shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Fixes wash_obj misuse (#2753)

Browse Source 
* Fixes wash_obj misuse (#30658)

* Fixes wash_obj misuse

* This too

* Ree

* REEEEE

* Fixes wash_obj misuse
This commit is contained in:
CitadelStationBot
2017-09-14 07:38:51 -05:00
committed by Poojawa
parent c6025a7049
commit 40f5d7d4bf
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/watercloset.dm
+10 -11
View File
@@ -274,16 +274,16 @@
ismist = 0 ismist = 0
/obj/machinery/shower/Crossed(atom/movable/O) /obj/machinery/shower/Crossed(atom/movable/AM)
..() ..()
if(on) if(on)
if(isliving(O)) if(isliving(AM))
var/mob/living/L = O var/mob/living/L = AM
if(wash_mob(L)) //it's a carbon mob. if(wash_mob(L)) //it's a carbon mob.
var/mob/living/carbon/C = L var/mob/living/carbon/C = L
C.slip(80,null,NO_SLIP_WHEN_WALKING) C.slip(80,null,NO_SLIP_WHEN_WALKING)
else else if(isobj(AM))
wash_obj(O) wash_obj(AM)
/obj/machinery/shower/proc/wash_obj(obj/O) /obj/machinery/shower/proc/wash_obj(obj/O)
@@ -374,12 +374,11 @@
/obj/machinery/shower/process() /obj/machinery/shower/process()
if(on) if(on)
wash_turf() wash_turf()
for(var/atom/movable/G in loc) for(var/atom/movable/AM in loc)
if(isliving(G)) if(isliving(AM))
var/mob/living/L = G wash_mob(AM)
wash_mob(L) else if(isobj(AM))
else wash_obj(AM)
wash_obj(G)
/obj/machinery/shower/deconstruct(disassembled = TRUE) /obj/machinery/shower/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/metal (loc, 3) new /obj/item/stack/sheet/metal (loc, 3)