From 2c275be1c10ca7283c4341cb6b3e70eb2e19ce45 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 9 Apr 2018 12:53:02 +0300 Subject: [PATCH 1/2] Fixes an heirloom trait-related runtime that gets spammed in the logs (#37036) * honk * return * Update negative.dm * Update _trait.dm --- code/datums/traits/_trait.dm | 1 + code/datums/traits/negative.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/traits/_trait.dm b/code/datums/traits/_trait.dm index 1b51d6a190..a0090a94fa 100644 --- a/code/datums/traits/_trait.dm +++ b/code/datums/traits/_trait.dm @@ -56,6 +56,7 @@ /datum/trait/process() if(QDELETED(trait_holder)) + trait_holder = null qdel(src) return if(trait_holder.stat == DEAD) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 8d161db9d5..dcaa4f4545 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -61,7 +61,7 @@ var/list/family_name = splittext(trait_holder.real_name, " ") heirloom.name = "\improper [family_name[family_name.len]] family [heirloom.name]" -/datum/trait/family_heirloom/process() +/datum/trait/family_heirloom/on_process() if(heirloom in trait_holder.GetAllContents()) trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing") trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)