mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-13 08:04:22 +01:00
Soap & clean proc refactor (#17744)
* Automatic changelog compile [ci skip] * soap * Washy wash * Big wash * washy * Update soap.dm * washiest * . * . * Washes the linter * scrubs the linter * washes indentation * . * updaet --------- Co-authored-by: vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com> Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
@@ -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]."))
|
||||
|
||||
@@ -617,7 +617,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]."), \
|
||||
|
||||
Reference in New Issue
Block a user