From cef06f90a56d399690f3a073b7ac3f6607e483f7 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Fri, 22 Apr 2022 00:48:05 +0100
Subject: [PATCH] Moves NTR to 50 command hours (#17597)

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

diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index 19b2b5c55d5..1ba9cc96ee5 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -21,6 +21,7 @@
 #define JOB_SYNDICATE			(1<<11)
 #define JOB_JUDGE				(1<<12)
 #define JOB_BLUESHIELD			(1<<13)
+#define JOB_NANO				(1<<14)
 
 #define JOBCAT_MEDSCI			(1<<1)
 
@@ -58,7 +59,7 @@
 
 #define JOBCAT_KARMA			(1<<3)
 
-#define JOB_NANO				(1<<0)
+// #define JOB_NANO				(1<<0) // AA07 2022-04-10 - Moved to ENGSEC (Non karma): Define kept for history sake
 // #define JOB_BLUESHIELD		(1<<1) // AA07 2022-02-23 - Moved to ENGSEC (Non karma): Define kept for history sake
 // #define JOB_BARBER			(1<<3) // AA07 2022-04-07 - Moved to SUPPORT (Non karma): Define kept for history sake
 // #define JOB_MECHANIC			(1<<4) // AA07 2021-10-02 - Removed: Kept for history sake
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 8572e01193e..d7392a1e226 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -105,16 +105,17 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 /datum/job/nanotrasenrep
 	title = "Nanotrasen Representative"
 	flag = JOB_NANO
-	department_flag = JOBCAT_KARMA
+	department_flag = JOBCAT_ENGSEC
 	total_positions = 1
 	spawn_positions = 1
 	supervisors = "the command staff"
 	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 17e331fb986..9f15f715e34 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -88,13 +88,12 @@ GLOBAL_LIST_INIT(nonhuman_positions, list(
 	"pAI"
 ))
 
-GLOBAL_LIST_INIT(whitelisted_positions, list(
-	"Nanotrasen Representative", // your days are numbered
-))
-
+// TODO: Remove
+GLOBAL_LIST_EMPTY(whitelisted_positions)
 
 /proc/check_job_karma(job)
 	return (job in GLOB.whitelisted_positions)
+// END TODO
 
 /proc/get_job_datums()
 	var/list/occupations = list()
diff --git a/code/modules/karma/karma_packages.dm b/code/modules/karma/karma_packages.dm
index 675890a2b4c..343a04d7772 100644
--- a/code/modules/karma/karma_packages.dm
+++ b/code/modules/karma/karma_packages.dm
@@ -48,6 +48,7 @@
 	database_id = KARMAPACKAGE_JOB_NANOTRASENREPRESENTATIVE
 	friendly_name = "Nanotrasen Representative"
 	karma_cost = 30
+	refundable = TRUE
 
 /datum/karma_package/job/secpodpilot
 	database_id = KARMAPACKAGE_JOB_SECURITYPODPILOT