From 9c60de46a10bf6b676387e663b0619c0ab5c2e86 Mon Sep 17 00:00:00 2001 From: Blue Wildrose Date: Wed, 16 Dec 2020 18:45:41 -0700 Subject: [PATCH] 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)