Adds an Intermediate Research Understudy Role - Revival

code/__DEFINES/jobs.dm

@@ -26,7 +26,7 @@
 
 #define COMMAND_ROLES list(/datum/job/captain, /datum/job/xo, /datum/job/chief_engineer, /datum/job/cmo, /datum/job/rd, /datum/job/hos, /datum/job/operations_manager)
 #define COMMAND_SUPPORT_ROLES list(/datum/job/bridge_crew)
-#define SCIENCE_ROLES list(/datum/job/scientist, /datum/job/xenoarchaeologist, /datum/job/xenobiologist, /datum/job/xenobotanist, /datum/job/intern_sci, /datum/job/eventsci)
+#define SCIENCE_ROLES list(/datum/job/scientist, /datum/job/xenoarchaeologist, /datum/job/xenobiologist, /datum/job/xenobotanist, /datum/job/intern_sci, /datum/job/intern_sci/assistant, /datum/job/eventsci)
 #define MEDICAL_ROLES list(/datum/job/doctor, /datum/job/surgeon, /datum/job/pharmacist, /datum/job/psychiatrist, /datum/job/med_tech, /datum/job/intern_med, /datum/job/eventmed)
 #define ENGINEERING_ROLES list(/datum/job/engineer, /datum/job/atmos, /datum/job/intern_eng, /datum/job/eventeng)
 #define SERVICE_ROLES list(/datum/job/chaplain, /datum/job/bartender, /datum/job/chef, /datum/job/hydro, /datum/job/janitor, /datum/job/librarian)

code/game/jobs/job/science.dm

@@ -212,22 +212,29 @@
 	uniform = /obj/item/clothing/under/rank/scientist/botany
 
 /datum/job/intern_sci
-	title = "Lab Assistant"
+	title = "Research Understudy"
 	flag = INTERN_SCI
 	departments = SIMPLEDEPT(DEPARTMENT_SCIENCE)
 	department_flag = MEDSCI
 	faction = "Station"
-	total_positions = 3
-	spawn_positions = 3
+	alt_titles = list("Xenoarchaeology Understudy", "Xenobiology Understudy", "Xenobotany Understudy")
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "the Research Director"
 	selection_color = "#a44799"
+	economic_modifier = 4
 	access = list(ACCESS_RESEARCH, ACCESS_TOX)
 	minimal_access = list(ACCESS_RESEARCH, ACCESS_TOX)
 	outfit = /obj/outfit/job/intern_sci
 	blacklisted_species = list(SPECIES_VAURCA_BREEDER)
+	minimum_character_age = list(
+		SPECIES_HUMAN = 28,
+		SPECIES_SKRELL = 58,
+		SPECIES_SKRELL_AXIORI = 58
+	)
 
 /obj/outfit/job/intern_sci
-	name = "Lab Assistant"
+	name = "Research Understudy"
 	jobtype = /datum/job/intern_sci
 
 	uniform = /obj/item/clothing/under/rank/scientist/intern
@@ -249,3 +256,14 @@
 	tab_pda = /obj/item/modular_computer/handheld/pda/research
 	wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/research
 	tablet = /obj/item/modular_computer/handheld/preset/research
+
+/datum/job/intern_sci/assistant
+	title = "Lab Assistant"
+	flag = ASSISTANT_SCI
+	alt_titles = list("Field Assistant", "Xenobiology Assisant", "Xenobotany Assistant")
+	economic_modifier = 2
+	minimum_character_age = list(
+		SPECIES_HUMAN = 18,
+		SPECIES_SKRELL = 50,
+		SPECIES_SKRELL_AXIORI = 50
+	)

code/game/jobs/jobs.dm

@@ -38,6 +38,7 @@ var/const/INTERN_MED		=(1<<11)
 var/const/INTERN_SCI		=(1<<12)
 var/const/XENOBOTANIST		=(1<<13)
 var/const/XENOARCHEOLOGIST	=(1<<14)
+var/const/ASSISTANT_SCI		=(1<<15)
 
 // SERVICE
 var/const/SERVICE			=(1<<2)
@@ -114,6 +115,7 @@ var/list/science_positions = list(
 	"Xenoarchaeologist",
 	"Xenobiologist",
 	"Xenobotanist",
+	"Research Understudy",
 	"Lab Assistant",
 	"Science Personnel"
 )

html/changelogs/sciencelearneralts.yml

@@ -0,0 +1,9 @@
+author: Sparky_hotdog
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a new job, Research Understudy, to replace Lab Assistant as the learner job for research. It has a minumim age of 28, up from 18."
+  - rscadd: "Added alt-titles for Research Understudy: Xenoarchaeology Understudy, Xenobiology Understudy and Xenobotany Understudy."
+  - rscadd: "Added alt-titles for Lab Assistant: Field Assistant, Xenobiology Assistant and Xenobotany Assistant."
+  - rscadd: "The Lab Assistant job is now intended as purely an aide to the research department."

maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

@@ -4233,6 +4233,18 @@
 /obj/machinery/atmospherics/unary/cryo_cell,
 /turf/simulated/floor/tiled,
 /area/medical/gen_treatment)
+"bOb" = (
+/obj/structure/bed/stool/chair/office/light{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/obj/effect/landmark/start{
+	name = "Xenobiologist"
+	},
+/turf/simulated/floor/wood,
+/area/rnd/conference)
 "bOe" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/effect/floor_decal/corner/dark_blue/full{
@@ -12228,12 +12240,12 @@
 /obj/structure/bed/stool/chair/office/light{
 	dir = 8
 	},
-/obj/effect/landmark/start{
-	name = "Xenobiologist"
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
+/obj/effect/landmark/start{
+	name = "Research Understudy"
+	},
 /turf/simulated/floor/wood,
 /area/rnd/conference)
 "fEQ" = (
@@ -25961,9 +25973,6 @@
 /obj/structure/bed/stool/chair/office/light{
 	dir = 8
 	},
-/obj/effect/landmark/start{
-	name = "Xenoarchaeologist"
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
 	},
@@ -25973,6 +25982,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/effect/landmark/start{
+	name = "Scientist"
+	},
 /turf/simulated/floor/wood,
 /area/rnd/conference)
 "lYV" = (
@@ -35356,7 +35368,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Lab Assistant"
+	name = "Research Understudy"
 	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -47340,6 +47352,12 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 10
 	},
+/obj/effect/landmark/start{
+	name = "Scientist"
+	},
+/obj/structure/bed/stool/chair/office/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "vWt" = (
@@ -52651,12 +52669,12 @@
 /obj/structure/bed/stool/chair/office/light{
 	dir = 4
 	},
-/obj/effect/landmark/start{
-	name = "Scientist"
-	},
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
 	},
+/obj/effect/landmark/start{
+	name = "Xenoarchaeologist"
+	},
 /turf/simulated/floor/wood,
 /area/rnd/conference)
 "yme" = (
@@ -78412,7 +78430,7 @@ dOi
 fcV
 eyY
 qsv
-ylu
+bOb
 ylu
 bfF
 cyG