]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Rework the Flare Gun & add a Security Shell Gun. (#32829)
authorBramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Wed, 6 Nov 2024 14:27:10 +0000 (15:27 +0100)
committerGitHub <noreply@github.com>
Wed, 6 Nov 2024 14:27:10 +0000 (15:27 +0100)
commitd58840990901423b8c9717bf90e4a36cb59b0ad5
treec45a6a3c893dcf2db540e5f4bb33542eb7287c1e
parented865ae973375fa05adf86a24821e93c4edbf7d3
Rework the Flare Gun & add a Security Shell Gun. (#32829)

* Rework flaregun and add security shell gun

* Make flare gun twice as likely to appear in emergency lockers

* Security shell gun can now fire lethal shells like the flare gun used to be able to.

* Rebalance the sec shell gun material cost to primarily be steel instead of plastic

* Define the ShellShotgunLight tag in tags.yml

* Leave the no lethal shells for normal flareguns to a different PR.

* Move a comment to re-run checks.

* Bye bye lethal shells from plastic guns.

* Fix weird whitespace issue.

* Make the sec shell gun inherit the normal flare gun.

* Remove the rack verb and update the sec shell gun description

* Remove the ability to fire lethals from flare guns, pending blowing up the gun

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
16 files changed:
Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
Resources/Prototypes/Recipes/Lathes/security.yml
Resources/Prototypes/tags.yml
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png [moved from Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/icon.png with 100% similarity]
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/bolt-open.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json [new file with mode: 0644]