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
@@ -1136,6 +1136,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"))