Remove the cargo department

code/game/jobs/job_controller.dm

@@ -52,8 +52,6 @@ var/global/datum/controller/occupations/job_master
 				GLOB.supply_positions |= job.title
 			if(job.department_flag & SRV)
 				GLOB.service_positions |= job.title
-			if(job.department_flag & CRG)
-				GLOB.cargo_positions |= job.title
 			if(job.department_flag & CIV)
 				GLOB.civilian_positions |= job.title
 			if(job.department_flag & MSC)

code/game/jobs/jobs.dm

@@ -4,12 +4,11 @@ var/const/MED               =(1<<2)
 var/const/SCI               =(1<<3)
 var/const/CIV               =(1<<4)
 var/const/COM               =(1<<5)
-var/const/CRG               =(1<<6)
-var/const/MSC               =(1<<7)
-var/const/SRV               =(1<<8)
-var/const/SUP               =(1<<9)
-var/const/SPT               =(1<<10)
-var/const/EXP               =(1<<11)
+var/const/MSC               =(1<<6)
+var/const/SRV               =(1<<7)
+var/const/SUP               =(1<<8)
+var/const/SPT               =(1<<9)
+var/const/EXP               =(1<<10)
 
 GLOBAL_LIST_EMPTY(assistant_occupations)
 
@@ -21,8 +20,6 @@ GLOBAL_LIST_EMPTY(medical_positions)
 
 GLOBAL_LIST_EMPTY(science_positions)
 
-GLOBAL_LIST_EMPTY(cargo_positions)
-
 GLOBAL_LIST_EMPTY(civilian_positions)
 
 GLOBAL_LIST_EMPTY(security_positions)
@@ -37,6 +34,8 @@ GLOBAL_LIST_EMPTY(support_positions)
 
 GLOBAL_LIST_EMPTY(exploration_positions)
 
+GLOBAL_LIST_EMPTY(unsorted_positions) // for nano manifest
+
 
 /proc/guest_jobbans(var/job)
 	return ((job in GLOB.command_positions) || (job in GLOB.nonhuman_positions) || (job in GLOB.security_positions))

code/game/machinery/pager.dm

@@ -64,5 +64,5 @@
 /obj/machinery/pager/medical
 	department = MED
 
-/obj/machinery/pager/cargo
-	department = CRG
+/obj/machinery/pager/cargo //supply
+	department = SUP

code/modules/modular_computers/file_system/crew_record.dm

@@ -133,7 +133,6 @@ GLOBAL_VAR_INIT(arrest_security_status, "Arrest")
 	var/list/eng = new()
 	var/list/med = new()
 	var/list/sci = new()
-	var/list/car = new()
 	var/list/civ = new()
 	var/list/bot = new()
 	var/list/misc = new()
@@ -206,9 +205,6 @@ GLOBAL_VAR_INIT(arrest_security_status, "Arrest")
 		if(job.department_flag & EXP)
 			exp[name] = rank
 			department = 1
-		if(job.department_flag & CRG)
-			car[name] = rank
-			department = 1
 		if(job.department_flag & CIV)
 			civ[name] = rank
 			department = 1
@@ -268,11 +264,6 @@ GLOBAL_VAR_INIT(arrest_security_status, "Arrest")
 		for(var/name in sup)
 			dat += "<tr[even ? " class='alt'" : ""]><td>[mil_ranks[name]][name]</td><td>[sup[name]]</td><td>[isactive[name]]</td></tr>"
 			even = !even
-	if(car.len > 0)
-		dat += "<tr><th colspan=3>Cargo</th></tr>"
-		for(var/name in car)
-			dat += "<tr[even ? " class='alt'" : ""]><td>[mil_ranks[name]][name]</td><td>[car[name]]</td><td>[isactive[name]]</td></tr>"
-			even = !even
 	if(exp.len > 0)
 		dat += "<tr><th colspan=3>Exploration</th></tr>"
 		for(var/name in exp)
@@ -346,12 +337,11 @@ GLOBAL_VAR_INIT(arrest_security_status, "Arrest")
 		"eng" = filtered_nano_crew_manifest(GLOB.engineering_positions),\
 		"med" = filtered_nano_crew_manifest(GLOB.medical_positions),\
 		"sup" = filtered_nano_crew_manifest(GLOB.supply_positions),\
-		"car" = filtered_nano_crew_manifest(GLOB.cargo_positions),\
 		"exp" = filtered_nano_crew_manifest(GLOB.exploration_positions),\
 		"srv" = filtered_nano_crew_manifest(GLOB.service_positions),\
-		"bot" = silicon_nano_crew_manifest(GLOB.cargo_positions),\
+		"bot" = silicon_nano_crew_manifest(GLOB.nonhuman_positions),\
 		"civ" = filtered_nano_crew_manifest(GLOB.civilian_positions),\
-		"misc" = filtered_nano_crew_manifest(GLOB.cargo_positions)\
+		"misc" = filtered_nano_crew_manifest(GLOB.unsorted_positions)\
 		)
 
 /proc/get_crewmember_record(var/name)

code/procs/announce.dm

@@ -125,7 +125,7 @@ datum/announcement/proc/NewsCast(message as text, message_title as text)
 
 	if(job.department_flag & (COM | CIV | MSC))
 		return "Common"
-	if(job.department_flag & (SUP | CRG))
+	if(job.department_flag & SUP)
 		return "Supply"
 	if(job.department_flag & SPT)
 		return "Command"

test/check-paths.sh

@@ -2,7 +2,7 @@
 set -e
 
 WORLD_LOG_COUNT=46
-ANGLE_BRACKET_COUNT=722
+ANGLE_BRACKET_COUNT=721
 
 FAILED=0