From 2bb99394261ceb4d4c7cedfa1846f363ba1af4bb Mon Sep 17 00:00:00 2001 From: NightRed Date: Sat, 1 Aug 2020 12:51:00 -0500 Subject: [PATCH] do we have a holder (#52626) --- code/datums/traits/negative.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index dd2aa5f5601..6a444ebb7fe 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -249,8 +249,9 @@ SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "family_heirloom_missing", /datum/mood_event/family_heirloom_missing) /datum/quirk/family_heirloom/remove() - SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing") - SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "family_heirloom") + if(quirk_holder) // if the holder is still exists lets remove moods + SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing") + SEND_SIGNAL(quirk_holder, COMSIG_CLEAR_MOOD_EVENT, "family_heirloom") /datum/quirk/frail name = "Frail"