]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Revert "Make flare gun explode, damage and stun the player when used … (#24679)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Mon, 29 Jan 2024 00:20:34 +0000 (11:20 +1100)
committerGitHub <noreply@github.com>
Mon, 29 Jan 2024 00:20:34 +0000 (11:20 +1100)
commite1901aa6b602516f0f7cc3f29844c77e90c77977
treeabf97ffbe97824fc3e08c5e711bacf09ad982c8d
parent58b55ba06c5de031079915a607ccf3adad781f93
Revert "Make flare gun explode, damage and stun the player when used … (#24679)

* Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)"

This reverts commit e301378114b245fa6927372f83c19868cb90b13c.

# Conflicts:
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

* Fix revert conflicts

* Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs
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