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
new file mode 100644
index 00000000000..728cab1d4de
--- /dev/null
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
@@ -0,0 +1,2071 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  12: FloorBar
+  1: FloorDark
+  32: FloorDarkMini
+  2: FloorDarkMono
+  37: FloorDarkPlastic
+  97: FloorTechMaint
+  3: FloorTechMaint2
+  113: Lattice
+  114: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 2
+    components:
+    - type: MetaData
+    - type: Transform
+      pos: -0.4375,-1.703125
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AgAAAAAAcgAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAcgAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          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
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: IFF
+      flags: HideLabel
+    - 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:
+            60: -1,-2
+            61: 0,-2
+            62: 0,-3
+            63: -1,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: BotGreyscale
+          decals:
+            64: 0,0
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            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:
+            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: StandClear
+          decals:
+            69: 1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: StandClearGreyscale
+          decals:
+            72: 0,8
+            73: 0,3
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineGreyscaleN
+          decals:
+            65: 2,1
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            68: 2,3
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 21879
+          -1,0:
+            0: 3820
+            1: 4096
+          0,1:
+            0: 4373
+            1: 52416
+          -1,1:
+            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
+          moles:
+          - 21.824879
+          - 82.10312
+          - 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
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirCanister
+  entities:
+  - uid: 126
+    components:
+    - type: Transform
+      anchored: True
+      pos: -0.5,0.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: AirlockExternalGlass
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+    - type: Door
+      secondsUntilStateChange: -93.89965
+      state: Opening
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
+- proto: AirlockHatch
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
+- proto: AirlockShuttleSyndicate
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 2
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 2
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 2
+- proto: APCBasic
+  entities:
+  - uid: 221
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,9.5
+      parent: 2
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 2
+  - uid: 218
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 2
+  - uid: 247
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 2
+  - 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: 3.5,6.5
+      parent: 2
+- proto: BlastDoorOpen
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 186
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 186
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 186
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 186
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 186
+  - uid: 220
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 186
+- proto: BoxBodyBag
+  entities:
+  - uid: 192
+    components:
+    - type: Transform
+      parent: 191
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 213
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,11.5
+      parent: 2
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,10.5
+      parent: 2
+- proto: CableApcExtension
+  entities:
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 2
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 2
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 2
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 2
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+  - uid: 154
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 2
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 2
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 2
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+- proto: CableHV
+  entities:
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+- proto: CableMV
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 27
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 2
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 2
+- proto: CannonBall
+  entities:
+  - uid: 205
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 206
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 207
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 208
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: CannonBallGlassshot
+  entities:
+  - uid: 201
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 202
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 203
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 204
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: CannonBallGrapeshot
+  entities:
+  - uid: 198
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 199
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 200
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 210
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: Catwalk
+  entities:
+  - uid: 80
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,10.5
+      parent: 2
+  - uid: 82
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 2
+  - uid: 87
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,6.5
+      parent: 2
+  - uid: 88
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 2
+  - uid: 89
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 2
+  - uid: 147
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 2
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,9.5
+      parent: 2
+  - uid: 159
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
+      parent: 2
+  - uid: 160
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 161
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 174
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,7.5
+      parent: 2
+  - uid: 177
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 2
+  - uid: 190
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 215
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 2
+  - uid: 228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 2
+  - uid: 229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 2
+  - uid: 230
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,2.5
+      parent: 2
+  - uid: 232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 2
+  - uid: 234
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 238
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,9.5
+      parent: 2
+  - uid: 240
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,7.5
+      parent: 2
+  - uid: 242
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 2
+- proto: ChairPilotSeat
+  entities:
+  - uid: 100
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,10.5
+      parent: 2
+  - uid: 172
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 2
+- proto: ClockworkGrille
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 2
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 2
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 2
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
+  - uid: 85
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 2
+- proto: ClosetWall
+  entities:
+  - uid: 191
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.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: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 192
+- proto: ComputerIFF
+  entities:
+  - uid: 195
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,9.5
+      parent: 2
+- proto: ComputerTabletopRadar
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
+- proto: ComputerTabletopShuttleAntag
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 2
+- proto: ComputerTabletopStationRecords
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,10.5
+      parent: 2
+- proto: CratePirate
+  entities:
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 0.5,0.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: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 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: 149
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 2
+- proto: DisposalBend
+  entities:
+  - uid: 178
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,2.5
+      parent: 2
+- proto: DisposalPipe
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
+  - uid: 124
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 2
+- proto: DisposalTrunk
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 2
+  - uid: 98
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-2.5
+      parent: 2
+- proto: DisposalUnit
+  entities:
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 2
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 231
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
+      parent: 2
+- proto: FaxMachineShipAntag
+  entities:
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 2
+- proto: GasPassiveVent
+  entities:
+  - uid: 121
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 134
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 26
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 28
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 38
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 43
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 78
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 91
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 96
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,9.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 108
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,4.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 112
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 113
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 114
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,7.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 117
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 118
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 125
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 130
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 41
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 48
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 49
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+- proto: GasPort
+  entities:
+  - uid: 131
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+- proto: GasVentPump
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 132
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 141
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,2.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+  - uid: 142
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0088FFFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 165
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+  - uid: 166
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1111FF'
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+- proto: Gyroscope
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+- proto: LockerWallMedicalFilled
+  entities:
+  - uid: 216
+    components:
+    - type: Transform
+      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: 79
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 2
+  - uid: 152
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 2
+  - uid: 170
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 2
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+- proto: PirateHandyFlag
+  entities:
+  - uid: 209
+    components:
+    - type: Transform
+      parent: 197
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: PlastitaniumWindow
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,12.5
+      parent: 2
+  - uid: 173
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
+      parent: 2
+  - uid: 180
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 2
+  - uid: 183
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 241
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,12.5
+      parent: 2
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
+- proto: PortableGeneratorPacmanShuttle
+  entities:
+  - uid: 24
+    components:
+    - type: Transform
+      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: 7
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,10.5
+      parent: 2
+- proto: PoweredSmallLight
+  entities:
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 2
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+- proto: Railing
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 83
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,12.5
+      parent: 2
+  - uid: 150
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,7.5
+      parent: 2
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,11.5
+      parent: 2
+  - uid: 239
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
+      parent: 2
+- proto: RailingCorner
+  entities:
+  - uid: 138
+    components:
+    - type: Transform
+      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: 188
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+- proto: ShuttleGunPirateCannon
+  entities:
+  - uid: 75
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 226
+  - uid: 86
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,7.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 226
+- proto: SignalButtonDirectional
+  entities:
+  - uid: 186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        184:
+        - Pressed: Toggle
+        219:
+        - Pressed: Toggle
+        4:
+        - Pressed: Toggle
+        212:
+        - Pressed: Toggle
+        171:
+        - Pressed: Toggle
+        220:
+        - Pressed: Toggle
+  - uid: 226
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,10.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        86:
+        - Pressed: Trigger
+        75:
+        - Pressed: Trigger
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 2
+- proto: SpawnPointPirate
+  entities:
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+- proto: SubstationBasic
+  entities:
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+- proto: SuitStoragePirateCap
+  entities:
+  - uid: 156
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 2
+- proto: SuitStorageWallmountEVAPirate
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      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: 14
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
+  - uid: 163
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 2
+  - uid: 189
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 2
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 2
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 2
+- proto: Thruster
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 13
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-1.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 15
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-0.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 182
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 187
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 225
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 236
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,3.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
+- proto: WallPlastitanium
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 25
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 2
+  - uid: 29
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 2
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -1.5,9.5
+      parent: 2
+  - uid: 31
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 2
+  - uid: 32
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 2
+  - uid: 40
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 2
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 2
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 2
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 2
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 2
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 2
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 2
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 2
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 104
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 2
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 2
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 2
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 123
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 2
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 2
+  - uid: 129
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 2
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 2
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 2
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 155
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 2
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 2
+- proto: WallPlastitaniumDiagonal
+  entities:
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -1.5,12.5
+      parent: 2
+  - uid: 145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,11.5
+      parent: 2
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,12.5
+      parent: 2
+  - uid: 214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
+      parent: 2
+  - uid: 237
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 2
+- proto: WallWeaponCapacitorRecharger
+  entities:
+  - uid: 244
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,7.5
+      parent: 2
+- proto: WarpPointShip
+  entities:
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+...
\ No newline at end of file
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