From eb2368be0373e41494bd0657275012b9fdcd40e6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 5 Jun 2018 13:18:27 -0500 Subject: [PATCH] [MIRROR] Fix inconsistent energy gun suicide (#7012) * Fix inconsistent energy gun suicide (#38252) * Fix inconsistent energy gun suicide --- code/modules/projectiles/guns/energy.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 7a3f002cbf..2a352932fa 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -166,8 +166,8 @@ /obj/item/gun/energy/ui_action_click() toggle_gunlight() -/obj/item/gun/energy/suicide_act(mob/user) - if (can_shoot() && can_trigger_gun(user)) +/obj/item/gun/energy/suicide_act(mob/living/user) + if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD)) 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)) @@ -181,7 +181,7 @@ user.visible_message("[user] panics and starts choking to death!") return(OXYLOSS) else - user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is pretending to melt [user.p_their()] face off with [src]! It looks like [user.p_theyre()] trying to commit suicide!") playsound(src, "gun_dry_fire", 30, 1) return (OXYLOSS)