From 4e8f7a7946bdb35374d5c8d2466bdf960fa6d303 Mon Sep 17 00:00:00 2001
From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com>
Date: Sun, 10 Nov 2024 00:05:45 +0300
Subject: [PATCH] [Maps] Tushkan update #2 (#2757)

---
 Resources/Maps/corvax_tushkan.yml | 1352 +++++++++++++++++------------
 1 file changed, 797 insertions(+), 555 deletions(-)

diff --git a/Resources/Maps/corvax_tushkan.yml b/Resources/Maps/corvax_tushkan.yml
index 102cc82ddd6..94ba0bd2411 100644
--- a/Resources/Maps/corvax_tushkan.yml
+++ b/Resources/Maps/corvax_tushkan.yml
@@ -126,7 +126,7 @@ entities:
           version: 6
         -2,0:
           ind: -2,0
-          tiles: lAAAAAAAhQAAAAABhQAAAAABggAAAAADHwAAAAABGwAAAAADDgAAAAACDgAAAAAADgAAAAABDgAAAAAAHQAAAAABHQAAAAADHQAAAAABHQAAAAADDgAAAAABDgAAAAADlAAAAAAAhQAAAAADhQAAAAACggAAAAABlAAAAAAAGwAAAAADGwAAAAABGwAAAAABGwAAAAACGwAAAAADGwAAAAACGwAAAAADGwAAAAADGwAAAAABGwAAAAADGwAAAAABlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAHwAAAAAClAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAHwAAAAABlAAAAAAAlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAABgAAAAAAHQAAAAADIQAAAAAAIQAAAAAAlAAAAAAADQAAAAABDQAAAAACDQAAAAADlAAAAAAAGwAAAAAAGwAAAAABGwAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAABgAAAAAAHQAAAAAAIQAAAAAAIQAAAAAAlAAAAAAADQAAAAAAHQAAAAABDQAAAAADEwAAAAADGwAAAAADDgAAAAAAGwAAAAAAlAAAAAAAlAAAAAAABgAAAAAABgAAAAAAHgAAAAABHgAAAAAAHwAAAAAAHwAAAAAAlAAAAAAADQAAAAACDQAAAAAADQAAAAAAlAAAAAAAGwAAAAACDgAAAAADGwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAEwAAAAABHgAAAAABlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAGwAAAAADDgAAAAAAGwAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAJQAAAAACJQAAAAACJQAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAGwAAAAADHQAAAAACGwAAAAAClAAAAAAAlAAAAAAAlAAAAAAABgAAAAAACQAAAAACCQAAAAAACQAAAAAAAQAAAAABAQAAAAADAQAAAAADAwAAAAACAwAAAAADlAAAAAAAGwAAAAABHQAAAAAAGwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAACQAAAAACCAAAAAACCQAAAAABAQAAAAACAQAAAAACAQAAAAABAwAAAAADAwAAAAACJQAAAAACGwAAAAABHQAAAAAAGwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAJQAAAAABJQAAAAADJQAAAAAClAAAAAAAlAAAAAAAlAAAAAAAGwAAAAADDgAAAAABGwAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAAQAAAAAAlAAAAAAAGwAAAAAADgAAAAABGwAAAAABlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAPgAAAAABlAAAAAAAlAAAAAAADQAAAAABDQAAAAABDQAAAAAADQAAAAACAQAAAAACHwAAAAAAGwAAAAADDgAAAAACGwAAAAACHwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAAAAQAAAAAClAAAAAAAGwAAAAABGwAAAAABGwAAAAADlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAADQAAAAABDQAAAAAADQAAAAAADQAAAAAAAQAAAAABlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAABgAAAAAABgAAAAAA
+          tiles: lAAAAAAAhQAAAAABhQAAAAABggAAAAADHwAAAAABGwAAAAADDgAAAAACDgAAAAAADgAAAAABDgAAAAAAHQAAAAABHQAAAAADHQAAAAABHQAAAAADDgAAAAABDgAAAAADlAAAAAAAhQAAAAADhQAAAAACggAAAAABlAAAAAAAGwAAAAADGwAAAAABGwAAAAABGwAAAAACGwAAAAADGwAAAAACGwAAAAADGwAAAAADGwAAAAABGwAAAAADGwAAAAABlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAHwAAAAAClAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAHwAAAAABlAAAAAAAlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAlAAAAAAADQAAAAABDQAAAAACDQAAAAADlAAAAAAAGwAAAAAAGwAAAAABGwAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAGwAAAAAAHwAAAAAAGwAAAAAAGwAAAAAAlAAAAAAADQAAAAAAHQAAAAABDQAAAAADEwAAAAADGwAAAAADDgAAAAAAGwAAAAAAlAAAAAAAlAAAAAAABgAAAAAABgAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAlAAAAAAADQAAAAACDQAAAAAADQAAAAAAlAAAAAAAGwAAAAACDgAAAAADGwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAHwAAAAAAKQAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAGwAAAAADDgAAAAAAGwAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAJQAAAAACJQAAAAACJQAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAGwAAAAADHQAAAAACGwAAAAAClAAAAAAAlAAAAAAAlAAAAAAABgAAAAAACQAAAAACCQAAAAAACQAAAAAAAQAAAAABAQAAAAADAQAAAAADAwAAAAACAwAAAAADlAAAAAAAGwAAAAABHQAAAAAAGwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAACQAAAAACCAAAAAACCQAAAAABAQAAAAACAQAAAAACAQAAAAABAwAAAAADAwAAAAACJQAAAAACGwAAAAABHQAAAAAAGwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAJQAAAAABJQAAAAADJQAAAAAClAAAAAAAlAAAAAAAlAAAAAAAGwAAAAADDgAAAAABGwAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAAQAAAAAAlAAAAAAAGwAAAAAADgAAAAABGwAAAAABlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAPgAAAAABlAAAAAAAlAAAAAAADQAAAAABDQAAAAABDQAAAAAADQAAAAACAQAAAAACHwAAAAAAGwAAAAADDgAAAAACGwAAAAACHwAAAAAClAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAAAAQAAAAAClAAAAAAAGwAAAAABGwAAAAABGwAAAAADlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAADQAAAAABDQAAAAAADQAAAAAADQAAAAAAAQAAAAABlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAAlAAAAAAABgAAAAAAlAAAAAAABgAAAAAABgAAAAAA
           version: 6
         -3,0:
           ind: -3,0
@@ -260,20 +260,6 @@ entities:
       chunkCollection:
         version: 2
         nodes:
-        - node:
-            cleanable: True
-            zIndex: 10
-            color: '#FFFFFF88'
-            id: Basalt5
-          decals:
-            6558: -28.643444,5.575065
-        - node:
-            cleanable: True
-            zIndex: 10
-            color: '#FFFFFF88'
-            id: Basalt7
-          decals:
-            6559: -27.920238,5.743797
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -306,7 +292,6 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            1890: -29,4
             3361: -15,-31
         - node:
             zIndex: 2
@@ -376,6 +361,12 @@ entities:
           decals:
             380: 17,18
             381: 17,17
+        - node:
+            zIndex: 5
+            color: '#B1624DFF'
+            id: Box
+          decals:
+            7289: -28,4
         - node:
             color: '#FFFFFFFF'
             id: Box
@@ -422,12 +413,6 @@ entities:
             4746: 10,-32
             4747: 12,-32
             4748: 14,-32
-        - node:
-            zIndex: 1
-            color: '#52B4E996'
-            id: BrickCornerOverlayNE
-          decals:
-            1882: -26,4
         - node:
             zIndex: 1
             color: '#765428BF'
@@ -488,12 +473,6 @@ entities:
             id: BrickCornerOverlayNW
           decals:
             4880: -39,18
-        - node:
-            zIndex: 1
-            color: '#52B4E996'
-            id: BrickCornerOverlaySE
-          decals:
-            1885: -26,3
         - node:
             zIndex: 1
             color: '#AE6716FF'
@@ -642,12 +621,6 @@ entities:
             3318: -13,-30
             3319: -13,-31
             3320: -13,-32
-        - node:
-            zIndex: 1
-            color: '#52B4E996'
-            id: BrickLineOverlayN
-          decals:
-            1883: -27,4
         - node:
             zIndex: 1
             color: '#765428BF'
@@ -740,12 +713,6 @@ entities:
             3314: -16,-28
             3315: -15,-28
             3321: -14,-28
-        - node:
-            zIndex: 1
-            color: '#52B4E996'
-            id: BrickLineOverlayS
-          decals:
-            1884: -27,3
         - node:
             color: '#765428BF'
             id: BrickLineOverlayS
@@ -2142,11 +2109,6 @@ entities:
             1746: -18,13
             1766: -9,-3
             3443: 8,-4
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileWhiteCornerNe
-          decals:
-            1878: -26,4
         - node:
             color: '#E6E6E6FF'
             id: BrickTileWhiteCornerNw
@@ -2183,11 +2145,6 @@ entities:
             1742: -18,3
             1764: -9,-6
             3442: 8,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileWhiteCornerSe
-          decals:
-            1881: -26,3
         - node:
             color: '#E6E6E6FF'
             id: BrickTileWhiteCornerSw
@@ -2361,7 +2318,6 @@ entities:
           decals:
             1123: -7,-4
             1124: -6,-4
-            1879: -27,4
             2668: 23,4
             2671: 19,4
         - node:
@@ -2418,7 +2374,6 @@ entities:
           decals:
             1125: -7,-5
             1126: -6,-5
-            1880: -27,3
             2670: 19,2
             2674: 23,2
         - node:
@@ -2599,6 +2554,14 @@ entities:
           decals:
             6955: -29,-16
             6956: -30,-15
+        - node:
+            zIndex: -1
+            color: '#52B4E996'
+            id: CheckerNESW
+          decals:
+            7297: -29,4
+            7298: -27,4
+            7299: -26,4
         - node:
             color: '#52B4E996'
             id: CheckerNESW
@@ -3026,7 +2989,6 @@ entities:
             6560: -22,9
             6565: -25,9
             6566: -26,13
-            6567: -22,12
         - node:
             cleanable: True
             zIndex: 10
@@ -3127,7 +3089,6 @@ entities:
             6554: 9,6
             6555: 9,7
             6556: 12,3
-            6624: -27,5
             6629: -7,-19
             6630: -6,-19
             6631: -6,-21
@@ -3154,8 +3115,6 @@ entities:
             6601: -1,10
             6602: -1,10
             6603: -2,15
-            6604: -29,5
-            6605: -29,6
             6607: -31,3
             6608: -31,3
             6609: -29,1
@@ -5097,13 +5056,6 @@ entities:
             1905: -14,-4
             1906: -14,-6
             1907: -14,-5
-        - node:
-            zIndex: 1
-            color: '#52B4E996'
-            id: MiniTileCheckerAOverlay
-          decals:
-            1887: -28,4
-            1888: -28,3
         - node:
             color: '#9FED5896'
             id: MiniTileCheckerAOverlay
@@ -5930,6 +5882,14 @@ entities:
             5206: 13,-19
             5207: 14,-19
             5208: 15,-19
+        - node:
+            zIndex: -1
+            color: '#52B4E996'
+            id: MiniTileLineOverlayN
+          decals:
+            7304: -29,5
+            7305: -27,5
+            7306: -26,5
         - node:
             color: '#D381C996'
             id: MiniTileLineOverlayN
@@ -5980,6 +5940,15 @@ entities:
             5220: 13,-15
             5221: 14,-15
             5222: 15,-15
+        - node:
+            zIndex: -1
+            color: '#52B4E996'
+            id: MiniTileLineOverlayS
+          decals:
+            7300: -29,3
+            7301: -28,3
+            7302: -27,3
+            7303: -26,3
         - node:
             zIndex: 1
             color: '#9FED5896'
@@ -6102,11 +6071,6 @@ entities:
             id: MiniTileSteelCornerNw
           decals:
             5089: -20,33
-        - node:
-            color: '#E6E6E6FF'
-            id: MiniTileSteelCornerSe
-          decals:
-            1937: -28,5
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelCornerSe
@@ -6151,21 +6115,18 @@ entities:
             id: MiniTileSteelInnerNe
           decals:
             1641: -13,8
+            7278: -29,5
         - node:
             color: '#D4D4D4FF'
             id: MiniTileSteelInnerNw
           decals:
             4704: -10,-30
-        - node:
-            color: '#E6E6E6FF'
-            id: MiniTileSteelInnerNw
-          decals:
-            1938: -28,5
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerNw
           decals:
             1642: -15,8
+            7280: -27,5
         - node:
             color: '#D4D4D4FF'
             id: MiniTileSteelInnerSe
@@ -6186,11 +6147,6 @@ entities:
             4710: -11,-32
             4711: -11,-31
             4712: -11,-30
-        - node:
-            color: '#E6E6E6FF'
-            id: MiniTileSteelLineE
-          decals:
-            1935: -28,6
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineE
@@ -6198,11 +6154,7 @@ entities:
             1644: -13,9
             2881: 30,3
             5101: -15,32
-        - node:
-            color: '#E6E6E6FF'
-            id: MiniTileSteelLineN
-          decals:
-            1934: -29,5
+            7279: -29,6
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineN
@@ -6213,11 +6165,7 @@ entities:
             5094: -18,33
             5095: -17,33
             5096: -16,33
-        - node:
-            color: '#E6E6E6FF'
-            id: MiniTileSteelLineS
-          decals:
-            1933: -29,5
+            7282: -28,5
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineS
@@ -6236,11 +6184,6 @@ entities:
             4707: -9,-32
             4708: -9,-31
             4709: -9,-30
-        - node:
-            color: '#E6E6E6FF'
-            id: MiniTileSteelLineW
-          decals:
-            1936: -28,6
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineW
@@ -6350,6 +6293,18 @@ entities:
           decals:
             1596: -15,4
             1597: -12,4
+        - node:
+            zIndex: -1
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteLineN
+          decals:
+            7294: -29,5
+            7295: -27,5
+            7296: -26,5
+            7307: -26,3
+            7308: -27,3
+            7309: -28,3
+            7310: -29,3
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineN
@@ -6389,6 +6344,19 @@ entities:
           decals:
             2877: 31,3
             2878: 32,3
+        - node:
+            zIndex: -1
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteLineS
+          decals:
+            7290: -29,3
+            7291: -28,3
+            7292: -27,3
+            7293: -26,3
+            7311: -29,5
+            7312: -28,5
+            7313: -27,5
+            7314: -26,5
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineS
@@ -6927,13 +6895,6 @@ entities:
             5543: -33,-27
             5544: -33,-26
             6227: -23,-31
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            1892: -28,4
-            1893: -28,3
         - node:
             color: '#000000FF'
             id: WarnLineW
@@ -6962,6 +6923,7 @@ entities:
             id: WarnLineW
           decals:
             4864: -40,20
+            7283: -28,5
         - node:
             color: '#4B362BFF'
             id: WoodTrimThinBoxWhite
@@ -7936,7 +7898,6 @@ entities:
             color: '#0000003E'
             id: grasssnowc1
           decals:
-            6762: -21.8967,12.3038435
             6763: -22.397684,13.751953
             6764: -18.448252,14.892344
             6765: -32.809677,-4.393697
@@ -7953,14 +7914,6 @@ entities:
             6759: -14.3490505,15.490858
             6760: -28.322248,15.184649
             6761: -28.787582,12.194032
-        - node:
-            cleanable: True
-            zIndex: 10
-            angle: 3.141592653589793 rad
-            color: '#FFFFFF18'
-            id: like
-          decals:
-            6568: -22,12
         - node:
             color: '#FFFFFFFF'
             id: m
@@ -8175,7 +8128,7 @@ entities:
             0: 62702
           -3,4:
             0: 4111
-            1: 60928
+            7: 60928
           -2,0:
             0: 61567
           -2,1:
@@ -8240,7 +8193,7 @@ entities:
             0: 3067
           8,2:
             0: 4881
-            2: 4
+            1: 4
           8,3:
             0: 65008
           9,0:
@@ -8301,11 +8254,11 @@ entities:
             0: 65295
           -11,1:
             0: 3584
-            2: 4
+            1: 4
           -11,0:
-            2: 1024
+            1: 1024
           -11,2:
-            2: 4
+            1: 4
           -10,0:
             0: 65535
           -10,1:
@@ -8314,7 +8267,7 @@ entities:
             0: 35762
           -10,3:
             0: 63240
-            2: 1
+            1: 1
           -10,-1:
             0: 61440
           -10,4:
@@ -8330,19 +8283,24 @@ entities:
           0,-5:
             0: 32767
           -1,-4:
-            0: 53725
+            0: 53724
+            2: 1
           0,-3:
-            0: 65303
+            0: 65301
+            2: 2
           -1,-3:
-            0: 65293
+            2: 9
+            0: 65284
           0,-2:
             0: 47935
           -1,-2:
             0: 48015
           1,-4:
-            0: 13107
+            2: 515
+            0: 12592
           1,-3:
-            0: 65283
+            2: 3
+            0: 65280
           1,-2:
             0: 47887
           2,-4:
@@ -8417,21 +8375,21 @@ entities:
             0: 65529
           0,10:
             0: 127
-            2: 34816
+            1: 34816
           -1,10:
             0: 207
-            2: 8960
+            1: 8960
           0,11:
-            2: 3983
+            1: 3983
           -1,11:
-            2: 3646
+            1: 3646
           1,9:
             0: 65521
           1,10:
             0: 3
-            2: 17856
+            1: 17856
           1,11:
-            2: 116
+            1: 116
           2,9:
             0: 61190
           2,10:
@@ -8444,7 +8402,7 @@ entities:
             0: 65535
           4,9:
             0: 15
-            2: 2048
+            1: 2048
           0,-8:
             0: 65535
           -1,-8:
@@ -8481,77 +8439,77 @@ entities:
             0: 62719
           4,-8:
             0: 61713
-            2: 136
+            1: 136
           4,-7:
             0: 4373
-            2: 17472
+            1: 17472
           4,-6:
             0: 4113
-            2: 3268
+            1: 3268
           4,-5:
             0: 56541
           0,-12:
-            2: 4880
+            1: 4880
           -1,-12:
-            2: 3840
+            1: 3840
           0,-11:
-            2: 4593
+            1: 4593
           -1,-11:
-            2: 62451
+            1: 62451
           0,-10:
-            2: 4383
+            1: 4383
             3: 17408
           -1,-10:
-            2: 2051
+            1: 2051
             0: 13056
           0,-9:
-            2: 3857
+            1: 3857
             3: 4
           -1,-9:
-            2: 128
+            1: 128
             0: 13059
           1,-11:
-            2: 8944
+            1: 8944
           1,-10:
-            2: 15
+            1: 15
             3: 21760
           1,-9:
             3: 5
-            2: 3840
+            1: 3840
           2,-11:
-            2: 35064
+            1: 35064
           2,-10:
-            2: 15
+            1: 15
             4: 4352
             3: 17408
           2,-9:
             4: 1
-            2: 3840
+            1: 3840
             3: 4
           3,-11:
-            2: 240
+            1: 240
           3,-10:
-            2: 15
+            1: 15
             5: 4352
             6: 17408
           3,-9:
             5: 1
-            2: 3840
+            1: 3840
             6: 4
           4,-11:
-            2: 4592
+            1: 4592
           4,-10:
-            2: 7953
+            1: 7953
           4,-9:
-            2: 49649
+            1: 49649
           5,-11:
-            2: 4401
+            1: 4401
           5,-10:
-            2: 4369
+            1: 4369
           5,-9:
-            2: 30065
+            1: 30065
           5,-8:
-            2: 65348
+            1: 65348
           5,-7:
             3: 30578
           5,-5:
@@ -8559,9 +8517,9 @@ entities:
           5,-4:
             0: 61007
           5,-6:
-            2: 3200
+            1: 3200
           6,-6:
-            2: 256
+            1: 256
             0: 2184
           6,-5:
             0: 56797
@@ -8597,22 +8555,22 @@ entities:
             0: 30583
           8,-1:
             0: 272
-            2: 1088
+            1: 1088
           8,-8:
             0: 8192
           8,-7:
             0: 8738
           9,-7:
-            2: 4096
+            1: 4096
           9,-6:
             0: 12336
           9,-4:
             0: 12336
           9,-3:
-            2: 16
+            1: 16
           8,4:
             0: 4368
-            2: 3200
+            1: 3200
           8,5:
             0: 61135
           7,5:
@@ -8621,21 +8579,21 @@ entities:
             0: 61678
           8,6:
             0: 6372
-            2: 49152
+            1: 49152
           8,7:
             0: 273
-            2: 3276
+            1: 3276
           7,7:
             0: 43263
           8,8:
-            2: 2
+            1: 2
             0: 26368
           9,4:
-            2: 256
+            1: 256
           9,6:
-            2: 4096
+            1: 4096
           9,7:
-            2: 273
+            1: 273
           7,8:
             0: 39864
           7,9:
@@ -8672,7 +8630,7 @@ entities:
             0: 11
           -5,9:
             0: 11
-            2: 512
+            1: 512
           -3,8:
             0: 61917
           -3,9:
@@ -8686,12 +8644,12 @@ entities:
           -2,9:
             0: 61408
           -2,10:
-            2: 17504
+            1: 17504
             0: 8
           -2,7:
             0: 57599
           -2,11:
-            2: 196
+            1: 196
           -4,5:
             0: 48059
           -5,5:
@@ -8704,7 +8662,7 @@ entities:
             0: 61627
           -3,5:
             0: 56576
-            1: 14
+            7: 14
           -3,6:
             0: 61919
           -2,5:
@@ -8714,7 +8672,7 @@ entities:
           -8,8:
             0: 192
           -8,7:
-            2: 34816
+            1: 34816
             0: 14
           -7,8:
             0: 3838
@@ -8747,7 +8705,7 @@ entities:
           -6,6:
             0: 30706
           -11,4:
-            2: 6
+            1: 6
             0: 52224
           -11,5:
             0: 52428
@@ -8758,13 +8716,13 @@ entities:
           -10,6:
             0: 4064
           -10,7:
-            2: 6
+            1: 6
           -10,-4:
             0: 2048
           -9,-4:
             0: 53198
           -9,-3:
-            2: 1
+            1: 1
             0: 61132
           -9,-2:
             0: 52238
@@ -8780,14 +8738,14 @@ entities:
             0: 32768
           -9,-6:
             0: 64716
-            2: 16
+            1: 16
           -9,-8:
             0: 32768
           -9,-7:
             0: 34952
           -8,-6:
             0: 4369
-            2: 16384
+            1: 16384
           -8,-5:
             0: 7633
           -7,-4:
@@ -8824,11 +8782,11 @@ entities:
             0: 65534
           -6,-6:
             0: 56592
-            2: 4
+            1: 4
           -6,-8:
             0: 61166
           -6,-7:
-            2: 58432
+            1: 58432
           -5,-8:
             0: 65262
           -5,-6:
@@ -8844,7 +8802,7 @@ entities:
           -4,-5:
             0: 4095
           -6,-12:
-            2: 36736
+            1: 36736
           -6,-10:
             0: 60940
           -6,-9:
@@ -8852,7 +8810,7 @@ entities:
           -6,-11:
             0: 52224
           -5,-12:
-            2: 3840
+            1: 3840
           -5,-11:
             0: 21760
           -5,-10:
@@ -8860,7 +8818,7 @@ entities:
           -5,-9:
             0: 4095
           -4,-12:
-            2: 12064
+            1: 12064
           -4,-11:
             0: 30464
           -4,-10:
@@ -8876,9 +8834,11 @@ entities:
           -3,-5:
             0: 53247
           -2,-4:
-            0: 39065
+            0: 37009
+            2: 2056
           -2,-3:
-            0: 65305
+            0: 65297
+            2: 8
           -2,-2:
             0: 65039
           -2,-5:
@@ -8900,19 +8860,19 @@ entities:
           -2,-9:
             0: 61198
           -3,-12:
-            2: 61422
+            1: 61422
           -3,-10:
             0: 60996
           -3,-11:
-            2: 238
+            1: 238
             0: 17408
           -2,-12:
-            2: 36736
+            1: 36736
           -2,-11:
-            2: 65279
+            1: 65279
           -2,-10:
             0: 65024
-            2: 14
+            1: 14
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -8930,10 +8890,8 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 235
+          immutable: True
           moles:
-          - 21.824879
-          - 82.10312
           - 0
           - 0
           - 0
@@ -8944,11 +8902,13 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          immutable: True
-          moles:
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.6852
+          - 81.57766
           - 0
           - 0
           - 0
@@ -9019,6 +8979,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 235
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -9449,35 +9424,33 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 4343
-      - 4691
-      - 4694
-      - 4692
-      - 4693
-      - 4887
-      - 4342
-      - 4351
-      - 4696
-      - 4695
-      - 4341
-      - 4344
-      - 4345
-      - 4338
-      - 4339
-      - 4698
-      - 4697
-      - 4337
-      - 4336
-      - 4699
-      - 4700
-      - 4702
-      - 4701
-      - 4708
-      - 4707
-      - 4710
-      - 4709
-      - 4340
       - 4406
+      - 4340
+      - 4709
+      - 4710
+      - 4707
+      - 4708
+      - 4700
+      - 4699
+      - 4336
+      - 4337
+      - 4697
+      - 4698
+      - 4339
+      - 4338
+      - 4345
+      - 4344
+      - 4341
+      - 4695
+      - 4696
+      - 4351
+      - 4342
+      - 4887
+      - 4693
+      - 4692
+      - 4694
+      - 4691
+      - 4343
   - uid: 4690
     components:
     - type: Transform
@@ -9954,6 +9927,11 @@ entities:
       - 6253
 - proto: AirCanister
   entities:
+  - uid: 4806
+    components:
+    - type: Transform
+      pos: -28.5,3.5
+      parent: 2
   - uid: 6625
     components:
     - type: Transform
@@ -11646,6 +11624,15 @@ entities:
     - type: Transform
       pos: -34.5,-19.5
       parent: 2
+- proto: ArtistCircuitBoard
+  entities:
+  - uid: 4411
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Ashtray
   entities:
   - uid: 8764
@@ -11660,11 +11647,13 @@ entities:
       parent: 2
 - proto: AsimovCircuitBoard
   entities:
-  - uid: 10805
+  - uid: 2717
     components:
     - type: Transform
-      pos: 20.5,-5.5
-      parent: 2
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 11
@@ -12177,14 +12166,6 @@ entities:
     - type: Transform
       pos: 5.5,21.5
       parent: 2
-- proto: BaseComputer
-  entities:
-  - uid: 6622
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-11.5
-      parent: 2
 - proto: BassGuitarInstrument
   entities:
   - uid: 5367
@@ -12598,6 +12579,12 @@ entities:
     - type: Transform
       pos: 23.5,-26.5
       parent: 2
+  - uid: 10951
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,8.5
+      parent: 2
 - proto: BluntRainbow
   entities:
   - uid: 10767
@@ -13733,6 +13720,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,3.5
       parent: 9095
+  - uid: 10953
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,9.5
+      parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
   - uid: 2268
@@ -20057,14 +20050,6 @@ entities:
     - type: Transform
       pos: 9.5,9.5
       parent: 2
-- proto: CableApcStack1
-  entities:
-  - uid: 2717
-    components:
-    - type: Transform
-      rot: -0.22689280275926285 rad
-      pos: -27.59481,3.3781903
-      parent: 2
 - proto: CableApcStack10
   entities:
   - uid: 5436
@@ -25636,11 +25621,6 @@ entities:
     - type: Transform
       pos: 15.771075,4.364028
       parent: 2
-  - uid: 10609
-    components:
-    - type: Transform
-      pos: -28.536913,5.756552
-      parent: 2
   - uid: 10616
     components:
     - type: Transform
@@ -28561,13 +28541,6 @@ entities:
     - type: Transform
       pos: 28.5,31.5
       parent: 2
-- proto: CloningPod
-  entities:
-  - uid: 4411
-    components:
-    - type: Transform
-      pos: -28.5,4.5
-      parent: 2
 - proto: ClosetBombFilled
   entities:
   - uid: 5291
@@ -28923,12 +28896,10 @@ entities:
     - type: Transform
       pos: 28.5,4.5
       parent: 2
-- proto: ClosetSteelBase
-  entities:
-  - uid: 4414
+  - uid: 10610
     components:
     - type: Transform
-      pos: -26.5,5.5
+      pos: -14.5,-27.5
       parent: 2
 - proto: ClosetToolFilled
   entities:
@@ -28976,6 +28947,49 @@ entities:
           - 8175
           - 8176
           - 8177
+- proto: ClosetWallPink
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-4.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:
+          - 4413
+          - 4412
+          - 4411
+          - 3332
+          - 2920
+          - 2861
+          - 2860
+          - 2717
+          - 2716
+          - 1431
+          - 83
 - proto: ClothingBackpackCE
   entities:
   - uid: 5440
@@ -29515,6 +29529,13 @@ entities:
       rot: 0.4188790204786391 rad
       pos: 29.311481,23.846048
       parent: 2
+- proto: ClothingNeckScarfStripedLightBlue
+  entities:
+  - uid: 10975
+    components:
+    - type: Transform
+      pos: -25.417915,5.5386567
+      parent: 2
 - proto: ClothingNeckScarfStripedSyndieRed
   entities:
   - uid: 5174
@@ -30238,6 +30259,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,21.5
       parent: 2
+- proto: CommandmentCircuitBoard
+  entities:
+  - uid: 2920
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: CommsComputerCircuitboard
   entities:
   - uid: 10144
@@ -30245,11 +30275,6 @@ entities:
     - type: Transform
       pos: 5.5104375,-2.42996
       parent: 2
-  - uid: 10420
-    components:
-    - type: Transform
-      pos: -13.07778,-25.450056
-      parent: 2
 - proto: ComputerAlert
   entities:
   - uid: 2195
@@ -30258,6 +30283,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,40.5
       parent: 2
+  - uid: 4414
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-11.5
+      parent: 2
 - proto: ComputerAnalysisConsole
   entities:
   - uid: 5260
@@ -30311,12 +30342,6 @@ entities:
       parent: 2
 - proto: ComputerBroken
   entities:
-  - uid: 4412
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,3.5
-      parent: 2
   - uid: 5385
     components:
     - type: Transform
@@ -30624,6 +30649,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: CorporateCircuitBoard
+  entities:
+  - uid: 2860
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: CounterMetalFrame
   entities:
   - uid: 10011
@@ -30793,31 +30827,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: CrateHydroSecure
-  entities:
-  - uid: 41
-    components:
-    - type: Transform
-      pos: -2.5,23.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
 - proto: CrateMedicalSecure
   entities:
   - uid: 4431
@@ -30921,6 +30930,11 @@ entities:
     - type: Transform
       pos: 30.5,11.5
       parent: 2
+  - uid: 10941
+    components:
+    - type: Transform
+      pos: -19.5,15.5
+      parent: 2
 - proto: CrateWeaponSecure
   entities:
   - uid: 7991
@@ -31089,6 +31103,25 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,-21.5
       parent: 2
+- proto: CryoPod
+  entities:
+  - uid: 4799
+    components:
+    - type: Transform
+      pos: -27.5,6.5
+      parent: 2
+- proto: CryoxadoneBeakerSmall
+  entities:
+  - uid: 10971
+    components:
+    - type: Transform
+      pos: -26.636395,5.7789326
+      parent: 2
+  - uid: 10972
+    components:
+    - type: Transform
+      pos: -26.418365,5.6533957
+      parent: 2
 - proto: CurtainsBlack
   entities:
   - uid: 10770
@@ -31619,11 +31652,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,20.5
       parent: 2
-  - uid: 3332
-    components:
-    - type: Transform
-      pos: 22.5,28.5
-      parent: 2
   - uid: 3367
     components:
     - type: Transform
@@ -31839,6 +31867,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,-23.5
       parent: 2
+  - uid: 10945
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,23.5
+      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 1363
@@ -31853,6 +31887,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,28.5
       parent: 2
+  - uid: 4798
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,28.5
+      parent: 2
   - uid: 5030
     components:
     - type: Transform
@@ -31915,12 +31955,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,25.5
       parent: 2
-  - uid: 2920
+  - uid: 4787
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 16.5,28.5
       parent: 2
+  - uid: 4797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,28.5
+      parent: 2
   - uid: 5006
     components:
     - type: Transform
@@ -33678,12 +33724,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,28.5
       parent: 2
-  - uid: 8849
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,28.5
-      parent: 2
   - uid: 8850
     components:
     - type: Transform
@@ -34093,6 +34133,42 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -10.5,-14.5
       parent: 2
+  - uid: 10946
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,24.5
+      parent: 2
+  - uid: 10947
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,25.5
+      parent: 2
+  - uid: 10948
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,26.5
+      parent: 2
+  - uid: 10949
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,27.5
+      parent: 2
+  - uid: 10955
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,28.5
+      parent: 2
+  - uid: 10956
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,28.5
+      parent: 2
 - proto: DisposalTrunk
   entities:
   - uid: 468
@@ -34295,6 +34371,18 @@ entities:
     - type: Transform
       pos: -16.5,-7.5
       parent: 2
+  - uid: 10944
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,23.5
+      parent: 2
+  - uid: 10954
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,28.5
+      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 359
@@ -34362,6 +34450,11 @@ entities:
     - type: Transform
       pos: -19.5,13.5
       parent: 2
+  - uid: 4702
+    components:
+    - type: Transform
+      pos: -2.5,23.5
+      parent: 2
   - uid: 4932
     components:
     - type: Transform
@@ -34922,6 +35015,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: DungeonMasterCircuitBoard
+  entities:
+  - uid: 3332
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: EggplantSeeds
   entities:
   - uid: 8149
@@ -37392,13 +37494,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 4413
-    components:
-    - type: Transform
-      pos: -28.5,6.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
 - proto: FoodBakedCookie
   entities:
   - uid: 5150
@@ -37893,6 +37988,11 @@ entities:
     - type: Transform
       pos: 16.5,-19.5
       parent: 2
+  - uid: 10959
+    components:
+    - type: Transform
+      pos: -27.5,3.49999
+      parent: 2
 - proto: GasCanisterBrokenBase
   entities:
   - uid: 9881
@@ -37905,6 +38005,14 @@ entities:
     - type: Transform
       pos: 14.5,19.5
       parent: 2
+- proto: GasFilter
+  entities:
+  - uid: 8019
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,4.5
+      parent: 2
 - proto: GasMinerCarbonDioxide
   entities:
   - uid: 10252
@@ -38395,6 +38503,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
+  - uid: 4417
+    components:
+    - type: Transform
+      pos: -25.5,3.5
+      parent: 2
   - uid: 4789
     components:
     - type: Transform
@@ -38418,13 +38531,17 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 4798
+  - uid: 4800
     components:
     - type: Transform
-      pos: -26.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: -26.5,4.5
+      parent: 2
+  - uid: 4802
+    components:
+    - type: Transform
+      pos: -26.5,5.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 4822
     components:
     - type: Transform
@@ -38951,6 +39068,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
+  - uid: 8856
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,3.5
+      parent: 2
   - uid: 8910
     components:
     - type: Transform
@@ -42202,61 +42325,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 4799
-    components:
-    - type: Transform
-      pos: -26.5,2.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
-  - uid: 4800
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -27.5,3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 4801
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0000FFFF'
-  - uid: 4802
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,4.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0000FFFF'
-  - uid: 4803
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -25.5,2.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0000FFFF'
-  - uid: 4804
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,1.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0000FFFF'
-  - uid: 4806
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,1.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 4807
     components:
     - type: Transform
@@ -42746,6 +42820,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
+  - uid: 5185
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,1.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 5272
     components:
     - type: Transform
@@ -42782,6 +42864,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,1.5
       parent: 2
+  - uid: 5292
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0000FFFF'
   - uid: 5848
     components:
     - type: Transform
@@ -47843,6 +47933,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
+  - uid: 9885
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,3.5
+      parent: 2
   - uid: 10376
     components:
     - type: Transform
@@ -48339,22 +48435,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 4787
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,0.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0000FFFF'
-  - uid: 4797
+  - uid: 4804
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: -28.5,4.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 4805
     components:
     - type: Transform
@@ -48439,6 +48525,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
+  - uid: 5262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,1.5
+      parent: 2
   - uid: 5430
     components:
     - type: Transform
@@ -48997,6 +49089,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
+  - uid: 8849
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,5.5
+      parent: 2
   - uid: 8904
     components:
     - type: Transform
@@ -49067,8 +49165,20 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
+  - uid: 10609
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,5.5
+      parent: 2
 - proto: GasPort
   entities:
+  - uid: 4803
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,3.5
+      parent: 2
   - uid: 5265
     components:
     - type: Transform
@@ -49245,6 +49355,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,18.5
       parent: 2
+  - uid: 6622
+    components:
+    - type: Transform
+      pos: -28.5,6.5
+      parent: 2
   - uid: 6665
     components:
     - type: Transform
@@ -49686,16 +49801,6 @@ entities:
       - 4689
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 4701
-    components:
-    - type: Transform
-      pos: -25.5,5.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 4689
-    - type: AtmosPipeColor
-      color: '#0000FFFF'
   - uid: 4704
     components:
     - type: Transform
@@ -50714,17 +50819,6 @@ entities:
       - 4689
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 4702
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,3.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 4689
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 4703
     components:
     - type: Transform
@@ -53159,6 +53253,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: LiveLetLiveCircuitBoard
+  entities:
+  - uid: 1431
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: LockableButtonAtmospherics
   entities:
   - uid: 6847
@@ -53482,8 +53585,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -53500,8 +53603,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 5132
           - 5133
+          - 5132
+          - 9975
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -53517,8 +53621,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -53535,8 +53639,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 5841
+          - 10960
           - 6664
+          - 5841
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -53697,8 +53802,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -53715,9 +53820,10 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6669
-          - 6910
+          - 10961
           - 6921
+          - 6910
+          - 6669
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -53733,8 +53839,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -53751,8 +53857,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6925
           - 6926
+          - 6925
+          - 10962
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -53906,8 +54013,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -53924,9 +54031,10 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6928
-          - 6929
           - 6930
+          - 6929
+          - 6928
+          - 10963
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -53942,8 +54050,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -53960,8 +54068,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6931
+          - 10964
           - 6932
+          - 6931
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -53979,8 +54088,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -53997,8 +54106,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6933
+          - 10965
           - 6934
+          - 6933
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -54014,8 +54124,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -54032,8 +54142,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 6991
+          - 10966
           - 6992
+          - 6991
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -54083,8 +54194,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -54101,8 +54212,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 7409
+          - 10967
           - 7410
+          - 7409
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -54118,8 +54230,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -54136,8 +54248,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 7411
+          - 10968
           - 7412
+          - 7411
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -54153,8 +54266,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -54171,13 +54284,14 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 7413
-          - 7439
-          - 7440
-          - 7850
-          - 7851
-          - 7852
           - 7853
+          - 7852
+          - 7851
+          - 7850
+          - 7440
+          - 7439
+          - 10969
+          - 7413
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -54193,8 +54307,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -54211,12 +54325,13 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 7854
-          - 7855
-          - 7856
-          - 7960
-          - 7961
           - 8097
+          - 7961
+          - 7960
+          - 7856
+          - 7855
+          - 7854
+          - 10970
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -54324,11 +54439,6 @@ entities:
       parent: 2
 - proto: MachineFrameDestroyed
   entities:
-  - uid: 1431
-    components:
-    - type: Transform
-      pos: -28.5,6.5
-      parent: 2
   - uid: 5093
     components:
     - type: Transform
@@ -54438,11 +54548,6 @@ entities:
     - type: Transform
       pos: -9.5,7.5
       parent: 2
-  - uid: 9975
-    components:
-    - type: Transform
-      pos: -15.5,15.5
-      parent: 2
   - uid: 10000
     components:
     - type: Transform
@@ -54704,18 +54809,6 @@ entities:
           showEnts: False
           occludes: False
           ent: null
-- proto: MaterialBiomass
-  entities:
-  - uid: 4416
-    components:
-    - type: Transform
-      pos: -25.45,5.55
-      parent: 2
-  - uid: 4417
-    components:
-    - type: Transform
-      pos: -25.55,5.5
-      parent: 2
 - proto: MaterialCloth
   entities:
   - uid: 2021
@@ -54728,17 +54821,6 @@ entities:
     - type: Transform
       pos: 10.5,31.5
       parent: 2
-- proto: MaterialCloth1
-  entities:
-  - uid: 5185
-    components:
-    - type: MetaData
-      desc: Попу мыть нужно каждый день.
-      name: полотенце
-    - type: Transform
-      rot: -0.3490658503988659 rad
-      pos: -21.25,-13.115585
-      parent: 2
 - proto: MaterialDurathread
   entities:
   - uid: 2020
@@ -54806,14 +54888,6 @@ entities:
     - type: Transform
       pos: -11.5,13.5
       parent: 2
-- proto: MedicalScannerMachineCircuitboard
-  entities:
-  - uid: 8019
-    components:
-    - type: Transform
-      rot: -0.5759586531581288 rad
-      pos: -27.416422,4.0471697
-      parent: 2
 - proto: MedicalTechFab
   entities:
   - uid: 4474
@@ -54885,11 +54959,17 @@ entities:
     - type: Transform
       pos: 9.2510195,-3.2073302
       parent: 2
-  - uid: 10610
+- proto: Mirror
+  entities:
+  - uid: 10942
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.58298,6.5866327
+      pos: 19.5,26.5
+      parent: 2
+  - uid: 10943
+    components:
+    - type: Transform
+      pos: 18.5,26.5
       parent: 2
 - proto: MopBucketFull
   entities:
@@ -55045,6 +55125,15 @@ entities:
     - Storage
     - UserInterface
     - ContainerContainer
+- proto: NTDefaultCircuitBoard
+  entities:
+  - uid: 83
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: NuclearBomb
   entities:
   - uid: 4
@@ -55052,6 +55141,15 @@ entities:
     - type: Transform
       pos: 4.5,-4.5
       parent: 2
+- proto: NutimovCircuitBoard
+  entities:
+  - uid: 2861
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: OnionSeeds
   entities:
   - uid: 8155
@@ -55073,6 +55171,13 @@ entities:
     - type: Transform
       pos: -24.5,7.5
       parent: 2
+- proto: OpporozidoneBeakerSmall
+  entities:
+  - uid: 10974
+    components:
+    - type: Transform
+      pos: -25.83575,5.657586
+      parent: 2
 - proto: OrangeSeeds
   entities:
   - uid: 8145
@@ -55171,6 +55276,15 @@ entities:
     - type: Transform
       pos: -10.5,12.5
       parent: 2
+- proto: PaladinCircuitBoard
+  entities:
+  - uid: 2716
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Paper
   entities:
   - uid: 347
@@ -61104,6 +61218,11 @@ entities:
       rot: 0.17453292519943295 rad
       pos: 31.948124,-2.525792
       parent: 2
+  - uid: 10973
+    components:
+    - type: Transform
+      pos: -26.01414,5.6641936
+      parent: 2
 - proto: PaperBin
   entities:
   - uid: 1391
@@ -61903,11 +62022,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,12.5
       parent: 2
-  - uid: 5292
-    components:
-    - type: Transform
-      pos: 33.5,3.5
-      parent: 2
   - uid: 5467
     components:
     - type: Transform
@@ -64512,6 +64626,11 @@ entities:
     - type: Transform
       pos: -18.5,-24.5
       parent: 2
+  - uid: 10420
+    components:
+    - type: Transform
+      pos: -27.5,3.5
+      parent: 2
   - uid: 10460
     components:
     - type: Transform
@@ -65547,10 +65666,10 @@ entities:
     - type: InsideEntityStorage
 - proto: Recycler
   entities:
-  - uid: 3396
+  - uid: 10611
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: -1.5707963267948966 rad
       pos: 32.5,8.5
       parent: 2
 - proto: ReinforcedPlasmaWindow
@@ -66171,6 +66290,15 @@ entities:
     - type: Transform
       pos: -40.68186,23.512796
       parent: 2
+- proto: RobocopCircuitBoard
+  entities:
+  - uid: 4413
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampApproved
   entities:
   - uid: 1966
@@ -66385,13 +66513,6 @@ entities:
     - type: Transform
       pos: 21.5,3.25
       parent: 2
-- proto: ShardGlass
-  entities:
-  - uid: 2716
-    components:
-    - type: Transform
-      pos: -27.802929,3.690955
-      parent: 2
 - proto: SheetGlass
   entities:
   - uid: 5628
@@ -66526,11 +66647,6 @@ entities:
     - type: Transform
       pos: -20.062002,-21.181068
       parent: 2
-  - uid: 10611
-    components:
-    - type: Transform
-      pos: -27.489912,5.69449
-      parent: 2
   - uid: 10618
     components:
     - type: Transform
@@ -67193,6 +67309,18 @@ entities:
       linkedPorts:
         10341:
         - Pressed: Toggle
+  - uid: 10939
+    components:
+    - type: MetaData
+      desc: Эта кнопка переключает гермозатвор.
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,9.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        10951:
+        - Pressed: Toggle
 - proto: SignalTimer
   entities:
   - uid: 2826
@@ -67333,13 +67461,6 @@ entities:
     - type: Transform
       pos: -1.5,-5.5
       parent: 2
-- proto: SignCloning
-  entities:
-  - uid: 4409
-    components:
-    - type: Transform
-      pos: -24.5,2.5
-      parent: 2
 - proto: SignCryo
   entities:
   - uid: 4459
@@ -67353,6 +67474,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,-19.5
       parent: 2
+- proto: SignCryogenicsMed
+  entities:
+  - uid: 3396
+    components:
+    - type: Transform
+      pos: -24.5,2.5
+      parent: 2
 - proto: SignDirectionalBar
   entities:
   - uid: 10157
@@ -67555,10 +67683,10 @@ entities:
     - type: Transform
       pos: -34.5,-4.5
       parent: 2
-  - uid: 8856
+  - uid: 10952
     components:
     - type: Transform
-      pos: 33.5,9.5
+      pos: 33.5,11.5
       parent: 2
 - proto: SignEVA
   entities:
@@ -68003,6 +68131,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -22.5,8.5
       parent: 2
+  - uid: 10940
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,0.5
+      parent: 2
 - proto: SmartFridge
   entities:
   - uid: 3683
@@ -68272,6 +68406,13 @@ entities:
     - type: Transform
       pos: 26.5,18.5
       parent: 2
+- proto: SpawnMobHamsterHamlet
+  entities:
+  - uid: 10950
+    components:
+    - type: Transform
+      pos: 0.5,38.5
+      parent: 2
 - proto: SpawnMobMouse
   entities:
   - uid: 10352
@@ -68700,6 +68841,11 @@ entities:
     - type: Transform
       pos: -38.913918,7.5646825
       parent: 2
+  - uid: 10976
+    components:
+    - type: Transform
+      pos: -12.707901,-5.4892144
+      parent: 2
 - proto: SprayBottleWater
   entities:
   - uid: 5164
@@ -68910,6 +69056,15 @@ entities:
     - type: Transform
       pos: -20.5,-40.5
       parent: 2
+- proto: StationEfficiencyCircuitBoard
+  entities:
+  - uid: 4412
+    components:
+    - type: Transform
+      parent: 41
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: StationMap
   entities:
   - uid: 9807
@@ -70162,6 +70317,11 @@ entities:
     - type: Transform
       pos: 31.770435,30.631765
       parent: 2
+  - uid: 10805
+    components:
+    - type: Transform
+      pos: -15.529418,15.624914
+      parent: 2
 - proto: Table
   entities:
   - uid: 669
@@ -70857,11 +71017,6 @@ entities:
     - type: Transform
       pos: 24.5,-5.5
       parent: 2
-  - uid: 5262
-    components:
-    - type: Transform
-      pos: 33.5,3.5
-      parent: 2
   - uid: 5288
     components:
     - type: Transform
@@ -71059,11 +71214,6 @@ entities:
       parent: 2
 - proto: TableReinforcedGlass
   entities:
-  - uid: 83
-    components:
-    - type: Transform
-      pos: -25.5,5.5
-      parent: 2
   - uid: 95
     components:
     - type: Transform
@@ -71139,6 +71289,11 @@ entities:
     - type: Transform
       pos: -11.5,4.5
       parent: 2
+  - uid: 4409
+    components:
+    - type: Transform
+      pos: -26.5,5.5
+      parent: 2
   - uid: 4421
     components:
     - type: Transform
@@ -71276,6 +71431,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,16.5
       parent: 2
+  - uid: 10957
+    components:
+    - type: Transform
+      pos: -25.5,5.5
+      parent: 2
 - proto: TableStone
   entities:
   - uid: 2852
@@ -72022,6 +72182,97 @@ entities:
     - type: Transform
       pos: -36.5,1.5
       parent: 2
+- proto: TowelColorWhite
+  entities:
+  - uid: 9975
+    components:
+    - type: Transform
+      parent: 4955
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10476
+    components:
+    - type: Transform
+      pos: -21.28907,-13.102891
+      parent: 2
+  - uid: 10960
+    components:
+    - type: Transform
+      parent: 4972
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10961
+    components:
+    - type: Transform
+      parent: 4951
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10962
+    components:
+    - type: Transform
+      parent: 4973
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10963
+    components:
+    - type: Transform
+      parent: 4959
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10964
+    components:
+    - type: Transform
+      parent: 4976
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10965
+    components:
+    - type: Transform
+      parent: 4956
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10966
+    components:
+    - type: Transform
+      parent: 4975
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10967
+    components:
+    - type: Transform
+      parent: 4960
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10968
+    components:
+    - type: Transform
+      parent: 4974
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10969
+    components:
+    - type: Transform
+      parent: 5414
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 10970
+    components:
+    - type: Transform
+      parent: 5415
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ToyFigurineBoxer
   entities:
   - uid: 10756
@@ -72129,7 +72380,7 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        3396:
+        10611:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
@@ -72141,13 +72392,6 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-- proto: UnfinishedMachineFrame
-  entities:
-  - uid: 10476
-    components:
-    - type: Transform
-      pos: -28.5,3.5
-      parent: 2
 - proto: UniformPrinter
   entities:
   - uid: 2007
@@ -81785,6 +82029,11 @@ entities:
       parent: 2
 - proto: WeldingFuelTankFull
   entities:
+  - uid: 4416
+    components:
+    - type: Transform
+      pos: -11.5,15.5
+      parent: 2
   - uid: 6276
     components:
     - type: Transform
@@ -81800,11 +82049,6 @@ entities:
     - type: Transform
       pos: 8.5,-15.5
       parent: 2
-  - uid: 9885
-    components:
-    - type: Transform
-      pos: -19.5,15.5
-      parent: 2
   - uid: 9898
     components:
     - type: Transform
@@ -82268,20 +82512,6 @@ entities:
     - type: Transform
       pos: -2.5,39.5
       parent: 2
-  - uid: 2860
-    components:
-    - type: MetaData
-      name: зеркало
-    - type: Transform
-      pos: 18.5,26.5
-      parent: 2
-  - uid: 2861
-    components:
-    - type: MetaData
-      name: зеркало
-    - type: Transform
-      pos: 19.5,26.5
-      parent: 2
   - uid: 3541
     components:
     - type: Transform
@@ -82756,4 +82986,16 @@ entities:
     - type: Transform
       pos: 14.5,-16.5
       parent: 2
+  - uid: 10958
+    components:
+    - type: Transform
+      pos: -27.5,3.5
+      parent: 2
+- proto: Zipties
+  entities:
+  - uid: 4701
+    components:
+    - type: Transform
+      pos: -15.076293,15.359289
+      parent: 2
 ...