diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 1aa424ea887..8583521f854 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -548,7 +548,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c var/choice = alert("Would you like to select a hologram based on a (visible) crew member, switch to unique avatar, or load your character from your character slot?",,"Crew Member","Unique","My Character") switch(choice) - if("Crew Member") + if("Crew Member") //A seeable crew member (or a dog) var/list/targets = trackable_mobs() if(targets.len) input = input("Select a crew member:") as null|anything in targets //The definition of "crew member" is a little loose... @@ -561,7 +561,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c else alert("No suitable records found. Aborting.") - if("My Character") + if("My Character") //Loaded character slot if(!client || !client.prefs) return var/mob/living/carbon/human/dummy/dummy = new () //This doesn't include custom_items because that's ... hard. @@ -574,25 +574,30 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c qdel(dummy) holo_icon = new_holo - else //One from the dmi. + else //A premade from the dmi var/icon_list[] = list( - "default", - "floating face", - "carp", - "ian", - "runtime", - "poly", - "pun pun", - "male human", - "female human", - "male unathi", - "female unathi", - "male tajara", - "female tajara", - "male tesharii", - "female tesharii", - "male skrell", - "female skrell" + "default", + "floating face", + "singularity", + "drone", + "carp", + "spider", + "bear", + "slime", + "ian", + "runtime", + "poly", + "pun pun", + "male human", + "female human", + "male unathi", + "female unathi", + "male tajara", + "female tajara", + "male tesharii", + "female tesharii", + "male skrell", + "female skrell" ) input = input("Please select a hologram:") as null|anything in icon_list if(input) @@ -602,8 +607,18 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1")) if("floating face") holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo2")) + if("singularity") + holo_icon = getHologramIcon(icon('icons/obj/singularity.dmi',"singularity_s1")) + if("drone") + holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"drone0")) if("carp") holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo4")) + if("spider") + holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"nurse")) + if("bear") + holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"brownbear")) + if("slime") + holo_icon = getHologramIcon(icon('icons/mob/slimes.dmi',"cerulean adult slime")) if("ian") holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"corgi")) if("runtime") diff --git a/code/modules/mob/living/silicon/ai/icons.dm b/code/modules/mob/living/silicon/ai/icons.dm index ebd47cc02d7..2d8bc0d0026 100644 --- a/code/modules/mob/living/silicon/ai/icons.dm +++ b/code/modules/mob/living/silicon/ai/icons.dm @@ -28,11 +28,14 @@ var/list/datum/ai_icon/ai_icons name = "Red" alive_icon = "ai-red" alive_light = "#F04848" + dead_icon = "ai-red_dead" + dead_light = "#F04848" /datum/ai_icon/green name = "Green" alive_icon = "ai-wierd" alive_light = "#00FF99" + dead_icon = "ai-weird_dead" /datum/ai_icon/blue name = "Blue" @@ -44,6 +47,11 @@ var/list/datum/ai_icon/ai_icons alive_icon = "ai-angryface" alive_light = "#FFFF33" +/datum/ai_icon/angel + name = "Angel" + alive_icon = "ai-angel" + dead_icon = "ai-angel_dead" + /datum/ai_icon/bliss name = "Bliss" alive_icon = "ai-bliss" @@ -57,6 +65,7 @@ var/list/datum/ai_icon/ai_icons /datum/ai_icon/database name = "Database" alive_icon = "ai-database" + dead_icon = "ai-database_dead" /datum/ai_icon/dorf name = "Dorf" @@ -80,6 +89,8 @@ var/list/datum/ai_icon/ai_icons name = "Goon" alive_icon = "ai-goon" alive_light = "#3E5C80" + dead_icon = "ai-goon-crash" + dead_light = "#3E5C80" /datum/ai_icon/heartline name = "Heartline" @@ -91,6 +102,10 @@ var/list/datum/ai_icon/ai_icons alive_icon = "ai-helios" alive_light = "#F2CF73" +/datum/ai_icon/hourglass + name = "Hourglass" + alive_icon = "ai-hourglass" + /datum/ai_icon/inverted name = "Inverted" alive_icon = "ai-u" @@ -100,6 +115,7 @@ var/list/datum/ai_icon/ai_icons name = "Lonestar" alive_icon = "ai-lonestar" alive_light = "#58751C" + dead_icon = "ai-lonestar_dead" /datum/ai_icon/matrix name = "Matrix" @@ -110,6 +126,7 @@ var/list/datum/ai_icon/ai_icons name = "Monochrome" alive_icon = "ai-mono" alive_light = "#585858" + dead_icon = "ai-mono_dead" /datum/ai_icon/nanotrasen name = "NanoTrasen" @@ -128,13 +145,16 @@ var/list/datum/ai_icon/ai_icons /datum/ai_icon/soviet name = "Soviet" - alive_icon = "ai-redoctober" + alive_icon = "ai-soviet" alive_light = "#FF4307" + dead_icon = "ai-soviet_dead" + dead_light = "#FF4307" /datum/ai_icon/Static name = "Static" alive_icon = "ai-static" alive_light = "#4784C1" + alive_icon = "ai-static_dead" /datum/ai_icon/text name = "Text" @@ -143,6 +163,7 @@ var/list/datum/ai_icon/ai_icons /datum/ai_icon/trapped name = "Trapped" alive_icon = "ai-hades" + dead_icon = "ai-hades_dead" /datum/ai_icon/triumvirate_static name = "Triumvirate" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 0a50fc78cce..f16ead995dd 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -158,9 +158,19 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/standard name = "standard robot module" - sprites = list( "Basic" = "robot_old", + sprites = list( + "M-USE NanoTrasen" = "robot", + "Cabeiri" = "eyebot-standard", + "CUPCAKE" = "Noble-STD", + "Haruka" = "marinaSD", + "Usagi" = "tallflower", + "Telemachus" = "toiletbot", + "WTOperator" = "sleekstandard", + "WTOmni" = "omoikane", + "XI-GUS" = "spider", + "XI-ALP" = "heavyStandard", + "Basic" = "robot_old", "Android" = "droid", - "Default" = "robot", "Drone" = "drone-standard" ) @@ -181,8 +191,16 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/medical/surgeon name = "surgeon robot module" sprites = list( + "M-USE NanoTrasen" = "robotMedi", + "Cabeiri" = "eyebot-medical", + "CUPCAKE" = "Noble-MED", + "Haruka" = "marinaMD", + "Minako" = "arachne", + "Usagi" = "tallwhite", + "Telemachus" = "toiletbotsurgeon", + "WTOperator" = "sleekcmo", + "XI-ALP" = "heavyMed", "Basic" = "Medbot", - "Standard" = "surgeon", "Advanced Droid" = "droid-medical", "Needles" = "medicalrobot", "Drone" = "drone-surgery" @@ -230,8 +248,16 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/medical/crisis name = "crisis robot module" sprites = list( + "M-USE NanoTrasen" = "robotMedi", + "Cabeiri" = "eyebot-medical", + "CUPCAKE" = "Noble-MED", + "Haruka" = "marinaMD", + "Minako" = "arachne", + "Usagi" = "tallwhite", + "Telemachus" = "toiletbotmedical", + "WTOperator" = "sleekmedic", + "XI-ALP" = "heavyMed", "Basic" = "Medbot", - "Standard" = "surgeon", "Advanced Droid" = "droid-medical", "Needles" = "medicalrobot", "Drone - Medical" = "drone-medical", @@ -295,6 +321,15 @@ var/global/list/robot_modules = list( networks = list(NETWORK_ENGINEERING) subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor) sprites = list( + "M-USE NanoTrasen" = "robotEngi", + "Cabeiri" = "eyebot-engineering", + "CUPCAKE" = "Noble-ENG", + "Haruka" = "marinaENG", + "Usagi" = "tallyellow", + "Telemachus" = "toiletbotengineering", + "WTOperator" = "sleekce", + "XI-GUS" = "spidereng", + "XI-ALP" = "heavyEng", "Basic" = "Engineering", "Antique" = "engineerrobot", "Landmate" = "landmate", @@ -408,11 +443,19 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/security/general sprites = list( + "M-USE NanoTrasen" = "robotSecy", + "Cabeiri" = "eyebot-security", + "Cerberus" = "bloodhound", + "Cerberus - Treaded" = "treadhound", + "CUPCAKE" = "Noble-SEC", + "Haruka" = "marinaSC", + "Usagi" = "tallred", + "Telemachus" = "toiletbotsecurity", + "WTOperator" = "sleeksecurity", + "XI-GUS" = "spidersec", + "XI-ALP" = "heavySec", "Basic" = "secborg", - "Red Knight" = "Security", "Black Knight" = "securityrobot", - "Bloodhound" = "bloodhound", - "Bloodhound - Treaded" = "secborg+tread", "Drone" = "drone-sec" ) @@ -448,6 +491,13 @@ var/global/list/robot_modules = list( name = "janitorial robot module" channels = list("Service" = 1) sprites = list( + "M-USE NanoTrasen" = "robotJani", + "Cabeiri" = "eyebot-janitor", + "CUPCAKE" = "Noble-CLN", + "Haruka" = "marinaJN", + "Telemachus" = "toiletbotjanitor", + "WTOperator" = "sleekjanitor", + "XI-ALP" = "heavyRes", "Basic" = "JanBot2", "Mopbot" = "janitorrobot", "Mop Gear Rex" = "mopgearrex", @@ -488,11 +538,21 @@ var/global/list/robot_modules = list( ) /obj/item/weapon/robot_module/robot/clerical/butler - sprites = list( "Waitress" = "Service", - "Kent" = "toiletbot", + sprites = list( + "M-USE NanoTrasen" = "robotServ", + "Cabeiri" = "eyebot-standard", + "CUPCAKE" = "Noble-SRV", + "Haruka" = "marinaSV", + "Usagi" = "tallgreen", + "Telemachus" = "toiletbot", + "WTOperator" = "sleekservice", + "WTOmni" = "omoikane", + "XI-GUS" = "spider", + "XI-ALP" = "heavyServ", + "Standard" = "Service2", + "Waitress" = "Service", "Bro" = "Brobot", "Rich" = "maximillion", - "Default" = "Service2", "Drone - Service" = "drone-service", "Drone - Hydro" = "drone-hydro" ) @@ -532,12 +592,21 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/clerical/general name = "clerical robot module" sprites = list( + "M-USE NanoTrasen" = "robotCler", + "Cabeiri" = "eyebot-standard", + "CUPCAKE" = "Noble-SRV", + "Haruka" = "marinaSV", + "Usagi" = "tallgreen", + "Telemachus" = "toiletbot", + "WTOperator" = "sleekclerical", + "WTOmni" = "omoikane", + "XI-GUS" = "spidercom", + "XI-ALP" = "heavyServ", "Waitress" = "Service", - "Kent" = "toiletbot", "Bro" = "Brobot", "Rich" = "maximillion", "Default" = "Service2", - "Drone" = "drone-service" + "Drone" = "drone-blu" ) /obj/item/weapon/robot_module/robot/clerical/general/New() @@ -563,6 +632,14 @@ var/global/list/robot_modules = list( channels = list("Supply" = 1) networks = list(NETWORK_MINE) sprites = list( + "NM-USE NanoTrasen" = "robotMine", + "Cabeiri" = "eyebot-miner", + "CUPCAKE" = "Noble-DIG", + "Haruka" = "marinaMN", + "Telemachus" = "toiletbotminer", + "WTOperator" = "sleekminer", + "XI-GUS" = "spidermining", + "XI-ALP" = "heavyMiner", "Basic" = "Miner_old", "Advanced Droid" = "droid-miner", "Treadhead" = "Miner", @@ -586,6 +663,10 @@ var/global/list/robot_modules = list( name = "research module" channels = list("Science" = 1) sprites = list( + "L'Ouef" = "peaceborg", + "Cabeiri" = "eyebot-science", + "Haruka" = "marinaSCI", + "WTOperator" = "sleekscience", "Droid" = "droid-science", "Drone" = "drone-science" ) @@ -641,7 +722,13 @@ var/global/list/robot_modules = list( LANGUAGE_SIGN = 0 ) sprites = list( - "Dread" = "securityrobot", + "Cerberus" = "syndie_bloodhound", + "Cerberus - Treaded" = "syndie_treadhound", + "Ares" = "squats", + "Telemachus" = "toiletbotantag", + "WTOperator" = "hosborg", + "XI-GUS" = "spidersyndi", + "XI-ALP" = "syndi-heavy" ) var/id @@ -666,7 +753,10 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/robot/security/combat name = "combat robot module" hide_on_manifest = 1 - sprites = list("Combat Android" = "droid-combat") + sprites = list( + "Haruka" = "marinaCB", + "Combat Android" = "droid-combat" + ) /obj/item/weapon/robot_module/robot/security/combat/New() ..() @@ -774,4 +864,4 @@ var/global/list/robot_modules = list( var/obj/item/device/lightreplacer/LR = locate() in src.modules LR.Charge(R, amount) ..() - return + return \ No newline at end of file diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi index 7fe7877cdaa..f5fbc438a76 100644 Binary files a/icons/mob/AI.dmi and b/icons/mob/AI.dmi differ diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi index 89392d81f77..2b3dfe51d82 100644 Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ