From 190e8bdd5a207d6bf37008253d1778e9d34c4f08 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 17 May 2020 09:40:39 -0400 Subject: [PATCH] Try to ensure some mobs don't end up processing in SSmobs --- code/_helpers/unsorted.dm | 5 +++++ code/modules/integrated_electronics/subtypes/output.dm | 1 + code/modules/mob/living/silicon/ai/ai.dm | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 2362ff1b3d..ec946e66bd 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1303,6 +1303,11 @@ var/mob/dview/dview_mob = new else living_mob_list -= src +/mob/dview/Life() + mob_list -= src + dead_mob_list -= src + living_mob_list -= src + /mob/dview/Destroy(var/force) crash_with("Attempt to delete the dview_mob: [log_info_line(src)]") if (!force) diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index 8745591d7f..5154804b05 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -152,6 +152,7 @@ /obj/item/integrated_circuit/output/text_to_speech/advanced/Initialize() ..() my_voice = new (src) + mob_list -= my_voice // no life() ticks my_voice.name = "TTS Circuit" /obj/item/integrated_circuit/output/text_to_speech/advanced/do_work() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 22707c6dbb..63564aaa53 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -985,9 +985,15 @@ var/list/ai_verbs_default = list( dead_mob_list -= src ai_list -= src silicon_mob_list -= src + QDEL_NULL(eyeobj) /mob/living/silicon/ai/announcer/Life() - return + mob_list -= src + living_mob_list -= src + dead_mob_list -= src + ai_list -= src + silicon_mob_list -= src + QDEL_NULL(eyeobj) #undef AI_CHECK_WIRELESS #undef AI_CHECK_RADIO