diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 149b869649..0659655da5 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) @@ -327,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)