From aee1f0bcb2ee1b36a342c09a2572186747e12400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Barou=C5=A1?= Date: Fri, 13 Nov 2020 20:19:40 +0100 Subject: [PATCH] Fixes Announcer mob Initialize hint and Destroy return and undefined var (#10539) --- code/modules/mob/living/announcer.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/announcer.dm b/code/modules/mob/living/announcer.dm index 6c09d0022ec..a6488b7b637 100755 --- a/code/modules/mob/living/announcer.dm +++ b/code/modules/mob/living/announcer.dm @@ -18,7 +18,6 @@ mob_thinks = FALSE universal_understand = TRUE - can_have_vision_cone = FALSE tesla_ignore = TRUE stop_sight_update = TRUE density = FALSE @@ -36,11 +35,13 @@ add_language(K) default_language = all_languages[LANGUAGE_TCB] + return INITIALIZE_HINT_NORMAL + /mob/living/announcer/Destroy() - // again not calling parent because it shouldn't be needed and makes this faster - SHOULD_CALL_PARENT(FALSE) - for(var/C in contents) + for(var/C in contents) // make doubly sure the contents don't get dropped on ground or something qdel(C) + // calling parent shouldn't be required, but let's do it just in case; contains cleanup stuff + return ..() /mob/living/announcer/proc/PrepareBroadcast(var/name = "", var/datum/language/lang = null, var/voice_name = null, var/accent = null) src.name = name