cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 06:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Shower order of operations fix (#12984)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-08-23 18:26:57 +02:00
committed by GitHub
co-authored by Cameron Lennox
parent bc28f40421
commit 3fcb59b07f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/watercloset.dm
+7 -5
View File
@@ -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)