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

2020-03-21 21:41:34 +01:00
parent 4c87f2256c cb537f431b
commit 2045fb86f6
305 changed files with 160783 additions and 6683 deletions
@@ -163,7 +163,7 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)

 	for(var/mob/living/carbon/human/H in GLOB.player_list)
 		var/turf/T = get_turf(H)
-		if(T && is_away_level(T.z))
+		if((T && is_away_level(T.z)) || HAS_TRAIT(H, TRAIT_NO_MIDROUND_ANTAG))
 			continue
 		if(summon_type == SUMMON_MAGIC)
 			give_magic(H)