From cbf3b770ddd032e3bfacd7b41ef7c8510cb0762a Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Wed, 9 Jan 2019 18:27:14 +0000 Subject: [PATCH] Fixes ghosts and camera mobs feeling cold showers :cl: coiax fix: Ghosts and camera mobs no longer feel if the shower is cold or too hot. /:cl: Fixes #42269. - In addition, replaces some "the shower" with [src]. --- code/game/objects/structures/shower.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 7cf0f019782..69ead620726 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -105,7 +105,7 @@ wash_obj(A) else if(isturf(A)) wash_turf(A) - else if(ismob(A)) + else if(isliving(A)) wash_mob(A) check_heat(A) @@ -219,12 +219,12 @@ if(current_temperature == SHOWER_FREEZING) if(iscarbon(L)) C.adjust_bodytemperature(-80, 80) - to_chat(L, "The shower is freezing!") + to_chat(L, "[src] is freezing!") else if(current_temperature == SHOWER_BOILING) if(iscarbon(L)) C.adjust_bodytemperature(35, 0, 500) L.adjustFireLoss(5) - to_chat(L, "The shower is searing!") + to_chat(L, "[src] is searing!") /obj/machinery/shower/proc/check_clothes(mob/living/carbon/human/H) if(H.wear_suit && (H.wear_suit.clothing_flags & SHOWEROKAY))