MROWL

code/game/jobs/job/assistant_vr.dm

@@ -1,7 +1,7 @@
 /datum/job/intern
 	title = "Intern"
 	flag = INTERN
-	department = "Civilian"
+	departments = list(DEPARTMENT_CIVILIAN)
 	department_flag = ENGSEC // Ran out of bits
 	faction = "Station"
 	total_positions = -1

code/game/jobs/job/offduty_vr.dm

@@ -8,7 +8,7 @@
 	timeoff_factor = -1
 	total_positions = -1
 	faction = "Station"
-	department = "Civilian"
+	departments = list(DEPARTMENT_CIVILIAN)
 	supervisors = "nobody! Enjoy your time off"
 	selection_color = "#9b633e"
 	access = list(access_maint_tunnels)
@@ -21,7 +21,7 @@
 	timeoff_factor = -1
 	total_positions = -1
 	faction = "Station"
-	department = "Cargo"
+	departments = list(DEPARTMENT_CARGO)
 	supervisors = "nobody! Enjoy your time off"
 	selection_color = "#9b633e"
 	access = list(access_maint_tunnels)
@@ -34,7 +34,7 @@
 	timeoff_factor = -1
 	total_positions = -1
 	faction = "Station"
-	department = "Engineering"
+	departments = list(DEPARTMENT_ENGINEERING)
 	supervisors = "nobody! Enjoy your time off"
 	selection_color = "#5B4D20"
 	access = list(access_maint_tunnels, access_external_airlocks, access_construction)
@@ -47,7 +47,7 @@
 	timeoff_factor = -1
 	total_positions = -1
 	faction = "Station"
-	department = "Medical"
+	departments = list(DEPARTMENT_MEDICAL)
 	supervisors = "nobody! Enjoy your time off"
 	selection_color = "#013D3B"
 	access = list(access_maint_tunnels, access_external_airlocks)
@@ -60,7 +60,7 @@
 	timeoff_factor = -1
 	total_positions = -1
 	faction = "Station"
-	department = "Science"
+	departments = list(DEPARTMENT_SCIENCE)
 	supervisors = "nobody! Enjoy your time off"
 	selection_color = "#633D63"
 	access = list(access_maint_tunnels)
@@ -73,7 +73,7 @@
 	timeoff_factor = -1
 	total_positions = -1
 	faction = "Station"
-	department = "Security"
+	departments = list(DEPARTMENT_SECURITY)
 	supervisors = "nobody! Enjoy your time off"
 	selection_color = "#601C1C"
 	access = list(access_maint_tunnels)

code/game/jobs/job/special_vr.dm

@@ -1,6 +1,6 @@
 /datum/job/centcom_officer //For Business
 	title = "CentCom Officer"
-	department = "Command"
+	departments = list(DEPARTMENT_CENTCOM)
 	head_position = 1
 	faction = "Station"
 	total_positions = 2
@@ -66,7 +66,7 @@
 /datum/job/clown
 	title = "Clown"
 	flag = CLOWN
-	department = "Civilian"
+	departments = list(DEPARTMENT_CIVILIAN)
 	department_flag = CIVILIAN
 	faction = "Station"
 	total_positions = -1
@@ -90,7 +90,7 @@
 /datum/job/mime
 	title = "Mime"
 	flag = MIME
-	department = "Civilian"
+	departments = list(DEPARTMENT_CIVILIAN)
 	department_flag = CIVILIAN
 	faction = "Station"
 	total_positions = -1

code/modules/admin/topic.dm

@@ -520,8 +520,8 @@
 	//Exploration (Purple)
 		counter = 0
 		jobs += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		jobs += "<tr bgcolor='e79fff'><th colspan='[length(planet_positions)]'><a href='?src=\ref[src];jobban3=explorationdept;jobban4=\ref[M]'>Exploration Positions</a></th></tr><tr align='center'>"
-		for(var/jobPos in planet_positions)
+		jobs += "<tr bgcolor='e79fff'><th colspan='[length(SSjob.get_job_titles_in_department(DEPARTMENT_PLANET))]'><a href='?src=\ref[src];jobban3=sciencedept;jobban4=\ref[M]'>Science Positions</a></th></tr><tr align='center'>"
+		for(var/jobPos in SSjob.get_job_titles_in_department(DEPARTMENT_PLANET))
 			if(!jobPos)	continue
 			var/datum/job/job = job_master.GetJob(jobPos)
 			if(!job) continue

code/modules/events/supply_demand_vr.dm

@@ -23,20 +23,20 @@
 	// Decide what items are requried!
 	// We base this on what departmets are most active, excluding departments we don't have
 	var/list/notHaveDeptList = metric.departments.Copy()
-	notHaveDeptList.Remove(list(ROLE_ENGINEERING, ROLE_MEDICAL, ROLE_RESEARCH, ROLE_CARGO, ROLE_CIVILIAN))
+	notHaveDeptList.Remove(list(DEPARTMENT_ENGINEERING, DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH, DEPARTMENT_CARGO, DEPARTMENT_CIVILIAN))
 	var/deptActivity = metric.assess_all_departments(severity * 2, notHaveDeptList)
 	for(var/dept in deptActivity)
 		switch(dept)
-			if(ROLE_ENGINEERING)
+			if(DEPARTMENT_ENGINEERING)
 				choose_atmos_items(severity + 1)
-			if(ROLE_MEDICAL)
+			if(DEPARTMENT_MEDICAL)
 				choose_chemistry_items(roll(severity, 2))
-			if(ROLE_RESEARCH) // Would be nice to differentiate between research diciplines
+			if(DEPARTMENT_RESEARCH) // Would be nice to differentiate between research diciplines
 				choose_research_items(roll(severity, 2))
 				choose_robotics_items(roll(1, severity))
-			if(ROLE_CARGO)
+			if(DEPARTMENT_CARGO)
 				choose_alloy_items(rand(1, severity))
-			if(ROLE_CIVILIAN) // Would be nice to separate out chef/gardener/bartender
+			if(DEPARTMENT_CIVILIAN) // Would be nice to separate out chef/gardener/bartender
 				choose_food_items(roll(severity, 2))
 				choose_bar_items(roll(severity, 2))
 	if(required_items.len == 0)