From 6cd660874c22cb3937c658fcdbb013d9187a164e Mon Sep 17 00:00:00 2001
From: Bone White <glaucus_adonis@hotmail.com>
Date: Tue, 28 Oct 2014 02:51:27 +0000
Subject: [PATCH] Civilian round-start fix (2)

Hopefully it works this time, tested locally as extensively as I can.

I have left a _very_ verbose debug line (103) in job_controller.dm which
should be commented out very soon.

Please keep var/Debug2 in global.dm set to 1 for the forseeable future,
to help diagnose job problems.
---
 code/game/jobs/job/civilian.dm   | 2 +-
 code/game/jobs/job_controller.dm | 6 ++----
 code/global.dm                   | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index b09f2cc3335..968736075f3 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -1,7 +1,7 @@
 /datum/job/civilian
 	title = "Civilian"
 	flag = CIVILIAN
-	department_flag = CIVILIAN
+	department_flag = SUPPORT
 	total_positions = -1
 	spawn_positions = -1
 	supervisors = "absolutely everyone"
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 8ccd40f49d1..3134dbc73c0 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -100,7 +100,7 @@ var/global/datum/controller/occupations/job_master
 		Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]")
 		var/list/candidates = list()
 		for(var/mob/new_player/player in unassigned)
-			//Debug("Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] Flag && Special: [flag && (!player.client.prefs.be_special & flag)] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
+			Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
 			if(jobban_isbanned(player, job.title))
 				Debug("FOC isbanned failed, Player: [player]")
 				continue
@@ -113,9 +113,6 @@ var/global/datum/controller/occupations/job_master
 			if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
 				Debug("FOC pass, Player: [player], Level:[level]")
 				candidates += player
-			else if(job.flag == CIVILIAN)
-				Debug("FOC pass, Player: [player], Level: **Civilian Autopass**")
-				candidates += player
 		return candidates
 
 	proc/GiveRandomJob(var/mob/new_player/player)
@@ -335,6 +332,7 @@ var/global/datum/controller/occupations/job_master
 						// 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]")
+							Debug(" - Job Flag: [job.flag] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Current Pos: [job.current_positions] Job Spawn Positions = [job.spawn_positions]")
 							AssignRole(player, job.title)
 							unassigned -= player
 							break
diff --git a/code/global.dm b/code/global.dm
index 98a81d2bf9f..249946633a9 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -201,7 +201,7 @@ var/list/adminlog = list()
 var/list/powernets = list()
 
 var/Debug = 0	// global debug switch
-var/Debug2 = 0
+var/Debug2 = 1   // enables detailed job debug file in secrets
 
 var/datum/debug/debugobj