mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 20:47:43 +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:
co-authored by
vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com>
ShadowLarkens
Cameron Lennox
parent
5961096074
commit
9eb876de72
@@ -1490,7 +1490,7 @@
|
||||
if(istype(I,/obj/item/card/id))
|
||||
I.gurgle_contaminate(target.contents, target.contamination_flavor, target.contamination_color)
|
||||
if(I.gurgled && target.contaminates)
|
||||
I.decontaminate()
|
||||
I.wash(CLEAN_WASH)
|
||||
I.gurgle_contaminate(target.contents, target.contamination_flavor, target.contamination_color)
|
||||
items_preserved -= content
|
||||
owner.updateVRPanel()
|
||||
|
||||
@@ -28,7 +28,7 @@ var/list/gurgled_overlays = list(
|
||||
return FALSE
|
||||
|
||||
if(gurgled && !(gurgled_color == contamination_color))
|
||||
decontaminate()
|
||||
wash(CLEAN_WASH)
|
||||
|
||||
if(!gurgled)
|
||||
gurgled = TRUE
|
||||
@@ -53,27 +53,13 @@ var/list/gurgled_overlays = list(
|
||||
else
|
||||
return TRUE
|
||||
|
||||
/obj/item/decontaminate() //Decontaminate the sogginess as well.
|
||||
..()
|
||||
gurgled = FALSE
|
||||
cut_overlay(gurgled_overlays[gurgled_color])
|
||||
if(cleanname)
|
||||
name = cleanname
|
||||
if(cleandesc)
|
||||
desc = cleandesc
|
||||
|
||||
/obj/item/clean_blood() //Make this type of contamination sink washable as well.
|
||||
..()
|
||||
if(gurgled)
|
||||
decontaminate()
|
||||
|
||||
/obj/structure/sink/attackby(obj/item/I, mob/user) //Wash the soggy item before it can interact with the sink.
|
||||
if(istype(I) && I.gurgled)
|
||||
to_chat(user, span_notice("You start washing [I]."))
|
||||
|
||||
busy = TRUE
|
||||
if(do_after(user, 40, src))
|
||||
I.clean_blood()
|
||||
I.wash(CLEAN_SCRUB)
|
||||
user.visible_message(span_notice("[user] washes [I] using [src]."),
|
||||
span_notice("You wash [I] using [src]."))
|
||||
busy = FALSE
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
if(!oldname)
|
||||
oldname = cleanname ? cleanname : name
|
||||
cleanname = "[d_stage_name] [oldname]"
|
||||
decontaminate()
|
||||
wash(CLEAN_ALL)
|
||||
if(istype(B))
|
||||
gurgled_color = B.contamination_color //Apply the correct color setting so uncontaminable things can still have the right overlay.
|
||||
gurgle_contaminate(B, B.contamination_flavor, B.contamination_color)
|
||||
|
||||
Reference in New Issue
Block a user