From 52f9cb6350b0337f79b63136d9f7645064b08d81 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:07:56 -0400 Subject: [PATCH] Merge pull request #13474 from Heroman3003/washing-optimize Optimizes shower's turf washing a bit --- code/game/objects/structures/watercloset.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index a8eb677840..a5812cc91d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -255,13 +255,7 @@ M.clean_blood() - if(isturf(loc)) - var/turf/tile = loc - for(var/obj/effect/E in tile) - if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay)) - qdel(E) - - reagents.splash(O, 10) + reagents.splash(O, 10, min_spill = 0, max_spill = 0) /obj/machinery/shower/process() if(!on) return @@ -275,11 +269,10 @@ reagents.add_reagent("water", reagents.get_free_space()) /obj/machinery/shower/proc/wash_floor() - if(!ismist && is_washing) + if(is_washing) return is_washing = 1 var/turf/T = get_turf(src) - reagents.splash(T, reagents.total_volume) T.clean(src) spawn(100) is_washing = 0