diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 42ef30bd15..37cc3d4d56 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -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. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index a10cb0d6a6..1f7e1c1e0e 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -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 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index d71ab49e32..344bd6a081 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1035,7 +1035,6 @@ whitelist: - Zookeeper - Scientist - - SeniorResearcher - ResearchDirector - Chef diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 1e0ef876a0..0bb8fd248b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -336,18 +336,6 @@ - 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 @@ -386,18 +374,6 @@ - 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 @@ -448,18 +424,6 @@ - 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 @@ -498,18 +462,6 @@ - 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 2e66296653..e7a5523725 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -562,7 +562,6 @@ - JobIconChiefEngineer - JobIconBartender - JobIconHeadOfSecurity - - JobIconBrigmedic - JobIconMedicalDoctor - JobIconParamedic - JobIconChef @@ -577,10 +576,6 @@ - JobIconServiceWorker - JobIconSecurityCadet - JobIconZookeeper - - JobIconSeniorPhysician - - JobIconSeniorOfficer - - JobIconSeniorEngineer - - JobIconSeniorResearcher - type: ActivatableUI key: enum.AgentIDCardUiKey.Key inHandsOnly: true @@ -743,8 +738,6 @@ layers: - state: default - state: idseniorengineer - - type: PresetIdCard - job: SeniorEngineer - type: entity parent: IDCardStandard @@ -755,8 +748,6 @@ layers: - state: default - state: idseniorresearcher - - type: PresetIdCard - job: SeniorResearcher - type: entity parent: IDCardStandard @@ -767,8 +758,6 @@ layers: - state: default - state: idseniorphysician - - type: PresetIdCard - job: SeniorPhysician - type: entity parent: IDCardStandard @@ -779,5 +768,3 @@ layers: - state: default - state: idseniorofficer - - type: PresetIdCard - job: SeniorOfficer diff --git a/Resources/Prototypes/Maps/aspid.yml b/Resources/Prototypes/Maps/aspid.yml index a6370b35e1..db30bc43d5 100644 --- a/Resources/Prototypes/Maps/aspid.yml +++ b/Resources/Prototypes/Maps/aspid.yml @@ -33,28 +33,24 @@ #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 ] - + diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index d0d2b22c5e..e333c2782b 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -30,27 +30,23 @@ #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 ] diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index ac46293760..29ef32c518 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -31,28 +31,24 @@ 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 ] diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml index 8fa07ebe2a..7294899738 100644 --- a/Resources/Prototypes/Maps/barratry.yml +++ b/Resources/Prototypes/Maps/barratry.yml @@ -33,27 +33,23 @@ #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 ] - + diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index ddf217580b..50826fc5e0 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -30,29 +30,25 @@ 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 ] - + diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 73d90122e1..58344e0f72 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -32,28 +32,24 @@ 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 ] - + diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 5e5bf61250..9ad4a3d403 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -31,30 +31,26 @@ 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 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index e4891b0509..5b824bd351 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -31,30 +31,26 @@ 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 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 91e6db642d..2d9287a390 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -30,28 +30,24 @@ 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 ] diff --git a/Resources/Prototypes/Maps/gemini.yml b/Resources/Prototypes/Maps/gemini.yml index 9dd3997636..20d2db2948 100644 --- a/Resources/Prototypes/Maps/gemini.yml +++ b/Resources/Prototypes/Maps/gemini.yml @@ -33,28 +33,24 @@ #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 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 2b56a5340b..f95e06eb5a 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -31,29 +31,25 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 3, 3 ] + StationEngineer: [ 4, 4 ] TechnicalAssistant: [ 3, 3 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] Chemist: [ 3, 3 ] - MedicalDoctor: [ 3, 3 ] + MedicalDoctor: [ 4, 4 ] MedicalIntern: [ 3, 3 ] Psychologist: [ 1, 1 ] Paramedic: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] - SeniorResearcher: [ 1, 1 ] - Scientist: [ 3, 3 ] - ResearchAssistant: [ 3, 3 ] + Scientist: [ 4, 4 ] + ResearchAssistant: [ 3, 3 ] 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 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 2128d9adbb..3afcead159 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -30,28 +30,24 @@ 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 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index eb023c0b1f..97deafa007 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -29,26 +29,22 @@ 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 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 2e38e56064..1281489891 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -31,30 +31,26 @@ 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 ] - + diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index d93d1ec7dd..ab41b9c927 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -29,27 +29,23 @@ ServiceWorker: [ 2, 2 ] #engineering ChiefEngineer: [ 1, 1 ] - SeniorEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] - StationEngineer: [ 3, 3 ] + StationEngineer: [ 4, 4 ] TechnicalAssistant: [ 3, 3 ] #medical ChiefMedicalOfficer: [ 1, 1 ] - SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 2 ] - MedicalDoctor: [ 2, 2 ] + MedicalDoctor: [ 3, 3 ] MedicalIntern: [ 2, 2 ] Paramedic: [ 1, 1 ] #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 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index b41286688d..345261c543 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -31,26 +31,22 @@ #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 index 0b10289482..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ /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 index f10b22f3ba..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ /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 index 036243e49b..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ /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 index 36f8b3effb..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ /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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index be61540c39..5b5ee2252d 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -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 diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 58eab7864b..0e344780f1 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -121,18 +121,6 @@ - type: playTimeTracker id: JobSecurityOfficer -- type: playTimeTracker - id: JobSeniorEngineer - -- type: playTimeTracker - id: JobSeniorOfficer - -- type: playTimeTracker - id: JobSeniorPhysician - -- type: playTimeTracker - id: JobSeniorResearcher - - type: playTimeTracker id: JobServiceWorker diff --git a/Resources/migration.yml b/Resources/migration.yml index 43a596b4aa..07a6c77831 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -87,3 +87,9 @@ GeneratorPlasma: PortableGeneratorPacman GeneratorUranium: PortableGeneratorSuperPacman GeneratorPlasmaMachineCircuitboard: PortableGeneratorPacmanMachineCircuitboard GeneratorUraniumMachineCircuitboard: PortableGeneratorSuperPacmanMachineCircuitboard + +# 2023-12-10 +SpawnPointSeniorResearcher: null +SpawnPointSeniorOfficer: null +SpawnPointSeniorEngineer: null +SpawnPointSeniorPhysician: null