cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 10:05:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Soap & clean proc refactor (#17744)

Browse Source 
* 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:
Guti
2025-05-31 19:31:15 +02:00
committed by GitHub
parent 5961096074
commit 9eb876de72
35 changed files with 448 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagents/other.dm
+12 -12
View File
@@ -446,7 +446,7 @@
..()
if(iscarbon(M))
var/mob/living/carbon/C = M
C.clean_blood(TRUE)
C.wash(CLEAN_SCRUB)
if(istype(M, /mob/living/simple_mob/vore/aggressive/macrophage)) // Big ouch for viruses
var/mob/living/simple_mob/macrophage = M
@@ -454,7 +454,7 @@
/datum/reagent/space_cleaner/touch_obj(var/obj/O)
..()
O.clean_blood()
O.wash(CLEAN_SCRUB)
/datum/reagent/space_cleaner/touch_turf(var/turf/T)
..()
@@ -462,7 +462,7 @@
if(istype(T, /turf/simulated))
var/turf/simulated/S = T
S.dirt = 0
T.clean_blood()
T.wash(CLEAN_SCRUB)
for(var/obj/effect/O in T)
if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
qdel(O)
@@ -475,32 +475,32 @@
/datum/reagent/space_cleaner/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
if(M.r_hand)
M.r_hand.clean_blood()
M.r_hand.wash(CLEAN_SCRUB)
if(M.l_hand)
M.l_hand.clean_blood()
M.l_hand.wash(CLEAN_SCRUB)
if(M.wear_mask)
if(M.wear_mask.clean_blood())
if(M.wear_mask.wash(CLEAN_SCRUB))
M.update_inv_wear_mask(0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(alien == IS_SLIME)
M.adjustToxLoss(rand(5, 10))
if(H.head)
if(H.head.clean_blood())
if(H.head.wash(CLEAN_SCRUB))
H.update_inv_head(0)
if(H.wear_suit)
if(H.wear_suit.clean_blood())
if(H.wear_suit.wash(CLEAN_SCRUB))
H.update_inv_wear_suit(0)
else if(H.w_uniform)
if(H.w_uniform.clean_blood())
if(H.w_uniform.wash(CLEAN_SCRUB))
H.update_inv_w_uniform(0)
if(H.shoes)
if(H.shoes.clean_blood())
if(H.shoes.wash(CLEAN_SCRUB))
H.update_inv_shoes(0)
else
H.clean_blood(1)
H.wash(CLEAN_SCRUB)
return
M.clean_blood()
M.wash(CLEAN_SCRUB)
/datum/reagent/space_cleaner/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_SLIME)