diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index a7808fe7afa..ad83b847b89 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -100,29 +100,29 @@ /obj/structure/toilet/prison/attackby(obj/item/I, mob/living/user) if(istype(I, /obj/item/weapon/grab)) - user.setClickCooldown(user.get_attack_speed(I)) - var/obj/item/weapon/grab/G = I + user.setClickCooldown(user.get_attack_speed(I)) + var/obj/item/weapon/grab/G = I - if(isliving(G.affecting)) - var/mob/living/GM = G.affecting + if(isliving(G.affecting)) + var/mob/living/GM = G.affecting - if(G.state>1) - if(!GM.loc == get_turf(src)) - to_chat(user, "[GM.name] needs to be on the toilet.") - return - if(open && !swirlie) - user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") - swirlie = GM - if(do_after(user, 30, GM)) - user.visible_message("[user] gives [GM.name] a swirlie!", "You give [GM.name] a swirlie!", "You hear a toilet flushing.") - if(!GM.internal) - GM.adjustOxyLoss(5) - swirlie = null + if(G.state>1) + if(!GM.loc == get_turf(src)) + to_chat(user, "[GM.name] needs to be on the toilet.") + return + if(open && !swirlie) + user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") + swirlie = GM + if(do_after(user, 30, GM)) + user.visible_message("[user] gives [GM.name] a swirlie!", "You give [GM.name] a swirlie!", "You hear a toilet flushing.") + if(!GM.internal) + GM.adjustOxyLoss(5) + swirlie = null + else + user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + GM.adjustBruteLoss(5) else - user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") - GM.adjustBruteLoss(5) - else - to_chat(user, "You need a tighter grip.") + to_chat(user, "You need a tighter grip.") /obj/structure/urinal