From a10740e4a8f8f6bda12148aa5e8694f50ceda89b Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Sun, 23 Aug 2026 08:07:43 -0400 Subject: [PATCH] Order of operations fix (#19676) Makes it so showers clean the touching and then apply the reagents we're splashing on them. --- code/game/objects/structures/watercloset.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 611e5cf7ffb..e9f65679ead 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -541,6 +541,13 @@ A.wash(CLEAN_RAD | CLEAN_TYPE_WEAK) // Clean radiation non-instantly A.wash(CLEAN_WASH) A.wash(CLEAN_SCRUB) + + //flush away reagents on the skin + var/mob/living/carbon/C = A + if(C.touching) + var/remove_amount = C.touching.maximum_volume * C.reagent_permeability() //take off your suit first + C.touching.remove_any(remove_amount) + reagents.splash(A, reaction_volume / 20, 1, TRUE, min_spill = 0, max_spill = 0) //Reaction volume needs to be divided by 20 due to a larger internal volume if(!isliving(A)) @@ -553,11 +560,6 @@ if(!iscarbon(A)) return - //flush away reagents on the skin - var/mob/living/carbon/C = A - if(C.touching) - var/remove_amount = C.touching.maximum_volume * C.reagent_permeability() //take off your suit first - C.touching.remove_any(remove_amount) /obj/machinery/shower/process() if(on)