Fix: Survs fix (ss220-space#73)

* Survs fix * Exp req fix, desc fix * Desc fix
terribaum · Nov 1, 2022 · 8b57941 · 8b57941
1 parent 558c207
commit 8b57941
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/code/datums/gamemodes/distress.dm b/code/datums/gamemodes/distress.dm
@@ -29,7 +29,7 @@
 		/datum/job/terragov/squad/standard = -1,
 		/datum/job/xenomorph = FREE_XENO_AT_START,
 		/datum/job/xenomorph/queen = 1,
-		/datum/job/survivor = 3
+		/datum/job/survivor/rambo = 3
 	)
 	var/siloless_hive_timer
 

diff --git a/code/datums/jobs/job/job.dm b/code/datums/jobs/job/job.dm
@@ -9,7 +9,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
 ))
 
 GLOBAL_LIST_INIT(exp_specialmap, list(
-	EXP_TYPE_LIVING = list(),
+	EXP_TYPE_LIVING = list("titles" = GLOB.jobs_regular_all + GLOB.jobs_xeno),
 	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
@@ -7,9 +7,6 @@
 	skills_type = /datum/skills/civilian/survivor
 	faction = FACTION_TERRAGOV
 
-	exp_requirements = XP_REQ_SURVIVOR
-	exp_type = EXP_TYPE_LIVING
-
 /datum/job/survivor/after_spawn(mob/living/carbon/C, mob/M, latejoin = FALSE)
 	. = ..()
 
@@ -283,7 +280,21 @@ Good luck, but do not expect to survive."})
 	title = "Survivor"
 	skills_type = /datum/skills/civilian/survivor/master
 	outfit = /datum/outfit/job/survivor/rambo
-	job_flags = JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN
+	job_flags = JOB_FLAG_ROUNDSTARTJOINABLE|JOB_FLAG_NOHEADSET|JOB_FLAG_OVERRIDELATEJOINSPAWN|JOB_FLAG_LATEJOINABLE
+
+	exp_requirements = XP_REQ_SURVIVOR
+	exp_type = EXP_TYPE_LIVING
+
+	html_description = {"
+		<b>Difficulty</b>: Hard<br /><br />
+		<b>You answer to: </b> Yourself<br /><br />
+		<b>Unlock Requirement</b>: 300h Living<br /><br />
+		<b>Gamemode Availability</b>: Nuclear War, Distress<br /><br />
+		You are one of lucky people to survive the initial xeno infestation. You're one of unlucky people who have not escaped yet. Do not fear, or you will die even faster.
+		<br /><br />
+		<b>Duty</b>: SURVIVE
+	"}
+
 
 /datum/outfit/job/survivor/rambo
 	name = "Survivor"

diff --git a/tgui/packages/tgui/interfaces/PlayerPreferences/JobPreferences.tsx b/tgui/packages/tgui/interfaces/PlayerPreferences/JobPreferences.tsx
@@ -52,7 +52,7 @@ export const JobPreferences = (props, context) => {
     'SOM Squad Veteran',
     'SOM Squad Leader',
   ];
-  const flavourJobs = ['Corporate Liaison'];
+  const flavourJobs = ['Corporate Liaison', 'Survivor'];
 
   const JobList = ({ name, jobs }) => (
     <Section title={name}>