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
..
Melee	Revert 'Revert 'Solution Entities'' (#23168)	2023-12-29 08:47:43 -04:00
Misc	Speed Boots [Tier 3 Civ-Service] (#21438)	2023-11-07 18:25:43 -07:00
Ranged	Revert "Make flare gun explode, damage and stun the player when used … (#24679)	2024-01-29 11:20:34 +11:00
DamageMarkerSystem.cs	Proto-kinetic crusher (#16277)	2023-05-14 13:15:18 +10:00