Fix: another surv timelock fix (ss220-space#74)

terribaum · Nov 1, 2022 · e001903 · e001903
1 parent 8b57941
commit e001903
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
@@ -122,11 +122,14 @@ GLOBAL_LIST_INIT(jobs_xeno, list(ROLE_XENOMORPH, ROLE_XENO_QUEEN))
 GLOBAL_LIST_INIT(jobs_regular_all, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, MECH_PILOT, REQUISITIONS_OFFICER, CHIEF_SHIP_ENGINEER, \
 CHIEF_MEDICAL_OFFICER, SYNTHETIC, SILICON_AI, CORPORATE_LIAISON, SHIP_TECH, \
 MEDICAL_DOCTOR, MEDICAL_RESEARCHER, SQUAD_LEADER, SQUAD_SMARTGUNNER, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_MARINE))
+GLOBAL_LIST_INIT(jobs_all, list(CAPTAIN, FIELD_COMMANDER, STAFF_OFFICER, PILOT_OFFICER, REQUISITIONS_OFFICER, CHIEF_SHIP_ENGINEER, CHIEF_MEDICAL_OFFICER, SYNTHETIC, SILICON_AI, CORPORATE_LIAISON, SHIP_TECH,
+MEDICAL_DOCTOR, MEDICAL_RESEARCHER, SQUAD_LEADER, SQUAD_SMARTGUNNER, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_MARINE, ROLE_XENOMORPH, ROLE_XENO_QUEEN))
 GLOBAL_LIST_INIT(jobs_fallen_all, typecacheof(list(/datum/job/fallen)))
 
 //Playtime tracking system, see jobs_exp.dm
 #define EXP_TYPE_LIVING "Living"
-#define EXP_TYPE_REGULAR_ALL "Any"
+#define EXP_TYPE_ALL "Any"
+#define EXP_TYPE_REGULAR_ALL "Any TMGC"
 #define EXP_TYPE_COMMAND "Command"
 #define EXP_TYPE_OFFICERS "Officers"
 #define EXP_TYPE_ENGINEERING "Engineering"

diff --git a/code/datums/jobs/job/job.dm b/code/datums/jobs/job/job.dm
@@ -1,4 +1,5 @@
 GLOBAL_LIST_INIT(exp_jobsmap, list(
+	EXP_TYPE_ALL = list("titles" = GLOB.jobs_all),
 	EXP_TYPE_REGULAR_ALL = list("titles" = GLOB.jobs_regular_all),
 	EXP_TYPE_MARINES = list("titles" = GLOB.jobs_marines),
 	EXP_TYPE_ENGINEERING = list("titles" = GLOB.jobs_engineering),
@@ -9,7 +10,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
 ))
 
 GLOBAL_LIST_INIT(exp_specialmap, list(
-	EXP_TYPE_LIVING = list("titles" = GLOB.jobs_regular_all + GLOB.jobs_xeno),
+	EXP_TYPE_LIVING = list(),
 	EXP_TYPE_SPECIAL = list(),
 	EXP_TYPE_GHOST = list(),
 	EXP_TYPE_ADMIN = list()

diff --git a/code/datums/jobs/job/survivor.dm b/code/datums/jobs/job/survivor.dm
@@ -283,7 +283,7 @@ Good luck, but do not expect to survive."})
 	job_flags = JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN|JOB_FLAG_LATEJOINABLE
 
 	exp_requirements = XP_REQ_SURVIVOR
-	exp_type = EXP_TYPE_LIVING
+	exp_type = EXP_TYPE_ALL
 
 	html_description = {"
 		<b>Difficulty</b>: Hard<br /><br />