Merge pull request #4649 from MistakeNot4892/rework/standard_jobs

Moving standard SS13 jobs and departments into a modpack.

maps/exodus/exodus.dm

@@ -25,6 +25,9 @@
 	// Must come after borers for compatibility.
 	#include "../../mods/content/psionics/_psionics.dme"
 
+	// Must come after psionics for counsellor compatibility.
+	#include "../../mods/content/standard_jobs/_standard_jobs.dme"
+
 	#include "../../mods/species/ascent/_ascent.dme"
 	#include "../../mods/content/pheromones/_pheromones.dme"
 	#include "../../mods/species/serpentid/_serpentid.dme"
@@ -49,30 +52,13 @@
 	#include "../away/unishi/unishi.dm"
 	#include "../away/yacht/yacht.dm"
 
-	#include "jobs/_goals.dm"
-	#include "jobs/captain.dm"
-	#include "jobs/civilian.dm"
-	#include "jobs/engineering.dm"
-	#include "jobs/medical.dm"
-	#include "jobs/science.dm"
-	#include "jobs/security.dm"
-	#include "jobs/synthetics.dm"
-
-	#include "outfits/_pda.dm"
-	#include "outfits/cargo.dm"
-	#include "outfits/civilian.dm"
-	#include "outfits/command.dm"
-	#include "outfits/engineering.dm"
-	#include "outfits/medical.dm"
-	#include "outfits/science.dm"
-	#include "outfits/security.dm"
+	#include "exodus_goals.dm"
 
 	#include "exodus_announcements.dm"
 	#include "exodus_antagonism.dm"
 	#include "exodus_cameras.dm"
 	#include "exodus_areas.dm"
 	#include "exodus_elevator.dm"
-	#include "exodus_departments.dm"
 	#include "exodus_jobs.dm"
 	#include "exodus_loadout.dm"
 	#include "exodus_overmap.dm"

maps/ministation/jobs/civilian.dm

@@ -1,26 +1,15 @@
-/datum/job/ministation/assistant
+/datum/job/assistant/ministation
 	title = "Recruit"
-	total_positions = -1
-	spawn_positions = -1
 	supervisors = "absolutely everyone"
-	economic_power = 1
-	access = list()
-	minimal_access = list()
-	hud_icon = "hudassistant"
 	alt_titles = list("Technical Recruit","Medical Recruit","Research Recruit","Visitor")
 	outfit_type = /decl/outfit/job/ministation_assistant
-	department_types = list(/decl/department/civilian)
 	event_categories = list(ASSIGNMENT_GARDENER)
-
-/datum/job/ministation/assistant/get_access()
-	if(get_config_value(/decl/config/toggle/assistant_maint))
-		return list(access_maint_tunnels)
-	return list()
+	hud_icon = "hudassistant"
 
 /decl/outfit/job/ministation_assistant
 	name = "Job - Ministation Assistant"
 
-/datum/job/ministation/bartender
+/datum/job/bartender/ministation
 	title = "Bartender"
 	alt_titles = list("Cook","Barista")
 	supervisors = "the Lieutenant and the Captain"
@@ -30,16 +19,6 @@
 	department_types = list(/decl/department/service)
 	selection_color = "#3fbe4a"
 	economic_power = 5
-	access = list(
-		access_hydroponics,
-		access_bar,
-		access_kitchen
-	)
-	minimal_access = list(
-		access_hydroponics,
-		access_bar,
-		access_kitchen
-	)
 	min_skill = list(
 		SKILL_COOKING	= SKILL_ADEPT,
 		SKILL_BOTANY	= SKILL_BASIC,
@@ -51,14 +30,13 @@
 	)
 	skill_points = 30
 
-/datum/job/ministation/cargo
+/datum/job/cargo_tech/ministation
 	title = "Cargo Technician"
 	alt_titles = list("Shaft Miner","Drill Technician","Prospector")
 	supervisors = "the Lieutenant and the Captain"
 	total_positions = 3
 	spawn_positions = 1
 	outfit_type = /decl/outfit/job/ministation/cargo
-	department_types = list(/decl/department/service)
 	selection_color = "#8a7c00"
 	economic_power = 5
 	access = list(
@@ -94,57 +72,24 @@
 		SKILL_FINANCE	= SKILL_MAX
 	)
 	skill_points = 30
-	software_on_spawn = list(
-		/datum/computer_file/program/supply,
-		/datum/computer_file/program/deck_management,
-		/datum/computer_file/program/reports
-	)
 
-/datum/job/ministation/janitor
-	title = "Janitor"
-	event_categories = list(ASSIGNMENT_JANITOR)
-	department_types = list(/decl/department/service)
+/datum/job/janitor/ministation
 	total_positions = 2
-	spawn_positions = 1
 	supervisors = "the Lieutenant and the Captain"
 	economic_power = 3
 	selection_color = "#940088"
-	access = list(
-		access_janitor,
-		access_maint_tunnels,
-		access_engine,
-		access_research,
-		access_sec_doors,
-		access_medical
-	)
-	minimal_access = list(
-		access_janitor,
-		access_maint_tunnels,
-		access_engine,
-		access_research,
-		access_sec_doors,
-		access_medical
-	)
-	alt_titles = list(
-		"Custodian",
-		"Sanitation Technician"
-	)
 	outfit_type = /decl/outfit/job/ministation/janitor
 	min_skill = list(
 		SKILL_HAULING  = SKILL_BASIC
 	)
 	skill_points = 28
 
-/datum/job/ministation/librarian
-	title = "Librarian"
-	department_types = list(/decl/department/service)
-	total_positions = 1
+/datum/job/librarian/ministation
 	spawn_positions = 2
 	supervisors = "the Lieutenant, the Captain, and the smell of old paper"
 	economic_power = 5
 	selection_color = "#008800"
 	access = list(access_library)
-	minimal_access = list(access_library)
 	alt_titles = list(
 		"Curator",
 		"Archivist"