diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index 4ca0eaba9a..1e0656aa5e 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -10332,7 +10332,7 @@ entities:
       32,22: 0
       32,23: 0
       33,17: 0
-      33,19: 1
+      33,19: 6
       33,21: 0
       33,22: 0
       33,23: 0
@@ -10680,6 +10680,81 @@ entities:
       - 0
       - 0
       - 0
+    - volume: 2500
+      temperature: 293.15
+      moles:
+      - 20.619795
+      - 77.56971
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+    - volume: 2500
+      temperature: 293.15
+      moles:
+      - 6666.982
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+    - volume: 2500
+      temperature: 293.15
+      moles:
+      - 0
+      - 6666.982
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+    - volume: 2500
+      temperature: 293.15
+      moles:
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+    - volume: 2500
+      temperature: 293.15
+      moles:
+      - 0
+      - 0
+      - 0
+      - 6666.982
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
+      - 0
     - volume: 2500
       temperature: 293.15
       moles:
@@ -10695,66 +10770,6 @@ entities:
       - 0
       - 0
       - 0
-    - volume: 2500
-      temperature: 293.15
-      moles:
-      - 6666.982
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 293.15
-      moles:
-      - 0
-      - 6666.982
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 293.15
-      moles:
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-    - volume: 2500
-      temperature: 293.15
-      moles:
-      - 0
-      - 0
-      - 0
-      - 6666.982
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
-      - 0
     type: GridAtmosphere
   - type: OccluderTree
   - type: Shuttle
@@ -17603,8 +17618,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -17622,9 +17636,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -17636,8 +17651,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -17655,9 +17669,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -25030,8 +25045,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -25049,9 +25063,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -25254,8 +25269,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -25273,9 +25287,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -25318,8 +25333,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -25337,9 +25351,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -33285,8 +33300,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -33304,9 +33318,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -39404,8 +39419,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -39423,9 +39437,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -39436,8 +39451,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -39455,9 +39469,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -39468,8 +39483,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -39487,9 +39501,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -39500,8 +39515,7 @@ entities:
     parent: 127
     type: Transform
   - fixtures:
-    - density: 100
-      shape: !type:PolygonShape
+    - shape: !type:PolygonShape
         vertices:
         - 0.49,-0.49
         - 0.49,0.49
@@ -39519,9 +39533,10 @@ entities:
       - BulletImpassable
       - InteractImpassable
       - Opaque
+      density: 100
     - shape: !type:PhysShapeCircle
-        position: 0,-0.5
         radius: 0.2
+        position: 0,-0.5
       hard: False
       id: docking
     type: Fixtures
@@ -54467,7 +54482,7 @@ entities:
   - pos: 24.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -76539.26
+  - SecondsUntilStateChange: -76723.14
     state: Opening
     type: Door
   - inputs:
@@ -54483,7 +54498,7 @@ entities:
   - pos: 24.5,-4.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -76539.26
+  - SecondsUntilStateChange: -76723.14
     state: Opening
     type: Door
   - inputs:
@@ -54499,7 +54514,7 @@ entities:
   - pos: 24.5,-7.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -76539.26
+  - SecondsUntilStateChange: -76723.14
     state: Opening
     type: Door
   - inputs:
@@ -54515,7 +54530,7 @@ entities:
   - pos: 24.5,-6.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -76539.26
+  - SecondsUntilStateChange: -76723.14
     state: Opening
     type: Door
   - inputs:
@@ -54567,7 +54582,7 @@ entities:
   - pos: 13.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54583,7 +54598,7 @@ entities:
   - pos: 14.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54599,7 +54614,7 @@ entities:
   - pos: 15.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54615,7 +54630,7 @@ entities:
   - pos: 16.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54631,7 +54646,7 @@ entities:
   - pos: 17.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54647,7 +54662,7 @@ entities:
   - pos: 18.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54663,7 +54678,7 @@ entities:
   - pos: 12.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54679,7 +54694,7 @@ entities:
   - pos: 19.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54695,7 +54710,7 @@ entities:
   - pos: 11.5,-6.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54711,7 +54726,7 @@ entities:
   - pos: 11.5,-7.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54727,7 +54742,7 @@ entities:
   - pos: 20.5,-6.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54743,7 +54758,7 @@ entities:
   - pos: 20.5,-7.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77590.13
+  - SecondsUntilStateChange: -77774.016
     state: Opening
     type: Door
   - inputs:
@@ -54759,7 +54774,7 @@ entities:
   - pos: 20.5,-9.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77505.53
+  - SecondsUntilStateChange: -77689.414
     state: Opening
     type: Door
   - inputs:
@@ -54775,7 +54790,7 @@ entities:
   - pos: 20.5,-11.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -77505.53
+  - SecondsUntilStateChange: -77689.414
     state: Opening
     type: Door
   - inputs:
@@ -58695,7 +58710,7 @@ entities:
     parent: 127
     type: Transform
 - uid: 7176
-  type: SpaceVillainArcadeFilled
+  type: SpaceVillainArcade
   components:
   - pos: -32.5,-6.5
     parent: 127
@@ -66589,6 +66604,25 @@ entities:
   - pos: 33.5,19.5
     parent: 127
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.25,-0.48
+        - 0.25,0.48
+        - -0.25,0.48
+        - -0.25,-0.48
+      mask:
+      - Impassable
+      - MidImpassable
+      - LowImpassable
+      layer:
+      - BulletImpassable
+      - Opaque
+      density: 145
+    type: Fixtures
+  - open: True
+    removedMasks: 20
+    type: EntityStorage
 - uid: 8225
   type: ClosetEmergencyFilledRandom
   components:
@@ -67374,7 +67408,7 @@ entities:
     parent: 127
     type: Transform
 - uid: 8322
-  type: SpaceVillainArcadeFilled
+  type: SpaceVillainArcade
   components:
   - pos: -4.5,31.5
     parent: 127
@@ -69753,10 +69787,9 @@ entities:
   - powerLoad: 0
     type: ApcPowerReceiver
 - uid: 8684
-  type: GasPipeTJunction
+  type: GasPipeFourway
   components:
-  - rot: 3.141592653589793 rad
-    pos: 25.5,1.5
+  - pos: 25.5,1.5
     parent: 127
     type: Transform
   - color: '#0055CCFF'
@@ -70607,4 +70640,72 @@ entities:
   - pos: 12.5,-22.5
     parent: 127
     type: Transform
+- uid: 8817
+  type: CableApcExtension
+  components:
+  - pos: 6.5,-1.5
+    parent: 127
+    type: Transform
+- uid: 8818
+  type: CableApcExtension
+  components:
+  - pos: 6.5,-0.5
+    parent: 127
+    type: Transform
+- uid: 8819
+  type: CableApcExtension
+  components:
+  - pos: 25.5,9.5
+    parent: 127
+    type: Transform
+- uid: 8820
+  type: CableApcExtension
+  components:
+  - pos: 24.5,9.5
+    parent: 127
+    type: Transform
+- uid: 8821
+  type: GasPipeStraight
+  components:
+  - pos: 25.5,0.5
+    parent: 127
+    type: Transform
+  - color: '#0055CCFF'
+    type: AtmosPipeColor
+- uid: 8822
+  type: CableApcExtension
+  components:
+  - pos: 35.5,17.5
+    parent: 127
+    type: Transform
+- uid: 8823
+  type: CableApcExtension
+  components:
+  - pos: -11.5,21.5
+    parent: 127
+    type: Transform
+- uid: 8824
+  type: CableApcExtension
+  components:
+  - pos: -11.5,22.5
+    parent: 127
+    type: Transform
+- uid: 8825
+  type: CableApcExtension
+  components:
+  - pos: -11.5,23.5
+    parent: 127
+    type: Transform
+- uid: 8826
+  type: CableApcExtension
+  components:
+  - pos: -11.5,24.5
+    parent: 127
+    type: Transform
+- uid: 8827
+  type: CableApcExtension
+  components:
+  - pos: -11.5,25.5
+    parent: 127
+    type: Transform
 ...