Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

2019-08-24 13:50:22 +02:00
parent 4df4cbd721 62e931c62d
commit 5d1cac62da
764 changed files with 19287 additions and 6704 deletions
@@ -27,7 +27,7 @@
 	for(var/mob/living/carbon/human/H in mobs)
 		if(!moblocs)
 			break //locs aren't always unique, so this may come into play
-		do_teleport(H, moblocs[moblocs.len])
+		do_teleport(H, moblocs[moblocs.len], channel = TELEPORT_CHANNEL_MAGIC)
 		moblocs.len -= 1

 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)