Delta-v/Content.Server/Weapons/Ranged/Systems
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
..
ChemicalAmmoSystem.cs Revert 'Revert 'Solution Entities'' (#23168) 2024-01-23 23:00:42 +01:00
FlyBySoundSystem.cs Melee refactor (#10897) 2022-09-29 15:51:59 +10:00
GunSystem.AutoFire.cs Star Wars 14: Shuttle weapon update (#23644) 2024-01-27 23:40:06 +01:00
GunSystem.Ballistic.cs Content ecs containers (#22484) 2024-01-22 18:47:55 +01:00
GunSystem.Battery.cs DamageableSystem cleanup & performance improvements (#20820) 2023-10-08 19:58:57 +02:00
GunSystem.Cartridges.cs DamageableSystem cleanup & performance improvements (#20820) 2023-10-08 19:58:57 +02:00
GunSystem.Revolver.cs Remove gun .Owners (#14585) 2023-03-11 20:08:22 +11:00
GunSystem.Solution.cs Revert 'Revert 'Solution Entities'' (#23168) 2024-01-23 23:00:42 +01:00
GunSystem.cs Revert "Make flare gun explode, damage and stun the player when used … (#24679) 2024-02-08 11:52:32 +01:00