From cfcab8cbcf6a0388acb324eef51eef0b5b226e10 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Thu, 19 Sep 2024 01:26:23 +0000
Subject: [PATCH] glacier update (#1851)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Resources/Maps/glacier.yml | 510 ++++++++++++++++++++-----------------
 1 file changed, 280 insertions(+), 230 deletions(-)

diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index 4efcaa14f91..b1b06eeed7f 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -8,6 +8,7 @@ tilemap:
   15: FloorBlue
   16: FloorBlueCircuit
   17: FloorBoxing
+  18: FloorBrokenWood
   19: FloorCarpetClown
   21: FloorCave
   22: FloorCaveDrought
@@ -144,7 +145,7 @@ entities:
           version: 6
         1,0:
           ind: 1,0
-          tiles: VAAAAAADVAAAAAABVAAAAAADVQAAAAABVQAAAAADVQAAAAACVQAAAAADVQAAAAADVQAAAAACVQAAAAADVQAAAAACFQAAAAAEFQAAAAADXgAAAAAAXgAAAAACXgAAAAADVAAAAAADVAAAAAABVAAAAAAAYQAAAAAAVQAAAAADVQAAAAADFQAAAAAFFQAAAAAEFQAAAAAEXgAAAAACXgAAAAAAFQAAAAABFQAAAAAAXgAAAAACXgAAAAAAXgAAAAAAVAAAAAACVAAAAAAAVAAAAAABYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAEFQAAAAAAFQAAAAAEXgAAAAACXgAAAAACXgAAAAABYQAAAAAAXgAAAAABXgAAAAADXgAAAAAAVAAAAAACVAAAAAABVAAAAAACNwAAAAAARwAAAAAARwAAAAAARwAAAAAAFQAAAAAAYQAAAAAAXgAAAAADXgAAAAADXgAAAAACFgAAAAAFFgAAAAABFgAAAAAFFgAAAAACVAAAAAACVAAAAAABVAAAAAACNwAAAAAARwAAAAAARwAAAAAARwAAAAADRwAAAAAAPQAAAAAAXgAAAAACXgAAAAADXgAAAAACFgAAAAAGFgAAAAAGFgAAAAAGFgAAAAABPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAARwAAAAADRwAAAAABRwAAAAABRwAAAAACYQAAAAAAYQAAAAAAXgAAAAABXgAAAAADFgAAAAAAFgAAAAAEFgAAAAAEFgAAAAAFCQAAAAAACQAAAAAMFQAAAAABFQAAAAAAFQAAAAAGRwAAAAACRwAAAAACRwAAAAACYQAAAAAAFQAAAAAEXgAAAAADXgAAAAABXgAAAAACFgAAAAAFFgAAAAADFgAAAAADCQAAAAAACQAAAAAACQAAAAAAFQAAAAAEFQAAAAAARwAAAAABRwAAAAAARwAAAAACNwAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAXgAAAAAAFgAAAAAAFgAAAAABSwAAAAAACQAAAAAACQAAAAAACQAAAAAHFQAAAAAFRwAAAAACRwAAAAADRwAAAAACYQAAAAAAFQAAAAACXgAAAAADXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAAASwAAAAABSwAAAAABCQAAAAAACQAAAAAAYQAAAAAARwAAAAACRwAAAAABRwAAAAACFQAAAAAEFQAAAAADYQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAYQAAAAAASwAAAAABSwAAAAAASwAAAAAACQAAAAAAYQAAAAAARwAAAAABRwAAAAABRwAAAAADRwAAAAABRwAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAAARwAAAAABSwAAAAAASwAAAAAASwAAAAACSwAAAAACNwAAAAAARwAAAAABRwAAAAADRwAAAAADRwAAAAAARwAAAAAAXgAAAAADXgAAAAABXgAAAAACXgAAAAADXgAAAAACRwAAAAACCQAAAAAASwAAAAAASwAAAAACSwAAAAADPQAAAAAARwAAAAABRwAAAAABRwAAAAABRwAAAAADRwAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAAARwAAAAABUgAAAAAAUgAAAAAASwAAAAABSwAAAAABNwAAAAAARwAAAAADRwAAAAADRwAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABRwAAAAABRwAAAAAARwAAAAAAUQAAAAAAFQAAAAAAYQAAAAAAFQAAAAAAFQAAAAAEFQAAAAAFFQAAAAAGFQAAAAAEFQAAAAACFQAAAAAAFQAAAAAGFQAAAAACFQAAAAAFRwAAAAAARwAAAAAARwAAAAACFQAAAAAFFQAAAAAEFQAAAAADFQAAAAAAFQAAAAAGYQAAAAAAFQAAAAADFQAAAAAC
+          tiles: VAAAAAADVAAAAAABVAAAAAADVQAAAAABVQAAAAADVQAAAAACVQAAAAADVQAAAAADVQAAAAACVQAAAAADVQAAAAACFQAAAAAEFQAAAAADXgAAAAAAXgAAAAACXgAAAAADVAAAAAADVAAAAAABVAAAAAAAYQAAAAAAVQAAAAADVQAAAAADFQAAAAAFFQAAAAAEFQAAAAAEXgAAAAACXgAAAAAAFQAAAAABFQAAAAAAXgAAAAACXgAAAAAAXgAAAAAAVAAAAAACVAAAAAAAVAAAAAABYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAEFQAAAAAAFQAAAAAEXgAAAAACXgAAAAACXgAAAAABYQAAAAAAXgAAAAABXgAAAAADXgAAAAAAVAAAAAACVAAAAAABVAAAAAACNwAAAAAARwAAAAAARwAAAAAARwAAAAAAFQAAAAAAYQAAAAAAXgAAAAADXgAAAAADXgAAAAACFgAAAAAFFgAAAAABFgAAAAAFFgAAAAACVAAAAAACVAAAAAABVAAAAAACNwAAAAAARwAAAAAARwAAAAAARwAAAAADRwAAAAAAPQAAAAAAXgAAAAACXgAAAAADXgAAAAACFgAAAAAGFgAAAAAGFgAAAAAGFgAAAAABPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAARwAAAAADRwAAAAABRwAAAAABRwAAAAACYQAAAAAAYQAAAAAAXgAAAAABXgAAAAADFgAAAAAAFgAAAAAEFgAAAAAEFgAAAAAFCQAAAAAACQAAAAAMFQAAAAABFQAAAAAAFQAAAAAGRwAAAAACRwAAAAACRwAAAAACYQAAAAAAFQAAAAAEXgAAAAADXgAAAAABEgAAAAAAFgAAAAAFFgAAAAADFgAAAAADCQAAAAAACQAAAAAACQAAAAAAFQAAAAAEFQAAAAAARwAAAAABRwAAAAAARwAAAAACNwAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAEgAAAAAAFgAAAAAAFgAAAAABSwAAAAAACQAAAAAACQAAAAAACQAAAAAHFQAAAAAFRwAAAAACRwAAAAADRwAAAAACYQAAAAAAFQAAAAAAXgAAAAADXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAAASwAAAAABSwAAAAABCQAAAAAACQAAAAAAYQAAAAAARwAAAAACRwAAAAABRwAAAAACFQAAAAAEFQAAAAADYQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAYQAAAAAASwAAAAABSwAAAAAASwAAAAAACQAAAAAAYQAAAAAARwAAAAABRwAAAAABRwAAAAADRwAAAAABRwAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAAARwAAAAABSwAAAAAASwAAAAAASwAAAAACSwAAAAACNwAAAAAARwAAAAABRwAAAAADRwAAAAADRwAAAAAARwAAAAAAXgAAAAADXgAAAAABXgAAAAACXgAAAAADXgAAAAACRwAAAAACCQAAAAAASwAAAAAASwAAAAACSwAAAAADPQAAAAAARwAAAAABRwAAAAABRwAAAAABRwAAAAADRwAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAAARwAAAAABUgAAAAAAUgAAAAAASwAAAAABSwAAAAABNwAAAAAARwAAAAADRwAAAAADRwAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABRwAAAAABRwAAAAAARwAAAAAAUQAAAAAAFQAAAAAAYQAAAAAAFQAAAAAAFQAAAAAEFQAAAAAFFQAAAAAGFQAAAAAEFQAAAAACFQAAAAAAFQAAAAAGFQAAAAACFQAAAAAFRwAAAAAARwAAAAAARwAAAAACFQAAAAAFFQAAAAAEFQAAAAADFQAAAAAAFQAAAAAGYQAAAAAAFQAAAAADFQAAAAAC
           version: 6
         1,1:
           ind: 1,1
@@ -9693,9 +9694,9 @@ entities:
             0: 111
           -4,12:
             0: 30583
-            2: 34952
+            3: 34952
           -4,10:
-            3: 12
+            2: 12
             0: 52224
           -4,11:
             0: 3276
@@ -9703,12 +9704,12 @@ entities:
             0: 118
           -3,10:
             0: 4352
-            2: 26214
+            3: 26214
           -3,11:
             0: 281
-            2: 26214
+            3: 26214
           -3,12:
-            2: 63351
+            3: 63351
           -2,9:
             0: 2039
           -2,10:
@@ -9717,7 +9718,7 @@ entities:
             0: 30591
           -2,12:
             0: 119
-            2: 61440
+            3: 61440
           -1,9:
             0: 30711
           -1,10:
@@ -9726,16 +9727,16 @@ entities:
             0: 30503
           -1,12:
             0: 119
-            2: 61440
+            3: 61440
           0,8:
             0: 63351
           0,9:
             0: 63736
           0,10:
-            2: 61712
+            3: 61712
             0: 232
           0,11:
-            2: 16255
+            3: 16255
           0,-4:
             0: 60428
           0,-3:
@@ -9851,17 +9852,17 @@ entities:
           4,7:
             0: 61663
           0,12:
-            2: 64443
+            3: 64443
           1,9:
             0: 32767
           1,10:
             0: 35507
-            2: 12288
+            3: 12288
           1,11:
-            2: 8994
+            3: 8994
             0: 34944
           1,12:
-            2: 291
+            3: 291
           2,9:
             0: 4095
           2,10:
@@ -9878,7 +9879,7 @@ entities:
             0: 65534
           3,12:
             0: 28927
-            2: 32768
+            3: 32768
           4,8:
             0: 65294
           4,9:
@@ -9993,7 +9994,7 @@ entities:
             0: 56831
           4,12:
             0: 255
-            2: 61440
+            3: 61440
           5,9:
             0: 3838
           5,10:
@@ -10002,7 +10003,7 @@ entities:
             0: 65528
           5,12:
             0: 33535
-            2: 28672
+            3: 28672
           6,9:
             0: 61439
           6,10:
@@ -10159,16 +10160,16 @@ entities:
             0: 43008
           10,12:
             0: 19
-            2: 27784
+            3: 27784
           11,9:
             0: 65534
           11,10:
             0: 56559
           11,11:
             0: 477
-            2: 17408
+            3: 17408
           11,12:
-            2: 4407
+            3: 4407
           12,8:
             0: 30583
           12,9:
@@ -10178,76 +10179,76 @@ entities:
           12,11:
             0: 3327
           0,13:
-            2: 43929
+            3: 43929
           -1,13:
-            2: 2039
+            3: 2039
           0,14:
-            2: 61038
+            3: 61038
             0: 128
           -1,14:
             0: 65535
           0,15:
-            2: 61166
+            3: 61166
           -1,15:
             0: 15
             4: 65280
           0,16:
-            2: 43942
+            3: 43942
             0: 8
           1,13:
-            2: 273
+            3: 273
             0: 8
           1,14:
-            2: 51711
+            3: 51711
           1,15:
-            2: 39127
+            3: 39127
             0: 8
           1,16:
-            2: 25823
+            3: 25823
           2,13:
             0: 3067
           2,14:
-            2: 60303
+            3: 60303
           3,13:
             0: 2867
-            2: 136
+            3: 136
           3,14:
             0: 65535
           4,13:
-            2: 255
+            3: 255
             0: 36608
           4,14:
             0: 65535
           5,13:
-            2: 30583
+            3: 30583
             0: 34952
           5,14:
-            2: 1911
+            3: 1911
             0: 63624
           6,13:
             0: 61167
           6,14:
-            2: 45552
+            3: 45552
           5,15:
             0: 8
           6,15:
             0: 34959
           7,13:
             0: 13107
-            2: 34952
+            3: 34952
           7,14:
-            2: 62200
+            3: 62200
           6,16:
             0: 136
-            2: 34816
+            3: 34816
           7,15:
             0: 27718
           7,16:
             0: 53106
           8,13:
-            2: 17615
+            3: 17615
           8,14:
-            2: 5828
+            3: 5828
             0: 8192
           12,4:
             0: 6
@@ -10265,25 +10266,25 @@ entities:
             0: 61439
           15,6:
             0: 20480
-            2: 35840
+            3: 35840
           15,7:
             0: 61661
           16,6:
-            2: 12288
+            3: 12288
           16,7:
             0: 61489
-            2: 70
+            3: 70
           6,17:
-            2: 2184
+            3: 2184
           7,17:
-            2: 25138
+            3: 25138
             0: 34956
           7,18:
-            2: 36386
+            3: 36386
             0: 8
           8,18:
             0: 241
-            2: 61952
+            3: 61952
           13,9:
             0: 28671
           13,10:
@@ -10308,10 +10309,10 @@ entities:
             0: 28912
           16,9:
             0: 61489
-            2: 70
+            3: 70
           16,10:
             0: 12528
-            2: 16384
+            3: 16384
           16,11:
             0: 1
           13,0:
@@ -10322,7 +10323,7 @@ entities:
             0: 12407
           13,3:
             0: 51
-            2: 1024
+            3: 1024
           13,-1:
             0: 34963
           -8,4:
@@ -10427,20 +10428,20 @@ entities:
           4,-6:
             0: 33075
           -8,-3:
-            2: 12544
+            3: 12544
           -9,-3:
             0: 64250
-            2: 1285
+            3: 1285
           -8,-1:
             0: 61731
           -9,-2:
             0: 64170
-            2: 1365
+            3: 1365
           -9,-1:
             0: 64174
-            2: 1361
+            3: 1361
           -8,-2:
-            2: 512
+            3: 512
           -8,0:
             0: 65526
           -7,-3:
@@ -10449,7 +10450,7 @@ entities:
             0: 62321
           -7,-5:
             0: 24576
-            2: 119
+            3: 119
           -7,-4:
             0: 49152
           -7,-2:
@@ -10470,27 +10471,27 @@ entities:
             0: 30513
           -9,0:
             0: 64170
-            2: 1365
+            3: 1365
           -8,1:
-            2: 1799
+            3: 1799
             0: 2296
           -9,1:
             0: 64250
-            2: 1285
+            3: 1285
           -8,2:
             0: 64384
           -9,2:
             0: 51200
-            2: 1
+            3: 1
           -9,3:
             0: 47308
           -7,1:
-            2: 1799
+            3: 1799
             0: 2296
           -7,2:
             0: 65392
           -6,1:
-            2: 263
+            3: 263
             0: 248
           -6,2:
             0: 52424
@@ -10501,32 +10502,32 @@ entities:
           8,16:
             0: 204
           9,13:
-            2: 34959
+            3: 34959
           9,14:
-            2: 248
+            3: 248
             0: 62464
           9,15:
             0: 4351
           9,16:
             0: 65535
           10,13:
-            2: 3
+            3: 3
           10,14:
             0: 36864
-            2: 32
+            3: 32
           10,15:
             0: 61499
           10,16:
             0: 4539
           11,14:
-            2: 8177
+            3: 8177
             0: 57344
           11,15:
             0: 207
           11,13:
-            2: 4401
+            3: 4401
           12,14:
-            2: 12561
+            3: 12561
           12,15:
             0: 8209
           11,16:
@@ -10547,10 +10548,10 @@ entities:
             0: 65535
           -12,3:
             0: 49151
-            2: 16384
+            3: 16384
           -13,3:
             0: 9215
-            2: 56320
+            3: 56320
           -11,0:
             0: 65535
           -11,1:
@@ -10558,7 +10559,7 @@ entities:
           -11,2:
             0: 65535
           -11,3:
-            2: 1799
+            3: 1799
             0: 63736
           -11,-1:
             0: 65535
@@ -10568,12 +10569,12 @@ entities:
             0: 65535
           -10,1:
             0: 63999
-            2: 1536
+            3: 1536
           -10,2:
-            2: 1285
+            3: 1285
             0: 31482
           -10,3:
-            2: 773
+            3: 773
             0: 12338
           -10,-1:
             0: 65535
@@ -10587,19 +10588,19 @@ entities:
             0: 61183
           -13,5:
             0: 58468
-            2: 2
+            3: 2
           -13,6:
             0: 26188
-            2: 48
+            3: 48
           -12,7:
             0: 45056
-            2: 16384
+            3: 16384
           -12,8:
-            2: 1799
+            3: 1799
             0: 12536
           -13,7:
             0: 57344
-            2: 4914
+            3: 4914
           -11,5:
             0: 30583
           -11,6:
@@ -10607,7 +10608,7 @@ entities:
           -11,7:
             0: 61986
           -11,8:
-            2: 1797
+            3: 1797
             0: 59642
           -10,6:
             0: 52479
@@ -10616,7 +10617,7 @@ entities:
           -10,5:
             0: 52430
           -10,8:
-            2: 771
+            3: 771
             0: 29812
           -9,6:
             0: 12545
@@ -10625,7 +10626,7 @@ entities:
           -12,-4:
             0: 61440
           -12,-3:
-            2: 1799
+            3: 1799
             0: 63736
           -13,-3:
             0: 3935
@@ -10637,28 +10638,28 @@ entities:
             0: 65535
           -11,-4:
             0: 12288
-            2: 16384
+            3: 16384
           -11,-3:
-            2: 1807
+            3: 1807
             0: 63728
           -11,-2:
             0: 65535
           -10,-3:
-            2: 1797
+            3: 1797
             0: 63736
           -10,-2:
             0: 65535
           -10,-4:
-            2: 6152
+            3: 6152
             0: 49152
           -10,-5:
             0: 34952
           -9,-4:
-            2: 1365
+            3: 1365
             0: 64170
           -9,-5:
             0: 64175
-            2: 1360
+            3: 1360
           -16,-4:
             0: 28671
           -16,-5:
@@ -10675,19 +10676,19 @@ entities:
             0: 28398
           -16,-1:
             0: 49138
-            2: 16384
+            3: 16384
           -17,-1:
             0: 2240
-            2: 32768
+            3: 32768
           -16,0:
-            2: 1
+            3: 1
             0: 1150
           -15,-4:
             0: 819
-            2: 32768
+            3: 32768
           -15,-3:
             0: 819
-            2: 34952
+            3: 34952
           -15,-2:
             0: 13107
           -15,-1:
@@ -10702,41 +10703,41 @@ entities:
             0: 65534
           -14,-4:
             0: 57344
-            2: 64
+            3: 64
           -14,-2:
-            2: 15
+            3: 15
             0: 51328
           -14,0:
             0: 65535
           -13,-4:
             0: 28672
-            2: 144
+            3: 144
           -10,-6:
             0: 32768
           -9,-6:
             0: 61440
           -8,-5:
-            2: 255
+            3: 255
           -16,-6:
-            2: 15
+            3: 15
             0: 63232
           -17,-6:
-            2: 74
+            3: 74
             0: 61696
           -17,-5:
             0: 57561
           -16,-7:
-            2: 8192
+            3: 8192
           -15,-6:
-            2: 16400
+            3: 16400
             0: 45056
           -14,-6:
             0: 4096
-            2: 8192
+            3: 8192
           -14,-5:
-            2: 4352
+            3: 4352
           -17,0:
-            2: 8
+            3: 8
             0: 2240
           -16,1:
             0: 3824
@@ -10753,7 +10754,7 @@ entities:
           -16,4:
             0: 65535
           -15,1:
-            2: 752
+            3: 752
             0: 8456
           -15,3:
             0: 20447
@@ -10761,29 +10762,29 @@ entities:
             0: 50786
           -15,4:
             0: 9830
-            2: 2048
+            3: 2048
           -14,1:
             0: 61439
           -14,2:
             0: 62606
-            2: 320
+            3: 320
           -14,3:
             0: 8191
-            2: 57344
+            3: 57344
           -14,4:
-            2: 1834
+            3: 1834
             0: 34944
           -13,4:
             0: 24578
-            2: 544
+            3: 544
           -18,-7:
-            2: 2112
+            3: 2112
           -18,-6:
             0: 51396
           -18,-5:
             0: 12
           -17,-7:
-            2: 40064
+            3: 40064
           -19,2:
             0: 9319
           -19,3:
@@ -10851,7 +10852,7 @@ entities:
             0: 7103
           8,-9:
             0: 57344
-            2: 224
+            3: 224
           9,-8:
             0: 53755
           9,-7:
@@ -10860,7 +10861,7 @@ entities:
             0: 4081
           9,-9:
             0: 47296
-            2: 16
+            3: 16
           10,-8:
             0: 56343
           10,-7:
@@ -10990,22 +10991,22 @@ entities:
           17,-2:
             0: 34955
           17,-1:
-            2: 22016
+            3: 22016
             0: 43208
           17,0:
             0: 30475
-            2: 4
+            3: 4
           18,-3:
             0: 30591
           18,-2:
             0: 25207
-            2: 5376
+            3: 5376
           18,-1:
             0: 61203
-            2: 4196
+            3: 4196
           18,0:
             0: 49117
-            2: 16418
+            3: 16418
           19,-3:
             0: 49087
           19,-1:
@@ -11040,7 +11041,7 @@ entities:
             0: 65532
           -13,8:
             0: 43257
-            2: 1798
+            3: 1798
           -11,9:
             0: 3104
           -10,9:
@@ -11063,40 +11064,40 @@ entities:
             0: 65394
           -14,7:
             0: 45736
-            2: 19522
+            3: 19522
           -14,8:
             0: 9386
-            2: 51780
+            3: 51780
           -4,13:
             0: 119
-            2: 62600
+            3: 62600
           -5,13:
             0: 30632
           -4,14:
-            2: 65023
+            3: 65023
           -5,14:
-            2: 21882
+            3: 21882
             0: 5
           -4,15:
-            2: 4383
+            3: 4383
           -5,15:
-            2: 29772
+            3: 29772
           -4,16:
-            2: 18255
+            3: 18255
           -3,13:
-            2: 14071
+            3: 14071
           -3,14:
-            2: 13107
+            3: 13107
             0: 34952
           -3,15:
-            2: 8739
+            3: 8739
             0: 8
             4: 34816
           -3,16:
-            2: 60963
+            3: 60963
             4: 8
           -2,13:
-            2: 3324
+            3: 3324
             0: 49152
           -2,14:
             0: 65535
@@ -11105,64 +11106,64 @@ entities:
             4: 65280
           -2,16:
             4: 15
-            2: 65280
+            3: 65280
           -1,16:
             4: 15
-            2: 7936
+            3: 7936
           -5,16:
-            2: 7962
+            3: 7962
             0: 16452
           -4,17:
-            2: 47332
+            3: 47332
             0: 16384
           -5,17:
-            2: 42567
+            3: 42567
             0: 16384
           -4,18:
-            2: 35820
+            3: 35820
             0: 1024
           -5,18:
-            2: 4030
+            3: 4030
           -4,19:
-            2: 51400
+            3: 51400
           -3,17:
-            2: 49722
+            3: 49722
             0: 12288
           -3,18:
-            2: 3631
+            3: 3631
             0: 256
           -3,19:
-            2: 4112
+            3: 4112
           -4,20:
-            2: 51400
+            3: 51400
           -2,17:
-            2: 61453
+            3: 61453
           -2,18:
-            2: 3455
+            3: 3455
             0: 512
           -1,17:
-            2: 57617
+            3: 57617
             0: 4096
           -1,18:
-            2: 36767
+            3: 36767
           -1,19:
-            2: 51400
+            3: 51400
           0,17:
-            2: 30891
+            3: 30891
             0: 32768
           0,18:
-            2: 185
+            3: 185
             0: 256
           0,19:
-            2: 4112
+            3: 4112
           -1,20:
-            2: 51400
+            3: 51400
           1,17:
-            2: 4372
+            3: 4372
           1,18:
-            2: 99
+            3: 99
           2,16:
-            2: 1
+            3: 1
           -8,12:
             0: 65328
           -9,12:
@@ -11178,9 +11179,9 @@ entities:
           -6,14:
             0: 35055
           -6,15:
-            2: 34952
+            3: 34952
           -6,16:
-            2: 7960
+            3: 7960
             0: 32896
           21,-4:
             0: 4096
@@ -11227,14 +11228,14 @@ entities:
           15,-13:
             0: 65409
           21,-8:
-            2: 32903
+            3: 32903
             0: 32624
           21,-7:
-            2: 7
+            3: 7
           22,-8:
-            2: 18241
+            3: 18241
           22,-7:
-            2: 1
+            3: 1
           -16,5:
             0: 14199
           -17,5:
@@ -11245,23 +11246,23 @@ entities:
             0: 61198
           -15,5:
             0: 4402
-            2: 17984
+            3: 17984
           -15,6:
-            2: 16
+            3: 16
             0: 236
           -14,6:
             0: 8208
-            2: 224
+            3: 224
           -14,5:
-            2: 8
+            3: 8
           -8,16:
-            2: 20288
+            3: 20288
           -7,16:
-            2: 24400
+            3: 24400
           -6,17:
-            2: 34952
+            3: 34952
           -6,18:
-            2: 136
+            3: 136
             0: 2048
           12,16:
             0: 23955
@@ -11269,39 +11270,39 @@ entities:
             0: 1535
           9,18:
             0: 48
-            2: 62528
+            3: 62528
           10,17:
             0: 273
           10,18:
-            2: 63616
+            3: 63616
           11,18:
-            2: 15904
+            3: 15904
             0: 4
           11,17:
             0: 2048
           12,17:
             0: 48
           12,18:
-            2: 1809
+            3: 1809
           -7,-6:
             0: 36864
-            2: 26222
+            3: 26222
           -7,-8:
-            2: 26342
+            3: 26342
           -7,-9:
-            2: 28262
+            3: 28262
           -7,-7:
-            2: 26222
+            3: 26222
           -6,-8:
-            2: 8244
+            3: 8244
             0: 52424
           -6,-7:
-            2: 17
+            3: 17
             0: 63342
           -6,-6:
             0: 179
           -6,-9:
-            2: 20300
+            3: 20300
             0: 32768
           -5,-8:
             0: 63863
@@ -11309,7 +11310,7 @@ entities:
             0: 34968
           -5,-9:
             0: 16382
-            2: 1
+            3: 1
           -4,-8:
             0: 17417
           -4,-6:
@@ -11383,20 +11384,20 @@ entities:
           17,-14:
             0: 4096
           -3,20:
-            2: 4112
+            3: 4112
           -4,21:
-            2: 136
+            3: 136
           0,20:
-            2: 4112
+            3: 4112
           -1,21:
-            2: 136
+            3: 136
           -7,-10:
             0: 2050
-            2: 26348
+            3: 26348
           -6,-10:
-            2: 17663
+            3: 17663
           -5,-10:
-            2: 17
+            3: 17
             0: 51456
           -5,-11:
             0: 4096
@@ -11422,7 +11423,7 @@ entities:
             1: 3
             0: 3712
           16,0:
-            2: 4
+            3: 4
             0: 51208
           16,1:
             0: 2248
@@ -11430,31 +11431,31 @@ entities:
             0: 1911
           18,1:
             0: 4081
-            2: 14
+            3: 14
           19,1:
-            2: 13
+            3: 13
             0: 3826
           20,0:
             0: 62208
-            2: 3072
+            3: 3072
           20,1:
             0: 1023
-            2: 3072
+            3: 3072
           21,0:
-            2: 9472
+            3: 9472
             0: 4096
           21,1:
             0: 31
-            2: 3360
+            3: 3360
           22,1:
             0: 1367
-            2: 520
+            3: 520
           22,0:
-            2: 4096
+            3: 4096
           23,1:
-            2: 17
+            3: 17
           23,0:
-            2: 4096
+            3: 4096
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -11487,11 +11488,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          immutable: True
-          temperature: 213.15
+          temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
+          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -11503,10 +11503,11 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
+          temperature: 213.15
           moles:
-          - 0
-          - 6666.982
+          - 21.824879
+          - 82.10312
           - 0
           - 0
           - 0
@@ -15842,7 +15843,7 @@ entities:
     - type: Transform
       pos: 79.5,-29.5
       parent: 2
-  - uid: 10641
+  - uid: 7266
     components:
     - type: Transform
       pos: 25.5,8.5
@@ -45658,6 +45659,13 @@ entities:
     - type: Transform
       pos: 8.5,-9.5
       parent: 2
+- proto: ChemMasterMachineCircuitboard
+  entities:
+  - uid: 10641
+    components:
+    - type: Transform
+      pos: 30.667278,0.4718771
+      parent: 2
 - proto: ChessBoard
   entities:
   - uid: 5982
@@ -47507,8 +47515,8 @@ entities:
   - uid: 6283
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-29.5
+      rot: 4.71238898038469 rad
+      pos: 36.5,-29.5
       parent: 2
 - proto: computerBodyScanner
   entities:
@@ -55023,6 +55031,11 @@ entities:
     - type: Transform
       pos: 31.5,-25.5
       parent: 2
+  - uid: 17925
+    components:
+    - type: Transform
+      pos: 33.5,-30.5
+      parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
   - uid: 7264
@@ -55124,15 +55137,16 @@ entities:
       - 17536
 - proto: FireAxeCabinetFilled
   entities:
-  - uid: 7266
+  - uid: 7267
     components:
     - type: Transform
-      pos: 39.5,46.5
+      pos: -6.5,39.5
       parent: 2
-  - uid: 7267
+  - uid: 17928
     components:
     - type: Transform
-      pos: -6.5,39.5
+      rot: 3.141592653589793 rad
+      pos: 38.5,46.5
       parent: 2
 - proto: Firelock
   entities:
@@ -70774,6 +70788,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 34.5,-29.5
       parent: 2
+    - type: GasPressurePump
+      targetPressure: 25
   - uid: 7621
     components:
     - type: Transform
@@ -75980,6 +75996,26 @@ entities:
     - type: Transform
       pos: 36.5,22.5
       parent: 2
+  - uid: 13132
+    components:
+    - type: Transform
+      pos: 28.5,3.5
+      parent: 2
+  - uid: 17921
+    components:
+    - type: Transform
+      pos: 30.5,4.5
+      parent: 2
+  - uid: 17922
+    components:
+    - type: Transform
+      pos: 28.5,5.5
+      parent: 2
+  - uid: 17923
+    components:
+    - type: Transform
+      pos: 30.5,6.5
+      parent: 2
 - proto: HydroponicsToolClippers
   entities:
   - uid: 10101
@@ -76034,7 +76070,7 @@ entities:
   - uid: 10110
     components:
     - type: Transform
-      pos: 25.39032,3.5923414
+      pos: 25.533035,2.893752
       parent: 2
 - proto: HydroponicsToolScythe
   entities:
@@ -76477,6 +76513,11 @@ entities:
     - type: Transform
       pos: -4.5,-13.5
       parent: 2
+  - uid: 17926
+    components:
+    - type: Transform
+      pos: 25.5,3.5
+      parent: 2
 - proto: KitchenSpike
   entities:
   - uid: 10178
@@ -87367,6 +87408,13 @@ entities:
     - type: Transform
       pos: 68.26685,-9.3414
       parent: 2
+- proto: PhoneInstrument
+  entities:
+  - uid: 17927
+    components:
+    - type: Transform
+      pos: 40.634407,44.497078
+      parent: 2
 - proto: PianoInstrument
   entities:
   - uid: 12265
@@ -94685,11 +94733,6 @@ entities:
       parent: 2
 - proto: ReagentGrinderMachineCircuitboard
   entities:
-  - uid: 13132
-    components:
-    - type: Transform
-      pos: 30.552803,0.46486855
-      parent: 2
   - uid: 13133
     components:
     - type: Transform
@@ -104299,6 +104342,13 @@ entities:
     - type: Transform
       pos: 48.5,-26.5
       parent: 2
+- proto: VendingMachineRobotics
+  entities:
+  - uid: 17924
+    components:
+    - type: Transform
+      pos: 43.5,-24.5
+      parent: 2
 - proto: VendingMachineSalvage
   entities:
   - uid: 9175
@@ -113805,10 +113855,10 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -93.39996
+      secondsUntilStateChange: -1095.1196
       state: Opening
     - type: Airlock
-      autoClose: false
+      autoClose: False
   - uid: 13197
     components:
     - type: MetaData
@@ -113821,10 +113871,10 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -92.8333
+      secondsUntilStateChange: -1094.553
       state: Opening
     - type: Airlock
-      autoClose: false
+      autoClose: False
   - uid: 15893
     components:
     - type: Transform
@@ -113843,10 +113893,10 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -92.36663
+      secondsUntilStateChange: -1094.0863
       state: Opening
     - type: Airlock
-      autoClose: false
+      autoClose: False
   - uid: 16355
     components:
     - type: MetaData
@@ -113859,10 +113909,10 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -93.89996
+      secondsUntilStateChange: -1095.6196
       state: Opening
     - type: Airlock
-      autoClose: false
+      autoClose: False
   - uid: 16357
     components:
     - type: MetaData