Merge remote-tracking branch 'origin/master' into TGUI-3.0

2020-06-26 14:03:27 +03:00
parent 940ddaeeb6 a83a543bdf
commit 765ffdb1a1
56 changed files with 1695 additions and 69362 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)