From c645cf284cad84b0ab14cbd78823deca97e81947 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Tue, 15 Mar 2022 09:10:05 +0000
Subject: [PATCH] Moves blueshield from karma to 50 command hours (#17438)

---
 code/__DEFINES/job.dm                | 3 ++-
 code/game/jobs/job/supervisor.dm     | 7 ++++---
 code/game/jobs/jobs.dm               | 1 -
 code/modules/karma/karma_packages.dm | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index 2af1016b309..4694740ceb1 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -20,6 +20,7 @@
 #define JOB_CENTCOM				(1<<10)
 #define JOB_SYNDICATE			(1<<11)
 #define JOB_JUDGE				(1<<12)
+#define JOB_BLUESHIELD			(1<<13)
 
 #define JOBCAT_MEDSCI			(1<<1)
 
@@ -57,7 +58,7 @@
 #define JOBCAT_KARMA			(1<<3)
 
 #define JOB_NANO				(1<<0)
-#define JOB_BLUESHIELD			(1<<1)
+// #define JOB_BLUESHIELD		(1<<1) // AA07 2022-02-23 - Moved to ENGSEC (Non karma): Define kept for history sake
 #define JOB_BARBER				(1<<3)
 // #define JOB_MECHANIC			(1<<4) // AA07 2021-10-02 - Removed: Kept for history sake
 // #define JOB_BRIGDOC			(1<<5) // AA07 2021-12-01 - Removed: Kept for history sake
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index f108e022e0f..8572e01193e 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -151,16 +151,17 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 /datum/job/blueshield
 	title = "Blueshield"
 	flag = JOB_BLUESHIELD
-	department_flag = JOBCAT_KARMA
+	department_flag = JOBCAT_ENGSEC
 	total_positions = 1
 	spawn_positions = 1
 	supervisors = "the Nanotrasen representative"
 	department_head = list("Captain")
 	selection_color = "#ddddff"
-	req_admin_notify = 1
-	is_command = 1
+	req_admin_notify = TRUE
+	is_command = TRUE
 	transfer_allowed = FALSE
 	minimal_player_age = 21
+	exp_map = list(EXP_TYPE_COMMAND = 3000) // 50 hours baby
 	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
 			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
 			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 9bac2db43e0..11f02d34eb5 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -89,7 +89,6 @@ GLOBAL_LIST_INIT(nonhuman_positions, list(
 ))
 
 GLOBAL_LIST_INIT(whitelisted_positions, list(
-	"Blueshield",
 	"Nanotrasen Representative",
 	"Barber",
 ))
diff --git a/code/modules/karma/karma_packages.dm b/code/modules/karma/karma_packages.dm
index cecb789b828..7b6b699590f 100644
--- a/code/modules/karma/karma_packages.dm
+++ b/code/modules/karma/karma_packages.dm
@@ -30,6 +30,7 @@
 	database_id = KARMAPACKAGE_JOB_BLUESHIELD
 	friendly_name = "Blueshield"
 	karma_cost = 30
+	refundable = TRUE
 
 /datum/karma_package/job/barber
 	database_id = KARMAPACKAGE_JOB_BARBER