From b477178fdfbbad50721c1ecbeab8c2ff39d050d9 Mon Sep 17 00:00:00 2001 From: Neerti Date: Fri, 19 Apr 2019 01:55:08 -0400 Subject: [PATCH] Hides AI Shells from the manifest. --- code/datums/datacore.dm | 4 ++-- code/defines/obj.dm | 4 ++-- code/game/world.dm | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 45d50ced1d..1ece4c93a6 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -83,8 +83,8 @@ bot[ai.name] = "Artificial Intelligence" for(var/mob/living/silicon/robot/robot in mob_list) - // No combat/syndicate cyborgs, no drones. - if(!robot.scrambledcodes && !(robot.module && robot.module.hide_on_manifest)) + // No combat/syndicate cyborgs, no drones, and no AI shells. + if(!robot.scrambledcodes && !robot.shell && !(robot.module && robot.module.hide_on_manifest)) bot[robot.name] = "[robot.modtype] [robot.braintype]" diff --git a/code/defines/obj.dm b/code/defines/obj.dm index b7f4eb2243..6c3c26ef3a 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -143,8 +143,8 @@ var/global/list/PDA_Manifest = list() bot[++bot.len] = list("name" = ai.real_name, "rank" = "Artificial Intelligence", "active" = "Active") for(var/mob/living/silicon/robot/robot in mob_list) - // No combat/syndicate cyborgs, no drones. - if(robot.scrambledcodes || (robot.module && robot.module.hide_on_manifest)) + // No combat/syndicate cyborgs, no drones, and no AI shells. + if(robot.scrambledcodes || robot.shell || (robot.module && robot.module.hide_on_manifest)) continue bot[++bot.len] = list("name" = robot.real_name, "rank" = "[robot.modtype] [robot.braintype]", "active" = "Active") diff --git a/code/game/world.dm b/code/game/world.dm index 4bcc4c8f74..da14592a2b 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -181,7 +181,9 @@ var/world_topic_spam_protect_time = world.timeofday positions["bot"] = list() positions["bot"][ai.name] = "Artificial Intelligence" for(var/mob/living/silicon/robot/robot in mob_list) - // No combat/syndicate cyborgs, no drones. + // No combat/syndicate cyborgs, no drones, and no AI shells. + if(robot.shell) + continue if(robot.module && robot.module.hide_on_manifest) continue if(!positions["bot"])