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] Fixes washing related issues (#11007)

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-04 10:30:55 -07:00
committed by GitHub
parent 6d73a10ec5
commit 21be1859ac
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__defines/is_helpers.dm
View File

@@ -84,4 +84,4 @@ GLOBAL_VAR_INIT(magic_appearance_detecting_image, new /image) // appearances are
/// NaN isn't a number, damn it. Infinity is a problem too. /// NaN isn't a number, damn it. Infinity is a problem too.
#define isnum_safe(x) ( isnum((x)) && !isnan((x)) && !isinf((x)) ) #define isnum_safe(x) ( isnum((x)) && !isnan((x)) && !isinf((x)) )
#define ismopable(A) (A && (A.layer <= ABOVE_JUNK_LAYER)) //If something can be cleaned by floor-cleaning devices such as mops or clean bots #define ismopable(A) (A && (A.plane <= OBJ_PLANE)) //If something can be cleaned by floor-cleaning devices such as mops or clean bots

2
code/game/atoms.dm
View File

@@ -820,6 +820,6 @@ GLOBAL_LIST_EMPTY(icon_dimensions)
blood_DNA = null blood_DNA = null
return TRUE return TRUE
blood_color = null // CHOMPEdit - PR this upstream at some point blood_color = null
germ_level = 0 germ_level = 0
fluorescent = 0 fluorescent = 0

1
code/game/objects/items/soap.dm
View File

@@ -72,6 +72,7 @@
to_chat(user, span_notice("You scrub \the [target.name] clean.")) to_chat(user, span_notice("You scrub \the [target.name] clean."))
var/turf/T = target var/turf/T = target
T.wash(CLEAN_SCRUB) T.wash(CLEAN_SCRUB)
reagents.trans_to_turf(T, 1, 10)
decreaseUses(user) decreaseUses(user)
else if(ishuman(target) && user.zone_sel.selecting == O_MOUTH) else if(ishuman(target) && user.zone_sel.selecting == O_MOUTH)
if(target == user) if(target == user)

2
code/game/objects/items/weapons/mop.dm
View File

@@ -35,6 +35,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
var/turf/T = get_turf(A) var/turf/T = get_turf(A)
if(T) if(T)
T.wash(CLEAN_SCRUB) T.wash(CLEAN_SCRUB)
reagents.trans_to_turf(T, 1, 10)
to_chat(user, span_notice("You have finished mopping!")) to_chat(user, span_notice("You have finished mopping!"))
@@ -76,4 +77,5 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
var/turf/T = get_turf(A) var/turf/T = get_turf(A)
if(T) if(T)
T.wash(CLEAN_SCRUB) T.wash(CLEAN_SCRUB)
reagents.trans_to_turf(T, 1, 10)
to_chat(user, span_notice("You have finished mopping!")) to_chat(user, span_notice("You have finished mopping!"))