Commit Graph

4 Commits

Author SHA1 Message Date
johnb432
8fc093de8f
Grenades - Code cleanup (#9979)
* Improved various aspects of grenades

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update fnc_flashbangExplosionEH.sqf

* More cleanup

* Update fnc_incendiary.sqf

* Update fnc_incendiary.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update addons/grenades/functions/fnc_nextMode.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

* Update addons/grenades/functions/fnc_incendiary.sqf

* Removed fix that is included in another PR

* Update fnc_incendiary.sqf

* Messed up merge conflict resolution

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-18 01:05:01 -07:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
Cyruz143
8eccabbc0a
Grenades - Use fnc_addToInventory (#8016)
* Try and put converted item back in the same container

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Less hacky handling of container names

* Return value convention

Co-authored-by: Dystopian <sddex@ya.ru>
2020-12-21 00:15:46 +01:00
Cyruz143
b21535665b
Grenades - Add throwable explosive charges (#7860)
* First pass on adding throwable explosives

* Moved fnc call to postinit

* Disabled gits auto CRLF bs

* Changing fnc name and call

* Move names to string table

* Using vanilla icon and removing explosive depend

* More stringtable conversions

* Missing semi-colons causing RPT error

* Update addons/grenades/stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Remove empty strings

* Update addons/grenades/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Add compatibility with "realistic names" modules, and add french translation

* Fix little mistake

* Update addons/grenades/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Add setting

* Change setting name, use ace_settingsInitialized

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
2020-08-24 12:45:56 -05:00