forked from yogstation13/Yogstation
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into syndie-tools-tweak
- Loading branch information
Showing
36 changed files
with
644 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #define TEXT_EFFECT_PLANE 65 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
modular_dripstation/code/_onclick/hud/rendering/plane_master.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /atom/movable/screen/plane_master/text_effect | ||
| name = "text effect plane" | ||
| plane = TEXT_EFFECT_PLANE | ||
| render_relay_planes = list(RENDER_PLANE_NON_GAME) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| ///Called from a cleaning tool to start cleaning something. | ||
| #define COMSIG_START_CLEANING "start_cleaning" | ||
|
|
||
| /// Marks an atom when the cleaning of it is first started, so that the cleaning overlay doesn't get removed prematurely | ||
| #define CURRENTLY_CLEANING "currently_cleaning" | ||
|
|
||
| /** | ||
| * Component that can be used to clean things. | ||
| * Takes care of duration and special cleaning interactions. | ||
| * A callback can be set by the datum holding the cleaner to add custom functionality. | ||
| * Soap uses a callback to decrease the amount of uses it has left after cleaning for example. | ||
| */ | ||
| /datum/component/cleaner | ||
| /// The time it takes to clean something, without reductions from the cleaning skill modifier. | ||
| var/base_cleaning_duration | ||
| /// Determines what this cleaner can wash off, [the available options are found here](code/__DEFINES/cleaning.html). | ||
| var/cleaning_strength | ||
| /// Gets called when something is successfully cleaned. | ||
| var/datum/callback/on_cleaned_callback | ||
|
|
||
| /datum/component/cleaner/Initialize( | ||
| base_cleaning_duration = 3 SECONDS, | ||
| cleaning_strength = CLEAN_SCRUB, | ||
| datum/callback/on_cleaned_callback = null, | ||
| ) | ||
| src.base_cleaning_duration = base_cleaning_duration | ||
| src.cleaning_strength = cleaning_strength | ||
| src.on_cleaned_callback = on_cleaned_callback | ||
|
|
||
| /datum/component/cleaner/Destroy(force, silent) | ||
| on_cleaned_callback = null | ||
| return ..() | ||
|
|
||
| /datum/component/cleaner/RegisterWithParent() | ||
| RegisterSignal(parent, COMSIG_START_CLEANING, .proc/on_start_cleaning) | ||
|
|
||
| /datum/component/cleaner/UnregisterFromParent() | ||
| UnregisterSignal(parent, COMSIG_START_CLEANING) | ||
|
|
||
| /** | ||
| * Handles the COMSIG_START_CLEANING signal by calling the clean proc. | ||
| * | ||
| * Arguments | ||
| * * source the datum that sent the signal to start cleaning | ||
| * * target the thing being cleaned | ||
| * * user the person doing the cleaning | ||
| * * clean_target set this to false if the target should not be washed | ||
| */ | ||
| /datum/component/cleaner/proc/on_start_cleaning(datum/source, atom/target, mob/living/user, clean_target) | ||
| SIGNAL_HANDLER | ||
| INVOKE_ASYNC(src, .proc/clean, source, target, user, clean_target) //signal handlers can't have do_afters inside of them | ||
|
|
||
| /** | ||
| * Cleans something using this cleaner. | ||
| * The cleaning duration is modified by the cleaning skill of the user. | ||
| * Successfully cleaning gives cleaning experience to the user and invokes the on_cleaned_callback. | ||
| * | ||
| * Arguments | ||
| * * source the datum that sent the signal to start cleaning | ||
| * * target the thing being cleaned | ||
| * * user the person doing the cleaning | ||
| * * clean_target set this to false if the target should not be washed | ||
| */ | ||
| /datum/component/cleaner/proc/clean(datum/source, atom/target, mob/living/user, clean_target = TRUE) | ||
| //add the cleaning overlay | ||
| //make sure we don't attempt to clean something while it's already being cleaned | ||
| if(HAS_TRAIT(target, CURRENTLY_CLEANING)) | ||
| return | ||
| //add the trait and overlay | ||
| ADD_TRAIT(target, CURRENTLY_CLEANING, REF(src)) | ||
| // We need to update our planes on overlay changes | ||
| RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(cleaning_target_moved)) | ||
| var/mutable_appearance/cleaning_bubbles = mutable_appearance('modular_dripstation/icons/effects/effects.dmi', "bubbles", FLOOR_CLEAN_LAYER, target, GAME_PLANE) | ||
| target.add_overlay(cleaning_bubbles) | ||
| //set the cleaning duration | ||
| var/cleaning_duration = base_cleaning_duration | ||
| //offsets the multiplier you get from cleaning skill, but doesn't allow the duration to be longer than the base duration | ||
| if(IS_JOB(user, "Janitor")) | ||
| cleaning_duration *= 0.8 | ||
| //do the cleaning | ||
| user.visible_message(span_notice("[user] starts to clean [target]!"), span_notice("You start to clean [target]...")) | ||
| var/clean_succeeded = FALSE | ||
| playsound(target, 'modular_dripstation/sound/effects/mop.ogg', 25, 1) | ||
| if(do_after(user, cleaning_duration, target = target)) | ||
| clean_succeeded = TRUE | ||
| user.visible_message(span_notice("[user] finishes cleaning [target]!"), span_notice("You finish cleaning [target].")) | ||
| 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 | ||
| if(istype(target, /obj/structure/window)) //window cleaning | ||
| target.set_opacity(initial(target.opacity)) | ||
| target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) | ||
| var/obj/structure/window/window = target | ||
| if(window.bloodied) | ||
| for(var/obj/effect/decal/cleanable/blood/iter_blood in window) | ||
| window.vis_contents -= iter_blood | ||
| qdel(iter_blood) | ||
| window.bloodied = FALSE | ||
| if(istype(target, /obj/machinery/door)) | ||
| var/obj/machinery/door/door = target | ||
| if(door.obj_flags && CMAGGED) | ||
| user.visible_message("[user] starts to clean the ooze off \the [door.name]'s access panel.", "You start to clean the ooze off \the [door.name]'s access panel.") | ||
| if(do_after(user, cleaning_duration, door)) | ||
| user.visible_message(span_notice("[user] finishes cleaning off access panel of [target]!"), span_notice("You clean the ooze off [target]'s access panel.")) | ||
| door.obj_flags &= ~CMAGGED | ||
| target.wash(cleaning_strength) | ||
|
|
||
| on_cleaned_callback?.Invoke(source, target, user, clean_target, clean_succeeded) | ||
| target.cut_overlay(cleaning_bubbles) | ||
| UnregisterSignal(target, COMSIG_MOVABLE_Z_CHANGED) | ||
| REMOVE_TRAIT(target, TRAIT_CURRENTLY_CLEANING, REF(src)) | ||
|
|
||
| /** | ||
| * Starts cleaning something by sending the COMSIG_START_CLEANING signal. | ||
| * This signal is received by the [cleaner component](code/datums/components/cleaner.html). | ||
| * | ||
| * Arguments | ||
| * * source the datum to send the signal from | ||
| * * target the thing being cleaned | ||
| * * 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 | ||
| */ | ||
| /atom/proc/start_cleaning(datum/source, atom/target, mob/living/user, clean_target = TRUE) | ||
| SEND_SIGNAL(source, COMSIG_START_CLEANING, target, user, clean_target) | ||
|
|
||
| /datum/component/cleaner/proc/cleaning_target_moved(atom/movable/source, turf/old_turf, turf/new_turf, same_z_layer) | ||
| if(same_z_layer) | ||
| return | ||
| // First, get rid of the old overlay | ||
| var/mutable_appearance/old_cleaning_bubbles = mutable_appearance('modular_dripstation/icons/effects/effects.dmi', "bubbles", FLOOR_CLEAN_LAYER, old_turf, GAME_PLANE) | ||
| source.cut_overlay(old_cleaning_bubbles) | ||
|
|
||
| // Now, add the new one | ||
| var/mutable_appearance/new_cleaning_bubbles = mutable_appearance('modular_dripstation/icons/effects/effects.dmi', "bubbles", FLOOR_CLEAN_LAYER, new_turf, GAME_PLANE) | ||
| source.add_overlay(new_cleaning_bubbles) |
Oops, something went wrong.