]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Make flare gun explode, damage and stun the player when used with the wrong ammo...
authorMendaxxDev <153332064+MendaxxDev@users.noreply.github.com>
Fri, 15 Dec 2023 09:57:59 +0000 (10:57 +0100)
committerGitHub <noreply@github.com>
Fri, 15 Dec 2023 09:57:59 +0000 (02:57 -0700)
commite301378114b245fa6927372f83c19868cb90b13c
treea232221d9f4d96baafd3246b1f89db7ccf4b1222
parent353ab9544605531e2d2d94e57e6812290c3c82f4
Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)

* Flare gun can now only be loaded with actual flares

* Make flare gun loadable with other shells, but destroy it and damage and stun the user when used

* tweak

* Logic fix + QOL add-ons

* damageOnWrongAmmo in gun component

* cleanup
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
Content.Shared/Weapons/Ranged/Components/GunComponent.cs
Resources/Locale/en-US/weapons/ranged/gun.ftl
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
Resources/Prototypes/tags.yml