Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Make flare gun explode, damage and stun the player when used … (#24679)

Browse Source 
* 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
This commit is contained in:
metalgearsloth
2024-01-29 11:20:34 +11:00
committed by GitHub
parent 58b55ba06c
commit e1901aa6b6
7 changed files with 13 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Locale/en-US/weapons/ranged/gun.ftl
View File

@@ -6,7 +6,6 @@ gun-selected-mode = Selected {$mode}
gun-disabled = You can't use guns!
gun-clumsy = The gun blows up in your face!
gun-set-fire-mode = Set to {$mode}
gun-component-wrong-ammo = Wrong ammo!
# SelectiveFire
gun-SemiAuto = semi-auto