From 736c549f860db3d033b3f27513365ae44e28c107 Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Tue, 12 Sep 2017 21:00:19 -0400 Subject: [PATCH] Shower tweak Showers no longer will apply water whenever check_heat is called, and will now attempt to wash you while you remain under them during their process() call (33% chance per process per mob) --- code/game/objects/structures/watercloset.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 8266daa684d..6844f27f475 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -470,13 +470,16 @@ qdel(E) /obj/machinery/shower/process() - if(!on || !mobpresent) return + if(!on || !mobpresent) + return for(var/mob/living/carbon/C in loc) + if(prob(33)) + wash(C) //re-applies water and re-cleans mob while they remain under the shower, 33% chance per process to avoid message spam/quick death check_heat(C) /obj/machinery/shower/proc/check_heat(mob/M as mob) - M.water_act(100, convertHeat(), src) //convenience - if(!on || watertemp == "normal") return + if(!on || watertemp == "normal") + return if(iscarbon(M)) var/mob/living/carbon/C = M