diff --git a/Resources/Maps/_NF/Shuttles/chisel.yml b/Resources/Maps/_NF/Shuttles/chisel.yml
index 6f4a86fe55b..26d7c0f0c5d 100644
--- a/Resources/Maps/_NF/Shuttles/chisel.yml
+++ b/Resources/Maps/_NF/Shuttles/chisel.yml
@@ -3,342 +3,313 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  72: FloorRGlass
-  73: FloorReinforced
-  85: FloorSteel
-  90: FloorSteelDirty
-  93: FloorSteelMono
-  94: FloorSteelOffset
-  97: FloorTechMaint
-  113: Lattice
-  114: Plating
+  30: FloorDark
+  33: FloorDarkHerringbone
+  35: FloorDarkMono
+  46: FloorGlass
+  107: FloorTechMaint
+  108: FloorTechMaint2
+  124: Lattice
+  125: Plating
 entities:
 - proto: ""
   entities:
   - uid: 1
     components:
-    - name: grid
-      type: MetaData
-    - pos: -0.5,-0.5000076
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -0.5,-0.5000076
       parent: invalid
-      type: Transform
-    - chunks:
+    - type: MapGrid
+      chunks:
         0,0:
           ind: 0,0
-          tiles: YQAAAAAAYQAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXQAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXQAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAYQAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAASQAAAAAAcgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: awAAAAAAawAAAAAAfQAAAAAAHgAAAAAALgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAfQAAAAAAHgAAAAAALgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAawAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAASQAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAXQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAcgAAAAAASQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAASAAAAAAASAAAAAAASAAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAbAAAAAAAfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAbAAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAYQAAAAAAcgAAAAAASQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAYQAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAYQAAAAAASQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAYQAAAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAawAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAawAAAAAAawAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAASQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAASQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAASQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAWgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAawAAAAAAawAAAAAAfQAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAAAawAAAAAAHgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAAAawAAAAAAHgAAAAAAIwAAAAAAIwAAAAAAHgAAAAAA
           version: 6
-      type: MapGrid
     - type: Broadphase
-    - bodyStatus: InAir
+    - type: Physics
+      bodyStatus: InAir
       angularDamping: 0.05
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
     - type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
+    - type: DecalGrid
+      chunkCollection:
         version: 2
         nodes:
         - node:
-            angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            52: -4.2144823,-3.365216
-            53: -5.2009125,-3.365216
-            61: -3.2190301,-3.365216
+            35: -1,-5
+            36: 0,-5
         - node:
+            angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
-            id: BrickTileDarkCornerNw
+            id: Arrows
           decals:
-            10: -6,4
+            33: -1,3
+            34: 0,3
         - node:
+            angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
-            id: BrickTileDarkLineE
+            id: Arrows
           decals:
-            36: 6,2
-            37: 6,1
-            38: 6,0
-            39: 6,-1
+            30: -6,-2
+            31: -6,-1
+            32: -6,0
         - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
+            color: '#BC863FFF'
+            id: Bot
           decals:
-            0: -5,4
-            1: -4,4
-            11: -3,4
-            33: 3,3
-            34: 4,3
-            35: 5,3
+            90: -1,-2
+            91: -2,-2
+            92: -3,-2
+            93: -3,-1
+            94: -2,-1
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileDarkLineW
+            id: BotGreyscale
           decals:
-            2: -6,3
-            3: -6,2
-            19: -6,-3
+            44: 3,-2
+            82: 6,-1
+            83: -6,2
         - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteInnerSe
+            color: '#FFFFFFFF'
+            id: BotLeft
           decals:
-            8: -6,4
+            37: -1,-5
+            38: 0,-5
+            39: -1,3
+            40: 0,3
+            41: -6,0
+            42: -6,-1
+            43: -6,-2
         - node:
-            color: '#FED83DFF'
-            id: BrickTileWhiteInnerSe
+            color: '#FFFFFFFF'
+            id: BoxGreyscale
           decals:
-            42: -2,-3
-            59: -2,-3
+            79: -5,3
         - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteLineE
+            color: '#B3B3B3FF'
+            id: BrickTileSteelCornerNe
           decals:
-            6: -6,3
-            7: -6,2
+            50: -1,1
+            52: 0,-1
+            61: 5,2
+            84: 4,3
         - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteLineS
+            color: '#B3B3B3FF'
+            id: BrickTileSteelCornerNw
           decals:
-            4: -5,4
-            5: -4,4
-            9: -3,4
+            47: -4,0
+            49: -2,1
+            85: 3,3
         - node:
-            color: '#FED83DFF'
-            id: BrickTileWhiteLineS
+            color: '#B3B3B3FF'
+            id: BrickTileSteelCornerSe
           decals:
-            40: -1,-3
-            41: 0,-3
+            53: 0,-3
+            62: 5,-1
         - node:
-            color: '#FED83DFF'
-            id: BrickTileWhiteLineW
+            color: '#B3B3B3FF'
+            id: BrickTileSteelCornerSw
           decals:
-            56: -6,-2
-            57: -6,0
-            58: -6,-1
+            54: -4,-3
+            63: 3,-1
         - node:
-            cleanable: True
-            color: '#FFFFFF75'
-            id: Dirt
+            color: '#B3B3B3FF'
+            id: BrickTileSteelInnerNe
           decals:
-            99: -3,-2
-            100: -5,-1
+            58: -1,-1
+            87: 4,2
         - node:
-            cleanable: True
-            color: '#FFFFFFC3'
-            id: Dirt
+            color: '#B3B3B3FF'
+            id: BrickTileSteelInnerNw
           decals:
-            101: -2,0
-            102: 3,0
-            103: 5,2
-            104: 4,1
-            105: 3,2
-            106: 5,0
-            107: -5,3
+            80: -2,0
         - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: Dirt
+            color: '#B3B3B3FF'
+            id: BrickTileSteelLineE
           decals:
-            76: 1,-1
-            77: 1,-2
-            78: 1,-3
-            79: 1,2
-            80: 1,3
-            81: 1,-5
-            82: 1,-4
-            83: 1,-6
-            84: -6,-1
-            85: -6,0
-            86: -6,-2
-            87: -5,-3
-            88: -5,-2
-            89: -4,-1
-            90: -5,0
-            91: -3,-3
-            92: -2,-2
-            93: -3,1
-            94: -2,2
-            95: -2,1
-            96: 0,2
-            97: 0,-1
-            98: 0,-3
-            108: -4,2
-            110: 3,-3
-            116: 3,-2
+            51: -1,0
+            59: 0,-2
+            67: 5,0
+            68: 5,1
         - node:
-            cleanable: True
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: Dirt
+            color: '#B3B3B3FF'
+            id: BrickTileSteelLineN
           decals:
-            109: 3,-3
-            117: 3,-2
+            48: -3,0
         - node:
-            color: '#FFFFFFFF'
-            id: MiniTileSteelInnerNw
+            color: '#B3B3B3FF'
+            id: BrickTileSteelLineS
           decals:
-            25: 6,-2
+            55: -3,-3
+            56: -2,-3
+            57: -1,-3
+            66: 4,-1
         - node:
-            color: '#FFFFFFFF'
-            id: MiniTileSteelLineN
+            color: '#B3B3B3FF'
+            id: BrickTileSteelLineW
           decals:
-            112: 4,-2
-            113: 3,-2
-            119: 5,-2
+            45: -4,-1
+            46: -4,-2
+            64: 3,1
+            65: 3,0
+            86: 3,2
         - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: MiniTileSteelLineN
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerNe
           decals:
-            111: 3,-3
+            72: -4,4
         - node:
-            color: '#FFFFFFFF'
-            id: MiniTileSteelLineS
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerNw
           decals:
-            30: 5,3
-            31: 4,3
-            32: 3,3
+            71: -6,4
         - node:
-            color: '#FFFFFFFF'
-            id: MiniTileSteelLineW
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerSe
           decals:
-            26: 6,-1
-            27: 6,0
-            28: 6,1
-            29: 6,2
+            74: -4,2
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteCornerNe
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerSw
           decals:
-            45: 5,2
+            73: -6,2
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteCornerSe
+            color: '#BC863FFF'
+            id: BrickTileWhiteEndN
           decals:
-            48: 5,-1
+            69: 4,1
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteInnerNe
+            color: '#BC863FFF'
+            id: BrickTileWhiteEndS
           decals:
-            63: -2,2
+            70: 4,0
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteInnerSe
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineE
           decals:
-            60: -3,-3
+            78: -4,3
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteInnerSw
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineN
           decals:
-            64: -3,1
+            77: -5,4
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteLineE
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineS
           decals:
-            46: 5,1
-            47: 5,0
+            75: -5,2
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteLineN
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineW
           decals:
-            43: 3,2
-            44: 4,2
-            49: -6,0
-            50: -5,0
-            51: -4,0
+            76: -6,3
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteLineS
+            color: '#169C9CFF'
+            id: DeliveryGreyscale
           decals:
-            54: -6,-2
-            55: -2,-3
-            114: 4,-1
-            115: 3,-1
+            88: 5,3
         - node:
-            color: '#6E6E6EFF'
-            id: MiniTileWhiteLineW
+            color: '#FFFFFFFF'
+            id: DeliveryGreyscale
           decals:
-            62: -5,-3
+            26: 6,2
+            27: 6,-2
+            28: 4,-2
+            29: -3,4
+            81: 5,-2
+            89: -3,3
         - node:
+            cleanable: True
             color: '#FFFFFFFF'
-            id: StandClear
+            id: Dirt
           decals:
-            16: -1,3
-            17: 0,3
-            18: 1,3
-            20: -1,3
-            21: 0,3
+            14: 1,-2
+            15: 1,-3
+            16: 1,2
+            17: 1,3
+            18: 1,-5
+            19: 1,-4
+            20: 1,-6
         - node:
-            color: '#FFFFFF7F'
-            id: WarnBox
+            color: '#BC863FFF'
+            id: MiniTileWhiteEndS
           decals:
-            118: 5,-2
+            60: 4,0
         - node:
             color: '#FFFFFFFF'
-            id: WarnEndN
+            id: StandClear
           decals:
-            67: 1,-2
+            0: 1,3
+            21: -1,4
+            22: 1,4
+            23: 0,4
         - node:
             color: '#FFFFFFFF'
-            id: WarnFull
+            id: WarnEndN
           decals:
-            12: 0,1
-            13: 0,0
-            14: 1,0
-            15: 1,1
+            5: 1,-2
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            68: 1,-3
-            69: 1,-4
-            70: 1,-5
-            71: 1,-6
-            74: 1,2
-            75: 1,3
+            6: 1,-3
+            7: 1,-4
+            8: 1,-5
+            9: 1,-6
+            12: 1,2
+            13: 1,3
+            25: 1,4
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            65: 1,-3
-            66: 1,-5
-            72: 1,2
-            73: 1,3
+            3: 1,-3
+            4: 1,-5
+            10: 1,2
+            11: 1,3
+            24: 1,4
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            22: -5,-4
-            23: -4,-4
-            24: -3,-4
-      type: DecalGrid
-    - version: 2
+            1: -4,-4
+            2: -3,-4
+    - type: GridAtmosphere
+      version: 2
       data:
         tiles:
           0,0:
             0: 65535
           0,1:
-            1: 2035
-            0: 12
+            0: 15
+            1: 2032
           1,0:
             0: 32767
             1: 32768
@@ -347,22 +318,22 @@ entities:
           -1,0:
             0: 65535
           -1,1:
-            0: 55
-            1: 3784
+            0: 63
+            1: 3776
           0,-2:
             0: 63232
             1: 2048
           0,-1:
             0: 65535
           1,-2:
-            0: 12544
-            1: 16896
+            1: 17152
+            0: 12288
           1,-1:
             0: 65527
             1: 8
           -1,-2:
-            1: 256
-            0: 65024
+            1: 768
+            0: 64512
           -1,-1:
             0: 65535
           1,1:
@@ -372,10 +343,11 @@ entities:
             0: 206
             1: 32
           -2,-1:
-            0: 61164
+            0: 61162
+            1: 4
           -2,-2:
-            1: 16384
-            0: 32768
+            0: 16384
+            1: 32768
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -408,1846 +380,2023 @@ entities:
           - 0
           - 0
         chunkSize: 4
-      type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
 - proto: AirAlarm
   entities:
-  - uid: 322
+  - uid: 213
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,1.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,2.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 304
-      - 315
-      type: DeviceNetwork
-    - devices:
-      - 315
-      - 304
-      type: DeviceList
-    - enabled: False
-      type: AccessReader
-    - type: Emagged
-  - uid: 323
+    - type: DeviceList
+      devices:
+      - 289
+      - 349
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 292
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,1.5
+    - type: Transform
+      pos: -2.5,1.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 316
-      - 190
-      - 187
+    - type: DeviceList
+      devices:
       - 317
-      type: DeviceNetwork
-    - devices:
-      - 187
-      - 316
       - 190
-      - 317
-      type: DeviceList
-    - enabled: False
-      type: AccessReader
-    - type: Emagged
+      - 316
+      - 187
+    - type: AtmosDevice
+      joinedGrid: 1
 - proto: AirCanister
   entities:
   - uid: 188
     components:
-    - anchored: True
-      pos: -2.5,4.5
+    - type: Transform
+      anchored: True
+      pos: 5.5,3.5
       parent: 1
-      type: Transform
-    - bodyType: Static
-      type: Physics
+    - type: Physics
+      bodyType: Static
+    - type: AtmosDevice
+      joinedGrid: 1
 - proto: AirlockCargoGlass
   entities:
   - uid: 122
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 2.5,-0.5
       parent: 1
-      type: Transform
 - proto: AirlockCommandGlass
   entities:
-  - uid: 121
+  - uid: 312
     components:
-    - pos: -4.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,1.5
       parent: 1
-      type: Transform
 - proto: AirlockExternalGlass
   entities:
+  - uid: 20
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 351
   - uid: 109
     components:
-    - pos: -0.5,-3.5
+    - type: Transform
+      pos: -0.5,-3.5
       parent: 1
-      type: Transform
+    - type: DeviceLinkSink
+      links:
+      - 351
   - uid: 110
     components:
-    - pos: 0.5,-3.5
+    - type: Transform
+      pos: 0.5,-3.5
       parent: 1
-      type: Transform
+    - type: DeviceLinkSink
+      links:
+      - 351
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 351
+  - uid: 284
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 351
 - proto: AirlockGlassShuttle
   entities:
   - uid: 46
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,-1.5
+    - type: Transform
+      pos: 0.5,-5.5
       parent: 1
-      type: Transform
   - uid: 47
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,-0.5
+    - type: Transform
+      pos: -0.5,-5.5
       parent: 1
-      type: Transform
-    - secondsUntilStateChange: -7573.943
-      state: Opening
-      type: Door
   - uid: 48
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,0.5
       parent: 1
-      type: Transform
   - uid: 56
     components:
-    - pos: 0.5,-5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-1.5
       parent: 1
-      type: Transform
   - uid: 58
     components:
-    - pos: -0.5,-5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-0.5
       parent: 1
-      type: Transform
 - proto: APCBasic
   entities:
   - uid: 176
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,0.5
       parent: 1
-      type: Transform
 - proto: AppraisalTool
   entities:
-  - uid: 66
+  - uid: 210
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.3942842,1.6721661
+    - type: Transform
+      pos: 6.699864,1.530165
       parent: 1
-      type: Transform
 - proto: AtmosDeviceFanTiny
   entities:
+  - uid: 16
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-5.5
+      parent: 1
   - uid: 49
     components:
-    - pos: -6.5,0.5
+    - type: Transform
+      pos: -6.5,0.5
       parent: 1
-      type: Transform
   - uid: 50
     components:
-    - pos: -6.5,-1.5
+    - type: Transform
+      pos: -6.5,-1.5
       parent: 1
-      type: Transform
   - uid: 51
     components:
-    - pos: -6.5,-0.5
+    - type: Transform
+      pos: -6.5,-0.5
       parent: 1
-      type: Transform
   - uid: 53
     components:
-    - pos: -0.5,-5.5
+    - type: Transform
+      pos: -0.5,-5.5
       parent: 1
-      type: Transform
   - uid: 54
     components:
-    - pos: 0.5,-5.5
+    - type: Transform
+      pos: 0.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 69
+  - uid: 61
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,3.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
       parent: 1
-      type: Transform
-  - uid: 70
+  - uid: 68
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,3.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,4.5
       parent: 1
-      type: Transform
 - proto: AtmosFixBlockerMarker
   entities:
-  - uid: 216
+  - uid: 41
     components:
-    - pos: -5.5,-4.5
+    - type: Transform
+      pos: -5.5,-3.5
       parent: 1
-      type: Transform
   - uid: 217
     components:
-    - pos: -3.5,-5.5
+    - type: Transform
+      pos: -3.5,-5.5
       parent: 1
-      type: Transform
   - uid: 218
     components:
-    - pos: 3.5,-5.5
+    - type: Transform
+      pos: 3.5,-5.5
       parent: 1
-      type: Transform
   - uid: 219
     components:
-    - pos: 5.5,-5.5
+    - type: Transform
+      pos: 5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 220
     components:
-    - pos: 6.5,-4.5
+    - type: Transform
+      pos: 6.5,-4.5
       parent: 1
-      type: Transform
   - uid: 226
     components:
-    - pos: 7.5,-3.5
+    - type: Transform
+      pos: 7.5,-3.5
       parent: 1
-      type: Transform
   - uid: 227
     components:
-    - pos: 7.5,3.5
+    - type: Transform
+      pos: 7.5,3.5
       parent: 1
-      type: Transform
   - uid: 238
     components:
-    - pos: 6.5,4.5
+    - type: Transform
+      pos: 6.5,4.5
       parent: 1
-      type: Transform
   - uid: 241
     components:
-    - pos: 5.5,5.5
+    - type: Transform
+      pos: 5.5,5.5
       parent: 1
-      type: Transform
   - uid: 250
     components:
-    - pos: 4.5,5.5
+    - type: Transform
+      pos: 4.5,5.5
       parent: 1
-      type: Transform
   - uid: 251
     components:
-    - pos: 3.5,5.5
+    - type: Transform
+      pos: 3.5,5.5
       parent: 1
-      type: Transform
   - uid: 260
     components:
-    - pos: 2.5,5.5
+    - type: Transform
+      pos: 2.5,5.5
       parent: 1
-      type: Transform
   - uid: 265
     components:
-    - pos: 1.5,5.5
+    - type: Transform
+      pos: 1.5,5.5
       parent: 1
-      type: Transform
   - uid: 266
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: 0.5,5.5
       parent: 1
-      type: Transform
   - uid: 270
     components:
-    - pos: -0.5,5.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 1
-      type: Transform
   - uid: 272
     components:
-    - pos: -1.5,5.5
+    - type: Transform
+      pos: -1.5,5.5
       parent: 1
-      type: Transform
   - uid: 273
     components:
-    - pos: -2.5,6.5
+    - type: Transform
+      pos: -2.5,6.5
       parent: 1
-      type: Transform
   - uid: 278
     components:
-    - pos: -1.5,6.5
+    - type: Transform
+      pos: -1.5,6.5
       parent: 1
-      type: Transform
   - uid: 290
     components:
-    - pos: -0.5,6.5
+    - type: Transform
+      pos: -0.5,6.5
       parent: 1
-      type: Transform
   - uid: 301
     components:
-    - pos: 0.5,6.5
+    - type: Transform
+      pos: 0.5,6.5
       parent: 1
-      type: Transform
   - uid: 305
     components:
-    - pos: 1.5,6.5
+    - type: Transform
+      pos: 1.5,6.5
       parent: 1
-      type: Transform
   - uid: 307
     components:
-    - pos: 2.5,6.5
+    - type: Transform
+      pos: 2.5,6.5
       parent: 1
-      type: Transform
-  - uid: 321
+  - uid: 310
     components:
-    - pos: 1.5,4.5
+    - type: Transform
+      pos: -4.5,-4.5
       parent: 1
-      type: Transform
   - uid: 326
     components:
-    - pos: 0.5,4.5
+    - type: Transform
+      pos: -2.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 327
+  - uid: 328
     components:
-    - pos: -0.5,4.5
+    - type: Transform
+      pos: -6.5,5.5
       parent: 1
-      type: Transform
-  - uid: 328
+  - uid: 341
     components:
-    - pos: -6.5,5.5
+    - type: Transform
+      pos: 4.5,-5.5
       parent: 1
-      type: Transform
 - proto: BlastDoor
   entities:
-  - uid: 61
+  - uid: 2
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,3.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,4.5
       parent: 1
-      type: Transform
-    - links:
-      - 52
-      - 60
-      type: DeviceLinkSink
-  - uid: 62
+    - type: DeviceLinkSink
+      links:
+      - 19
+  - uid: 18
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,3.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 19
+  - uid: 60
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
       parent: 1
-      type: Transform
-    - links:
-      - 52
-      - 60
-      type: DeviceLinkSink
+    - type: DeviceLinkSink
+      links:
+      - 19
   - uid: 183
     components:
-    - pos: 1.5,-3.5
+    - type: Transform
+      pos: 1.5,-3.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 189
-      type: DeviceLinkSink
   - uid: 185
     components:
-    - pos: 1.5,-5.5
+    - type: Transform
+      pos: 1.5,-5.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 189
-      type: DeviceLinkSink
-  - uid: 186
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,3.5
-      parent: 1
-      type: Transform
-    - links:
-      - 52
-      - 60
-      type: DeviceLinkSink
 - proto: CableApcExtension
   entities:
   - uid: 31
     components:
-    - pos: 3.5,-0.5
+    - type: Transform
+      pos: 3.5,-0.5
       parent: 1
-      type: Transform
   - uid: 33
     components:
-    - pos: 0.5,-0.5
+    - type: Transform
+      pos: 0.5,-0.5
       parent: 1
-      type: Transform
   - uid: 39
     components:
-    - pos: -0.5,-0.5
+    - type: Transform
+      pos: -0.5,-0.5
       parent: 1
-      type: Transform
   - uid: 63
     components:
-    - pos: 3.5,-3.5
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -3.5,1.5
       parent: 1
-      type: Transform
   - uid: 102
     components:
-    - pos: -1.5,-0.5
+    - type: Transform
+      pos: -1.5,-0.5
       parent: 1
-      type: Transform
   - uid: 136
     components:
-    - pos: -2.5,-0.5
+    - type: Transform
+      pos: -2.5,-0.5
       parent: 1
-      type: Transform
   - uid: 140
     components:
-    - pos: -3.5,-0.5
+    - type: Transform
+      pos: -3.5,-0.5
       parent: 1
-      type: Transform
   - uid: 147
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 2.5,-0.5
       parent: 1
-      type: Transform
   - uid: 153
     components:
-    - pos: 0.5,-2.5
+    - type: Transform
+      pos: 0.5,-2.5
       parent: 1
-      type: Transform
   - uid: 154
     components:
-    - pos: 0.5,-3.5
-      parent: 1
-      type: Transform
-  - uid: 155
-    components:
-    - pos: -4.5,1.5
+    - type: Transform
+      pos: 0.5,-3.5
       parent: 1
-      type: Transform
   - uid: 157
     components:
-    - pos: 0.5,0.5
+    - type: Transform
+      pos: 0.5,0.5
       parent: 1
-      type: Transform
   - uid: 177
     components:
-    - pos: 2.5,0.5
+    - type: Transform
+      pos: 2.5,0.5
       parent: 1
-      type: Transform
   - uid: 178
     components:
-    - pos: 0.5,1.5
+    - type: Transform
+      pos: 0.5,1.5
       parent: 1
-      type: Transform
   - uid: 179
     components:
-    - pos: 0.5,2.5
+    - type: Transform
+      pos: 0.5,2.5
       parent: 1
-      type: Transform
   - uid: 180
     components:
-    - pos: -3.5,-2.5
+    - type: Transform
+      pos: -3.5,-2.5
       parent: 1
-      type: Transform
   - uid: 181
     components:
-    - pos: 0.5,3.5
+    - type: Transform
+      pos: 0.5,3.5
       parent: 1
-      type: Transform
   - uid: 182
     components:
-    - pos: 0.5,4.5
+    - type: Transform
+      pos: 0.5,4.5
       parent: 1
-      type: Transform
   - uid: 184
     components:
-    - pos: 5.5,2.5
+    - type: Transform
+      pos: 5.5,2.5
       parent: 1
-      type: Transform
   - uid: 193
     components:
-    - pos: -3.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 194
-    components:
-    - pos: -4.5,0.5
+    - type: Transform
+      pos: -3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 195
     components:
-    - pos: 0.5,-1.5
+    - type: Transform
+      pos: 0.5,-1.5
       parent: 1
-      type: Transform
   - uid: 196
     components:
-    - pos: -4.5,-0.5
+    - type: Transform
+      pos: -4.5,-0.5
       parent: 1
-      type: Transform
   - uid: 197
     components:
-    - pos: 5.5,0.5
+    - type: Transform
+      pos: 5.5,0.5
       parent: 1
-      type: Transform
   - uid: 198
     components:
-    - pos: 3.5,-2.5
+    - type: Transform
+      pos: 3.5,-2.5
       parent: 1
-      type: Transform
   - uid: 199
     components:
-    - pos: 3.5,-1.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 200
     components:
-    - pos: 5.5,1.5
+    - type: Transform
+      pos: 5.5,1.5
       parent: 1
-      type: Transform
   - uid: 201
     components:
-    - pos: 5.5,-0.5
+    - type: Transform
+      pos: 5.5,-0.5
       parent: 1
-      type: Transform
   - uid: 202
     components:
-    - pos: 1.5,-0.5
+    - type: Transform
+      pos: 1.5,-0.5
       parent: 1
-      type: Transform
   - uid: 203
     components:
-    - pos: 4.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 221
-    components:
-    - pos: -4.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 222
-    components:
-    - pos: -4.5,2.5
+    - type: Transform
+      pos: 4.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 223
+  - uid: 209
     components:
-    - pos: -4.5,3.5
+    - type: Transform
+      pos: -3.5,-3.5
       parent: 1
-      type: Transform
   - uid: 224
     components:
-    - pos: -2.5,3.5
+    - type: Transform
+      pos: -2.5,3.5
       parent: 1
-      type: Transform
   - uid: 225
     components:
-    - pos: -3.5,3.5
+    - type: Transform
+      pos: -3.5,3.5
       parent: 1
-      type: Transform
   - uid: 237
     components:
-    - pos: 5.5,3.5
+    - type: Transform
+      pos: 5.5,3.5
       parent: 1
-      type: Transform
   - uid: 239
     components:
-    - pos: 4.5,-3.5
+    - type: Transform
+      pos: 4.5,-3.5
       parent: 1
-      type: Transform
   - uid: 249
     components:
-    - pos: 5.5,-3.5
+    - type: Transform
+      pos: 5.5,-3.5
       parent: 1
-      type: Transform
   - uid: 275
     components:
-    - pos: -2.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 276
-    components:
-    - pos: -2.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 277
-    components:
-    - pos: -2.5,6.5
+    - type: Transform
+      pos: -2.5,4.5
       parent: 1
-      type: Transform
 - proto: CableHV
   entities:
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
   - uid: 165
     components:
-    - pos: 5.5,-1.5
+    - type: Transform
+      pos: 5.5,-1.5
       parent: 1
-      type: Transform
   - uid: 231
     components:
-    - pos: 4.5,-1.5
+    - type: Transform
+      pos: 4.5,-1.5
       parent: 1
-      type: Transform
   - uid: 234
     components:
-    - pos: 3.5,-1.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 236
     components:
-    - pos: 6.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 255
-    components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 6.5,-1.5
       parent: 1
-      type: Transform
 - proto: CableMV
   entities:
   - uid: 174
     components:
-    - pos: 3.5,0.5
+    - type: Transform
+      pos: 3.5,0.5
       parent: 1
-      type: Transform
   - uid: 175
     components:
-    - pos: 2.5,0.5
+    - type: Transform
+      pos: 2.5,0.5
       parent: 1
-      type: Transform
   - uid: 256
     components:
-    - pos: 4.5,0.5
+    - type: Transform
+      pos: 4.5,0.5
       parent: 1
-      type: Transform
   - uid: 257
     components:
-    - pos: 5.5,0.5
+    - type: Transform
+      pos: 5.5,0.5
       parent: 1
-      type: Transform
   - uid: 258
     components:
-    - pos: 6.5,0.5
+    - type: Transform
+      pos: 6.5,0.5
       parent: 1
-      type: Transform
   - uid: 259
     components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
       parent: 1
-      type: Transform
 - proto: CableTerminal
   entities:
   - uid: 230
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-1.5
       parent: 1
-      type: Transform
 - proto: Catwalk
   entities:
-  - uid: 72
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,4.5
-      parent: 1
-      type: Transform
   - uid: 73
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,5.5
       parent: 1
-      type: Transform
   - uid: 74
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,6.5
       parent: 1
-      type: Transform
-  - uid: 75
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 1
-      type: Transform
   - uid: 76
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,5.5
       parent: 1
-      type: Transform
   - uid: 77
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,6.5
       parent: 1
-      type: Transform
-  - uid: 78
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,4.5
-      parent: 1
-      type: Transform
   - uid: 79
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,5.5
       parent: 1
-      type: Transform
   - uid: 80
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,6.5
       parent: 1
-      type: Transform
   - uid: 82
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,6.5
       parent: 1
-      type: Transform
   - uid: 83
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,5.5
       parent: 1
-      type: Transform
   - uid: 84
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,6.5
       parent: 1
-      type: Transform
-  - uid: 85
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,5.5
-      parent: 1
-      type: Transform
   - uid: 86
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,5.5
       parent: 1
-      type: Transform
   - uid: 126
     components:
-    - pos: 1.5,1.5
+    - type: Transform
+      pos: 1.5,1.5
       parent: 1
-      type: Transform
   - uid: 129
     components:
-    - pos: 0.5,0.5
+    - type: Transform
+      pos: 0.5,0.5
       parent: 1
-      type: Transform
   - uid: 130
     components:
-    - pos: 1.5,0.5
+    - type: Transform
+      pos: 1.5,0.5
       parent: 1
-      type: Transform
   - uid: 134
     components:
-    - pos: 0.5,1.5
+    - type: Transform
+      pos: 0.5,1.5
       parent: 1
-      type: Transform
   - uid: 248
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-3.5
       parent: 1
-      type: Transform
   - uid: 252
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,-3.5
       parent: 1
-      type: Transform
   - uid: 268
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-3.5
       parent: 1
-      type: Transform
-- proto: Chair
+- proto: ChairFolding
   entities:
-  - uid: 38
+  - uid: 12
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,1.5
       parent: 1
-      type: Transform
-  - uid: 267
+  - uid: 81
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,1.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,3.5
       parent: 1
-      type: Transform
 - proto: ChairPilotSeat
   entities:
   - uid: 141
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,3.5
       parent: 1
-      type: Transform
 - proto: ComputerTabletopShuttle
   entities:
   - uid: 191
     components:
-    - pos: -4.5,4.5
+    - type: Transform
+      pos: -4.5,4.5
       parent: 1
-      type: Transform
 - proto: ComputerTabletopStationRecords
   entities:
   - uid: 192
     components:
-    - pos: -3.5,4.5
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+- proto: ComputerWallmountWithdrawBankATM
+  entities:
+  - uid: 332
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
       parent: 1
-      type: Transform
+    - type: Physics
+      canCollide: False
+    - type: ContainerContainer
+      containers:
+        board: !type:Container
+          ents: []
+        bank-ATM-cashSlot: !type:ContainerSlot {}
+    - type: ItemSlots
 - proto: ConveyorBelt
   entities:
   - uid: 97
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-2.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 125
-      type: DeviceLinkSink
   - uid: 98
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-5.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 125
-      type: DeviceLinkSink
   - uid: 99
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-3.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 125
-      type: DeviceLinkSink
   - uid: 100
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 1.5,2.5
       parent: 1
-      type: Transform
-    - links:
-      - 148
-      type: DeviceLinkSink
+    - type: DeviceLinkSink
+      links:
+      - 330
+      - 149
   - uid: 101
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 1.5,4.5
       parent: 1
-      type: Transform
-    - links:
-      - 148
-      type: DeviceLinkSink
+    - type: DeviceLinkSink
+      links:
+      - 330
+      - 149
   - uid: 103
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 1.5,5.5
       parent: 1
-      type: Transform
-    - links:
-      - 148
-      type: DeviceLinkSink
+    - type: DeviceLinkSink
+      links:
+      - 330
+      - 149
   - uid: 104
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 1.5,3.5
       parent: 1
-      type: Transform
-    - links:
-      - 148
-      type: DeviceLinkSink
+    - type: DeviceLinkSink
+      links:
+      - 330
+      - 149
   - uid: 105
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,-3.5
       parent: 1
-      type: Transform
-    - links:
-      - 162
-      type: DeviceLinkSink
-  - uid: 106
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-3.5
-      parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 162
-      type: DeviceLinkSink
   - uid: 107
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,-3.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 162
-      type: DeviceLinkSink
   - uid: 228
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-1.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 125
-      type: DeviceLinkSink
   - uid: 269
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-4.5
       parent: 1
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 125
-      type: DeviceLinkSink
 - proto: CrateGenericSteel
   entities:
-  - uid: 149
+  - uid: 70
     components:
-    - pos: -2.5,-3.5
+    - type: Transform
+      pos: -2.5,-2.5
       parent: 1
-      type: Transform
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 229
-    components:
-    - pos: -5.5,1.5
-      parent: 1
-      type: Transform
-- proto: DrinkBeerglass
-  entities:
-  - uid: 65
-    components:
-    - pos: 3.6651173,3.8305898
-      parent: 1
-      type: Transform
-  - uid: 163
+  - uid: 304
     components:
-    - pos: 3.2484512,3.5189266
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-3.5
       parent: 1
-      type: Transform
-- proto: DrinkMugBlue
+- proto: DrinkWaterBottleFull
   entities:
-  - uid: 263
+  - uid: 14
     components:
-    - pos: -5.654616,4.264064
+    - type: Transform
+      pos: 3.3522706,3.5916283
       parent: 1
-      type: Transform
-- proto: DrinkMugMetal
-  entities:
-  - uid: 262
+  - uid: 294
     components:
-    - pos: 3.3084455,2.5795195
+    - type: Transform
+      pos: 3.6803956,3.6541283
       parent: 1
-      type: Transform
 - proto: EmergencyLight
   entities:
   - uid: 320
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 324
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,1.5
-      parent: 1
-      type: Transform
   - uid: 325
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,2.5
       parent: 1
-      type: Transform
+  - uid: 331
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 271
+  - uid: 221
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-1.5
       parent: 1
-      type: Transform
 - proto: FaxMachineShip
   entities:
   - uid: 143
     components:
-    - pos: -5.5,4.5
+    - type: Transform
+      pos: -5.5,4.5
       parent: 1
-      type: Transform
 - proto: FirelockGlass
   entities:
-  - uid: 68
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 55
     components:
-    - pos: 1.5,3.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,4.5
       parent: 1
-      type: Transform
   - uid: 71
     components:
-    - pos: 1.5,-3.5
+    - type: Transform
+      pos: 1.5,-3.5
       parent: 1
-      type: Transform
   - uid: 96
     components:
-    - pos: 1.5,-5.5
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: -4.5,0.5
       parent: 1
-      type: Transform
   - uid: 318
     components:
-    - pos: -4.5,1.5
+    - type: Transform
+      pos: 0.5,2.5
       parent: 1
-      type: Transform
   - uid: 319
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
       parent: 1
-      type: Transform
 - proto: FoodBoxPizzaFilled
   entities:
-  - uid: 152
+  - uid: 216
     components:
-    - pos: 3.5495157,3.143291
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.3678956,2.7947533
       parent: 1
-      type: Transform
 - proto: GasPassiveVent
   entities:
-  - uid: 310
+  - uid: 66
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: 4.5,5.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 209
+  - uid: 267
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,3.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,1.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 279
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 285
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 302
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 337
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeStraight
   entities:
   - uid: 8
     components:
-    - pos: -4.5,2.5
+    - type: Transform
+      pos: -4.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,3.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 156
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,3.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 159
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 164
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 223
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 229
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 240
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 264
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 277
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 280
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,1.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 281
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,0.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 282
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 283
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 284
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-0.5
-      parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 286
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 287
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 288
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 289
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-0.5
-      parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 292
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-1.5
-      parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 293
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 296
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 297
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 298
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 299
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,2.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 300
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 303
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 306
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 308
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,3.5
-      parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 309
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 311
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,0.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 312
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 333
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,1.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 313
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 336
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,0.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,0.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 314
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 350
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,0.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 210
+  - uid: 150
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,3.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 291
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 167
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-0.5
+    - type: Transform
+      pos: -1.5,-1.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 294
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 208
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 295
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 347
     components:
-    - pos: -0.5,-1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-0.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPort
   entities:
-  - uid: 212
+  - uid: 262
     components:
-    - pos: -2.5,4.5
+    - type: Transform
+      pos: 5.5,3.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPressurePump
   entities:
-  - uid: 204
+  - uid: 137
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,3.5
+    - type: Transform
+      pos: 5.5,2.5
       parent: 1
-      type: Transform
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 208
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 344
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,2.5
       parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVentPump
   entities:
   - uid: 190
     components:
-    - pos: -4.5,4.5
+    - type: Transform
+      pos: -4.5,4.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 323
-      type: DeviceNetwork
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 304
+    - type: DeviceNetwork
+      deviceLists:
+      - 292
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 317
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-0.5
+    - type: Transform
+      pos: -1.5,0.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 322
-      type: DeviceNetwork
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
-  - uid: 317
+    - type: DeviceNetwork
+      deviceLists:
+      - 292
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 349
     components:
-    - pos: -0.5,0.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 323
-      type: DeviceNetwork
-    - color: '#0000CCFF'
-      type: AtmosPipeColor
+    - type: DeviceNetwork
+      deviceLists:
+      - 213
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 187
     components:
-    - pos: -3.5,4.5
+    - type: Transform
+      pos: -3.5,4.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 323
-      type: DeviceNetwork
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 315
+    - type: DeviceNetwork
+      deviceLists:
+      - 292
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 289
     components:
-    - pos: 5.5,-0.5
+    - type: Transform
+      pos: 5.5,-0.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 322
-      type: DeviceNetwork
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: DeviceNetwork
+      deviceLists:
+      - 213
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 316
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-2.5
       parent: 1
-      type: Transform
-    - ShutdownSubscribers:
-      - 323
-      type: DeviceNetwork
-    - color: '#990000FF'
-      type: AtmosPipeColor
+    - type: DeviceNetwork
+      deviceLists:
+      - 292
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 243
+  - uid: 158
     components:
-    - pos: 5.5,3.5
+    - type: Transform
+      pos: -2.5,3.5
       parent: 1
-      type: Transform
 - proto: Grille
   entities:
   - uid: 112
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-0.5
       parent: 1
-      type: Transform
   - uid: 113
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,0.5
       parent: 1
-      type: Transform
   - uid: 114
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,1.5
       parent: 1
-      type: Transform
   - uid: 115
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,5.5
       parent: 1
-      type: Transform
   - uid: 116
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,5.5
       parent: 1
-      type: Transform
   - uid: 117
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -5.5,5.5
       parent: 1
-      type: Transform
   - uid: 118
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -6.5,4.5
       parent: 1
-      type: Transform
   - uid: 119
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -6.5,3.5
       parent: 1
-      type: Transform
 - proto: Gyroscope
   entities:
-  - uid: 242
+  - uid: 160
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,4.5
       parent: 1
-      type: Transform
 - proto: LockerQuarterMasterFilled
   entities:
-  - uid: 211
+  - uid: 146
     components:
-    - pos: -5.5,2.5
+    - type: Transform
+      pos: -5.5,2.5
       parent: 1
-      type: Transform
 - proto: LockerSalvageSpecialistFilled
   entities:
-  - uid: 146
+  - uid: 211
     components:
-    - pos: 3.5,-1.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 1
-      type: Transform
 - proto: MaterialReclaimer
   entities:
-  - uid: 91
+  - uid: 17
     components:
-    - pos: -3.5,0.5
+    - type: Transform
+      pos: 6.5,2.5
       parent: 1
-      type: Transform
 - proto: OreProcessor
   entities:
-  - uid: 247
+  - uid: 263
     components:
-    - pos: -4.5,-3.5
+    - type: Transform
+      pos: -2.5,-3.5
       parent: 1
-      type: Transform
 - proto: PaperBin5
   entities:
   - uid: 145
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -5.5,3.5
       parent: 1
-      type: Transform
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 55
+  - uid: 57
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,3.5
+    - type: Transform
+      pos: 1.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 57
+  - uid: 62
     components:
-    - pos: 1.5,-5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
       parent: 1
-      type: Transform
   - uid: 108
     components:
-    - pos: 1.5,-3.5
+    - type: Transform
+      pos: 1.5,-3.5
       parent: 1
-      type: Transform
-- proto: PortableGeneratorPacman
+- proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 235
+  - uid: 78
     components:
-    - anchored: True
+    - type: Transform
       pos: 4.5,-1.5
       parent: 1
-      type: Transform
-    - storage:
-        Plasma: 3000
-      type: MaterialStorage
-    - bodyType: Static
-      type: Physics
-    - type: InsertingMaterialStorage
+    - type: FuelGenerator
+      on: False
+    - type: Physics
+      bodyType: Static
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+    - type: FuelGenerator
+      on: False
+    - type: Physics
+      bodyType: Static
+- proto: PowerCellRecharger
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
 - proto: Poweredlight
   entities:
+  - uid: 123
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
   - uid: 139
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,3.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,1.5
       parent: 1
-      type: Transform
-  - uid: 158
+  - uid: 242
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,2.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -2.5,0.5
       parent: 1
-      type: Transform
 - proto: PoweredlightColoredBlack
   entities:
   - uid: 169
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-3.5
       parent: 1
-      type: Transform
-- proto: PoweredSmallLight
+- proto: PoweredlightSodium
   entities:
-  - uid: 123
-    components:
-    - pos: -3.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 124
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 128
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 137
+  - uid: 204
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,5.5
       parent: 1
-      type: Transform
-  - uid: 160
+- proto: PoweredSmallLight
+  entities:
+  - uid: 106
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,2.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 264
+  - uid: 121
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-1.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
       parent: 1
-      type: Transform
 - proto: Rack
   entities:
   - uid: 171
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-3.5
       parent: 1
-      type: Transform
 - proto: Railing
   entities:
   - uid: 87
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,6.5
       parent: 1
-      type: Transform
-- proto: RailingCorner
-  entities:
-  - uid: 89
+  - uid: 233
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,5.5
       parent: 1
-      type: Transform
-- proto: RailingCornerSmall
-  entities:
+  - uid: 291
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,6.5
+      parent: 1
+- proto: RailingCornerSmall
+  entities:
   - uid: 95
     components:
-    - pos: -1.5,5.5
+    - type: Transform
+      pos: -1.5,5.5
       parent: 1
-      type: Transform
 - proto: ReinforcedWindow
   entities:
   - uid: 3
     components:
-    - pos: -5.5,5.5
+    - type: Transform
+      pos: -5.5,5.5
       parent: 1
-      type: Transform
   - uid: 4
     components:
-    - pos: -4.5,5.5
+    - type: Transform
+      pos: -4.5,5.5
       parent: 1
-      type: Transform
   - uid: 5
     components:
-    - pos: -3.5,5.5
+    - type: Transform
+      pos: -3.5,5.5
       parent: 1
-      type: Transform
   - uid: 6
     components:
-    - pos: -6.5,4.5
+    - type: Transform
+      pos: -6.5,4.5
       parent: 1
-      type: Transform
   - uid: 7
     components:
-    - pos: -6.5,3.5
+    - type: Transform
+      pos: -6.5,3.5
       parent: 1
-      type: Transform
   - uid: 28
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-0.5
       parent: 1
-      type: Transform
   - uid: 29
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,1.5
       parent: 1
-      type: Transform
   - uid: 30
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,0.5
       parent: 1
-      type: Transform
+- proto: SalvageTechfabNF
+  entities:
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
 - proto: SheetPlasma
   entities:
-  - uid: 172
+  - uid: 334
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.496558,0.63767743
+    - type: Transform
+      pos: 4.477741,-1.5468674
       parent: 1
-      type: Transform
-- proto: SignalButton
+    - type: Stack
+      count: 15
+- proto: SheetPlasma1
   entities:
-  - uid: 52
+  - uid: 338
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,2.5
+    - type: Transform
+      pos: 5.484686,-1.5624924
       parent: 1
-      type: Transform
-    - linkedPorts:
-        61:
-        - Pressed: Toggle
-        62:
-        - Pressed: Toggle
-        186:
-        - Pressed: Toggle
-      type: DeviceLinkSource
-  - uid: 60
+    - type: Stack
+      count: 15
+- proto: SignalButton
+  entities:
+  - uid: 19
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,4.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
       parent: 1
-      type: Transform
-    - linkedPorts:
-        61:
+    - type: DeviceLinkSource
+      linkedPorts:
+        60:
         - Pressed: Toggle
-        62:
+        2:
         - Pressed: Toggle
-        186:
+        18:
         - Pressed: Toggle
-      type: DeviceLinkSource
 - proto: SignalButtonDirectional
   entities:
   - uid: 189
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-2.5
       parent: 1
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         183:
         - Pressed: Toggle
         185:
         - Pressed: Toggle
-      type: DeviceLinkSource
+  - uid: 351
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        148:
+        - Pressed: DoorBolt
+        20:
+        - Pressed: DoorBolt
+        284:
+        - Pressed: DoorBolt
+        109:
+        - Pressed: DoorBolt
+        110:
+        - Pressed: DoorBolt
+- proto: SignElectricalMed
+  entities:
+  - uid: 345
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
 - proto: SMESBasic
   entities:
   - uid: 253
     components:
-    - pos: 6.5,-1.5
+    - type: Transform
+      pos: 6.5,-1.5
       parent: 1
-      type: Transform
 - proto: SolidSecretDoor
   entities:
   - uid: 173
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-2.5
       parent: 1
-      type: Transform
 - proto: SpawnPointLatejoin
   entities:
   - uid: 168
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,1.5
       parent: 1
-      type: Transform
 - proto: SpawnPointPilot
   entities:
   - uid: 207
     components:
-    - pos: -4.5,3.5
+    - type: Transform
+      pos: -4.5,3.5
       parent: 1
-      type: Transform
 - proto: SpawnPointSalvageSpecialist
   entities:
-  - uid: 213
+  - uid: 346
     components:
-    - pos: -1.5,0.5
+    - type: Transform
+      pos: 4.5,0.5
       parent: 1
-      type: Transform
-- proto: SubstationBasic
+- proto: SubstationWallBasic
   entities:
-  - uid: 254
+  - uid: 166
     components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 6.5,-2.5
       parent: 1
-      type: Transform
 - proto: SuitStorageSalv
   entities:
-  - uid: 166
+  - uid: 276
     components:
-    - pos: 5.5,-1.5
+    - type: Transform
+      pos: 6.5,-0.5
       parent: 1
-      type: Transform
 - proto: SuitStorageWallmountQuartermaster
   entities:
   - uid: 329
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,2.5
       parent: 1
-      type: Transform
+    - type: Physics
+      canCollide: False
 - proto: Table
   entities:
-  - uid: 159
+  - uid: 89
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,3.5
       parent: 1
-      type: Transform
-  - uid: 164
+  - uid: 212
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,2.5
       parent: 1
-      type: Transform
-  - uid: 232
+- proto: TableReinforced
+  entities:
+  - uid: 132
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,0.5
       parent: 1
-      type: Transform
-  - uid: 233
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,1.5
-      parent: 1
-      type: Transform
-- proto: TableReinforced
-  entities:
   - uid: 142
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -5.5,4.5
       parent: 1
-      type: Transform
   - uid: 144
     components:
-    - pos: -5.5,3.5
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,1.5
       parent: 1
-      type: Transform
   - uid: 205
     components:
-    - pos: -3.5,4.5
+    - type: Transform
+      pos: -3.5,4.5
       parent: 1
-      type: Transform
   - uid: 206
     components:
-    - pos: -4.5,4.5
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
       parent: 1
-      type: Transform
 - proto: Thruster
   entities:
   - uid: 59
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 1
-      type: Transform
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-5.5
+      parent: 1
   - uid: 170
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 240
+  - uid: 255
     components:
-    - pos: 5.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,5.5
       parent: 1
-      type: Transform
   - uid: 274
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,6.5
       parent: 1
-      type: Transform
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 1
+- proto: trayScanner
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 6.324864,1.10829
+      parent: 1
 - proto: TwoWayLever
   entities:
   - uid: 125
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,-0.5
+    - type: Transform
+      pos: 0.5,-1.5
       parent: 1
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         228:
         - Left: Forward
         - Right: Reverse
@@ -2268,377 +2417,366 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-      type: DeviceLinkSource
-  - uid: 148
+  - uid: 149
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,2.5
+    - type: Transform
+      pos: 2.5,6.5
       parent: 1
-      type: Transform
-    - linkedPorts:
-        100:
+    - type: DeviceLinkSource
+      linkedPorts:
+        103:
         - Left: Forward
-        - Right: Reverse
+        - Right: Forward
         - Middle: Off
-        104:
+        101:
         - Left: Forward
-        - Right: Reverse
+        - Right: Forward
         - Middle: Off
-        101:
+        104:
         - Left: Forward
-        - Right: Reverse
+        - Right: Forward
         - Middle: Off
-        103:
+        100:
         - Left: Forward
-        - Right: Reverse
+        - Right: Forward
         - Middle: Off
-      type: DeviceLinkSource
   - uid: 162
     components:
-    - pos: -3.5,-2.5
+    - type: Transform
+      pos: -3.5,-2.5
       parent: 1
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         107:
-        - Left: Reverse
+        - Left: Forward
         - Right: Forward
         - Middle: Off
         105:
-        - Left: Reverse
-        - Right: Forward
-        - Middle: Off
-        106:
-        - Left: Reverse
+        - Left: Forward
         - Right: Forward
         - Middle: Off
-      type: DeviceLinkSource
-- proto: VendingMachineSalvage
-  entities:
-  - uid: 167
+  - uid: 330
     components:
-    - pos: -1.5,-2.5
+    - type: Transform
+      pos: -0.5,0.5
       parent: 1
-      type: Transform
+    - type: DeviceLinkSource
+      linkedPorts:
+        100:
+        - Middle: Off
+        - Left: Forward
+        - Right: Forward
+        104:
+        - Middle: Off
+        - Left: Forward
+        - Right: Forward
+        103:
+        - Middle: Off
+        - Right: Forward
+        - Left: Forward
+        101:
+        - Middle: Off
+        - Right: Forward
+        - Left: Forward
 - proto: WallReinforced
   entities:
   - uid: 9
     components:
-    - pos: -6.5,1.5
+    - type: Transform
+      pos: -6.5,1.5
       parent: 1
-      type: Transform
   - uid: 10
     components:
-    - pos: -2.5,5.5
+    - type: Transform
+      pos: -2.5,5.5
       parent: 1
-      type: Transform
   - uid: 11
     components:
-    - pos: -1.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 12
-    components:
-    - pos: -1.5,3.5
+    - type: Transform
+      pos: -1.5,4.5
       parent: 1
-      type: Transform
   - uid: 13
     components:
-    - pos: -5.5,1.5
+    - type: Transform
+      pos: -5.5,1.5
       parent: 1
-      type: Transform
-  - uid: 14
-    components:
-    - pos: 2.5,3.5
-      parent: 1
-      type: Transform
   - uid: 15
     components:
-    - pos: 2.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 16
-    components:
-    - pos: -3.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 18
-    components:
-    - pos: -2.5,2.5
+    - type: Transform
+      pos: 2.5,4.5
       parent: 1
-      type: Transform
   - uid: 21
     components:
-    - pos: 4.5,4.5
+    - type: Transform
+      pos: 4.5,4.5
       parent: 1
-      type: Transform
   - uid: 22
     components:
-    - pos: 5.5,4.5
+    - type: Transform
+      pos: 5.5,4.5
       parent: 1
-      type: Transform
   - uid: 23
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-1.5
       parent: 1
-      type: Transform
   - uid: 24
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-2.5
       parent: 1
-      type: Transform
   - uid: 25
     components:
-    - pos: 3.5,4.5
+    - type: Transform
+      pos: 3.5,4.5
       parent: 1
-      type: Transform
   - uid: 26
     components:
-    - pos: 6.5,3.5
+    - type: Transform
+      pos: 6.5,3.5
       parent: 1
-      type: Transform
   - uid: 27
     components:
-    - pos: 7.5,2.5
+    - type: Transform
+      pos: 7.5,2.5
       parent: 1
-      type: Transform
   - uid: 32
     components:
-    - pos: 7.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 34
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-4.5
+    - type: Transform
+      pos: 7.5,-2.5
       parent: 1
-      type: Transform
   - uid: 36
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-3.5
       parent: 1
-      type: Transform
   - uid: 37
     components:
-    - pos: 2.5,-5.5
+    - type: Transform
+      pos: 2.5,-5.5
       parent: 1
-      type: Transform
   - uid: 42
     components:
-    - pos: -1.5,-4.5
+    - type: Transform
+      pos: -1.5,-4.5
       parent: 1
-      type: Transform
   - uid: 43
     components:
-    - pos: -1.5,-3.5
+    - type: Transform
+      pos: -1.5,-3.5
       parent: 1
-      type: Transform
   - uid: 44
     components:
-    - pos: 2.5,-4.5
+    - type: Transform
+      pos: 2.5,-4.5
       parent: 1
-      type: Transform
   - uid: 45
     components:
-    - pos: 2.5,-3.5
-      parent: 1
-      type: Transform
-  - uid: 64
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -5.5,-3.5
+    - type: Transform
+      pos: 2.5,-3.5
       parent: 1
-      type: Transform
   - uid: 67
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 88
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 90
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 92
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 93
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 94
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,2.5
-      parent: 1
-      type: Transform
   - uid: 120
     components:
-    - pos: -6.5,2.5
+    - type: Transform
+      pos: -6.5,2.5
       parent: 1
-      type: Transform
-  - uid: 127
+  - uid: 128
     components:
-    - pos: -2.5,-5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-2.5
       parent: 1
-      type: Transform
   - uid: 135
     components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-5.5
+    - type: Transform
+      pos: 6.5,-2.5
       parent: 1
-      type: Transform
   - uid: 138
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-4.5
       parent: 1
-      type: Transform
+  - uid: 152
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,1.5
+      parent: 1
   - uid: 161
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-5.5
       parent: 1
-      type: Transform
   - uid: 214
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-4.5
       parent: 1
-      type: Transform
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
   - uid: 261
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-2.5
       parent: 1
-      type: Transform
-- proto: WallSolid
+  - uid: 309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-3.5
+      parent: 1
+- proto: WallReinforcedDiagonal
   entities:
-  - uid: 111
+  - uid: 131
     components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,5.5
       parent: 1
-      type: Transform
-  - uid: 132
+  - uid: 172
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,-2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 133
+  - uid: 186
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 215
+  - uid: 244
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-4.5
+    - type: Transform
+      pos: -6.5,5.5
       parent: 1
-      type: Transform
-  - uid: 246
+  - uid: 245
     components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-4.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,3.5
       parent: 1
-      type: Transform
-- proto: WallSolidDiagonal
+  - uid: 308
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,4.5
+      parent: 1
+- proto: WallSolid
   entities:
-  - uid: 2
+  - uid: 88
     components:
-    - pos: -6.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
       parent: 1
-      type: Transform
-  - uid: 17
+  - uid: 90
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,1.5
       parent: 1
-      type: Transform
-  - uid: 19
+  - uid: 92
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,-4.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,0.5
       parent: 1
-      type: Transform
-  - uid: 20
+  - uid: 93
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 35
+  - uid: 94
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -5.5,-4.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 41
+  - uid: 111
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 81
+  - uid: 133
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 131
+  - uid: 222
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,-5.5
+    - type: Transform
+      pos: -1.5,3.5
       parent: 1
-      type: Transform
-  - uid: 244
+  - uid: 232
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,3.5
+    - type: Transform
+      pos: 2.5,3.5
       parent: 1
-      type: Transform
-  - uid: 245
+  - uid: 235
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,4.5
+    - type: Transform
+      pos: 2.5,2.5
       parent: 1
-      type: Transform
-- proto: WarpPointShip
-  entities:
-  - uid: 40
+  - uid: 243
     components:
-    - pos: 0.5,0.5
+    - type: Transform
+      pos: -1.5,2.5
       parent: 1
-      type: Transform
-- proto: WaterCooler
+  - uid: 313
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,1.5
+      parent: 1
+- proto: WarpPointShip
   entities:
-  - uid: 150
+  - uid: 40
     components:
-    - pos: 4.5,3.5
+    - type: Transform
+      pos: 0.5,0.5
       parent: 1
-      type: Transform
 - proto: Wrench
   entities:
-  - uid: 151
+  - uid: 34
     components:
-    - pos: 6.380465,1.3807236
+    - type: Transform
+      pos: 6.4525113,1.4135437
       parent: 1
-      type: Transform
 ...
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index eb892764bfa..1c2901f582d 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -7,15 +7,12 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitVoidParamed
         - id: ClothingMaskBreathMedical
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
   - type: AccessReader
-#    access: [["Medical"]]
 
 #Hydroponics EVA
 - type: entity
@@ -25,8 +22,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterEVASuitHydro
         - id: ClothingMaskBreath
@@ -34,7 +29,6 @@
         - id: HandheldGPSBasic
 #        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
   - type: AccessReader
-    # access: [[ "Hydroponics" ]]
 
 #HARDSUITS
 #Quartermaster hardsuit
@@ -45,8 +39,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitLuxury
@@ -54,7 +46,22 @@
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
   - type: AccessReader
-    # access: [["Quartermaster"]]
+
+#Mining hardsuit
+- type: entity
+  id: SuitStorageMining
+  parent: SuitStorageBase
+  suffix: Mining
+  components:
+  - type: StorageFill
+    contents:
+        - id: AirTankFilled
+        - id: ClothingShoesBootsMag
+        - id: ClothingOuterHardsuitSalvage
+        - id: ClothingMaskGasExplorer
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+  - type: AccessReader
 
 #Mercenary hardsuit
 - type: entity
@@ -64,8 +71,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitMercenary
         - id: ClothingMaskGasMercenary
@@ -83,8 +88,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitScaf
         - id: ClothingMaskGasMercenary
@@ -102,14 +105,11 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitPilot
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
   - type: AccessReader
     access: [["Captain"], ["Pilot"]]
 
@@ -121,16 +121,12 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitClown
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
   - type: AccessReader
-#    access: [["Captain"], ["Pilot"]]
 
 #Cadet hardsuit
 - type: entity
@@ -140,8 +136,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdBronze # Frontier
         - id: ClothingMaskGasNfsd
@@ -159,8 +153,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdSilver # Frontier
         - id: ClothingMaskGasNfsd 
@@ -178,8 +170,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdBrigmedic # Frontier
         - id: ClothingMaskGasNfsd 
@@ -197,8 +187,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
@@ -216,8 +204,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
@@ -235,8 +221,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdSheriff # Frontier
         - id: ClothingMaskGasSheriff
@@ -254,8 +238,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdCombat # Frontier
         - id: ClothingMaskGasNfsd 
@@ -273,8 +255,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdCommand # Frontier
         - id: ClothingMaskGasNfsd 
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
index 0170715fbde..feb64cc4885 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
@@ -15,6 +15,11 @@
   id: SuitStorageWallmountQuartermaster
   parent: [SuitStorageWallmount, SuitStorageQuartermaster]
 
+#Mining hardsuit
+- type: entity
+  id: SuitStorageWallmountMining
+  parent: [SuitStorageWallmount, SuitStorageMining]
+
 #Mercenary hardsuit
 - type: entity
   id: SuitStorageWallmountMercenary
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index ab5030cbad4..7d575be619e 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -254,14 +254,15 @@
     idleState: icon
     runningState: icon
     staticRecipes:
-      - Durathread
-      - Plasteel
-      - SheetSteel
-      - SheetPlasteel
-      - SheetPlasma
-      - SheetGlass1
-      - SheetRGlass
-      - SheetPlastic
+      #- Durathread
+      #- Plasteel
+      #- SheetSteel
+      #- SheetPlasteel
+      #- SheetPlasma30
+      #- SheetUranium30
+      #- SheetGlass30
+      #- SheetRGlass
+      #- SheetPlastic
       - ClothingOuterSuitEmergency
       - ClothingHeadHelmetEVA
       - ClothingOuterHardsuitEVA
@@ -305,26 +306,21 @@
       - GlowstickPurple
       - GlowstickRedLathe
       - GlowstickYellow
-    dynamicRecipes:
+      - OreBag
       - MiningDrill
+      - WeaponProtoKineticAccelerator
+    dynamicRecipes:
       - Bucket
       - MopItem
       - SprayBottle
       - FireExtinguisher
-      - LightTube
-      - LightBulb
-      - CableStack
       - CableMVStack
       - CableHVStack
-      - Signaller
-      - PowerCellMedium
       - PowerCellHigh
       - PowerCellMicroreactor
       - WeaponCrusher
       - WeaponCrusherDagger
       - WeaponCrusherGlaive
-      - WeaponProtoKineticAccelerator
-      - WeaponTetherGun
       - WeaponGrapplingGun
       - ClothingBackpackHolding
       - ClothingBackpackSatchelHolding
@@ -364,6 +360,7 @@
         - Sheet
         - RawMaterial
         - Ingot
+#        - Ore
 
 - type: entity
   id: NfsdTechFab
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
index d77243c10fa..80c51a0e93b 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -88,3 +88,12 @@
   category: Tools
   materials:
     Steel: 500
+
+- type: latheRecipe
+  id: OreBag
+  result: OreBag
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Cloth: 500
diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml
index d4cc906f6de..00d93eee310 100644
--- a/Resources/Prototypes/_NF/Shipyard/chisel.yml
+++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml
@@ -12,7 +12,7 @@
   id: Chisel
   name: ICR Chisel
   description: Standard small size multipurpose vessel , originally meant to aid in ship scrapping.
-  price: 31340
+  price: 34615 # on init 30100$, 15% markup 4515$
   category: Small
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/chisel.yml