squashed

code/__DEFINES/department.dm

@@ -1,29 +1,35 @@
+// station departments
+#define DEPT_NAME_COMMAND "Command"
 #define DEPT_BITFLAG_COM (1<<0)
-#define DEPARTMENT_COMMAND "Command"
+#define DEPT_NAME_CIVILIAN "Civilian"
 #define DEPT_BITFLAG_CIV (1<<1)
-#define DEPARTMENT_CIVILIAN "Civilian"
+#define DEPT_NAME_SERVICE "Service"
 #define DEPT_BITFLAG_SRV (1<<2)
-#define DEPARTMENT_SERVICE "Service"
+#define DEPT_NAME_CARGO "Cargo"
 #define DEPT_BITFLAG_CAR (1<<3)
-#define DEPARTMENT_CARGO "Cargo"
+#define DEPT_NAME_SCIENCE "Science"
 #define DEPT_BITFLAG_SCI (1<<4)
-#define DEPARTMENT_SCIENCE "Science"
+#define DEPT_NAME_ENGINEERING "Engineering"
 #define DEPT_BITFLAG_ENG (1<<5)
-#define DEPARTMENT_ENGINEERING "Engineering"
+#define DEPT_NAME_MEDICAL "Medical"
 #define DEPT_BITFLAG_MED (1<<6)
-#define DEPARTMENT_MEDICAL "Medical"
+#define DEPT_NAME_SECURITY "Security"
 #define DEPT_BITFLAG_SEC (1<<7)
-#define DEPARTMENT_SECURITY "Security"
+#define DEPT_NAME_VIP "VIP"
 #define DEPT_BITFLAG_VIP (1<<8)
-#define DEPARTMENT_VIP "VIP"
+#define DEPT_NAME_SILICON "Silicon"
 #define DEPT_BITFLAG_SILICON  (1<<9)
-#define DEPARTMENT_SILICON "Silicon"
-#define DEPT_BITFLAG_CENTCOM (1<<10)
-#define DEPARTMENT_CENTCOM "CentCom"
-#define DEPT_BITFLAG_OTHER (1<<11)
-#define DEPARTMENT_OTHER "Other"
-#define DEPT_BITFLAG_CAPTAIN (1<<12)
-#define DEPARTMENT_CAPTAIN
+#define DEPT_NAME_UNASSIGNED "Misc"
+#define DEPT_BITFLAG_UNASSIGNED (1<<10)
+
+#define DEPT_NAME_CENTCOM "CentCom"
+#define DEPT_BITFLAG_CENTCOM (1<<11)
+#define DEPT_NAME_OTHER "Other"
+#define DEPT_BITFLAG_OTHER (1<<12)
+
+// not real department. These exist for pref grouping
+#define DEPT_NAME_ASSISTANT "Assistant"
+#define DEPT_NAME_CAPTAIN "Captain"
 
 
 // Crew Manifest will show crew data in this order
@@ -39,15 +45,16 @@
 #define DEPT_MANIFEST_ORDER_SERVICE 70
 #define DEPT_MANIFEST_ORDER_CIVILIAN 80
 #define DEPT_MANIFEST_ORDER_SILICON 90
-#define DEPT_MANIFEST_ORDER_OTHER 999 // not used but just in case
+#define DEPT_MANIFEST_ORDER_UNASSIGNED 666 // dummy department for people with no department
 
 
-#define DEPT_PREF_ORDER_COMMAND 10
-#define DEPT_PREF_ORDER_SECURITY 20
+// used for /mob/dead/new_player/proc/LateChoices()
+#define DEPT_PREF_ORDER_COMMAND 	10
+#define DEPT_PREF_ORDER_SECURITY 	20
 #define DEPT_PREF_ORDER_ENGINEERING 30
-#define DEPT_PREF_ORDER_MEDICAL 40
-#define DEPT_PREF_ORDER_SCIENCE 50
-#define DEPT_PREF_ORDER_CARGO 60
-#define DEPT_PREF_ORDER_SERVICE 70
-#define DEPT_PREF_ORDER_CIVILIAN 80
-#define DEPT_PREF_ORDER_SILICON 90
+#define DEPT_PREF_ORDER_MEDICAL 	40
+#define DEPT_PREF_ORDER_SCIENCE 	50
+#define DEPT_PREF_ORDER_CARGO 		60
+#define DEPT_PREF_ORDER_SERVICE 	70
+#define DEPT_PREF_ORDER_CIVILIAN 	80
+#define DEPT_PREF_ORDER_SILICON 	90

code/__HELPERS/jobs.dm

@@ -249,13 +249,3 @@ GLOBAL_LIST_INIT(command_huds, list(
 		JOB_HUD_UNKNOWN = JOB_CHATCOLOR_UNKNOWN
 	)
 	return hud_to_chatcolor[jobname] || JOB_CHATCOLOR_UNKNOWN
-
-/proc/get_job_departments(field)
-	. = list()
-	for(var/flag in GLOB.bitflags)
-		var/key = "[flag]"
-		var/department = SSdepartment.department_bitflag_to_name[key]
-		if(!department || !SSdepartment.departments[department])
-			continue
-		if(CHECK_BITFIELD(field, flag))
-			. += department