diff --git a/Resources/Maps/chibi.yml b/Resources/Maps/chibi.yml
index 14209b5445a..154a03caf37 100644
--- a/Resources/Maps/chibi.yml
+++ b/Resources/Maps/chibi.yml
@@ -1210,7 +1210,8 @@ entities:
           4,-2:
             0: 58623
           4,-1:
-            0: 63231
+            0: 59135
+            3: 4096
           -4,-2:
             1: 35008
           -3,-2:
@@ -1227,9 +1228,9 @@ entities:
           -2,-3:
             0: 4095
           -2,-2:
-            3: 17
+            4: 17
             0: 61440
-            4: 68
+            5: 68
           -2,-5:
             1: 63740
           -1,-4:
@@ -1345,14 +1346,14 @@ entities:
             1: 61440
           0,-7:
             1: 4383
-            5: 52224
+            6: 52224
           -1,-8:
             1: 32768
           -1,-7:
             1: 34952
           0,-6:
             1: 61713
-            5: 204
+            6: 204
           -1,-6:
             1: 65528
           0,-5:
@@ -1361,9 +1362,9 @@ entities:
             1: 36864
           1,-7:
             1: 15
-            5: 30464
+            6: 30464
           1,-6:
-            5: 119
+            6: 119
             1: 28672
           1,-5:
             1: 823
@@ -1496,6 +1497,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.6852
+          - 81.57766
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -2089,11 +2105,6 @@ entities:
       - 2606
 - proto: AirCanister
   entities:
-  - uid: 476
-    components:
-    - type: Transform
-      pos: -6.5,-14.5
-      parent: 2
   - uid: 494
     components:
     - type: Transform
@@ -2904,7 +2915,7 @@ entities:
   - uid: 4130
     components:
     - type: Transform
-      pos: 6.9053955,-13.725324
+      pos: 6.9110007,-13.601992
       parent: 2
 - proto: AntiPsychicKnife
   entities:
@@ -3327,14 +3338,6 @@ entities:
     - type: Transform
       pos: 0.09203553,9.5710945
       parent: 2
-- proto: BaseGasCondenser
-  entities:
-  - uid: 3836
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-12.5
-      parent: 2
 - proto: Beaker
   entities:
   - uid: 590
@@ -3440,6 +3443,13 @@ entities:
     - type: Transform
       pos: -0.7364657,15.77805
       parent: 2
+- proto: Biogenerator
+  entities:
+  - uid: 1323
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
 - proto: BiomassReclaimer
   entities:
   - uid: 369
@@ -3534,10 +3544,10 @@ entities:
       parent: 2
 - proto: BookLeafLoversSecret
   entities:
-  - uid: 324
+  - uid: 2645
     components:
     - type: Transform
-      pos: 3.5369291,1.5679168
+      pos: 6.515614,1.7625364
       parent: 2
 - proto: BookMedicalReferenceBook
   entities:
@@ -9762,10 +9772,10 @@ entities:
       parent: 2
 - proto: ClosetRadiationSuitFilled
   entities:
-  - uid: 2716
+  - uid: 749
     components:
     - type: Transform
-      pos: 7.5,-15.5
+      pos: 7.5,-14.5
       parent: 2
 - proto: ClosetToolFilled
   entities:
@@ -10122,6 +10132,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,11.5
       parent: 2
+- proto: CondenserMachineCircuitBoard
+  entities:
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 18.350609,-1.3538277
+      parent: 2
+  - uid: 744
+    components:
+    - type: Transform
+      pos: -5.5044107,-12.838328
+      parent: 2
 - proto: ConveyorBelt
   entities:
   - uid: 596
@@ -10411,14 +10433,11 @@ entities:
       parent: 2
 - proto: CrewMonitoringServer
   entities:
-  - uid: 370
+  - uid: 4105
     components:
     - type: Transform
-      pos: 19.5,-4.5
+      pos: 20.5,16.5
       parent: 2
-    - type: SingletonDeviceNetServer
-      active: False
-      available: False
 - proto: CryogenicSleepUnitSpawnerLateJoin
   entities:
   - uid: 133
@@ -11693,6 +11712,11 @@ entities:
     - type: Transform
       pos: 13.5,-25.5
       parent: 2
+  - uid: 742
+    components:
+    - type: Transform
+      pos: 19.5,-4.5
+      parent: 2
   - uid: 1197
     components:
     - type: Transform
@@ -11708,11 +11732,6 @@ entities:
     - type: Transform
       pos: 12.5,13.5
       parent: 2
-  - uid: 4105
-    components:
-    - type: Transform
-      pos: 16.5,0.5
-      parent: 2
 - proto: DonkpocketBoxSpawner
   entities:
   - uid: 1516
@@ -13600,6 +13619,13 @@ entities:
     - type: Transform
       pos: 30.484352,12.71384
       parent: 2
+- proto: FrezonCanister
+  entities:
+  - uid: 4313
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 2
 - proto: GasAnalyzer
   entities:
   - uid: 367
@@ -13665,7 +13691,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 9.5,-23.5
+      pos: 8.5,-23.5
       parent: 2
 - proto: GasMixerFlipped
   entities:
@@ -14575,12 +14601,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 744
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-23.5
-      parent: 2
   - uid: 746
     components:
     - type: Transform
@@ -18430,17 +18450,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 742
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-23.5
-      parent: 2
-  - uid: 749
-    components:
-    - type: Transform
-      pos: 9.5,-22.5
-      parent: 2
   - uid: 768
     components:
     - type: Transform
@@ -18459,6 +18468,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-23.5
       parent: 2
+  - uid: 4104
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-23.5
+      parent: 2
   - uid: 4208
     components:
     - type: Transform
@@ -18467,6 +18482,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAA00FF'
+  - uid: 4316
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 2
 - proto: GasPressurePump
   entities:
   - uid: 436
@@ -21302,6 +21322,33 @@ entities:
     - type: Transform
       pos: 22.403679,10.117976
       parent: 2
+- proto: LauncherSyringe
+  entities:
+  - uid: 1423
+    components:
+    - type: Transform
+      pos: 19.418198,1.2312825
+      parent: 2
+    - type: Storage
+      storedItems:
+        2716:
+          position: 0,0
+          _rotation: South
+        3375:
+          position: 1,0
+          _rotation: South
+        3836:
+          position: 2,0
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 2716
+          - 3375
+          - 3836
 - proto: LockableButtonEngineering
   entities:
   - uid: 686
@@ -21416,8 +21463,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -21434,9 +21481,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 1507
-          - 1206
           - 1512
+          - 1206
+          - 1507
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -21496,13 +21543,6 @@ entities:
     - type: Transform
       pos: 28.5,6.5
       parent: 2
-- proto: LockerFreezerVaultFilled
-  entities:
-  - uid: 1423
-    components:
-    - type: Transform
-      pos: 20.5,16.5
-      parent: 2
 - proto: LockerHeadOfSecurityFilledHardsuit
   entities:
   - uid: 1482
@@ -21880,6 +21920,26 @@ entities:
     - type: Transform
       pos: 11.340396,-4.510086
       parent: 2
+- proto: MiniSyringe
+  entities:
+  - uid: 2716
+    components:
+    - type: Transform
+      parent: 1423
+    - type: Physics
+      canCollide: False
+  - uid: 3375
+    components:
+    - type: Transform
+      parent: 1423
+    - type: Physics
+      canCollide: False
+  - uid: 3836
+    components:
+    - type: Transform
+      parent: 1423
+    - type: Physics
+      canCollide: False
 - proto: MopItem
   entities:
   - uid: 199
@@ -21945,6 +22005,16 @@ entities:
       parent: 2
 - proto: OxygenCanister
   entities:
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 10.5,-25.5
+      parent: 2
+  - uid: 370
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 2
   - uid: 484
     components:
     - type: Transform
@@ -21960,11 +22030,6 @@ entities:
     - type: Transform
       pos: 32.5,-17.5
       parent: 2
-  - uid: 1323
-    components:
-    - type: Transform
-      pos: 10.5,-25.5
-      parent: 2
   - uid: 1456
     components:
     - type: Transform
@@ -22847,11 +22912,6 @@ entities:
     - type: Transform
       pos: 22.5,16.5
       parent: 2
-  - uid: 2645
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 2
   - uid: 4136
     components:
     - type: Transform
@@ -23652,6 +23712,13 @@ entities:
     - type: Transform
       pos: 7.5,-6.5
       parent: 2
+- proto: ReverseEngineeringMachine
+  entities:
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 2
 - proto: Roboisseur
   entities:
   - uid: 188
@@ -24043,10 +24110,10 @@ entities:
       parent: 2
 - proto: SignChem
   entities:
-  - uid: 3375
+  - uid: 4314
     components:
     - type: Transform
-      pos: 19.5,-1.5
+      pos: 20.5,-1.5
       parent: 2
 - proto: SignCryogenicsMed
   entities:
@@ -24779,10 +24846,10 @@ entities:
       parent: 2
 - proto: SpawnMobWalter
   entities:
-  - uid: 4104
+  - uid: 4315
     components:
     - type: Transform
-      pos: 16.5,0.5
+      pos: 19.5,-4.5
       parent: 2
 - proto: SpawnPointAtmos
   entities:
@@ -25163,11 +25230,6 @@ entities:
       parent: 2
 - proto: StorageCanister
   entities:
-  - uid: 576
-    components:
-    - type: Transform
-      pos: -7.5,-14.5
-      parent: 2
   - uid: 630
     components:
     - type: Transform
@@ -25275,7 +25337,7 @@ entities:
     - type: Transform
       pos: 26.5,-15.5
       parent: 2
-- proto: SuitStorageSec
+- proto: SuitStorageSecDeltaV
   entities:
   - uid: 1480
     components:
@@ -26010,7 +26072,7 @@ entities:
   - uid: 4102
     components:
     - type: Transform
-      pos: 6.8071203,-14.810205
+      pos: 6.5985007,-14.748621
       parent: 2
 - proto: TrashBag
   entities:
@@ -26297,10 +26359,10 @@ entities:
       parent: 2
 - proto: VendingMachineSeedsUnlocked
   entities:
-  - uid: 110
+  - uid: 324
     components:
     - type: Transform
-      pos: 4.5,1.5
+      pos: 3.5,1.5
       parent: 2
 - proto: VendingMachineTankDispenserEVA
   entities:
@@ -28966,7 +29028,7 @@ entities:
   - uid: 85
     components:
     - type: Transform
-      pos: 3.4305947,1.6056892
+      pos: 5.86946,-0.30139673
       parent: 2
   - uid: 366
     components: