Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/game/gamemodes/game_mode.dm

@@ -24,6 +24,7 @@
 	var/list/datum/mind/antag_candidates = list()	// List of possible starting antags goes here
 	var/list/restricted_jobs = list()	// Jobs it doesn't make sense to be.  I.E chaplain or AI cultist
 	var/list/protected_jobs = list()	// Jobs that can't be traitors because
+	var/list/required_jobs = list()		// alternative required job groups eg list(list(cap=1),list(hos=1,sec=2)) translates to one captain OR one hos and two secmans
 	var/required_players = 0
 	var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations
 	var/required_enemies = 0
@@ -355,7 +356,7 @@
 
 	// Ultimate randomizing code right here
 	for(var/mob/dead/new_player/player in GLOB.player_list)
-		if(player.client && player.ready == PLAYER_READY_TO_PLAY)
+		if(player.client && player.ready == PLAYER_READY_TO_PLAY && player.check_preferences())
 			players += player
 
 	// Shuffling, the players list is now ping-independent!!!

code/game/machinery/limbgrower.dm

@@ -27,12 +27,10 @@
 							"human",
 							"lizard",
 							"fly",
-							"moth",
+							"insect",
 							"plasmaman",
 							"mammal",
-							"aquatic",
-							"insect",
-							"xenoperson",
+							"xeno",
 							"other"
 							)