From 239b6cd62799efdf49c1e278a4d6de06310eefc3 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 27 Oct 2021 17:21:33 +0100 Subject: [PATCH] [MIRROR] [s] removes some ways of making unvaredited custom callbacks [MDB IGNORE] (#9071) * removes some ways of making unvaredited custom callbacks (#62345) * [s] removes some ways of making unvaredited custom callbacks Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> --- code/datums/components/mood.dm | 2 ++ code/modules/antagonists/cult/rune_spawn_action.dm | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 9b0cdaf05c1..c45879e259b 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -320,6 +320,8 @@ SIGNAL_HANDLER var/datum/mood_event/the_event + if(!ispath(type, /datum/mood_event)) + return if(!istext(category)) category = REF(category) if(mood_events[category]) diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm index 910b454607e..b18c08518cf 100644 --- a/code/modules/antagonists/cult/rune_spawn_action.dm +++ b/code/modules/antagonists/cult/rune_spawn_action.dm @@ -46,13 +46,13 @@ var/obj/effect/temp_visual/cult/rune_spawn/R1 = new(T, scribe_time, rune_color) //the rest are not always the same, so we need types for em var/obj/effect/temp_visual/cult/rune_spawn/R2 - if(rune_word_type) + if(ispath(rune_word_type, /obj/effect/temp_visual/cult/rune_spawn)) R2 = new rune_word_type(T, scribe_time, rune_color) var/obj/effect/temp_visual/cult/rune_spawn/R3 - if(rune_innerring_type) + if(ispath(rune_innerring_type, /obj/effect/temp_visual/cult/rune_spawn)) R3 = new rune_innerring_type(T, scribe_time, rune_color) var/obj/effect/temp_visual/cult/rune_spawn/R4 - if(rune_center_type) + if(ispath(rune_center_type, /obj/effect/temp_visual/cult/rune_spawn)) R4 = new rune_center_type(T, scribe_time, rune_color) cooldown = base_cooldown + world.time