From 715b1f85daf2d19ebd3bda4645d373a7a6675aeb Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Mon, 22 Jun 2020 15:53:55 -0500 Subject: [PATCH] prevents shunted AIs from doomsdaying (tg#51284) --- code/modules/antagonists/traitor/equipment/Malf_Modules.dm | 2 ++ code/modules/power/apc.dm | 1 + 2 files changed, 3 insertions(+) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 6616eea006..8e9a54a69a 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -257,6 +257,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( return if (active) return //prevent the AI from activating an already active doomsday + if (owner_AI.shunted) + return //prevent AI from activating doomsday while shunted. active = TRUE set_us_up_the_bomb(owner) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6772fe3cf1..7d0ecf3e66 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1141,6 +1141,7 @@ return if(!is_station_level(z)) return + malf.ShutOffDoomsdayDevice() occupier = new /mob/living/silicon/ai(src, malf.laws, malf) //DEAR GOD WHY? //IKR???? occupier.adjustOxyLoss(malf.getOxyLoss()) if(!findtext(occupier.name, "APC Copy"))