Delta-v/Content.Shared/Weapons
metalgearsloth e1901aa6b6
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 e301378114.

# 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
2024-01-29 11:20:34 +11:00
..
Marker Unrevert audio (#21330) 2023-11-27 22:12:34 +11:00
Melee Gravity anomaly rework (#24452) 2024-01-27 04:15:05 -08:00
Misc Grappling fixes (#23709) 2024-01-08 12:15:46 +11:00
Ranged Revert "Make flare gun explode, damage and stun the player when used … (#24679) 2024-01-29 11:20:34 +11:00
Reflect AutoCompState + ItemToggle fixes (#23422) 2024-01-03 17:24:02 +11:00