Merge pull request #4416 from Citadel-Station-13/upstream-merge-33566

[MIRROR] Fixes race swap ruining rounds
2017-12-18 15:25:33 -06:00
parent ba5306c8fe ff030283e0
commit 7df9c3b5fc
1 changed files with 1 additions and 1 deletions
@@ -12,7 +12,7 @@

 	for(var/speciestype in subtypesof(/datum/species))
 		var/datum/species/S = new speciestype()
-		if(!S.dangerous_existence)
+		if(!S.dangerous_existence && !S.blacklisted)
 			all_species += speciestype

 	var/datum/species/new_species = pick(all_species)