From bb309631008a405d70650ed6fbd6bf7f6c552f39 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 13 Jun 2017 15:42:15 -0500 Subject: [PATCH] Fixes shooting self while suiciding with gun without proper firing pin auth (#1520) --- code/modules/projectiles/guns/ballistic.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 80be30a06a..7907403bd8 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -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("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") sleep(25) if(user.is_holding(src)) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index f8d0911011..a7080bcf57 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -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("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!") sleep(25) if(user.is_holding(src))