Some other code now uses ai status display list (#1506)

This commit is contained in:
CitadelStationBot
2017-06-13 15:43:04 -05:00
committed by kevinz000
parent 64f9c2f8cc
commit 16f968f5e5
2 changed files with 9 additions and 2 deletions
+8
View File
@@ -213,6 +213,14 @@
var/emotion = "Neutral"
/obj/machinery/ai_status_display/Initialize()
. = ..()
GLOB.ai_status_displays.Add(src)
/obj/machinery/ai_status_display/Destroy()
GLOB.ai_status_displays.Remove(src)
. = ..()
/obj/machinery/ai_status_display/attack_ai(mob/living/silicon/ai/user)
if(isAI(user))
user.ai_statuschange()
+1 -2
View File
@@ -632,13 +632,12 @@
return //won't work if dead
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer", "Dorfy", "Blue Glow", "Red Glow")
var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
for (var/obj/machinery/M in GLOB.machines) //change status
for (var/M in GLOB.ai_status_displays) //change status of displays
if(istype(M, /obj/machinery/ai_status_display))
var/obj/machinery/ai_status_display/AISD = M
AISD.emotion = emote
//if Friend Computer, change ALL displays
else if(istype(M, /obj/machinery/status_display))
var/obj/machinery/status_display/SD = M
if(emote=="Friend Computer")
SD.friendc = 1