cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +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

8
code/game/machinery/suit_storage/suit_cycler.dm
View File

@@ -430,15 +430,15 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache)
if(helmet)
if(radiation_level > 2)
helmet.decontaminate()
helmet.wash(CLEAN_TYPE_RADIATION)
if(radiation_level > 1)
helmet.clean_blood()
helmet.wash(CLEAN_SCRUB)
if(suit)
if(radiation_level > 2)
suit.decontaminate()
suit.wash(CLEAN_TYPE_RADIATION)
if(radiation_level > 1)
suit.clean_blood()
suit.wash(CLEAN_SCRUB)
. = TRUE

6
code/game/machinery/suit_storage/suit_storage.dm
View File

@@ -283,11 +283,11 @@
if(i==3) //End of the cycle
if(!issuperUV)
if(HELMET)
HELMET.clean_blood()
HELMET.wash(CLEAN_SCRUB)
if(SUIT)
SUIT.clean_blood()
SUIT.wash(CLEAN_SCRUB)
if(MASK)
MASK.clean_blood()
MASK.wash(CLEAN_SCRUB)
else //It was supercycling, destroy everything
if(HELMET)
HELMET = null

15
code/game/machinery/washing_machine.dm
View File

@@ -58,12 +58,12 @@
update_icon()
to_chat(usr, "The washing machine starts a cycle.")
playsound(src, 'sound/items/washingmachine.ogg', 50, 1, 1)
sleep(200)
for(var/atom/A in washing)
A.clean_blood()
for(var/obj/item/I in washing)
I.decontaminate()
addtimer(CALLBACK(src, PROC_REF(finish_wash)), 2 SECONDS)
/obj/machinery/washing_machine/proc/finish_wash()
for(var/atom/A in washing)
A.wash(CLEAN_ALL)
//Tanning!
for(var/obj/item/stack/hairlesshide/HH in washing)
@@ -86,17 +86,14 @@
set category = "Object"
set src in usr.loc
sleep(20)
if(state in list(1,3,6))
if((state in list(1,3,6)) && do_after(usr, 20))
usr.loc = src.loc
/obj/machinery/washing_machine/update_icon()
//VOREStation Edit
cut_overlays()
icon_state = "wm_[state]"
if(panel_open)
add_overlay("panel")
//VOREStation Edit End
/obj/machinery/washing_machine/attackby(obj/item/W as obj, mob/user as mob)
if(state == 2 && washing.len < 1)