diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bf867c28abd..5c536f5ac6b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4329,3 +4329,15 @@ Entries:
       message: 'Fixes the plasteel recipe to be lore accurate: Plasteel = Plasma + Steel'
   id: 4951
   time: '2024-04-27T23:46:34.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Updated conveyor belts sprites.
+  id: 4952
+  time: '2024-04-28T03:15:52.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Tweak
+      message: Rotated Bocakillo.
+  id: 4953
+  time: '2024-04-28T06:02:55.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
index 2c92ed8dc3d..1ee842eac32 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
@@ -9,6 +9,7 @@ tilemap:
   2: FloorDarkMono
   37: FloorDarkPlastic
   97: FloorTechMaint
+  3: FloorTechMaint2
   113: Lattice
   114: Plating
 entities:
@@ -24,11 +25,19 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: cgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AgAAAAAAcgAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAcgAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAYQAAAAAAAgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAgAAAAAAcgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAwAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -56,131 +65,135 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            0: 3,3
-            1: 4,3
-            2: 4,4
-            3: 3,4
+            60: -1,-2
+            61: 0,-2
+            62: 0,-3
+            63: -1,-3
         - node:
             color: '#FFFFFFFF'
             id: BotGreyscale
           decals:
-            4: 1,4
+            64: 0,0
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            12: 0,6
-            13: 1,3
-            18: 0,1
-            19: 1,2
-            20: 1,6
-            21: -1,3
-            22: -8,3
-            23: -9,3
-            24: -10,3
-            25: -10,4
-            26: -10,5
-            27: -9,5
-            28: -1,1
-            38: -3,6
-            39: -1,6
-            40: 2,5
-            41: 5,5
-            42: 5,4
-            43: 5,3
-            44: -2,4
-            45: -7,4
-            52: 0,1
+            103: -1,0
+            104: -3,1
+            105: -1,2
+            106: 2,1
+            107: 1,-1
+            108: 0,3
+            109: 0,8
+            110: 2,4
+            111: 2,2
+            112: 1,-4
+            113: 0,-4
+            114: -1,-4
+            115: 1,-4
+            116: 0,-4
+            117: -1,-4
+            118: -1,9
+            119: -1,10
+            120: -1,11
+            121: 0,11
+            122: 1,11
+            123: 1,10
+            124: 1,10
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            14: 4,4
-            15: 4,3
-            16: 3,3
-            17: 3,4
-            29: -2,6
-            34: -6,3
-            35: -5,3
-            36: -4,3
-            37: -3,3
-            53: -2,6
-            54: 3,3
-            55: 3,4
-            56: 4,3
-            57: -8,3
-            58: -9,5
-            59: -9,5
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtLight
-          decals:
-            46: 1,4
-            47: 1,4
-            48: 0,6
-            49: 1,2
-            50: 0,1
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtMedium
-          decals:
-            51: 0,1
+            77: -3,1
+            78: -2,0
+            79: -1,0
+            80: 0,0
+            81: 1,0
+            82: 2,0
+            83: 2,1
+            84: 0,-2
+            85: -1,-2
+            86: -1,-3
+            87: 0,-3
+            88: 2,2
+            89: 2,4
+            90: 2,3
+            91: 0,3
+            92: -3,2
+            93: -1,4
+            94: -1,5
+            95: -1,6
+            96: -1,7
+            97: -1,9
+            98: -1,10
+            99: -1,11
+            100: 0,11
+            101: 1,11
+            102: 1,10
+            125: 2,0
+            126: -2,0
+            127: 0,-2
+            128: -1,-3
+            129: -1,4
+            130: -1,5
+            131: -1,6
+            132: -1,7
+            133: -1,6
+            134: -1,6
+            135: -1,6
         - node:
             color: '#FFFFFFFF'
-            id: WarnLineE
+            id: StandClear
           decals:
-            9: -1,6
+            69: 1,-1
         - node:
             color: '#FFFFFFFF'
-            id: WarnLineGreyscaleW
+            id: StandClearGreyscale
           decals:
-            11: 0,6
+            72: 0,8
+            73: 0,3
         - node:
             color: '#FFFFFFFF'
-            id: WarnLineS
+            id: WarnLineGreyscaleN
           decals:
-            5: 5,3
-            6: 5,4
-            7: 5,5
-            8: -3,6
-            10: 2,5
+            65: 2,1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            30: -6,3
-            31: -5,3
-            32: -4,3
-            33: -3,3
+            68: 2,3
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
           0,0:
-            0: 65527
-          0,1:
-            0: 65277
-            1: 258
-          -3,1:
-            0: 61166
-          -3,0:
-            0: 60928
-          -2,0:
-            0: 65280
-          -2,1:
-            0: 65535
+            0: 21879
           -1,0:
-            0: 65518
+            0: 3820
+            1: 4096
+          0,1:
+            0: 4373
+            1: 52416
           -1,1:
-            0: 65535
-          1,1:
-            0: 4915
-          1,0:
-            0: 13072
+            0: 34952
+            1: 3
+          0,2:
+            0: 13105
+            1: 32768
+          -1,2:
+            0: 34944
+          0,-1:
+            0: 9011
+            1: 34944
+          0,3:
+            1: 12
+          -1,-1:
+            1: 12832
+            0: 2184
+          -1,3:
+            1: 4
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -198,10 +211,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          immutable: True
           moles:
-          - 20.078888
-          - 75.53487
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -217,599 +230,709 @@ entities:
     - type: RadiationGridResistance
 - proto: AirCanister
   entities:
-  - uid: 229
+  - uid: 126
     components:
     - type: Transform
       anchored: True
-      pos: 1.5,3.5
+      pos: -0.5,0.5
       parent: 2
     - type: Physics
       bodyType: Static
 - proto: AirlockExternalGlass
   entities:
-  - uid: 10
+  - uid: 11
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,5.5
+      pos: 2.5,4.5
       parent: 2
-  - uid: 88
+  - uid: 57
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,6.5
+      pos: 1.5,-0.5
       parent: 2
-  - uid: 118
+    - type: Door
+      secondsUntilStateChange: -93.89965
+      state: Opening
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
+  - uid: 59
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,6.5
+      pos: 2.5,2.5
       parent: 2
 - proto: AirlockHatch
   entities:
-  - uid: 112
+  - uid: 58
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,4.5
+      pos: 0.5,8.5
       parent: 2
-  - uid: 114
+  - uid: 196
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,4.5
+      pos: 0.5,3.5
       parent: 2
 - proto: AirlockShuttleSyndicate
   entities:
-  - uid: 162
+  - uid: 56
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,5.5
+      pos: 0.5,-3.5
       parent: 2
-  - uid: 173
+  - uid: 63
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,3.5
+      pos: 1.5,-3.5
       parent: 2
-  - uid: 217
+  - uid: 64
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,4.5
+      pos: -0.5,-3.5
       parent: 2
 - proto: APCBasic
   entities:
-  - uid: 110
+  - uid: 221
     components:
     - type: Transform
-      pos: -7.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,9.5
       parent: 2
 - proto: AtmosDeviceFanTiny
   entities:
-  - uid: 76
+  - uid: 162
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
+      pos: 0.5,-3.5
       parent: 2
-  - uid: 77
+  - uid: 218
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,5.5
+      pos: -0.5,-3.5
       parent: 2
-  - uid: 161
+  - uid: 247
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
       parent: 2
-  - uid: 223
+  - uid: 248
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
+      parent: 2
+- proto: AtmosFixBlockerMarker
+  entities:
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 2
+  - uid: 250
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 2
+  - uid: 251
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 2
+  - uid: 252
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 2
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 2
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 257
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 2
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 2
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 2
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 2
+  - uid: 262
+    components:
+    - type: Transform
+      pos: -1.5,12.5
+      parent: 2
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 3.5,7.5
+      parent: 2
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 2
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 2
+  - uid: 266
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 2
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 268
     components:
     - type: Transform
-      pos: 5.5,4.5
+      pos: 3.5,6.5
       parent: 2
 - proto: BlastDoorOpen
   entities:
-  - uid: 46
+  - uid: 4
     components:
     - type: Transform
-      pos: -6.5,3.5
+      pos: -0.5,12.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 129
-  - uid: 50
+      - 186
+  - uid: 171
     components:
     - type: Transform
-      pos: -10.5,4.5
+      pos: 1.5,6.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 129
-  - uid: 56
+      - 186
+  - uid: 184
     components:
     - type: Transform
-      pos: 1.5,1.5
+      pos: 1.5,12.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 129
-  - uid: 58
+      - 186
+  - uid: 212
     components:
     - type: Transform
-      pos: -10.5,3.5
+      pos: -0.5,8.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 129
-  - uid: 64
+      - 186
+  - uid: 219
     components:
     - type: Transform
-      pos: -4.5,5.5
+      pos: 0.5,12.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 129
-  - uid: 78
+      - 186
+  - uid: 220
     components:
     - type: Transform
-      pos: -10.5,5.5
+      pos: -2.5,0.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 129
+      - 186
 - proto: BoxBodyBag
   entities:
-  - uid: 244
+  - uid: 192
     components:
     - type: Transform
-      parent: 243
+      parent: 191
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
 - proto: ButtonFrameCaution
   entities:
-  - uid: 55
+  - uid: 213
     components:
     - type: Transform
-      pos: -9.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,11.5
       parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
-  - uid: 121
+  - uid: 175
     components:
     - type: Transform
-      pos: -8.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,10.5
       parent: 2
 - proto: CableApcExtension
   entities:
-  - uid: 26
+  - uid: 16
     components:
     - type: Transform
-      pos: 0.5,4.5
+      pos: 2.5,9.5
       parent: 2
-  - uid: 35
+  - uid: 55
     components:
     - type: Transform
-      pos: -3.5,4.5
+      pos: 1.5,-0.5
       parent: 2
-  - uid: 41
+  - uid: 60
     components:
     - type: Transform
-      pos: -6.5,4.5
+      pos: 1.5,0.5
       parent: 2
-  - uid: 62
+  - uid: 65
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: 0.5,3.5
       parent: 2
-  - uid: 63
+  - uid: 66
     components:
     - type: Transform
-      pos: 0.5,5.5
+      pos: 0.5,6.5
       parent: 2
   - uid: 67
     components:
     - type: Transform
-      pos: 1.5,5.5
+      pos: 1.5,1.5
       parent: 2
   - uid: 68
     components:
     - type: Transform
-      pos: 2.5,5.5
+      pos: -1.5,1.5
       parent: 2
-  - uid: 69
+  - uid: 70
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: -0.5,1.5
       parent: 2
   - uid: 71
     components:
     - type: Transform
-      pos: -2.5,4.5
+      pos: 0.5,4.5
       parent: 2
   - uid: 74
     components:
     - type: Transform
-      pos: -7.5,5.5
+      pos: 1.5,-1.5
       parent: 2
-  - uid: 104
+  - uid: 90
     components:
     - type: Transform
-      pos: -8.5,4.5
+      pos: 0.5,8.5
       parent: 2
-  - uid: 127
+  - uid: 99
     components:
     - type: Transform
-      pos: -7.5,6.5
+      pos: 0.5,1.5
       parent: 2
-  - uid: 130
+  - uid: 106
     components:
     - type: Transform
-      pos: -4.5,4.5
+      pos: 0.5,10.5
       parent: 2
-  - uid: 131
+  - uid: 139
     components:
     - type: Transform
-      pos: -1.5,4.5
+      pos: 0.5,9.5
       parent: 2
-  - uid: 134
+  - uid: 153
     components:
     - type: Transform
-      pos: -5.5,4.5
+      pos: 0.5,2.5
       parent: 2
-  - uid: 135
+  - uid: 154
     components:
     - type: Transform
-      pos: 3.5,5.5
+      pos: -1.5,2.5
       parent: 2
-  - uid: 138
+  - uid: 167
     components:
     - type: Transform
-      pos: -7.5,4.5
+      pos: 0.5,5.5
       parent: 2
-  - uid: 139
+  - uid: 168
     components:
     - type: Transform
-      pos: 0.5,3.5
+      pos: 1.5,9.5
       parent: 2
-  - uid: 180
+  - uid: 169
     components:
     - type: Transform
-      pos: -0.5,4.5
+      pos: 0.5,7.5
       parent: 2
 - proto: CableHV
   entities:
-  - uid: 89
+  - uid: 105
     components:
     - type: Transform
-      pos: -5.5,3.5
+      pos: -0.5,6.5
       parent: 2
-  - uid: 108
+  - uid: 135
     components:
     - type: Transform
-      pos: -4.5,3.5
+      pos: -0.5,7.5
       parent: 2
 - proto: CableMV
   entities:
-  - uid: 27
+  - uid: 19
     components:
     - type: Transform
-      pos: -6.5,4.5
+      pos: 2.5,9.5
       parent: 2
-  - uid: 36
+  - uid: 27
     components:
     - type: Transform
-      pos: -5.5,3.5
+      pos: -0.5,7.5
       parent: 2
-  - uid: 38
+  - uid: 44
     components:
     - type: Transform
-      pos: -7.5,5.5
+      pos: 0.5,8.5
       parent: 2
-  - uid: 65
+  - uid: 45
     components:
     - type: Transform
-      pos: -7.5,4.5
+      pos: 1.5,9.5
       parent: 2
-  - uid: 66
+  - uid: 46
     components:
     - type: Transform
-      pos: -7.5,6.5
+      pos: 0.5,7.5
       parent: 2
-  - uid: 70
+  - uid: 47
     components:
     - type: Transform
-      pos: -5.5,4.5
+      pos: 0.5,9.5
       parent: 2
 - proto: CannonBall
   entities:
-  - uid: 98
+  - uid: 205
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 101
+  - uid: 206
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 102
+  - uid: 207
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 103
+  - uid: 208
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
 - proto: CannonBallGlassshot
   entities:
-  - uid: 95
+  - uid: 201
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 97
+  - uid: 202
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 99
+  - uid: 203
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 100
+  - uid: 204
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
 - proto: CannonBallGrapeshot
   entities:
-  - uid: 92
+  - uid: 198
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 93
+  - uid: 199
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 94
+  - uid: 200
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 96
+  - uid: 210
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
 - proto: Catwalk
   entities:
-  - uid: 3
+  - uid: 80
     components:
     - type: Transform
-      pos: 3.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,10.5
       parent: 2
-  - uid: 5
+  - uid: 82
     components:
     - type: Transform
-      pos: 0.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,1.5
       parent: 2
-  - uid: 24
+  - uid: 87
     components:
     - type: Transform
-      pos: -7.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,6.5
       parent: 2
-  - uid: 48
+  - uid: 88
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,5.5
       parent: 2
-  - uid: 51
+  - uid: 89
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
       parent: 2
-  - uid: 52
+  - uid: 147
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
       parent: 2
-  - uid: 53
+  - uid: 148
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,9.5
       parent: 2
-  - uid: 61
+  - uid: 159
     components:
     - type: Transform
-      pos: -5.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
       parent: 2
-  - uid: 80
+  - uid: 160
     components:
     - type: Transform
-      pos: 0.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,7.5
       parent: 2
-  - uid: 86
+  - uid: 161
     components:
     - type: Transform
-      pos: 0.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
       parent: 2
-  - uid: 113
+  - uid: 174
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,7.5
       parent: 2
-  - uid: 126
+  - uid: 177
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 2
-  - uid: 141
+  - uid: 190
     components:
     - type: Transform
-      pos: -3.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
       parent: 2
-  - uid: 142
+  - uid: 215
     components:
     - type: Transform
-      pos: -2.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
       parent: 2
-  - uid: 143
+  - uid: 228
     components:
     - type: Transform
-      pos: -7.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
       parent: 2
-  - uid: 144
+  - uid: 229
     components:
     - type: Transform
-      pos: -0.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
       parent: 2
-  - uid: 145
+  - uid: 230
     components:
     - type: Transform
-      pos: 0.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,2.5
       parent: 2
-  - uid: 146
+  - uid: 232
     components:
     - type: Transform
-      pos: -0.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
       parent: 2
-  - uid: 179
+  - uid: 234
     components:
     - type: Transform
-      pos: -4.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,1.5
       parent: 2
-  - uid: 185
+  - uid: 238
     components:
     - type: Transform
-      pos: 1.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,9.5
       parent: 2
-  - uid: 208
+  - uid: 240
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 4.5,5.5
+      pos: 2.5,7.5
       parent: 2
-  - uid: 230
+  - uid: 242
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
       parent: 2
 - proto: ChairPilotSeat
   entities:
-  - uid: 148
+  - uid: 100
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,10.5
       parent: 2
-  - uid: 150
+  - uid: 172
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,6.5
+      pos: -2.5,1.5
       parent: 2
-  - uid: 186
+  - uid: 176
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,1.5
+      pos: 2.5,7.5
       parent: 2
 - proto: ClockworkGrille
   entities:
-  - uid: 39
+  - uid: 1
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,3.5
+      pos: 0.5,12.5
       parent: 2
-  - uid: 45
+  - uid: 3
     components:
     - type: Transform
-      pos: -6.5,3.5
+      pos: -0.5,-0.5
       parent: 2
-  - uid: 54
+  - uid: 9
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,5.5
+      pos: 1.5,12.5
       parent: 2
-  - uid: 60
+  - uid: 10
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,5.5
+      pos: 0.5,-0.5
       parent: 2
-  - uid: 105
+  - uid: 12
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,4.5
+      pos: 1.5,6.5
       parent: 2
-  - uid: 163
+  - uid: 85
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
+      pos: -2.5,0.5
       parent: 2
-  - uid: 172
+  - uid: 120
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,4.5
+      pos: -0.5,8.5
       parent: 2
-  - uid: 213
+  - uid: 122
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,3.5
+      pos: -0.5,12.5
       parent: 2
 - proto: ClosetWall
   entities:
-  - uid: 243
+  - uid: 191
     components:
     - type: Transform
-      pos: 0.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
       parent: 2
     - type: EntityStorage
       air:
@@ -835,45 +958,43 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 244
+          - 192
 - proto: ComputerIFF
   entities:
-  - uid: 119
+  - uid: 195
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,9.5
       parent: 2
 - proto: ComputerTabletopRadar
   entities:
-  - uid: 49
+  - uid: 137
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,4.5
+      pos: 0.5,11.5
       parent: 2
 - proto: ComputerTabletopShuttleAntag
   entities:
-  - uid: 75
+  - uid: 6
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,5.5
+      pos: 1.5,11.5
       parent: 2
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 214
+  - uid: 81
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,10.5
       parent: 2
 - proto: CratePirate
   entities:
-  - uid: 91
+  - uid: 197
     components:
     - type: Transform
-      pos: 1.5,4.5
+      pos: 0.5,0.5
       parent: 2
     - type: EntityStorage
       air:
@@ -899,1041 +1020,1052 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 234
-          - 92
-          - 93
-          - 94
-          - 95
-          - 96
-          - 97
-          - 98
-          - 99
-          - 100
-          - 101
-          - 102
-          - 103
+          - 209
+          - 208
+          - 207
+          - 206
+          - 205
+          - 204
+          - 203
+          - 202
+          - 201
+          - 200
+          - 199
+          - 198
+          - 210
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 218
+  - uid: 149
     components:
     - type: Transform
-      pos: -2.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,4.5
       parent: 2
 - proto: DisposalBend
   entities:
-  - uid: 20
+  - uid: 178
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,2.5
       parent: 2
 - proto: DisposalPipe
   entities:
-  - uid: 8
+  - uid: 37
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,1.5
+      pos: -2.5,-0.5
       parent: 2
-  - uid: 9
+  - uid: 109
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,1.5
+      pos: -2.5,0.5
       parent: 2
-  - uid: 31
+  - uid: 115
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,1.5
+      pos: -2.5,1.5
       parent: 2
-  - uid: 154
+  - uid: 124
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,1.5
+      pos: -2.5,-1.5
       parent: 2
 - proto: DisposalTrunk
   entities:
-  - uid: 37
+  - uid: 5
     components:
     - type: Transform
-      pos: -0.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 2
-  - uid: 81
+  - uid: 98
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-2.5
       parent: 2
 - proto: DisposalUnit
   entities:
-  - uid: 14
+  - uid: 179
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: -1.5,2.5
       parent: 2
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 242
+  - uid: 231
     components:
     - type: Transform
-      pos: -0.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
       parent: 2
 - proto: FaxMachineShipAntag
   entities:
-  - uid: 90
+  - uid: 222
     components:
     - type: Transform
-      pos: -9.5,3.5
+      pos: -0.5,11.5
       parent: 2
 - proto: GasPassiveVent
   entities:
-  - uid: 216
+  - uid: 121
     components:
     - type: Transform
-      pos: 4.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
+      color: '#FF1111FF'
 - proto: GasPipeBend
   entities:
-  - uid: 165
+  - uid: 39
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,10.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 209
+  - uid: 111
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,5.5
+      pos: 1.5,1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 210
+      color: '#FF1111FF'
+  - uid: 134
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
+      color: '#FF1111FF'
 - proto: GasPipeStraight
   entities:
-  - uid: 4
+  - uid: 20
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -5.5,4.5
+      pos: 2.5,-2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 7
+      color: '#FF1111FF'
+  - uid: 26
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 164
+  - uid: 28
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,8.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 166
+  - uid: 36
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
+      pos: 1.5,0.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
-  - uid: 168
+      color: '#FF1111FF'
+  - uid: 38
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
-  - uid: 188
+      color: '#FF1111FF'
+  - uid: 43
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 4.5,6.5
+      pos: 0.5,3.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 196
+      color: '#FF1111FF'
+  - uid: 50
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,3.5
+      pos: 1.5,-0.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
-  - uid: 197
+      color: '#FF1111FF'
+  - uid: 78
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 198
+  - uid: 91
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,8.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
-  - uid: 199
+      color: '#FF1111FF'
+  - uid: 96
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,9.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 200
+      color: '#0088FFFF'
+  - uid: 108
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,4.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 201
+      color: '#FF1111FF'
+  - uid: 112
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 202
+  - uid: 113
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,5.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 203
+      color: '#0088FFFF'
+  - uid: 114
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 204
+      color: '#0088FFFF'
+  - uid: 117
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,6.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 222
+      color: '#FF1111FF'
+  - uid: 118
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 224
+      color: '#FF1111FF'
+  - uid: 125
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 231
+      color: '#0088FFFF'
+  - uid: 130
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 167
+  - uid: 34
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,6.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 181
+      color: '#0088FFFF'
+  - uid: 41
     components:
     - type: Transform
-      pos: -3.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 182
+      color: '#FF1111FF'
+  - uid: 48
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 207
+  - uid: 49
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
-  - uid: 225
+      color: '#FF1111FF'
+  - uid: 51
     components:
     - type: Transform
-      pos: 3.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
+      color: '#FF1111FF'
 - proto: GasPort
   entities:
-  - uid: 151
+  - uid: 131
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
 - proto: GasVentPump
   entities:
-  - uid: 205
+  - uid: 23
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 206
+  - uid: 132
     components:
     - type: Transform
-      pos: -4.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,10.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 211
+  - uid: 141
     components:
     - type: Transform
-      pos: -0.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,2.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
-  - uid: 219
+  - uid: 142
     components:
     - type: Transform
-      pos: -8.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,6.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0088FFFF'
 - proto: GasVentScrubber
   entities:
-  - uid: 140
+  - uid: 33
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,4.5
+      pos: 0.5,9.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 147
+      color: '#FF1111FF'
+  - uid: 35
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 169
+      color: '#FF1111FF'
+  - uid: 165
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -7.5,4.5
+      pos: -0.5,5.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
-  - uid: 220
+      color: '#FF1111FF'
+  - uid: 166
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF2222FF'
+      color: '#FF1111FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 72
+  - uid: 21
     components:
     - type: Transform
-      pos: -2.5,3.5
+      pos: -0.5,4.5
       parent: 2
 - proto: Gyroscope
   entities:
-  - uid: 73
+  - uid: 17
     components:
     - type: Transform
-      pos: -3.5,3.5
+      pos: -0.5,5.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
 - proto: LockerWallMedicalFilled
   entities:
-  - uid: 241
+  - uid: 216
     components:
     - type: Transform
-      pos: -3.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,5.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14923
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: PirateFlag
   entities:
-  - uid: 237
+  - uid: 79
     components:
     - type: Transform
-      pos: 4.5,6.5
+      pos: 3.5,9.5
       parent: 2
-  - uid: 238
+  - uid: 152
     components:
     - type: Transform
-      pos: -7.5,7.5
+      pos: -3.5,1.5
       parent: 2
-  - uid: 239
+  - uid: 170
     components:
     - type: Transform
-      pos: -8.5,2.5
+      pos: -1.5,10.5
       parent: 2
-  - uid: 240
+  - uid: 211
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: 2.5,-2.5
       parent: 2
 - proto: PirateHandyFlag
   entities:
-  - uid: 234
+  - uid: 209
     components:
     - type: Transform
-      parent: 91
+      parent: 197
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
 - proto: PlastitaniumWindow
   entities:
-  - uid: 11
+  - uid: 144
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
+      pos: -2.5,0.5
       parent: 2
-  - uid: 15
+  - uid: 151
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,12.5
       parent: 2
-  - uid: 47
+  - uid: 173
     components:
     - type: Transform
-      pos: -6.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
       parent: 2
-  - uid: 84
+  - uid: 180
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,4.5
+      pos: -0.5,-0.5
       parent: 2
-  - uid: 157
+  - uid: 183
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,5.5
+      pos: -0.5,8.5
       parent: 2
-  - uid: 159
+  - uid: 193
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,5.5
+      pos: 0.5,-0.5
       parent: 2
-  - uid: 187
+  - uid: 241
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,1.5
+      pos: 1.5,12.5
       parent: 2
-  - uid: 232
+  - uid: 243
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,3.5
+      pos: 1.5,6.5
       parent: 2
 - proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 133
+  - uid: 24
     components:
     - type: Transform
-      pos: -4.5,3.5
+      pos: -0.5,6.5
       parent: 2
     - type: FuelGenerator
       on: False
     - type: Physics
       bodyType: Static
+- proto: PowerCellRecharger
+  entities:
+  - uid: 157
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 2
 - proto: PoweredlightColoredBlack
   entities:
-  - uid: 183
+  - uid: 7
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,10.5
       parent: 2
 - proto: PoweredSmallLight
   entities:
-  - uid: 149
+  - uid: 146
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,6.5
+      pos: 2.5,7.5
       parent: 2
-  - uid: 215
+  - uid: 224
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,5.5
+      pos: 1.5,1.5
       parent: 2
 - proto: Railing
   entities:
-  - uid: 122
+  - uid: 52
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
       parent: 2
-  - uid: 128
+  - uid: 83
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -3.5,7.5
+      pos: 2.5,12.5
       parent: 2
-  - uid: 132
+  - uid: 150
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,7.5
       parent: 2
-  - uid: 170
+  - uid: 235
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,11.5
       parent: 2
-  - uid: 212
+  - uid: 239
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
       parent: 2
 - proto: RailingCorner
   entities:
-  - uid: 57
+  - uid: 138
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 2
+  - uid: 181
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 2
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
       parent: 2
 - proto: SheetPlasma
   entities:
-  - uid: 233
+  - uid: 188
     components:
     - type: Transform
-      pos: -4.5,3.5
+      pos: -0.5,6.5
       parent: 2
 - proto: ShuttleGunPirateCannon
   entities:
-  - uid: 158
+  - uid: 75
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 109
-  - uid: 160
+      - 226
+  - uid: 86
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,7.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 109
+      - 226
 - proto: SignalButtonDirectional
   entities:
-  - uid: 109
-    components:
-    - type: Transform
-      pos: -8.5,6.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        158:
-        - Pressed: Trigger
-        160:
-        - Pressed: Trigger
-  - uid: 129
+  - uid: 186
     components:
     - type: Transform
-      pos: -9.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,11.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        78:
+        184:
         - Pressed: Toggle
-        50:
+        219:
         - Pressed: Toggle
-        58:
+        4:
         - Pressed: Toggle
-        46:
+        212:
         - Pressed: Toggle
-        64:
+        171:
         - Pressed: Toggle
-        56:
+        220:
         - Pressed: Toggle
-- proto: SpawnPointPirate
-  entities:
-  - uid: 235
+  - uid: 226
     components:
     - type: Transform
-      pos: -4.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,10.5
       parent: 2
-- proto: SpawnPointPirateCaptain
+    - type: DeviceLinkSource
+      linkedPorts:
+        86:
+        - Pressed: Trigger
+        75:
+        - Pressed: Trigger
+- proto: SpawnPointLatejoin
   entities:
-  - uid: 245
+  - uid: 158
     components:
     - type: Transform
-      pos: -3.5,4.5
+      pos: 0.5,6.5
       parent: 2
-- proto: SpawnPointPirateFirstMate
+- proto: SpawnPointPirate
   entities:
-  - uid: 246
+  - uid: 164
     components:
     - type: Transform
-      pos: -2.5,4.5
+      pos: 0.5,7.5
       parent: 2
 - proto: SubstationBasic
   entities:
-  - uid: 111
+  - uid: 102
     components:
     - type: Transform
-      pos: -5.5,3.5
+      pos: -0.5,7.5
       parent: 2
-- proto: SuitStorageEVAPirate
+- proto: SuitStoragePirateCap
   entities:
-  - uid: 120
+  - uid: 156
     components:
     - type: Transform
-      pos: -0.5,3.5
+      pos: -0.5,9.5
       parent: 2
-- proto: SuitStoragePirateCap
+- proto: SuitStorageWallmountEVAPirate
   entities:
-  - uid: 30
+  - uid: 76
     components:
     - type: Transform
-      pos: -7.5,3.5
+      pos: -0.5,3.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14923
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: Physics
+      canCollide: False
 - proto: TableReinforced
   entities:
-  - uid: 79
+  - uid: 14
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,4.5
+      pos: 0.5,11.5
       parent: 2
-  - uid: 171
+  - uid: 163
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,5.5
+      pos: -0.5,2.5
       parent: 2
-  - uid: 177
+  - uid: 189
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,3.5
+      pos: -0.5,10.5
       parent: 2
-  - uid: 184
+  - uid: 217
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,3.5
+      pos: -0.5,11.5
+      parent: 2
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 1.5,11.5
       parent: 2
 - proto: Thruster
   entities:
-  - uid: 16
+  - uid: 8
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
-  - uid: 21
+  - uid: 13
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,0.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-1.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
-  - uid: 34
+  - uid: 15
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,-0.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
-  - uid: 59
+  - uid: 182
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,7.5
+      pos: -2.5,4.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
-  - uid: 193
+  - uid: 187
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
-  - uid: 195
+  - uid: 225
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,1.5
+      pos: -3.5,4.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
-  - uid: 228
+  - uid: 236
     components:
     - type: Transform
-      pos: 2.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,3.5
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
 - proto: WallPlastitanium
   entities:
-  - uid: 6
+  - uid: 18
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -1.5,3.5
       parent: 2
-  - uid: 12
+  - uid: 22
     components:
     - type: Transform
-      pos: 4.5,6.5
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 13
+  - uid: 25
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,7.5
+      pos: -3.5,2.5
       parent: 2
-  - uid: 17
+  - uid: 29
     components:
     - type: Transform
-      pos: 4.5,2.5
+      pos: -2.5,3.5
       parent: 2
-  - uid: 18
+  - uid: 30
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,5.5
+      pos: -1.5,9.5
       parent: 2
-  - uid: 19
+  - uid: 31
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,7.5
+      pos: -1.5,11.5
       parent: 2
-  - uid: 23
+  - uid: 32
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
+      pos: -3.5,1.5
       parent: 2
-  - uid: 25
+  - uid: 40
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,2.5
+      pos: -1.5,10.5
       parent: 2
-  - uid: 28
+  - uid: 42
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,7.5
+      pos: 1.5,4.5
       parent: 2
-  - uid: 29
+  - uid: 53
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,6.5
+      pos: 3.5,4.5
       parent: 2
-  - uid: 32
+  - uid: 54
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,6.5
+      pos: 2.5,-3.5
       parent: 2
-  - uid: 33
+  - uid: 61
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
+      pos: -1.5,-1.5
       parent: 2
-  - uid: 42
+  - uid: 62
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,2.5
+      pos: -1.5,-0.5
       parent: 2
-  - uid: 43
+  - uid: 69
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,2.5
+      pos: -1.5,-2.5
       parent: 2
-  - uid: 44
+  - uid: 72
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,2.5
+      pos: 3.5,3.5
       parent: 2
-  - uid: 82
+  - uid: 73
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,5.5
+      pos: 1.5,2.5
       parent: 2
-  - uid: 83
+  - uid: 77
     components:
     - type: Transform
-      pos: 3.5,6.5
+      pos: 3.5,0.5
       parent: 2
-  - uid: 85
+  - uid: 92
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,6.5
+      pos: -0.5,3.5
       parent: 2
-  - uid: 87
+  - uid: 94
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,5.5
+      pos: 2.5,9.5
       parent: 2
-  - uid: 106
+  - uid: 95
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,5.5
+      pos: 3.5,8.5
       parent: 2
-  - uid: 107
+  - uid: 97
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,2.5
+      pos: 2.5,10.5
       parent: 2
-  - uid: 115
+  - uid: 101
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,5.5
+      pos: 3.5,9.5
       parent: 2
-  - uid: 116
+  - uid: 103
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,2.5
+      pos: 1.5,5.5
       parent: 2
-  - uid: 117
+  - uid: 104
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,7.5
+      pos: -1.5,7.5
       parent: 2
-  - uid: 123
+  - uid: 107
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,5.5
+      pos: 1.5,3.5
       parent: 2
-  - uid: 136
+  - uid: 110
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,2.5
+      pos: 3.5,10.5
       parent: 2
-  - uid: 137
+  - uid: 116
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,2.5
+      pos: 1.5,8.5
       parent: 2
-  - uid: 152
+  - uid: 119
     components:
     - type: Transform
-      pos: 3.5,2.5
+      pos: -1.5,5.5
       parent: 2
-  - uid: 153
+  - uid: 123
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,7.5
+      pos: -1.5,4.5
       parent: 2
-  - uid: 155
+  - uid: 127
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,7.5
+      pos: -1.5,8.5
       parent: 2
-  - uid: 156
+  - uid: 128
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,7.5
+      pos: 2.5,8.5
       parent: 2
-  - uid: 174
+  - uid: 129
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,6.5
+      pos: 1.5,7.5
       parent: 2
-  - uid: 175
+  - uid: 133
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,6.5
+      pos: -1.5,6.5
       parent: 2
-  - uid: 176
+  - uid: 136
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,2.5
+      pos: 3.5,1.5
       parent: 2
-  - uid: 178
+  - uid: 140
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,7.5
+      pos: 2.5,11.5
       parent: 2
-  - uid: 190
+  - uid: 143
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,0.5
+      pos: 2.5,-0.5
       parent: 2
-  - uid: 191
+  - uid: 155
     components:
     - type: Transform
-      pos: -1.5,1.5
+      pos: -1.5,-3.5
       parent: 2
-  - uid: 192
+  - uid: 227
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,0.5
+      pos: 3.5,2.5
       parent: 2
-  - uid: 226
+  - uid: 233
     components:
     - type: Transform
-      pos: 5.5,2.5
+      pos: 2.5,-1.5
       parent: 2
-  - uid: 227
+  - uid: 246
     components:
     - type: Transform
-      pos: 5.5,6.5
+      pos: -3.5,0.5
       parent: 2
 - proto: WallPlastitaniumDiagonal
   entities:
-  - uid: 1
+  - uid: 84
     components:
     - type: Transform
-      pos: -9.5,7.5
+      pos: -1.5,12.5
       parent: 2
-  - uid: 22
+  - uid: 145
     components:
     - type: Transform
-      pos: 1.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,11.5
       parent: 2
-  - uid: 124
+  - uid: 185
     components:
     - type: Transform
-      pos: -10.5,6.5
+      pos: 2.5,0.5
       parent: 2
-  - uid: 125
+  - uid: 194
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,12.5
       parent: 2
-  - uid: 189
+  - uid: 214
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
       parent: 2
-  - uid: 194
+  - uid: 237
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
       parent: 2
 - proto: WallWeaponCapacitorRecharger
   entities:
-  - uid: 221
-    components:
-    - type: Transform
-      pos: -5.5,5.5
-      parent: 2
-  - uid: 236
+  - uid: 244
     components:
     - type: Transform
-      pos: -1.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,7.5
       parent: 2
 - proto: WarpPointShip
   entities:
-  - uid: 40
+  - uid: 93
     components:
     - type: Transform
-      pos: 0.5,4.5
+      pos: 0.5,1.5
       parent: 2
 ...
diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
index 4dc879b0f6a..e5439ab140c 100644
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -12,7 +12,7 @@
   - type: Transform
     anchored: true
   - type: Sprite
-    sprite: Structures/conveyor.rsi
+    sprite: _NF/Structures/conveyor.rsi # Frontier
     state: conveyor_started_cw
     drawdepth: FloorObjects
   - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
index 43d2484bbd2..317ac769183 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
@@ -8,7 +8,7 @@
           steps:
             - tag: ConveyorAssembly
               icon:
-                sprite: Structures/conveyor.rsi
+                sprite: _NF/Structures/conveyor.rsi # Frontier
                 state: conveyor_loose
               name: conveyor belt assembly
               doAfter: 2
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_loose.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_loose.png
new file mode 100644
index 00000000000..25e35a51939
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_loose.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw.png
new file mode 100644
index 00000000000..9887da3bb87
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw_r.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw_r.png
new file mode 100644
index 00000000000..a0adbe06869
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw_r.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw.png
new file mode 100644
index 00000000000..09fc8795fd8
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw_r.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw_r.png
new file mode 100644
index 00000000000..8b244c67a2f
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw_r.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_ccw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_ccw.png
new file mode 100644
index 00000000000..cd23250be38
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_ccw.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_cw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_cw.png
new file mode 100644
index 00000000000..065c5617c92
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_cw.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/greenlight.png b/Resources/Textures/_NF/Structures/conveyor.rsi/greenlight.png
new file mode 100644
index 00000000000..c50fb82d078
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/greenlight.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/meta.json b/Resources/Textures/_NF/Structures/conveyor.rsi/meta.json
new file mode 100644
index 00000000000..c9f16b2eea7
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/conveyor.rsi/meta.json
@@ -0,0 +1,256 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Dvir01",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "conveyor_loose"
+    },
+    {
+      "name": "conveyor_started_ccw",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_started_ccw_r",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_started_cw",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_started_cw_r",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_stopped_ccw",
+      "directions": 8
+    },
+    {
+      "name": "conveyor_stopped_cw",
+      "directions": 8
+    },
+    {
+      "name": "greenlight"
+    },
+    {
+      "name": "redlight"
+    },
+    {
+      "name": "switch"
+    },
+    {
+      "name": "switch-fwd"
+    },
+    {
+      "name": "switch-off"
+    },
+    {
+      "name": "switch-rev"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/redlight.png b/Resources/Textures/_NF/Structures/conveyor.rsi/redlight.png
new file mode 100644
index 00000000000..812c1a6508e
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/redlight.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch-fwd.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-fwd.png
new file mode 100644
index 00000000000..c13ef62ccc8
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-fwd.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch-off.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-off.png
new file mode 100644
index 00000000000..a89901f190e
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-off.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch-rev.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-rev.png
new file mode 100644
index 00000000000..f7530468331
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-rev.png differ
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch.png
new file mode 100644
index 00000000000..a89901f190e
Binary files /dev/null and b/Resources/Textures/_NF/Structures/conveyor.rsi/switch.png differ