diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index c89f5bc505..64b85be904 100644
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -88,11 +88,11 @@ grids:
   - ind: 0,-1
     tiles: NQAAADcAAAAeAAAAHgAAAB4AAAA3AAAAMwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADUAAAA3AAAAHgAAAB4AAAAeAAAANwAAADQAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAAeAAAANwAAADcAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADcAAAA3AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA3AAAANwAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADcAAAA0AAAANwAAADcAAAA3AAAANAAAADQAAAA0AAAANwAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADcAAAA3AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADcAAAA3AAAANwAAADcAAAA0AAAANwAAADQAAAA3AAAANwAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANwAAADcAAAA0AAAANAAAADQAAAA0AAAALgAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADcAAAA3AAAANAAAADQAAAA0AAAALgAAAC4AAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA3AAAANwAAADQAAAA0AAAANAAAAC4AAAAuAAAANAAAADQAAAA0AAAANAAAADQAAAA3AAAANAAAADQAAAA0AAAANwAAADcAAAA0AAAANAAAADQAAAA0AAAALgAAADQAAAA0AAAANAAAADQAAAA0AAAANwAAADQAAAA0AAAANAAAADcAAAA3AAAANAAAADQAAAA0AAAANwAAAC4AAAA0AAAANAAAADQAAAA3AAAANwAAADcAAAA0AAAANwAAADQAAAA3AAAANwAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANwAAADEAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAAxAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA3AAAAMQAAAA==
   - ind: -1,-2
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA3AAAANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANwAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAAAAAAANgAAAAAAAAA2AAAAAAAAAAAAAAAAAAAAAAAAADcAAAA0AAAANAAAADcAAAA3AAAAMwAAADMAAAA3AAAAAAAAADYAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAA3AAAANAAAADQAAAA3AAAANwAAADcAAAA3AAAANwAAADYAAAA2AAAANwAAADcAAAA3AAAAAAAAAAAAAAAAAAAANwAAADQAAAA0AAAANAAAADcAAAA3AAAANwAAADcAAAAAAAAANgAAADcAAAA3AAAANwAAADYAAAA2AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAAMwAAADMAAAAzAAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAAA==
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAAAAAAAAAAAAAAAAAAAAAAAA3AAAANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgAAADYAAAA2AAAANgAAADYAAAAAAAAAAAAAAAAAAAAAAAAANwAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANgAAADYAAAA2AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAAAAAAANgAAAAAAAAA2AAAAAAAAAAAAAAAAAAAAAAAAADcAAAA0AAAANAAAADcAAAA3AAAAMwAAADMAAAA3AAAAAAAAADYAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAA3AAAANAAAADQAAAA3AAAANwAAADcAAAA3AAAANwAAADYAAAA2AAAANwAAADcAAAA3AAAAAAAAAAAAAAAAAAAANwAAADQAAAA0AAAANAAAADcAAAA3AAAANwAAADcAAAAAAAAANgAAADcAAAA3AAAANwAAADYAAAA2AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAAMwAAADMAAAAzAAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAAA==
   - ind: 0,-2
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADYAAAA2AAAANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA2AAAANgAAADYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAADcAAAA3AAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAA0AAAANAAAADcAAAA2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAANAAAADQAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAADQAAAA0AAAANAAAADQAAAA3AAAANgAAADYAAAA2AAAANgAAADYAAAAAAAAAAAAAAAAAAAAAAAAANgAAADcAAAA3AAAANwAAADcAAAA0AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAAAAAAAAAAAAAAAAAADYAAAAzAAAAMwAAADMAAAAzAAAAMwAAADMAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAA2AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAAMwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAAA==
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADcAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAADcAAAA3AAAANwAAADQAAAA0AAAANAAAADcAAAA2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADcAAAAnAAAAJwAAACcAAAA0AAAANAAAADQAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3AAAANwAAADcAAAA3AAAANAAAADQAAAA0AAAANAAAADQAAAA3AAAANgAAADYAAAA2AAAANgAAADYAAAAAAAAAAAAAAAAAAAAAAAAANgAAADcAAAA3AAAANwAAADcAAAA0AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAAAAAAAAAAAAAAAAAADYAAAAzAAAAMwAAADMAAAAzAAAAMwAAADMAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAA2AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAAMwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAAA==
   - ind: 1,-2
-    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADcAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADYAAAA3AAAANwAAADcAAAA3AAAANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA2AAAANwAAADcAAAA3AAAANwAAADYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADcAAAAnAAAAJwAAACcAAAAnAAAANwAAADYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3AAAAJwAAACcAAAAnAAAAJwAAADcAAAA2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAACcAAAAnAAAAJwAAACcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANgAAADYAAAAAAAAAAAAAAA==
+    tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADcAAAAAAAAAAAAAAAAAAAA3AAAANwAAADcAAAA3AAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAACcAAAAnAAAAJwAAADcAAAA3AAAANwAAADcAAAA3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACcAAAAnAAAAJwAAACcAAAAnAAAAJwAAACcAAAAnAAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3AAAAJwAAACcAAAAnAAAANwAAADcAAAA3AAAANwAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAACcAAAAnAAAAJwAAADcAAAA2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADcAAAAnAAAAJwAAACcAAAA3AAAANgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3AAAAJwAAACcAAAAnAAAANwAAADYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANwAAACcAAAAnAAAAJwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANgAAADYAAAAAAAAAAAAAAA==
   - ind: -2,-1
     tiles: NwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAAMQAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAA3AAAAHgAAAB4AAAA3AAAANwAAADcAAAA3AAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAANwAAADcAAAA3AAAANwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAADUAAAA1AAAANQAAADcAAAAeAAAAHgAAAB4AAAA3AAAANwAAADcAAAA0AAAANwAAADcAAAA3AAAAHgAAAB4AAAA1AAAANQAAADUAAAA3AAAAHgAAAB4AAAAeAAAANwAAAB4AAAA0AAAANAAAADQAAAA0AAAANwAAAB4AAAAeAAAANQAAADUAAAA1AAAANwAAAB4AAAAeAAAAHgAAADcAAAAeAAAANAAAADQAAAA0AAAANAAAADcAAAA3AAAANwAAAB4AAAAeAAAAHgAAADcAAAA3AAAAHgAAADcAAAA3AAAAHgAAADQAAAA0AAAANAAAADQAAAA3AAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADEAAAAxAAAANwAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADcAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAA3AAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAAMQAAADEAAAAxAAAANwAAADEAAAAxAAAAMQAAADEAAAA3AAAANwAAABoAAAAaAAAAGgAAADcAAAA3AAAANwAAADcAAAA3AAAANwAAADcAAAA3AAAAMQAAADEAAAAxAAAANwAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAJgAAACYAAAAxAAAANwAAADEAAAAxAAAAMQAAADcAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAACYAAAAmAAAAMQAAADcAAAAxAAAAMQAAADEAAAA3AAAAGgAAABoAAAAaAAAAGgAAAB4AAAAeAAAAHgAAADcAAAA3AAAAJgAAAA==
   - ind: -2,0
@@ -8016,41 +8016,131 @@ entities:
       30,19: 0
       30,20: 0
       -26,0: 0
-      -12,-15: 3
-      -11,-15: 3
-      -10,-15: 3
-      -9,-15: 3
-      -8,-15: 3
-      -7,-15: 3
-      -6,-15: 3
-      -12,21: 3
-      -11,21: 3
-      -15,-23: 3
-      -14,-23: 3
-      -12,-18: 3
-      -10,-21: 3
-      -10,-20: 3
-      -10,-19: 3
-      -10,-18: 3
-      -8,-23: 3
-      -8,-21: 3
-      -8,-20: 3
-      -8,-19: 3
-      -8,-18: 3
-      -7,-23: 3
-      -7,-19: 3
-      -6,-23: 3
-      -6,-19: 3
-      -5,-23: 3
-      28,-17: 3
-      29,-17: 3
-      -27,0: 3
-      -27,4: 3
-      -43,22: 3
-      -43,23: 3
-      -41,22: 3
-      -41,23: 3
-      -38,23: 3
+      -12,-15: 0
+      -11,-15: 0
+      -10,-15: 0
+      -9,-15: 0
+      -8,-15: 0
+      -7,-15: 0
+      -6,-15: 0
+      -12,21: 0
+      -11,21: 0
+      -15,-23: 0
+      -14,-23: 0
+      -12,-18: 0
+      -10,-21: 0
+      -10,-20: 0
+      -10,-19: 0
+      -10,-18: 0
+      -8,-23: 0
+      -8,-21: 0
+      -8,-20: 0
+      -8,-19: 0
+      -8,-18: 0
+      -7,-23: 0
+      -7,-19: 0
+      -6,-23: 0
+      -6,-19: 0
+      -5,-23: 0
+      28,-17: 0
+      29,-17: 0
+      -27,0: 0
+      -27,4: 0
+      -43,22: 0
+      -43,23: 0
+      -41,22: 0
+      -41,23: 0
+      -38,23: 0
+      0,28: 0
+      1,28: 0
+      2,28: 0
+      -10,26: 0
+      -10,28: 0
+      -8,26: 0
+      -8,28: 0
+      -7,26: 0
+      -7,28: 0
+      -6,26: 0
+      -6,28: 0
+      -5,28: 0
+      -4,28: 0
+      -3,28: 0
+      -2,28: 0
+      -1,28: 0
+      -16,-25: 0
+      -15,-25: 0
+      -15,-24: 0
+      -14,-25: 0
+      -12,-23: 0
+      -10,-23: 0
+      -8,-25: 0
+      -8,-24: 0
+      -7,-25: 0
+      -7,-24: 0
+      -6,-25: 0
+      -6,-24: 0
+      -5,-25: 0
+      -5,-24: 0
+      -4,-25: 0
+      -4,-24: 0
+      -3,-25: 0
+      -3,-24: 0
+      -2,-25: 0
+      -2,-24: 0
+      -1,-25: 0
+      -1,-24: 0
+      0,-25: 0
+      0,-24: 0
+      1,-25: 0
+      1,-24: 0
+      2,-25: 0
+      2,-24: 0
+      12,-25: 3
+      12,-24: 3
+      12,-23: 3
+      12,-22: 3
+      12,-21: 3
+      13,-25: 3
+      13,-24: 3
+      13,-23: 3
+      13,-22: 3
+      13,-21: 3
+      14,-25: 3
+      14,-24: 3
+      14,-23: 3
+      14,-22: 3
+      14,-21: 3
+      15,-25: 3
+      15,-24: 3
+      15,-23: 3
+      15,-22: 3
+      15,-21: 3
+      16,-25: 3
+      16,-24: 3
+      16,-23: 3
+      17,-24: 3
+      18,-24: 3
+      19,-24: 3
+      20,-25: 3
+      20,-24: 3
+      21,-25: 3
+      21,-24: 3
+      21,-23: 3
+      22,-25: 3
+      22,-24: 3
+      22,-23: 3
+      22,-22: 3
+      22,-21: 3
+      23,-25: 3
+      23,-24: 3
+      23,-23: 3
+      23,-22: 3
+      23,-21: 3
+      24,-25: 3
+      24,-24: 3
+      24,-23: 3
+      24,-22: 3
+      24,-21: 3
     uniqueMixes:
     - volume: 2500
       temperature: 293.15
@@ -10361,12 +10451,16 @@ entities:
   - pos: 23.325472,8.795675
     parent: 30
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 356
   type: ClothingShoesBootsMag
   components:
   - pos: 23.684847,8.545675
     parent: 30
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 357
   type: DoubleEmergencyOxygenTankFilled
   components:
@@ -10389,12 +10483,16 @@ entities:
   - pos: 24.325472,8.701925
     parent: 30
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 360
   type: YellowOxygenTankFilled
   components:
   - pos: 24.700472,8.670675
     parent: 30
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 361
   type: ClothingMaskBreath
   components:
@@ -28910,27 +29008,27 @@ entities:
     parent: 30
     type: Transform
 - uid: 2861
-  type: WallReinforced
+  type: ReinforcedWindow
   components:
-  - pos: 17.5,-22.5
+  - pos: 12.5,-23.5
     parent: 30
     type: Transform
 - uid: 2862
-  type: WallReinforced
+  type: Grille
   components:
-  - pos: 17.5,-19.5
+  - pos: 23.5,-20.5
     parent: 30
     type: Transform
 - uid: 2863
-  type: WallReinforced
+  type: ReinforcedWindow
   components:
-  - pos: 20.5,-22.5
+  - pos: 14.5,-20.5
     parent: 30
     type: Transform
 - uid: 2864
-  type: WallReinforced
+  type: Grille
   components:
-  - pos: 20.5,-19.5
+  - pos: 15.5,-20.5
     parent: 30
     type: Transform
 - uid: 2865
@@ -28958,45 +29056,45 @@ entities:
     parent: 30
     type: Transform
 - uid: 2869
-  type: ReinforcedWindow
+  type: Grille
   components:
-  - pos: 21.5,-19.5
+  - pos: 14.5,-20.5
     parent: 30
     type: Transform
 - uid: 2870
-  type: ReinforcedWindow
+  type: WallReinforced
   components:
-  - pos: 21.5,-18.5
+  - pos: 20.5,-16.5
     parent: 30
     type: Transform
 - uid: 2871
   type: ReinforcedWindow
   components:
-  - pos: 21.5,-17.5
+  - pos: 20.5,-18.5
     parent: 30
     type: Transform
 - uid: 2872
   type: ReinforcedWindow
   components:
-  - pos: 20.5,-21.5
+  - pos: 24.5,-22.5
     parent: 30
     type: Transform
 - uid: 2873
   type: ReinforcedWindow
   components:
-  - pos: 20.5,-20.5
+  - pos: 24.5,-21.5
     parent: 30
     type: Transform
 - uid: 2874
   type: ReinforcedWindow
   components:
-  - pos: 17.5,-21.5
+  - pos: 20.5,-22.5
     parent: 30
     type: Transform
 - uid: 2875
   type: ReinforcedWindow
   components:
-  - pos: 17.5,-20.5
+  - pos: 16.5,-23.5
     parent: 30
     type: Transform
 - uid: 2876
@@ -29018,113 +29116,71 @@ entities:
     parent: 30
     type: Transform
 - uid: 2879
-  type: Grille
+  type: ReinforcedWindow
   components:
-  - pos: 17.5,-21.5
+  - pos: 20.5,-23.5
     parent: 30
     type: Transform
 - uid: 2880
-  type: Grille
+  type: ReinforcedWindow
   components:
-  - pos: 17.5,-20.5
+  - pos: 16.5,-24.5
     parent: 30
     type: Transform
 - uid: 2881
-  type: Grille
+  type: ReinforcedWindow
   components:
-  - pos: 20.5,-21.5
+  - pos: 24.5,-23.5
     parent: 30
     type: Transform
 - uid: 2882
-  type: Grille
+  type: ReinforcedWindow
   components:
-  - pos: 20.5,-20.5
+  - pos: 23.5,-20.5
     parent: 30
     type: Transform
 - uid: 2883
   type: Grille
   components:
-  - pos: 21.5,-19.5
+  - pos: 13.5,-20.5
     parent: 30
     type: Transform
 - uid: 2884
-  type: Grille
+  type: ReinforcedWindow
   components:
-  - pos: 21.5,-18.5
+  - pos: 20.5,-17.5
     parent: 30
     type: Transform
 - uid: 2885
-  type: Grille
+  type: ReinforcedWindow
   components:
-  - pos: 21.5,-17.5
+  - pos: 20.5,-19.5
     parent: 30
     type: Transform
 - uid: 2886
-  type: AirlockExternalLocked
+  type: Grille
   components:
-  - pos: 18.5,-19.5
+  - pos: 22.5,-20.5
     parent: 30
     type: Transform
 - uid: 2887
-  type: AirlockExternalLocked
+  type: Grille
   components:
-  - pos: 19.5,-19.5
+  - pos: 21.5,-20.5
     parent: 30
     type: Transform
 - uid: 2888
-  type: AirlockExternalShuttleLocked
+  type: ReinforcedWindow
   components:
-  - pos: 18.5,-22.5
+  - pos: 12.5,-21.5
     parent: 30
     type: Transform
-  - fixtures:
-    - shape: !type:PolygonShape
-        vertices:
-        - 0.49,-0.49
-        - 0.49,0.49
-        - -0.49,0.49
-        - -0.49,-0.49
-      mask:
-      - Impassable
-      layer:
-      - Impassable
-      - HighImpassable
-      - BulletImpassable
-      - Opaque
-      mass: 100
-    - shape: !type:PhysShapeCircle
-        position: 0,-0.5
-        radius: 0.2
-      hard: False
-      id: docking
-    type: Fixtures
 - uid: 2889
-  type: AirlockExternalShuttleLocked
+  type: ReinforcedWindow
   components:
-  - pos: 19.5,-22.5
+  - pos: 13.5,-20.5
     parent: 30
     type: Transform
-  - fixtures:
-    - shape: !type:PolygonShape
-        vertices:
-        - 0.49,-0.49
-        - 0.49,0.49
-        - -0.49,0.49
-        - -0.49,-0.49
-      mask:
-      - Impassable
-      layer:
-      - Impassable
-      - HighImpassable
-      - BulletImpassable
-      - Opaque
-      mass: 100
-    - shape: !type:PhysShapeCircle
-        position: 0,-0.5
-        radius: 0.2
-      hard: False
-      id: docking
-    type: Fixtures
 - uid: 2890
   type: WallSolid
   components:
@@ -29322,66 +29378,57 @@ entities:
     parent: 30
     type: Transform
 - uid: 2921
-  type: WindowReinforcedDirectional
+  type: ReinforcedWindow
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 16.5,-21.5
+  - pos: 20.5,-24.5
     parent: 30
     type: Transform
 - uid: 2922
-  type: WindowReinforcedDirectional
+  type: ReinforcedWindow
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 16.5,-20.5
+  - pos: 22.5,-22.5
     parent: 30
     type: Transform
 - uid: 2923
-  type: WindowReinforcedDirectional
+  type: ReinforcedWindow
   components:
-  - rot: 3.141592653589793 rad
-    pos: 16.5,-20.5
+  - pos: 22.5,-23.5
     parent: 30
     type: Transform
 - uid: 2924
-  type: WindowReinforcedDirectional
+  type: ReinforcedWindow
   components:
-  - rot: 3.141592653589793 rad
-    pos: 21.5,-20.5
+  - pos: 15.5,-20.5
     parent: 30
     type: Transform
 - uid: 2925
-  type: WindowReinforcedDirectional
+  type: ReinforcedWindow
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 21.5,-20.5
+  - pos: 22.5,-20.5
     parent: 30
     type: Transform
 - uid: 2926
-  type: WindowReinforcedDirectional
+  type: ReinforcedWindow
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 21.5,-21.5
+  - pos: 22.5,-24.5
     parent: 30
     type: Transform
 - uid: 2927
-  type: WindowReinforcedDirectional
+  type: Grille
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 22.5,-19.5
+  - pos: 12.5,-21.5
     parent: 30
     type: Transform
 - uid: 2928
-  type: WindowReinforcedDirectional
+  type: Grille
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 22.5,-18.5
+  - pos: 12.5,-22.5
     parent: 30
     type: Transform
 - uid: 2929
-  type: WindowReinforcedDirectional
+  type: WallReinforced
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 22.5,-17.5
+  - pos: 20.5,-20.5
     parent: 30
     type: Transform
 - uid: 2930
@@ -29553,45 +29600,39 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 2952
-  type: Chair
+  type: ReinforcedWindow
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 17.5,-18.5
+  - pos: 16.5,-22.5
     parent: 30
     type: Transform
 - uid: 2953
-  type: Chair
+  type: ReinforcedWindow
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 17.5,-17.5
+  - pos: 14.5,-24.5
     parent: 30
     type: Transform
 - uid: 2954
-  type: Chair
+  type: ReinforcedWindow
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 17.5,-16.5
+  - pos: 14.5,-23.5
     parent: 30
     type: Transform
 - uid: 2955
-  type: Chair
+  type: ReinforcedWindow
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 20.5,-18.5
+  - pos: 18.5,-23.5
     parent: 30
     type: Transform
 - uid: 2956
-  type: Chair
+  type: ReinforcedWindow
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 20.5,-17.5
+  - pos: 17.5,-23.5
     parent: 30
     type: Transform
 - uid: 2957
-  type: Chair
+  type: ReinforcedWindow
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 20.5,-16.5
+  - pos: 14.5,-22.5
     parent: 30
     type: Transform
 - uid: 2958
@@ -29609,7 +29650,7 @@ entities:
 - uid: 2960
   type: PosterLegitUeNo
   components:
-  - pos: 21.5,-16.5
+  - pos: 20.5,-16.5
     parent: 30
     type: Transform
 - uid: 2961
@@ -29645,22 +29686,11 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 2965
-  type: PoweredSmallLight
+  type: WallReinforced
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 19.5,-20.5
+  - pos: 24.5,-24.5
     parent: 30
     type: Transform
-  - powerLoad: 0
-    type: ApcPowerReceiver
-  - containers:
-      light_bulb: !type:ContainerSlot {}
-    type: ContainerContainer
-  - inputs:
-      On: []
-      Off: []
-      Toggle: []
-    type: SignalReceiver
 - uid: 2966
   type: DisposalTrunk
   components:
@@ -29824,22 +29854,17 @@ entities:
   - color: '#0335FCFF'
     type: AtmosPipeColor
 - uid: 2983
-  type: GasPipeStraight
+  type: WallReinforced
   components:
-  - pos: 19.5,-19.5
+  - pos: 12.5,-24.5
     parent: 30
     type: Transform
-  - color: '#0335FCFF'
-    type: AtmosPipeColor
 - uid: 2984
-  type: GasVentPump
+  type: WallReinforced
   components:
-  - rot: 3.141592653589793 rad
-    pos: 19.5,-20.5
+  - pos: 16.5,-20.5
     parent: 30
     type: Transform
-  - color: '#0335FCFF'
-    type: AtmosPipeColor
 - uid: 2985
   type: GasPipeStraight
   components:
@@ -30817,21 +30842,21 @@ entities:
     parent: 30
     type: Transform
 - uid: 3131
-  type: CableApcExtension
+  type: SignDirectionalEvac
   components:
-  - pos: 18.5,-19.5
+  - pos: 20.5,0.5
     parent: 30
     type: Transform
 - uid: 3132
-  type: CableApcExtension
+  type: AirlockExternalGlass
   components:
-  - pos: 18.5,-20.5
+  - pos: 23.5,-22.5
     parent: 30
     type: Transform
 - uid: 3133
-  type: CableApcExtension
+  type: AirlockExternalGlass
   components:
-  - pos: 18.5,-21.5
+  - pos: 21.5,-22.5
     parent: 30
     type: Transform
 - uid: 3134
@@ -34339,33 +34364,17 @@ entities:
       Toggle: []
     type: SignalReceiver
 - uid: 3548
-  type: Poweredlight
+  type: Grille
   components:
-  - rot: 3.141592653589793 rad
-    pos: 17.5,-18.5
+  - pos: 12.5,-23.5
     parent: 30
     type: Transform
-  - powerLoad: 0
-    type: ApcPowerReceiver
-  - inputs:
-      On: []
-      Off: []
-      Toggle: []
-    type: SignalReceiver
 - uid: 3549
-  type: Poweredlight
+  type: ReinforcedWindow
   components:
-  - rot: 3.141592653589793 rad
-    pos: 20.5,-18.5
+  - pos: 19.5,-23.5
     parent: 30
     type: Transform
-  - powerLoad: 0
-    type: ApcPowerReceiver
-  - inputs:
-      On: []
-      Off: []
-      Toggle: []
-    type: SignalReceiver
 - uid: 3550
   type: DisposalBend
   components:
@@ -39336,11 +39345,9 @@ entities:
 - uid: 4127
   type: ClothingHeadHelmetTemplar
   components:
-  - pos: 19.499983,-20.506557
+  - pos: 24.456139,-14.492622
     parent: 30
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4128
   type: ClothingShoesTourist
   components:
@@ -41533,21 +41540,47 @@ entities:
     parent: 30
     type: Transform
 - uid: 4443
-  type: SolarPanel
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
-  - pos: -2.5,-24.5
+  - pos: 23.5,-24.5
     parent: 30
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 4444
-  type: SolarPanel
+  type: CableHV
   components:
-  - pos: -0.5,-24.5
+  - pos: -11.5,-22.5
     parent: 30
     type: Transform
 - uid: 4445
-  type: SolarPanel
+  type: CableHV
   components:
-  - pos: 0.5,-24.5
+  - pos: -13.5,-22.5
     parent: 30
     type: Transform
 - uid: 4446
@@ -41637,17 +41670,43 @@ entities:
     parent: 30
     type: Transform
 - uid: 4460
-  type: SolarPanel
+  type: AirlockExternalGlass
   components:
-  - pos: -3.5,-24.5
+  - pos: 15.5,-22.5
     parent: 30
     type: Transform
 - uid: 4461
-  type: SolarPanel
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
-  - pos: -1.5,-24.5
+  - pos: 15.5,-24.5
     parent: 30
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 4462
   type: SolarPanel
   components:
@@ -41685,45 +41744,97 @@ entities:
     parent: 30
     type: Transform
 - uid: 4468
-  type: CableHV
+  type: SolarPanel
   components:
-  - pos: 2.5,-24.5
+  - pos: -13.5,-22.5
     parent: 30
     type: Transform
 - uid: 4469
-  type: CableHV
+  type: SolarPanel
   components:
-  - pos: 1.5,-24.5
+  - pos: -11.5,-22.5
     parent: 30
     type: Transform
 - uid: 4470
   type: CableHV
   components:
-  - pos: 0.5,-24.5
+  - pos: -14.5,-22.5
     parent: 30
     type: Transform
 - uid: 4471
   type: CableHV
   components:
-  - pos: -0.5,-24.5
+  - pos: -12.5,-22.5
     parent: 30
     type: Transform
 - uid: 4472
-  type: CableHV
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
-  - pos: -1.5,-24.5
+  - pos: 13.5,-24.5
     parent: 30
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 4473
-  type: CableHV
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
-  - pos: -2.5,-24.5
+  - pos: 21.5,-24.5
     parent: 30
     type: Transform
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 4474
-  type: CableHV
+  type: AirlockExternalGlass
   components:
-  - pos: -3.5,-24.5
+  - pos: 13.5,-22.5
     parent: 30
     type: Transform
 - uid: 4475
@@ -41735,13 +41846,13 @@ entities:
 - uid: 4476
   type: SolarPanel
   components:
-  - pos: 1.5,-24.5
+  - pos: -12.5,-22.5
     parent: 30
     type: Transform
 - uid: 4477
   type: SolarPanel
   components:
-  - pos: 2.5,-24.5
+  - pos: -14.5,-22.5
     parent: 30
     type: Transform
 - uid: 4478
@@ -42713,6 +42824,42 @@ entities:
       board: !type:Container
         ents: []
     type: ContainerContainer
+- uid: 4602
+  type: WallReinforced
+  components:
+  - pos: 12.5,-20.5
+    parent: 30
+    type: Transform
+- uid: 4603
+  type: ReinforcedWindow
+  components:
+  - pos: 12.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 4604
+  type: WallReinforced
+  components:
+  - pos: 24.5,-20.5
+    parent: 30
+    type: Transform
+- uid: 4605
+  type: ReinforcedWindow
+  components:
+  - pos: 21.5,-20.5
+    parent: 30
+    type: Transform
+- uid: 4606
+  type: Grille
+  components:
+  - pos: 24.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 4607
+  type: Grille
+  components:
+  - pos: 24.5,-22.5
+    parent: 30
+    type: Transform
 - uid: 4608
   type: CrateEngineeringCableBulk
   components:
@@ -47988,6 +48135,280 @@ entities:
   - pos: -8.5,23.5
     parent: 30
     type: Transform
+- uid: 5320
+  type: Grille
+  components:
+  - pos: 24.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5321
+  type: Grille
+  components:
+  - pos: 22.5,-24.5
+    parent: 30
+    type: Transform
+- uid: 5322
+  type: Grille
+  components:
+  - pos: 22.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5323
+  type: Grille
+  components:
+  - pos: 22.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5324
+  type: Grille
+  components:
+  - pos: 14.5,-24.5
+    parent: 30
+    type: Transform
+- uid: 5325
+  type: Grille
+  components:
+  - pos: 14.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5326
+  type: Grille
+  components:
+  - pos: 14.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5327
+  type: Grille
+  components:
+  - pos: 16.5,-24.5
+    parent: 30
+    type: Transform
+- uid: 5328
+  type: Grille
+  components:
+  - pos: 16.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5329
+  type: Grille
+  components:
+  - pos: 16.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5330
+  type: Grille
+  components:
+  - pos: 17.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5331
+  type: Grille
+  components:
+  - pos: 18.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5332
+  type: Grille
+  components:
+  - pos: 19.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5333
+  type: Grille
+  components:
+  - pos: 20.5,-24.5
+    parent: 30
+    type: Transform
+- uid: 5334
+  type: Grille
+  components:
+  - pos: 20.5,-23.5
+    parent: 30
+    type: Transform
+- uid: 5335
+  type: Grille
+  components:
+  - pos: 20.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5336
+  type: Grille
+  components:
+  - pos: 20.5,-19.5
+    parent: 30
+    type: Transform
+- uid: 5337
+  type: Grille
+  components:
+  - pos: 20.5,-18.5
+    parent: 30
+    type: Transform
+- uid: 5338
+  type: Grille
+  components:
+  - pos: 20.5,-17.5
+    parent: 30
+    type: Transform
+- uid: 5339
+  type: GasVentPump
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 19.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5340
+  type: GasPipeStraight
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 19.5,-20.5
+    parent: 30
+    type: Transform
+- uid: 5341
+  type: GasPipeStraight
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 19.5,-19.5
+    parent: 30
+    type: Transform
+- uid: 5342
+  type: FirelockGlass
+  components:
+  - pos: 17.5,-20.5
+    parent: 30
+    type: Transform
+  - airBlocked: False
+    type: Airtight
+  - canCollide: False
+    type: Physics
+- uid: 5343
+  type: FirelockGlass
+  components:
+  - pos: 18.5,-20.5
+    parent: 30
+    type: Transform
+  - airBlocked: False
+    type: Airtight
+  - canCollide: False
+    type: Physics
+- uid: 5344
+  type: FirelockGlass
+  components:
+  - pos: 19.5,-20.5
+    parent: 30
+    type: Transform
+  - airBlocked: False
+    type: Airtight
+  - canCollide: False
+    type: Physics
+- uid: 5345
+  type: Chair
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 17.5,-19.5
+    parent: 30
+    type: Transform
+- uid: 5346
+  type: Chair
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 17.5,-18.5
+    parent: 30
+    type: Transform
+- uid: 5347
+  type: Chair
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 17.5,-17.5
+    parent: 30
+    type: Transform
+- uid: 5348
+  type: Chair
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 17.5,-16.5
+    parent: 30
+    type: Transform
+- uid: 5349
+  type: CableApcExtension
+  components:
+  - pos: 18.5,-19.5
+    parent: 30
+    type: Transform
+- uid: 5350
+  type: CableApcExtension
+  components:
+  - pos: 18.5,-20.5
+    parent: 30
+    type: Transform
+- uid: 5351
+  type: Chair
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 17.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5352
+  type: Chair
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 18.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5353
+  type: Chair
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 19.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5354
+  type: CableApcExtension
+  components:
+  - pos: 18.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5355
+  type: CableApcExtension
+  components:
+  - pos: 18.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5356
+  type: CableApcExtension
+  components:
+  - pos: 17.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5357
+  type: CableApcExtension
+  components:
+  - pos: 16.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5358
+  type: CableApcExtension
+  components:
+  - pos: 15.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5359
+  type: CableApcExtension
+  components:
+  - pos: 14.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5360
+  type: CableApcExtension
+  components:
+  - pos: 13.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5361
+  type: CableApcExtension
+  components:
+  - pos: 13.5,-22.5
+    parent: 30
+    type: Transform
 - uid: 5362
   type: CableHV
   components:
@@ -48008,6 +48429,42 @@ entities:
     type: Physics
   - fixtures: []
     type: Fixtures
+- uid: 5364
+  type: CableApcExtension
+  components:
+  - pos: 15.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5365
+  type: CableApcExtension
+  components:
+  - pos: 19.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5366
+  type: CableApcExtension
+  components:
+  - pos: 20.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5367
+  type: CableApcExtension
+  components:
+  - pos: 21.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5368
+  type: CableApcExtension
+  components:
+  - pos: 22.5,-21.5
+    parent: 30
+    type: Transform
+- uid: 5369
+  type: CableApcExtension
+  components:
+  - pos: 23.5,-21.5
+    parent: 30
+    type: Transform
 - uid: 5370
   type: CableHV
   components:
@@ -48359,6 +48816,151 @@ entities:
     type: Physics
   - fixtures: []
     type: Fixtures
+- uid: 5405
+  type: CableApcExtension
+  components:
+  - pos: 23.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5406
+  type: CableApcExtension
+  components:
+  - pos: 21.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5407
+  type: SignSpace
+  components:
+  - pos: 14.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5408
+  type: SignSpace
+  components:
+  - pos: 22.5,-22.5
+    parent: 30
+    type: Transform
+- uid: 5409
+  type: PoweredSmallLight
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 13.5,-23.5
+    parent: 30
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
+- uid: 5410
+  type: PoweredSmallLight
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 15.5,-23.5
+    parent: 30
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
+- uid: 5411
+  type: PoweredSmallLight
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 23.5,-23.5
+    parent: 30
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
+- uid: 5412
+  type: PoweredSmallLight
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 21.5,-23.5
+    parent: 30
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
+- uid: 5413
+  type: Poweredlight
+  components:
+  - pos: 16.5,-21.5
+    parent: 30
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
+- uid: 5414
+  type: Poweredlight
+  components:
+  - pos: 20.5,-21.5
+    parent: 30
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
+- uid: 5415
+  type: WindowReinforcedDirectional
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 21.5,-19.5
+    parent: 30
+    type: Transform
+- uid: 5416
+  type: WindowReinforcedDirectional
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 21.5,-18.5
+    parent: 30
+    type: Transform
+- uid: 5417
+  type: WindowReinforcedDirectional
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 21.5,-17.5
+    parent: 30
+    type: Transform
+- uid: 5418
+  type: SignDisposalSpace
+  components:
+  - pos: 21.5,-14.5
+    parent: 30
+    type: Transform
 - uid: 5470
   type: Catwalk
   components:
@@ -62251,11 +62853,9 @@ entities:
 - uid: 7269
   type: ClothingHeadHelmetThunderdome
   components:
-  - pos: 20.545996,-16.589645
+  - pos: 17.428757,-18.611456
     parent: 30
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 7270
   type: ClothingNeckHeadphones
   components:
@@ -63140,30 +63740,6 @@ entities:
   - pos: 19.5,26.5
     parent: 30
     type: Transform
-- uid: 7385
-  type: Catwalk
-  components:
-  - pos: 19.5,-21.5
-    parent: 30
-    type: Transform
-- uid: 7386
-  type: Catwalk
-  components:
-  - pos: 18.5,-21.5
-    parent: 30
-    type: Transform
-- uid: 7387
-  type: Catwalk
-  components:
-  - pos: 18.5,-20.5
-    parent: 30
-    type: Transform
-- uid: 7388
-  type: Catwalk
-  components:
-  - pos: 19.5,-20.5
-    parent: 30
-    type: Transform
 - uid: 7389
   type: GeneratorRTG
   components: