From cf42e348f0026404a6e0833e2c3569e32781fb85 Mon Sep 17 00:00:00 2001 From: Jarcolr Date: Mon, 31 Mar 2014 18:19:25 +0300 Subject: [PATCH] Can no longer use fire extinguisher closet without hands If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating. Cool,right? --- code/game/objects/structures/extinguisher.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 9713c7c9eb3..cfcc3c1176d 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -28,6 +28,13 @@ /obj/structure/extinguisher_cabinet/attack_hand(mob/user) if(isrobot(user) || isalien(user)) return + if (hasorgans(user)) + var/datum/organ/external/temp = user:organs_by_name["r_hand"] + if (user.hand) + temp = user:organs_by_name["l_hand"] + if(temp && !temp.is_usable()) + user << "You try to move your [temp.display_name], but cannot!" + return if(has_extinguisher) user.put_in_hands(has_extinguisher) user << "You take [has_extinguisher] from [src]." @@ -62,4 +69,4 @@ else icon_state = "extinguisher_full" else - icon_state = "extinguisher_empty" \ No newline at end of file + icon_state = "extinguisher_empty"