From 59b609c79daa1f4cd7db3cd3673c32c47f177789 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 15 May 2017 10:36:56 -0500 Subject: [PATCH] Reverts favoring empty positions --- code/controllers/subsystem/job.dm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 32d53884f5..c37e10b28c 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -287,8 +287,6 @@ SUBSYSTEM_DEF(job) if(PopcapReached()) RejectPlayer(player) - var/datum/job/validjob - // Loop through all jobs for(var/datum/job/job in shuffledoccupations) // SHUFFLE ME BABY if(!job) @@ -315,19 +313,11 @@ SUBSYSTEM_DEF(job) // If the job isn't filled if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) + Debug("DO pass, Player: [player], Level:[level], Job:[job.title]") + AssignRole(player, job.title) + unassigned -= player + break - validjob = job - - //Is the Job empty? Stop Looking Then! - if (!job.current_positions) - break - - //Assign us the last job we found - if (validjob) - Debug("DO pass, Player: [player], Level:[level], Job:[validjob.title]") - AssignRole(player, validjob.title) - unassigned -= player - break // 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