diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 0ac8a61183..e2705ad49f 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -46,10 +46,15 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list( ":thinking:", "Alien", "Angel", + "Angryface", + "AtlantisCZE", "Banned", "Bliss", "Blue", - "Clown", + "Boy", + "Boy-Malf", + "Girl", + "Girl-Malf", "Database", "Dorf", "Firewall", @@ -61,26 +66,44 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list( "Hades", "Heartline", "Helios", + "Hotdog", + "Hourglass", "House", "Inverted", + "Jack", "Matrix", "Monochrome", + "Mothman", "Murica", "Nanotrasen", "Not Malf", + "Patriot", + "Pirate", "President", - "Random", "Rainbow", - "Red", + "Clown", + "Random", + "Ravensdale", "Red October", + "Red", + "Royal", + "Searif", + "Serithi", + "SilveryFerret", + "Smiley", "Static", "Syndicat Meow", "TechDemon", + "Terminal", "Text", "Too Deep", "Triumvirate", "Triumvirate-M", - "Weird")) + "Wasp", + "Weird", + "Xerxes", + "Yes-Man" + )) /proc/resolve_ai_icon(input) if(!input || !(input in GLOB.ai_core_display_screens)) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 1835d2464a..cc0e7c6cda 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -36,7 +36,7 @@ var/can_be_carded = TRUE var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list(), "Burglar"=list()) var/viewalerts = 0 - var/icon/holo_icon//Default is assigned when AI is created. + var/icon/holo_icon//Female is assigned when AI is created. var/obj/mecha/controlled_mech //For controlled_mech a mech, to determine whether to relaymove or use the AI eye. var/radio_enabled = TRUE //Determins if a carded AI can speak with its built in radio or not. radiomod = ";" //AIs will, by default, state their laws on the internal radio. @@ -130,7 +130,7 @@ set_core_display_icon() - holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default")) + holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"female")) spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(5, 0, src) @@ -670,10 +670,13 @@ holo_icon = getHologramIcon(icon(icon_list[input], input)) else var/list/icon_list = list( - "default" = 'icons/mob/ai.dmi', + "female" = 'icons/mob/ai.dmi', + "male" = 'icons/mob/ai.dmi', "floating face" = 'icons/mob/ai.dmi', + "green face" = 'icons/mob/ai.dmi', "xeno queen" = 'icons/mob/alien.dmi', - "horror" = 'icons/mob/ai.dmi' + "horror" = 'icons/mob/ai.dmi', + "creature" = 'icons/mob/ai.dmi' ) input = input("Please select a hologram:") as null|anything in icon_list diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi index bdf54e36e5..39f4d12268 100644 Binary files a/icons/mob/AI.dmi and b/icons/mob/AI.dmi differ