From b5056c5441ea6ac07529ea36548f60cbc63245fd Mon Sep 17 00:00:00 2001 From: Jarcolr Date: Mon, 31 Mar 2014 21:13:26 +0300 Subject: [PATCH] Cannot wash your missing hands anymore M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh. Conflicts: code/game/objects/structures/watercloset.dm --- code/game/objects/structures/watercloset.dm | 29 ++++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 8bdaad4672a..c3032dbe840 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -326,17 +326,23 @@ anchored = 1 var/busy = 0 //Something's being washed at the moment +/obj/structure/sink/attack_hand(mob/user as mob) + 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 - -/obj/structure/sink/attack_hand(mob/M as mob) - if(isrobot(M) || isAI(M)) + if(isrobot(user) || isAI(user)) return - if(!Adjacent(M)) + if(!Adjacent(user)) return if(busy) - M << "\red Someone's already washing here." + user << "\red Someone's already washing here." return usr << "\blue You start washing your hands." @@ -345,13 +351,14 @@ sleep(40) busy = 0 - if(!Adjacent(M)) return //Person has moved away from the sink + if(!Adjacent(user)) return //Person has moved away from the sink - M.clean_blood() - if(ishuman(M)) - M:update_inv_gloves(0,0) + user.clean_blood() + if(ishuman(user)) + user:update_inv_gloves() for(var/mob/V in viewers(src, null)) - V.show_message("\blue [M] washes their hands using \the [src].") + V.show_message("\blue [user] washes their hands using \the [src].") + /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) if(busy) @@ -420,3 +427,5 @@ /obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob) icon_state = "puddle-splash" ..() + icon_state = "puddle" +