Fix departmental trainee roles (goonstation#20773)

GesuBackups · Sep 21, 2024 · 134bec3 · 134bec3
1 parent 6135d3b
commit 134bec3
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 72 deletions.
diff --git a/code/lists/jobs.dm b/code/lists/jobs.dm
@@ -43,6 +43,7 @@ var/list/job_mailgroup_list = list(
  "Chief Engineer" = MGD_COMMAND,
  "Quartermaster" = MGD_CARGO,
  "Engineer" = MGD_STATIONREPAIR,
+ "Technical Trainee" = MGD_STATIONREPAIR,
  "Janitor" = MGD_STATIONREPAIR,
  "Miner" = MGD_MINING,
  "Botanist" = MGD_BOTANY,
@@ -51,6 +52,7 @@ var/list/job_mailgroup_list = list(
  "Geneticist" = MGD_MEDRESEACH,
  "Pathologist" = MGD_MEDRESEACH,
  "Medical Doctor" = MGD_MEDBAY,
+ "Medical Trainee" = MGD_MEDBAY,
  "Chaplain" = MGD_SPIRITUALAFFAIRS)
 
 //Used for PDA department paging.
@@ -100,16 +102,19 @@ var/list/engineering_jobs = list(
  "Engineer",
  "Miner",
  "Quartermaster",
+ "Technical Trainee",
 )
 var/list/medical_jobs = list(
  "Medical Director",
  "Medical Doctor",
  "Roboticist",
- "Geneticist"
+ "Geneticist",
+ "Medical Trainee",
 )
 var/list/science_jobs = list(
  "Research Director",
  "Scientist",
+ "Research Trainee",
 )
 var/list/medsci_jobs = medical_jobs + science_jobs
 var/list/service_jobs = list(
@@ -137,7 +142,6 @@ var/list/engineering_gimmicks = list(
  "Head of Mining",
  "Station Builder",
  "Atmospherish Technician",
- "Technical Assistant",
 )
 var/list/medical_gimmicks = list(
  "Acupuncturist",
@@ -169,7 +173,6 @@ var/list/medical_gimmicks = list(
 var/list/science_gimmicks = list(
  "Toxins Researcher",
  "Chemist",
- "Research Assistant",
  "Test Subject",
 )
 var/list/medsci_gimmicks = medical_gimmicks + science_gimmicks

diff --git a/code/obj/landmark.dm b/code/obj/landmark.dm
@@ -143,8 +143,8 @@ var/global/list/job_start_locations = list()
  name = "Engineer"
  icon_state = "engineer"
 
-/obj/landmark/start/job/technical_assistant
- name = "Technical Assistant"
+/obj/landmark/start/job/technical_trainee
+ name = "Technical Trainee"
  icon_state = "engineer"
 /obj/landmark/start/job/miner
  name = "Miner"
@@ -160,8 +160,8 @@ var/global/list/job_start_locations = list()
  name = "Medical Doctor"
  icon_state = "medical_doctor"
 
-/obj/landmark/start/job/medical_assistant
- name = "Medical Assistant"
+/obj/landmark/start/job/medical_trainee
+ name = "Medical Trainee"
  icon_state = "medical_doctor"
 
 /obj/landmark/start/job/geneticist
@@ -176,8 +176,8 @@ var/global/list/job_start_locations = list()
  name = "Scientist"
  icon_state = "scientist"
 
-/obj/landmark/start/job/research_assistant
- name = "Research Assistant"
+/obj/landmark/start/job/research_trainee
+ name = "Research Trainee"
  icon_state = "scientist"
 
 // Security

diff --git a/code/procs/access.dm b/code/procs/access.dm
@@ -256,7 +256,7 @@
  return list(access_morgue, access_maint_tunnels)
 
  ///////////////////////////// Medical
- if("Medical Doctor")
+ if("Medical Doctor", "Medical Trainee")
  return list(access_medical, access_medical_lockers, access_morgue, access_maint_tunnels)
  if("Geneticist")
  return list(access_medical, access_medical_lockers, access_morgue, access_medlab, access_maint_tunnels)
@@ -267,8 +267,6 @@
  if("Pharmacist")
  return list(access_research,access_tech_storage, access_maint_tunnels, access_chemistry,
  access_medical_lockers, access_medical, access_morgue, access_researchfoyer)
- if("Medical Assistant")
- return list(access_maint_tunnels, access_tech_storage, access_medical, access_morgue)
  if("Psychiatrist")
  return list(access_medical, access_maint_tunnels)
  if("Medical Specialist")
@@ -277,20 +275,18 @@
  access_medlab) //Mdir minus head stuff
 
  ///////////////////////////// Science
- if("Scientist")
+ if("Scientist", "Research Trainee")
  return list(access_tox, access_tox_storage, access_research, access_chemistry, access_researchfoyer, access_artlab, access_telesci, access_robotdepot)
  if("Chemist")
  return list(access_research, access_chemistry, access_researchfoyer)
  if("Toxins Researcher")
  return list(access_research, access_tox, access_tox_storage, access_researchfoyer)
- if("Research Assistant")
- return list(access_maint_tunnels, access_tech_storage, access_research, access_chemistry, access_tox, access_researchfoyer, access_artlab, access_telesci, access_robotdepot) //notably not tox_storage, which is also the sci locker access for some fucking reason
 
  //////////////////////////// Engineering
  if("Atmospheric Technician")
  return list(access_maint_tunnels, access_engineering_control,
  access_eva, access_engineering, access_engineering_storage, access_engineering_eva, access_engineering_atmos)
- if("Engineer")
+ if("Engineer", "Technical Trainee")
  return list(access_engineering, access_maint_tunnels, access_engineering_control,
  access_engineering_storage, access_engineering_atmos, access_engineering_engine, access_engineering_power,
  access_tech_storage, access_engineering_mechanic)
@@ -321,7 +317,7 @@
  return list(access_bar, access_kitchen)
  if("Clown", "Boxer", "Barber", "Mime", "Dungeoneer")
  return list(access_maint_tunnels)
- if("Assistant", "Staff Assistant", "Technical Assistant", "Radio Show Host")
+ if("Assistant", "Staff Assistant", "Radio Show Host")
  return list(access_maint_tunnels, access_tech_storage)
  if("Mail Courier")
  return list(access_mail, access_heads, access_cargo, access_medical, access_researchfoyer, access_research, access_tech_storage)

diff --git a/maps/atlas.dmm b/maps/atlas.dmm
@@ -12476,7 +12476,7 @@
  dir = 4;
  level = -1
  },
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/black,
 /area/station/engine/engineering)
 "eWF" = (
@@ -13859,7 +13859,7 @@
 /obj/stool/chair/blue{
  dir = 4
  },
-/obj/landmark/start/job/medical_assistant,
+/obj/landmark/start/job/medical_trainee,
 /turf/simulated/floor/white,
 /area/station/medical/medbay)
 "hPj" = (
@@ -15564,7 +15564,7 @@
 /obj/cable{
  icon_state = "1-2"
  },
-/obj/landmark/start/job/research_assistant,
+/obj/landmark/start/job/research_trainee,
 /turf/simulated/floor/purplewhite{
  dir = 8
  },
@@ -16922,7 +16922,7 @@
 /turf/simulated/floor/red,
 /area/station/security/equipment)
 "nOs" = (
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/black,
 /area/station/engine/engineering)
 "nOy" = (

diff --git a/maps/clarion.dmm b/maps/clarion.dmm
@@ -19941,7 +19941,7 @@
  dir = 8
  },
 /obj/item/storage/wall/office,
-/obj/landmark/start/job/medical_assistant,
+/obj/landmark/start/job/medical_trainee,
 /turf/simulated/floor/wood/two,
 /area/station/medical/staff)
 "gXP" = (
@@ -20733,7 +20733,7 @@
 /obj/stool/chair/office{
  dir = 1
  },
-/obj/landmark/start/job/research_assistant,
+/obj/landmark/start/job/research_trainee,
 /turf/simulated/floor/carpet{
  icon_state = "fred2"
  },
@@ -22299,7 +22299,7 @@
  },
 /area/station/crew_quarters/bar)
 "iDb" = (
-/obj/landmark/start/job/medical_assistant,
+/obj/landmark/start/job/medical_trainee,
 /turf/simulated/floor/bluewhite{
  dir = 4
  },
@@ -28733,7 +28733,7 @@
 /obj/cable{
  icon_state = "4-8"
  },
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/orangeblack/side/white,
 /area/station/engine/engineering)
 "nwl" = (
@@ -37881,7 +37881,7 @@
 /area/station/crew_quarters/quarters_west)
 "ulP" = (
 /obj/stool/chair/office,
-/obj/landmark/start/job/research_assistant,
+/obj/landmark/start/job/research_trainee,
 /turf/simulated/floor/carpet,
 /area/station/science/lobby)
 "ulV" = (
@@ -39241,7 +39241,7 @@
  anchored = 0;
  dir = 8
  },
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor{
  dir = 1;
  icon_state = "yellowblack"

diff --git a/maps/cogmap.dmm b/maps/cogmap.dmm
@@ -40174,7 +40174,7 @@
 /area/station/security/checkpoint)
 "eFF" = (
 /obj/stool/chair/yellow,
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/yellow/side,
 /area/station/engine/elect)
 "eFK" = (
@@ -40743,7 +40743,7 @@
 /obj/stool/chair/couch{
  dir = 4
  },
-/obj/landmark/start/job/research_assistant,
+/obj/landmark/start/job/research_trainee,
 /turf/simulated/floor/purple/side{
  dir = 1
  },
@@ -44986,7 +44986,7 @@
 /area/station/security/brig)
 "ipJ" = (
 /obj/stool/chair/comfy/blue,
-/obj/landmark/start/job/medical_assistant,
+/obj/landmark/start/job/medical_trainee,
 /turf/simulated/floor/wood/two,
 /area/station/medical/staff)
 "ipZ" = (
@@ -51004,7 +51004,7 @@
 /turf/simulated/floor/green/side,
 /area/station/turret_protected/Zeta)
 "nkK" = (
-/obj/landmark/start/job/medical_assistant,
+/obj/landmark/start/job/medical_trainee,
 /turf/simulated/floor/white,
 /area/station/medical/medbay)
 "nlf" = (
@@ -54320,7 +54320,7 @@
 /area/station/hydroponics/bay)
 "pJe" = (
 /obj/disposalpipe/segment/mail,
-/obj/landmark/start/job/research_assistant,
+/obj/landmark/start/job/research_trainee,
 /turf/simulated/floor/white,
 /area/station/science/chemistry)
 "pJv" = (
@@ -65357,7 +65357,7 @@
 /area/station/storage/primary)
 "yiI" = (
 /obj/stool/chair/yellow,
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor,
 /area/station/engine/engineering)
 "yiM" = (

diff --git a/maps/cogmap2.dmm b/maps/cogmap2.dmm
@@ -69739,7 +69739,7 @@
 /area/station/chapel/sanctuary)
 "rAl" = (
 /obj/stool/chair/comfy,
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/yellow/side{
  dir = 6
  },
@@ -74192,7 +74192,7 @@
 /turf/simulated/floor/plating,
 /area/station/turret_protected/ai)
 "woU" = (
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/plating,
 /area/station/engine/elect)
 "wpW" = (

diff --git a/maps/donut2.dmm b/maps/donut2.dmm
@@ -16638,7 +16638,7 @@
 /obj/disposalpipe/segment/mail{
  dir = 4
  },
-/obj/landmark/start/job/medical_assistant,
+/obj/landmark/start/job/medical_trainee,
 /turf/simulated/floor/white,
 /area/station/medical/medbay)
 "bXr" = (
@@ -23318,7 +23318,7 @@
 /obj/cable{
  icon_state = "4-8"
  },
-/obj/landmark/start/job/medical_assistant,
+/obj/landmark/start/job/medical_trainee,
 /turf/simulated/floor/carpet/blue,
 /area/station/medical/staff)
 "goU" = (
@@ -37269,7 +37269,7 @@
  dir = 8;
  icon_state = "pipe-c"
  },
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/yellow/side{
  dir = 1
  },
@@ -38353,7 +38353,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/scidisposal)
 "pDG" = (
-/obj/landmark/start/job/research_assistant,
+/obj/landmark/start/job/research_trainee,
 /turf/simulated/floor/white,
 /area/station/crew_quarters/observatory)
 "pDR" = (
@@ -38677,7 +38677,7 @@
 /obj/disposalpipe/segment/mail{
  dir = 4
  },
-/obj/landmark/start/job/technical_assistant,
+/obj/landmark/start/job/technical_trainee,
 /turf/simulated/floor/orangeblack,
 /area/station/engine/elect)
 "pQx" = (
@@ -45169,7 +45169,7 @@
 /area/station/maintenance/southwest)
 "tUx" = (
 /obj/stool,
-/obj/landmark/start/job/research_assistant,
+/obj/landmark/start/job/research_trainee,
 /turf/simulated/floor/white,
 /area/station/crew_quarters/observatory)
 "tUA" = (