diff --git a/Resources/Maps/chibi.yml b/Resources/Maps/chibi.yml
index ee3672fb9cd..8db5b0e4e4f 100644
--- a/Resources/Maps/chibi.yml
+++ b/Resources/Maps/chibi.yml
@@ -81,7 +81,7 @@ entities:
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: gQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAABgAAAAACBgAAAAABEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABAQAAAAADYAAAAAACgQAAAAAABgAAAAAACwAAAAADEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADBgAAAAACBgAAAAADCwAAAAACEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACCQAAAAAAYAAAAAABAQAAAAACYAAAAAACCQAAAAAABgAAAAABBgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAACBgAAAAAABgAAAAAABgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACYAAAAAABYAAAAAAAYAAAAAAACQAAAAAABgAAAAADCwAAAAABEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAQAAAAAAYAAAAAADgQAAAAAABgAAAAABCwAAAAABEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAABgQAAAAAABgAAAAAABgAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAABBgAAAAABBgAAAAACBgAAAAAAEQAAAAAAEQAAAAAABgAAAAADYAAAAAABBgAAAAACBgAAAAABgQAAAAAABgAAAAABBgAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAABgAAAAAABgAAAAACBgAAAAADBgAAAAADBgAAAAABAQAAAAAABgAAAAACBgAAAAAABgAAAAABBgAAAAACBgAAAAABgQAAAAAAYAAAAAADAQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAAACQAAAAAAgQAAAAAAYAAAAAABgQAAAAAACQAAAAAABgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAABgAAAAABBgAAAAAABgAAAAAABgAAAAADBgAAAAADAQAAAAADgQAAAAAAAgAAAAACAgAAAAADAgAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAABgAAAAABBgAAAAABBgAAAAACBgAAAAABBgAAAAACBgAAAAABYAAAAAABAQAAAAADAQAAAAABAgAAAAACAgAAAAACAgAAAAADYAAAAAABAQAAAAADYAAAAAADBgAAAAAAAQAAAAACAQAAAAADBgAAAAACBgAAAAABBgAAAAADgQAAAAAAgQAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAAACQAAAAAAYAAAAAAAAQAAAAABYAAAAAACBgAAAAAABgAAAAAABgAAAAADBgAAAAABBgAAAAADBgAAAAABgQAAAAAABQAAAAAAgQAAAAAAAwAAAAABAwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAACQAAAAAABgAAAAABBgAAAAADBgAAAAABBgAAAAAABgAAAAACCQAAAAAABQAAAAAAAwAAAAAAAwAAAAACAwAAAAADAwAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADBgAAAAADAQAAAAADAQAAAAAABgAAAAACBgAAAAAABgAAAAABCQAAAAAABQAAAAAA
+          tiles: gQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAABgAAAAACBgAAAAABEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABAQAAAAADYAAAAAACgQAAAAAABgAAAAAACwAAAAADEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADBgAAAAACBgAAAAADCwAAAAACEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACCQAAAAAAYAAAAAABAQAAAAACYAAAAAACCQAAAAAABgAAAAABBgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAACBgAAAAAABgAAAAAABgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACYAAAAAABYAAAAAAAYAAAAAAACQAAAAAABgAAAAADCwAAAAABEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAQAAAAAAYAAAAAADgQAAAAAABgAAAAABCwAAAAABEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAABgQAAAAAAgQAAAAAABgAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAABBgAAAAABBgAAAAACBgAAAAAAEQAAAAAAEQAAAAAABgAAAAADYAAAAAABBgAAAAACBgAAAAABgQAAAAAABgAAAAABBgAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAABgAAAAAABgAAAAACBgAAAAADBgAAAAADBgAAAAABAQAAAAAABgAAAAACBgAAAAAABgAAAAABBgAAAAACBgAAAAABgQAAAAAAYAAAAAADAQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAAACQAAAAAAgQAAAAAAYAAAAAABgQAAAAAACQAAAAAABgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAABgAAAAABBgAAAAAABgAAAAAABgAAAAADBgAAAAADAQAAAAADgQAAAAAAAgAAAAACAgAAAAADAgAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAABgAAAAABBgAAAAABBgAAAAACBgAAAAABBgAAAAACBgAAAAABYAAAAAABAQAAAAADAQAAAAABAgAAAAACAgAAAAACAgAAAAADYAAAAAABAQAAAAADYAAAAAADBgAAAAAAAQAAAAACAQAAAAADBgAAAAACBgAAAAABBgAAAAADgQAAAAAAgQAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAAACQAAAAAAYAAAAAAAAQAAAAABYAAAAAACBgAAAAAABgAAAAAABgAAAAADBgAAAAABBgAAAAADBgAAAAABgQAAAAAABQAAAAAAgQAAAAAAAwAAAAABAwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAACQAAAAAABgAAAAABBgAAAAADBgAAAAABBgAAAAAABgAAAAACCQAAAAAABQAAAAAAAwAAAAAAAwAAAAACAwAAAAADAwAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADBgAAAAADAQAAAAADAQAAAAAABgAAAAACBgAAAAAABgAAAAABCQAAAAAABQAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
@@ -1095,7 +1095,8 @@ entities:
           2,-1:
             0: 41647
           2,4:
-            0: 3812
+            0: 1764
+            2: 2048
           3,0:
             0: 63095
           3,1:
@@ -1126,8 +1127,8 @@ entities:
             1: 51340
           -3,0:
             0: 28672
-            2: 2
-            3: 236
+            3: 2
+            4: 236
           -3,1:
             0: 127
             1: 28672
@@ -1141,13 +1142,13 @@ entities:
           -3,2:
             1: 44661
           -3,-1:
-            3: 57344
+            4: 57344
             0: 2286
           -3,4:
             0: 2730
             1: 1092
           -2,0:
-            3: 17
+            4: 17
             0: 61646
           -2,1:
             0: 62207
@@ -1158,7 +1159,7 @@ entities:
             1: 15
             0: 58608
           -2,-1:
-            3: 4096
+            4: 4096
             0: 51379
           -2,4:
             0: 2730
@@ -1182,7 +1183,7 @@ entities:
             0: 65535
           1,-3:
             0: 30710
-            4: 32768
+            5: 32768
           1,-2:
             0: 61695
           2,-2:
@@ -1223,9 +1224,9 @@ entities:
           -2,-3:
             0: 4095
           -2,-2:
-            5: 17
+            6: 17
             0: 61440
-            6: 68
+            7: 68
           -2,-5:
             1: 63740
           -1,-4:
@@ -1341,21 +1342,21 @@ entities:
             1: 32768
           0,-6:
             1: 62258
-            7: 136
+            8: 136
           -1,-6:
             1: 65528
           0,-5:
             1: 4095
           0,-7:
             1: 8928
-            7: 32768
+            8: 32768
           1,-8:
             1: 36864
           1,-7:
             1: 127
-            7: 28672
+            8: 28672
           1,-6:
-            7: 119
+            8: 119
             1: 28672
           1,-5:
             1: 823
@@ -1475,6 +1476,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 234.99979
           moles:
@@ -2102,13 +2118,17 @@ entities:
       - 2712
       - 2713
       - 2717
-- proto: AirCanister
-  entities:
-  - uid: 364
+  - uid: 4254
     components:
     - type: Transform
-      pos: 20.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-25.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 2709
+- proto: AirCanister
+  entities:
   - uid: 476
     components:
     - type: Transform
@@ -2278,8 +2298,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2732
     - type: DeviceLinkSource
       linkedPorts:
         2732:
@@ -2291,8 +2309,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2731
     - type: DeviceLinkSource
       linkedPorts:
         2731:
@@ -2306,8 +2322,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2734
     - type: DeviceLinkSource
       linkedPorts:
         2734:
@@ -2319,8 +2333,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2733
     - type: DeviceLinkSource
       linkedPorts:
         2733:
@@ -2332,8 +2344,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2741
     - type: DeviceLinkSource
       linkedPorts:
         2741:
@@ -2345,8 +2355,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2740
     - type: DeviceLinkSource
       linkedPorts:
         2740:
@@ -2358,8 +2366,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2781
     - type: DeviceLinkSource
       linkedPorts:
         2781:
@@ -2371,8 +2377,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2780
     - type: DeviceLinkSource
       linkedPorts:
         2780:
@@ -2386,9 +2390,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 2737
-      - 2738
     - type: DeviceLinkSource
       linkedPorts:
         2737:
@@ -2402,9 +2403,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 2737
-      - 2738
     - type: DeviceLinkSource
       linkedPorts:
         2737:
@@ -2418,9 +2416,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 2736
-      - 2735
     - type: DeviceLinkSource
       linkedPorts:
         2736:
@@ -2434,9 +2429,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 2736
-      - 2735
     - type: DeviceLinkSource
       linkedPorts:
         2736:
@@ -2482,8 +2474,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2841
     - type: DeviceLinkSource
       linkedPorts:
         2841:
@@ -2750,9 +2740,6 @@ entities:
     - type: Transform
       pos: 14.5,-1.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1033
   - uid: 2771
     components:
     - type: Transform
@@ -2816,9 +2803,6 @@ entities:
     - type: Transform
       pos: 26.5,5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 4133
   - uid: 2789
     components:
     - type: Transform
@@ -2836,8 +2820,6 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2842
     - type: DeviceLinkSource
       linkedPorts:
         2842:
@@ -2883,6 +2865,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 2708
+      - 4254
 - proto: AlwaysPoweredSmallLightMaintenance
   entities:
   - uid: 1784
@@ -2963,6 +2946,15 @@ entities:
     - type: Transform
       pos: 6.9053955,-13.725324
       parent: 2
+- proto: AntiPsychicKnife
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: APCBasic
   entities:
   - uid: 242
@@ -3328,6 +3320,14 @@ 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
@@ -3447,35 +3447,21 @@ entities:
     - type: Transform
       pos: 4.5,-21.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 687
-      - 686
   - uid: 681
     components:
     - type: Transform
       pos: 3.5,-21.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 687
-      - 686
   - uid: 822
     components:
     - type: Transform
       pos: 1.5,-16.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1392
   - uid: 823
     components:
     - type: Transform
       pos: 0.5,-16.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1392
 - proto: BoardGameSpawner
   entities:
   - uid: 88
@@ -3504,19 +3490,19 @@ entities:
     - type: Transform
       pos: 0.66429377,9.789996
       parent: 2
-- proto: BookChefGaming
+- proto: BookEngineersHandbook
   entities:
-  - uid: 132
+  - uid: 4080
     components:
     - type: Transform
-      pos: -4.6419573,-1.1048201
+      pos: 13.36858,-13.745592
       parent: 2
-- proto: BookEngineersHandbook
+- proto: BookHowToCookForFortySpaceman
   entities:
-  - uid: 4080
+  - uid: 132
     components:
     - type: Transform
-      pos: 13.36858,-13.745592
+      pos: -4.6419573,-1.1048201
       parent: 2
 - proto: BookHowToKeepStationClean
   entities:
@@ -3648,6 +3634,12 @@ entities:
       parent: 2
 - proto: ButtonFrameCaution
   entities:
+  - uid: 91
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-16.5
+      parent: 2
   - uid: 128
     components:
     - type: Transform
@@ -8676,6 +8668,11 @@ entities:
     - type: Transform
       pos: 3.5,-13.5
       parent: 2
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 19.5,-8.5
+      parent: 2
   - uid: 775
     components:
     - type: Transform
@@ -9737,25 +9734,25 @@ entities:
     - type: Transform
       pos: 25.222517,-17.675888
       parent: 2
-  - uid: 774
+  - uid: 2214
     components:
     - type: Transform
-      pos: 13.276499,-25.63269
+      pos: 14.731315,-13.678445
       parent: 2
-  - uid: 2214
+  - uid: 3989
     components:
     - type: Transform
-      pos: 14.731315,-13.678445
+      pos: 14.220898,-13.230217
       parent: 2
-  - uid: 3836
+  - uid: 4252
     components:
     - type: Transform
-      pos: 13.703583,-25.174038
+      pos: 14.269526,-25.660843
       parent: 2
-  - uid: 3989
+  - uid: 4253
     components:
     - type: Transform
-      pos: 14.220898,-13.230217
+      pos: 14.7174425,-25.191769
       parent: 2
 - proto: ClothingHeadHatWarden
   entities:
@@ -10016,198 +10013,132 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1142
   - uid: 600
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -7.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1258
   - uid: 623
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -8.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1258
   - uid: 1030
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1077
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-11.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1078
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-10.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1079
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-9.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1083
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1084
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 30.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1085
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 31.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1086
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 32.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1087
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 33.5,-8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1307
   - uid: 1088
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 33.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1306
   - uid: 1089
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 32.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1306
   - uid: 1090
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 31.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1306
   - uid: 1091
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 30.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1306
   - uid: 1092
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1306
   - uid: 1093
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-3.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1306
   - uid: 1094
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1306
   - uid: 1129
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 24.5,-2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1142
   - uid: 1131
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 23.5,-2.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1142
   - uid: 1406
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -9.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1258
 - proto: CrateArtifactContainer
   entities:
   - uid: 401
@@ -11643,6 +11574,11 @@ entities:
       parent: 2
 - proto: DogBed
   entities:
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 13.5,-25.5
+      parent: 2
   - uid: 1197
     components:
     - type: Transform
@@ -11663,11 +11599,6 @@ entities:
     - type: Transform
       pos: 16.5,0.5
       parent: 2
-  - uid: 4231
-    components:
-    - type: Transform
-      pos: 12.5,-25.5
-      parent: 2
 - proto: DonkpocketBoxSpawner
   entities:
   - uid: 1516
@@ -11807,7 +11738,7 @@ entities:
       parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 301
+  - uid: 522
     components:
     - type: Transform
       pos: 14.5,16.5
@@ -11864,6 +11795,19 @@ entities:
       - 3986
       - 3987
       - 3985
+  - uid: 3854
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-14.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 2714
+      - 2715
+      - 2712
+      - 2713
+      - 2717
   - uid: 3960
     components:
     - type: Transform
@@ -12189,19 +12133,6 @@ entities:
       devices:
       - 2653
       - 2654
-  - uid: 4095
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-16.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 2714
-      - 2715
-      - 2712
-      - 2713
-      - 2717
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 1466
@@ -13050,7 +12981,7 @@ entities:
       - 4207
       - 2718
       - 3978
-      - 4095
+      - 3854
   - uid: 2713
     components:
     - type: Transform
@@ -13061,7 +12992,7 @@ entities:
       - 4207
       - 2718
       - 3978
-      - 4095
+      - 3854
   - uid: 2714
     components:
     - type: Transform
@@ -13073,7 +13004,7 @@ entities:
       - 4207
       - 2718
       - 3978
-      - 4095
+      - 3854
   - uid: 2715
     components:
     - type: Transform
@@ -13085,7 +13016,7 @@ entities:
       - 4207
       - 2718
       - 3978
-      - 4095
+      - 3854
   - uid: 2717
     components:
     - type: Transform
@@ -13095,7 +13026,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 4207
-      - 4095
+      - 3854
   - uid: 2719
     components:
     - type: Transform
@@ -13391,11 +13322,6 @@ entities:
     - type: Transform
       pos: 27.54671,6.4799376
       parent: 2
-  - uid: 1557
-    components:
-    - type: Transform
-      pos: -4.494746,-14.484572
-      parent: 2
   - uid: 3911
     components:
     - type: Transform
@@ -13406,6 +13332,11 @@ entities:
     - type: Transform
       pos: 10.235386,-15.528822
       parent: 2
+  - uid: 4231
+    components:
+    - type: Transform
+      pos: 0.5559509,-18.66202
+      parent: 2
 - proto: FloorDrain
   entities:
   - uid: 138
@@ -13594,6 +13525,9 @@ entities:
   entities:
   - uid: 357
     components:
+    - type: MetaData
+      desc: Very useful for filtering gases out of the cryo pipes.
+      name: cryo gas filter
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 17.5,-7.5
@@ -14511,6 +14445,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#00AAFFFF'
+  - uid: 1537
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-8.5
+      parent: 2
   - uid: 1934
     components:
     - type: Transform
@@ -18229,12 +18169,6 @@ entities:
       color: '#00AAFFFF'
 - proto: GasPort
   entities:
-  - uid: 363
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,-8.5
-      parent: 2
   - uid: 399
     components:
     - type: Transform
@@ -18310,12 +18244,6 @@ entities:
       color: '#FFAA00FF'
 - proto: GasPressurePump
   entities:
-  - uid: 356
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,-8.5
-      parent: 2
   - uid: 436
     components:
     - type: MetaData
@@ -18398,13 +18326,24 @@ entities:
       targetPressure: 4500
   - uid: 1493
     components:
+    - type: MetaData
+      desc: A pump that moves gas into the cryo pipes by pressure.
+      name: cryo gas pump
     - type: Transform
       pos: 18.5,-6.5
       parent: 2
+    - type: GasPressurePump
+      targetPressure: 100
     - type: AtmosPipeColor
       color: '#00AAFFFF'
 - proto: GasThermoMachineFreezerEnabled
   entities:
+  - uid: 32
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-8.5
+      parent: 2
   - uid: 1161
     components:
     - type: Transform
@@ -20906,15 +20845,12 @@ entities:
     - type: Transform
       pos: 4.5,-23.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 688
 - proto: IngotGold
   entities:
   - uid: 410
     components:
     - type: Transform
-      pos: 6.6966734,-6.2569885
+      pos: 5.19535,-6.1434913
       parent: 2
     - type: Stack
       count: 10
@@ -21137,6 +21073,18 @@ entities:
         - Pressed: Toggle
         822:
         - Pressed: Toggle
+  - uid: 4250
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-16.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        822:
+        - Pressed: Toggle
+        823:
+        - Pressed: Toggle
 - proto: LockerAtmosphericsFilled
   entities:
   - uid: 478
@@ -21158,6 +21106,35 @@ entities:
     - type: Transform
       pos: 11.5,18.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        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:
+          - 127
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerChemistryFilled
   entities:
   - uid: 328
@@ -21303,9 +21280,10 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 1748
-          - 1749
           - 4010
+          - 1749
+          - 1748
+          - 363
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -21391,9 +21369,6 @@ entities:
     - type: Transform
       pos: 0.5,-14.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 4210
 - proto: MachineCentrifuge
   entities:
   - uid: 332
@@ -21417,6 +21392,11 @@ entities:
       parent: 2
 - proto: MaintenanceFluffSpawner
   entities:
+  - uid: 1417
+    components:
+    - type: Transform
+      pos: 11.5,5.5
+      parent: 2
   - uid: 3793
     components:
     - type: Transform
@@ -21462,11 +21442,6 @@ entities:
     - type: Transform
       pos: 12.5,11.5
       parent: 2
-  - uid: 3813
-    components:
-    - type: Transform
-      pos: 11.5,5.5
-      parent: 2
   - uid: 3814
     components:
     - type: Transform
@@ -21771,13 +21746,6 @@ entities:
 
 
         Please burn this document after reading, and maybe the station too while you're at it.
-- proto: PaperBin20
-  entities:
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 2.5,13.5
-      parent: 2
 - proto: PaperBiscuitCorporateSpareID
   entities:
   - uid: 4137
@@ -21865,6 +21833,13 @@ entities:
     - type: Transform
       pos: 24.5,-2.5
       parent: 2
+- proto: PlushieHampter
+  entities:
+  - uid: 4251
+    components:
+    - type: Transform
+      pos: 26.463293,2.5566661
+      parent: 2
 - proto: PortableGeneratorJrPacman
   entities:
   - uid: 1544
@@ -21921,11 +21896,6 @@ entities:
     - type: Transform
       pos: -12.5,5.5
       parent: 2
-  - uid: 522
-    components:
-    - type: Transform
-      pos: 18.5,16.5
-      parent: 2
   - uid: 1106
     components:
     - type: Transform
@@ -22098,11 +22068,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,8.5
       parent: 2
-  - uid: 3854
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 2
   - uid: 3855
     components:
     - type: Transform
@@ -22272,6 +22237,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,20.5
       parent: 2
+  - uid: 4249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-2.5
+      parent: 2
 - proto: PoweredLightBlueInterior
   entities:
   - uid: 1290
@@ -22652,10 +22623,10 @@ entities:
       parent: 2
 - proto: RandomPainting
   entities:
-  - uid: 4057
+  - uid: 3813
     components:
     - type: Transform
-      pos: 1.5,18.5
+      pos: 2.5,18.5
       parent: 2
 - proto: RandomPosterAny
   entities:
@@ -22972,9 +22943,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,-4.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 1258
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 625
@@ -23527,7 +23495,7 @@ entities:
   - uid: 83
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: 5.44535,-6.393665
       parent: 2
   - uid: 842
     components:
@@ -24322,19 +24290,19 @@ entities:
     - type: Transform
       pos: 22.5,-24.5
       parent: 2
-- proto: SpaceCashLuckyBill
+- proto: SophicScribe
   entities:
-  - uid: 4097
+  - uid: 4095
     components:
     - type: Transform
-      pos: 22.348318,14.453911
+      pos: 0.5,17.5
       parent: 2
-- proto: SpaceHeaterAnchored
+- proto: SpaceCashLuckyBill
   entities:
-  - uid: 1537
+  - uid: 4097
     components:
     - type: Transform
-      pos: -7.5,-12.5
+      pos: 22.348318,14.453911
       parent: 2
 - proto: SpaceVillainArcadeFilled
   entities:
@@ -24366,10 +24334,10 @@ entities:
       parent: 2
 - proto: SpawnMobCatException
   entities:
-  - uid: 4232
+  - uid: 301
     components:
     - type: Transform
-      pos: 12.5,-25.5
+      pos: 13.5,-25.5
       parent: 2
 - proto: SpawnMobCatSpace
   entities:
@@ -25390,11 +25358,6 @@ entities:
       parent: 2
 - proto: TableCounterWood
   entities:
-  - uid: 127
-    components:
-    - type: Transform
-      pos: 2.5,13.5
-      parent: 2
   - uid: 155
     components:
     - type: Transform
@@ -25420,11 +25383,6 @@ entities:
     - type: Transform
       pos: 5.5,-6.5
       parent: 2
-  - uid: 32
-    components:
-    - type: Transform
-      pos: 6.5,-6.5
-      parent: 2
   - uid: 270
     components:
     - type: Transform
@@ -25819,6 +25777,13 @@ entities:
     - type: Transform
       pos: 1.5,9.5
       parent: 2
+- proto: VendingMachineCart
+  entities:
+  - uid: 1557
+    components:
+    - type: Transform
+      pos: 18.5,16.5
+      parent: 2
 - proto: VendingMachineChefDrobe
   entities:
   - uid: 139
@@ -25870,10 +25835,10 @@ entities:
       parent: 2
 - proto: VendingMachineGames
   entities:
-  - uid: 1417
+  - uid: 4057
     components:
     - type: Transform
-      pos: 1.5,17.5
+      pos: 2.5,13.5
       parent: 2
 - proto: VendingMachineJaniDrobe
   entities:
@@ -25910,6 +25875,13 @@ entities:
     - type: Transform
       pos: 5.5,13.5
       parent: 2
+- proto: VendingMachineRobotics
+  entities:
+  - uid: 4232
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 2
 - proto: VendingMachineSalvage
   entities:
   - uid: 1143
@@ -25950,7 +25922,7 @@ entities:
   - uid: 4078
     components:
     - type: Transform
-      pos: 0.5,17.5
+      pos: 1.5,17.5
       parent: 2
 - proto: VendingMachineYouTool
   entities:
@@ -28202,6 +28174,22 @@ entities:
     - type: Transform
       pos: 7.5,-0.5
       parent: 2
+- proto: WaterVaporCanister
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 12.5,-25.5
+      parent: 2
+- proto: WeaponAntiqueLaser
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      parent: 1164
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: WeaponCapacitorRecharger
   entities:
   - uid: 1276