shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes shooting self while suiciding with gun without proper firing pin auth (#1520)

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-13 15:42:15 -05:00
committed by kevinz000
parent a2b44c94e1
commit bb30963100
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic.dm
+1 -1
View File
@@ -138,7 +138,7 @@
return boolets
/obj/item/weapon/gun/ballistic/suicide_act(mob/user)
if (chambered && chambered.BB && !chambered.BB.nodamage)
if (chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!</span>")
sleep(25)
if(user.is_holding(src))
code/modules/projectiles/guns/energy.dm
+1 -1
View File
@@ -149,7 +149,7 @@
toggle_gunlight()
/obj/item/weapon/gun/energy/suicide_act(mob/user)
if (src.can_shoot())
if (src.can_shoot() && can_trigger_gun(user))
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!</span>")
sleep(25)
if(user.is_holding(src))