From a02b93374a819bcbfc5b79c77fbb2523610d7d28 Mon Sep 17 00:00:00 2001 From: Tom <8881105+tf-4@users.noreply.github.com> Date: Sat, 18 Dec 2021 22:24:50 +0000 Subject: [PATCH] Adds SIGNAL_HANDLER to modular procs that were missing it (#10121) --- modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm | 1 + .../modules/emotes/code/additionalemotes/turf_emote.dm | 1 + modular_skyrat/modules/fishing/code/fishing.dm | 3 +++ modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm | 1 + .../pollution/code/temporary_pollution_emission_component.dm | 1 + .../modules/reagent_forging/code/reagent_component.dm | 3 +++ .../xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm | 1 + 7 files changed, 11 insertions(+) diff --git a/modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm b/modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm index 7bcf413c236..a181eaad0df 100644 --- a/modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm +++ b/modular_skyrat/modules/aesthetics/firealarm/code/firealarm.dm @@ -67,6 +67,7 @@ SEND_SIGNAL(src, COMSIG_FIREALARM_TRIGGER_DOORS) /obj/machinery/firealarm/proc/trigger_effects() + SIGNAL_HANDLER SEND_SIGNAL(src, COMSIG_FIREALARM_TRIGGERED_ON) /obj/machinery/firealarm/proc/untrigger_effects() diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm index 4c5b2b4d3a2..ca8af8571c0 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm @@ -210,6 +210,7 @@ var/current_turf return TRUE /datum/emote/living/mark_turf/proc/turf_owner(mob/living/user) + SIGNAL_HANDLER UnregisterSignal(user, COMSIG_MOVABLE_MOVED) var/obj/owned_turf = user.owned_turf diff --git a/modular_skyrat/modules/fishing/code/fishing.dm b/modular_skyrat/modules/fishing/code/fishing.dm index 12df9cbbe4c..ae401743615 100644 --- a/modular_skyrat/modules/fishing/code/fishing.dm +++ b/modular_skyrat/modules/fishing/code/fishing.dm @@ -44,6 +44,7 @@ GLOBAL_LIST_INIT(fishing_weights, list( return ..() /datum/component/fishing/proc/start_fishing() + SIGNAL_HANDLER var/random_fish_time = rand(3 SECONDS, 6 SECONDS) COOLDOWN_START(src, start_fishing_window, random_fish_time) COOLDOWN_START(src, stop_fishing_window, random_fish_time + 2 SECONDS) @@ -62,6 +63,7 @@ GLOBAL_LIST_INIT(fishing_weights, list( atom_parent.do_alert_animation() /datum/component/fishing/proc/finish_fishing(atom/fisher = null, master_involved = FALSE) + SIGNAL_HANDLER if(reel_sound_timer) deltimer(reel_sound_timer) if(mutate_parent) @@ -158,6 +160,7 @@ GLOBAL_LIST_INIT(fishing_weights, list( target_atom = null /obj/item/fishing_rod/proc/check_movement() + SIGNAL_HANDLER if(!listening_to) return if(!target_atom) diff --git a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm index 826bee516b6..c1dd3d27f3b 100644 --- a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm +++ b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm @@ -193,6 +193,7 @@ qdel(src) /datum/gunpoint/proc/SourceUpdatedResting(datum/datum_source, resting) + SIGNAL_HANDLER if(resting) qdel(src) diff --git a/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm b/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm index 4b344d370f3..322e344bcbf 100644 --- a/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm +++ b/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm @@ -28,6 +28,7 @@ qdel(src) /datum/component/temporary_pollution_emission/proc/wash_off() + SIGNAL_HANDLER if(ismob(parent)) to_chat(parent, span_notice("The smell that lingered on your body fades.")) qdel(src) diff --git a/modular_skyrat/modules/reagent_forging/code/reagent_component.dm b/modular_skyrat/modules/reagent_forging/code/reagent_component.dm index 34588e8f3da..e960f152700 100644 --- a/modular_skyrat/modules/reagent_forging/code/reagent_component.dm +++ b/modular_skyrat/modules/reagent_forging/code/reagent_component.dm @@ -35,11 +35,13 @@ return ..() /datum/component/reagent_clothing/proc/set_wearer() + SIGNAL_HANDLER if(!ishuman(parent_clothing.loc)) return cloth_wearer = parent_clothing.loc /datum/component/reagent_clothing/proc/remove_wearer() + SIGNAL_HANDLER cloth_wearer = null /datum/component/reagent_clothing/process(delta_time) @@ -79,6 +81,7 @@ return ..() /datum/component/reagent_weapon/proc/inject_attacked(datum/source, mob/living/target, mob/living/user, params) + SIGNAL_HANDLER if(!parent_weapon || !length(imbued_reagent)) return var/mob/living_target = target diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm index 31a1459de77..37fd8c66b30 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm @@ -237,6 +237,7 @@ listeningTo = null /obj/item/storage/bag/xenoarch/proc/pickup_rocks(mob/living/user) + SIGNAL_HANDLER var/show_message = FALSE var/turf/tile = user.loc if (!isturf(tile))