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

(cherry picked from commit e1901aa6b602516f0f7cc3f29844c77e90c77977)
2024-02-08 11:52:32 +01:00
..
Components Revert "Make flare gun explode, damage and stun the player when used … (#24679) 2024-02-08 11:52:32 +01:00
Events Add events for GunComponent values, muzzle flashes and cartridge spread (#24077) 2024-02-08 11:52:29 +01:00
Systems BatteryWeaponFireModes refactor (#24502) 2024-02-08 11:52:31 +01:00
HitscanPrototype.cs Make all prototype types partial (#21374) 2023-11-12 20:29:57 +01:00
IShootable.cs Gun refactor (#8301) 2022-06-01 19:59:58 +10:00