]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Remove senior roles (#22303)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Tue, 12 Dec 2023 02:37:05 +0000 (21:37 -0500)
committerGitHub <noreply@github.com>
Tue, 12 Dec 2023 02:37:05 +0000 (13:37 +1100)
28 files changed:
Resources/Locale/en-US/job/job-description.ftl
Resources/Locale/en-US/job/job-names.ftl
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
Resources/Prototypes/Maps/aspid.yml
Resources/Prototypes/Maps/atlas.yml
Resources/Prototypes/Maps/bagel.yml
Resources/Prototypes/Maps/barratry.yml
Resources/Prototypes/Maps/box.yml
Resources/Prototypes/Maps/cluster.yml
Resources/Prototypes/Maps/core.yml
Resources/Prototypes/Maps/europa.yml
Resources/Prototypes/Maps/fland.yml
Resources/Prototypes/Maps/gemini.yml
Resources/Prototypes/Maps/marathon.yml
Resources/Prototypes/Maps/meta.yml
Resources/Prototypes/Maps/omega.yml
Resources/Prototypes/Maps/origin.yml
Resources/Prototypes/Maps/packed.yml
Resources/Prototypes/Maps/saltern.yml
Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml [deleted file]
Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml [deleted file]
Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml [deleted file]
Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml [deleted file]
Resources/Prototypes/Roles/Jobs/departments.yml
Resources/Prototypes/Roles/play_time_trackers.yml
Resources/migration.yml

index 42ef30bd15b3d93c6417e4091c44d313b4e7c43c..37cc3d4d563c240dde24149f4478ad73a17e7ef2 100644 (file)
@@ -44,7 +44,3 @@ job-description-security = Catch criminals and enemies of the station, enforce t
 job-description-serviceworker = Learn the basics of bartending, cooking, and growing plants.
 job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
 job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Gemini Station.
-job-description-senior-engineer = Teach new engineers the basics of the station's engine, repairing, atmospherics and power.
-job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects.
-job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead.
-job-description-senior-officer = Teach new officers the basics of searches, performing arrests, prison times and how to properly shoot a firearm.
index a10cb0d6a683177ea2f3db1a7d3150f279837879..1f7e1c1e0ea67bb144f0d6cd082ace04b761f043 100644 (file)
@@ -44,10 +44,6 @@ job-name-ertmedic = ERT Medic
 job-name-ertjanitor = ERT Janitor
 job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
-job-name-senior-engineer = Senior Engineer
-job-name-senior-researcher = Senior Researcher
-job-name-senior-physician = Senior Physician
-job-name-senior-officer = Senior Officer
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
@@ -91,10 +87,6 @@ JobSalvageSpecialist = Salvage Specialist
 JobScientist = Scientist
 JobSecurityCadet = Security Cadet
 JobSecurityOfficer = Security Officer
-JobSeniorEngineer = Senior Engineer
-JobSeniorOfficer = Senior Officer
-JobSeniorPhysician = Senior Physician
-JobSeniorResearcher = Senior Researcher
 JobServiceWorker = Service Worker
 JobStationEngineer = Station Engineer
 JobTechnicalAssistant = Technical Assistant
index d71ab49e322f77dc398cdec966440ae37e5841ec..344bd6a08140b3303f7a40d635c43c7d3b5bc5a4 100644 (file)
     whitelist:
     - Zookeeper
     - Scientist
-    - SeniorResearcher
     - ResearchDirector
     - Chef
 
index 1e0ef876a0e559ffe2d9b40226f68c37bbc8776c..0bb8fd248beb0858500d79464445f69cfde8b4ab 100644 (file)
       - state: green
       - state: ce
 
-- type: entity
-  id: SpawnPointSeniorEngineer
-  parent: SpawnPointJobBase
-  name: seniorengineer
-  components:
-  - type: SpawnPoint
-    job_id: SeniorEngineer
-  - type: Sprite
-    layers:
-      - state: green
-      - state: seniorengineer
-
 - type: entity
   id: SpawnPointStationEngineer
   parent: SpawnPointJobBase
       - state: green
       - state: cmo
 
-- type: entity
-  id: SpawnPointSeniorPhysician
-  parent: SpawnPointJobBase
-  name: seniorphysician
-  components:
-  - type: SpawnPoint
-    job_id: SeniorPhysician
-  - type: Sprite
-    layers:
-      - state: green
-      - state: seniorphysician
-
 - type: entity
   id: SpawnPointMedicalDoctor
   parent: SpawnPointJobBase
       - state: green
       - state: rd
 
-- type: entity
-  id: SpawnPointSeniorResearcher
-  parent: SpawnPointJobBase
-  name: seniorresearcher
-  components:
-  - type: SpawnPoint
-    job_id: SeniorResearcher
-  - type: Sprite
-    layers:
-      - state: green
-      - state: seniorresearcher
-
 - type: entity
   id: SpawnPointScientist
   parent: SpawnPointJobBase
       - state: green
       - state: warden
 
-- type: entity
-  id: SpawnPointSeniorOfficer
-  parent: SpawnPointJobBase
-  name: seniorofficer
-  components:
-  - type: SpawnPoint
-    job_id: SeniorOfficer
-  - type: Sprite
-    layers:
-      - state: green
-      - state: seniorofficer
-
 - type: entity
   id: SpawnPointSecurityOfficer
   parent: SpawnPointJobBase
index 2e662966537eee50ac82cc3cb83efe6dbf6de7bf..e7a5523725dea286108d67c260f2a8378adc7151 100644 (file)
     - JobIconChiefEngineer
     - JobIconBartender
     - JobIconHeadOfSecurity
-    - JobIconBrigmedic
     - JobIconMedicalDoctor
     - JobIconParamedic
     - JobIconChef
     - JobIconServiceWorker
     - JobIconSecurityCadet
     - JobIconZookeeper
-    - JobIconSeniorPhysician
-    - JobIconSeniorOfficer
-    - JobIconSeniorEngineer
-    - JobIconSeniorResearcher
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
     inHandsOnly: true
     layers:
     - state: default
     - state: idseniorengineer
-  - type: PresetIdCard
-    job: SeniorEngineer
 
 - type: entity
   parent: IDCardStandard
     layers:
     - state: default
     - state: idseniorresearcher
-  - type: PresetIdCard
-    job: SeniorResearcher
 
 - type: entity
   parent: IDCardStandard
     layers:
     - state: default
     - state: idseniorphysician
-  - type: PresetIdCard
-    job: SeniorPhysician
 
 - type: entity
   parent: IDCardStandard
     layers:
     - state: default
     - state: idseniorofficer
-  - type: PresetIdCard
-    job: SeniorOfficer
index a6370b35e1be610f0aa9366e293f9a76cf31768f..db30bc43d52546e262d19865a5af39e776a2399e 100644 (file)
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
-            SeniorEngineer: [ 1, 1 ]
-            StationEngineer: [ 2, 3 ]
+            StationEngineer: [ 3, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 1, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 4, 4 ]
             MedicalIntern: [ 4, 4 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]
-            Scientist: [ 3, 4 ]
+            Scientist: [ 4, 5 ]
             ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
             Detective: [ 1, 1 ]
-            SecurityOfficer: [ 3, 4 ]
+            SecurityOfficer: [ 4, 5 ]
             SecurityCadet: [ 4, 4 ]
             #supply
             Quartermaster: [ 1, 1 ]
@@ -65,4 +61,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+
index d0d2b22c5e2845882c25a43bbac18d281bfaeb34..e333c2782b3be0c45168709049922241e5041e70 100644 (file)
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
-            SeniorEngineer: [1, 1 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 1, 3 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 4, 4 ]
             MedicalIntern: [ 1, 3 ]
             Paramedic: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [1, 1 ]
-            Scientist: [ 3, 3 ]
+            Scientist: [ 4, 4 ]
             ResearchAssistant: [ 1, 3 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 4, 4 ]
             SecurityCadet: [ 1, 3 ]
             #supply
             Quartermaster: [ 1, 1 ]
index ac462937606a259b578e36902bc20ee3e66964d1..29ef32c51835025f77202464f18397d7cbf42d55 100644 (file)
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 3 ]
-            MedicalDoctor: [ 2, 2 ]
+            MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 4, 4 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
-            Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 4, 4 ] 
+            Scientist: [ 5, 5 ]
+            ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
             Lawyer: [ 2, 2 ]
index 8fa07ebe2a3e1ea55e33a1c42224a2dc44f4653e..72948997385099fe6569724dd144c6865600859c 100644 (file)
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            SeniorEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 4 ]
+            StationEngineer: [ 5, 5 ]
             TechnicalAssistant: [ 2, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 4, 4 ]
             MedicalIntern: [ 2, 4 ]
             Paramedic: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]
-            Scientist: [ 4, 4 ]
+            Scientist: [ 5, 5 ]
             ResearchAssistant: [2, 4]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
             Detective: [ 1, 1 ]
-            SecurityOfficer: [ 4, 4 ]
+            SecurityOfficer: [ 5, 5 ]
             SecurityCadet: [ 2, 4 ]
             #supply
             Quartermaster: [ 1, 1 ]
@@ -64,4 +60,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+
index ddf217580beed0c88f824342843987569fa63bad..50826fc5e097c4da1fe576340f8404f5d0381b7c 100644 (file)
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 4, 4 ]
+            StationEngineer: [ 5, 5 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 3 ]
-            MedicalDoctor: [ 3, 3 ]
+            MedicalDoctor: [ 4, 4 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 4, 4 ]
             Psychologist: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
-            Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 4, 4 ] 
+            Scientist: [ 5, 5 ]
+            ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SecurityOfficer: [ 4, 4 ]
+            SecurityOfficer: [ 5, 5 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
             Lawyer: [ 2, 2 ]
@@ -65,4 +61,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+
index 73d90122e1bca4b8cb3b8e10daf014c8206c4cb0..58344e0f72d20179cd6f2958cab707a7365bd5d1 100644 (file)
             ServiceWorker: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
-            StationEngineer: [ 2, 2 ]
+            StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 2, 2 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 1, 1 ]
-            MedicalDoctor: [ 1, 1 ]
+            MedicalDoctor: [ 2, 2 ]
             MedicalIntern: [ 2, 2 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1 , 1 ]
-            Scientist: [ 2, 2 ]
+            Scientist: [ 3, 3 ]
             ResearchAssistant: [ 2, 2 ]
             Borg: [ 1, 1 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
             Detective: [ 1, 1 ]
-            SecurityOfficer: [ 2, 2 ]
+            SecurityOfficer: [ 3, 3 ]
             SecurityCadet: [ 2, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
@@ -64,4 +60,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+
index 5e5bf61250d9270228128a51a46d3ee562f3655f..9ad4a3d403453ea1b16262d41de609b171c7ada9 100644 (file)
             ServiceWorker: [ 3, 3 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 4, 4 ]
             AtmosphericTechnician: [ 2, 2 ]
             TechnicalAssistant: [ 2, 2 ]
-            SeniorEngineer: [ 1, 1 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 2, 3 ]
+            MedicalDoctor: [ 3, 4 ]
             Chemist: [ 1, 2 ]
             MedicalIntern: [ 2, 2 ]
             Paramedic: [ 1, 2 ]
-            SeniorPhysician: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            Scientist: [ 2, 2 ]
+            Scientist: [ 3, 3 ]
             ResearchAssistant: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ] 
             #security
             HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 4, 4 ]
             Warden: [ 1, 1 ]
             Lawyer: [ 1, 1 ]
             SecurityCadet: [ 1, 1 ]
             Detective: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
             #supply
             CargoTechnician: [ 3, 3 ]
             Quartermaster: [ 1, 1 ]
index e4891b050960be32240d6fe6859f36b133c48768..5b824bd3512b5e63c2fc2f139fc55a7c3b1d9ce4 100644 (file)
             ServiceWorker: [ 3, 4 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 2, 2 ]
+            StationEngineer: [ 3, 3 ]
             AtmosphericTechnician: [ 2, 2 ]
             TechnicalAssistant: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 1, 2 ]
+            MedicalDoctor: [ 2, 3 ]
             Chemist: [ 1, 2 ]
             MedicalIntern: [ 1, 1 ]
             Paramedic: [ 1, 2 ]
-            SeniorPhysician: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            Scientist: [ 1, 2 ]
+            Scientist: [ 2, 3 ]
             ResearchAssistant: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ] 
             #security
             HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 2, 2 ]
+            SecurityOfficer: [ 3, 3 ]
             Warden: [ 1, 1 ]
             Lawyer: [ 1, 1 ]
             SecurityCadet: [ 3, 3 ]
             Detective: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
             #supply
             CargoTechnician: [ 3, 3 ]
             Quartermaster: [ 1, 1 ]
index 91e6db642d1339fc148797e0bd94c13d87009685..2d9287a390ee56967ff5372ef8f19934652e4d61 100644 (file)
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 4, 4 ]
+            StationEngineer: [ 5, 5 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 3, 3 ]
-            MedicalDoctor: [ 5, 5 ]
+            MedicalDoctor: [ 6, 6 ]
             Paramedic: [ 2, 2 ]
             MedicalIntern: [ 4, 4 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
-            Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 6, 6 ] 
+            Scientist: [ 5, 5 ]
+            ResearchAssistant: [ 6, 6 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SecurityOfficer: [ 7, 7 ]
+            SecurityOfficer: [ 8, 8 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
             Lawyer: [ 2, 2 ]
index 9dd3997636b59b8a936901a8029666cbf2cb32fe..20d2db29481a3e3bd70e777834f33470397a68f3 100644 (file)
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            SeniorEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 6 ]
+            StationEngineer: [ 5, 7 ]
             TechnicalAssistant: [ 8, 8 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 3 ]
             Paramedic: [ 2, 2 ]
-            MedicalDoctor: [ 3, 5 ]
+            MedicalDoctor: [ 4, 6 ]
             MedicalIntern: [ 8, 8 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]
-            Scientist: [ 4, 6 ]
+            Scientist: [ 5, 7 ]
             ResearchAssistant: [ 8, 8 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
             Detective: [ 1, 1 ]
-            SecurityOfficer: [ 4, 6 ]
+            SecurityOfficer: [ 5, 7 ]
             SecurityCadet: [ 8, 8 ]
             #supply
             Quartermaster: [ 1, 1 ]
index 2b56a5340b96cbaa398079a88d12b5ee57e7a26b..f95e06eb5ad2157ef349782ccee88c52d56f246c 100644 (file)
             ServiceWorker: [ 2, 2 ]\r
             #engineering\r
             ChiefEngineer: [ 1, 1 ]\r
-            SeniorEngineer: [ 1, 1 ]\r
             AtmosphericTechnician: [ 3, 3 ]\r
-            StationEngineer: [ 3, 3 ]\r
+            StationEngineer: [ 4, 4 ]\r
             TechnicalAssistant: [ 3, 3 ]\r
             #medical\r
             ChiefMedicalOfficer: [ 1, 1 ]\r
-            SeniorPhysician: [ 1, 1 ]\r
             Chemist: [ 3, 3 ]\r
-            MedicalDoctor: [ 3, 3 ]\r
+            MedicalDoctor: [ 4, 4 ]\r
             MedicalIntern: [ 3, 3 ]\r
             Psychologist: [ 1, 1 ]\r
             Paramedic: [ 1, 1 ]\r
             #science\r
             ResearchDirector: [ 1, 1 ]\r
-            SeniorResearcher: [ 1, 1 ]        \r
-            Scientist: [ 3, 3 ]\r
-            ResearchAssistant: [ 3, 3 ] \r
+            Scientist: [ 4, 4 ]\r
+            ResearchAssistant: [ 3, 3 ]\r
             Borg: [ 2, 2 ]\r
             #security\r
             HeadOfSecurity: [ 1, 1 ]\r
             Warden: [ 1, 1 ]\r
-            SeniorOfficer: [ 1, 1 ]\r
-            SecurityOfficer: [ 3, 3 ]\r
+            SecurityOfficer: [ 4, 4 ]\r
             Detective: [ 1, 1 ]\r
             SecurityCadet: [ 4, 4 ]\r
             Lawyer: [ 2, 2 ]\r
index 2128d9adbb40a820f1a1e0f0d5fd6038159ff4d2..3afcead1594db3c82fd29553110e0ad015f3258e 100644 (file)
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 4, 6 ]
+            StationEngineer: [ 5, 7 ]
             TechnicalAssistant: [ 3, 6 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 3, 3 ]
-            MedicalDoctor: [ 4, 4 ]
+            MedicalDoctor: [ 5, 5 ]
             MedicalIntern: [ 3, 6 ]
             Paramedic: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
-            Scientist: [ 4, 6 ]
-            ResearchAssistant: [ 3, 6 ] 
+            Scientist: [ 5, 7 ]
+            ResearchAssistant: [ 3, 6 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SecurityOfficer: [ 4, 6 ]
+            SecurityOfficer: [ 5, 7 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 3, 6 ]
             Lawyer: [ 2, 2 ]
index eb023c0b1fe31166455cdebad2c0446ff2129739..97deafa0078c4a6408b70c4bda80e0b234742449 100644 (file)
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
-            StationEngineer: [ 2, 2 ]
+            StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 2, 2 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 2, 2 ]
+            MedicalDoctor: [ 3, 3 ]
             MedicalIntern: [ 2, 2 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
-            Scientist: [ 3, 3 ]
-            ResearchAssistant: [ 2, 2 ] 
+            Scientist: [ 4, 4 ]
+            ResearchAssistant: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             Lawyer: [ 1, 1 ]
index 2e38e56064b26ae52a89cdb8c3acbe8b5b4507c0..128148989129d19f873b3d1107095cb343fe165d 100644 (file)
             ServiceWorker: [ 3, 4 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 5, 5 ]
+            StationEngineer: [ 6, 6 ]
             TechnicalAssistant: [ 2, 3 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 3 ]
             Paramedic: [ 1, 1 ]
-            MedicalDoctor: [ 5, 5 ]
+            MedicalDoctor: [ 6, 6 ]
             Psychologist: [ 1, 1 ]
             MedicalIntern: [ 1, 2 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]
-            Scientist: [ 5, 5 ]
+            Scientist: [ 6, 6 ]
             ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
             Detective: [ 1, 1 ]
-            SecurityOfficer: [ 6, 6 ]
+            SecurityOfficer: [ 7, 7 ]
             SecurityCadet: [ 2, 4 ]
             #supply
             Quartermaster: [ 1, 1 ]
@@ -67,4 +63,4 @@
             Musician: [ 2, 2 ]
             Boxer: [ 1, 1 ]
             Reporter: [ 1, 1 ]
-            
+
index d93d1ec7dd76ff5dea5a1300bc95b71d58533688..ab41b9c927246dcdc0513f8e1a53fa56bbf65678 100644 (file)
             ServiceWorker: [ 2, 2 ]\r
             #engineering\r
             ChiefEngineer: [ 1, 1 ]\r
-            SeniorEngineer: [ 1, 1 ]\r
             AtmosphericTechnician: [ 2, 2 ]\r
-            StationEngineer: [ 3, 3 ]\r
+            StationEngineer: [ 4, 4 ]\r
             TechnicalAssistant: [ 3, 3 ]\r
             #medical\r
             ChiefMedicalOfficer: [ 1, 1 ]\r
-            SeniorPhysician: [ 1, 1 ]\r
             Chemist: [ 2, 2 ]\r
-            MedicalDoctor: [ 2, 2 ]\r
+            MedicalDoctor: [ 3, 3 ]\r
             MedicalIntern: [ 2, 2 ]\r
             Paramedic: [ 1, 1 ]\r
             #science\r
             ResearchDirector: [ 1, 1 ]\r
-            SeniorResearcher: [ 1, 1 ]        \r
-            Scientist: [ 3, 3 ]\r
-            ResearchAssistant: [ 2, 2 ] \r
+            Scientist: [ 4, 4 ]\r
+            ResearchAssistant: [ 2, 2 ]\r
             #security\r
             HeadOfSecurity: [ 1, 1 ]\r
             Warden: [ 1, 1 ]\r
-            SeniorOfficer: [ 1, 1 ]\r
-            SecurityOfficer: [ 3, 3 ]\r
+            SecurityOfficer: [ 4, 4 ]\r
             Detective: [ 1, 1 ]\r
             SecurityCadet: [ 2, 2 ]\r
             Lawyer: [ 1, 1 ]\r
index b41286688dbe6d8f1e46cf09922b71e1fbd97054..345261c543a13670c39597dbdb7c91830529c202 100644 (file)
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
-            SeniorEngineer: [1, 1 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 2 ]
-            MedicalDoctor: [ 2, 2 ]
+            MedicalDoctor: [ 3, 3 ]
             MedicalIntern: [ 4, 4 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [1, 1 ]
-            Scientist: [ 3, 3 ]
+            Scientist: [ 4, 4 ]
             ResearchAssistant: [ 2, 2 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
-            SecurityOfficer: [ 3, 3 ]
+            SecurityOfficer: [ 4, 4 ]
             SecurityCadet: [ 4, 4 ]
             #supply
             Quartermaster: [ 1, 1 ]
@@ -61,4 +57,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
deleted file mode 100644 (file)
index 0b10289..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- type: job
-  id: SeniorEngineer
-  name: job-name-senior-engineer
-  description: job-description-senior-engineer
-  playTimeTracker: JobSeniorEngineer
-  requirements:
-    - !type:RoleTimeRequirement
-      role: JobAtmosphericTechnician
-      time: 21600 #6 hrs
-    - !type:RoleTimeRequirement
-      role: JobStationEngineer
-      time: 21600 #6 hrs
-    - !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 216000 # 60 hrs
-  startingGear: SeniorEngineerGear
-  icon: "JobIconSeniorEngineer"
-  supervisors: job-supervisors-ce
-  access:
-  - Maintenance
-  - Engineering
-  - External
-  - Atmospherics
-
-- type: startingGear
-  id: SeniorEngineerGear
-  equipment:
-    head: ClothingHeadHatBeretEngineering
-    jumpsuit: ClothingUniformJumpsuitSeniorEngineer
-    back: ClothingBackpackEngineeringFilled
-    shoes: ClothingShoesBootsWork
-    id: SeniorEngineerPDA
-    eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilityEngineering
-    ears: ClothingHeadsetEngineering
-  innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer
-  satchel: ClothingBackpackSatchelEngineeringFilled
-  duffelbag: ClothingBackpackDuffelEngineeringFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
deleted file mode 100644 (file)
index f10b22f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-- type: job
-  id: SeniorPhysician
-  name: job-name-senior-physician
-  description: job-description-senior-physician
-  playTimeTracker: JobSeniorPhysician
-  requirements:
-    - !type:RoleTimeRequirement
-      role: JobChemist
-      time: 21600 #6 hrs
-    - !type:RoleTimeRequirement
-      role: JobMedicalDoctor
-      time: 21600 #6 hrs
-    - !type:DepartmentTimeRequirement
-      department: Medical
-      time: 216000 # 60 hrs
-  startingGear: SeniorPhysicianGear
-  icon: "JobIconSeniorPhysician"
-  supervisors: job-supervisors-cmo
-  access:
-  - Medical
-  - Maintenance
-  - Chemistry
-
-- type: startingGear
-  id: SeniorPhysicianGear
-  equipment:
-    head: ClothingHeadHatBeretSeniorPhysician
-    jumpsuit: ClothingUniformJumpsuitSeniorPhysician
-    back: ClothingBackpackMedicalFilled
-    shoes: ClothingShoesColorBlack
-    outerClothing: ClothingOuterCoatLabSeniorPhysician
-    id: SeniorPhysicianPDA
-    ears: ClothingHeadsetMedical
-    belt: ClothingBeltMedicalFilled
-  innerClothingSkirt: ClothingUniformJumpskirtSeniorPhysician
-  satchel: ClothingBackpackSatchelMedicalFilled
-  duffelbag: ClothingBackpackDuffelMedicalFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
deleted file mode 100644 (file)
index 036243e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: job
-  id: SeniorResearcher
-  name: job-name-senior-researcher
-  description: job-description-senior-researcher
-  playTimeTracker: JobSeniorResearcher
-  requirements:
-    - !type:DepartmentTimeRequirement
-      department: Science
-      time: 216000 #60 hrs
-  startingGear: SeniorResearcherGear
-  icon: "JobIconSeniorResearcher"
-  supervisors: job-supervisors-rd
-  access:
-  - Research
-  - Maintenance
-
-- type: startingGear
-  id: SeniorResearcherGear
-  equipment:
-    head: ClothingHeadHatBeretRND
-    jumpsuit: ClothingUniformJumpsuitSeniorResearcher
-    back: ClothingBackpackScienceFilled
-    shoes: ClothingShoesColorBlack
-    outerClothing: ClothingOuterCoatLabSeniorResearcher
-    id: SeniorResearcherPDA
-    ears: ClothingHeadsetScience
-  innerClothingSkirt: ClothingUniformJumpskirtSeniorResearcher
-  satchel: ClothingBackpackSatchelScienceFilled
-  duffelbag: ClothingBackpackDuffelScienceFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
deleted file mode 100644 (file)
index 36f8b3e..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-- type: job
-  id: SeniorOfficer
-  name: job-name-senior-officer
-  description: job-description-senior-officer
-  playTimeTracker: JobSeniorOfficer
-  requirements:
-    - !type:RoleTimeRequirement
-      role: JobWarden
-      time: 21600 #6 hrs
-    - !type:RoleTimeRequirement
-      role: JobDetective
-      time: 7200 #2 hrs
-    - !type:RoleTimeRequirement
-      role: JobSecurityOfficer
-      time: 21600 #6 hrs
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 216000 # 60 hrs
-  startingGear: SeniorOfficerGear
-  icon: "JobIconSeniorOfficer"
-  supervisors: job-supervisors-hos
-  canBeAntag: false
-  access:
-  - Security
-  - Brig
-  - Maintenance
-  - Service
-  - External
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-
-- type: startingGear
-  id: SeniorOfficerGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSeniorOfficer
-    back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSecurity
-    head: ClothingHeadHatBeretSecurity
-    outerClothing: ClothingOuterArmorBasic
-    id: SeniorOfficerPDA
-    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-  innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer
-  satchel: ClothingBackpackSatchelSecurityFilled
-  duffelbag: ClothingBackpackDuffelSecurityFilled
index be61540c395d8ab2ffe5026216e8363467fb7f6f..5b5ee2252de00be2aade2b2c37514b33044549ce 100644 (file)
@@ -51,7 +51,6 @@
   roles:
   - AtmosphericTechnician
   - ChiefEngineer
-  - SeniorEngineer
   - StationEngineer
   - TechnicalAssistant
 
@@ -66,7 +65,6 @@
   - MedicalIntern
   - Psychologist
   - Paramedic
-  - SeniorPhysician
 
 - type: department
   id: Security
@@ -76,7 +74,6 @@
   - HeadOfSecurity
   - SecurityCadet
   - SecurityOfficer
-  - SeniorOfficer
   - Detective
   - Warden
 
@@ -86,7 +83,6 @@
   color: "#D381C9"
   roles:
   - ResearchDirector
-  - SeniorResearcher
   - Scientist
   - ResearchAssistant
 
index 58eab7864bb641dc7b52243f4b33d0963ab30e5a..0e344780f1a25901e0e6d008e8c1d6475dbb7301 100644 (file)
 - type: playTimeTracker
   id: JobSecurityOfficer
 
-- type: playTimeTracker
-  id: JobSeniorEngineer
-
-- type: playTimeTracker
-  id: JobSeniorOfficer
-
-- type: playTimeTracker
-  id: JobSeniorPhysician
-
-- type: playTimeTracker
-  id: JobSeniorResearcher
-
 - type: playTimeTracker
   id: JobServiceWorker
 
index 43a596b4aa3230e726683a1013566d69f603f325..07a6c77831ec0301dcbc7315face870d7900638b 100644 (file)
@@ -87,3 +87,9 @@ GeneratorPlasma: PortableGeneratorPacman
 GeneratorUranium: PortableGeneratorSuperPacman
 GeneratorPlasmaMachineCircuitboard: PortableGeneratorPacmanMachineCircuitboard
 GeneratorUraniumMachineCircuitboard: PortableGeneratorSuperPacmanMachineCircuitboard
+
+# 2023-12-10
+SpawnPointSeniorResearcher: null
+SpawnPointSeniorOfficer: null
+SpawnPointSeniorEngineer: null
+SpawnPointSeniorPhysician: null