diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 959f8f807a..a382858c54 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -18,8 +18,9 @@ /obj/structure/toilet/attack_hand(mob/living/user as mob) if(swirlie) + usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) usr.visible_message("[user] slams the toilet seat onto [swirlie.name]'s head!", "You slam the toilet seat onto [swirlie.name]'s head!", "You hear reverberating porcelain.") - swirlie.adjustBruteLoss(8) + swirlie.adjustBruteLoss(5) return if(cistern && !open) @@ -53,6 +54,7 @@ return if(istype(I, /obj/item/weapon/grab)) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) var/obj/item/weapon/grab/G = I if(isliving(G.affecting)) @@ -65,14 +67,14 @@ 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, 5, 0)) + 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(8) + GM.adjustBruteLoss(5) else user << "You need a tighter grip."