diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
index b9c988e81cf..b87426eb151 100644
--- a/Resources/Maps/submarine.yml
+++ b/Resources/Maps/submarine.yml
@@ -447,11 +447,11 @@ entities:
           version: 6
         -3,3:
           ind: -3,3
-          tiles: PAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAATwAAAAADTwAAAAACPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAATwAAAAADTwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAATwAAAAABTwAAAAACPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAVAAAAAACVAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAVAAAAAAAVAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKwAAAAADKwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAAAcgAAAAADcgAAAAACcgAAAAADfwAAAAAAewAAAAABewAAAAAAewAAAAAAewAAAAABewAAAAAATwAAAAACKwAAAAADKwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAAAcgAAAAAAcgAAAAADcgAAAAAATwAAAAABewAAAAAAewAAAAADewAAAAABewAAAAADewAAAAAATwAAAAABKwAAAAAAKwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAACcgAAAAADcgAAAAACcgAAAAABfwAAAAAAewAAAAACewAAAAAAewAAAAADewAAAAABewAAAAAAfwAAAAAAKwAAAAAAKwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAADewAAAAAAewAAAAACewAAAAABewAAAAAAUAAAAAAAKwAAAAABKwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAACewAAAAADUAAAAAAAKwAAAAADKwAAAAABUAAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAABewAAAAACewAAAAADewAAAAACewAAAAACewAAAAACewAAAAAAewAAAAABewAAAAABfwAAAAAAUAAAAAAAUAAAAAAA
+          tiles: PAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAATwAAAAADTwAAAAACPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAATwAAAAADTwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAVAAAAAAAVAAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAPAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAVAAAAAACVAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAVAAAAAAAVAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKwAAAAADKwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAAAcgAAAAADcgAAAAACcgAAAAADfwAAAAAAewAAAAABewAAAAAAewAAAAAAewAAAAABewAAAAAATwAAAAACKwAAAAADKwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAAAcgAAAAAAcgAAAAADcgAAAAAATwAAAAABewAAAAAAewAAAAADewAAAAABewAAAAADewAAAAAATwAAAAABKwAAAAAAKwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAACcgAAAAADcgAAAAACcgAAAAABfwAAAAAAewAAAAACewAAAAAAewAAAAADewAAAAABewAAAAAAfwAAAAAAKwAAAAAAKwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAADewAAAAAAewAAAAACewAAAAABewAAAAAAUAAAAAAAKwAAAAABKwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAACewAAAAADUAAAAAAAKwAAAAADKwAAAAABUAAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAABewAAAAACewAAAAADewAAAAACewAAAAACewAAAAACewAAAAAAewAAAAABewAAAAABfwAAAAAAUAAAAAAAUAAAAAAA
           version: 6
         -2,3:
           ind: -2,3
-          tiles: TwAAAAADTwAAAAAATwAAAAAATwAAAAABVAAAAAADIAAAAAABIAAAAAACUAAAAAAAQwAAAAAAQwAAAAAATwAAAAADIQAAAAAAIQAAAAACIQAAAAADIQAAAAABIQAAAAAATwAAAAAATwAAAAACTwAAAAAATwAAAAAAVAAAAAACIAAAAAADIAAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAIAAAAAADIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABTwAAAAADTwAAAAADTwAAAAAATwAAAAACVAAAAAACIAAAAAADIAAAAAACfwAAAAAAQwAAAAAAQwAAAAAATwAAAAAAIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABVAAAAAAAVAAAAAABVAAAAAABTwAAAAADVAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAQwAAAAAAQwAAAAAATwAAAAADIQAAAAADIQAAAAABIQAAAAABIQAAAAADIQAAAAABVAAAAAADVAAAAAADVAAAAAAAfwAAAAAATwAAAAABTwAAAAAATwAAAAAAfwAAAAAAfwAAAAAATwAAAAAATwAAAAABTwAAAAAATwAAAAABfwAAAAAAfwAAAAAAfwAAAAAATwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAADeAAAAAABeAAAAAAAfwAAAAAAcgAAAAAAcgAAAAADcgAAAAADcgAAAAABcgAAAAABcgAAAAABfwAAAAAAMgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAeAAAAAAAeAAAAAABeAAAAAABfwAAAAAAcgAAAAADcgAAAAAAcgAAAAABcgAAAAACcgAAAAADcgAAAAACTwAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAACeAAAAAADeAAAAAADTwAAAAADcgAAAAABcgAAAAADTwAAAAACTwAAAAACcgAAAAABcgAAAAAATwAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAADeAAAAAACeAAAAAADfwAAAAAAcgAAAAADcgAAAAABTwAAAAACTwAAAAADcgAAAAABcgAAAAADTwAAAAADMgAAAAAAcQAAAAAAcQAAAAAAcQAAAAABUAAAAAAAeAAAAAACeAAAAAACeAAAAAABUAAAAAAAcgAAAAABcgAAAAAAcgAAAAACcgAAAAAAcgAAAAAAcgAAAAABTwAAAAACMgAAAAAAcQAAAAAAcQAAAAACcQAAAAADUAAAAAAAeAAAAAACeAAAAAADeAAAAAACUAAAAAAAcgAAAAACcgAAAAACcgAAAAAAcgAAAAACcgAAAAAAcgAAAAAATwAAAAADMgAAAAAAcQAAAAAAcQAAAAACcQAAAAABTwAAAAACeAAAAAAAeAAAAAAAeAAAAAAATwAAAAACTwAAAAACTwAAAAAATwAAAAABTwAAAAADTwAAAAACTwAAAAADfwAAAAAAMgAAAAAAcQAAAAAAcQAAAAAAcQAAAAABTwAAAAADeAAAAAAAeAAAAAAAeAAAAAADTwAAAAADVAAAAAADVAAAAAAAVAAAAAABVAAAAAACVAAAAAADTwAAAAACfwAAAAAAfwAAAAAAcQAAAAACcQAAAAACcQAAAAABUAAAAAAAeAAAAAAAeAAAAAAAeAAAAAACTwAAAAAAVAAAAAABVAAAAAAAVAAAAAABVAAAAAABVAAAAAABTwAAAAABeAAAAAACeAAAAAABcQAAAAAAcQAAAAACcQAAAAAAUAAAAAAAeAAAAAABTwAAAAACeAAAAAAATwAAAAABTwAAAAABTwAAAAADTwAAAAAATwAAAAAATwAAAAACTwAAAAAAeAAAAAADeAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAADTwAAAAABeAAAAAACeAAAAAACeAAAAAADeAAAAAABeAAAAAABeAAAAAADeAAAAAACeAAAAAABeAAAAAADeAAAAAAB
+          tiles: TwAAAAADTwAAAAAATwAAAAAATwAAAAABVAAAAAADIAAAAAABIAAAAAACUAAAAAAAQwAAAAAAQwAAAAAATwAAAAADIQAAAAAAIQAAAAACIQAAAAADIQAAAAABIQAAAAAATwAAAAAATwAAAAACTwAAAAAATwAAAAAAVAAAAAACIAAAAAADIAAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAIAAAAAADIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABVAAAAAAAVAAAAAAAVAAAAAAATwAAAAACVAAAAAACIAAAAAADIAAAAAACfwAAAAAAQwAAAAAAQwAAAAAATwAAAAAAIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABVAAAAAAAVAAAAAABVAAAAAABTwAAAAADVAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAQwAAAAAAQwAAAAAATwAAAAADIQAAAAADIQAAAAABIQAAAAABIQAAAAADIQAAAAABVAAAAAADVAAAAAADVAAAAAAAfwAAAAAATwAAAAABTwAAAAAATwAAAAAAfwAAAAAAfwAAAAAATwAAAAAATwAAAAABTwAAAAAATwAAAAABfwAAAAAAfwAAAAAAfwAAAAAATwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAADeAAAAAABeAAAAAAAfwAAAAAAcgAAAAAAcgAAAAADcgAAAAADcgAAAAABcgAAAAABcgAAAAABfwAAAAAAMgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAeAAAAAAAeAAAAAABeAAAAAABfwAAAAAAcgAAAAADcgAAAAAAcgAAAAABcgAAAAACcgAAAAADcgAAAAACTwAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAACeAAAAAADeAAAAAADTwAAAAADcgAAAAABcgAAAAADTwAAAAACTwAAAAACcgAAAAABcgAAAAAATwAAAAAAMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAADeAAAAAACeAAAAAADfwAAAAAAcgAAAAADcgAAAAABTwAAAAACTwAAAAADcgAAAAABcgAAAAADTwAAAAADMgAAAAAAcQAAAAAAcQAAAAAAcQAAAAABUAAAAAAAeAAAAAACeAAAAAACeAAAAAABUAAAAAAAcgAAAAABcgAAAAAAcgAAAAACcgAAAAAAcgAAAAAAcgAAAAABTwAAAAACMgAAAAAAcQAAAAAAcQAAAAACcQAAAAADUAAAAAAAeAAAAAACeAAAAAADeAAAAAACUAAAAAAAcgAAAAACcgAAAAACcgAAAAAAcgAAAAACcgAAAAAAcgAAAAAATwAAAAADMgAAAAAAcQAAAAAAcQAAAAACcQAAAAABTwAAAAACeAAAAAAAeAAAAAAAeAAAAAAATwAAAAACTwAAAAACTwAAAAAATwAAAAABTwAAAAADTwAAAAACTwAAAAADfwAAAAAAMgAAAAAAcQAAAAAAcQAAAAAAcQAAAAABTwAAAAADeAAAAAAAeAAAAAAAeAAAAAADTwAAAAADVAAAAAADVAAAAAAAVAAAAAABVAAAAAACVAAAAAADTwAAAAACfwAAAAAAfwAAAAAAcQAAAAACcQAAAAACcQAAAAABUAAAAAAAeAAAAAAAeAAAAAAAeAAAAAACTwAAAAAAVAAAAAABVAAAAAAAVAAAAAABVAAAAAABVAAAAAABTwAAAAABeAAAAAACeAAAAAABcQAAAAAAcQAAAAACcQAAAAAAUAAAAAAAeAAAAAABTwAAAAACeAAAAAAATwAAAAABTwAAAAABTwAAAAADTwAAAAAATwAAAAAATwAAAAACTwAAAAAAeAAAAAADeAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAeAAAAAADTwAAAAABeAAAAAACeAAAAAACeAAAAAADeAAAAAABeAAAAAABeAAAAAADeAAAAAACeAAAAAABeAAAAAADeAAAAAAB
           version: 6
         -5,3:
           ind: -5,3
@@ -11018,7 +11018,8 @@ entities:
           1,-7:
             0: 65535
           1,-6:
-            0: 65535
+            0: 32767
+            1: 32768
           1,-5:
             0: 65535
           2,-8:
@@ -11650,7 +11651,8 @@ entities:
           -11,8:
             0: 65535
           -11,9:
-            0: 65535
+            0: 65527
+            1: 8
           -11,10:
             0: 65535
           -11,11:
@@ -11668,7 +11670,8 @@ entities:
           -9,9:
             0: 65535
           -9,10:
-            0: 65535
+            0: 49151
+            2: 16384
           -9,11:
             0: 65535
           -15,-8:
@@ -12031,19 +12034,19 @@ entities:
             0: 65535
           -16,-3:
             0: 4607
-            1: 60928
+            3: 60928
           -16,-2:
             0: 65297
-            1: 238
+            3: 238
           -16,-1:
             0: 65535
           -15,-4:
             0: 65535
           -15,-3:
             0: 35071
-            1: 30464
+            3: 30464
           -15,-2:
-            1: 119
+            3: 119
             0: 65416
           -15,-1:
             0: 65535
@@ -12519,43 +12522,43 @@ entities:
             0: 65535
           -15,13:
             0: 16383
-            2: 49152
+            4: 49152
           -15,14:
             0: 13107
-            2: 52428
+            4: 52428
           -14,12:
             0: 65535
           -14,13:
             0: 53247
-            2: 12288
+            4: 12288
           -14,14:
-            2: 13107
+            4: 13107
             0: 52428
           -13,12:
             0: 48059
-            3: 17476
+            5: 17476
           -13,13:
             0: 63487
           -13,14:
             0: 48063
           -12,12:
-            4: 4369
-            2: 17476
+            6: 4369
+            4: 17476
             0: 43690
           -12,13:
             0: 65439
           -12,14:
             0: 65535
           -11,12:
-            2: 4369
-            5: 17476
+            4: 4369
+            7: 17476
             0: 43690
           -11,13:
             0: 65487
           -11,14:
             0: 65535
           -10,12:
-            2: 4369
+            4: 4369
             0: 61166
           -10,13:
             0: 65535
@@ -12852,7 +12855,8 @@ entities:
           -10,1:
             0: 65535
           -9,15:
-            0: 65535
+            0: 61439
+            8: 4096
           0,17:
             0: 65535
           0,18:
@@ -13087,9 +13091,9 @@ entities:
             0: 65535
           -15,15:
             0: 65523
-            2: 12
+            4: 12
           -14,15:
-            2: 3
+            4: 3
             0: 65532
           -13,15:
             0: 65535
@@ -14457,6 +14461,36 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.1495
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 235
           moles:
@@ -14532,6 +14566,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: BecomesStation
@@ -34604,6 +34653,7 @@ entities:
     - type: DeviceLinkSink
       links:
       - 9223
+      - 40522
   - uid: 9257
     components:
     - type: Transform
@@ -34612,6 +34662,7 @@ entities:
     - type: DeviceLinkSink
       links:
       - 2512
+      - 40523
   - uid: 9351
     components:
     - type: Transform
@@ -37021,13 +37072,17 @@ entities:
   - uid: 9690
     components:
     - type: Transform
-      pos: -33.704086,43.897106
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 17014
     components:
     - type: Transform
-      pos: -33.683586,43.79884
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: BoxSyringe
   entities:
   - uid: 1571
@@ -37584,6 +37639,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 89.5,-13.5
       parent: 2
+  - uid: 40524
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,53.5
+      parent: 2
+  - uid: 40525
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,53.5
+      parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
   - uid: 28381
@@ -55456,6 +55523,11 @@ entities:
     - type: Transform
       pos: 58.5,41.5
       parent: 2
+  - uid: 28461
+    components:
+    - type: Transform
+      pos: 76.5,-3.5
+      parent: 2
   - uid: 28467
     components:
     - type: Transform
@@ -59186,6 +59258,11 @@ entities:
     - type: Transform
       pos: 102.5,15.5
       parent: 2
+  - uid: 33677
+    components:
+    - type: Transform
+      pos: 78.5,-3.5
+      parent: 2
   - uid: 33692
     components:
     - type: Transform
@@ -64561,6 +64638,11 @@ entities:
     - type: Transform
       pos: 63.5,-30.5
       parent: 2
+  - uid: 40512
+    components:
+    - type: Transform
+      pos: 77.5,-3.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 37500
@@ -64568,6 +64650,11 @@ entities:
     - type: Transform
       pos: -58.407085,43.545338
       parent: 2
+  - uid: 40527
+    components:
+    - type: Transform
+      pos: 20.484457,-18.316412
+      parent: 2
 - proto: CableApcStack1
   entities:
   - uid: 12431
@@ -80250,6 +80337,11 @@ entities:
     - type: Transform
       pos: -59.164898,43.537525
       parent: 2
+  - uid: 40526
+    components:
+    - type: Transform
+      pos: 20.375082,-18.417974
+      parent: 2
 - proto: CableHVStack1
   entities:
   - uid: 9835
@@ -86384,6 +86476,11 @@ entities:
     - type: Transform
       pos: -58.782085,43.529713
       parent: 2
+  - uid: 40528
+    components:
+    - type: Transform
+      pos: 20.726645,-18.4961
+      parent: 2
 - proto: CableTerminal
   entities:
   - uid: 1439
@@ -99703,13 +99800,6 @@ entities:
     - type: Transform
       pos: 17.5,-1.5
       parent: 2
-- proto: ChemicalPayload
-  entities:
-  - uid: 36047
-    components:
-    - type: Transform
-      pos: 31.597778,16.540527
-      parent: 2
 - proto: ChemistryEmptyBottle01
   entities:
   - uid: 26714
@@ -100544,13 +100634,6 @@ entities:
     - type: Transform
       pos: 86.5,-10.5
       parent: 2
-- proto: ClosetSteelBase
-  entities:
-  - uid: 33677
-    components:
-    - type: Transform
-      pos: -35.5,63.5
-      parent: 2
 - proto: ClosetToolFilled
   entities:
   - uid: 26253
@@ -102274,11 +102357,6 @@ entities:
       parent: 2
 - proto: CombatKnife
   entities:
-  - uid: 36046
-    components:
-    - type: Transform
-      pos: 31.519653,16.720215
-      parent: 2
   - uid: 40436
     components:
     - type: Transform
@@ -102946,6 +103024,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,52.5
       parent: 2
+  - uid: 17013
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-56.5
+      parent: 2
+  - uid: 40521
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -36.5,-56.5
+      parent: 2
 - proto: ComputerResearchAndDevelopment
   entities:
   - uid: 4157
@@ -103478,6 +103568,15 @@ entities:
     - type: DeviceLinkSink
       links:
       - 28204
+  - uid: 9505
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,52.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
   - uid: 9598
     components:
     - type: Transform
@@ -103812,6 +103911,33 @@ entities:
     - type: DeviceLinkSink
       links:
       - 28204
+  - uid: 36047
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,52.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
+  - uid: 36048
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -32.5,51.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
+  - uid: 36049
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -31.5,51.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
   - uid: 39813
     components:
     - type: Transform
@@ -103902,6 +104028,59 @@ entities:
     - type: DeviceLinkSink
       links:
       - 39827
+  - uid: 40407
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,51.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
+  - uid: 40499
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,52.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
+  - uid: 40500
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,51.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
+  - uid: 40501
+    components:
+    - type: Transform
+      pos: -29.5,52.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
+  - uid: 40511
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,52.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
+  - uid: 40513
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,51.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 10478
 - proto: CourierBag
   entities:
   - uid: 22394
@@ -104221,6 +104400,11 @@ entities:
     - type: Transform
       pos: -49.5,-11.5
       parent: 2
+  - uid: 40507
+    components:
+    - type: Transform
+      pos: -22.5,58.5
+      parent: 2
 - proto: CrateFreezer
   entities:
   - uid: 23538
@@ -104235,6 +104419,11 @@ entities:
     - type: Transform
       pos: 74.5,-11.5
       parent: 2
+  - uid: 40510
+    components:
+    - type: Transform
+      pos: -35.5,58.5
+      parent: 2
 - proto: CrateFunPlushie
   entities:
   - uid: 34039
@@ -106368,12 +106557,6 @@ entities:
     - type: Transform
       pos: -20.5,55.5
       parent: 2
-  - uid: 18238
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,55.5
-      parent: 2
   - uid: 18713
     components:
     - type: Transform
@@ -106502,6 +106685,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 57.5,60.5
       parent: 2
+  - uid: 40541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,44.5
+      parent: 2
+  - uid: 40542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,44.5
+      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 2908
@@ -106733,6 +106928,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,64.5
       parent: 2
+  - uid: 25990
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,55.5
+      parent: 2
   - uid: 36000
     components:
     - type: Transform
@@ -111398,6 +111599,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -31.5,-27.5
       parent: 2
+  - uid: 18238
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,54.5
+      parent: 2
   - uid: 18243
     components:
     - type: Transform
@@ -112506,6 +112713,72 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,66.5
       parent: 2
+  - uid: 40529
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,53.5
+      parent: 2
+  - uid: 40531
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,52.5
+      parent: 2
+  - uid: 40532
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,51.5
+      parent: 2
+  - uid: 40533
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,50.5
+      parent: 2
+  - uid: 40534
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,49.5
+      parent: 2
+  - uid: 40535
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,48.5
+      parent: 2
+  - uid: 40536
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,47.5
+      parent: 2
+  - uid: 40537
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,46.5
+      parent: 2
+  - uid: 40538
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,45.5
+      parent: 2
+  - uid: 40539
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,44.5
+      parent: 2
+  - uid: 40540
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,44.5
+      parent: 2
 - proto: DisposalPipeBroken
   entities:
   - uid: 2523
@@ -113105,6 +113378,12 @@ entities:
     - type: Transform
       pos: -29.5,67.5
       parent: 2
+  - uid: 40518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,43.5
+      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 712
@@ -113447,6 +113726,11 @@ entities:
     - type: Transform
       pos: -35.5,65.5
       parent: 2
+  - uid: 40509
+    components:
+    - type: Transform
+      pos: -29.5,43.5
+      parent: 2
 - proto: DisposalYJunction
   entities:
   - uid: 16695
@@ -176790,8 +177074,10 @@ entities:
   - uid: 12055
     components:
     - type: Transform
-      pos: 6.5493526,-20.872643
-      parent: 2
+      parent: 28451
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 15379
     components:
     - type: Transform
@@ -176845,6 +177131,14 @@ entities:
     - type: Transform
       pos: -44.588486,60.89263
       parent: 2
+- proto: HandHeldMassScanner
+  entities:
+  - uid: 40506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.739797,-45.467434
+      parent: 2
 - proto: HandLabeler
   entities:
   - uid: 1084
@@ -176918,6 +177212,11 @@ entities:
     - type: Transform
       pos: 70.5,-6.5
       parent: 2
+  - uid: 26498
+    components:
+    - type: Transform
+      pos: -35.5,62.5
+      parent: 2
 - proto: HatSpawner
   entities:
   - uid: 21090
@@ -179969,6 +180268,36 @@ entities:
     - type: Transform
       pos: -40.5,36.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 26511
+          - 26513
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerElectricalSuppliesFilled
   entities:
   - uid: 50
@@ -180345,6 +180674,62 @@ entities:
     - type: Transform
       pos: 39.5,26.5
       parent: 2
+- proto: LockerSecurity
+  entities:
+  - uid: 40544
+    components:
+    - type: Transform
+      pos: -33.5,43.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.1465
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 39530
+          - 39531
+          - 10347
+          - 39534
+          - 39523
+          - 21843
+          - 10566
+          - 39527
+          - 39522
+          - 9690
+          - 39537
+          - 17014
+          - 39535
+          - 39525
+          - 39528
+          - 39529
+          - 39536
+          - 39521
+          - 39526
+          - 39533
+          - 39524
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerSecurityFilled
   entities:
   - uid: 3737
@@ -180377,6 +180762,44 @@ entities:
     - type: Transform
       pos: -6.5,42.5
       parent: 2
+  - uid: 28451
+    components:
+    - type: Transform
+      pos: 7.5,-20.5
+      parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 12055
+          - 4676
+          - 17385
+          - 17723
+          - 12057
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerWallMedicalFilled
   entities:
   - uid: 3509
@@ -180400,11 +180823,11 @@ entities:
     - type: Transform
       pos: 13.5,44.5
       parent: 2
-  - uid: 20601
+  - uid: 40530
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,31.5
+      rot: 1.5707963267948966 rad
+      pos: -36.5,35.5
       parent: 2
 - proto: LockerWardenFilled
   entities:
@@ -180689,22 +181112,28 @@ entities:
   - uid: 39533
     components:
     - type: Transform
-      pos: -30.032213,46.53773
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MagazineBoxMagnumPractice
   entities:
   - uid: 39535
     components:
     - type: Transform
-      pos: -29.704088,46.858044
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MagazineBoxPistolPractice
   entities:
   - uid: 39536
     components:
     - type: Transform
-      pos: -30.266588,46.71742
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MagazineBoxPistolRubber
   entities:
   - uid: 13387
@@ -180717,44 +181146,73 @@ entities:
   - uid: 39537
     components:
     - type: Transform
-      pos: -29.477526,46.522106
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MagazineBoxSpecialPractice
   entities:
   - uid: 39534
     components:
     - type: Transform
-      pos: -30.602526,46.72523
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MagazineLightRiflePractice
   entities:
   - uid: 39530
     components:
     - type: Transform
-      pos: -33.43846,43.47523
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 39531
     components:
     - type: Transform
-      pos: -33.24315,43.522106
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MagazinePistolPractice
   entities:
   - uid: 10347
     components:
     - type: Transform
-      pos: -33.547836,46.63148
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 15703
+    components:
+    - type: Transform
+      pos: -32.8151,46.561256
       parent: 2
   - uid: 21843
     components:
     - type: Transform
-      pos: -33.59471,46.66273
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 28462
+    components:
+    - type: Transform
+      pos: -32.549477,46.47532
       parent: 2
   - uid: 39522
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.50096,46.56898
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 40503
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.190104,46.592506
       parent: 2
 - proto: MagazinePistolRubber
   entities:
@@ -180773,30 +181231,40 @@ entities:
   - uid: 10566
     components:
     - type: Transform
-      pos: -29.665026,43.490856
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 39521
     components:
     - type: Transform
-      pos: -29.563463,43.545544
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 39525
     components:
     - type: Transform
-      pos: -29.383776,43.63148
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MagazineRiflePractice
   entities:
   - uid: 39528
     components:
     - type: Transform
-      pos: -32.9619,46.50648
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 39529
     components:
     - type: Transform
-      pos: -33.15721,46.576794
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: MailBag
   entities:
   - uid: 6695
@@ -181461,6 +181929,11 @@ entities:
     - type: Transform
       pos: 39.5,6.5
       parent: 2
+  - uid: 20601
+    components:
+    - type: Transform
+      pos: 31.5,16.5
+      parent: 2
   - uid: 20963
     components:
     - type: Transform
@@ -181547,6 +182020,16 @@ entities:
     - type: Transform
       pos: -45.5,70.5
       parent: 2
+  - uid: 40502
+    components:
+    - type: Transform
+      pos: 34.5,16.5
+      parent: 2
+  - uid: 40504
+    components:
+    - type: Transform
+      pos: 31.5,15.5
+      parent: 2
 - proto: Matchbox
   entities:
   - uid: 30063
@@ -182114,13 +182597,6 @@ entities:
     - type: Transform
       pos: 24.5,-0.5
       parent: 2
-- proto: ModularGrenade
-  entities:
-  - uid: 36048
-    components:
-    - type: Transform
-      pos: 31.316528,16.04834
-      parent: 2
 - proto: MopBucketFull
   entities:
   - uid: 10261
@@ -188406,12 +188882,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -25.5,-39.5
       parent: 2
-  - uid: 10478
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,45.5
-      parent: 2
   - uid: 23429
     components:
     - type: Transform
@@ -188433,6 +188903,12 @@ entities:
     - type: Transform
       pos: -35.5,7.5
       parent: 2
+  - uid: 40516
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,43.5
+      parent: 2
 - proto: PosterContrabandSpaceCola
   entities:
   - uid: 7627
@@ -191127,11 +191603,6 @@ entities:
     - type: Transform
       pos: -0.5,50.5
       parent: 2
-  - uid: 40407
-    components:
-    - type: Transform
-      pos: -22.5,58.5
-      parent: 2
 - proto: PottedPlantRD
   entities:
   - uid: 28745
@@ -195668,12 +196139,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,42.5
       parent: 2
-  - uid: 25990
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,43.5
-      parent: 2
   - uid: 25992
     components:
     - type: Transform
@@ -195686,12 +196151,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,43.5
       parent: 2
-  - uid: 26498
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,43.5
-      parent: 2
   - uid: 26598
     components:
     - type: Transform
@@ -200696,6 +201155,16 @@ entities:
     - type: Transform
       pos: -71.5,2.5
       parent: 2
+  - uid: 40515
+    components:
+    - type: Transform
+      pos: -38.5,60.5
+      parent: 2
+  - uid: 40519
+    components:
+    - type: Transform
+      pos: -36.5,59.5
+      parent: 2
 - proto: RandomMedicCorpseSpawner
   entities:
   - uid: 5338
@@ -209202,9 +209671,10 @@ entities:
   - uid: 17385
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.927308,-20.399904
-      parent: 2
+      parent: 28451
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 22670
     components:
     - type: Transform
@@ -209679,7 +210149,7 @@ entities:
   - uid: 2722
     components:
     - type: Transform
-      pos: 21.019302,-18.386
+      pos: 21.726645,-18.40235
       parent: 2
   - uid: 4951
     components:
@@ -209852,7 +210322,7 @@ entities:
   - uid: 12315
     components:
     - type: Transform
-      pos: 20.54274,-18.35475
+      pos: 21.30477,-18.386724
       parent: 2
   - uid: 16504
     components:
@@ -210564,6 +211034,26 @@ entities:
         - Pressed: Open
         30311:
         - Pressed: Open
+  - uid: 40522
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,53.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        9253:
+        - Pressed: Toggle
+  - uid: 40523
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,53.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        9257:
+        - Pressed: Toggle
 - proto: SignalSwitchDirectional
   entities:
   - uid: 3283
@@ -210601,6 +211091,44 @@ entities:
         28201:
         - On: Forward
         - Off: Off
+  - uid: 10478
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,45.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        40513:
+        - On: Forward
+        - Off: Off
+        40407:
+        - On: Forward
+        - Off: Off
+        36049:
+        - On: Forward
+        - Off: Off
+        36048:
+        - On: Forward
+        - Off: Off
+        40500:
+        - On: Forward
+        - Off: Off
+        9505:
+        - On: Forward
+        - Off: Off
+        36047:
+        - On: Forward
+        - Off: Off
+        40511:
+        - On: Forward
+        - Off: Off
+        40499:
+        - On: Forward
+        - Off: Off
+        40501:
+        - On: Forward
+        - Off: Off
   - uid: 11344
     components:
     - type: Transform
@@ -217326,25 +217854,49 @@ entities:
   - uid: 39523
     components:
     - type: Transform
-      pos: -32.7119,46.522106
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 39524
     components:
     - type: Transform
-      pos: -32.415024,46.428356
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: SpeedLoaderMagnumRubber
+  entities:
+  - uid: 26511
+    components:
+    - type: Transform
+      parent: 22421
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 26513
+    components:
+    - type: Transform
+      parent: 22421
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: SpeedLoaderSpecialPractice
   entities:
   - uid: 39526
     components:
     - type: Transform
-      pos: -32.3994,46.69398
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 39527
     components:
     - type: Transform
-      pos: -32.61815,46.81898
-      parent: 2
+      parent: 40544
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: SprayBottle
   entities:
   - uid: 37373
@@ -218526,13 +219078,17 @@ entities:
   - uid: 4676
     components:
     - type: Transform
-      pos: 8.432165,-20.89608
-      parent: 2
+      parent: 28451
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 12057
     components:
     - type: Transform
-      pos: 8.619665,-21.05233
-      parent: 2
+      parent: 28451
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 13368
     components:
     - type: Transform
@@ -224376,25 +224932,27 @@ entities:
       parent: 2
 - proto: TargetSyndicate
   entities:
-  - uid: 26511
+  - uid: 26528
     components:
     - type: Transform
-      pos: -30.5,52.5
+      pos: -33.5,52.5
       parent: 2
-  - uid: 26513
+  - uid: 26529
     components:
     - type: Transform
-      pos: -32.5,52.5
+      pos: -29.5,52.5
       parent: 2
-  - uid: 26528
+  - uid: 36046
     components:
     - type: Transform
-      pos: -33.5,52.5
+      rot: 1.5707963267948966 rad
+      pos: -32.5,51.5
       parent: 2
-  - uid: 26529
+  - uid: 40517
     components:
     - type: Transform
-      pos: -29.5,52.5
+      rot: 1.5707963267948966 rad
+      pos: -30.5,51.5
       parent: 2
 - proto: tatamimat
   entities:
@@ -224652,13 +225210,6 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-- proto: TimerTrigger
-  entities:
-  - uid: 36049
-    components:
-    - type: Transform
-      pos: 31.629028,15.79834
-      parent: 2
 - proto: ToiletDirtyWater
   entities:
   - uid: 19706
@@ -225310,6 +225861,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.744827,10.731756
       parent: 2
+  - uid: 40543
+    components:
+    - type: Transform
+      pos: -29.875687,43.410027
+      parent: 2
 - proto: TrashBananaPeel
   entities:
   - uid: 943
@@ -232728,12 +233284,6 @@ entities:
     - type: Transform
       pos: -19.5,41.5
       parent: 2
-  - uid: 15703
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,42.5
-      parent: 2
   - uid: 15704
     components:
     - type: Transform
@@ -237262,6 +237812,11 @@ entities:
     - type: Transform
       pos: 72.5,-27.5
       parent: 2
+  - uid: 40514
+    components:
+    - type: Transform
+      pos: -29.5,42.5
+      parent: 2
 - proto: WallReinforcedDiagonal
   entities:
   - uid: 22062
@@ -247594,19 +248149,23 @@ entities:
   - uid: 17723
     components:
     - type: Transform
-      pos: 6.3726206,-20.212404
-      parent: 2
+      parent: 28451
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: WeaponDisablerPractice
   entities:
-  - uid: 9505
+  - uid: 40508
     components:
     - type: Transform
-      pos: -32.3164,43.572277
+      rot: -1.5707963267948966 rad
+      pos: -32.656937,43.57409
       parent: 2
-  - uid: 17013
+  - uid: 40520
     components:
     - type: Transform
-      pos: -32.582024,43.751965
+      rot: -1.5707963267948966 rad
+      pos: -32.2585,43.60534
       parent: 2
 - proto: WeaponFlareGun
   entities:
@@ -247637,6 +248196,14 @@ entities:
     - type: Transform
       pos: -22.514536,51.356438
       parent: 2
+- proto: WeaponPistolMk58Nonlethal
+  entities:
+  - uid: 40505
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.331062,46.564983
+      parent: 2
 - proto: WeaponShotgunKammererNonLethal
   entities:
   - uid: 37918