From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Mon, 15 May 2023 17:27:20 +0000 (-0600)
Subject: [map] omega update (#16466)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d4cdeb54b2e179c661bd1e3732d40bcc8aaced43;p=space-station-14.git

[map] omega update (#16466)
---

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index b9157f388a..eac0e2303d 100644
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -9624,11 +9624,6 @@ entities:
     - pos: 20.5,-18.5
       parent: 4812
       type: Transform
-  - uid: 6293
-    components:
-    - pos: 27.5,-17.5
-      parent: 4812
-      type: Transform
   - uid: 7000
     components:
     - pos: -13.5,-32.5
@@ -35243,12 +35238,6 @@ entities:
       pos: -8.5,-25.5
       parent: 4812
       type: Transform
-  - uid: 7269
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -25.5,-26.5
-      parent: 4812
-      type: Transform
   - uid: 11148
     components:
     - pos: 9.5,-43.5
@@ -35691,6 +35680,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetBombFilled
   entities:
@@ -35726,39 +35719,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-  - uid: 8374
-    components:
-    - pos: -35.5,21.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        EntityStorageComponent: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents: []
+          ent: null
       type: ContainerContainer
 - proto: ClosetChefFilled
   entities:
@@ -35794,6 +35758,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetEmergencyFilledRandom
   entities:
@@ -35829,6 +35797,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 1795
     components:
@@ -35862,6 +35834,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 2677
     components:
@@ -35895,6 +35871,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 3786
     components:
@@ -35928,6 +35908,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 4484
     components:
@@ -35961,6 +35945,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 4522
     components:
@@ -35994,6 +35982,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 4540
     components:
@@ -36027,6 +36019,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 4599
     components:
@@ -36060,6 +36056,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 4725
     components:
@@ -36116,6 +36116,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 7616
     components:
@@ -36149,43 +36153,14 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-  - uid: 10407
-    components:
-    - pos: -55.5,-23.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        EntityStorageComponent: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents: []
+          ent: null
       type: ContainerContainer
-  - uid: 10602
+  - uid: 10407
     components:
-    - pos: -45.5,-16.5
+    - pos: -55.5,-23.5
       parent: 4812
       type: Transform
     - air:
@@ -36215,43 +36190,14 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-  - uid: 10876
-    components:
-    - pos: -32.5,8.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        EntityStorageComponent: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents: []
+          ent: null
       type: ContainerContainer
-  - uid: 11461
+  - uid: 10602
     components:
-    - pos: 36.5,-37.5
+    - pos: -45.5,-16.5
       parent: 4812
       type: Transform
     - air:
@@ -36281,45 +36227,14 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-- proto: ClosetFireFilled
-  entities:
-  - uid: 1514
-    components:
-    - pos: 1.5,-10.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        EntityStorageComponent: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents: []
+          ent: null
       type: ContainerContainer
-  - uid: 1796
+  - uid: 10876
     components:
-    - pos: 0.5,16.5
+    - pos: -32.5,8.5
       parent: 4812
       type: Transform
     - air:
@@ -36349,66 +36264,14 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-  - uid: 3674
-    components:
-    - pos: 3.5,49.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-  - uid: 4483
-    components:
-    - pos: 22.5,1.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        EntityStorageComponent: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents: []
+          ent: null
       type: ContainerContainer
-  - uid: 7615
+  - uid: 11461
     components:
-    - pos: -16.5,-13.5
+    - pos: 36.5,-37.5
       parent: 4812
       type: Transform
     - air:
@@ -36438,6 +36301,183 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+- proto: ClosetFireFilled
+  entities:
+  - uid: 1514
+    components:
+    - pos: 1.5,-10.5
+      parent: 4812
+      type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.14957
+        moles:
+        - 1.6033952
+        - 6.031821
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
+    - containers:
+        EntityStorageComponent: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 1796
+    components:
+    - pos: 0.5,16.5
+      parent: 4812
+      type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.14957
+        moles:
+        - 1.6033952
+        - 6.031821
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
+    - containers:
+        EntityStorageComponent: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 3674
+    components:
+    - pos: 3.5,49.5
+      parent: 4812
+      type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.14957
+        moles:
+        - 1.6033952
+        - 6.031821
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
+  - uid: 4483
+    components:
+    - pos: 22.5,1.5
+      parent: 4812
+      type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.14957
+        moles:
+        - 1.6033952
+        - 6.031821
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
+    - containers:
+        EntityStorageComponent: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 7615
+    components:
+    - pos: -16.5,-13.5
+      parent: 4812
+      type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.14957
+        moles:
+        - 1.6033952
+        - 6.031821
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
+    - containers:
+        EntityStorageComponent: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8328
     components:
@@ -36471,6 +36511,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 9688
     components:
@@ -36504,6 +36548,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 9690
     components:
@@ -36537,6 +36585,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 12474
     components:
@@ -36620,6 +36672,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetL3ScienceFilled
   entities:
@@ -36655,6 +36711,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 11149
     components:
@@ -36688,6 +36748,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetL3SecurityFilled
   entities:
@@ -36723,6 +36787,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetL3VirologyFilled
   entities:
@@ -36758,6 +36826,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetLegalFilled
   entities:
@@ -36793,6 +36865,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetMaintenanceFilledRandom
   entities:
@@ -36828,6 +36904,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 10527
     components:
@@ -36861,6 +36941,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 10900
     components:
@@ -36894,6 +36978,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 11309
     components:
@@ -36927,6 +37015,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 11618
     components:
@@ -36960,6 +37052,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 11882
     components:
@@ -36993,6 +37089,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetRadiationSuitFilled
   entities:
@@ -37028,6 +37128,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 9686
     components:
@@ -37061,6 +37165,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 9687
     components:
@@ -37094,6 +37202,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 10664
     components:
@@ -37127,6 +37239,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 11775
     components:
@@ -37160,6 +37276,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: ClosetWallAtmospherics
   entities:
@@ -37458,7 +37578,7 @@ entities:
   entities:
   - uid: 10769
     components:
-    - pos: -46.38971,-8.46829
+    - pos: -43.49446,-7.521168
       parent: 4812
       type: Transform
 - proto: ClothingEyesHudSecurity
@@ -37741,28 +37861,6 @@ entities:
     - pos: -10.496132,3.670351
       parent: 4812
       type: Transform
-- proto: ClothingHeadHelmetEVA
-  entities:
-  - uid: 744
-    components:
-    - pos: 5.5,15.5
-      parent: 4812
-      type: Transform
-  - uid: 745
-    components:
-    - pos: 5.5,16.5
-      parent: 4812
-      type: Transform
-  - uid: 746
-    components:
-    - pos: 9.5,15.5
-      parent: 4812
-      type: Transform
-  - uid: 747
-    components:
-    - pos: 9.5,16.5
-      parent: 4812
-      type: Transform
 - proto: ClothingHeadHelmetSyndicate
   entities:
   - uid: 11672
@@ -37800,16 +37898,6 @@ entities:
       type: Transform
 - proto: ClothingMaskBreathMedical
   entities:
-  - uid: 6640
-    components:
-    - pos: -10.617126,-14.356129
-      parent: 4812
-      type: Transform
-  - uid: 6641
-    components:
-    - pos: -10.429626,-14.481129
-      parent: 4812
-      type: Transform
   - uid: 8863
     components:
     - pos: 14.451679,-40.556843
@@ -38092,28 +38180,6 @@ entities:
     - pos: -17.511423,32.47987
       parent: 4812
       type: Transform
-- proto: ClothingOuterHardsuitEVA
-  entities:
-  - uid: 740
-    components:
-    - pos: 5.5,15.5
-      parent: 4812
-      type: Transform
-  - uid: 741
-    components:
-    - pos: 5.5,16.5
-      parent: 4812
-      type: Transform
-  - uid: 742
-    components:
-    - pos: 9.5,15.5
-      parent: 4812
-      type: Transform
-  - uid: 743
-    components:
-    - pos: 9.5,16.5
-      parent: 4812
-      type: Transform
 - proto: ClothingOuterHardsuitEVAPrisoner
   entities:
   - uid: 10996
@@ -38121,24 +38187,6 @@ entities:
     - pos: -31.569149,26.70803
       parent: 4812
       type: Transform
-- proto: ClothingOuterHardsuitSecurity
-  entities:
-  - uid: 8375
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 8373
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 8376
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 8373
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: ClothingOuterHardsuitSpatio
   entities:
   - uid: 12424
@@ -42367,6 +42415,11 @@ entities:
       type: Transform
 - proto: Dresser
   entities:
+  - uid: 744
+    components:
+    - pos: -12.5,29.5
+      parent: 4812
+      type: Transform
   - uid: 1254
     components:
     - pos: -17.5,5.5
@@ -42382,11 +42435,6 @@ entities:
     - pos: 7.5,29.5
       parent: 4812
       type: Transform
-  - uid: 2584
-    components:
-    - pos: -10.5,27.5
-      parent: 4812
-      type: Transform
   - uid: 5363
     components:
     - pos: 19.5,-11.5
@@ -42448,13 +42496,6 @@ entities:
     - pos: 18.44514,-15.833292
       parent: 4812
       type: Transform
-- proto: DrinkDoctorsDelightGlass
-  entities:
-  - uid: 7571
-    components:
-    - pos: -25.37559,-25.25328
-      parent: 4812
-      type: Transform
 - proto: DrinkFlask
   entities:
   - uid: 2590
@@ -42909,11 +42950,6 @@ entities:
     - pos: 7.5,26.5
       parent: 4812
       type: Transform
-  - uid: 10667
-    components:
-    - pos: -49.5,-6.5
-      parent: 4812
-      type: Transform
 - proto: filingCabinetTall
   entities:
   - uid: 3236
@@ -44120,7 +44156,7 @@ entities:
   entities:
   - uid: 6364
     components:
-    - pos: -46.56787,-8.286076
+    - pos: -42.568504,-1.8948193
       parent: 4812
       type: Transform
   - uid: 8597
@@ -44170,7 +44206,7 @@ entities:
       type: ContainerContainer
   - uid: 12487
     components:
-    - pos: -46.520996,-8.426701
+    - pos: -42.55288,-2.0198193
       parent: 4812
       type: Transform
   - uid: 12488
@@ -63846,6 +63882,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 9571
     components:
@@ -63879,6 +63919,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerBoozeFilled
   entities:
@@ -63914,6 +63958,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerBotanistFilled
   entities:
@@ -63949,6 +63997,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerCaptainFilled
   entities:
@@ -63984,6 +64036,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerChemistryFilled
   entities:
@@ -64019,6 +64075,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerChiefEngineerFilled
   entities:
@@ -64054,6 +64114,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerChiefMedicalOfficerFilled
   entities:
@@ -64089,6 +64153,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerDetectiveFilled
   entities:
@@ -64124,6 +64192,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerElectricalSuppliesFilled
   entities:
@@ -64159,6 +64231,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 4491
     components:
@@ -64192,6 +64268,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 10600
     components:
@@ -64225,6 +64305,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 10722
     components:
@@ -64258,39 +64342,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-  - uid: 10739
-    components:
-    - pos: -46.5,-7.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        EntityStorageComponent: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents: []
+          ent: null
       type: ContainerContainer
 - proto: LockerEngineerFilled
   entities:
@@ -64326,6 +64381,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 9720
     components:
@@ -64359,6 +64418,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 9721
     components:
@@ -64392,6 +64455,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerEvidence
   entities:
@@ -64427,6 +64494,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8358
     components:
@@ -64460,6 +64531,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8359
     components:
@@ -64493,6 +64568,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8418
     components:
@@ -64526,6 +64605,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8419
     components:
@@ -64559,6 +64642,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerFreezer
   entities:
@@ -64594,6 +64681,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 1563
     components:
@@ -64627,6 +64718,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 2709
     components:
@@ -64663,6 +64758,10 @@ entities:
           ents:
           - 12503
           - 12504
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerHeadOfPersonnelFilled
   entities:
@@ -64698,6 +64797,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerHeadOfSecurityFilled
   entities:
@@ -64733,6 +64836,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerMedicalFilled
   entities:
@@ -64768,6 +64875,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerMedicineFilled
   entities:
@@ -64803,6 +64914,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerQuarterMasterFilled
   entities:
@@ -64863,6 +64978,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerSalvageSpecialistFilled
   entities:
@@ -64898,6 +65017,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 3265
     components:
@@ -64931,6 +65054,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerScienceFilled
   entities:
@@ -65014,6 +65141,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8421
     components:
@@ -65047,6 +65178,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8422
     components:
@@ -65080,26 +65215,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-- proto: LockerSyndicatePersonal
-  entities:
-  - uid: 8373
-    components:
-    - pos: -36.5,21.5
-      parent: 4812
-      type: Transform
-    - locked: False
-      type: Lock
-    - open: True
-      removedMasks: 20
-      type: EntityStorage
-    - containers:
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents:
-          - 8375
-          - 8376
+          ent: null
       type: ContainerContainer
 - proto: LockerWardenFilled
   entities:
@@ -65135,6 +65254,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: LockerWeldingSuppliesFilled
   entities:
@@ -65170,39 +65293,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
-  - uid: 10738
-    components:
-    - pos: -46.5,-6.5
-      parent: 4812
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.6033952
-        - 6.031821
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-    - containers:
-        EntityStorageComponent: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        entity_storage: !type:Container
+        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ents: []
+          ent: null
       type: ContainerContainer
 - proto: MachineAnomalyGenerator
   entities:
@@ -69434,26 +69528,6 @@ entities:
       type: Transform
 - proto: Rack
   entities:
-  - uid: 735
-    components:
-    - pos: 5.5,15.5
-      parent: 4812
-      type: Transform
-  - uid: 736
-    components:
-    - pos: 5.5,16.5
-      parent: 4812
-      type: Transform
-  - uid: 737
-    components:
-    - pos: 9.5,15.5
-      parent: 4812
-      type: Transform
-  - uid: 738
-    components:
-    - pos: 9.5,16.5
-      parent: 4812
-      type: Transform
   - uid: 1545
     components:
     - pos: 6.5,4.5
@@ -69609,11 +69683,6 @@ entities:
     - pos: -36.5,8.5
       parent: 4812
       type: Transform
-  - uid: 10766
-    components:
-    - pos: -46.5,-8.5
-      parent: 4812
-      type: Transform
   - uid: 10877
     components:
     - pos: -33.5,8.5
@@ -75531,6 +75600,106 @@ entities:
     - pos: 21.54712,4.4847765
       parent: 4812
       type: Transform
+- proto: SuitStorageAtmos
+  entities:
+  - uid: 742
+    components:
+    - pos: -41.5,9.5
+      parent: 4812
+      type: Transform
+  - uid: 4846
+    components:
+    - pos: -41.5,10.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageCaptain
+  entities:
+  - uid: 746
+    components:
+    - pos: -10.5,27.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageCE
+  entities:
+  - uid: 747
+    components:
+    - pos: -49.5,-6.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageCMO
+  entities:
+  - uid: 4856
+    components:
+    - pos: -25.5,-25.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageEngi
+  entities:
+  - uid: 2584
+    components:
+    - pos: -46.5,-7.5
+      parent: 4812
+      type: Transform
+  - uid: 4843
+    components:
+    - pos: -46.5,-8.5
+      parent: 4812
+      type: Transform
+  - uid: 4855
+    components:
+    - pos: -46.5,-6.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageEVA
+  entities:
+  - uid: 738
+    components:
+    - pos: 9.5,16.5
+      parent: 4812
+      type: Transform
+  - uid: 743
+    components:
+    - pos: 5.5,15.5
+      parent: 4812
+      type: Transform
+  - uid: 4844
+    components:
+    - pos: 5.5,16.5
+      parent: 4812
+      type: Transform
+  - uid: 4845
+    components:
+    - pos: 9.5,15.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageHOS
+  entities:
+  - uid: 740
+    components:
+    - pos: -23.5,22.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageRD
+  entities:
+  - uid: 735
+    components:
+    - pos: 27.5,-17.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageSec
+  entities:
+  - uid: 736
+    components:
+    - pos: -35.5,21.5
+      parent: 4812
+      type: Transform
+- proto: SuitStorageWarden
+  entities:
+  - uid: 745
+    components:
+    - pos: -36.5,21.5
+      parent: 4812
+      type: Transform
 - proto: SuperCapacitorStockPart
   entities:
   - uid: 6210
@@ -76869,11 +77038,6 @@ entities:
     - pos: -12.5,-16.5
       parent: 4812
       type: Transform
-  - uid: 6611
-    components:
-    - pos: -10.5,-14.5
-      parent: 4812
-      type: Transform
   - uid: 6612
     components:
     - pos: -10.5,-18.5
@@ -76894,11 +77058,6 @@ entities:
     - pos: -14.5,-19.5
       parent: 4812
       type: Transform
-  - uid: 7250
-    components:
-    - pos: -25.5,-25.5
-      parent: 4812
-      type: Transform
   - uid: 7295
     components:
     - pos: -19.5,-21.5
@@ -78542,6 +78701,17 @@ entities:
     - pos: -12.5,-15.5
       parent: 4812
       type: Transform
+- proto: VendingMachineChemicals
+  entities:
+  - uid: 741
+    components:
+    - flags: SessionSpecific
+      type: MetaData
+    - pos: -10.5,-14.5
+      parent: 4812
+      type: Transform
+    - nextEmpEject: 23.6779791
+      type: VendingMachine
 - proto: VendingMachineCigs
   entities:
   - uid: 917
@@ -78833,6 +79003,17 @@ entities:
     - pos: 11.5,-26.5
       parent: 4812
       type: Transform
+- proto: VendingMachineRobotics
+  entities:
+  - uid: 737
+    components:
+    - flags: SessionSpecific
+      type: MetaData
+    - pos: 4.5,-23.5
+      parent: 4812
+      type: Transform
+    - nextEmpEject: 73.1995168
+      type: VendingMachine
 - proto: VendingMachineSalvage
   entities:
   - uid: 3434
@@ -87155,6 +87336,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: WardrobeFormal
   entities:
@@ -87193,6 +87378,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: WardrobeMixedFilled
   entities:
@@ -87253,6 +87442,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8355
     components:
@@ -87286,6 +87479,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8383
     components:
@@ -87319,6 +87516,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
   - uid: 8384
     components:
@@ -87352,6 +87553,10 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
       type: ContainerContainer
 - proto: WardrobeYellowFilled
   entities: