From 2cf129759be42ff8e69de07dfd73d9b1ef515f15 Mon Sep 17 00:00:00 2001 From: Perakp Date: Sun, 7 Sep 2014 00:11:04 +0300 Subject: [PATCH] Showers wet the floor. --- code/game/objects/structures/watercloset.dm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 0e9c73ac499..62b181272f2 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -156,7 +156,11 @@ add_fingerprint(M) if(on) for (var/atom/movable/G in loc) - Crossed(G) + wash(G) + else + if(istype(loc, /turf/simulated)) + var/turf/simulated/tile = loc + tile.MakeSlippery() /obj/machinery/shower/attackby(obj/item/I, mob/user) @@ -206,9 +210,10 @@ /obj/machinery/shower/Crossed(atom/movable/O) ..() wash(O) - if(ismob(O)) - mobpresent += 1 - check_heat(O) + if(iscarbon(O) && on) + var/mob/living/carbon/M=O + M.slip(4,2,null,NO_SLIP_WHEN_WALKING) + /obj/machinery/shower/Uncrossed(atom/movable/O) @@ -220,7 +225,9 @@ //Yes, showers are super powerful as far as washing goes. /obj/machinery/shower/proc/wash(atom/movable/O) if(!on) return - + if(ismob(O)) + mobpresent += 1 + check_heat(O) if(isliving(O)) var/mob/living/L = O L.ExtinguishMob() @@ -306,6 +313,7 @@ check_heat(C) + /obj/machinery/shower/proc/check_heat(mob/M) if(!on || watertemp == "normal") return if(iscarbon(M))