diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml
index 1da3198e105..89df17c8720 100644
--- a/Resources/Maps/_NF/Shuttles/bazaar.yml
+++ b/Resources/Maps/_NF/Shuttles/bazaar.yml
@@ -1045,125 +1045,126 @@ entities:
     - type: Transform
       pos: -6.5,-3.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 55
+  - uid: 48
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,4.5
       parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
   - uid: 56
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-6.5
       parent: 1
   - uid: 57
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-5.5
       parent: 1
   - uid: 58
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-6.5
       parent: 1
   - uid: 59
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,3.5
       parent: 1
   - uid: 60
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -12.5,-5.5
+      pos: 13.5,-5.5
       parent: 1
   - uid: 61
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,4.5
+      pos: 0.5,-9.5
       parent: 1
   - uid: 62
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-4.5
+      pos: -0.5,-9.5
       parent: 1
   - uid: 63
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-6.5
+      pos: 10.5,0.5
       parent: 1
   - uid: 64
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-5.5
+      pos: -9.5,0.5
       parent: 1
   - uid: 65
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,0.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,0.5
+      pos: 11.5,0.5
       parent: 1
   - uid: 67
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,0.5
+      pos: -10.5,0.5
       parent: 1
   - uid: 68
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-4.5
       parent: 1
   - uid: 69
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,1.5
       parent: 1
   - uid: 70
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-6.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,2.5
       parent: 1
   - uid: 71
     components:
     - type: Transform
-      pos: 14.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-4.5
       parent: 1
   - uid: 72
     components:
     - type: Transform
-      pos: 14.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,1.5
       parent: 1
   - uid: 73
     components:
     - type: Transform
-      pos: -13.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,2.5
       parent: 1
-  - uid: 74
+  - uid: 75
     components:
     - type: Transform
-      pos: -13.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,3.5
       parent: 1
-  - uid: 75
+  - uid: 461
     components:
     - type: Transform
-      pos: -13.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,4.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -1404,51 +1405,33 @@ entities:
     - type: Transform
       pos: 11.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 938
   - uid: 83
     components:
     - type: Transform
       pos: -10.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 943
   - uid: 85
     components:
     - type: Transform
       pos: -9.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 943
   - uid: 590
     components:
     - type: Transform
       pos: 10.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 938
   - uid: 591
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 942
   - uid: 937
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 939
 - proto: ButtonFrameCaution
   entities:
   - uid: 4
@@ -2889,26 +2872,36 @@ entities:
     - type: Transform
       pos: 4.5,-3.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
   - uid: 387
     components:
     - type: Transform
       pos: -3.5,-3.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
 - proto: ConveyorBelt
   entities:
@@ -2918,54 +2911,36 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 650
   - uid: 349
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 650
   - uid: 350
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 650
   - uid: 351
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 649
   - uid: 352
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 649
   - uid: 353
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -13.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 649
 - proto: ConveyorBeltAssembly
   entities:
   - uid: 354
@@ -3670,6 +3645,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 74
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 95
     components:
     - type: Transform
@@ -4657,16 +4640,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPressurePumpOn
-  entities:
-  - uid: 461
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
 - proto: GasPressurePumpOnMax
   entities:
   - uid: 509
@@ -5120,6 +5093,14 @@ entities:
     - type: Transform
       pos: -1.5,10.5
       parent: 1
+- proto: LockerWallMaterialsFuelUraniumFilled2
+  entities:
+  - uid: 66
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,7.5
+      parent: 1
 - proto: MaterialReclaimer
   entities:
   - uid: 540
@@ -5134,6 +5115,20 @@ entities:
     - type: Transform
       pos: 3.280076,1.401608
       parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 604
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-3.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 194
@@ -5531,18 +5526,6 @@ entities:
     - type: Transform
       pos: 11.5,-7.5
       parent: 1
-- proto: SheetUranium
-  entities:
-  - uid: 48
-    components:
-    - type: Transform
-      pos: -10.480434,9.520037
-      parent: 1
-  - uid: 531
-    components:
-    - type: Transform
-      pos: -10.496059,7.488787
-      parent: 1
 - proto: ShuttersNormal
   entities:
   - uid: 525
@@ -5550,57 +5533,36 @@ entities:
     - type: Transform
       pos: -0.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 571
   - uid: 526
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 571
   - uid: 527
     components:
     - type: Transform
       pos: -2.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 571
   - uid: 549
     components:
     - type: Transform
       pos: 0.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 571
   - uid: 570
     components:
     - type: Transform
       pos: 1.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 571
   - uid: 573
     components:
     - type: Transform
       pos: 2.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 571
   - uid: 949
     components:
     - type: Transform
       pos: 3.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 571
 - proto: ShuttersNormalOpen
   entities:
   - uid: 192
@@ -5608,65 +5570,41 @@ entities:
     - type: Transform
       pos: -4.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 947
   - uid: 193
     components:
     - type: Transform
       pos: -6.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 775
     components:
     - type: Transform
       pos: -6.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 944
   - uid: 776
     components:
     - type: Transform
       pos: -4.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 947
   - uid: 950
     components:
     - type: Transform
       pos: 5.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 945
   - uid: 951
     components:
     - type: Transform
       pos: 5.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 945
   - uid: 952
     components:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 946
   - uid: 953
     components:
     - type: Transform
       pos: 7.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 946
 - proto: ShuttersRadiation
   entities:
   - uid: 235
@@ -5674,9 +5612,6 @@ entities:
     - type: Transform
       pos: -9.5,8.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 41
 - proto: ShuttleWindow
   entities:
   - uid: 577
@@ -5912,20 +5847,6 @@ entities:
     - type: Transform
       pos: -4.5,5.5
       parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 604
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-3.5
-      parent: 1
-  - uid: 605
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-3.5
-      parent: 1
 - proto: SinkEmpty
   entities:
   - uid: 523
@@ -6013,8 +5934,6 @@ entities:
     - type: Transform
       pos: -0.5,11.5
       parent: 1
-    - type: Physics
-      canCollide: False
 - proto: Table
   entities:
   - uid: 145