Antagonist at lobby no more

code/controllers/subsystem/SSjobs.dm

@@ -409,16 +409,15 @@ SUBSYSTEM_DEF(jobs)
 						unassigned -= player
 						break
 
+	Debug("DO, Standard Check end")
+	Debug("DO, Running Alternate Check")
+
 	// Hand out random jobs to the people who didn't get any in the last check
 	// Also makes sure that they got their preference correct
 	for(var/mob/new_player/player in unassigned)
 		if(player.client.prefs.active_character.alternate_option == GET_RANDOM_JOB)
 			GiveRandomJob(player)
 
-	Debug("DO, Standard Check end")
-
-	Debug("DO, Running AC2")
-
 	// Antags, who have to get in, come first
 	for(var/mob/new_player/player in unassigned)
 		if(player.mind.special_role)
@@ -434,10 +433,14 @@ SUBSYSTEM_DEF(jobs)
 
 	// Then we assign what we can to everyone else.
 	for(var/mob/new_player/player in unassigned)
-		if(player.client.prefs.active_character.alternate_option == BE_ASSISTANT)
-			Debug("AC2 Assistant located, Player: [player]")
+		if(player.client.prefs.active_character.alternate_option != RETURN_TO_LOBBY)
+			Debug("AC unemployed located, assigning assistant, Player: [player]")
+			AssignRole(player, "Assistant")
+		else if(player.mind.special_role)
+			Debug("AC unemployed antagonist located, force assigning assistant, Player: [player]")
 			AssignRole(player, "Assistant")
-		else if(player.client.prefs.active_character.alternate_option == RETURN_TO_LOBBY)
+		else
+			Debug("AC unemployed located, return to lobby, Player: [player]")
 			player.ready = FALSE
 			unassigned -= player