From 28c5f37570f137829e2f0c66c71f14c2f50be459 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Tue, 25 Jul 2023 23:40:56 -0600
Subject: [PATCH] Meta update (#18314)

* meta update

* Update meta.yml

* Update meta.yml

* meta
---
 Resources/Maps/meta.yml            | 160 +++++++++++++++++------------
 Resources/Prototypes/Maps/meta.yml |  57 +++++-----
 2 files changed, 131 insertions(+), 86 deletions(-)

diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index c31ce64092..bc8cc73177 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -530,6 +530,8 @@ entities:
             3147: -40,23
             3148: -40,24
             3149: -40,25
+            3257: 55,-1
+            3258: 55,0
         - node:
             color: '#FFFFFFFF'
             id: BotGreyscale
@@ -7111,6 +7113,7 @@ entities:
             0: 65535
           5,-16:
             0: 61873
+            6: 64
           5,-15:
             0: 65535
           5,-14:
@@ -7119,6 +7122,7 @@ entities:
             0: 65535
           6,-16:
             0: 64764
+            6: 514
           6,-15:
             0: 65535
           6,-14:
@@ -7127,6 +7131,7 @@ entities:
             0: 65535
           7,-16:
             0: 32627
+            6: 140
           7,-15:
             0: 65527
           7,-14:
@@ -7259,16 +7264,21 @@ entities:
             0: 59953
           6,-18:
             0: 12602
+            6: 512
           6,-17:
             0: 59953
+            6: 2
           7,-19:
             0: 12900
+            6: 34952
           7,-17:
             0: 12900
+            6: 34952
           7,-20:
             0: 58466
           7,-18:
             0: 58466
+            6: 2184
           6,-23:
             0: 59953
           6,-22:
@@ -123377,21 +123387,6 @@ entities:
       type: ContainerContainer
     - canCollide: True
       type: Physics
-  - uid: 8194
-    components:
-    - pos: 17.59783,31.574615
-      parent: 5350
-      type: Transform
-    - containers:
-        cellslot_cell_container: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        cell_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-      type: ContainerContainer
   - uid: 10515
     components:
     - pos: 8.57861,46.945236
@@ -123706,6 +123701,13 @@ entities:
       type: HandheldLight
     - canCollide: True
       type: Physics
+- proto: LampInterrogator
+  entities:
+  - uid: 999
+    components:
+    - pos: 17.577362,31.802523
+      parent: 5350
+      type: Transform
 - proto: lantern
   entities:
   - uid: 22071
@@ -124425,53 +124427,43 @@ entities:
         - 0
         - 0
       type: EntityStorage
-- proto: LockerEngineerFilled
+- proto: LockerEngineerFilledHardsuit
   entities:
-  - uid: 23371
+  - uid: 1483
     components:
     - pos: 47.5,17.5
       parent: 5350
       type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.1495
-        moles:
-        - 3.848459
-        - 14.477538
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-- proto: LockerEngineerFilledHardsuit
-  entities:
-  - uid: 22146
+  - uid: 3701
     components:
     - pos: 57.5,0.5
       parent: 5350
       type: Transform
-  - uid: 22147
+  - uid: 8194
     components:
     - pos: 57.5,-0.5
       parent: 5350
       type: Transform
-  - uid: 22148
+  - uid: 10354
     components:
     - pos: 57.5,-1.5
       parent: 5350
       type: Transform
-  - uid: 22149
+  - uid: 10355
     components:
     - pos: 57.5,-2.5
       parent: 5350
       type: Transform
+  - uid: 22149
+    components:
+    - pos: 55.5,-0.5
+      parent: 5350
+      type: Transform
+  - uid: 23371
+    components:
+    - pos: 55.5,0.5
+      parent: 5350
+      type: Transform
 - proto: LockerEvidence
   entities:
   - uid: 6564
@@ -140173,7 +140165,7 @@ entities:
     - pos: 9.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -25678.453
+    - SecondsUntilStateChange: -26137.268
       state: Closing
       type: Door
     - links:
@@ -140184,7 +140176,7 @@ entities:
     - pos: 10.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -25678.453
+    - SecondsUntilStateChange: -26137.268
       state: Closing
       type: Door
     - links:
@@ -140195,7 +140187,7 @@ entities:
     - pos: 11.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -25678.453
+    - SecondsUntilStateChange: -26137.268
       state: Closing
       type: Door
     - links:
@@ -140206,7 +140198,7 @@ entities:
     - pos: 13.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -25678.453
+    - SecondsUntilStateChange: -26137.268
       state: Closing
       type: Door
     - links:
@@ -140217,7 +140209,7 @@ entities:
     - pos: 14.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -25678.453
+    - SecondsUntilStateChange: -26137.268
       state: Closing
       type: Door
     - links:
@@ -140228,7 +140220,7 @@ entities:
     - pos: 15.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -25678.453
+    - SecondsUntilStateChange: -26137.268
       state: Closing
       type: Door
     - links:
@@ -144630,6 +144622,11 @@ entities:
     - pos: -34.5,-34.5
       parent: 5350
       type: Transform
+  - uid: 26634
+    components:
+    - pos: -35.5,-34.5
+      parent: 5350
+      type: Transform
 - proto: SpawnPointMime
   entities:
   - uid: 3255
@@ -144677,6 +144674,11 @@ entities:
     - pos: 24.5,-56.5
       parent: 5350
       type: Transform
+  - uid: 26635
+    components:
+    - pos: 25.5,-56.5
+      parent: 5350
+      type: Transform
 - proto: SpawnPointResearchDirector
   entities:
   - uid: 22494
@@ -144735,6 +144737,11 @@ entities:
     - pos: 1.5,39.5
       parent: 5350
       type: Transform
+  - uid: 26632
+    components:
+    - pos: 1.5,38.5
+      parent: 5350
+      type: Transform
 - proto: SpawnPointSecurityOfficer
   entities:
   - uid: 10520
@@ -144757,6 +144764,34 @@ entities:
     - pos: -0.5,44.5
       parent: 5350
       type: Transform
+- proto: SpawnPointSeniorEngineer
+  entities:
+  - uid: 26637
+    components:
+    - pos: 51.5,3.5
+      parent: 5350
+      type: Transform
+- proto: SpawnPointSeniorOfficer
+  entities:
+  - uid: 26631
+    components:
+    - pos: 1.5,40.5
+      parent: 5350
+      type: Transform
+- proto: SpawnPointSeniorPhysician
+  entities:
+  - uid: 26633
+    components:
+    - pos: -36.5,-34.5
+      parent: 5350
+      type: Transform
+- proto: SpawnPointSeniorResearcher
+  entities:
+  - uid: 26636
+    components:
+    - pos: 26.5,-56.5
+      parent: 5350
+      type: Transform
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 7352
@@ -144793,19 +144828,19 @@ entities:
       type: Transform
 - proto: SpawnPointTechnicalAssistant
   entities:
-  - uid: 999
+  - uid: 22146
     components:
-    - pos: 55.5,3.5
+    - pos: 52.5,0.5
       parent: 5350
       type: Transform
-  - uid: 3701
+  - uid: 22147
     components:
-    - pos: 55.5,4.5
+    - pos: 51.5,0.5
       parent: 5350
       type: Transform
-  - uid: 10355
+  - uid: 22148
     components:
-    - pos: 54.5,3.5
+    - pos: 52.5,3.5
       parent: 5350
       type: Transform
 - proto: SpawnPointWarden
@@ -145584,16 +145619,6 @@ entities:
     - pos: 49.5,10.5
       parent: 5350
       type: Transform
-  - uid: 1483
-    components:
-    - pos: 55.5,-0.5
-      parent: 5350
-      type: Transform
-  - uid: 10354
-    components:
-    - pos: 55.5,0.5
-      parent: 5350
-      type: Transform
 - proto: SuitStorageEVA
   entities:
   - uid: 1488
@@ -151763,6 +151788,15 @@ entities:
     - pos: 1.5,-34.5
       parent: 5350
       type: Transform
+- proto: VendingMachineRobotics
+  entities:
+  - uid: 26638
+    components:
+    - flags: SessionSpecific
+      type: MetaData
+    - pos: 4.5,-32.5
+      parent: 5350
+      type: Transform
 - proto: VendingMachineSalvage
   entities:
   - uid: 1503
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index 1375f26c54..38a2c55101 100644
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -18,37 +18,48 @@
           overflowJobs:
             - Passenger
           availableJobs:
-            CargoTechnician: [ 3, 3 ]
-            Passenger: [ -1, -1 ]
-            Bartender: [ 2, 2 ]
-            Botanist: [ 3, 3 ]
-            Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
-            Janitor: [ 3, 3 ]
-            Mime: [ 1, 1 ]
+            #service
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            Bartender: [ 2, 2 ]
+            Botanist: [ 2, 3 ]
+            Chef: [ 2, 2 ]
+            Janitor: [ 1, 2 ]
+            Chaplain: [ 1, 1 ]
+            Librarian: [ 1, 1 ]
+            ServiceWorker: [ 2, 2 ]
+            #engineering
             ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 4 ]
+            SeniorEngineer: [ 1, 1 ]
+            AtmosphericTechnician: [ 3, 3 ]
+            StationEngineer: [ 4, 6 ]
+            TechnicalAssistant: [ 3, 6 ]
+            #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 4, 4 ]
+            SeniorPhysician: [ 1, 1 ]
             Chemist: [ 3, 3 ]
+            MedicalDoctor: [ 4, 4 ]
+            MedicalIntern: [ 3, 6 ]
+            Paramedic: [ 1, 1 ]
+            #science
             ResearchDirector: [ 1, 1 ]
-            Scientist: [ 6, 6 ]
+            SeniorResearcher: [ 1, 1 ]        
+            Scientist: [ 4, 6 ]
+            ResearchAssistant: [ 3, 6 ] 
+            #security
             HeadOfSecurity: [ 1, 1 ]
-            SecurityOfficer: [ 6, 6 ]
-            Chaplain: [ 2, 2 ]
             Warden: [ 1, 1 ]
-            Librarian: [ 2, 2 ]
+            SeniorOfficer: [ 1, 1 ]
+            SecurityOfficer: [ 4, 6 ]
+            Detective: [ 1, 1 ]
+            SecurityCadet: [ 3, 6 ]
             Lawyer: [ 2, 2 ]
+            #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
-            Musician: [ 2, 2 ]
-            AtmosphericTechnician: [ 3, 3 ]
-            TechnicalAssistant: [ 8, 8 ]
-            MedicalIntern: [ 8, 8 ]
-            ServiceWorker: [ 4, 4 ]
-            SecurityCadet: [ 8, 8 ]
-            Detective: [ 1, 1 ]
-            ResearchAssistant: [ 8, 8 ]
-            Paramedic: [ 1, 1 ]
+            CargoTechnician: [ 3, 3 ]
+            #civilian
+            Passenger: [ -1, -1 ]
+            Clown: [ 1, 1 ]
+            Mime: [ 1, 1 ]
+            Musician: [ 1, 1 ]