From edc1fbeaf17c68d77398c256ce0eaf66b4c79ee1 Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Sat, 21 Sep 2024 02:13:02 +0100
Subject: [PATCH 1/3] glacier update

---
 Resources/Maps/glacier.yml | 1216 ++++++++++++++++++++++++++----------
 1 file changed, 899 insertions(+), 317 deletions(-)

diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index b1b06eeed7f..18d255b8ce5 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -9694,9 +9694,9 @@ entities:
             0: 111
           -4,12:
             0: 30583
-            3: 34952
+            2: 34952
           -4,10:
-            2: 12
+            3: 12
             0: 52224
           -4,11:
             0: 3276
@@ -9704,12 +9704,12 @@ entities:
             0: 118
           -3,10:
             0: 4352
-            3: 26214
+            2: 26214
           -3,11:
             0: 281
-            3: 26214
+            2: 26214
           -3,12:
-            3: 63351
+            2: 63351
           -2,9:
             0: 2039
           -2,10:
@@ -9718,7 +9718,7 @@ entities:
             0: 30591
           -2,12:
             0: 119
-            3: 61440
+            2: 61440
           -1,9:
             0: 30711
           -1,10:
@@ -9727,16 +9727,16 @@ entities:
             0: 30503
           -1,12:
             0: 119
-            3: 61440
+            2: 61440
           0,8:
             0: 63351
           0,9:
             0: 63736
           0,10:
-            3: 61712
+            2: 61712
             0: 232
           0,11:
-            3: 16255
+            2: 16255
           0,-4:
             0: 60428
           0,-3:
@@ -9852,17 +9852,17 @@ entities:
           4,7:
             0: 61663
           0,12:
-            3: 64443
+            2: 64443
           1,9:
             0: 32767
           1,10:
             0: 35507
-            3: 12288
+            2: 12288
           1,11:
-            3: 8994
+            2: 8994
             0: 34944
           1,12:
-            3: 291
+            2: 291
           2,9:
             0: 4095
           2,10:
@@ -9879,7 +9879,7 @@ entities:
             0: 65534
           3,12:
             0: 28927
-            3: 32768
+            2: 32768
           4,8:
             0: 65294
           4,9:
@@ -9994,7 +9994,7 @@ entities:
             0: 56831
           4,12:
             0: 255
-            3: 61440
+            2: 61440
           5,9:
             0: 3838
           5,10:
@@ -10003,7 +10003,7 @@ entities:
             0: 65528
           5,12:
             0: 33535
-            3: 28672
+            2: 28672
           6,9:
             0: 61439
           6,10:
@@ -10160,16 +10160,16 @@ entities:
             0: 43008
           10,12:
             0: 19
-            3: 27784
+            2: 27784
           11,9:
             0: 65534
           11,10:
             0: 56559
           11,11:
             0: 477
-            3: 17408
+            2: 17408
           11,12:
-            3: 4407
+            2: 4407
           12,8:
             0: 30583
           12,9:
@@ -10179,76 +10179,76 @@ entities:
           12,11:
             0: 3327
           0,13:
-            3: 43929
+            2: 43929
           -1,13:
-            3: 2039
+            2: 2039
           0,14:
-            3: 61038
+            2: 61038
             0: 128
           -1,14:
             0: 65535
           0,15:
-            3: 61166
+            2: 61166
           -1,15:
             0: 15
             4: 65280
           0,16:
-            3: 43942
+            2: 43942
             0: 8
           1,13:
-            3: 273
+            2: 273
             0: 8
           1,14:
-            3: 51711
+            2: 51711
           1,15:
-            3: 39127
+            2: 39127
             0: 8
           1,16:
-            3: 25823
+            2: 25823
           2,13:
             0: 3067
           2,14:
-            3: 60303
+            2: 60303
           3,13:
             0: 2867
-            3: 136
+            2: 136
           3,14:
             0: 65535
           4,13:
-            3: 255
+            2: 255
             0: 36608
           4,14:
             0: 65535
           5,13:
-            3: 30583
+            2: 30583
             0: 34952
           5,14:
-            3: 1911
+            2: 1911
             0: 63624
           6,13:
             0: 61167
           6,14:
-            3: 45552
+            2: 45552
           5,15:
             0: 8
           6,15:
             0: 34959
           7,13:
             0: 13107
-            3: 34952
+            2: 34952
           7,14:
-            3: 62200
+            2: 62200
           6,16:
             0: 136
-            3: 34816
+            2: 34816
           7,15:
             0: 27718
           7,16:
             0: 53106
           8,13:
-            3: 17615
+            2: 17615
           8,14:
-            3: 5828
+            2: 5828
             0: 8192
           12,4:
             0: 6
@@ -10266,25 +10266,25 @@ entities:
             0: 61439
           15,6:
             0: 20480
-            3: 35840
+            2: 35840
           15,7:
             0: 61661
           16,6:
-            3: 12288
+            2: 12288
           16,7:
             0: 61489
-            3: 70
+            2: 70
           6,17:
-            3: 2184
+            2: 2184
           7,17:
-            3: 25138
+            2: 25138
             0: 34956
           7,18:
-            3: 36386
+            2: 36386
             0: 8
           8,18:
             0: 241
-            3: 61952
+            2: 61952
           13,9:
             0: 28671
           13,10:
@@ -10309,10 +10309,10 @@ entities:
             0: 28912
           16,9:
             0: 61489
-            3: 70
+            2: 70
           16,10:
             0: 12528
-            3: 16384
+            2: 16384
           16,11:
             0: 1
           13,0:
@@ -10323,7 +10323,7 @@ entities:
             0: 12407
           13,3:
             0: 51
-            3: 1024
+            2: 1024
           13,-1:
             0: 34963
           -8,4:
@@ -10428,20 +10428,20 @@ entities:
           4,-6:
             0: 33075
           -8,-3:
-            3: 12544
+            2: 12544
           -9,-3:
             0: 64250
-            3: 1285
+            2: 1285
           -8,-1:
             0: 61731
           -9,-2:
             0: 64170
-            3: 1365
+            2: 1365
           -9,-1:
             0: 64174
-            3: 1361
+            2: 1361
           -8,-2:
-            3: 512
+            2: 512
           -8,0:
             0: 65526
           -7,-3:
@@ -10450,7 +10450,7 @@ entities:
             0: 62321
           -7,-5:
             0: 24576
-            3: 119
+            2: 119
           -7,-4:
             0: 49152
           -7,-2:
@@ -10471,27 +10471,27 @@ entities:
             0: 30513
           -9,0:
             0: 64170
-            3: 1365
+            2: 1365
           -8,1:
-            3: 1799
+            2: 1799
             0: 2296
           -9,1:
             0: 64250
-            3: 1285
+            2: 1285
           -8,2:
             0: 64384
           -9,2:
             0: 51200
-            3: 1
+            2: 1
           -9,3:
             0: 47308
           -7,1:
-            3: 1799
+            2: 1799
             0: 2296
           -7,2:
             0: 65392
           -6,1:
-            3: 263
+            2: 263
             0: 248
           -6,2:
             0: 52424
@@ -10502,32 +10502,32 @@ entities:
           8,16:
             0: 204
           9,13:
-            3: 34959
+            2: 34959
           9,14:
-            3: 248
+            2: 248
             0: 62464
           9,15:
             0: 4351
           9,16:
             0: 65535
           10,13:
-            3: 3
+            2: 3
           10,14:
             0: 36864
-            3: 32
+            2: 32
           10,15:
             0: 61499
           10,16:
             0: 4539
           11,14:
-            3: 8177
+            2: 8177
             0: 57344
           11,15:
             0: 207
           11,13:
-            3: 4401
+            2: 4401
           12,14:
-            3: 12561
+            2: 12561
           12,15:
             0: 8209
           11,16:
@@ -10548,10 +10548,10 @@ entities:
             0: 65535
           -12,3:
             0: 49151
-            3: 16384
+            2: 16384
           -13,3:
             0: 9215
-            3: 56320
+            2: 56320
           -11,0:
             0: 65535
           -11,1:
@@ -10559,7 +10559,7 @@ entities:
           -11,2:
             0: 65535
           -11,3:
-            3: 1799
+            2: 1799
             0: 63736
           -11,-1:
             0: 65535
@@ -10569,12 +10569,12 @@ entities:
             0: 65535
           -10,1:
             0: 63999
-            3: 1536
+            2: 1536
           -10,2:
-            3: 1285
+            2: 1285
             0: 31482
           -10,3:
-            3: 773
+            2: 773
             0: 12338
           -10,-1:
             0: 65535
@@ -10588,19 +10588,19 @@ entities:
             0: 61183
           -13,5:
             0: 58468
-            3: 2
+            2: 2
           -13,6:
             0: 26188
-            3: 48
+            2: 48
           -12,7:
             0: 45056
-            3: 16384
+            2: 16384
           -12,8:
-            3: 1799
+            2: 1799
             0: 12536
           -13,7:
             0: 57344
-            3: 4914
+            2: 4914
           -11,5:
             0: 30583
           -11,6:
@@ -10608,7 +10608,7 @@ entities:
           -11,7:
             0: 61986
           -11,8:
-            3: 1797
+            2: 1797
             0: 59642
           -10,6:
             0: 52479
@@ -10617,7 +10617,7 @@ entities:
           -10,5:
             0: 52430
           -10,8:
-            3: 771
+            2: 771
             0: 29812
           -9,6:
             0: 12545
@@ -10626,7 +10626,7 @@ entities:
           -12,-4:
             0: 61440
           -12,-3:
-            3: 1799
+            2: 1799
             0: 63736
           -13,-3:
             0: 3935
@@ -10638,28 +10638,28 @@ entities:
             0: 65535
           -11,-4:
             0: 12288
-            3: 16384
+            2: 16384
           -11,-3:
-            3: 1807
+            2: 1807
             0: 63728
           -11,-2:
             0: 65535
           -10,-3:
-            3: 1797
+            2: 1797
             0: 63736
           -10,-2:
             0: 65535
           -10,-4:
-            3: 6152
+            2: 6152
             0: 49152
           -10,-5:
             0: 34952
           -9,-4:
-            3: 1365
+            2: 1365
             0: 64170
           -9,-5:
             0: 64175
-            3: 1360
+            2: 1360
           -16,-4:
             0: 28671
           -16,-5:
@@ -10676,19 +10676,19 @@ entities:
             0: 28398
           -16,-1:
             0: 49138
-            3: 16384
+            2: 16384
           -17,-1:
             0: 2240
-            3: 32768
+            2: 32768
           -16,0:
-            3: 1
+            2: 1
             0: 1150
           -15,-4:
             0: 819
-            3: 32768
+            2: 32768
           -15,-3:
             0: 819
-            3: 34952
+            2: 34952
           -15,-2:
             0: 13107
           -15,-1:
@@ -10703,41 +10703,41 @@ entities:
             0: 65534
           -14,-4:
             0: 57344
-            3: 64
+            2: 64
           -14,-2:
-            3: 15
+            2: 15
             0: 51328
           -14,0:
             0: 65535
           -13,-4:
             0: 28672
-            3: 144
+            2: 144
           -10,-6:
             0: 32768
           -9,-6:
             0: 61440
           -8,-5:
-            3: 255
+            2: 255
           -16,-6:
-            3: 15
+            2: 15
             0: 63232
           -17,-6:
-            3: 74
+            2: 74
             0: 61696
           -17,-5:
             0: 57561
           -16,-7:
-            3: 8192
+            2: 8192
           -15,-6:
-            3: 16400
+            2: 16400
             0: 45056
           -14,-6:
             0: 4096
-            3: 8192
+            2: 8192
           -14,-5:
-            3: 4352
+            2: 4352
           -17,0:
-            3: 8
+            2: 8
             0: 2240
           -16,1:
             0: 3824
@@ -10754,7 +10754,7 @@ entities:
           -16,4:
             0: 65535
           -15,1:
-            3: 752
+            2: 752
             0: 8456
           -15,3:
             0: 20447
@@ -10762,29 +10762,29 @@ entities:
             0: 50786
           -15,4:
             0: 9830
-            3: 2048
+            2: 2048
           -14,1:
             0: 61439
           -14,2:
             0: 62606
-            3: 320
+            2: 320
           -14,3:
             0: 8191
-            3: 57344
+            2: 57344
           -14,4:
-            3: 1834
+            2: 1834
             0: 34944
           -13,4:
             0: 24578
-            3: 544
+            2: 544
           -18,-7:
-            3: 2112
+            2: 2112
           -18,-6:
             0: 51396
           -18,-5:
             0: 12
           -17,-7:
-            3: 40064
+            2: 40064
           -19,2:
             0: 9319
           -19,3:
@@ -10852,7 +10852,7 @@ entities:
             0: 7103
           8,-9:
             0: 57344
-            3: 224
+            2: 224
           9,-8:
             0: 53755
           9,-7:
@@ -10861,7 +10861,7 @@ entities:
             0: 4081
           9,-9:
             0: 47296
-            3: 16
+            2: 16
           10,-8:
             0: 56343
           10,-7:
@@ -10991,22 +10991,22 @@ entities:
           17,-2:
             0: 34955
           17,-1:
-            3: 22016
+            2: 22016
             0: 43208
           17,0:
             0: 30475
-            3: 4
+            2: 4
           18,-3:
             0: 30591
           18,-2:
             0: 25207
-            3: 5376
+            2: 5376
           18,-1:
             0: 61203
-            3: 4196
+            2: 4196
           18,0:
             0: 49117
-            3: 16418
+            2: 16418
           19,-3:
             0: 49087
           19,-1:
@@ -11041,7 +11041,7 @@ entities:
             0: 65532
           -13,8:
             0: 43257
-            3: 1798
+            2: 1798
           -11,9:
             0: 3104
           -10,9:
@@ -11064,40 +11064,40 @@ entities:
             0: 65394
           -14,7:
             0: 45736
-            3: 19522
+            2: 19522
           -14,8:
             0: 9386
-            3: 51780
+            2: 51780
           -4,13:
             0: 119
-            3: 62600
+            2: 62600
           -5,13:
             0: 30632
           -4,14:
-            3: 65023
+            2: 65023
           -5,14:
-            3: 21882
+            2: 21882
             0: 5
           -4,15:
-            3: 4383
+            2: 4383
           -5,15:
-            3: 29772
+            2: 29772
           -4,16:
-            3: 18255
+            2: 18255
           -3,13:
-            3: 14071
+            2: 14071
           -3,14:
-            3: 13107
+            2: 13107
             0: 34952
           -3,15:
-            3: 8739
+            2: 8739
             0: 8
             4: 34816
           -3,16:
-            3: 60963
+            2: 60963
             4: 8
           -2,13:
-            3: 3324
+            2: 3324
             0: 49152
           -2,14:
             0: 65535
@@ -11106,64 +11106,64 @@ entities:
             4: 65280
           -2,16:
             4: 15
-            3: 65280
+            2: 65280
           -1,16:
             4: 15
-            3: 7936
+            2: 7936
           -5,16:
-            3: 7962
+            2: 7962
             0: 16452
           -4,17:
-            3: 47332
+            2: 47332
             0: 16384
           -5,17:
-            3: 42567
+            2: 42567
             0: 16384
           -4,18:
-            3: 35820
+            2: 35820
             0: 1024
           -5,18:
-            3: 4030
+            2: 4030
           -4,19:
-            3: 51400
+            2: 51400
           -3,17:
-            3: 49722
+            2: 49722
             0: 12288
           -3,18:
-            3: 3631
+            2: 3631
             0: 256
           -3,19:
-            3: 4112
+            2: 4112
           -4,20:
-            3: 51400
+            2: 51400
           -2,17:
-            3: 61453
+            2: 61453
           -2,18:
-            3: 3455
+            2: 3455
             0: 512
           -1,17:
-            3: 57617
+            2: 57617
             0: 4096
           -1,18:
-            3: 36767
+            2: 36767
           -1,19:
-            3: 51400
+            2: 51400
           0,17:
-            3: 30891
+            2: 30891
             0: 32768
           0,18:
-            3: 185
+            2: 185
             0: 256
           0,19:
-            3: 4112
+            2: 4112
           -1,20:
-            3: 51400
+            2: 51400
           1,17:
-            3: 4372
+            2: 4372
           1,18:
-            3: 99
+            2: 99
           2,16:
-            3: 1
+            2: 1
           -8,12:
             0: 65328
           -9,12:
@@ -11179,9 +11179,9 @@ entities:
           -6,14:
             0: 35055
           -6,15:
-            3: 34952
+            2: 34952
           -6,16:
-            3: 7960
+            2: 7960
             0: 32896
           21,-4:
             0: 4096
@@ -11228,14 +11228,14 @@ entities:
           15,-13:
             0: 65409
           21,-8:
-            3: 32903
+            2: 32903
             0: 32624
           21,-7:
-            3: 7
+            2: 7
           22,-8:
-            3: 18241
+            2: 18241
           22,-7:
-            3: 1
+            2: 1
           -16,5:
             0: 14199
           -17,5:
@@ -11246,23 +11246,23 @@ entities:
             0: 61198
           -15,5:
             0: 4402
-            3: 17984
+            2: 17984
           -15,6:
-            3: 16
+            2: 16
             0: 236
           -14,6:
             0: 8208
-            3: 224
+            2: 224
           -14,5:
-            3: 8
+            2: 8
           -8,16:
-            3: 20288
+            2: 20288
           -7,16:
-            3: 24400
+            2: 24400
           -6,17:
-            3: 34952
+            2: 34952
           -6,18:
-            3: 136
+            2: 136
             0: 2048
           12,16:
             0: 23955
@@ -11270,39 +11270,39 @@ entities:
             0: 1535
           9,18:
             0: 48
-            3: 62528
+            2: 62528
           10,17:
             0: 273
           10,18:
-            3: 63616
+            2: 63616
           11,18:
-            3: 15904
+            2: 15904
             0: 4
           11,17:
             0: 2048
           12,17:
             0: 48
           12,18:
-            3: 1809
+            2: 1809
           -7,-6:
             0: 36864
-            3: 26222
+            2: 26222
           -7,-8:
-            3: 26342
+            2: 26342
           -7,-9:
-            3: 28262
+            2: 28262
           -7,-7:
-            3: 26222
+            2: 26222
           -6,-8:
-            3: 8244
+            2: 8244
             0: 52424
           -6,-7:
-            3: 17
+            2: 17
             0: 63342
           -6,-6:
             0: 179
           -6,-9:
-            3: 20300
+            2: 20300
             0: 32768
           -5,-8:
             0: 63863
@@ -11310,7 +11310,7 @@ entities:
             0: 34968
           -5,-9:
             0: 16382
-            3: 1
+            2: 1
           -4,-8:
             0: 17417
           -4,-6:
@@ -11384,20 +11384,20 @@ entities:
           17,-14:
             0: 4096
           -3,20:
-            3: 4112
+            2: 4112
           -4,21:
-            3: 136
+            2: 136
           0,20:
-            3: 4112
+            2: 4112
           -1,21:
-            3: 136
+            2: 136
           -7,-10:
             0: 2050
-            3: 26348
+            2: 26348
           -6,-10:
-            3: 17663
+            2: 17663
           -5,-10:
-            3: 17
+            2: 17
             0: 51456
           -5,-11:
             0: 4096
@@ -11423,7 +11423,7 @@ entities:
             1: 3
             0: 3712
           16,0:
-            3: 4
+            2: 4
             0: 51208
           16,1:
             0: 2248
@@ -11431,31 +11431,31 @@ entities:
             0: 1911
           18,1:
             0: 4081
-            3: 14
+            2: 14
           19,1:
-            3: 13
+            2: 13
             0: 3826
           20,0:
             0: 62208
-            3: 3072
+            2: 3072
           20,1:
             0: 1023
-            3: 3072
+            2: 3072
           21,0:
-            3: 9472
+            2: 9472
             0: 4096
           21,1:
             0: 31
-            3: 3360
+            2: 3360
           22,1:
             0: 1367
-            3: 520
+            2: 520
           22,0:
-            3: 4096
+            2: 4096
           23,1:
-            3: 17
+            2: 17
           23,0:
-            3: 4096
+            2: 4096
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -11488,10 +11488,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
@@ -11503,11 +11504,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
@@ -11773,8 +11773,22 @@ entities:
       - 4145
       - 4146
       - 4147
+  - uid: 6307
+    components:
+    - type: MetaData
+      name: service room air alarm
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,0.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9373
+      - 9448
   - uid: 8610
     components:
+    - type: MetaData
+      name: teg air alarm
     - type: Transform
       pos: -3.5,61.5
       parent: 2
@@ -11783,6 +11797,8 @@ entities:
       - 4760
   - uid: 17596
     components:
+    - type: MetaData
+      name: tool room air alarm
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 33.5,36.5
@@ -11797,12 +11813,16 @@ entities:
       - 17600
   - uid: 17597
     components:
+    - type: MetaData
+      name: central hall air alarm
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,22.5
       parent: 2
   - uid: 17598
     components:
+    - type: MetaData
+      name: east hall air alarm
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 36.5,21.5
@@ -11827,6 +11847,8 @@ entities:
       - 17550
   - uid: 17604
     components:
+    - type: MetaData
+      name: chapel air alarm
     - type: Transform
       pos: 32.5,-14.5
       parent: 2
@@ -11837,6 +11859,8 @@ entities:
       - 8249
   - uid: 17605
     components:
+    - type: MetaData
+      name: medical air alarm
     - type: Transform
       pos: 9.5,-0.5
       parent: 2
@@ -11855,6 +11879,8 @@ entities:
       - 9435
   - uid: 17606
     components:
+    - type: MetaData
+      name: cryogenics air alarm
     - type: Transform
       pos: -2.5,-5.5
       parent: 2
@@ -11864,6 +11890,143 @@ entities:
       - 9375
       - 9296
       - 9453
+  - uid: 17929
+    components:
+    - type: MetaData
+      name: mime air alarm
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,-4.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9372
+      - 9449
+  - uid: 17930
+    components:
+    - type: MetaData
+      name: clown air alarm
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,-12.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9450
+      - 9371
+  - uid: 17931
+    components:
+    - type: MetaData
+      name: public garden air alarm
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-16.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9452
+      - 9370
+  - uid: 17932
+    components:
+    - type: MetaData
+      name: boxing ring air alarm
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-14.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9369
+      - 9451
+  - uid: 17933
+    components:
+    - type: MetaData
+      name: perma air alarm
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,17.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17936
+      - 17935
+      - 9293
+      - 9437
+      - 17937
+      - 17934
+  - uid: 17938
+    components:
+    - type: MetaData
+      name: security air alarm
+    - type: Transform
+      pos: -17.5,20.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17939
+      - 17940
+      - 17942
+      - 17943
+      - 9368
+      - 17944
+  - uid: 17945
+    components:
+    - type: MetaData
+      name: warden air alarm
+    - type: Transform
+      pos: -13.5,23.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9445
+      - 9361
+  - uid: 17946
+    components:
+    - type: MetaData
+      name: brig air alarm
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,21.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17947
+      - 9443
+      - 17939
+      - 17940
+      - 6196
+      - 14340
+      - 17614
+      - 14342
+  - uid: 17948
+    components:
+    - type: MetaData
+      name: security lobby air alarm
+    - type: Transform
+      pos: -3.5,31.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9330
+      - 9409
+      - 9438
+      - 9362
+  - uid: 17949
+    components:
+    - type: MetaData
+      name: security dorms air alarm
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,35.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9440
+      - 9366
+      - 9364
+      - 9441
+      - 9365
+      - 9442
 - proto: AirAlarmAssembly
   entities:
   - uid: 12
@@ -13809,6 +13972,42 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8610
+  - uid: 17934
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17933
+  - uid: 17935
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17933
+  - uid: 17936
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17933
+  - uid: 17937
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17933
 - proto: AltarSpawner
   entities:
   - uid: 241
@@ -15875,8 +16074,7 @@ entities:
       desc: Used for administering ten CCs of PAIN!
       name: The Doctor's Orders
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.689892,-7.3280826
+      pos: 13.626989,-7.2987084
       parent: 2
   - uid: 624
     components:
@@ -49360,11 +49558,6 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconSalvage
   entities:
-  - uid: 6307
-    components:
-    - type: Transform
-      pos: 80.5,4.5
-      parent: 2
   - uid: 9958
     components:
     - type: Transform
@@ -49376,7 +49569,7 @@ entities:
       pos: 89.5,4.5
       parent: 2
     - type: NavMapBeacon
-      text: Salvage Arm
+      text: Salvage Magnet
 - proto: DefaultStationBeaconScience
   entities:
   - uid: 10226
@@ -54771,6 +54964,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -23.5,43.5
       parent: 2
+  - uid: 17951
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-7.5
+      parent: 2
 - proto: EmergencyRollerBedSpawnFolded
   entities:
   - uid: 7221
@@ -54879,7 +55078,7 @@ entities:
       pos: 69.5,-7.5
       parent: 2
     - type: FaxMachine
-      name: Service, Reporter
+      name: Reporter's Office
   - uid: 7239
     components:
     - type: Transform
@@ -55135,6 +55334,18 @@ entities:
       - 17538
       - 17537
       - 17536
+  - uid: 17941
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,17.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17939
+      - 17940
+      - 17942
+      - 17943
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 7267
@@ -55168,6 +55379,27 @@ entities:
       deviceLists:
       - 10
       - 9
+- proto: FirelockEdge
+  entities:
+  - uid: 17942
+    components:
+    - type: Transform
+      pos: -22.5,18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17941
+      - 17938
+  - uid: 17943
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17941
+      - 17938
 - proto: FirelockFrame
   entities:
   - uid: 7268
@@ -55439,6 +55671,26 @@ entities:
       deviceLists:
       - 11
       - 17604
+  - uid: 17939
+    components:
+    - type: Transform
+      pos: -14.5,18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17941
+      - 17938
+      - 17946
+  - uid: 17940
+    components:
+    - type: Transform
+      pos: -14.5,17.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17941
+      - 17938
+      - 17946
 - proto: Fireplace
   entities:
   - uid: 7270
@@ -58633,13 +58885,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.5,49.5
       parent: 2
-  - uid: 12260
-    components:
-    - type: Transform
-      pos: -7.5,18.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 12345
     components:
     - type: Transform
@@ -67489,14 +67734,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 8937
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8938
     components:
     - type: Transform
@@ -69393,6 +69630,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 8937
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 9089
     components:
     - type: Transform
@@ -70486,6 +70731,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 12260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 12670
     components:
     - type: Transform
@@ -70998,6 +71251,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17946
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 6332
@@ -71092,6 +71348,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,19.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17933
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9294
@@ -71388,6 +71647,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,26.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17948
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9332
@@ -71614,6 +71876,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,22.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17945
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9362
@@ -71622,6 +71887,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,34.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17948
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9363
@@ -71637,6 +71905,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,37.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17949
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9365
@@ -71644,6 +71915,9 @@ entities:
     - type: Transform
       pos: -18.5,42.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17949
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9366
@@ -71652,6 +71926,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,31.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17949
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9368
@@ -71659,6 +71936,9 @@ entities:
     - type: Transform
       pos: -19.5,21.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17938
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9369
@@ -71667,6 +71947,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -13.5,-16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17932
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9370
@@ -71675,6 +71958,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,-16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17931
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9371
@@ -71683,6 +71969,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-9.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17930
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9372
@@ -71691,6 +71980,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-2.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17929
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9373
@@ -71699,6 +71991,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.5,1.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6307
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 9374
@@ -71766,6 +72061,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17946
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 17864
@@ -71805,6 +72103,16 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 17947
+    components:
+    - type: Transform
+      pos: -7.5,19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17946
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 5443
@@ -72124,6 +72432,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,25.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17948
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9410
@@ -72369,6 +72680,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -29.5,20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17933
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9438
@@ -72377,6 +72691,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,32.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17948
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9439
@@ -72392,6 +72709,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,30.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17949
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9441
@@ -72400,6 +72720,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,36.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17949
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9442
@@ -72407,6 +72730,9 @@ entities:
     - type: Transform
       pos: -17.5,41.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17949
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9443
@@ -72415,6 +72741,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,19.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17946
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9445
@@ -72423,6 +72752,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5,20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17945
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9447
@@ -72439,6 +72771,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,-0.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6307
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9449
@@ -72447,6 +72782,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,-3.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17929
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9450
@@ -72455,6 +72793,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-10.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17930
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9451
@@ -72463,6 +72804,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,-17.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17932
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9452
@@ -72471,6 +72815,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-17.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17931
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 9453
@@ -72500,6 +72847,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,15.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17946
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 14342
@@ -72508,6 +72858,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,15.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17946
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 16450
@@ -72585,6 +72938,16 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 17944
+    components:
+    - type: Transform
+      pos: -21.5,21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17938
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVolumePump
   entities:
   - uid: 4223
@@ -72814,11 +73177,6 @@ entities:
     - type: Transform
       pos: -13.734782,10.56881
       parent: 2
-  - uid: 9485
-    components:
-    - type: Transform
-      pos: 42.850143,-31.586727
-      parent: 2
 - proto: Grille
   entities:
   - uid: 462
@@ -95269,21 +95627,6 @@ entities:
     - type: Transform
       pos: 26.5,25.5
       parent: 2
-  - uid: 13238
-    components:
-    - type: Transform
-      pos: 37.5,10.5
-      parent: 2
-  - uid: 13239
-    components:
-    - type: Transform
-      pos: 38.5,10.5
-      parent: 2
-  - uid: 13240
-    components:
-    - type: Transform
-      pos: 42.5,9.5
-      parent: 2
   - uid: 13241
     components:
     - type: Transform
@@ -100751,7 +101094,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: ai satellite 2
+      id: AI Satellite 2
   - uid: 10831
     components:
     - type: Transform
@@ -100762,7 +101105,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: ai satellite 1
+      id: AI Satellite 1
   - uid: 10833
     components:
     - type: Transform
@@ -100773,7 +101116,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: ai core
+      id: AI Core
   - uid: 11036
     components:
     - type: Transform
@@ -100784,7 +101127,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: ai satellite 3
+      id: AI Satellite 3
   - uid: 14090
     components:
     - type: Transform
@@ -100827,7 +101170,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: Control Room
+      id: Bridge
   - uid: 14094
     components:
     - type: Transform
@@ -100849,6 +101192,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Vault
+  - uid: 14109
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-32.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Mysta's Room
   - uid: 16356
     components:
     - type: Transform
@@ -100858,7 +101212,51 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: bridge exterior
+      id: Bridge Exterior
+  - uid: 17962
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,41.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Bridge Courtyard
+  - uid: 17963
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,65.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Upload
+  - uid: 17969
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,13.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Logistics Officer's Office
+  - uid: 14101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,40.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Chief Engineer's Office
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 5352
@@ -100894,16 +101292,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Atmospherics Lobby
-  - uid: 14097
-    components:
-    - type: Transform
-      pos: -2.5,56.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Atmospherics Experiment Chambers
   - uid: 14100
     components:
     - type: Transform
@@ -100915,17 +101303,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: AME Room
-  - uid: 14101
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,40.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Chief Engineer's Office
   - uid: 14102
     components:
     - type: Transform
@@ -100946,7 +101323,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraEngineering
       nameSet: True
-      id: Robotics
+      id: Backup Power
   - uid: 14104
     components:
     - type: Transform
@@ -100969,6 +101346,58 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Atmospheric Upper Courtyard
+  - uid: 14156
+    components:
+    - type: Transform
+      pos: 10.5,56.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmos Walkway
+  - uid: 17964
+    components:
+    - type: Transform
+      pos: 9.5,51.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Telecomms
+  - uid: 17965
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,55.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Gravity
+  - uid: 17966
+    components:
+    - type: Transform
+      pos: -4.5,66.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solar Control
+  - uid: 17967
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,56.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: TEG Exterior
 - proto: SurveillanceCameraGeneral
   entities:
   - uid: 14106
@@ -100988,7 +101417,7 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
-      - SurveillanceCameraGeneral
+      - SurveillanceCameraMedical
       nameSet: True
       id: Medical Front
   - uid: 14108
@@ -101000,17 +101429,6 @@ entities:
     - type: SurveillanceCamera
       nameSet: True
       id: Clothing Kiosk
-  - uid: 14109
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 35.5,10.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Cargo Front
   - uid: 14110
     components:
     - type: Transform
@@ -101064,6 +101482,71 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Evacuation
+  - uid: 17955
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.5,-0.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Disposals
+  - uid: 17959
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,21.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Central Hall
+  - uid: 17960
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,10.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Botany Hall
+  - uid: 17961
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,35.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Tool Room
+  - uid: 17953
+    components:
+    - type: Transform
+      pos: 49.5,-12.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Cryosleep
+  - uid: 13240
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,10.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Logistics Front
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 13913
@@ -101164,6 +101647,17 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Chemistry Lab
+  - uid: 17950
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-7.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Morgue
 - proto: SurveillanceCameraRouterCommand
   entities:
   - uid: 17901
@@ -101273,17 +101767,6 @@ entities:
       - SurveillanceCameraScience
       nameSet: True
       id: Lockers
-  - uid: 14135
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-27.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraScience
-      nameSet: True
-      id: Artifact Chamber
   - uid: 14136
     components:
     - type: Transform
@@ -101305,6 +101788,16 @@ entities:
       - SurveillanceCameraScience
       nameSet: True
       id: Forensic Mantis' Office
+  - uid: 17971
+    components:
+    - type: Transform
+      pos: 34.5,-32.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Artifact Lab
 - proto: SurveillanceCameraSecurity
   entities:
   - uid: 14139
@@ -101447,6 +101940,38 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Courtroom
+  - uid: 17956
+    components:
+    - type: Transform
+      pos: -21.5,18.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Perma Visitation
+  - uid: 17957
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,22.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Warden's Room
+  - uid: 17958
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,15.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Brig Cells
 - proto: SurveillanceCameraService
   entities:
   - uid: 14153
@@ -101481,41 +102006,63 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Hydroponics
-  - uid: 14156
+  - uid: 14157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,41.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Musician's Room
+  - uid: 14158
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 43.5,10.5
+      pos: 7.5,15.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraService
       nameSet: True
-      id: Cargo
-  - uid: 14157
+      id: Kitchen
+  - uid: 17952
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 55.5,41.5
+      pos: 39.5,3.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraService
       nameSet: True
-      id: Musician's Room
-  - uid: 14158
+      id: Janitor's Closet
+  - uid: 17954
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,15.5
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-9.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraService
       nameSet: True
-      id: Kitchen
+      id: Reporter's Office
 - proto: SurveillanceCameraSupply
   entities:
+  - uid: 14135
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,10.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Logistics
   - uid: 17375
     components:
     - type: Transform
@@ -101524,6 +102071,26 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Salvage Dock
+  - uid: 17968
+    components:
+    - type: Transform
+      pos: 48.5,14.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Salvage Equipment
+  - uid: 17970
+    components:
+    - type: Transform
+      pos: 52.5,2.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Cargo Shuttle Dock
 - proto: SurveillanceCameraWirelessRouterEntertainment
   entities:
   - uid: 8556
@@ -113855,7 +114422,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -1095.1196
+      secondsUntilStateChange: -3420.321
       state: Opening
     - type: Airlock
       autoClose: False
@@ -113871,7 +114438,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -1094.553
+      secondsUntilStateChange: -3419.7544
       state: Opening
     - type: Airlock
       autoClose: False
@@ -113893,7 +114460,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -1094.0863
+      secondsUntilStateChange: -3419.2878
       state: Opening
     - type: Airlock
       autoClose: False
@@ -113909,7 +114476,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -1095.6196
+      secondsUntilStateChange: -3420.821
       state: Opening
     - type: Airlock
       autoClose: False
@@ -113955,11 +114522,26 @@ entities:
     - type: Transform
       pos: 2.5,-6.5
       parent: 2
+  - uid: 9485
+    components:
+    - type: Transform
+      pos: 37.5,10.5
+      parent: 2
   - uid: 12145
     components:
     - type: Transform
       pos: 42.5,-19.5
       parent: 2
+  - uid: 13238
+    components:
+    - type: Transform
+      pos: 38.5,10.5
+      parent: 2
+  - uid: 13239
+    components:
+    - type: Transform
+      pos: 42.5,9.5
+      parent: 2
   - uid: 16358
     components:
     - type: Transform

From 55900240715628b9423557287155e49d82397366 Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Sat, 21 Sep 2024 02:17:21 +0100
Subject: [PATCH 2/3] fax

---
 Resources/Maps/glacier.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index 18d255b8ce5..a527f2b65b8 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -55120,21 +55120,21 @@ entities:
       pos: 20.5,-12.5
       parent: 2
     - type: FaxMachine
-      name: CMO's Room
+      name: Chief Medical Officer
   - uid: 7245
     components:
     - type: Transform
       pos: 26.5,22.5
       parent: 2
     - type: FaxMachine
-      name: Service, HoP
+      name: Head of Personnel
   - uid: 7246
     components:
     - type: Transform
       pos: 7.5,-13.5
       parent: 2
     - type: FaxMachine
-      name: Medical, Virology
+      name: Virology
   - uid: 7247
     components:
     - type: Transform

From ba69b9a7af53da32f09704981a93ae330b99ab5c Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Sun, 22 Sep 2024 02:12:32 +0100
Subject: [PATCH 3/3] other

---
 Resources/Maps/glacier.yml | 90 +++++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 41 deletions(-)

diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index a527f2b65b8..8ab44a7cc2a 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -16562,6 +16562,13 @@ entities:
     - type: Transform
       pos: -1.5,49.5
       parent: 2
+- proto: Biogenerator
+  entities:
+  - uid: 6400
+    components:
+    - type: Transform
+      pos: 27.5,2.5
+      parent: 2
 - proto: BiomassReclaimer
   entities:
   - uid: 709
@@ -47702,6 +47709,12 @@ entities:
       parent: 2
 - proto: ComputerAlert
   entities:
+  - uid: 14097
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,57.5
+      parent: 2
   - uid: 17148
     components:
     - type: Transform
@@ -48635,11 +48648,6 @@ entities:
     - type: Transform
       pos: 26.5,6.5
       parent: 2
-  - uid: 6400
-    components:
-    - type: Transform
-      pos: 27.5,2.5
-      parent: 2
 - proto: CrateHydroSecure
   entities:
   - uid: 6401
@@ -101192,6 +101200,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Vault
+  - uid: 14101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,40.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Chief Engineer's Office
   - uid: 14109
     components:
     - type: Transform
@@ -101246,17 +101265,6 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Logistics Officer's Office
-  - uid: 14101
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,40.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: Chief Engineer's Office
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 5352
@@ -101400,6 +101408,17 @@ entities:
       id: TEG Exterior
 - proto: SurveillanceCameraGeneral
   entities:
+  - uid: 13240
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,10.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Logistics Front
   - uid: 14106
     components:
     - type: Transform
@@ -101482,6 +101501,16 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Evacuation
+  - uid: 17953
+    components:
+    - type: Transform
+      pos: 49.5,-12.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Cryosleep
   - uid: 17955
     components:
     - type: Transform
@@ -101526,27 +101555,6 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Tool Room
-  - uid: 17953
-    components:
-    - type: Transform
-      pos: 49.5,-12.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Cryosleep
-  - uid: 13240
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 35.5,10.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Logistics Front
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 13913
@@ -114422,7 +114430,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -3420.321
+      secondsUntilStateChange: -3483.2776
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114438,7 +114446,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -3419.7544
+      secondsUntilStateChange: -3482.711
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114460,7 +114468,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -3419.2878
+      secondsUntilStateChange: -3482.2444
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114476,7 +114484,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -3420.821
+      secondsUntilStateChange: -3483.7776
       state: Opening
     - type: Airlock
       autoClose: False