From a9cc6b0509b83a12ff7d232110abea4da7ac4b1d Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 8 Nov 2018 04:47:08 -0500
Subject: [PATCH] fixes job exp requirements by unmodularizing job list defines
 (#7703)

---
 code/modules/jobs/jobs.dm                 | 12 ++++------
 modular_citadel/code/modules/jobs/jobs.dm | 28 -----------------------
 tgstation.dme                             |  1 -
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 modular_citadel/code/modules/jobs/jobs.dm

diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index f3b3237834..23d20cd27a 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -1,12 +1,11 @@
-/*CITADEL CHANGE - comments this out to be overridden in modular_citadel
 GLOBAL_LIST_INIT(command_positions, list(
 	"Captain",
 	"Head of Personnel",
 	"Head of Security",
 	"Chief Engineer",
 	"Research Director",
-	"Chief Medical Officer"))
-*/
+	"Chief Medical Officer",
+	"Quartermaster"))
 
 GLOBAL_LIST_INIT(engineering_positions, list(
 	"Chief Engineer",
@@ -27,15 +26,13 @@ GLOBAL_LIST_INIT(science_positions, list(
 	"Scientist",
 	"Roboticist"))
 
-/*CITADEL CHANGE - comments this out to be overridden in modular_citadel
 GLOBAL_LIST_INIT(supply_positions, list(
-	"Head of Personnel",
 	"Quartermaster",
 	"Cargo Technician",
 	"Shaft Miner"))
-*/
-/*CITADEL CHANGE - comments this out to be overridden in modular_citadel
+
 GLOBAL_LIST_INIT(civilian_positions, list(
+	"Head of Personnel",
 	"Bartender",
 	"Botanist",
 	"Cook",
@@ -46,7 +43,6 @@ GLOBAL_LIST_INIT(civilian_positions, list(
 	"Clown",
 	"Mime",
 	"Assistant"))
-*/
 
 GLOBAL_LIST_INIT(security_positions, list(
 	"Head of Security",
diff --git a/modular_citadel/code/modules/jobs/jobs.dm b/modular_citadel/code/modules/jobs/jobs.dm
deleted file mode 100644
index 85e8043d62..0000000000
--- a/modular_citadel/code/modules/jobs/jobs.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-GLOBAL_LIST_INIT(command_positions, list(
-	"Captain",
-	"Head of Personnel",
-	"Head of Security",
-	"Chief Engineer",
-	"Research Director",
-	"Chief Medical Officer",
-	"Quartermaster"))
-
-GLOBAL_LIST_INIT(supply_positions, list(
-	"Quartermaster",
-	"Cargo Technician",
-	"Shaft Miner"))
-	
-GLOBAL_LIST_INIT(civilian_positions, list(
-	"Head of Personnel",
-	"Bartender",
-	"Botanist",
-	"Cook",
-	"Janitor",
-	"Curator",
-	"Lawyer",
-	"Chaplain",
-	"Clown",
-	"Mime",
-	"Assistant"))
-
-
diff --git a/tgstation.dme b/tgstation.dme
index 5c12fb6d94..81a20ecee9 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2890,7 +2890,6 @@
 #include "modular_citadel\code\modules\food_and_drinks\snacks\meat.dm"
 #include "modular_citadel\code\modules\integrated_electronics\subtypes\manipulation.dm"
 #include "modular_citadel\code\modules\jobs\dresscode_values.dm"
-#include "modular_citadel\code\modules\jobs\jobs.dm"
 #include "modular_citadel\code\modules\jobs\job_types\captain.dm"
 #include "modular_citadel\code\modules\jobs\job_types\cargo_service.dm"
 #include "modular_citadel\code\modules\jobs\job_types\engineering.dm"