diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 10c87301114..84c300002bd 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -645,7 +645,7 @@ #define AI_EMOTION_UNSURE "Unsure" #define AI_EMOTION_CONFUSED "Confused" #define AI_EMOTION_SAD "Sad" -#define AI_EMOTION_BSOD "BSOD" +#define AI_EMOTION_BSOD "BSOD" //It is used only on EMP pulse displays. #define AI_EMOTION_BLANK "Blank" #define AI_EMOTION_PROBLEMS "Problems?" #define AI_EMOTION_AWESOME "Awesome" @@ -655,6 +655,8 @@ #define AI_EMOTION_DORFY "Dorfy" #define AI_EMOTION_BLUE_GLOW "Blue Glow" #define AI_EMOTION_RED_GLOW "Red Glow" +#define AI_EMOTION_DEAD "Dead" //This one is used when deactivating the AI +#define AI_EMOTION_DOWNLOAD "Download" // Defines for AI holograms #define AI_HOLOGRAM_CATEGORY_ANIMAL "Animal" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 04d263ec959..1c0d9818b27 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -777,7 +777,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/ai, 32) icon_state = GLOB.ai_status_display_emotes[emotion] // Default fallback else - icon_state = "ai_neutral" + icon_state = "ai_download" set_picture(icon_state) return PROCESS_KILL diff --git a/code/modules/mob/living/silicon/ai/_preferences.dm b/code/modules/mob/living/silicon/ai/_preferences.dm index d790c7d6511..7841b42f839 100644 --- a/code/modules/mob/living/silicon/ai/_preferences.dm +++ b/code/modules/mob/living/silicon/ai/_preferences.dm @@ -4,7 +4,6 @@ GLOBAL_LIST_INIT(ai_status_display_emotes, list( AI_EMOTION_AWESOME = "ai_awesome", AI_EMOTION_BLANK = AI_DISPLAY_DONT_GLOW, AI_EMOTION_BLUE_GLOW = "ai_sal", - AI_EMOTION_BSOD = "ai_bsod", AI_EMOTION_CONFUSED = "ai_confused", AI_EMOTION_DORFY = "ai_urist", AI_EMOTION_FACEPALM = "ai_facepalm", @@ -17,6 +16,8 @@ GLOBAL_LIST_INIT(ai_status_display_emotes, list( AI_EMOTION_THINKING = "ai_thinking", AI_EMOTION_UNSURE = "ai_unsure", AI_EMOTION_VERY_HAPPY = "ai_veryhappy", + AI_EMOTION_DEAD = "ai_dead", + AI_EMOTION_DOWNLOAD = "ai_download", )) // Mapping from AI core display options to new status display icon states diff --git a/code/modules/mob/living/silicon/ai/ai_status_display_picker.dm b/code/modules/mob/living/silicon/ai/ai_status_display_picker.dm index e88fc60c92a..72a31d75e41 100644 --- a/code/modules/mob/living/silicon/ai/ai_status_display_picker.dm +++ b/code/modules/mob/living/silicon/ai/ai_status_display_picker.dm @@ -77,9 +77,9 @@ else if(current_emotion in GLOB.ai_core_to_status_display_mapping) current_icon_state = GLOB.ai_core_to_status_display_mapping[current_emotion] else - current_icon_state = "ai_neutral" + current_icon_state = "ai_download" else - current_icon_state = "ai_neutral" + current_icon_state = "ai_download" data["current_emotion"] = current_emotion data["current_icon"] = list( diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index fb769563ef3..aad3df39d80 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -4,7 +4,7 @@ if(!gibbed) // Will update all AI status displays with a blue screen of death - INVOKE_ASYNC(src, PROC_REF(emote), "bsod") + INVOKE_ASYNC(src, PROC_REF(emote), "dead") if(!isnull(deployed_shell)) disconnect_shell() diff --git a/code/modules/mob/living/silicon/ai/emote.dm b/code/modules/mob/living/silicon/ai/emote.dm index c4ec04e0899..c73a2b95c0d 100644 --- a/code/modules/mob/living/silicon/ai/emote.dm +++ b/code/modules/mob/living/silicon/ai/emote.dm @@ -39,6 +39,14 @@ key = "bsod" emotion = AI_EMOTION_BSOD +/datum/emote/ai/emotion_display/dead + key = "dead" + emotion = AI_EMOTION_DEAD + +/datum/emote/ai/emotion_display/download + key = "download" + emotion = AI_EMOTION_DOWNLOAD + /datum/emote/ai/emotion_display/trollface key = "trollface" emotion = AI_EMOTION_PROBLEMS diff --git a/icons/obj/machines/status_display.dmi b/icons/obj/machines/status_display.dmi index 2fa55c8436b..33cff692557 100644 Binary files a/icons/obj/machines/status_display.dmi and b/icons/obj/machines/status_display.dmi differ