From 9c60de46a10bf6b676387e663b0619c0ab5c2e86 Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Wed, 16 Dec 2020 18:45:41 -0700 Subject: [PATCH 1/3] Prevent AI from doomsdaying while carded --- code/modules/antagonists/traitor/equipment/Malf_Modules.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 149b869649..00bb8b5633 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -261,6 +261,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( return //prevent the AI from activating an already active doomsday if (owner_AI.shunted) return //prevent AI from activating doomsday while shunted. + if (istype(owner.loc, /obj/item/aicard)) + return //prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then. active = TRUE set_us_up_the_bomb(owner) From d4d5e53cb6212b12891ce7f1ac6d4d07a441b206 Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Wed, 16 Dec 2020 19:27:04 -0700 Subject: [PATCH 2/3] go away Travis --- code/modules/antagonists/traitor/equipment/Malf_Modules.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 00bb8b5633..3ffe644775 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -262,7 +262,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if (owner_AI.shunted) return //prevent AI from activating doomsday while shunted. if (istype(owner.loc, /obj/item/aicard)) - return //prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then. + return // prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then. active = TRUE set_us_up_the_bomb(owner) From 98b1de5536b55de640ac7f79322409e81194962b Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Fri, 18 Dec 2020 22:56:39 -0700 Subject: [PATCH 3/3] oh yes we don't want that do we? --- code/modules/antagonists/traitor/equipment/Malf_Modules.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 3ffe644775..0659655da5 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -262,7 +262,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if (owner_AI.shunted) return //prevent AI from activating doomsday while shunted. if (istype(owner.loc, /obj/item/aicard)) - return // prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then. + return //prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then. active = TRUE set_us_up_the_bomb(owner) @@ -329,6 +329,10 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( sleep(30) if(QDELETED(owner) || owner.stat == DEAD) return + if(istype(owner.loc, /obj/item/aicard)) + to_chat(owner, "Error: Signal transmission failed. Reason: Lost connection to network.") + to_chat(owner, "You can't activate the doomsday device while inside an intelliCard!") + return priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", "aimalf") set_security_level("delta") var/obj/machinery/doomsday_device/DOOM = new(owner_AI)