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