cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Delta-v/Content.Shared/Weapons
History
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 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

(cherry picked from commit e1901aa6b6)
 		2024-02-08 11:52:32 +01:00
..
Marker Unrevert audio (#21330) 2023-12-02 20:16:36 +01:00
Melee Gravity anomaly rework (#24452) 2024-01-28 00:33:39 +01:00
Misc Grappling fixes (#23709) 2024-01-26 22:10:57 +01:00
Ranged Revert "Make flare gun explode, damage and stun the player when used … (#24679) 2024-02-08 11:52:32 +01:00
Reflect AutoCompState + ItemToggle fixes (#23422) 2024-01-26 21:27:29 +01:00