Merge pull request #12581 from Detective-Google/shunties

prevents shunted AIs from doomsdaying (tg#51284)
This commit is contained in:
silicons
2020-06-24 08:44:48 -07:00
committed by GitHub
2 changed files with 3 additions and 0 deletions
@@ -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)
+1
View File
@@ -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"))