Merge branch 'upstream-merge' into 'arumoon-server'

TG Meta update See merge request Workbench-Team/space-station-14!96
Workbench-Team · Jul 30, 2023 · 7664dbd · 7664dbd
2 parents cabd7f4 + 110c1bc
commit 7664dbd
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 15 deletions.
diff --git a/Resources/Maps/metastation.yml b/Resources/Maps/metastation.yml
@@ -150892,11 +150892,6 @@ entities:
       type: Transform
 - proto: LockerAtmosphericsFilled
   entities:
-  - uid: 21043
-    components:
-    - pos: 75.5,-18.5
-      parent: 2
-      type: Transform
   - uid: 28960
     components:
     - pos: 57.5,-26.5
@@ -150912,6 +150907,13 @@ entities:
     - pos: 45.5,-38.5
       parent: 2
       type: Transform
+- proto: LockerAtmosphericsFilledHardsuit
+  entities:
+  - uid: 21043
+    components:
+    - pos: 75.5,-18.5
+      parent: 2
+      type: Transform
 - proto: LockerBoozeFilled
   entities:
   - uid: 10546
@@ -151270,9 +151272,14 @@ entities:
       type: Transform
 - proto: LockerMedicalFilled
   entities:
-  - uid: 27821
+  - uid: 32221
     components:
-    - pos: 7.5,-22.5
+    - pos: -22.5,-53.5
+      parent: 2
+      type: Transform
+  - uid: 32222
+    components:
+    - pos: -30.5,-40.5
       parent: 2
       type: Transform
 - proto: LockerMedicineFilled
@@ -151282,6 +151289,18 @@ entities:
     - pos: -50.5,-55.5
       parent: 2
       type: Transform
+  - uid: 27821
+    components:
+    - pos: 7.5,-22.5
+      parent: 2
+      type: Transform
+- proto: LockerParamedicFilled
+  entities:
+  - uid: 32220
+    components:
+    - pos: -18.5,-33.5
+      parent: 2
+      type: Transform
 - proto: LockerQuarterMasterFilled
   entities:
   - uid: 10383
@@ -178819,6 +178838,11 @@ entities:
     - pos: -7.5,-35.5
       parent: 2
       type: Transform
+  - uid: 32223
+    components:
+    - pos: -19.5,-33.5
+      parent: 2
+      type: Transform
 - proto: SpawnPointPsychologist
   entities:
   - uid: 25727
@@ -178955,6 +178979,34 @@ entities:
     - pos: 4.5,31.5
       parent: 2
       type: Transform
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 32224
+    components:
+    - pos: 76.5,-18.5
+      parent: 2
+      type: Transform
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 32218
+    components:
+    - pos: 12.5,30.5
+      parent: 2
+      type: Transform
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 32219
+    components:
+    - pos: -24.5,-46.5
+      parent: 2
+      type: Transform
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 17386
+    components:
+    - pos: 15.5,-66.5
+      parent: 2
+      type: Transform
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 1867

diff --git a/Resources/Prototypes/Maps/metastation.yml b/Resources/Prototypes/Maps/metastation.yml
@@ -18,36 +18,41 @@
           overflowJobs:
             - Passenger
           availableJobs:
-      #Command
+        #Command
            Captain: [ 1, 1 ]
            HeadOfPersonnel: [ 1, 1 ]
            HeadOfSecurity: [ 1, 1 ]
            ChiefEngineer: [ 1, 1 ]
            ChiefMedicalOfficer: [ 1, 1 ]
            ResearchDirector: [ 1, 1 ]
            Quartermaster: [ 1, 1 ]
-      #Security
+        #Seniors
+           SeniorOfficer: [ 1, 1]
+           SeniorEngineer: [ 1, 1]
+           SeniorPhysician: [ 1, 1]
+           SeniorResearcher: [ 1, 1]
+        #Security
            Warden: [ 1, 1 ]
            Detective: [ 1, 1 ]
            SecurityOfficer: [ 6, 6 ]
            SecurityCadet: [ 4, 4 ]
            Lawyer: [ 2, 2 ]
-      #Engineering
+        #Engineering
            AtmosphericTechnician: [ 3, 3 ]
            StationEngineer: [ 4, 4 ]
            TechnicalAssistant: [ 4, 4 ]
-      #Medical
+        #Medical
            Chemist: [ 3, 3 ]
-           Paramedic: [ 1, 1 ]
+           Paramedic: [ 2, 2 ]
            MedicalDoctor: [ 4, 4 ]
            MedicalIntern: [ 4, 4 ]
-      #Science
+        #Science
            Scientist: [ 6, 6 ]
            ResearchAssistant: [ 4, 4 ]
-      #Cargo
+        #Cargo
            SalvageSpecialist: [ 3, 3 ]
            CargoTechnician: [ 3, 3 ]
-      #Service
+        #Service
            Passenger: [ -1, -1 ]
            Bartender: [ 2, 2 ]
            Botanist: [ 3, 3 ]