cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Soap & clean proc refactor (#10989)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-02 10:18:12 -07:00
committed by GitHub
parent 6badc27205
commit 4558eaab04
39 changed files with 465 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/objects/structures/watercloset.dm
View File

@@ -194,7 +194,7 @@
wash(M)
process_heat(M)
for (var/atom/movable/G in src.loc)
G.clean_blood(TRUE)
G.wash(CLEAN_SCRUB)
else
soundloop.stop()
@@ -247,7 +247,7 @@
//Yes, showers are super powerful as far as washing goes.
/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob)
/obj/machinery/shower/proc/do_wash(atom/movable/O as obj|mob)
if(!on) return
if(isliving(O))
@@ -262,7 +262,7 @@
var/remove_amount = M.touching.maximum_volume * M.reagent_permeability() //take off your suit first
M.touching.remove_any(remove_amount)
M.clean_blood()
M.wash(CLEAN_SCRUB)
reagents.splash(O, 10, min_spill = 0, max_spill = 0)
@@ -270,7 +270,7 @@
if(!on) return
for(var/atom/movable/AM in loc)
if(AM.simulated)
wash(AM)
do_wash(AM)
if(isliving(AM))
var/mob/living/L = AM
process_heat(L)
@@ -282,7 +282,7 @@
return
is_washing = 1
var/turf/T = get_turf(src)
T.clean(src)
T.wash(CLEAN_SCRUB)
addtimer(VARSET_CALLBACK(src, is_washing, 0), 100, TIMER_DELETE_ME)
/obj/machinery/shower/proc/process_heat(mob/living/M)
@@ -548,21 +548,21 @@
var/mob/living/carbon/human/H = user
H.gunshot_residue = null
if(H.gloves)
H.gloves.clean_blood()
H.gloves.wash(CLEAN_SCRUB)
H.update_inv_gloves()
H.gloves.germ_level = 0
else
if(H.r_hand)
H.r_hand.clean_blood()
H.r_hand.wash(CLEAN_SCRUB)
if(H.l_hand)
H.l_hand.clean_blood()
H.l_hand.wash(CLEAN_SCRUB)
H.bloody_hands = 0
H.germ_level = 0
H.hand_blood_color = null
LAZYCLEARLIST(H.blood_DNA)
H.update_bloodied()
else
user.clean_blood()
user.wash(CLEAN_SCRUB)
for(var/mob/V in viewers(src, null))
V.show_message(span_notice("[user] washes their hands using \the [src]."))
@@ -623,7 +623,7 @@
return
busy = 0
O.clean_blood()
O.wash(CLEAN_SCRUB)
O.water_act(rand(1,10))
user.visible_message( \
span_notice("[user] washes \a [I] using \the [src]."), \