Merge remote-tracking branch 'citadel/master' into the-p-o-o-l

2020-01-25 19:36:06 -07:00
parent c5f2eeef3b 603ab65ed1
commit dc3e5e24fd
34 changed files with 374 additions and 250 deletions
@@ -229,7 +229,7 @@
 			UnregisterSignal(mastermind, COMSIG_PRE_MIND_TRANSFER)
 			mastermind = null
 	if(cleanup)
-		var/obj/effect/vr_clean_master/cleanbot = locate() in get_area(M)
+		var/obj/effect/vr_clean_master/cleanbot = locate() in get_base_area(M)
 		if(cleanbot)
 			LAZYOR(cleanbot.corpse_party, M)
 		qdel(src)