From 8aaefaf8527792aa2465e678428c80b658fa3618 Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:55:10 +0100
Subject: [PATCH 1/8] Adds the SBB Bodkin expeditionary shuttle

---
 .../Maps/_NF/Shuttles/Expedition/bodkin.yml   | 3231 +++++++++++++++++
 .../_NF/Shipyard/Expedition/bodkin.yml        |   38 +
 2 files changed, 3269 insertions(+)
 create mode 100644 Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
 create mode 100644 Resources/Prototypes/_NF/Shipyard/Expedition/bodkin.yml

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml b/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
new file mode 100644
index 00000000000..499f36c5f9f
--- /dev/null
+++ b/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
@@ -0,0 +1,3231 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  34: FloorDarkDiagonal
+  37: FloorDarkMini
+  38: FloorDarkMono
+  40: FloorDarkPavement
+  41: FloorDarkPavementVertical
+  49: FloorGlass
+  69: FloorMetalDiamond
+  112: FloorTechMaint
+  129: Lattice
+  130: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 2
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -0.515625,-0.46875
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABgQAAAAAAgQAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAgQAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAAJgAAAAADJgAAAAACJgAAAAACJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAJgAAAAADKAAAAAAAKAAAAAADKAAAAAADKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAJgAAAAACJgAAAAACJgAAAAACJgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAJgAAAAADKAAAAAABKAAAAAADKAAAAAABKAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAADggAAAAAAcAAAAAAAcAAAAAAAJgAAAAABKAAAAAAD
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACgQAAAAAAgQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAABJgAAAAADJgAAAAABJgAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAAAJgAAAAABRQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAJgAAAAADJgAAAAACJgAAAAABJgAAAAAAggAAAAAARQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAKAAAAAADKAAAAAAAKAAAAAADKAAAAAADJgAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAJgAAAAABggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABJgAAAAAAggAAAAAAggAAAAAAggAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAJgAAAAAAggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAABKAAAAAAAJgAAAAABggAAAAAAcAAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACggAAAAAAggAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACggAAAAAAggAAAAAAJQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAggAAAAAAJQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: KQAAAAABJgAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAACJQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABJQAAAAAAggAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABJQAAAAACggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAADggAAAAAAMQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            57: 5,-3
+            58: 5,-4
+            59: 4,-4
+            60: 3,-4
+        - node:
+            color: '#0096FFFF'
+            id: BotGreyscale
+          decals:
+            62: 4,-1
+        - node:
+            color: '#FF5C5CFF'
+            id: BotGreyscale
+          decals:
+            61: 5,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: BotGreyscale
+          decals:
+            0: 3,-7
+            1: 4,-7
+            2: -3,-7
+            3: -4,-7
+            4: 0,-9
+            5: 1,-9
+            6: -1,-9
+            9: -2,-9
+            10: 2,-9
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Dirt
+          decals:
+            133: -3,-7
+            142: -1,-3
+            143: 1,4
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            144: 4,-2
+            147: -3,-1
+            152: 4,-6
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            118: -6,-8
+            119: -6,-6
+            120: -7,-6
+            121: -7,-8
+            122: -5,-8
+            123: -5,-6
+            124: -1,-10
+            125: 0,-10
+            126: 1,-10
+            127: 6,-8
+            128: 6,-6
+            129: 7,-6
+            130: 7,-8
+            131: 5,-8
+            132: 5,-6
+            134: -4,-7
+            135: 4,-7
+            136: -3,-9
+            137: 1,-9
+            138: -1,-9
+            139: 3,-9
+            140: 0,-9
+            141: 1,-9
+            145: 2,-1
+            146: -2,-1
+            156: 3,-6
+            163: -1,-2
+            164: -1,0
+            165: 1,-2
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            148: -4,-6
+            149: -3,-8
+            153: 1,-8
+            154: -2,-8
+            155: 3,-8
+            157: -1,-6
+            158: 0,-3
+            159: 1,-1
+            160: 0,0
+            161: 0,4
+            162: 0,5
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            150: 0,-6
+            151: 4,-8
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileCheckerAOverlay
+          decals:
+            46: 0,6
+            47: 0,7
+        - node:
+            color: '#B3B3B3FF'
+            id: MiniTileCheckerAOverlay
+          decals:
+            54: 1,4
+            55: 1,3
+            56: 1,2
+        - node:
+            color: '#B8B873FF'
+            id: MiniTileCheckerAOverlay
+          decals:
+            50: -1,2
+        - node:
+            color: '#CA7EF2FF'
+            id: MiniTileCheckerAOverlay
+          decals:
+            48: -1,4
+            49: -1,3
+        - node:
+            color: '#4B709CFF'
+            id: MiniTileCheckerBOverlay
+          decals:
+            41: 1,2
+            42: 1,3
+            43: 1,4
+            44: 0,6
+            45: 0,7
+            51: -1,2
+            52: -1,3
+            53: -1,4
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteEndE
+          decals:
+            66: 4,-8
+            102: 4,-6
+        - node:
+            color: '#EFB3417F'
+            id: MiniTileWhiteEndE
+          decals:
+            101: 1,-1
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileWhiteEndN
+          decals:
+            63: 0,5
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteEndW
+          decals:
+            64: -4,-6
+            65: -4,-8
+        - node:
+            color: '#EFB3417F'
+            id: MiniTileWhiteEndW
+          decals:
+            100: -1,-1
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileWhiteInnerNe
+          decals:
+            26: 0,-1
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteInnerNe
+          decals:
+            97: 0,-8
+            98: 0,-6
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileWhiteInnerNw
+          decals:
+            25: 0,-1
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteInnerNw
+          decals:
+            96: 0,-8
+            99: 0,-6
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileWhiteInnerSe
+          decals:
+            27: 0,-1
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteInnerSe
+          decals:
+            94: 0,-6
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileWhiteInnerSw
+          decals:
+            28: 0,-1
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteInnerSw
+          decals:
+            95: 0,-6
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileWhiteLineE
+          decals:
+            8: 0,-5
+            22: 0,0
+            23: 0,-2
+            24: 0,-3
+            38: 0,2
+            39: 0,3
+            40: 0,4
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteLineE
+          decals:
+            93: 0,-7
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteLineN
+          decals:
+            67: -3,-8
+            68: -2,-8
+            69: -1,-8
+            70: 1,-8
+            71: 2,-8
+            72: 3,-8
+            73: 3,-6
+            74: 2,-6
+            75: 1,-6
+            76: -2,-6
+            77: -3,-6
+            78: -1,-6
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteLineS
+          decals:
+            79: -3,-6
+            80: -2,-6
+            81: -1,-6
+            82: 1,-6
+            83: 2,-6
+            84: 3,-6
+            85: 3,-8
+            86: 2,-8
+            87: 1,-8
+            88: 0,-8
+            89: -1,-8
+            90: -2,-8
+            91: -3,-8
+        - node:
+            color: '#334E6DFF'
+            id: MiniTileWhiteLineW
+          decals:
+            7: 0,-5
+            19: 0,-3
+            20: 0,-2
+            21: 0,0
+            35: 0,2
+            36: 0,3
+            37: 0,4
+        - node:
+            color: '#774194FF'
+            id: MiniTileWhiteLineW
+          decals:
+            92: 0,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            11: -6,-7
+            12: 6,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndE
+          decals:
+            30: 1,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndW
+          decals:
+            29: -1,-10
+        - node:
+            color: '#4B709CFF'
+            id: WarnFullGreyscale
+          decals:
+            105: 0,-4
+            106: 0,1
+        - node:
+            color: '#9A54BFFF'
+            id: WarnFullGreyscale
+          decals:
+            109: -5,-6
+            110: -5,-8
+            111: 5,-8
+            112: 5,-6
+        - node:
+            color: '#EFB3417F'
+            id: WarnFullGreyscale
+          decals:
+            107: -2,-1
+            108: 2,-1
+        - node:
+            color: '#FFFF00FF'
+            id: WarnFullGreyscale
+          decals:
+            113: -2,-7
+            114: -1,-7
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFF00FF'
+            id: WarnFullGreyscale
+          decals:
+            115: 1,-7
+            116: 2,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            15: 3,-9
+            33: 6,-8
+            34: 6,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            32: 0,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            14: -3,-9
+            103: -6,-6
+            104: -6,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            13: -4,-9
+            16: 4,-9
+            17: 6,-9
+            18: -6,-9
+            31: 0,-10
+        - node:
+            color: '#96DAFFFF'
+            id: med
+          decals:
+            117: 1,-5
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -2,-3:
+            0: 576
+            1: 3200
+            2: 16384
+          -2,-2:
+            2: 3662
+          -2,-1:
+            0: 16386
+            2: 2184
+          -1,-3:
+            1: 16
+            2: 61440
+            0: 32
+          -1,-2:
+            2: 36863
+          -1,-1:
+            2: 64435
+          -2,0:
+            0: 8
+          0,-3:
+            2: 61440
+            0: 128
+          0,-2:
+            2: 16383
+          0,-1:
+            2: 64441
+          -1,0:
+            2: 34824
+            0: 4096
+            1: 544
+          0,0:
+            2: 13075
+            1: 2176
+          1,-3:
+            1: 48
+            2: 20480
+            0: 2112
+          1,-2:
+            2: 3935
+          1,-1:
+            2: 4915
+            0: 16392
+          1,0:
+            0: 4098
+          -1,1:
+            1: 3
+            0: 64
+            2: 8
+          0,1:
+            2: 4371
+            0: 64
+            1: 8
+          -1,2:
+            0: 8
+          0,2:
+            0: 2
+          1,1:
+            1: 1
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirAlarm
+  entities:
+  - uid: 307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 217
+      - 52
+      - 211
+      - 50
+      - 351
+      - 366
+      - 216
+      - 285
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 136
+      - 40
+      - 102
+      - 137
+      - 33
+      - 105
+      - 52
+- proto: AirlockCommandGlass
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+- proto: AirlockEngineering
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
+  - uid: 97
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 2
+- proto: AirlockExternalGlass
+  entities:
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 2
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 2
+  - uid: 367
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 2
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 2
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 100
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-5.5
+      parent: 2
+  - uid: 122
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-5.5
+      parent: 2
+  - uid: 337
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-7.5
+      parent: 2
+  - uid: 338
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-7.5
+      parent: 2
+- proto: AmeController
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 2
+    - type: AmeController
+      injecting: True
+    - type: ContainerContainer
+      containers:
+        fuelSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 47
+- proto: AmeJar
+  entities:
+  - uid: 47
+    components:
+    - type: Transform
+      parent: 46
+    - type: Physics
+      canCollide: False
+  - uid: 289
+    components:
+    - type: Transform
+      pos: -2.687633,-0.6083449
+      parent: 2
+- proto: AmeShielding
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 2
+  - uid: 5
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 2
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 2
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 2
+  - uid: 8
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 2
+  - uid: 9
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 2
+  - uid: 10
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 2
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 2
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 2
+    - type: PointLight
+      radius: 2
+      enabled: True
+- proto: APCBasic
+  entities:
+  - uid: 174
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 2
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 2
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 2
+  - uid: 192
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 2
+  - uid: 326
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 2
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 2
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 2
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 2
+  - uid: 335
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 2
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 2
+- proto: AtmosFixBlockerMarker
+  entities:
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 2
+  - uid: 112
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 2
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 2
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 2
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 2
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 2
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 2
+  - uid: 378
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 2
+  - uid: 379
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 2
+  - uid: 380
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 2
+  - uid: 381
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 2
+  - uid: 382
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 2
+  - uid: 383
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
+  - uid: 384
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 2
+  - uid: 385
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 2
+  - uid: 386
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 2
+  - uid: 387
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
+  - uid: 388
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 389
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 390
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 2
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 2
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 2
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 2
+  - uid: 400
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 2
+- proto: BlastDoor
+  entities:
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 120
+  - uid: 294
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-9.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 298
+  - uid: 297
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 298
+  - uid: 317
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 348
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 348
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 120
+  - uid: 363
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 298
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 187
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 2
+  - uid: 291
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-6.5
+      parent: 2
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-9.5
+      parent: 2
+- proto: CableApcExtension
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 2
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 2
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 2
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 2
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 2
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 2
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 2
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 2
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 2
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 2
+  - uid: 250
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 2
+  - uid: 251
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 2
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 2
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 2
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 2
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 2
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 2
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 2
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
+  - uid: 275
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 2
+  - uid: 340
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 2
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 2
+  - uid: 414
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
+- proto: CableHV
+  entities:
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 155
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 2
+  - uid: 158
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 159
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 2
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 2
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+- proto: CableMV
+  entities:
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 2
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+- proto: CableTerminal
+  entities:
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+- proto: CargoPallet
+  entities:
+  - uid: 343
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 2
+  - uid: 344
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 2
+  - uid: 345
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 2
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 2
+- proto: Catwalk
+  entities:
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 2
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 2
+- proto: ChairPilotSeat
+  entities:
+  - uid: 134
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,6.5
+      parent: 2
+  - uid: 140
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 2
+  - uid: 227
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
+      parent: 2
+- proto: ClosetWall
+  entities:
+  - uid: 106
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 2
+  - uid: 224
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+- proto: ClosetWallEmergencyFilledRandom
+  entities:
+  - uid: 280
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 2
+- proto: ComputerSalvageExpedition
+  entities:
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+- proto: ComputerShuttle
+  entities:
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+- proto: ComputerTabletopStationRecords
+  entities:
+  - uid: 283
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 2
+- proto: ConveyorBelt
+  entities:
+  - uid: 124
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 123
+  - uid: 349
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 167
+  - uid: 350
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 167
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 167
+  - uid: 354
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 167
+  - uid: 355
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 123
+  - uid: 356
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 123
+  - uid: 357
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 123
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 2
+- proto: EmergencyLight
+  entities:
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 2
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 2
+  - uid: 406
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+  - uid: 407
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 2
+  - uid: 408
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 2
+  - uid: 409
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 2
+  - uid: 410
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
+      parent: 2
+  - uid: 411
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 2
+  - uid: 412
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-6.5
+      parent: 2
+  - uid: 413
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-6.5
+      parent: 2
+- proto: EmergencyRollerBed
+  entities:
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 2
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 311
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 2
+- proto: FaxMachineShip
+  entities:
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
+- proto: FirelockGlass
+  entities:
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 307
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 403
+      - 307
+  - uid: 351
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 307
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 307
+- proto: FolderSpawner
+  entities:
+  - uid: 309
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.3707361,3.997057
+      parent: 2
+- proto: GasMixerOn
+  entities:
+  - uid: 157
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 2
+    - type: GasMixer
+      inletTwoConcentration: 0.22000003
+      inletOneConcentration: 0.78
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 156
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 170
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 212
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 266
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 347
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 154
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 171
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 185
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-9.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 191
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 194
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 195
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 196
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 198
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 205
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 206
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 207
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 208
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 209
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 210
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 218
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 220
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 221
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 222
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 226
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 230
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 234
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 263
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 267
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 360
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 121
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 130
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 135
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 219
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPort
+  entities:
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 2
+  - uid: 143
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 361
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasVentPump
+  entities:
+  - uid: 40
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 403
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 105
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 403
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 136
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-6.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 403
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 307
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 217
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 307
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-7.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 403
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-7.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 403
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 403
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 211
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 307
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 285
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 307
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 2
+- proto: Grille
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 2
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 2
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 2
+- proto: GrilleDiagonal
+  entities:
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 299
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 2
+- proto: GunSafeShuttleCaptain
+  entities:
+  - uid: 369
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
+- proto: Gyroscope
+  entities:
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 2
+- proto: LockerCaptain
+  entities:
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 2
+- proto: LockerSalvageSpecialistFilled
+  entities:
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 2
+- proto: LockerWallMedical
+  entities:
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 2
+- proto: NitrogenCanister
+  entities:
+  - uid: 182
+    components:
+    - type: Transform
+      anchored: True
+      pos: 5.5,-1.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 181
+    components:
+    - type: Transform
+      anchored: True
+      pos: 4.5,-0.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: PlasticFlapsAirtightClear
+  entities:
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 2
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 2
+- proto: PlasticFlapsClear
+  entities:
+  - uid: 286
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 2
+  - uid: 287
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 2
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 111
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 2
+- proto: PosterLegitSafetyMothPiping
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,0.5
+      parent: 2
+- proto: Poweredlight
+  entities:
+  - uid: 146
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 2
+  - uid: 284
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 2
+  - uid: 312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 2
+  - uid: 316
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 2
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 2
+  - uid: 364
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-8.5
+      parent: 2
+  - uid: 365
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-8.5
+      parent: 2
+- proto: PoweredlightExterior
+  entities:
+  - uid: 264
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 265
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,4.5
+      parent: 2
+  - uid: 322
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 2
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 2
+- proto: PoweredlightGreen
+  entities:
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 2
+- proto: PoweredlightRed
+  entities:
+  - uid: 324
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,1.5
+      parent: 2
+- proto: PoweredSmallLight
+  entities:
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+- proto: RandomPosterLegit
+  entities:
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 310
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 331
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 2
+- proto: ShuttleWindow
+  entities:
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+  - uid: 101
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 2
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 2
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 2
+- proto: ShuttleWindowDiagonal
+  entities:
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 2
+- proto: SignalButtonDirectional
+  entities:
+  - uid: 120
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-6.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        359:
+        - Pressed: Toggle
+        277:
+        - Pressed: Toggle
+  - uid: 298
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-9.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        297:
+        - Pressed: Toggle
+        294:
+        - Pressed: Toggle
+        363:
+        - Pressed: Toggle
+  - uid: 348
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        317:
+        - Pressed: Toggle
+        358:
+        - Pressed: Toggle
+- proto: SignAtmos
+  entities:
+  - uid: 279
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-0.5
+      parent: 2
+- proto: SignBridge
+  entities:
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+- proto: SignCargo
+  entities:
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 2
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 2
+- proto: SignDirectionalBridge
+  entities:
+  - uid: 184
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.6294031,-3.3566456
+      parent: 2
+- proto: SignDirectionalEng
+  entities:
+  - uid: 272
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.6294031,-3.5753956
+      parent: 2
+- proto: SignDoors
+  entities:
+  - uid: 372
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 2
+- proto: SignElectricalMed
+  entities:
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+- proto: SignEngine
+  entities:
+  - uid: 296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 2
+- proto: SignEngineering
+  entities:
+  - uid: 295
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,0.5
+      parent: 2
+- proto: SignShipDock
+  entities:
+  - uid: 292
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-4.5
+      parent: 2
+  - uid: 293
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-4.5
+      parent: 2
+- proto: SignSpace
+  entities:
+  - uid: 327
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 2
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 2
+- proto: SMESBasic
+  entities:
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 401
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 2
+- proto: SteelBench
+  entities:
+  - uid: 370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 2
+- proto: SubstationWallBasic
+  entities:
+  - uid: 339
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+- proto: SuitStorageCaptain
+  entities:
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+- proto: SuitStorageSalv
+  entities:
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 2
+- proto: Table
+  entities:
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 2
+- proto: Thruster
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
+  - uid: 56
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-10.5
+      parent: 2
+  - uid: 75
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-10.5
+      parent: 2
+  - uid: 85
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 87
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,1.5
+      parent: 2
+  - uid: 90
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-10.5
+      parent: 2
+  - uid: 91
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-10.5
+      parent: 2
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 2
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 127
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,2.5
+      parent: 2
+  - uid: 128
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
+      parent: 2
+- proto: TwoWayLever
+  entities:
+  - uid: 123
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        124:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+        357:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+        356:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+        355:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        354:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+        353:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+        349:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+        350:
+        - Left: Reverse
+        - Right: Forward
+        - Middle: Off
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+- proto: WallShuttle
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 2
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 2
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 2
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 2
+  - uid: 16
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 2
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 2
+  - uid: 18
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 2
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 2
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 2
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 2
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 2
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 2
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 2
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 2
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+  - uid: 37
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 38
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 2
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 2
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 2
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 2
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 2
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 2
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 2
+  - uid: 71
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 2
+  - uid: 72
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 2
+  - uid: 73
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 2
+  - uid: 74
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 2
+  - uid: 76
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 80
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 2
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 2
+  - uid: 82
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 2
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 2
+  - uid: 86
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 2
+  - uid: 88
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 2
+  - uid: 93
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 2
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 2
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 116
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 2
+  - uid: 118
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 2
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 2
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 2
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 2
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 2
+  - uid: 189
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 2
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 2
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 2
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-9.5
+      parent: 2
+  - uid: 21
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-0.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 43
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 2
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 2
+  - uid: 49
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-10.5
+      parent: 2
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,3.5
+      parent: 2
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 58
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 2
+  - uid: 79
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-10.5
+      parent: 2
+  - uid: 83
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-10.5
+      parent: 2
+  - uid: 89
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 92
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-10.5
+      parent: 2
+  - uid: 113
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-9.5
+      parent: 2
+  - uid: 114
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 2
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 2
+- proto: WallWeaponCapacitorRechargerOmnidirectional
+  entities:
+  - uid: 313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 2
+- proto: WarpPointShip
+  entities:
+  - uid: 402
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+- proto: WaterCooler
+  entities:
+  - uid: 308
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+- proto: Wrench
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 4.4386373,-1.5209942
+      parent: 2
+...
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/bodkin.yml
new file mode 100644
index 00000000000..2aae6f2dc64
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/bodkin.yml
@@ -0,0 +1,38 @@
+# Author Info
+# GitHub: Tych0theSynth
+# Discord: tych0
+
+# Maintainer Info
+# GitHub: Tych0theSynth
+# Discord: Tych0
+
+# Shuttle Notes:
+#
+- type: vessel
+  id: Bodkin
+  name: SBB Bodkin
+  description: A compact civilian-grade scout ship designed for short-term planetary surveying and exploration. The Broadhead's smaller sibling.
+  price: 54000 #Shuttle values at approx 28000. 54000 puts it in between the Pathfinder and Brigand, which is where it should sit.
+  category: Small
+  group: Expedition
+  shuttlePath: /Maps/_NF/Shuttles/Expedition/bodkin.yml
+
+- type: gameMap
+  id: Bodkin
+  mapName: 'SBB Bodkin'
+  mapPath: /Maps/_NF/Shuttles/Expedition/bodkin.yml
+  minPlayers: 0
+  stations:
+    Bodkin:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Bodkin {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file

From 7a287afc5ed2e1cc86d416ca3c4f5a832828395f Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:47:52 +0100
Subject: [PATCH 2/8] Halved pallets, added a saw

---
 .../Maps/_NF/Shuttles/Expedition/bodkin.yml   | 89 ++++++++++---------
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml b/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
index 499f36c5f9f..760d29a8204 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
@@ -79,6 +79,12 @@ entities:
             id: BotGreyscale
           decals:
             61: 5,-2
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: BotGreyscale
+          decals:
+            170: 2,-7
         - node:
             color: '#FFFFFFFF'
             id: BotGreyscale
@@ -92,6 +98,7 @@ entities:
             6: -1,-9
             9: -2,-9
             10: 2,-9
+            166: -2,-7
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -372,18 +379,16 @@ entities:
             107: -2,-1
             108: 2,-1
         - node:
+            angle: -1.5707963267948966 rad
             color: '#FFFF00FF'
             id: WarnFullGreyscale
           decals:
-            113: -2,-7
-            114: -1,-7
+            169: 1,-7
         - node:
-            angle: 1.5707963267948966 rad
             color: '#FFFF00FF'
             id: WarnFullGreyscale
           decals:
-            115: 1,-7
-            116: 2,-7
+            114: -1,-7
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
@@ -1183,7 +1188,7 @@ entities:
     - type: Transform
       pos: 6.5,-7.5
       parent: 2
-  - uid: 414
+  - uid: 415
     components:
     - type: Transform
       pos: -1.5,-0.5
@@ -1291,26 +1296,16 @@ entities:
       parent: 2
 - proto: CargoPallet
   entities:
-  - uid: 343
+  - uid: 203
     components:
     - type: Transform
-      pos: -1.5,-6.5
+      pos: 1.5,-6.5
       parent: 2
   - uid: 344
     components:
     - type: Transform
       pos: -0.5,-6.5
       parent: 2
-  - uid: 345
-    components:
-    - type: Transform
-      pos: 1.5,-6.5
-      parent: 2
-  - uid: 346
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 2
 - proto: Catwalk
   entities:
   - uid: 268
@@ -1368,10 +1363,10 @@ entities:
       parent: 2
 - proto: ClosetWallEmergencyFilledRandom
   entities:
-  - uid: 280
+  - uid: 223
     components:
     - type: Transform
-      pos: -1.5,-4.5
+      pos: -3.5,-4.5
       parent: 2
 - proto: ComputerSalvageExpedition
   entities:
@@ -1471,65 +1466,65 @@ entities:
       - 123
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 1
+  - uid: 301
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 2
 - proto: EmergencyLight
   entities:
-  - uid: 404
+  - uid: 405
     components:
     - type: Transform
       pos: -3.5,-5.5
       parent: 2
-  - uid: 405
+  - uid: 406
     components:
     - type: Transform
       pos: 4.5,-5.5
       parent: 2
-  - uid: 406
+  - uid: 407
     components:
     - type: Transform
       pos: -0.5,-4.5
       parent: 2
-  - uid: 407
+  - uid: 408
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-2.5
       parent: 2
-  - uid: 408
+  - uid: 409
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,0.5
       parent: 2
-  - uid: 409
+  - uid: 410
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-0.5
       parent: 2
-  - uid: 410
+  - uid: 411
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-0.5
       parent: 2
-  - uid: 411
+  - uid: 412
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,2.5
       parent: 2
-  - uid: 412
+  - uid: 413
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-6.5
       parent: 2
-  - uid: 413
+  - uid: 414
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2236,16 +2231,16 @@ entities:
     - type: Transform
       pos: 5.5,-2.5
       parent: 2
-- proto: LockerCaptain
+- proto: LockerCaptainFilled
   entities:
-  - uid: 203
+  - uid: 343
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 2
 - proto: LockerSalvageSpecialistFilled
   entities:
-  - uid: 223
+  - uid: 305
     components:
     - type: Transform
       pos: 1.5,-1.5
@@ -2413,21 +2408,28 @@ entities:
       parent: 2
 - proto: RandomPosterLegit
   entities:
-  - uid: 301
-    components:
-    - type: Transform
-      pos: 2.5,4.5
-      parent: 2
   - uid: 310
     components:
     - type: Transform
       pos: -1.5,3.5
       parent: 2
   - uid: 331
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 404
     components:
     - type: Transform
       pos: -1.5,-2.5
       parent: 2
+- proto: Saw
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: 1.5272883,-4.5321774
+      parent: 2
 - proto: ShuttleWindow
   entities:
   - uid: 64
@@ -2648,14 +2650,14 @@ entities:
       parent: 2
 - proto: SuitStorageCaptain
   entities:
-  - uid: 305
+  - uid: 306
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 2
 - proto: SuitStorageSalv
   entities:
-  - uid: 306
+  - uid: 345
     components:
     - type: Transform
       pos: 1.5,-2.5
@@ -3201,6 +3203,11 @@ entities:
       parent: 2
 - proto: WallWeaponCapacitorRechargerOmnidirectional
   entities:
+  - uid: 280
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 2
   - uid: 313
     components:
     - type: Transform

From 6fef120a6f511ee21b23ad8dffbc11881b8b907f Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Wed, 7 Aug 2024 15:51:14 +0300
Subject: [PATCH 3/8] Update bodkin.yml

---
 Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml b/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
index 760d29a8204..8ab6277db4f 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
@@ -19,7 +19,7 @@ entities:
   - uid: 2
     components:
     - type: MetaData
-      name: grid
+      name: Bodkin
     - type: Transform
       pos: -0.515625,-0.46875
       parent: invalid

From ce6bc5191f01859e697743149b05c78af212ef33 Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Wed, 28 Aug 2024 21:56:19 +0100
Subject: [PATCH 4/8] Bodkin reworked into salvage ship

---
 .../_NF/Shuttles/{Expedition => }/bodkin.yml  | 2705 +++++++++--------
 .../_NF/Shipyard/{Expedition => }/bodkin.yml  |   12 +-
 2 files changed, 1478 insertions(+), 1239 deletions(-)
 rename Resources/Maps/_NF/Shuttles/{Expedition => }/bodkin.yml (76%)
 rename Resources/Prototypes/_NF/Shipyard/{Expedition => }/bodkin.yml (60%)

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml b/Resources/Maps/_NF/Shuttles/bodkin.yml
similarity index 76%
rename from Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
rename to Resources/Maps/_NF/Shuttles/bodkin.yml
index 8ab6277db4f..bd1c37be8e4 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/bodkin.yml
+++ b/Resources/Maps/_NF/Shuttles/bodkin.yml
@@ -3,6 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
+  2: FloorDark
   34: FloorDarkDiagonal
   37: FloorDarkMini
   38: FloorDarkMono
@@ -10,6 +11,8 @@ tilemap:
   41: FloorDarkPavementVertical
   49: FloorGlass
   69: FloorMetalDiamond
+  1: FloorSteel
+  3: FloorSteelMono
   112: FloorTechMaint
   129: Lattice
   130: Plating
@@ -27,19 +30,19 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABgQAAAAAAgQAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAgQAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAAJgAAAAADJgAAAAACJgAAAAACJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAJgAAAAADKAAAAAAAKAAAAAADKAAAAAADKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAJgAAAAACJgAAAAACJgAAAAACJgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAJgAAAAADKAAAAAABKAAAAAADKAAAAAABKAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAADggAAAAAAcAAAAAAAcAAAAAAAJgAAAAABKAAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAgQAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAAgAAAAACAgAAAAABAgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAJgAAAAABAgAAAAADMQAAAAABJgAAAAACJgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAMQAAAAAAMQAAAAACJgAAAAABJgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAJgAAAAADKAAAAAABKAAAAAABKAAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAJgAAAAAAggAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAggAAAAAAAQAAAAACAQAAAAAAAQAAAAACggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAQAAAAACAQAAAAADAQAAAAADAQAAAAADAwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAQAAAAAAAQAAAAABAQAAAAADMQAAAAACMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAggAAAAAAAQAAAAACAQAAAAABAQAAAAAAAQAAAAAB
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACgQAAAAAAgQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAABJgAAAAADJgAAAAABJgAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAAAJgAAAAABRQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAJgAAAAADJgAAAAACJgAAAAABJgAAAAAAggAAAAAARQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAKAAAAAADKAAAAAAAKAAAAAADKAAAAAADJgAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAJgAAAAABggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABJgAAAAAAggAAAAAAggAAAAAAggAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAAAJgAAAAAAggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAABKAAAAAAAJgAAAAABggAAAAAAcAAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAABAgAAAAABAgAAAAABRQAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAAAJgAAAAABMQAAAAACAgAAAAABJgAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAABJgAAAAAAMQAAAAACMQAAAAADggAAAAAARQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAABKAAAAAACKAAAAAABKAAAAAAAJgAAAAABRQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAABggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAADAQAAAAAAggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAAQAAAAADJgAAAAABcAAAAAAAcAAAAAAAcAAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACggAAAAAAggAAAAAAggAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACggAAAAAAggAAAAAAJQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAggAAAAAAJQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAggAAAAAAggAAAAAAggAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAJgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAJQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,0:
           ind: 0,0
-          tiles: KQAAAAABJgAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAACJQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABJQAAAAAAggAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAABJQAAAAACggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKQAAAAADggAAAAAAMQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAMQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AQAAAAABAwAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAADJgAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAJQAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAACJQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAABJQAAAAADggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAACggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -61,367 +64,477 @@ entities:
       chunkCollection:
         version: 2
         nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            474: -4,-8
+            475: 4,-8
+        - node:
+            color: '#D69949FF'
+            id: Bot
+          decals:
+            692: 1,-3
+            693: 0,-3
+            694: -1,-3
         - node:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            57: 5,-3
-            58: 5,-4
-            59: 4,-4
-            60: 3,-4
+            740: 5,-3
+            741: 5,-4
+            742: 4,-4
         - node:
             color: '#0096FFFF'
             id: BotGreyscale
           decals:
-            62: 4,-1
+            739: 4,-1
         - node:
-            color: '#FF5C5CFF'
+            color: '#FF0000FF'
             id: BotGreyscale
           decals:
-            61: 5,-2
+            738: 5,-2
+        - node:
+            color: '#BC863FFF'
+            id: BotLeft
+          decals:
+            519: -1,2
+        - node:
+            color: '#D69949FF'
+            id: BotLeft
+          decals:
+            699: -1,0
+        - node:
+            color: '#BC863FFF'
+            id: BotRight
+          decals:
+            407: 1,2
+        - node:
+            color: '#D69949FF'
+            id: BotRight
+          decals:
+            689: 1,0
         - node:
-            angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
-            id: BotGreyscale
+            id: BrickTileDarkBox
           decals:
-            170: 2,-7
+            325: -5,-6
+            326: -5,-8
         - node:
+            angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
-            id: BotGreyscale
+            id: BrickTileDarkBox
           decals:
-            0: 3,-7
-            1: 4,-7
-            2: -3,-7
-            3: -4,-7
-            4: 0,-9
-            5: 1,-9
-            6: -1,-9
-            9: -2,-9
-            10: 2,-9
-            166: -2,-7
+            330: 5,-6
+            331: 5,-8
         - node:
-            cleanable: True
             color: '#FFFFFFFF'
-            id: Dirt
+            id: BrickTileDarkCornerNe
           decals:
-            133: -3,-7
-            142: -1,-3
-            143: 1,4
+            648: -3,-7
         - node:
-            cleanable: True
             color: '#FFFFFFFF'
-            id: DirtHeavy
+            id: BrickTileDarkCornerNw
           decals:
-            144: 4,-2
-            147: -3,-1
-            152: 4,-6
+            647: 3,-7
         - node:
-            cleanable: True
             color: '#FFFFFFFF'
-            id: DirtHeavyMonotile
+            id: BrickTileDarkEndE
           decals:
-            118: -6,-8
-            119: -6,-6
-            120: -7,-6
-            121: -7,-8
-            122: -5,-8
-            123: -5,-6
-            124: -1,-10
-            125: 0,-10
-            126: 1,-10
-            127: 6,-8
-            128: 6,-6
-            129: 7,-6
-            130: 7,-8
-            131: 5,-8
-            132: 5,-6
-            134: -4,-7
-            135: 4,-7
-            136: -3,-9
-            137: 1,-9
-            138: -1,-9
-            139: 3,-9
-            140: 0,-9
-            141: 1,-9
-            145: 2,-1
-            146: -2,-1
-            156: 3,-6
-            163: -1,-2
-            164: -1,0
-            165: 1,-2
+            627: 4,-6
+            637: -2,-6
+            641: 4,-7
         - node:
-            cleanable: True
             color: '#FFFFFFFF'
-            id: DirtLight
+            id: BrickTileDarkEndS
           decals:
-            148: -4,-6
-            149: -3,-8
-            153: 1,-8
-            154: -2,-8
-            155: 3,-8
-            157: -1,-6
-            158: 0,-3
-            159: 1,-1
-            160: 0,0
-            161: 0,4
-            162: 0,5
+            645: -3,-8
+            646: 3,-8
         - node:
-            cleanable: True
             color: '#FFFFFFFF'
-            id: DirtMedium
+            id: BrickTileDarkEndW
           decals:
-            150: 0,-6
-            151: 4,-8
+            629: 2,-6
+            638: -4,-6
+            643: -4,-7
         - node:
-            color: '#334E6DFF'
-            id: MiniTileCheckerAOverlay
+            color: '#FFFFFFFF'
+            id: BrickTileDarkInnerSe
           decals:
-            46: 0,6
-            47: 0,7
+            650: 3,-7
         - node:
-            color: '#B3B3B3FF'
-            id: MiniTileCheckerAOverlay
+            color: '#FFFFFFFF'
+            id: BrickTileDarkInnerSw
           decals:
-            54: 1,4
-            55: 1,3
-            56: 1,2
+            649: -3,-7
         - node:
-            color: '#B8B873FF'
-            id: MiniTileCheckerAOverlay
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
           decals:
-            50: -1,2
+            631: 3,-6
+            639: -3,-6
         - node:
-            color: '#CA7EF2FF'
-            id: MiniTileCheckerAOverlay
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineS
           decals:
-            48: -1,4
-            49: -1,3
+            633: 3,-6
+            640: -3,-6
         - node:
-            color: '#4B709CFF'
-            id: MiniTileCheckerBOverlay
+            color: '#FFFFFFFF'
+            id: BrickTileSteelBox
           decals:
-            41: 1,2
-            42: 1,3
-            43: 1,4
-            44: 0,6
-            45: 0,7
-            51: -1,2
-            52: -1,3
-            53: -1,4
+            461: -3,-5
+            472: 2,-1
+            473: 0,1
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteEndE
+            color: '#FFFFFFFF'
+            id: BrickTileSteelCornerSe
           decals:
-            66: 4,-8
-            102: 4,-6
+            687: 0,-2
         - node:
-            color: '#EFB3417F'
-            id: MiniTileWhiteEndE
+            color: '#FFFFFFFF'
+            id: BrickTileSteelEndN
           decals:
-            101: 1,-1
+            685: 0,-1
         - node:
-            color: '#334E6DFF'
-            id: MiniTileWhiteEndN
+            color: '#FFFFFFFF'
+            id: BrickTileSteelEndW
           decals:
-            63: 0,5
+            701: -2,-2
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteEndW
+            color: '#FFFFFFFF'
+            id: BrickTileSteelInnerNw
           decals:
-            64: -4,-6
-            65: -4,-8
+            686: 0,-2
         - node:
-            color: '#EFB3417F'
-            id: MiniTileWhiteEndW
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineN
           decals:
-            100: -1,-1
+            658: -1,-2
         - node:
-            color: '#334E6DFF'
-            id: MiniTileWhiteInnerNe
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineS
           decals:
-            26: 0,-1
+            653: -1,-2
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteInnerNe
+            color: '#9A54BFFF'
+            id: BrickTileWhiteCornerNe
           decals:
-            97: 0,-8
-            98: 0,-6
+            670: 1,0
         - node:
-            color: '#334E6DFF'
-            id: MiniTileWhiteInnerNw
+            color: '#9A54BFFF'
+            id: BrickTileWhiteCornerNw
           decals:
-            25: 0,-1
+            668: -4,-1
+            680: -5,-2
+            697: -1,0
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteInnerNw
+            color: '#9A54BFFF'
+            id: BrickTileWhiteCornerSe
           decals:
-            96: 0,-8
-            99: 0,-6
+            671: 1,-3
+            681: -3,-4
         - node:
-            color: '#334E6DFF'
-            id: MiniTileWhiteInnerSe
+            color: '#9A54BFFF'
+            id: BrickTileWhiteCornerSw
           decals:
-            27: 0,-1
+            677: -5,-4
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteInnerSe
+            color: '#9A54BFFF'
+            id: BrickTileWhiteInnerNw
           decals:
-            94: 0,-6
+            683: -4,-2
+            684: -1,-1
         - node:
-            color: '#334E6DFF'
-            id: MiniTileWhiteInnerSw
+            color: '#9A54BFFF'
+            id: BrickTileWhiteInnerSe
           decals:
-            28: 0,-1
+            682: -3,-3
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteInnerSw
+            color: '#9A54BFFF'
+            id: BrickTileWhiteLineE
           decals:
-            95: 0,-6
+            666: 1,-1
+            667: 1,-2
         - node:
-            color: '#334E6DFF'
-            id: MiniTileWhiteLineE
+            color: '#9A54BFFF'
+            id: BrickTileWhiteLineN
           decals:
-            8: 0,-5
-            22: 0,0
-            23: 0,-2
-            24: 0,-3
-            38: 0,2
-            39: 0,3
-            40: 0,4
+            663: -3,-1
+            664: -2,-1
+            698: 0,0
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteLineE
+            color: '#9A54BFFF'
+            id: BrickTileWhiteLineS
           decals:
-            93: 0,-7
+            672: 0,-3
+            673: -1,-3
+            675: -4,-4
+            700: -2,-3
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteLineN
-          decals:
-            67: -3,-8
-            68: -2,-8
-            69: -1,-8
-            70: 1,-8
-            71: 2,-8
-            72: 3,-8
-            73: 3,-6
-            74: 2,-6
-            75: 1,-6
-            76: -2,-6
-            77: -3,-6
-            78: -1,-6
+            color: '#9A54BFFF'
+            id: BrickTileWhiteLineW
+          decals:
+            678: -5,-3
         - node:
-            color: '#774194FF'
-            id: MiniTileWhiteLineS
-          decals:
-            79: -3,-6
-            80: -2,-6
-            81: -1,-6
-            82: 1,-6
-            83: 2,-6
-            84: 3,-6
-            85: 3,-8
-            86: 2,-8
-            87: 1,-8
-            88: 0,-8
-            89: -1,-8
-            90: -2,-8
-            91: -3,-8
+            angle: -3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: DeliveryGreyscale
+          decals:
+            789: 1,-6
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Dirt
+          decals:
+            745: -1,-9
+            746: 3,-1
+            747: 0,-3
+            748: -1,4
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            763: 0,-9
+            764: -4,-8
+            772: -3,-2
+            773: 1,-2
+            774: 4,-3
+            775: 3,-3
+            776: 4,-1
+            777: 4,-2
+            780: 0,4
+        - node:
+            cleanable: True
+            angle: -3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            790: 0,-6
+            791: 1,-6
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            115: -6,-8
+            116: -6,-6
+            117: -7,-6
+            118: -7,-8
+            121: -1,-10
+            122: 0,-10
+            123: 1,-10
+            124: 6,-8
+            125: 6,-6
+            126: 7,-6
+            127: 7,-8
+            749: -6,-6
+            750: -6,-7
+            751: -6,-8
+            756: -3,-8
+            757: -3,-7
+            758: 3,-7
+            759: 4,-7
+            760: 4,-6
+            778: 1,0
+            779: -1,2
+            784: 0,-2
+            785: 0,-1
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            752: -1,-6
+            753: -2,-9
+            765: 2,-9
+            766: -3,-4
+            767: -1,-1
+            768: 0,3
+            769: 1,5
+            770: 0,6
+            771: -4,-1
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            761: 2,-6
+            762: -4,-6
+            781: -2,-3
+            782: 0,5
+            783: -1,-5
+        - node:
+            angle: -3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: LoadingAreaGreyscale
+          decals:
+            788: 0,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkEndN
+          decals:
+            264: 0,8
+            285: 1,5
+            296: -1,5
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkEndS
+          decals:
+            263: 0,2
+            406: 1,3
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineE
+          decals:
+            265: 0,7
+            266: 0,6
+            267: 0,5
+            268: 0,4
+            269: 0,3
+            288: 1,4
+            294: -1,4
+            295: -1,3
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineS
+          decals:
+            518: -1,3
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileDarkLineW
+          decals:
+            270: 0,3
+            271: 0,4
+            272: 0,5
+            273: 0,6
+            274: 0,7
+            289: 1,4
+            292: -1,3
+            293: -1,4
         - node:
             color: '#334E6DFF'
-            id: MiniTileWhiteLineW
+            id: MiniTileOverlay
+          decals:
+            256: 0,2
+            257: 0,3
+            258: 0,4
+            259: 0,5
+            260: 0,6
+            261: 0,7
+            262: 0,8
+        - node:
+            color: '#774194FF'
+            id: MiniTileOverlay
           decals:
-            7: 0,-5
-            19: 0,-3
-            20: 0,-2
-            21: 0,0
-            35: 0,2
-            36: 0,3
-            37: 0,4
+            277: 1,5
+            278: 1,4
+            282: -1,3
+            283: -1,4
+            284: -1,5
+            405: 1,3
         - node:
             color: '#774194FF'
-            id: MiniTileWhiteLineW
+            id: PavementOverlay
           decals:
-            92: 0,-7
+            623: 2,-6
+            624: 3,-6
+            625: 4,-6
+            634: -4,-6
+            635: -3,-6
+            636: -2,-6
         - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            167: 6,-7
+        - node:
+            angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            11: -6,-7
-            12: 6,-7
+            166: -6,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnBox
+          decals:
+            359: -7,-9
+            360: 7,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSE
+          decals:
+            743: 4,-3
         - node:
             color: '#FFFFFFFF'
             id: WarnEndE
           decals:
             30: 1,-10
+            361: 6,-9
+            365: -4,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnEndW
           decals:
             29: -1,-10
+            362: 4,-9
+            366: -6,-9
         - node:
             color: '#4B709CFF'
             id: WarnFullGreyscale
           decals:
-            105: 0,-4
-            106: 0,1
-        - node:
-            color: '#9A54BFFF'
-            id: WarnFullGreyscale
-          decals:
-            109: -5,-6
-            110: -5,-8
-            111: 5,-8
-            112: 5,-6
+            471: 0,1
         - node:
-            color: '#EFB3417F'
+            color: '#CA7EF2FF'
             id: WarnFullGreyscale
           decals:
-            107: -2,-1
-            108: 2,-1
+            322: -5,-6
+            323: -5,-8
+            460: -3,-5
         - node:
-            angle: -1.5707963267948966 rad
-            color: '#FFFF00FF'
+            angle: 1.5707963267948966 rad
+            color: '#CA7EF2FF'
             id: WarnFullGreyscale
           decals:
-            169: 1,-7
+            328: 5,-8
+            329: 5,-6
         - node:
-            color: '#FFFF00FF'
+            angle: 1.5707963267948966 rad
+            color: '#FFA647FF'
             id: WarnFullGreyscale
           decals:
-            114: -1,-7
+            470: 2,-1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            15: 3,-9
             33: 6,-8
             34: 6,-6
+            370: 3,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
             32: 0,-10
+            364: 5,-9
+            368: -5,-9
+            744: 3,-3
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            14: -3,-9
             103: -6,-6
             104: -6,-8
+            369: -3,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            13: -4,-9
-            16: 4,-9
-            17: 6,-9
-            18: -6,-9
             31: 0,-10
-        - node:
-            color: '#96DAFFFF'
-            id: med
-          decals:
-            117: 1,-5
+            363: 5,-9
+            367: -5,-9
     - type: GridAtmosphere
       version: 2
       data:
@@ -436,29 +549,29 @@ entities:
             0: 16386
             2: 2184
           -1,-3:
-            1: 16
+            1: 240
             2: 61440
-            0: 32
           -1,-2:
-            2: 36863
+            2: 45055
           -1,-1:
-            2: 64435
+            2: 65523
           -2,0:
             0: 8
           0,-3:
+            1: 240
             2: 61440
-            0: 128
           0,-2:
             2: 16383
           0,-1:
-            2: 64441
+            2: 64440
           -1,0:
             2: 34824
-            0: 4096
-            1: 544
+            1: 32
+            0: 512
           0,0:
             2: 13075
-            1: 2176
+            1: 128
+            0: 2048
           1,-3:
             1: 48
             2: 20480
@@ -469,21 +582,20 @@ entities:
             2: 4915
             0: 16392
           1,0:
-            0: 4098
+            0: 2
           -1,1:
-            1: 3
-            0: 64
-            2: 8
+            0: 1056
+            1: 512
+            2: 136
           0,1:
-            2: 4371
-            0: 64
-            1: 8
+            2: 4403
+            0: 1152
+            1: 2048
           -1,2:
-            0: 8
+            0: 128
           0,2:
-            0: 2
-          1,1:
-            1: 1
+            2: 1
+            0: 32
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -535,82 +647,71 @@ entities:
     - type: RadiationGridResistance
 - proto: AirAlarm
   entities:
-  - uid: 307
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,5.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 217
-      - 52
-      - 211
-      - 50
-      - 351
-      - 366
-      - 216
-      - 285
-  - uid: 403
+  - uid: 78
     components:
     - type: Transform
-      pos: 3.5,-4.5
+      pos: -1.5,0.5
       parent: 2
     - type: DeviceList
       devices:
-      - 136
-      - 40
-      - 102
-      - 137
-      - 33
+      - 437
+      - 232
+      - 202
+      - 390
+      - 240
+      - 267
+      - 359
+      - 315
+      - 269
+      - 296
       - 105
-      - 52
-- proto: AirlockCommandGlass
+      - 33
+      - 358
+      - 172
+      - 102
+      - 40
+- proto: AirlockCargo
   entities:
-  - uid: 95
+  - uid: 311
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: -2.5,-4.5
       parent: 2
-  - uid: 98
+- proto: AirlockCommand
+  entities:
+  - uid: 281
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: 0.5,1.5
       parent: 2
 - proto: AirlockEngineering
   entities:
-  - uid: 94
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 2
-  - uid: 97
+  - uid: 310
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 2.5,-0.5
       parent: 2
 - proto: AirlockExternalGlass
   entities:
-  - uid: 65
+  - uid: 46
     components:
     - type: Transform
-      pos: -4.5,-5.5
+      pos: -4.5,-7.5
       parent: 2
-  - uid: 78
+  - uid: 151
     components:
     - type: Transform
       pos: 5.5,-7.5
       parent: 2
-  - uid: 367
+  - uid: 153
     components:
     - type: Transform
-      pos: -4.5,-7.5
+      pos: 5.5,-5.5
       parent: 2
-  - uid: 368
+  - uid: 344
     components:
     - type: Transform
-      pos: 5.5,-5.5
+      pos: -4.5,-5.5
       parent: 2
 - proto: AirlockGlassShuttle
   entities:
@@ -638,145 +739,121 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -6.5,-7.5
       parent: 2
-- proto: AmeController
+- proto: APCBasic
   entities:
-  - uid: 46
+  - uid: 76
     components:
     - type: Transform
-      pos: -3.5,-0.5
+      pos: -2.5,0.5
       parent: 2
-    - type: AmeController
-      injecting: True
-    - type: ContainerContainer
-      containers:
-        fuelSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 47
-- proto: AmeJar
+- proto: AtmosDeviceFanTiny
   entities:
-  - uid: 47
+  - uid: 154
     components:
     - type: Transform
-      parent: 46
-    - type: Physics
-      canCollide: False
-  - uid: 289
+      pos: 7.5,-8.5
+      parent: 2
+  - uid: 188
     components:
     - type: Transform
-      pos: -2.687633,-0.6083449
+      pos: 0.5,-9.5
       parent: 2
-- proto: AmeShielding
-  entities:
-  - uid: 4
+  - uid: 190
     components:
     - type: Transform
-      pos: -2.5,-1.5
+      pos: 1.5,-9.5
       parent: 2
-  - uid: 5
+  - uid: 192
     components:
     - type: Transform
-      pos: -2.5,-2.5
+      pos: -0.5,-9.5
       parent: 2
-  - uid: 6
+  - uid: 326
     components:
     - type: Transform
-      pos: -3.5,-3.5
+      pos: -6.5,-8.5
       parent: 2
-  - uid: 7
+  - uid: 333
     components:
     - type: Transform
-      pos: -2.5,-3.5
+      pos: -6.5,-7.5
       parent: 2
-  - uid: 8
+  - uid: 334
     components:
     - type: Transform
-      pos: -4.5,-1.5
+      pos: -6.5,-5.5
       parent: 2
-  - uid: 9
+  - uid: 335
     components:
     - type: Transform
-      pos: -3.5,-1.5
+      pos: 7.5,-5.5
       parent: 2
-  - uid: 10
+  - uid: 336
     components:
     - type: Transform
-      pos: -4.5,-3.5
+      pos: 7.5,-7.5
       parent: 2
-  - uid: 11
+- proto: AtmosFixBlockerMarker
+  entities:
+  - uid: 19
     components:
     - type: Transform
-      pos: -4.5,-2.5
+      pos: 3.5,6.5
       parent: 2
-  - uid: 45
+  - uid: 25
     components:
     - type: Transform
-      pos: -3.5,-2.5
+      pos: 3.5,5.5
       parent: 2
-    - type: PointLight
-      radius: 2
-      enabled: True
-- proto: APCBasic
-  entities:
-  - uid: 174
+  - uid: 26
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-2.5
-      parent: 2
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 188
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
+      pos: 0.5,-10.5
       parent: 2
-  - uid: 190
+  - uid: 28
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      pos: -0.5,-10.5
       parent: 2
-  - uid: 192
+  - uid: 34
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: 1.5,9.5
       parent: 2
-  - uid: 326
+  - uid: 35
     components:
     - type: Transform
-      pos: -6.5,-8.5
+      pos: 2.5,6.5
       parent: 2
-  - uid: 329
+  - uid: 37
     components:
     - type: Transform
-      pos: 7.5,-8.5
+      pos: 1.5,-10.5
       parent: 2
-  - uid: 333
+  - uid: 41
     components:
     - type: Transform
-      pos: -6.5,-7.5
+      pos: 2.5,-10.5
       parent: 2
-  - uid: 334
+  - uid: 42
     components:
     - type: Transform
-      pos: -6.5,-5.5
+      pos: 3.5,2.5
       parent: 2
-  - uid: 335
+  - uid: 48
     components:
     - type: Transform
-      pos: 7.5,-5.5
+      pos: 5.5,-10.5
       parent: 2
-  - uid: 336
+  - uid: 52
     components:
     - type: Transform
-      pos: 7.5,-7.5
+      pos: -1.5,6.5
       parent: 2
-- proto: AtmosFixBlockerMarker
-  entities:
-  - uid: 48
+  - uid: 58
     components:
     - type: Transform
-      pos: 5.5,-10.5
+      pos: -0.5,9.5
       parent: 2
   - uid: 112
     components:
@@ -788,6 +865,26 @@ entities:
     - type: Transform
       pos: -3.5,-10.5
       parent: 2
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 2
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 2
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 2
   - uid: 371
     components:
     - type: Transform
@@ -838,66 +935,6 @@ entities:
     - type: Transform
       pos: -2.5,1.5
       parent: 2
-  - uid: 384
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 2
-  - uid: 385
-    components:
-    - type: Transform
-      pos: -3.5,3.5
-      parent: 2
-  - uid: 386
-    components:
-    - type: Transform
-      pos: -3.5,4.5
-      parent: 2
-  - uid: 387
-    components:
-    - type: Transform
-      pos: -2.5,4.5
-      parent: 2
-  - uid: 388
-    components:
-    - type: Transform
-      pos: -1.5,5.5
-      parent: 2
-  - uid: 389
-    components:
-    - type: Transform
-      pos: -0.5,8.5
-      parent: 2
-  - uid: 390
-    components:
-    - type: Transform
-      pos: 1.5,8.5
-      parent: 2
-  - uid: 391
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 2
-  - uid: 392
-    components:
-    - type: Transform
-      pos: 3.5,4.5
-      parent: 2
-  - uid: 393
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 2
-  - uid: 394
-    components:
-    - type: Transform
-      pos: 4.5,3.5
-      parent: 2
-  - uid: 395
-    components:
-    - type: Transform
-      pos: 3.5,2.5
-      parent: 2
   - uid: 396
     components:
     - type: Transform
@@ -923,80 +960,79 @@ entities:
     - type: Transform
       pos: 7.5,-9.5
       parent: 2
-- proto: BlastDoor
+- proto: BenchSofaCorpLeft
   entities:
   - uid: 277
     components:
     - type: Transform
-      pos: 7.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 120
-  - uid: 294
+    - type: Physics
+      bodyType: Static
+- proto: BenchSofaCorpRight
+  entities:
+  - uid: 205
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 0.5,-9.5
+      pos: -3.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 298
-  - uid: 297
+    - type: Physics
+      bodyType: Static
+- proto: BlastDoor
+  entities:
+  - uid: 9
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-9.5
+      pos: 5.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 298
-  - uid: 317
+  - uid: 10
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 2
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 2
+  - uid: 13
     components:
     - type: Transform
       pos: -4.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 348
-  - uid: 358
+  - uid: 294
     components:
     - type: Transform
-      pos: -6.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 348
-  - uid: 359
+  - uid: 297
     components:
     - type: Transform
-      pos: 5.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 120
   - uid: 363
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 298
 - proto: ButtonFrameCaution
   entities:
-  - uid: 187
+  - uid: 68
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-6.5
       parent: 2
-  - uid: 291
+  - uid: 307
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
       parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
@@ -1008,75 +1044,70 @@ entities:
       parent: 2
 - proto: CableApcExtension
   entities:
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 2
-  - uid: 176
+  - uid: 8
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: -2.5,-4.5
       parent: 2
-  - uid: 177
+  - uid: 77
     components:
     - type: Transform
-      pos: 4.5,-2.5
+      pos: -2.5,0.5
       parent: 2
-  - uid: 178
+  - uid: 170
     components:
     - type: Transform
-      pos: 3.5,-1.5
+      pos: -2.5,-3.5
       parent: 2
-  - uid: 236
+  - uid: 181
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: -2.5,-5.5
       parent: 2
-  - uid: 237
+  - uid: 182
     components:
     - type: Transform
-      pos: 2.5,-0.5
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 238
+  - uid: 184
     components:
     - type: Transform
-      pos: 1.5,-0.5
+      pos: 3.5,-0.5
       parent: 2
-  - uid: 239
+  - uid: 186
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: 3.5,-1.5
       parent: 2
-  - uid: 240
+  - uid: 191
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: 2.5,-0.5
       parent: 2
-  - uid: 241
+  - uid: 193
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      pos: 1.5,-0.5
       parent: 2
-  - uid: 242
+  - uid: 199
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: -0.5,-0.5
       parent: 2
-  - uid: 243
+  - uid: 200
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      pos: -1.5,-0.5
       parent: 2
-  - uid: 244
+  - uid: 217
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      pos: -2.5,-6.5
       parent: 2
-  - uid: 245
+  - uid: 239
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: 0.5,-0.5
       parent: 2
   - uid: 246
     components:
@@ -1138,11 +1169,6 @@ entities:
     - type: Transform
       pos: 0.5,0.5
       parent: 2
-  - uid: 258
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 2
   - uid: 259
     components:
     - type: Transform
@@ -1163,20 +1189,25 @@ entities:
     - type: Transform
       pos: 0.5,4.5
       parent: 2
-  - uid: 275
+  - uid: 266
     components:
     - type: Transform
-      pos: -0.5,4.5
+      pos: 0.5,6.5
       parent: 2
-  - uid: 276
+  - uid: 278
     components:
     - type: Transform
-      pos: 1.5,4.5
+      pos: 0.5,5.5
       parent: 2
-  - uid: 278
+  - uid: 317
     components:
     - type: Transform
-      pos: 0.5,5.5
+      pos: -2.5,-1.5
+      parent: 2
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
       parent: 2
   - uid: 340
     components:
@@ -1188,608 +1219,752 @@ entities:
     - type: Transform
       pos: 6.5,-7.5
       parent: 2
-  - uid: 415
+  - uid: 388
     components:
     - type: Transform
-      pos: -1.5,-0.5
+      pos: -2.5,-2.5
       parent: 2
 - proto: CableHV
   entities:
-  - uid: 103
+  - uid: 70
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 104
+  - uid: 71
     components:
     - type: Transform
-      pos: 4.5,-3.5
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 155
+  - uid: 165
     components:
     - type: Transform
-      pos: -3.5,-0.5
+      pos: 4.5,-3.5
       parent: 2
-  - uid: 158
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+- proto: CableMV
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 73
     components:
     - type: Transform
       pos: -2.5,-0.5
       parent: 2
-  - uid: 159
+  - uid: 83
     components:
     - type: Transform
-      pos: -1.5,-0.5
+      pos: 3.5,-1.5
       parent: 2
-  - uid: 160
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 94
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 2
-  - uid: 161
+  - uid: 95
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: -1.5,-0.5
       parent: 2
-  - uid: 162
+  - uid: 96
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 2
-  - uid: 163
+  - uid: 99
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 2
-  - uid: 164
+  - uid: 236
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 165
+  - uid: 404
     components:
     - type: Transform
-      pos: 3.5,-1.5
+      pos: -2.5,0.5
       parent: 2
-  - uid: 166
+- proto: CableTerminal
+  entities:
+  - uid: 72
     components:
     - type: Transform
-      pos: 3.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-3.5
       parent: 2
-  - uid: 169
+- proto: CarpetPurple
+  entities:
+  - uid: 15
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: 1.5,3.5
       parent: 2
-- proto: CableMV
-  entities:
-  - uid: 172
+  - uid: 49
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: 1.5,4.5
       parent: 2
-  - uid: 173
+  - uid: 406
     components:
     - type: Transform
-      pos: 2.5,-2.5
+      pos: -3.5,-3.5
       parent: 2
-  - uid: 274
+  - uid: 428
     components:
     - type: Transform
-      pos: 4.5,-3.5
+      pos: -3.5,-1.5
       parent: 2
-  - uid: 300
+  - uid: 429
     components:
     - type: Transform
-      pos: 4.5,-2.5
+      pos: -3.5,-2.5
       parent: 2
-  - uid: 303
+  - uid: 430
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      pos: -4.5,-1.5
       parent: 2
-- proto: CableTerminal
-  entities:
-  - uid: 168
+  - uid: 431
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: -4.5,-2.5
+      parent: 2
+  - uid: 432
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
       parent: 2
-- proto: CargoPallet
+- proto: Catwalk
   entities:
-  - uid: 203
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 2
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 2
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 2
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 2
+  - uid: 140
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 2
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 2
+  - uid: 161
     components:
     - type: Transform
       pos: 1.5,-6.5
       parent: 2
-  - uid: 344
+  - uid: 171
     components:
     - type: Transform
-      pos: -0.5,-6.5
+      pos: -1.5,-7.5
       parent: 2
-- proto: Catwalk
-  entities:
-  - uid: 268
+  - uid: 211
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: -0.5,-10.5
       parent: 2
-  - uid: 269
+  - uid: 280
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-1.5
       parent: 2
-  - uid: 270
+  - uid: 319
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: -0.5,-6.5
       parent: 2
-  - uid: 271
+  - uid: 328
     components:
     - type: Transform
-      pos: 4.5,-2.5
+      pos: 0.5,-6.5
       parent: 2
-- proto: ChairPilotSeat
-  entities:
-  - uid: 134
+  - uid: 345
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,6.5
+      pos: 2.5,-10.5
       parent: 2
-  - uid: 140
+  - uid: 346
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,3.5
+      pos: -0.5,-7.5
       parent: 2
-  - uid: 227
+  - uid: 389
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,2.5
+      pos: 0.5,-7.5
       parent: 2
-- proto: ClosetWall
-  entities:
-  - uid: 106
+  - uid: 408
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-1.5
+      pos: -1.5,-6.5
       parent: 2
-  - uid: 224
+- proto: ChairOfficeDark
+  entities:
+  - uid: 212
     components:
     - type: Transform
-      pos: -2.5,0.5
+      rot: 3.141592653589793 rad
+      pos: 1.5154896,3.767986
       parent: 2
-- proto: ClosetWallEmergencyFilledRandom
+- proto: ChairPilotSeat
   entities:
-  - uid: 223
+  - uid: 148
     components:
     - type: Transform
-      pos: -3.5,-4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,7.5
       parent: 2
-- proto: ComputerSalvageExpedition
+- proto: ComfyChair
   entities:
-  - uid: 138
+  - uid: 325
     components:
     - type: Transform
-      pos: -0.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,-3.5
       parent: 2
 - proto: ComputerShuttle
   entities:
-  - uid: 133
+  - uid: 265
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 0.5,8.5
       parent: 2
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 283
+  - uid: 206
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 2
+- proto: ComputerWallmountWithdrawBankATM
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
       parent: 2
+    - type: ContainerContainer
+      containers:
+        board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
+    - type: ItemSlots
 - proto: ConveyorBelt
   entities:
-  - uid: 124
+  - uid: 64
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 123
-  - uid: 349
+  - uid: 65
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,-8.5
+      pos: 7.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 167
-  - uid: 350
+  - uid: 89
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 4.5,-8.5
+      pos: 0.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 167
-  - uid: 353
+  - uid: 150
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 167
-  - uid: 354
+  - uid: 155
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,-8.5
+      pos: 5.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 167
-  - uid: 355
+  - uid: 156
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 123
-  - uid: 356
+  - uid: 157
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 123
-  - uid: 357
+  - uid: 274
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 2
+  - uid: 275
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 123
+  - uid: 342
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 2
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 301
+  - uid: 313
     components:
     - type: Transform
-      pos: 2.5,-4.5
+      pos: 4.5,-4.5
       parent: 2
-- proto: EmergencyLight
+- proto: DrinkMug
   entities:
-  - uid: 405
+  - uid: 426
     components:
     - type: Transform
-      pos: -3.5,-5.5
+      pos: -4.4542685,-2.4937136
       parent: 2
-  - uid: 406
+- proto: DrinkMugMetal
+  entities:
+  - uid: 146
     components:
     - type: Transform
-      pos: 4.5,-5.5
+      pos: -4.563232,-1.3772196
       parent: 2
-  - uid: 407
+- proto: DrinkMugMoebius
+  entities:
+  - uid: 145
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: -4.2980185,-1.8687136
       parent: 2
-  - uid: 408
+- proto: EmergencyLight
+  entities:
+  - uid: 174
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
       parent: 2
-  - uid: 409
+  - uid: 413
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-6.5
+      parent: 2
+  - uid: 414
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,0.5
+      pos: 6.5,-6.5
       parent: 2
-  - uid: 410
+  - uid: 417
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-0.5
+      pos: -4.5,-3.5
       parent: 2
-  - uid: 411
+  - uid: 433
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-0.5
+      pos: 1.5,0.5
       parent: 2
-  - uid: 412
+  - uid: 434
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,-8.5
       parent: 2
-  - uid: 413
+  - uid: 436
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-6.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-8.5
       parent: 2
-  - uid: 414
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 409
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-6.5
+      pos: 2.5,-1.5
       parent: 2
-- proto: EmergencyRollerBed
+- proto: FaxMachineShip
   entities:
-  - uid: 320
+  - uid: 201
     components:
     - type: Transform
-      pos: 1.5,-4.5
+      pos: -0.5,4.5
       parent: 2
-- proto: ExtinguisherCabinetFilled
+- proto: filingCabinetDrawerRandom
   entities:
-  - uid: 311
+  - uid: 144
     components:
     - type: Transform
-      pos: -2.5,-4.5
+      pos: 1.5,5.5
       parent: 2
-- proto: FaxMachineShip
+- proto: FirelockEdge
   entities:
-  - uid: 282
+  - uid: 437
     components:
     - type: Transform
-      pos: 1.5,3.5
+      pos: 0.5,6.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 78
 - proto: FirelockGlass
   entities:
-  - uid: 50
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 78
+  - uid: 359
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 307
-  - uid: 52
+      - 78
+  - uid: 390
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: 0.5,1.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 403
-      - 307
-  - uid: 351
+      - 78
+- proto: GasMixerOn
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 2
+    - type: GasMixer
+      inletTwoConcentration: 0.22000003
+      inletOneConcentration: 0.78
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 126
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 133
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 176
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 103
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 104
     components:
     - type: Transform
-      pos: -1.5,-0.5
+      pos: -2.5,-1.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 307
-  - uid: 366
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 106
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: -0.5,1.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 307
-- proto: FolderSpawner
-  entities:
-  - uid: 309
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 110
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.3707361,3.997057
+      pos: -0.5,0.5
       parent: 2
-- proto: GasMixerOn
-  entities:
-  - uid: 157
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 111
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-1.5
+      pos: -0.5,-0.5
       parent: 2
-    - type: GasMixer
-      inletTwoConcentration: 0.22000003
-      inletOneConcentration: 0.78
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPassiveVent
-  entities:
-  - uid: 179
+  - uid: 115
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-10.5
+      pos: -2.5,-6.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPipeBend
-  entities:
-  - uid: 144
+  - uid: 120
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: -2.5,-5.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 156
+      color: '#990000FF'
+  - uid: 121
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-1.5
+      pos: -2.5,-4.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 170
+      color: '#990000FF'
+  - uid: 123
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-8.5
+      pos: 0.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 212
+      color: '#0055CCFF'
+  - uid: 124
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,4.5
+      pos: -1.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 266
+      color: '#0055CCFF'
+  - uid: 127
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 0.5,-8.5
+      pos: -2.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GasPipeFourway
-  entities:
-  - uid: 347
+      color: '#0055CCFF'
+  - uid: 128
     components:
     - type: Transform
-      pos: 0.5,-7.5
+      pos: -3.5,-2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GasPipeStraight
-  entities:
-  - uid: 154
+      color: '#0055CCFF'
+  - uid: 129
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+      pos: -3.5,-3.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 171
+  - uid: 131
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 185
+  - uid: 132
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-9.5
+      pos: -3.5,-4.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 186
+      color: '#0055CCFF'
+  - uid: 134
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-7.5
+      pos: -2.5,-3.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 191
+  - uid: 137
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-7.5
+      pos: -0.5,2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 194
+      color: '#0055CCFF'
+  - uid: 163
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 164
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 1.5,-7.5
+      pos: -2.5,-5.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 195
+      color: '#0055CCFF'
+  - uid: 166
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 2.5,-7.5
+      pos: -1.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 196
+  - uid: 177
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-7.5
+      pos: 0.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 197
+  - uid: 178
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-7.5
+      pos: -3.5,-8.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 198
+  - uid: 183
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 199
+  - uid: 185
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,-9.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 200
+  - uid: 194
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 201
+  - uid: 195
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 202
+  - uid: 196
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 205
+  - uid: 197
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 206
+  - uid: 198
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -1825,59 +2000,30 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 213
-    components:
-    - type: Transform
-      pos: 1.5,0.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 214
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 215
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 218
+  - uid: 219
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,-1.5
+      pos: 3.5,-5.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 220
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 221
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 222
+      color: '#990000FF'
+  - uid: 224
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 226
     components:
     - type: Transform
@@ -1918,7 +2064,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 232
+  - uid: 233
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1926,64 +2072,63 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 233
+  - uid: 235
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,-5.5
+      pos: -4.5,-5.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 234
+  - uid: 263
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-5.5
+      pos: -4.5,-7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 235
+      color: '#990000FF'
+  - uid: 268
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 263
+  - uid: 320
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-7.5
+      pos: -2.5,-2.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 267
+  - uid: 324
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,-8.5
+      pos: 1.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 360
+      color: '#0055CCFF'
+  - uid: 394
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-8.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 121
+  - uid: 180
     components:
     - type: Transform
-      pos: 3.5,-5.5
+      pos: 3.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 130
+  - uid: 187
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1991,63 +2136,52 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 135
+  - uid: 215
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-5.5
+      pos: -3.5,-5.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 180
+  - uid: 216
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-0.5
+      pos: -3.5,-7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 204
+      color: '#990000FF'
+  - uid: 237
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-2.5
+      pos: 1.5,-5.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 219
+      color: '#0055CCFF'
+  - uid: 288
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
+      pos: -0.5,-7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
 - proto: GasPort
   entities:
-  - uid: 142
+  - uid: 175
     components:
     - type: Transform
       pos: 4.5,-0.5
       parent: 2
-  - uid: 143
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-1.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPressurePumpOnMax
-  entities:
-  - uid: 361
+  - uid: 225
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -1.5,-8.5
+      pos: 5.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
 - proto: GasVentPump
   entities:
   - uid: 40
@@ -2058,7 +2192,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 403
+      - 78
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 105
@@ -2069,39 +2203,50 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 403
+      - 78
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 136
+  - uid: 172
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-6.5
+      pos: 1.5,-8.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 403
+      - 78
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 216
+  - uid: 202
     components:
     - type: Transform
-      pos: 1.5,3.5
+      pos: -0.5,3.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 307
+      - 78
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 217
+  - uid: 267
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-2.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 78
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 315
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 307
+      - 78
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -2114,7 +2259,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 403
+      - 78
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 102
@@ -2125,136 +2270,193 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 403
+      - 78
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 137
+  - uid: 232
     components:
     - type: Transform
-      pos: -2.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 403
+      - 78
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 211
+  - uid: 240
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 307
+      - 78
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 285
+  - uid: 269
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 78
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 358
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-8.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 307
+      - 78
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 145
+  - uid: 241
     components:
     - type: Transform
       pos: 5.5,-3.5
       parent: 2
 - proto: Grille
   entities:
-  - uid: 59
+  - uid: 107
     components:
     - type: Transform
-      pos: -0.5,6.5
+      pos: 7.5,-6.5
       parent: 2
-  - uid: 60
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 2
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 2
+  - uid: 245
     components:
     - type: Transform
       pos: -0.5,7.5
       parent: 2
-  - uid: 61
+  - uid: 264
     components:
     - type: Transform
-      pos: 1.5,6.5
+      pos: 0.5,9.5
       parent: 2
-  - uid: 62
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 2
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 301
     components:
     - type: Transform
       pos: 1.5,7.5
       parent: 2
-  - uid: 63
+  - uid: 304
     components:
     - type: Transform
-      pos: 0.5,8.5
+      pos: -0.5,8.5
       parent: 2
-  - uid: 107
+  - uid: 329
     components:
     - type: Transform
-      pos: 7.5,-6.5
+      pos: 2.5,4.5
       parent: 2
-  - uid: 125
+  - uid: 347
     components:
     - type: Transform
-      pos: -6.5,-6.5
+      pos: -5.5,-2.5
+      parent: 2
+  - uid: 350
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
       parent: 2
 - proto: GrilleDiagonal
   entities:
-  - uid: 129
+  - uid: 61
     components:
     - type: Transform
-      pos: -0.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,9.5
       parent: 2
-  - uid: 299
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 2
+- proto: Gyroscope
+  entities:
+  - uid: 272
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,8.5
+      pos: 5.5,-2.5
       parent: 2
-- proto: GunSafeShuttleCaptain
+- proto: Lamp
   entities:
-  - uid: 369
+  - uid: 283
     components:
     - type: Transform
-      pos: 1.5,2.5
+      rot: 3.141592653589793 rad
+      pos: 1.6404343,5.139264
       parent: 2
-- proto: Gyroscope
+- proto: LockerQuarterMasterFilled
   entities:
-  - uid: 153
+  - uid: 47
     components:
     - type: Transform
-      pos: 5.5,-2.5
+      pos: 1.5,2.5
       parent: 2
-- proto: LockerCaptainFilled
+- proto: LockerSalvageSpecialistFilled
   entities:
-  - uid: 343
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+  - uid: 238
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 2
-- proto: LockerSalvageSpecialistFilled
+- proto: LockerWallMaterialsFuelUraniumFilled
   entities:
-  - uid: 305
+  - uid: 312
     components:
     - type: Transform
-      pos: 1.5,-1.5
+      pos: 3.5,0.5
       parent: 2
-- proto: LockerWallMedical
+- proto: LuxuryPen
   entities:
-  - uid: 302
+  - uid: 18
     components:
     - type: Transform
-      pos: 1.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: 1.6934373,4.4512644
       parent: 2
 - proto: NitrogenCanister
   entities:
-  - uid: 182
+  - uid: 222
     components:
     - type: Transform
       anchored: True
@@ -2262,9 +2464,16 @@ entities:
       parent: 2
     - type: Physics
       bodyType: Static
+- proto: OreProcessor
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 2
 - proto: OxygenCanister
   entities:
-  - uid: 181
+  - uid: 227
     components:
     - type: Transform
       anchored: True
@@ -2272,65 +2481,91 @@ entities:
       parent: 2
     - type: Physics
       bodyType: Static
+- proto: PaperBin10
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 330
+  - uid: 152
     components:
     - type: Transform
       pos: 7.5,-8.5
       parent: 2
-  - uid: 342
+  - uid: 276
     components:
     - type: Transform
       pos: -6.5,-8.5
       parent: 2
 - proto: PlasticFlapsClear
   entities:
-  - uid: 286
+  - uid: 66
     components:
     - type: Transform
       pos: -4.5,-8.5
       parent: 2
-  - uid: 287
+  - uid: 343
     components:
     - type: Transform
       pos: 5.5,-8.5
       parent: 2
+- proto: PortableGeneratorSuperPacmanShuttle
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+    - type: FuelGenerator
+      targetPower: 22000
+      on: False
+    - type: Physics
+      bodyType: Static
 - proto: PosterLegitCarpMount
   entities:
-  - uid: 111
+  - uid: 425
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,-0.5
       parent: 2
 - proto: PosterLegitSafetyMothPiping
   entities:
-  - uid: 225
+  - uid: 435
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: -1.5707963267948966 rad
       pos: 4.5,0.5
       parent: 2
-- proto: Poweredlight
+- proto: PosterLegitSMBoH
   entities:
-  - uid: 146
+  - uid: 424
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-4.5
+      pos: -0.5,-3.5
       parent: 2
-  - uid: 284
+- proto: PottedPlantBioluminscent
+  entities:
+  - uid: 410
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,3.5
+      pos: -1.5,-0.5
       parent: 2
-  - uid: 312
+- proto: Poweredlight
+  entities:
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 2
+  - uid: 300
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
+      pos: 0.5,6.5
       parent: 2
   - uid: 316
     components:
@@ -2354,20 +2589,32 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-8.5
       parent: 2
-- proto: PoweredlightExterior
-  entities:
-  - uid: 264
+  - uid: 411
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 2
+  - uid: 412
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
+      parent: 2
+  - uid: 415
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,4.5
+      pos: 4.5,-3.5
       parent: 2
-  - uid: 265
+  - uid: 416
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -2.5,4.5
+      pos: -3.5,-3.5
       parent: 2
+- proto: PoweredlightExterior
+  entities:
   - uid: 322
     components:
     - type: Transform
@@ -2380,7 +2627,7 @@ entities:
       parent: 2
 - proto: PoweredlightGreen
   entities:
-  - uid: 325
+  - uid: 355
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2388,64 +2635,65 @@ entities:
       parent: 2
 - proto: PoweredlightRed
   entities:
-  - uid: 324
+  - uid: 59
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,1.5
       parent: 2
-- proto: PoweredSmallLight
+- proto: RailingCorner
   entities:
-  - uid: 315
+  - uid: 139
     components:
     - type: Transform
-      pos: -2.5,-0.5
+      pos: 2.5,-10.5
       parent: 2
-  - uid: 332
+  - uid: 143
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-10.5
       parent: 2
-- proto: RandomPosterLegit
+- proto: RandomPosterAny
   entities:
-  - uid: 310
+  - uid: 418
     components:
     - type: Transform
-      pos: -1.5,3.5
+      pos: 1.5,1.5
       parent: 2
-  - uid: 331
+  - uid: 419
     components:
     - type: Transform
-      pos: 2.5,4.5
+      pos: 2.5,5.5
       parent: 2
-  - uid: 404
+  - uid: 420
     components:
     - type: Transform
-      pos: -1.5,-2.5
+      pos: -3.5,0.5
       parent: 2
-- proto: Saw
-  entities:
-  - uid: 1
+  - uid: 421
     components:
     - type: Transform
-      pos: 1.5272883,-4.5321774
+      pos: 1.5,-3.5
       parent: 2
-- proto: ShuttleWindow
+- proto: SalvageTechfabNF
   entities:
-  - uid: 64
+  - uid: 160
     components:
     - type: Transform
-      pos: 0.5,8.5
+      pos: 0.5,-2.5
       parent: 2
-  - uid: 67
+- proto: ShuttleWindow
+  entities:
+  - uid: 50
     components:
     - type: Transform
-      pos: -0.5,7.5
+      pos: -5.5,-1.5
       parent: 2
-  - uid: 68
+  - uid: 57
     components:
     - type: Transform
-      pos: -0.5,6.5
+      pos: 1.5,8.5
       parent: 2
   - uid: 101
     components:
@@ -2457,42 +2705,80 @@ entities:
     - type: Transform
       pos: 7.5,-6.5
       parent: 2
-  - uid: 131
+  - uid: 141
     components:
     - type: Transform
-      pos: 1.5,6.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,7.5
       parent: 2
-  - uid: 132
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 258
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,7.5
       parent: 2
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 2
+  - uid: 302
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 306
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 2
+  - uid: 331
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 2
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
 - proto: ShuttleWindowDiagonal
   entities:
-  - uid: 66
+  - uid: 149
     components:
     - type: Transform
-      pos: -0.5,8.5
+      pos: -0.5,9.5
       parent: 2
-  - uid: 193
+  - uid: 169
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,8.5
+      pos: 1.5,9.5
       parent: 2
 - proto: SignalButtonDirectional
   entities:
-  - uid: 120
+  - uid: 67
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        359:
+        13:
         - Pressed: Toggle
-        277:
+        10:
         - Pressed: Toggle
   - uid: 298
     components:
@@ -2508,17 +2794,17 @@ entities:
         - Pressed: Toggle
         363:
         - Pressed: Toggle
-  - uid: 348
+  - uid: 308
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-6.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        317:
+        9:
         - Pressed: Toggle
-        358:
+        11:
         - Pressed: Toggle
 - proto: SignAtmos
   entities:
@@ -2530,7 +2816,7 @@ entities:
       parent: 2
 - proto: SignBridge
   entities:
-  - uid: 281
+  - uid: 135
     components:
     - type: Transform
       pos: -0.5,1.5
@@ -2547,22 +2833,6 @@ entities:
     - type: Transform
       pos: 4.5,-9.5
       parent: 2
-- proto: SignDirectionalBridge
-  entities:
-  - uid: 184
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.6294031,-3.3566456
-      parent: 2
-- proto: SignDirectionalEng
-  entities:
-  - uid: 272
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.6294031,-3.5753956
-      parent: 2
 - proto: SignDoors
   entities:
   - uid: 372
@@ -2570,27 +2840,11 @@ entities:
     - type: Transform
       pos: -1.5,-9.5
       parent: 2
-- proto: SignElectricalMed
-  entities:
-  - uid: 321
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 2
-- proto: SignEngine
-  entities:
-  - uid: 296
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,0.5
-      parent: 2
 - proto: SignEngineering
   entities:
-  - uid: 295
+  - uid: 299
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: 2.5,0.5
       parent: 2
 - proto: SignShipDock
@@ -2607,86 +2861,100 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-4.5
       parent: 2
-- proto: SignSpace
+- proto: SMESBasic
   entities:
-  - uid: 327
+  - uid: 173
     components:
     - type: Transform
-      pos: -4.5,-4.5
+      pos: 3.5,-3.5
       parent: 2
-  - uid: 328
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 427
     components:
     - type: Transform
-      pos: 5.5,-4.5
+      pos: -1.5,-1.5
       parent: 2
-- proto: SMESBasic
+- proto: SubstationWallBasic
   entities:
-  - uid: 152
+  - uid: 314
     components:
     - type: Transform
-      pos: 3.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-2.5
       parent: 2
-- proto: SpawnPointLatejoin
+- proto: SuitStorageQuartermaster
   entities:
-  - uid: 401
+  - uid: 159
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: -0.5,2.5
       parent: 2
-- proto: SteelBench
+- proto: SuitStorageWallmountSalv
   entities:
-  - uid: 370
+  - uid: 360
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-1.5
+      pos: 2.5,-4.5
       parent: 2
-- proto: SubstationWallBasic
-  entities:
-  - uid: 339
+  - uid: 423
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      pos: -1.5,-4.5
       parent: 2
-- proto: SuitStorageCaptain
+- proto: TableCounterMetal
   entities:
-  - uid: 306
+  - uid: 55
     components:
     - type: Transform
-      pos: 1.5,0.5
+      pos: -1.5,-2.5
       parent: 2
-- proto: SuitStorageSalv
+- proto: TableGlass
   entities:
-  - uid: 345
+  - uid: 97
     components:
     - type: Transform
-      pos: 1.5,-2.5
+      pos: -0.5,3.5
+      parent: 2
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -0.5,4.5
       parent: 2
-- proto: Table
+- proto: TableReinforced
   entities:
-  - uid: 139
+  - uid: 142
     components:
     - type: Transform
-      pos: 1.5,4.5
+      pos: 0.5,-4.5
       parent: 2
-  - uid: 141
+- proto: TableReinforcedGlass
+  entities:
+  - uid: 204
     components:
     - type: Transform
-      pos: 1.5,3.5
+      pos: -4.5,-1.5
       parent: 2
-  - uid: 319
+  - uid: 309
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-2.5
+      pos: -4.5,-2.5
       parent: 2
-- proto: Thruster
+- proto: TableWood
   entities:
-  - uid: 41
+  - uid: 234
     components:
     - type: Transform
-      pos: -2.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
       parent: 2
+- proto: Thruster
+  entities:
   - uid: 56
     components:
     - type: Transform
@@ -2723,110 +2991,129 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-10.5
       parent: 2
-  - uid: 96
+  - uid: 244
     components:
     - type: Transform
-      pos: 3.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
       parent: 2
-  - uid: 99
+  - uid: 357
     components:
     - type: Transform
-      pos: -3.5,4.5
+      pos: 3.5,6.5
       parent: 2
-  - uid: 126
+  - uid: 368
     components:
     - type: Transform
-      pos: 4.5,4.5
+      pos: -2.5,6.5
       parent: 2
-  - uid: 127
+  - uid: 395
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,2.5
       parent: 2
-  - uid: 128
+- proto: ToyFigurineQuartermaster
+  entities:
+  - uid: 422
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,2.5
+      pos: 1.3748093,4.6623425
       parent: 2
 - proto: TwoWayLever
   entities:
-  - uid: 123
+  - uid: 63
     components:
     - type: Transform
       pos: -2.5,-8.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        124:
+        64:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        357:
+        275:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        356:
+        157:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        355:
+        150:
         - Left: Reverse
+        - Middle: Off
+        - Right: Forward
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        89:
         - Right: Forward
+        - Left: Reverse
         - Middle: Off
-  - uid: 167
+        342:
+        - Right: Forward
+        - Left: Reverse
+        - Middle: Off
+  - uid: 273
     components:
     - type: Transform
       pos: 3.5,-8.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        354:
+        156:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        353:
+        155:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        349:
+        274:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        350:
+        65:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
+- proto: VendingMachineSalvage
+  entities:
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 2
 - proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 352
+  - uid: 203
     components:
     - type: Transform
-      pos: 4.5,-3.5
+      pos: -0.5,-2.5
       parent: 2
 - proto: WallShuttle
   entities:
-  - uid: 12
+  - uid: 1
     components:
     - type: Transform
-      pos: 2.5,-9.5
+      pos: 1.5,6.5
       parent: 2
-  - uid: 13
+  - uid: 12
     components:
     - type: Transform
-      pos: -1.5,-1.5
+      pos: 2.5,-9.5
       parent: 2
   - uid: 14
     components:
     - type: Transform
       pos: -5.5,-4.5
       parent: 2
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -5.5,-1.5
-      parent: 2
   - uid: 16
     components:
     - type: Transform
@@ -2837,16 +3124,6 @@ entities:
     - type: Transform
       pos: 5.5,-0.5
       parent: 2
-  - uid: 18
-    components:
-    - type: Transform
-      pos: -5.5,-2.5
-      parent: 2
-  - uid: 19
-    components:
-    - type: Transform
-      pos: 2.5,2.5
-      parent: 2
   - uid: 20
     components:
     - type: Transform
@@ -2862,26 +3139,11 @@ entities:
     - type: Transform
       pos: 4.5,0.5
       parent: 2
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 2.5,3.5
-      parent: 2
-  - uid: 26
-    components:
-    - type: Transform
-      pos: 2.5,4.5
-      parent: 2
   - uid: 27
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 2
-  - uid: 28
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 2
   - uid: 29
     components:
     - type: Transform
@@ -2902,26 +3164,11 @@ entities:
     - type: Transform
       pos: 6.5,-2.5
       parent: 2
-  - uid: 34
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 2
-  - uid: 35
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 2
   - uid: 36
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 2
-  - uid: 37
-    components:
-    - type: Transform
-      pos: -1.5,4.5
-      parent: 2
   - uid: 38
     components:
     - type: Transform
@@ -2932,10 +3179,10 @@ entities:
     - type: Transform
       pos: 6.5,-4.5
       parent: 2
-  - uid: 42
+  - uid: 45
     components:
     - type: Transform
-      pos: -3.5,0.5
+      pos: -3.5,-4.5
       parent: 2
   - uid: 53
     components:
@@ -2947,166 +3194,171 @@ entities:
     - type: Transform
       pos: 6.5,-9.5
       parent: 2
-  - uid: 55
+  - uid: 62
     components:
     - type: Transform
-      pos: 3.5,3.5
+      pos: -1.5,-3.5
       parent: 2
   - uid: 69
     components:
     - type: Transform
-      pos: -1.5,-2.5
+      pos: 2.5,5.5
       parent: 2
-  - uid: 70
+  - uid: 74
     components:
     - type: Transform
-      pos: -1.5,-3.5
+      pos: -4.5,-4.5
       parent: 2
-  - uid: 71
+  - uid: 80
     components:
     - type: Transform
-      pos: -1.5,-4.5
+      pos: -2.5,-9.5
       parent: 2
-  - uid: 72
+  - uid: 81
     components:
     - type: Transform
-      pos: -2.5,-4.5
+      pos: 4.5,-9.5
       parent: 2
-  - uid: 73
+  - uid: 82
     components:
     - type: Transform
-      pos: -3.5,-4.5
+      pos: -3.5,-9.5
       parent: 2
-  - uid: 74
+  - uid: 84
     components:
     - type: Transform
-      pos: -4.5,-4.5
+      pos: 3.5,-9.5
       parent: 2
-  - uid: 76
+  - uid: 86
     components:
     - type: Transform
-      pos: -0.5,5.5
+      pos: -5.5,-9.5
       parent: 2
-  - uid: 77
+  - uid: 88
     components:
     - type: Transform
-      pos: 1.5,5.5
+      pos: -4.5,-9.5
       parent: 2
-  - uid: 80
+  - uid: 109
     components:
     - type: Transform
-      pos: -2.5,-9.5
+      pos: 5.5,-4.5
       parent: 2
-  - uid: 81
+  - uid: 116
     components:
     - type: Transform
-      pos: 4.5,-9.5
+      pos: -1.5,-9.5
       parent: 2
-  - uid: 82
+  - uid: 118
     components:
     - type: Transform
-      pos: -3.5,-9.5
+      pos: -6.5,-4.5
       parent: 2
-  - uid: 84
+  - uid: 119
     components:
     - type: Transform
-      pos: 3.5,-9.5
+      pos: 7.5,-4.5
       parent: 2
-  - uid: 86
+  - uid: 130
     components:
     - type: Transform
-      pos: -5.5,-9.5
+      pos: -1.5,-4.5
       parent: 2
-  - uid: 88
+  - uid: 189
     components:
     - type: Transform
-      pos: -4.5,-9.5
+      pos: -4.5,-6.5
       parent: 2
-  - uid: 93
+  - uid: 213
     components:
     - type: Transform
-      pos: -2.5,3.5
+      pos: 1.5,-3.5
       parent: 2
-  - uid: 109
+  - uid: 214
     components:
     - type: Transform
-      pos: 5.5,-4.5
+      pos: -0.5,-3.5
       parent: 2
-  - uid: 110
+  - uid: 289
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      pos: 0.5,-3.5
       parent: 2
-  - uid: 116
+  - uid: 290
     components:
     - type: Transform
-      pos: -1.5,-9.5
+      pos: 5.5,-6.5
       parent: 2
-  - uid: 118
+  - uid: 330
     components:
     - type: Transform
-      pos: -6.5,-4.5
+      pos: -1.5,2.5
       parent: 2
-  - uid: 119
+  - uid: 348
     components:
     - type: Transform
-      pos: 7.5,-4.5
+      pos: -3.5,0.5
       parent: 2
-  - uid: 147
+  - uid: 349
     components:
     - type: Transform
-      pos: 3.5,-4.5
+      pos: -1.5,5.5
       parent: 2
-  - uid: 148
+  - uid: 352
     components:
     - type: Transform
-      pos: 2.5,-4.5
+      pos: 2.5,2.5
       parent: 2
-  - uid: 149
+  - uid: 354
     components:
     - type: Transform
-      pos: 2.5,-3.5
+      pos: -0.5,6.5
       parent: 2
-  - uid: 150
+  - uid: 369
     components:
     - type: Transform
-      pos: 2.5,-2.5
+      pos: 2.5,-1.5
       parent: 2
-  - uid: 151
+  - uid: 370
     components:
     - type: Transform
-      pos: 2.5,-1.5
+      pos: 2.5,-4.5
       parent: 2
-  - uid: 183
+  - uid: 384
     components:
     - type: Transform
-      pos: 1.5,-3.5
+      pos: 3.5,-4.5
       parent: 2
-  - uid: 189
+  - uid: 385
     components:
     - type: Transform
-      pos: -4.5,-6.5
+      pos: 4.5,-4.5
       parent: 2
-  - uid: 273
+  - uid: 386
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: 2.5,-3.5
       parent: 2
-  - uid: 288
+  - uid: 387
     components:
     - type: Transform
-      pos: -0.5,1.5
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 290
+  - uid: 391
     components:
     - type: Transform
-      pos: 5.5,-6.5
+      pos: -0.5,1.5
       parent: 2
-  - uid: 314
+  - uid: 392
     components:
     - type: Transform
       pos: 1.5,1.5
       parent: 2
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 2
 - proto: WallShuttleDiagonal
   entities:
   - uid: 3
@@ -3137,28 +3389,11 @@ entities:
     - type: Transform
       pos: -5.5,-0.5
       parent: 2
-  - uid: 49
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-10.5
-      parent: 2
   - uid: 51
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,3.5
-      parent: 2
-  - uid: 57
-    components:
-    - type: Transform
-      pos: -1.5,5.5
-      parent: 2
-  - uid: 58
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,5.5
+      pos: 2.5,6.5
       parent: 2
   - uid: 79
     components:
@@ -3166,18 +3401,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-10.5
       parent: 2
-  - uid: 83
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-10.5
-      parent: 2
-  - uid: 89
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,3.5
-      parent: 2
   - uid: 92
     components:
     - type: Transform
@@ -3196,23 +3419,39 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 2
-  - uid: 115
+  - uid: 284
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 303
+    components:
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 2
+  - uid: 332
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,5.5
+      parent: 2
+  - uid: 353
     components:
     - type: Transform
       pos: -6.5,-3.5
       parent: 2
-- proto: WallWeaponCapacitorRechargerOmnidirectional
-  entities:
-  - uid: 280
+  - uid: 393
     components:
     - type: Transform
-      pos: -1.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-10.5
       parent: 2
-  - uid: 313
+  - uid: 403
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,5.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-10.5
       parent: 2
 - proto: WarpPointShip
   entities:
@@ -3223,16 +3462,16 @@ entities:
       parent: 2
 - proto: WaterCooler
   entities:
-  - uid: 308
+  - uid: 168
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: -3.5,-0.5
       parent: 2
-- proto: Wrench
+- proto: WeaponCapacitorRecharger
   entities:
-  - uid: 304
+  - uid: 167
     components:
     - type: Transform
-      pos: 4.4386373,-1.5209942
+      pos: -1.5,-2.5
       parent: 2
 ...
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/bodkin.yml
similarity index 60%
rename from Resources/Prototypes/_NF/Shipyard/Expedition/bodkin.yml
rename to Resources/Prototypes/_NF/Shipyard/bodkin.yml
index 2aae6f2dc64..a7c61e42074 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/bodkin.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bodkin.yml
@@ -11,16 +11,16 @@
 - type: vessel
   id: Bodkin
   name: SBB Bodkin
-  description: A compact civilian-grade scout ship designed for short-term planetary surveying and exploration. The Broadhead's smaller sibling.
-  price: 54000 #Shuttle values at approx 28000. 54000 puts it in between the Pathfinder and Brigand, which is where it should sit.
-  category: Small
-  group: Expedition
-  shuttlePath: /Maps/_NF/Shuttles/Expedition/bodkin.yml
+  description: The smaller sibling to the Broadhead, the SBB Bodkin is designed for rockhopping and salvage recovery.
+  price: 34000 #Grid appraises at 29500. Slapped on a 15% markup and rounded it up as it's a salvage ship.
+  category: Medium
+  group: Civilian
+  shuttlePath: /Maps/_NF/Shuttles/bodkin.yml
 
 - type: gameMap
   id: Bodkin
   mapName: 'SBB Bodkin'
-  mapPath: /Maps/_NF/Shuttles/Expedition/bodkin.yml
+  mapPath: /Maps/_NF/Shuttles/bodkin.yml
   minPlayers: 0
   stations:
     Bodkin:

From f3aa9b3f697053fbceb355b4ef1eb1a53c36c180 Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:23:09 +0100
Subject: [PATCH 5/8] Add emergency internals locker

---
 Resources/Maps/_NF/Shuttles/bodkin.yml | 1079 ++++++++++++------------
 1 file changed, 543 insertions(+), 536 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/bodkin.yml b/Resources/Maps/_NF/Shuttles/bodkin.yml
index bd1c37be8e4..d9cde1f122f 100644
--- a/Resources/Maps/_NF/Shuttles/bodkin.yml
+++ b/Resources/Maps/_NF/Shuttles/bodkin.yml
@@ -22,7 +22,7 @@ entities:
   - uid: 2
     components:
     - type: MetaData
-      name: Bodkin
+      name: grid
     - type: Transform
       pos: -0.515625,-0.46875
       parent: invalid
@@ -68,473 +68,473 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            474: -4,-8
-            475: 4,-8
+            82: -4,-8
+            83: 4,-8
         - node:
             color: '#D69949FF'
             id: Bot
           decals:
-            692: 1,-3
-            693: 0,-3
-            694: -1,-3
+            131: 1,-3
+            132: 0,-3
+            133: -1,-3
         - node:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            740: 5,-3
-            741: 5,-4
-            742: 4,-4
+            141: 5,-3
+            142: 5,-4
+            143: 4,-4
         - node:
             color: '#0096FFFF'
             id: BotGreyscale
           decals:
-            739: 4,-1
+            140: 4,-1
         - node:
             color: '#FF0000FF'
             id: BotGreyscale
           decals:
-            738: 5,-2
+            139: 5,-2
         - node:
             color: '#BC863FFF'
             id: BotLeft
           decals:
-            519: -1,2
+            85: -1,2
         - node:
             color: '#D69949FF'
             id: BotLeft
           decals:
-            699: -1,0
+            136: -1,0
         - node:
             color: '#BC863FFF'
             id: BotRight
           decals:
-            407: 1,2
+            75: 1,2
         - node:
             color: '#D69949FF'
             id: BotRight
           decals:
-            689: 1,0
+            130: 1,0
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkBox
           decals:
-            325: -5,-6
-            326: -5,-8
+            55: -5,-6
+            56: -5,-8
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: BrickTileDarkBox
           decals:
-            330: 5,-6
-            331: 5,-8
+            59: 5,-6
+            60: 5,-8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            648: -3,-7
+            105: -3,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
-            647: 3,-7
+            104: 3,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkEndE
           decals:
-            627: 4,-6
-            637: -2,-6
-            641: 4,-7
+            89: 4,-6
+            96: -2,-6
+            100: 4,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkEndS
           decals:
-            645: -3,-8
-            646: 3,-8
+            102: -3,-8
+            103: 3,-8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkEndW
           decals:
-            629: 2,-6
-            638: -4,-6
-            643: -4,-7
+            90: 2,-6
+            97: -4,-6
+            101: -4,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
-            650: 3,-7
+            107: 3,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
-            649: -3,-7
+            106: -3,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
           decals:
-            631: 3,-6
-            639: -3,-6
+            91: 3,-6
+            98: -3,-6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            633: 3,-6
-            640: -3,-6
+            92: 3,-6
+            99: -3,-6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelBox
           decals:
-            461: -3,-5
-            472: 2,-1
-            473: 0,1
+            77: -3,-5
+            80: 2,-1
+            81: 0,1
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSe
           decals:
-            687: 0,-2
+            129: 0,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndN
           decals:
-            685: 0,-1
+            127: 0,-1
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndW
           decals:
-            701: -2,-2
+            138: -2,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
-            686: 0,-2
+            128: 0,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
           decals:
-            658: -1,-2
+            109: -1,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
           decals:
-            653: -1,-2
+            108: -1,-2
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteCornerNe
           decals:
-            670: 1,0
+            115: 1,0
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteCornerNw
           decals:
-            668: -4,-1
-            680: -5,-2
-            697: -1,0
+            114: -4,-1
+            122: -5,-2
+            134: -1,0
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteCornerSe
           decals:
-            671: 1,-3
-            681: -3,-4
+            116: 1,-3
+            123: -3,-4
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteCornerSw
           decals:
-            677: -5,-4
+            120: -5,-4
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteInnerNw
           decals:
-            683: -4,-2
-            684: -1,-1
+            125: -4,-2
+            126: -1,-1
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteInnerSe
           decals:
-            682: -3,-3
+            124: -3,-3
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteLineE
           decals:
-            666: 1,-1
-            667: 1,-2
+            112: 1,-1
+            113: 1,-2
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteLineN
           decals:
-            663: -3,-1
-            664: -2,-1
-            698: 0,0
+            110: -3,-1
+            111: -2,-1
+            135: 0,0
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteLineS
           decals:
-            672: 0,-3
-            673: -1,-3
-            675: -4,-4
-            700: -2,-3
+            117: 0,-3
+            118: -1,-3
+            119: -4,-4
+            137: -2,-3
         - node:
             color: '#9A54BFFF'
             id: BrickTileWhiteLineW
           decals:
-            678: -5,-3
+            121: -5,-3
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            789: 1,-6
+            186: 1,-6
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            745: -1,-9
-            746: 3,-1
-            747: 0,-3
-            748: -1,4
+            146: -1,-9
+            147: 3,-1
+            148: 0,-3
+            149: -1,4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            763: 0,-9
-            764: -4,-8
-            772: -3,-2
-            773: 1,-2
-            774: 4,-3
-            775: 3,-3
-            776: 4,-1
-            777: 4,-2
-            780: 0,4
+            162: 0,-9
+            163: -4,-8
+            171: -3,-2
+            172: 1,-2
+            173: 4,-3
+            174: 3,-3
+            175: 4,-1
+            176: 4,-2
+            179: 0,4
         - node:
             cleanable: True
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            790: 0,-6
-            791: 1,-6
+            187: 0,-6
+            188: 1,-6
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            115: -6,-8
-            116: -6,-6
-            117: -7,-6
-            118: -7,-8
-            121: -1,-10
-            122: 0,-10
-            123: 1,-10
-            124: 6,-8
-            125: 6,-6
-            126: 7,-6
-            127: 7,-8
-            749: -6,-6
-            750: -6,-7
-            751: -6,-8
-            756: -3,-8
-            757: -3,-7
-            758: 3,-7
-            759: 4,-7
-            760: 4,-6
-            778: 1,0
-            779: -1,2
-            784: 0,-2
-            785: 0,-1
+            8: -6,-8
+            9: -6,-6
+            10: -7,-6
+            11: -7,-8
+            12: -1,-10
+            13: 0,-10
+            14: 1,-10
+            15: 6,-8
+            16: 6,-6
+            17: 7,-6
+            18: 7,-8
+            150: -6,-6
+            151: -6,-7
+            152: -6,-8
+            155: -3,-8
+            156: -3,-7
+            157: 3,-7
+            158: 4,-7
+            159: 4,-6
+            177: 1,0
+            178: -1,2
+            183: 0,-2
+            184: 0,-1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            752: -1,-6
-            753: -2,-9
-            765: 2,-9
-            766: -3,-4
-            767: -1,-1
-            768: 0,3
-            769: 1,5
-            770: 0,6
-            771: -4,-1
+            153: -1,-6
+            154: -2,-9
+            164: 2,-9
+            165: -3,-4
+            166: -1,-1
+            167: 0,3
+            168: 1,5
+            169: 0,6
+            170: -4,-1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            761: 2,-6
-            762: -4,-6
-            781: -2,-3
-            782: 0,5
-            783: -1,-5
+            160: 2,-6
+            161: -4,-6
+            180: -2,-3
+            181: 0,5
+            182: -1,-5
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
             id: LoadingAreaGreyscale
           decals:
-            788: 0,-6
+            185: 0,-6
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndN
           decals:
-            264: 0,8
-            285: 1,5
-            296: -1,5
+            29: 0,8
+            45: 1,5
+            52: -1,5
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndS
           decals:
-            263: 0,2
-            406: 1,3
+            28: 0,2
+            74: 1,3
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            265: 0,7
-            266: 0,6
-            267: 0,5
-            268: 0,4
-            269: 0,3
-            288: 1,4
-            294: -1,4
-            295: -1,3
+            30: 0,7
+            31: 0,6
+            32: 0,5
+            33: 0,4
+            34: 0,3
+            46: 1,4
+            50: -1,4
+            51: -1,3
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
           decals:
-            518: -1,3
+            84: -1,3
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineW
           decals:
-            270: 0,3
-            271: 0,4
-            272: 0,5
-            273: 0,6
-            274: 0,7
-            289: 1,4
-            292: -1,3
-            293: -1,4
+            35: 0,3
+            36: 0,4
+            37: 0,5
+            38: 0,6
+            39: 0,7
+            47: 1,4
+            48: -1,3
+            49: -1,4
         - node:
             color: '#334E6DFF'
             id: MiniTileOverlay
           decals:
-            256: 0,2
-            257: 0,3
-            258: 0,4
-            259: 0,5
-            260: 0,6
-            261: 0,7
-            262: 0,8
+            21: 0,2
+            22: 0,3
+            23: 0,4
+            24: 0,5
+            25: 0,6
+            26: 0,7
+            27: 0,8
         - node:
             color: '#774194FF'
             id: MiniTileOverlay
           decals:
-            277: 1,5
-            278: 1,4
-            282: -1,3
-            283: -1,4
-            284: -1,5
-            405: 1,3
+            40: 1,5
+            41: 1,4
+            42: -1,3
+            43: -1,4
+            44: -1,5
+            73: 1,3
         - node:
             color: '#774194FF'
             id: PavementOverlay
           decals:
-            623: 2,-6
-            624: 3,-6
-            625: 4,-6
-            634: -4,-6
-            635: -3,-6
-            636: -2,-6
+            86: 2,-6
+            87: 3,-6
+            88: 4,-6
+            93: -4,-6
+            94: -3,-6
+            95: -2,-6
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            167: 6,-7
+            20: 6,-7
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            166: -6,-7
+            19: -6,-7
         - node:
             color: '#FFFFFFFF'
             id: WarnBox
           decals:
-            359: -7,-9
-            360: 7,-9
+            61: -7,-9
+            62: 7,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            743: 4,-3
+            144: 4,-3
         - node:
             color: '#FFFFFFFF'
             id: WarnEndE
           decals:
-            30: 1,-10
-            361: 6,-9
-            365: -4,-9
+            1: 1,-10
+            63: 6,-9
+            67: -4,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnEndW
           decals:
-            29: -1,-10
-            362: 4,-9
-            366: -6,-9
+            0: -1,-10
+            64: 4,-9
+            68: -6,-9
         - node:
             color: '#4B709CFF'
             id: WarnFullGreyscale
           decals:
-            471: 0,1
+            79: 0,1
         - node:
             color: '#CA7EF2FF'
             id: WarnFullGreyscale
           decals:
-            322: -5,-6
-            323: -5,-8
-            460: -3,-5
+            53: -5,-6
+            54: -5,-8
+            76: -3,-5
         - node:
             angle: 1.5707963267948966 rad
             color: '#CA7EF2FF'
             id: WarnFullGreyscale
           decals:
-            328: 5,-8
-            329: 5,-6
+            57: 5,-8
+            58: 5,-6
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFA647FF'
             id: WarnFullGreyscale
           decals:
-            470: 2,-1
+            78: 2,-1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            33: 6,-8
-            34: 6,-6
-            370: 3,-9
+            4: 6,-8
+            5: 6,-6
+            72: 3,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            32: 0,-10
-            364: 5,-9
-            368: -5,-9
-            744: 3,-3
+            3: 0,-10
+            66: 5,-9
+            70: -5,-9
+            145: 3,-3
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            103: -6,-6
-            104: -6,-8
-            369: -3,-9
+            6: -6,-6
+            7: -6,-8
+            71: -3,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            31: 0,-10
-            363: 5,-9
-            367: -5,-9
+            2: 0,-10
+            65: 5,-9
+            69: -5,-9
     - type: GridAtmosphere
       version: 2
       data:
@@ -647,68 +647,68 @@ entities:
     - type: RadiationGridResistance
 - proto: AirAlarm
   entities:
-  - uid: 78
+  - uid: 83
     components:
     - type: Transform
       pos: -1.5,0.5
       parent: 2
     - type: DeviceList
       devices:
-      - 437
-      - 232
-      - 202
-      - 390
-      - 240
-      - 267
-      - 359
-      - 315
-      - 269
-      - 296
+      - 438
+      - 233
+      - 203
+      - 391
+      - 241
+      - 268
+      - 360
+      - 317
+      - 270
+      - 299
       - 105
       - 33
-      - 358
-      - 172
+      - 359
+      - 173
       - 102
       - 40
 - proto: AirlockCargo
   entities:
-  - uid: 311
+  - uid: 312
     components:
     - type: Transform
       pos: -2.5,-4.5
       parent: 2
 - proto: AirlockCommand
   entities:
-  - uid: 281
+  - uid: 282
     components:
     - type: Transform
       pos: 0.5,1.5
       parent: 2
 - proto: AirlockEngineering
   entities:
-  - uid: 310
+  - uid: 311
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 2
 - proto: AirlockExternalGlass
   entities:
-  - uid: 46
+  - uid: 47
     components:
     - type: Transform
       pos: -4.5,-7.5
       parent: 2
-  - uid: 151
+  - uid: 152
     components:
     - type: Transform
       pos: 5.5,-7.5
       parent: 2
-  - uid: 153
+  - uid: 154
     components:
     - type: Transform
       pos: 5.5,-5.5
       parent: 2
-  - uid: 344
+  - uid: 345
     components:
     - type: Transform
       pos: -4.5,-5.5
@@ -741,14 +741,14 @@ entities:
       parent: 2
 - proto: APCBasic
   entities:
-  - uid: 76
+  - uid: 77
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 2
 - proto: AtmosDeviceFanTiny
   entities:
-  - uid: 154
+  - uid: 155
     components:
     - type: Transform
       pos: 7.5,-8.5
@@ -795,47 +795,47 @@ entities:
       parent: 2
 - proto: AtmosFixBlockerMarker
   entities:
-  - uid: 19
+  - uid: 25
     components:
     - type: Transform
       pos: 3.5,6.5
       parent: 2
-  - uid: 25
+  - uid: 26
     components:
     - type: Transform
       pos: 3.5,5.5
       parent: 2
-  - uid: 26
+  - uid: 28
     components:
     - type: Transform
       pos: 0.5,-10.5
       parent: 2
-  - uid: 28
+  - uid: 34
     components:
     - type: Transform
       pos: -0.5,-10.5
       parent: 2
-  - uid: 34
+  - uid: 35
     components:
     - type: Transform
       pos: 1.5,9.5
       parent: 2
-  - uid: 35
+  - uid: 37
     components:
     - type: Transform
       pos: 2.5,6.5
       parent: 2
-  - uid: 37
+  - uid: 41
     components:
     - type: Transform
       pos: 1.5,-10.5
       parent: 2
-  - uid: 41
+  - uid: 42
     components:
     - type: Transform
       pos: 2.5,-10.5
       parent: 2
-  - uid: 42
+  - uid: 45
     components:
     - type: Transform
       pos: 3.5,2.5
@@ -845,12 +845,12 @@ entities:
     - type: Transform
       pos: 5.5,-10.5
       parent: 2
-  - uid: 52
+  - uid: 55
     components:
     - type: Transform
       pos: -1.5,6.5
       parent: 2
-  - uid: 58
+  - uid: 59
     components:
     - type: Transform
       pos: -0.5,9.5
@@ -865,22 +865,22 @@ entities:
     - type: Transform
       pos: -3.5,-10.5
       parent: 2
-  - uid: 270
+  - uid: 271
     components:
     - type: Transform
       pos: -1.5,-10.5
       parent: 2
-  - uid: 291
+  - uid: 295
     components:
     - type: Transform
       pos: -2.5,6.5
       parent: 2
-  - uid: 295
+  - uid: 296
     components:
     - type: Transform
       pos: -2.5,5.5
       parent: 2
-  - uid: 361
+  - uid: 366
     components:
     - type: Transform
       pos: -2.5,2.5
@@ -962,7 +962,7 @@ entities:
       parent: 2
 - proto: BenchSofaCorpLeft
   entities:
-  - uid: 277
+  - uid: 280
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -972,7 +972,7 @@ entities:
       bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
-  - uid: 205
+  - uid: 206
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -982,22 +982,22 @@ entities:
       bodyType: Static
 - proto: BlastDoor
   entities:
-  - uid: 9
+  - uid: 10
     components:
     - type: Transform
       pos: 5.5,-8.5
       parent: 2
-  - uid: 10
+  - uid: 11
     components:
     - type: Transform
       pos: -6.5,-8.5
       parent: 2
-  - uid: 11
+  - uid: 13
     components:
     - type: Transform
       pos: 7.5,-8.5
       parent: 2
-  - uid: 13
+  - uid: 15
     components:
     - type: Transform
       pos: -4.5,-8.5
@@ -1022,13 +1022,13 @@ entities:
       parent: 2
 - proto: ButtonFrameCaution
   entities:
-  - uid: 68
+  - uid: 69
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-6.5
       parent: 2
-  - uid: 307
+  - uid: 308
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1044,62 +1044,62 @@ entities:
       parent: 2
 - proto: CableApcExtension
   entities:
-  - uid: 8
+  - uid: 9
     components:
     - type: Transform
       pos: -2.5,-4.5
       parent: 2
-  - uid: 77
+  - uid: 78
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 2
-  - uid: 170
+  - uid: 171
     components:
     - type: Transform
       pos: -2.5,-3.5
       parent: 2
-  - uid: 181
+  - uid: 182
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 2
-  - uid: 182
+  - uid: 183
     components:
     - type: Transform
       pos: 3.5,-2.5
       parent: 2
-  - uid: 184
+  - uid: 186
     components:
     - type: Transform
       pos: 3.5,-0.5
       parent: 2
-  - uid: 186
+  - uid: 187
     components:
     - type: Transform
       pos: 3.5,-1.5
       parent: 2
-  - uid: 191
+  - uid: 193
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 2
-  - uid: 193
+  - uid: 199
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 2
-  - uid: 199
+  - uid: 200
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 2
-  - uid: 200
+  - uid: 201
     components:
     - type: Transform
       pos: -1.5,-0.5
       parent: 2
-  - uid: 217
+  - uid: 218
     components:
     - type: Transform
       pos: -2.5,-6.5
@@ -1189,7 +1189,7 @@ entities:
     - type: Transform
       pos: 0.5,4.5
       parent: 2
-  - uid: 266
+  - uid: 267
     components:
     - type: Transform
       pos: 0.5,6.5
@@ -1199,16 +1199,11 @@ entities:
     - type: Transform
       pos: 0.5,5.5
       parent: 2
-  - uid: 317
+  - uid: 319
     components:
     - type: Transform
       pos: -2.5,-1.5
       parent: 2
-  - uid: 339
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 2
   - uid: 340
     components:
     - type: Transform
@@ -1219,93 +1214,98 @@ entities:
     - type: Transform
       pos: 6.5,-7.5
       parent: 2
-  - uid: 388
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 389
     components:
     - type: Transform
       pos: -2.5,-2.5
       parent: 2
 - proto: CableHV
   entities:
-  - uid: 70
+  - uid: 71
     components:
     - type: Transform
       pos: 2.5,-2.5
       parent: 2
-  - uid: 71
+  - uid: 72
     components:
     - type: Transform
       pos: 3.5,-2.5
       parent: 2
-  - uid: 165
+  - uid: 166
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 2
-  - uid: 285
+  - uid: 286
     components:
     - type: Transform
       pos: 3.5,-3.5
       parent: 2
 - proto: CableMV
   entities:
-  - uid: 4
+  - uid: 5
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 2
-  - uid: 60
+  - uid: 61
     components:
     - type: Transform
       pos: 3.5,-0.5
       parent: 2
-  - uid: 73
+  - uid: 76
     components:
     - type: Transform
       pos: -2.5,-0.5
       parent: 2
-  - uid: 83
+  - uid: 89
     components:
     - type: Transform
       pos: 3.5,-1.5
       parent: 2
-  - uid: 93
+  - uid: 94
     components:
     - type: Transform
       pos: 2.5,-2.5
       parent: 2
-  - uid: 94
+  - uid: 95
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 2
-  - uid: 95
+  - uid: 96
     components:
     - type: Transform
       pos: -1.5,-0.5
       parent: 2
-  - uid: 96
+  - uid: 97
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 2
-  - uid: 99
+  - uid: 103
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 2
-  - uid: 236
+  - uid: 237
     components:
     - type: Transform
       pos: 3.5,-2.5
       parent: 2
-  - uid: 404
+  - uid: 405
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 2
 - proto: CableTerminal
   entities:
-  - uid: 72
+  - uid: 73
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1313,132 +1313,132 @@ entities:
       parent: 2
 - proto: CarpetPurple
   entities:
-  - uid: 15
+  - uid: 18
     components:
     - type: Transform
       pos: 1.5,3.5
       parent: 2
-  - uid: 49
+  - uid: 50
     components:
     - type: Transform
       pos: 1.5,4.5
       parent: 2
-  - uid: 406
+  - uid: 407
     components:
     - type: Transform
       pos: -3.5,-3.5
       parent: 2
-  - uid: 428
+  - uid: 429
     components:
     - type: Transform
       pos: -3.5,-1.5
       parent: 2
-  - uid: 429
+  - uid: 430
     components:
     - type: Transform
       pos: -3.5,-2.5
       parent: 2
-  - uid: 430
+  - uid: 431
     components:
     - type: Transform
       pos: -4.5,-1.5
       parent: 2
-  - uid: 431
+  - uid: 432
     components:
     - type: Transform
       pos: -4.5,-2.5
       parent: 2
-  - uid: 432
+  - uid: 433
     components:
     - type: Transform
       pos: -4.5,-3.5
       parent: 2
 - proto: Catwalk
   entities:
-  - uid: 6
+  - uid: 7
     components:
     - type: Transform
       pos: 2.5,-7.5
       parent: 2
-  - uid: 7
+  - uid: 8
     components:
     - type: Transform
       pos: 2.5,-6.5
       parent: 2
-  - uid: 98
+  - uid: 99
     components:
     - type: Transform
       pos: 0.5,-10.5
       parent: 2
-  - uid: 138
+  - uid: 139
     components:
     - type: Transform
       pos: 1.5,-10.5
       parent: 2
-  - uid: 140
+  - uid: 141
     components:
     - type: Transform
       pos: -1.5,-10.5
       parent: 2
-  - uid: 147
+  - uid: 148
     components:
     - type: Transform
       pos: 1.5,-7.5
       parent: 2
-  - uid: 161
+  - uid: 162
     components:
     - type: Transform
       pos: 1.5,-6.5
       parent: 2
-  - uid: 171
+  - uid: 172
     components:
     - type: Transform
       pos: -1.5,-7.5
       parent: 2
-  - uid: 211
+  - uid: 212
     components:
     - type: Transform
       pos: -0.5,-10.5
       parent: 2
-  - uid: 280
+  - uid: 281
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-1.5
       parent: 2
-  - uid: 319
+  - uid: 320
     components:
     - type: Transform
       pos: -0.5,-6.5
       parent: 2
-  - uid: 328
+  - uid: 329
     components:
     - type: Transform
       pos: 0.5,-6.5
       parent: 2
-  - uid: 345
+  - uid: 346
     components:
     - type: Transform
       pos: 2.5,-10.5
       parent: 2
-  - uid: 346
+  - uid: 347
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 2
-  - uid: 389
+  - uid: 390
     components:
     - type: Transform
       pos: 0.5,-7.5
       parent: 2
-  - uid: 408
+  - uid: 409
     components:
     - type: Transform
       pos: -1.5,-6.5
       parent: 2
 - proto: ChairOfficeDark
   entities:
-  - uid: 212
+  - uid: 213
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1446,15 +1446,22 @@ entities:
       parent: 2
 - proto: ChairPilotSeat
   entities:
-  - uid: 148
+  - uid: 149
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,7.5
       parent: 2
+- proto: ClosetWallO2N2FilledRandom
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 2
 - proto: ComfyChair
   entities:
-  - uid: 325
+  - uid: 327
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1462,14 +1469,14 @@ entities:
       parent: 2
 - proto: ComputerShuttle
   entities:
-  - uid: 265
+  - uid: 266
     components:
     - type: Transform
       pos: 0.5,8.5
       parent: 2
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 206
+  - uid: 211
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1477,7 +1484,7 @@ entities:
       parent: 2
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 162
+  - uid: 163
     components:
     - type: Transform
       pos: -3.5,-4.5
@@ -1497,96 +1504,97 @@ entities:
     - type: ItemSlots
 - proto: ConveyorBelt
   entities:
-  - uid: 64
+  - uid: 65
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,-8.5
       parent: 2
-  - uid: 65
+  - uid: 66
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-8.5
       parent: 2
-  - uid: 89
+  - uid: 93
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-4.5
       parent: 2
-  - uid: 150
+  - uid: 151
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,-8.5
       parent: 2
-  - uid: 155
+  - uid: 156
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,-8.5
       parent: 2
-  - uid: 156
+  - uid: 157
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-8.5
       parent: 2
-  - uid: 157
+  - uid: 158
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-8.5
       parent: 2
-  - uid: 274
+  - uid: 275
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-8.5
       parent: 2
-  - uid: 275
+  - uid: 276
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,-8.5
       parent: 2
-  - uid: 342
+  - uid: 343
     components:
     - type: Transform
       pos: 1.5,-4.5
       parent: 2
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 313
+  - uid: 314
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-3.5
       parent: 2
 - proto: DrinkMug
   entities:
-  - uid: 426
+  - uid: 427
     components:
     - type: Transform
       pos: -4.4542685,-2.4937136
       parent: 2
 - proto: DrinkMugMetal
   entities:
-  - uid: 146
+  - uid: 147
     components:
     - type: Transform
       pos: -4.563232,-1.3772196
       parent: 2
 - proto: DrinkMugMoebius
   entities:
-  - uid: 145
+  - uid: 146
     components:
     - type: Transform
       pos: -4.2980185,-1.8687136
       parent: 2
 - proto: EmergencyLight
   entities:
-  - uid: 174
+  - uid: 175
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1604,24 +1612,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-6.5
       parent: 2
-  - uid: 417
+  - uid: 418
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-3.5
       parent: 2
-  - uid: 433
+  - uid: 434
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 2
-  - uid: 434
+  - uid: 435
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-8.5
       parent: 2
-  - uid: 436
+  - uid: 437
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1629,64 +1637,64 @@ entities:
       parent: 2
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 409
+  - uid: 410
     components:
     - type: Transform
       pos: 2.5,-1.5
       parent: 2
 - proto: FaxMachineShip
   entities:
-  - uid: 201
+  - uid: 202
     components:
     - type: Transform
       pos: -0.5,4.5
       parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 144
+  - uid: 145
     components:
     - type: Transform
       pos: 1.5,5.5
       parent: 2
 - proto: FirelockEdge
   entities:
-  - uid: 437
+  - uid: 438
     components:
     - type: Transform
       pos: 0.5,6.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
 - proto: FirelockGlass
   entities:
-  - uid: 296
+  - uid: 299
     components:
     - type: Transform
       pos: -2.5,-4.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
-  - uid: 359
+      - 83
+  - uid: 360
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
-  - uid: 390
+      - 83
+  - uid: 391
     components:
     - type: Transform
       pos: 0.5,1.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
 - proto: GasMixerOn
   entities:
-  - uid: 271
+  - uid: 272
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1709,7 +1717,7 @@ entities:
       color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 126
+  - uid: 127
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1717,7 +1725,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 133
+  - uid: 134
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1725,7 +1733,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 218
+  - uid: 219
     components:
     - type: Transform
       pos: 0.5,4.5
@@ -1734,14 +1742,14 @@ entities:
       color: '#990000FF'
 - proto: GasPipeFourway
   entities:
-  - uid: 176
+  - uid: 177
     components:
     - type: Transform
       pos: -0.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 321
+  - uid: 324
     components:
     - type: Transform
       pos: 0.5,-0.5
@@ -1750,7 +1758,7 @@ entities:
       color: '#990000FF'
 - proto: GasPipeStraight
   entities:
-  - uid: 103
+  - uid: 104
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1758,56 +1766,56 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 104
+  - uid: 106
     components:
     - type: Transform
       pos: -2.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 106
+  - uid: 110
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 110
+  - uid: 111
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 111
+  - uid: 115
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 115
+  - uid: 120
     components:
     - type: Transform
       pos: -2.5,-6.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 120
+  - uid: 121
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 121
+  - uid: 123
     components:
     - type: Transform
       pos: -2.5,-4.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 123
+  - uid: 124
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1815,7 +1823,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 124
+  - uid: 126
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1823,7 +1831,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 127
+  - uid: 128
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1831,21 +1839,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 128
+  - uid: 129
     components:
     - type: Transform
       pos: -3.5,-2.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 129
+  - uid: 130
     components:
     - type: Transform
       pos: -3.5,-3.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 131
+  - uid: 132
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1853,28 +1861,28 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 132
+  - uid: 133
     components:
     - type: Transform
       pos: -3.5,-4.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 134
+  - uid: 135
     components:
     - type: Transform
       pos: -2.5,-3.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 137
+  - uid: 138
     components:
     - type: Transform
       pos: -0.5,2.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 163
+  - uid: 164
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1882,7 +1890,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 164
+  - uid: 165
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1890,7 +1898,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 166
+  - uid: 167
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1898,21 +1906,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 177
+  - uid: 178
     components:
     - type: Transform
       pos: 0.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 178
+  - uid: 180
     components:
     - type: Transform
       pos: -3.5,-8.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 183
+  - uid: 184
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2000,7 +2008,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 219
+  - uid: 220
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2008,7 +2016,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 220
+  - uid: 221
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2016,7 +2024,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 224
+  - uid: 225
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2064,7 +2072,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 233
+  - uid: 234
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2088,7 +2096,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 268
+  - uid: 269
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2096,14 +2104,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 320
+  - uid: 321
     components:
     - type: Transform
       pos: -2.5,-2.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 324
+  - uid: 325
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2111,7 +2119,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 394
+  - uid: 395
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2121,14 +2129,14 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 180
+  - uid: 181
     components:
     - type: Transform
       pos: 3.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 187
+  - uid: 191
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2136,7 +2144,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 215
+  - uid: 216
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2144,21 +2152,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 216
+  - uid: 217
     components:
     - type: Transform
       pos: -3.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 237
+  - uid: 238
     components:
     - type: Transform
       pos: 1.5,-5.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 288
+  - uid: 289
     components:
     - type: Transform
       pos: -0.5,-7.5
@@ -2167,14 +2175,14 @@ entities:
       color: '#990000FF'
 - proto: GasPort
   entities:
-  - uid: 175
+  - uid: 176
     components:
     - type: Transform
       pos: 4.5,-0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 225
+  - uid: 227
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2192,7 +2200,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 105
@@ -2203,10 +2211,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 172
+  - uid: 173
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2214,20 +2222,20 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 202
+  - uid: 203
     components:
     - type: Transform
       pos: -0.5,3.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 267
+  - uid: 268
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2235,10 +2243,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 315
+  - uid: 317
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2246,7 +2254,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -2259,7 +2267,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 102
@@ -2270,10 +2278,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 232
+  - uid: 233
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2281,10 +2289,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 240
+  - uid: 241
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2292,10 +2300,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 269
+  - uid: 270
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2303,10 +2311,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 358
+  - uid: 359
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2314,12 +2322,12 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 78
+      - 83
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 241
+  - uid: 242
     components:
     - type: Transform
       pos: 5.5,-3.5
@@ -2336,77 +2344,77 @@ entities:
     - type: Transform
       pos: -6.5,-6.5
       parent: 2
-  - uid: 243
+  - uid: 244
     components:
     - type: Transform
       pos: 1.5,8.5
       parent: 2
-  - uid: 245
+  - uid: 258
     components:
     - type: Transform
       pos: -0.5,7.5
       parent: 2
-  - uid: 264
+  - uid: 265
     components:
     - type: Transform
       pos: 0.5,9.5
       parent: 2
-  - uid: 282
+  - uid: 283
     components:
     - type: Transform
       pos: 2.5,3.5
       parent: 2
-  - uid: 287
+  - uid: 288
     components:
     - type: Transform
       pos: -1.5,4.5
       parent: 2
-  - uid: 301
+  - uid: 302
     components:
     - type: Transform
       pos: 1.5,7.5
       parent: 2
-  - uid: 304
+  - uid: 305
     components:
     - type: Transform
       pos: -0.5,8.5
       parent: 2
-  - uid: 329
+  - uid: 330
     components:
     - type: Transform
       pos: 2.5,4.5
       parent: 2
-  - uid: 347
+  - uid: 348
     components:
     - type: Transform
       pos: -5.5,-2.5
       parent: 2
-  - uid: 350
+  - uid: 351
     components:
     - type: Transform
       pos: -1.5,3.5
       parent: 2
-  - uid: 356
+  - uid: 357
     components:
     - type: Transform
       pos: -5.5,-1.5
       parent: 2
 - proto: GrilleDiagonal
   entities:
-  - uid: 61
+  - uid: 62
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,9.5
       parent: 2
-  - uid: 223
+  - uid: 224
     components:
     - type: Transform
       pos: -0.5,9.5
       parent: 2
 - proto: Gyroscope
   entities:
-  - uid: 272
+  - uid: 273
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2414,7 +2422,7 @@ entities:
       parent: 2
 - proto: Lamp
   entities:
-  - uid: 283
+  - uid: 284
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2422,33 +2430,33 @@ entities:
       parent: 2
 - proto: LockerQuarterMasterFilled
   entities:
-  - uid: 47
+  - uid: 49
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 2
 - proto: LockerSalvageSpecialistFilled
   entities:
-  - uid: 158
+  - uid: 159
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 2
-  - uid: 238
+  - uid: 240
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 2
 - proto: LockerWallMaterialsFuelUraniumFilled
   entities:
-  - uid: 312
+  - uid: 313
     components:
     - type: Transform
       pos: 3.5,0.5
       parent: 2
 - proto: LuxuryPen
   entities:
-  - uid: 18
+  - uid: 19
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2456,7 +2464,7 @@ entities:
       parent: 2
 - proto: NitrogenCanister
   entities:
-  - uid: 222
+  - uid: 223
     components:
     - type: Transform
       anchored: True
@@ -2466,14 +2474,14 @@ entities:
       bodyType: Static
 - proto: OreProcessor
   entities:
-  - uid: 407
+  - uid: 408
     components:
     - type: Transform
       pos: 1.5,-4.5
       parent: 2
 - proto: OxygenCanister
   entities:
-  - uid: 227
+  - uid: 232
     components:
     - type: Transform
       anchored: True
@@ -2483,50 +2491,49 @@ entities:
       bodyType: Static
 - proto: PaperBin10
   entities:
-  - uid: 351
+  - uid: 352
     components:
     - type: Transform
       pos: -0.5,3.5
       parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 152
+  - uid: 153
     components:
     - type: Transform
       pos: 7.5,-8.5
       parent: 2
-  - uid: 276
+  - uid: 277
     components:
     - type: Transform
       pos: -6.5,-8.5
       parent: 2
 - proto: PlasticFlapsClear
   entities:
-  - uid: 66
+  - uid: 67
     components:
     - type: Transform
       pos: -4.5,-8.5
       parent: 2
-  - uid: 343
+  - uid: 344
     components:
     - type: Transform
       pos: 5.5,-8.5
       parent: 2
 - proto: PortableGeneratorSuperPacmanShuttle
   entities:
-  - uid: 5
+  - uid: 6
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 2
     - type: FuelGenerator
-      targetPower: 22000
       on: False
     - type: Physics
       bodyType: Static
 - proto: PosterLegitCarpMount
   entities:
-  - uid: 425
+  - uid: 426
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2534,7 +2541,7 @@ entities:
       parent: 2
 - proto: PosterLegitSafetyMothPiping
   entities:
-  - uid: 435
+  - uid: 436
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2542,26 +2549,26 @@ entities:
       parent: 2
 - proto: PosterLegitSMBoH
   entities:
-  - uid: 424
+  - uid: 425
     components:
     - type: Transform
       pos: -0.5,-3.5
       parent: 2
 - proto: PottedPlantBioluminscent
   entities:
-  - uid: 410
+  - uid: 411
     components:
     - type: Transform
       pos: -1.5,-0.5
       parent: 2
 - proto: Poweredlight
   entities:
-  - uid: 136
+  - uid: 137
     components:
     - type: Transform
       pos: 0.5,-4.5
       parent: 2
-  - uid: 300
+  - uid: 301
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2589,25 +2596,25 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-8.5
       parent: 2
-  - uid: 411
+  - uid: 412
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,0.5
       parent: 2
-  - uid: 412
+  - uid: 415
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 2
-  - uid: 415
+  - uid: 416
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-3.5
       parent: 2
-  - uid: 416
+  - uid: 417
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2627,7 +2634,7 @@ entities:
       parent: 2
 - proto: PoweredlightGreen
   entities:
-  - uid: 355
+  - uid: 356
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2635,7 +2642,7 @@ entities:
       parent: 2
 - proto: PoweredlightRed
   entities:
-  - uid: 59
+  - uid: 60
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2643,12 +2650,12 @@ entities:
       parent: 2
 - proto: RailingCorner
   entities:
-  - uid: 139
+  - uid: 140
     components:
     - type: Transform
       pos: 2.5,-10.5
       parent: 2
-  - uid: 143
+  - uid: 144
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2656,41 +2663,41 @@ entities:
       parent: 2
 - proto: RandomPosterAny
   entities:
-  - uid: 418
+  - uid: 419
     components:
     - type: Transform
       pos: 1.5,1.5
       parent: 2
-  - uid: 419
+  - uid: 420
     components:
     - type: Transform
       pos: 2.5,5.5
       parent: 2
-  - uid: 420
+  - uid: 421
     components:
     - type: Transform
       pos: -3.5,0.5
       parent: 2
-  - uid: 421
+  - uid: 422
     components:
     - type: Transform
       pos: 1.5,-3.5
       parent: 2
 - proto: SalvageTechfabNF
   entities:
-  - uid: 160
+  - uid: 161
     components:
     - type: Transform
       pos: 0.5,-2.5
       parent: 2
 - proto: ShuttleWindow
   entities:
-  - uid: 50
+  - uid: 51
     components:
     - type: Transform
       pos: -5.5,-1.5
       parent: 2
-  - uid: 57
+  - uid: 58
     components:
     - type: Transform
       pos: 1.5,8.5
@@ -2705,62 +2712,62 @@ entities:
     - type: Transform
       pos: 7.5,-6.5
       parent: 2
-  - uid: 141
+  - uid: 142
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,7.5
       parent: 2
-  - uid: 242
+  - uid: 243
     components:
     - type: Transform
       pos: -1.5,4.5
       parent: 2
-  - uid: 258
+  - uid: 264
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,7.5
       parent: 2
-  - uid: 286
+  - uid: 287
     components:
     - type: Transform
       pos: 0.5,9.5
       parent: 2
-  - uid: 302
+  - uid: 303
     components:
     - type: Transform
       pos: -1.5,3.5
       parent: 2
-  - uid: 306
+  - uid: 307
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,8.5
       parent: 2
-  - uid: 327
+  - uid: 328
     components:
     - type: Transform
       pos: 2.5,3.5
       parent: 2
-  - uid: 331
+  - uid: 332
     components:
     - type: Transform
       pos: -5.5,-2.5
       parent: 2
-  - uid: 367
+  - uid: 368
     components:
     - type: Transform
       pos: 2.5,4.5
       parent: 2
 - proto: ShuttleWindowDiagonal
   entities:
-  - uid: 149
+  - uid: 150
     components:
     - type: Transform
       pos: -0.5,9.5
       parent: 2
-  - uid: 169
+  - uid: 170
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2768,7 +2775,7 @@ entities:
       parent: 2
 - proto: SignalButtonDirectional
   entities:
-  - uid: 67
+  - uid: 68
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2776,9 +2783,9 @@ entities:
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        13:
+        15:
         - Pressed: Toggle
-        10:
+        11:
         - Pressed: Toggle
   - uid: 298
     components:
@@ -2794,7 +2801,7 @@ entities:
         - Pressed: Toggle
         363:
         - Pressed: Toggle
-  - uid: 308
+  - uid: 309
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2802,9 +2809,9 @@ entities:
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        9:
+        10:
         - Pressed: Toggle
-        11:
+        13:
         - Pressed: Toggle
 - proto: SignAtmos
   entities:
@@ -2816,7 +2823,7 @@ entities:
       parent: 2
 - proto: SignBridge
   entities:
-  - uid: 135
+  - uid: 136
     components:
     - type: Transform
       pos: -0.5,1.5
@@ -2842,7 +2849,7 @@ entities:
       parent: 2
 - proto: SignEngineering
   entities:
-  - uid: 299
+  - uid: 300
     components:
     - type: Transform
       pos: 2.5,0.5
@@ -2863,21 +2870,21 @@ entities:
       parent: 2
 - proto: SMESBasic
   entities:
-  - uid: 173
+  - uid: 174
     components:
     - type: Transform
       pos: 3.5,-3.5
       parent: 2
 - proto: SpawnPointLatejoin
   entities:
-  - uid: 427
+  - uid: 428
     components:
     - type: Transform
       pos: -1.5,-1.5
       parent: 2
 - proto: SubstationWallBasic
   entities:
-  - uid: 314
+  - uid: 315
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2885,69 +2892,69 @@ entities:
       parent: 2
 - proto: SuitStorageQuartermaster
   entities:
-  - uid: 159
+  - uid: 160
     components:
     - type: Transform
       pos: -0.5,2.5
       parent: 2
 - proto: SuitStorageWallmountSalv
   entities:
-  - uid: 360
+  - uid: 361
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 2
-  - uid: 423
+  - uid: 424
     components:
     - type: Transform
       pos: -1.5,-4.5
       parent: 2
 - proto: TableCounterMetal
   entities:
-  - uid: 55
+  - uid: 57
     components:
     - type: Transform
       pos: -1.5,-2.5
       parent: 2
 - proto: TableGlass
   entities:
-  - uid: 97
+  - uid: 98
     components:
     - type: Transform
       pos: -0.5,3.5
       parent: 2
-  - uid: 305
+  - uid: 306
     components:
     - type: Transform
       pos: -0.5,5.5
       parent: 2
-  - uid: 401
+  - uid: 403
     components:
     - type: Transform
       pos: -0.5,4.5
       parent: 2
 - proto: TableReinforced
   entities:
-  - uid: 142
+  - uid: 143
     components:
     - type: Transform
       pos: 0.5,-4.5
       parent: 2
 - proto: TableReinforcedGlass
   entities:
-  - uid: 204
+  - uid: 205
     components:
     - type: Transform
       pos: -4.5,-1.5
       parent: 2
-  - uid: 309
+  - uid: 310
     components:
     - type: Transform
       pos: -4.5,-2.5
       parent: 2
 - proto: TableWood
   entities:
-  - uid: 234
+  - uid: 236
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2991,23 +2998,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-10.5
       parent: 2
-  - uid: 244
+  - uid: 245
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,2.5
       parent: 2
-  - uid: 357
+  - uid: 358
     components:
     - type: Transform
       pos: 3.5,6.5
       parent: 2
-  - uid: 368
+  - uid: 369
     components:
     - type: Transform
       pos: -2.5,6.5
       parent: 2
-  - uid: 395
+  - uid: 401
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -3015,91 +3022,91 @@ entities:
       parent: 2
 - proto: ToyFigurineQuartermaster
   entities:
-  - uid: 422
+  - uid: 423
     components:
     - type: Transform
       pos: 1.3748093,4.6623425
       parent: 2
 - proto: TwoWayLever
   entities:
-  - uid: 63
+  - uid: 64
     components:
     - type: Transform
       pos: -2.5,-8.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        64:
+        65:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        275:
+        276:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        157:
+        158:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        150:
+        151:
         - Left: Reverse
         - Middle: Off
         - Right: Forward
-  - uid: 221
+  - uid: 222
     components:
     - type: Transform
       pos: -0.5,-4.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        89:
+        93:
         - Right: Forward
         - Left: Reverse
         - Middle: Off
-        342:
+        343:
         - Right: Forward
         - Left: Reverse
         - Middle: Off
-  - uid: 273
+  - uid: 274
     components:
     - type: Transform
       pos: 3.5,-8.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        156:
+        157:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        155:
+        156:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        274:
+        275:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
-        65:
+        66:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
 - proto: VendingMachineSalvage
   entities:
-  - uid: 366
+  - uid: 367
     components:
     - type: Transform
       pos: 1.5,-2.5
       parent: 2
 - proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 203
+  - uid: 204
     components:
     - type: Transform
       pos: -0.5,-2.5
       parent: 2
 - proto: WallShuttle
   entities:
-  - uid: 1
+  - uid: 4
     components:
     - type: Transform
       pos: 1.5,6.5
@@ -3179,7 +3186,7 @@ entities:
     - type: Transform
       pos: 6.5,-4.5
       parent: 2
-  - uid: 45
+  - uid: 46
     components:
     - type: Transform
       pos: -3.5,-4.5
@@ -3194,12 +3201,12 @@ entities:
     - type: Transform
       pos: 6.5,-9.5
       parent: 2
-  - uid: 62
+  - uid: 63
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 2
-  - uid: 69
+  - uid: 70
     components:
     - type: Transform
       pos: 2.5,5.5
@@ -3259,7 +3266,7 @@ entities:
     - type: Transform
       pos: 7.5,-4.5
       parent: 2
-  - uid: 130
+  - uid: 131
     components:
     - type: Transform
       pos: -1.5,-4.5
@@ -3269,92 +3276,92 @@ entities:
     - type: Transform
       pos: -4.5,-6.5
       parent: 2
-  - uid: 213
+  - uid: 214
     components:
     - type: Transform
       pos: 1.5,-3.5
       parent: 2
-  - uid: 214
+  - uid: 215
     components:
     - type: Transform
       pos: -0.5,-3.5
       parent: 2
-  - uid: 289
+  - uid: 290
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: 5.5,-6.5
       parent: 2
-  - uid: 290
+  - uid: 291
     components:
     - type: Transform
-      pos: 5.5,-6.5
+      pos: 0.5,-3.5
       parent: 2
-  - uid: 330
+  - uid: 331
     components:
     - type: Transform
       pos: -1.5,2.5
       parent: 2
-  - uid: 348
+  - uid: 349
     components:
     - type: Transform
       pos: -3.5,0.5
       parent: 2
-  - uid: 349
+  - uid: 350
     components:
     - type: Transform
       pos: -1.5,5.5
       parent: 2
-  - uid: 352
+  - uid: 353
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 2
-  - uid: 354
+  - uid: 355
     components:
     - type: Transform
       pos: -0.5,6.5
       parent: 2
-  - uid: 369
+  - uid: 370
     components:
     - type: Transform
       pos: 2.5,-1.5
       parent: 2
-  - uid: 370
+  - uid: 384
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 2
-  - uid: 384
+  - uid: 385
     components:
     - type: Transform
       pos: 3.5,-4.5
       parent: 2
-  - uid: 385
+  - uid: 386
     components:
     - type: Transform
       pos: 4.5,-4.5
       parent: 2
-  - uid: 386
+  - uid: 387
     components:
     - type: Transform
       pos: 2.5,-3.5
       parent: 2
-  - uid: 387
+  - uid: 388
     components:
     - type: Transform
       pos: 2.5,-2.5
       parent: 2
-  - uid: 391
+  - uid: 392
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 2
-  - uid: 392
+  - uid: 393
     components:
     - type: Transform
       pos: 1.5,1.5
       parent: 2
-  - uid: 405
+  - uid: 406
     components:
     - type: Transform
       pos: -5.5,-3.5
@@ -3389,7 +3396,7 @@ entities:
     - type: Transform
       pos: -5.5,-0.5
       parent: 2
-  - uid: 51
+  - uid: 52
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -3419,35 +3426,35 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 2
-  - uid: 284
+  - uid: 285
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,5.5
       parent: 2
-  - uid: 303
+  - uid: 304
     components:
     - type: Transform
       pos: -1.5,6.5
       parent: 2
-  - uid: 332
+  - uid: 339
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,5.5
       parent: 2
-  - uid: 353
+  - uid: 354
     components:
     - type: Transform
       pos: -6.5,-3.5
       parent: 2
-  - uid: 393
+  - uid: 394
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,-10.5
       parent: 2
-  - uid: 403
+  - uid: 404
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -3462,14 +3469,14 @@ entities:
       parent: 2
 - proto: WaterCooler
   entities:
-  - uid: 168
+  - uid: 169
     components:
     - type: Transform
       pos: -3.5,-0.5
       parent: 2
 - proto: WeaponCapacitorRecharger
   entities:
-  - uid: 167
+  - uid: 168
     components:
     - type: Transform
       pos: -1.5,-2.5

From 6c7f04796ab51b21f252f33a245bc503ae658deb Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:35:49 +0100
Subject: [PATCH 6/8] directional fannage

---
 Resources/Maps/_NF/Shuttles/bodkin.yml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/bodkin.yml b/Resources/Maps/_NF/Shuttles/bodkin.yml
index d9cde1f122f..12199029d57 100644
--- a/Resources/Maps/_NF/Shuttles/bodkin.yml
+++ b/Resources/Maps/_NF/Shuttles/bodkin.yml
@@ -746,17 +746,17 @@ entities:
     - type: Transform
       pos: -2.5,0.5
       parent: 2
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 155
     components:
     - type: Transform
-      pos: 7.5,-8.5
+      pos: 0.5,-9.5
       parent: 2
   - uid: 188
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      pos: -0.5,-9.5
       parent: 2
   - uid: 190
     components:
@@ -766,32 +766,38 @@ entities:
   - uid: 192
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-7.5
       parent: 2
   - uid: 326
     components:
     - type: Transform
-      pos: -6.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-5.5
       parent: 2
   - uid: 333
     components:
     - type: Transform
-      pos: -6.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-8.5
       parent: 2
   - uid: 334
     components:
     - type: Transform
-      pos: -6.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-8.5
       parent: 2
   - uid: 335
     components:
     - type: Transform
-      pos: 7.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-7.5
       parent: 2
   - uid: 336
     components:
     - type: Transform
-      pos: 7.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-5.5
       parent: 2
 - proto: AtmosFixBlockerMarker
   entities:

From 0107f3a0547a23005d6fbbf3e38204ce1af24096 Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:23:10 +0100
Subject: [PATCH 7/8] edited signs, added shelves, moved stuff

---
 Resources/Maps/_NF/Shuttles/bodkin.yml       | 186 ++++++++++---------
 Resources/Prototypes/_NF/Shipyard/bodkin.yml |   4 +-
 2 files changed, 99 insertions(+), 91 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/bodkin.yml b/Resources/Maps/_NF/Shuttles/bodkin.yml
index 12199029d57..4660f70ebc9 100644
--- a/Resources/Maps/_NF/Shuttles/bodkin.yml
+++ b/Resources/Maps/_NF/Shuttles/bodkin.yml
@@ -748,52 +748,52 @@ entities:
       parent: 2
 - proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 155
+  - uid: 188
     components:
     - type: Transform
       pos: 0.5,-9.5
       parent: 2
-  - uid: 188
+  - uid: 190
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 2
-  - uid: 190
+  - uid: 192
     components:
     - type: Transform
       pos: 1.5,-9.5
       parent: 2
-  - uid: 192
+  - uid: 326
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-7.5
       parent: 2
-  - uid: 326
+  - uid: 333
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-5.5
       parent: 2
-  - uid: 333
+  - uid: 334
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-8.5
       parent: 2
-  - uid: 334
+  - uid: 335
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,-8.5
       parent: 2
-  - uid: 335
+  - uid: 336
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,-7.5
       parent: 2
-  - uid: 336
+  - uid: 439
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1482,11 +1482,11 @@ entities:
       parent: 2
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 211
+  - uid: 293
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,5.5
+      pos: -0.5,4.5
       parent: 2
 - proto: ComputerWallmountWithdrawBankATM
   entities:
@@ -1606,6 +1606,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,2.5
       parent: 2
+  - uid: 313
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-8.5
+      parent: 2
+  - uid: 352
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-8.5
+      parent: 2
   - uid: 413
     components:
     - type: Transform
@@ -1629,31 +1641,19 @@ entities:
     - type: Transform
       pos: 1.5,0.5
       parent: 2
-  - uid: 435
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-8.5
-      parent: 2
-  - uid: 437
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-8.5
-      parent: 2
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 410
+  - uid: 292
     components:
     - type: Transform
       pos: 2.5,-1.5
       parent: 2
 - proto: FaxMachineShip
   entities:
-  - uid: 202
+  - uid: 301
     components:
     - type: Transform
-      pos: -0.5,4.5
+      pos: -0.5,3.5
       parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
@@ -2455,7 +2455,7 @@ entities:
       parent: 2
 - proto: LockerWallMaterialsFuelUraniumFilled
   entities:
-  - uid: 313
+  - uid: 300
     components:
     - type: Transform
       pos: 3.5,0.5
@@ -2468,6 +2468,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.6934373,4.4512644
       parent: 2
+- proto: NFSignDock
+  entities:
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 2
+  - uid: 416
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 2
 - proto: NitrogenCanister
   entities:
   - uid: 223
@@ -2495,12 +2507,17 @@ entities:
       parent: 2
     - type: Physics
       bodyType: Static
-- proto: PaperBin10
+- proto: PaperOffice
   entities:
-  - uid: 352
+  - uid: 155
     components:
     - type: Transform
-      pos: -0.5,3.5
+      pos: 1.395498,4.4775753
+      parent: 2
+  - uid: 435
+    components:
+    - type: Transform
+      pos: 1.301748,4.5713253
       parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
@@ -2567,6 +2584,13 @@ entities:
     - type: Transform
       pos: -1.5,-0.5
       parent: 2
+- proto: PottedPlantRandom
+  entities:
+  - uid: 437
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
 - proto: Poweredlight
   entities:
   - uid: 137
@@ -2574,7 +2598,7 @@ entities:
     - type: Transform
       pos: 0.5,-4.5
       parent: 2
-  - uid: 301
+  - uid: 306
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2590,18 +2614,6 @@ entities:
     - type: Transform
       pos: 6.5,-5.5
       parent: 2
-  - uid: 364
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-8.5
-      parent: 2
-  - uid: 365
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-8.5
-      parent: 2
   - uid: 412
     components:
     - type: Transform
@@ -2614,12 +2626,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 2
-  - uid: 416
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-3.5
-      parent: 2
   - uid: 417
     components:
     - type: Transform
@@ -2654,6 +2660,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,1.5
       parent: 2
+- proto: PoweredSmallLight
+  entities:
+  - uid: 202
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-8.5
+      parent: 2
+  - uid: 211
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-8.5
+      parent: 2
+  - uid: 364
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-3.5
+      parent: 2
 - proto: RailingCorner
   entities:
   - uid: 140
@@ -2696,6 +2722,21 @@ entities:
     - type: Transform
       pos: 0.5,-2.5
       parent: 2
+- proto: ShelfRGlass
+  entities:
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+- proto: ShelfRMetal
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-9.5
+      parent: 2
 - proto: ShuttleWindow
   entities:
   - uid: 51
@@ -2834,45 +2875,22 @@ entities:
     - type: Transform
       pos: -0.5,1.5
       parent: 2
-- proto: SignCargo
-  entities:
-  - uid: 373
-    components:
-    - type: Transform
-      pos: -3.5,-9.5
-      parent: 2
-  - uid: 374
-    components:
-    - type: Transform
-      pos: 4.5,-9.5
-      parent: 2
-- proto: SignDoors
+- proto: SignSalvage
   entities:
   - uid: 372
     components:
     - type: Transform
-      pos: -1.5,-9.5
-      parent: 2
-- proto: SignEngineering
-  entities:
-  - uid: 300
-    components:
-    - type: Transform
-      pos: 2.5,0.5
+      pos: -2.5,-9.5
       parent: 2
-- proto: SignShipDock
-  entities:
-  - uid: 292
+  - uid: 373
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-4.5
+      pos: 3.5,-9.5
       parent: 2
-  - uid: 293
+  - uid: 374
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-4.5
+      pos: -1.5,5.5
       parent: 2
 - proto: SMESBasic
   entities:
@@ -2929,11 +2947,6 @@ entities:
     - type: Transform
       pos: -0.5,3.5
       parent: 2
-  - uid: 306
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 2
   - uid: 403
     components:
     - type: Transform
@@ -3026,13 +3039,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,2.5
       parent: 2
-- proto: ToyFigurineQuartermaster
-  entities:
-  - uid: 423
-    components:
-    - type: Transform
-      pos: 1.3748093,4.6623425
-      parent: 2
 - proto: TwoWayLever
   entities:
   - uid: 64
diff --git a/Resources/Prototypes/_NF/Shipyard/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/bodkin.yml
index a7c61e42074..bcc34b49465 100644
--- a/Resources/Prototypes/_NF/Shipyard/bodkin.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bodkin.yml
@@ -14,8 +14,10 @@
   description: The smaller sibling to the Broadhead, the SBB Bodkin is designed for rockhopping and salvage recovery.
   price: 34000 #Grid appraises at 29500. Slapped on a 15% markup and rounded it up as it's a salvage ship.
   category: Medium
-  group: Civilian
+  group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/bodkin.yml
+  class:
+  - Salvage
 
 - type: gameMap
   id: Bodkin

From 7bb26e88ab71c3ab6d229a80feab2f4e2eb15502 Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Mon, 14 Oct 2024 23:45:35 +0100
Subject: [PATCH 8/8] updated price

---
 Resources/Prototypes/_NF/Shipyard/bodkin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Shipyard/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/bodkin.yml
index bcc34b49465..e9ee2217ff0 100644
--- a/Resources/Prototypes/_NF/Shipyard/bodkin.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bodkin.yml
@@ -12,7 +12,7 @@
   id: Bodkin
   name: SBB Bodkin
   description: The smaller sibling to the Broadhead, the SBB Bodkin is designed for rockhopping and salvage recovery.
-  price: 34000 #Grid appraises at 29500. Slapped on a 15% markup and rounded it up as it's a salvage ship.
+  price: 39000 #Grid appraises at 35693. Slapped on a ~10% markup.
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/bodkin.yml