cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 16:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential cleaner component runtimes (#92265)

Browse Source 
## About The Pull Request

`pre_clean_callback` is asserted to be nullable, so this would runtime
if you have something with the default cleaner arguments

It probably shouldn't be invoked twice, anyways

## Changelog

Not player visible but could save a future coder or admin a minor
headache
This commit is contained in:
MrMelbert
2025-07-23 23:00:58 -05:00
committed by Roxy
parent 668317e450
commit 4f2b55d05c
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/cleaning.dm
View File

@@ -14,7 +14,7 @@
#define CLEAN_DONT_BLOCK_INTERACTION (1<<3) #define CLEAN_DONT_BLOCK_INTERACTION (1<<3)
/// Return to do cleaning without actually cleaning anything /// Return to do cleaning without actually cleaning anything
/// Only does anything if [CLEAN_ALLOWED] is also returned /// Only does anything if [CLEAN_ALLOWED] is also returned
#define CLEAN_NO_CLEANER_REAGENTS (1<<4) #define CLEAN_NO_WASH (1<<4)
// Different kinds of things that can be cleaned. // Different kinds of things that can be cleaned.
// Use these when overriding the wash proc or registering for the clean signals to check if your thing should be cleaned // Use these when overriding the wash proc or registering for the clean signals to check if your thing should be cleaned

25
code/datums/components/cleaner.dm
View File

@@ -65,16 +65,18 @@
if(isitem(source) && SHOULD_SKIP_INTERACTION(target, source, user)) if(isitem(source) && SHOULD_SKIP_INTERACTION(target, source, user))
return NONE return NONE
// By default, give XP var/call_wash = TRUE
var/give_xp = TRUE var/give_xp = TRUE
if(pre_clean_callback) if(pre_clean_callback)
var/callback_return = pre_clean_callback.Invoke(source, target, user) var/callback_return = pre_clean_callback.Invoke(source, target, user)
if(callback_return & CLEAN_BLOCKED) if(callback_return & CLEAN_BLOCKED)
return (callback_return & CLEAN_DONT_BLOCK_INTERACTION) ? NONE : ITEM_INTERACT_BLOCKING return (callback_return & CLEAN_DONT_BLOCK_INTERACTION) ? NONE : ITEM_INTERACT_BLOCKING
if(callback_return & CLEAN_NO_WASH)
call_wash = FALSE
if(callback_return & CLEAN_NO_XP) if(callback_return & CLEAN_NO_XP)
give_xp = FALSE give_xp = FALSE
INVOKE_ASYNC(src, PROC_REF(clean), source, target, user, give_xp) INVOKE_ASYNC(src, PROC_REF(clean), source, target, user, call_wash, give_xp)
return ITEM_INTERACT_SUCCESS return ITEM_INTERACT_SUCCESS
/** /**
@@ -86,13 +88,10 @@
* * source the datum that sent the signal to start cleaning * * source the datum that sent the signal to start cleaning
* * target the thing being cleaned * * target the thing being cleaned
* * user the person doing the cleaning * * user the person doing the cleaning
* * clean_target set this to false if the target should not be washed and if experience should not be awarded to the user * * call_wash set this to false if the target should not be wash()ed
* * grant_xp set this to false if the user should not be granted cleaning experience
*/ */
/datum/component/cleaner/proc/clean(datum/source, atom/target, mob/living/user, clean_target = TRUE) /datum/component/cleaner/proc/clean(datum/source, atom/target, mob/living/user, call_wash = TRUE, grant_xp = TRUE)
//mops don't clean anything unless they're dipped in cleaning reagents
var/callback_return = pre_clean_callback.Invoke(source, target, user)
if(callback_return & CLEAN_NO_CLEANER_REAGENTS)
clean_target = FALSE
//make sure we don't attempt to clean something while it's already being cleaned //make sure we don't attempt to clean something while it's already being cleaned
if(HAS_TRAIT(target, TRAIT_CURRENTLY_CLEANING) || (SEND_SIGNAL(target, COMSIG_ATOM_PRE_CLEAN, user) & COMSIG_ATOM_CANCEL_CLEAN)) if(HAS_TRAIT(target, TRAIT_CURRENTLY_CLEANING) || (SEND_SIGNAL(target, COMSIG_ATOM_PRE_CLEAN, user) & COMSIG_ATOM_CANCEL_CLEAN))
return return
@@ -129,12 +128,12 @@
var/clean_succeeded = FALSE var/clean_succeeded = FALSE
if(do_after(user, cleaning_duration, target = target)) if(do_after(user, cleaning_duration, target = target))
clean_succeeded = TRUE clean_succeeded = TRUE
if(clean_target) for(var/obj/effect/decal/cleanable/cleanable_decal in target) //it's important to do this before you wash all of the cleanables off
for(var/obj/effect/decal/cleanable/cleanable_decal in target) //it's important to do this before you wash all of the cleanables off if(call_wash && grant_xp)
user.mind?.adjust_experience(/datum/skill/cleaning, round(cleanable_decal.beauty / CLEAN_SKILL_BEAUTY_ADJUSTMENT)) user.mind?.adjust_experience(/datum/skill/cleaning, round(cleanable_decal.beauty / CLEAN_SKILL_BEAUTY_ADJUSTMENT))
all_cleaned[cleanable_decal] = GET_ATOM_BLOOD_DNA(cleanable_decal) all_cleaned[cleanable_decal] = GET_ATOM_BLOOD_DNA(cleanable_decal)
if(target.wash(cleaning_strength)) if(call_wash && target.wash(cleaning_strength) && grant_xp)
user.mind?.adjust_experience(/datum/skill/cleaning, round(CLEAN_SKILL_GENERIC_WASH_XP)) user.mind?.adjust_experience(/datum/skill/cleaning, round(CLEAN_SKILL_GENERIC_WASH_XP))
on_cleaned_callback?.Invoke(source, target, user, clean_succeeded, all_cleaned) on_cleaned_callback?.Invoke(source, target, user, clean_succeeded, all_cleaned)
//remove the cleaning overlay //remove the cleaning overlay

2
code/game/objects/items/clown_items.dm
View File

@@ -125,7 +125,7 @@
/obj/item/soap/proc/should_clean(datum/cleaning_source, atom/atom_to_clean, mob/living/cleaner) /obj/item/soap/proc/should_clean(datum/cleaning_source, atom/atom_to_clean, mob/living/cleaner)
. = CLEAN_ALLOWED . = CLEAN_ALLOWED
if(!check_allowed_items(atom_to_clean)) if(!check_allowed_items(atom_to_clean))
. |= CLEAN_NO_XP . |= CLEAN_NO_XP|CLEAN_NO_WASH
/** /**
* Decrease the number of uses the bar of soap has. * Decrease the number of uses the bar of soap has.

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

@@ -52,7 +52,7 @@
return CLEAN_BLOCKED return CLEAN_BLOCKED
if(reagents.has_reagent(amount = 1, chemical_flags = REAGENT_CLEANS)) if(reagents.has_reagent(amount = 1, chemical_flags = REAGENT_CLEANS))
return CLEAN_ALLOWED return CLEAN_ALLOWED
return CLEAN_ALLOWED|CLEAN_NO_XP|CLEAN_NO_CLEANER_REAGENTS return CLEAN_ALLOWED|CLEAN_NO_XP|CLEAN_NO_WASH
/** /**
* Applies reagents to the cleaned floor and removes them from the mop. * Applies reagents to the cleaned floor and removes them from the mop.