From 0fbbf498402e058ce84f724a6f442e53730db15a Mon Sep 17 00:00:00 2001 From: atermonera Date: Sat, 2 Apr 2022 14:46:04 -0800 Subject: [PATCH] Revert ":sadcatthumbsup:" This reverts commit 2278a4121156f705ef38dbe58bbc3415fd8658ab. --- code/game/objects/effects/chem/puddle.dm | 5 ++--- code/game/objects/structures/watercloset.dm | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/code/game/objects/effects/chem/puddle.dm b/code/game/objects/effects/chem/puddle.dm index cb854efe15..de3c60a4e7 100644 --- a/code/game/objects/effects/chem/puddle.dm +++ b/code/game/objects/effects/chem/puddle.dm @@ -22,9 +22,8 @@ CP.update_icon(TRUE) /obj/effect/decal/cleanable/chempuddle/proc/Spread(exclude=list()) - if(!reagents) // Destroy ourselves if we are an empty husk somehow. - if(!QDELETED(src)) - qdel(src) + if(!reagents && !QDELETED(src)) + qdel(src) return if(reagents.total_volume < (25 * reagents.get_viscosity())) return diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index aa92a47a44..42e90eda15 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -267,14 +267,7 @@ reagents.splash(O, 10) /obj/machinery/shower/process() -// A drain for every shower! ..If, there's a liquid on its turf. - var/obj/effect/decal/cleanable/chempuddle/to_drain = locate() in get_turf(src) - if(to_drain) - if(!QDELETED(to_drain)) - qdel(to_drain) - if(!on) return - for(var/thing in loc) var/atom/movable/AM = thing var/mob/living/L = thing