From 3fcb59b07fe420c2a4c7749970dd66a9cd251817 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sun, 23 Aug 2026 09:26:57 -0700 Subject: [PATCH] [MIRROR] Shower order of operations fix (#12984) Co-authored-by: Cameron Lennox --- 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 e7c1196d6d..ce85d67827 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)