cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 11:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes ghosts and camera mobs feeling cold showers

Browse Source 
🆑 coiax
fix: Ghosts and camera mobs no longer feel if the shower is cold or too hot.
/🆑

Fixes #42269.

- In addition, replaces some "the shower" with [src].
This commit is contained in:
Jack Edge
2019-01-09 18:27:14 +00:00
parent f48e3a9dea
commit cbf3b770dd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/shower.dm
+3 -3
View File
@@ -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, "<span class='warning'>The shower is freezing!</span>")
to_chat(L, "<span class='warning'>[src] is freezing!</span>")
else if(current_temperature == SHOWER_BOILING)
if(iscarbon(L))
C.adjust_bodytemperature(35, 0, 500)
L.adjustFireLoss(5)
to_chat(L, "<span class='danger'>The shower is searing!</span>")
to_chat(L, "<span class='danger'>[src] is searing!</span>")
/obj/machinery/shower/proc/check_clothes(mob/living/carbon/human/H)
if(H.wear_suit && (H.wear_suit.clothing_flags & SHOWEROKAY))