From 4f4e129bc226d50453dafce8e11159adb64bafa4 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 7 Jul 2018 00:05:08 -0400 Subject: [PATCH] Merge pull request #38937 from AnturK/morequirkshit Fixes quirk removal runtimes. --- code/datums/traits/good.dm | 7 ++++--- code/datums/traits/neutral.dm | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index ff3cb85b278d..05b9fd8332b9 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -23,9 +23,10 @@ mood.mood_modifier = 0.8 /datum/quirk/apathetic/remove() - GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder) - if(mood) - mood.mood_modifier = 1 //Change this once/if species get their own mood modifiers. + if(quirk_holder) + GET_COMPONENT_FROM(mood, /datum/component/mood, quirk_holder) + if(mood) + mood.mood_modifier = 1 //Change this once/if species get their own mood modifiers. diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 8ef9bf0a1122..0d57b3694fc8 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -26,8 +26,9 @@ /datum/quirk/pineapple_liker/remove() var/mob/living/carbon/human/H = quirk_holder - var/datum/species/species = H.dna.species - species.liked_food &= ~PINEAPPLE + if(H) + var/datum/species/species = H.dna.species + species.liked_food &= ~PINEAPPLE /datum/quirk/pineapple_hater name = "Ananas Aversion" @@ -43,8 +44,9 @@ /datum/quirk/pineapple_hater/remove() var/mob/living/carbon/human/H = quirk_holder - var/datum/species/species = H.dna.species - species.disliked_food &= ~PINEAPPLE + if(H) + var/datum/species/species = H.dna.species + species.disliked_food &= ~PINEAPPLE /datum/quirk/deviant_tastes name = "Deviant Tastes" @@ -62,9 +64,10 @@ /datum/quirk/deviant_tastes/remove() var/mob/living/carbon/human/H = quirk_holder - var/datum/species/species = H.dna.species - species.liked_food = initial(species.liked_food) - species.disliked_food = initial(species.disliked_food) + if(H) + var/datum/species/species = H.dna.species + species.liked_food = initial(species.liked_food) + species.disliked_food = initial(species.disliked_food) @@ -83,4 +86,5 @@ quirk_holder.playsound_local(quirk_holder, 'sound/ambience/ambidet1.ogg', 50, FALSE) /datum/quirk/monochromatic/remove() - quirk_holder.remove_client_colour(/datum/client_colour/monochrome) + if(quirk_holder) + quirk_holder.remove_client_colour(/datum/client_colour/monochrome)