From c1adecc0e2a5e67612bddac59439d7a7fe8e33f9 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sun, 4 Jun 2017 11:08:04 -0500
Subject: [PATCH] Fix AI status displays to use a list instead of the world
 list (#1391)

---
 code/_globalvars/lists/objects.dm            | 4 +++-
 code/game/machinery/status_display.dm        | 4 +++-
 code/modules/mob/living/silicon/ai/death.dm  | 4 ++--
 code/modules/mob/living/silicon/ai/login.dm  | 2 +-
 code/modules/mob/living/silicon/ai/logout.dm | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index e82976d4a3..81ad9d648e 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -32,4 +32,6 @@ GLOBAL_LIST_EMPTY(ladders)
 GLOBAL_LIST_EMPTY(trophy_cases)
 
 GLOBAL_LIST_EMPTY(wire_color_directory)
-GLOBAL_LIST_EMPTY(wire_name_directory)
\ No newline at end of file
+GLOBAL_LIST_EMPTY(wire_name_directory)
+
+GLOBAL_LIST_EMPTY(ai_status_displays)
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 2b46183efe..9ebd0e7563 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -45,12 +45,14 @@
 	// register for radio system
 
 /obj/machinery/status_display/Initialize()
-	..()
+	. = ..()
+	GLOB.ai_status_displays.Add(src)
 	SSradio.add_object(src, frequency)
 
 /obj/machinery/status_display/Destroy()
 	if(SSradio)
 		SSradio.remove_object(src,frequency)
+	GLOB.ai_status_displays.Remove(src)
 	return ..()
 
 // timed process
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index d21f0a221c..dbed880839 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -25,7 +25,7 @@
 		spawn(10)
 			explosion(src.loc, 3, 6, 12, 15)
 
-	for(var/obj/machinery/ai_status_display/O in world) //change status
+	for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status
 		if(src.key)
 			O.mode = 2
 			if(istype(loc, /obj/item/device/aicard))
@@ -42,4 +42,4 @@
 	if(doomsday_device)
 		doomsday_device.timing = FALSE
 		SSshuttle.clearHostileEnvironment(doomsday_device)
-		qdel(doomsday_device)
\ No newline at end of file
+		qdel(doomsday_device)
diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm
index aa009df4ef..faac6a0b8b 100644
--- a/code/modules/mob/living/silicon/ai/login.dm
+++ b/code/modules/mob/living/silicon/ai/login.dm
@@ -6,7 +6,7 @@
 		client.images += blood
 
 	if(stat != DEAD)
-		for(var/obj/machinery/ai_status_display/O in GLOB.machines) //change status
+		for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status
 			O.mode = 1
 			O.emotion = "Neutral"
 	view_core()
diff --git a/code/modules/mob/living/silicon/ai/logout.dm b/code/modules/mob/living/silicon/ai/logout.dm
index 4a2f99cfbf..46343e60ab 100644
--- a/code/modules/mob/living/silicon/ai/logout.dm
+++ b/code/modules/mob/living/silicon/ai/logout.dm
@@ -1,5 +1,5 @@
 /mob/living/silicon/ai/Logout()
 	..()
-	for(var/obj/machinery/ai_status_display/O in world) //change status
+	for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status
 		O.mode = 0
 	view_core()