From 88d43a428a7d193a164605ec8bc68d7231c3d8e5 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 14 Jan 2025 06:19:20 +0000
Subject: [PATCH] glacier update (#2706)

* glacier update

* power sec apc

---------

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

diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index 1a32685837f..50afc8ade06 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -273,7 +273,7 @@ entities:
           version: 6
         2,-2:
           ind: 2,-2
-          tiles: UQAAAAAAGAAAAAAAGAAAAAACGAAAAAADGAAAAAAAGAAAAAAAYQAAAAAAGAAAAAAAGAAAAAABGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAPQAAAAAAGAAAAAABGAAAAAAAGAAAAAACGAAAAAABGAAAAAAANwAAAAAAGAAAAAAAGAAAAAABYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAICQAAAAAECQAAAAAAYQAAAAAAYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAGAAAAAABYQAAAAAAOwAAAAADOwAAAAABOwAAAAABYQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAGAAAAAADGAAAAAAAGAAAAAACYQAAAAAAOwAAAAACOwAAAAAAOwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAGAAAAAACGAAAAAAAGAAAAAAANwAAAAAAOwAAAAABOwAAAAADOwAAAAAAYQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAABIQAAAAABIQAAAAADGAAAAAADGAAAAAACGAAAAAACGAAAAAAAGAAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAACYQAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAIQAAAAAAIQAAAAABGAAAAAADGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAACPQAAAAAAOwAAAAACOwAAAAADOwAAAAACYQAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABGAAAAAADGAAAAAACGAAAAAACGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAACIQAAAAAAGAAAAAACGAAAAAAAGAAAAAACGAAAAAADGAAAAAADGAAAAAADGAAAAAACGAAAAAACNwAAAAAAIQAAAAADIQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAADGAAAAAACGAAAAAABGAAAAAADGAAAAAAAGAAAAAACGAAAAAACGAAAAAAAGAAAAAACYQAAAAAAIQAAAAADIQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADGAAAAAABPQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADHwAAAAACHwAAAAACYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAFgAAAAADYQAAAAAAYQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHwAAAAACHwAAAAABNwAAAAAAGAAAAAACGAAAAAAAGAAAAAABYQAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAAASwAAAAABSwAAAAADCQAAAAAACQAAAAAACQAAAAAAGAAAAAACGAAAAAABNwAAAAAAGAAAAAAAGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAISwAAAAADSwAAAAADCQAAAAAACQAAAAAACQAAAAALHwAAAAAAHwAAAAADPQAAAAAAGAAAAAADGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAAFQAAAAACCQAAAAAASwAAAAAASwAAAAAACQAAAAAACQAAAAAACQAAAAAA
+          tiles: UQAAAAAAGAAAAAAAGAAAAAACGAAAAAADGAAAAAAAGAAAAAAAYQAAAAAAGAAAAAAAGAAAAAABGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAPQAAAAAAGAAAAAABGAAAAAAAGAAAAAACGAAAAAABGAAAAAAANwAAAAAAGAAAAAAAGAAAAAABYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAICQAAAAAECQAAAAAAYQAAAAAAYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAGAAAAAABYQAAAAAAOwAAAAADOwAAAAABOwAAAAABYQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAGAAAAAADGAAAAAAAGAAAAAACYQAAAAAAOwAAAAACOwAAAAAAOwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAGAAAAAACGAAAAAAAGAAAAAAANwAAAAAAOwAAAAABOwAAAAADOwAAAAAAYQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAABIQAAAAABIQAAAAADGAAAAAADGAAAAAACGAAAAAACGAAAAAAAGAAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAACYQAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAIQAAAAAAIQAAAAABGAAAAAADGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAACPQAAAAAAOwAAAAACOwAAAAADOwAAAAACYQAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABGAAAAAADGAAAAAACGAAAAAAAGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAACIQAAAAAAGAAAAAACGAAAAAAAGAAAAAAAGAAAAAADGAAAAAADGAAAAAADGAAAAAACGAAAAAACNwAAAAAAIQAAAAADIQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAADGAAAAAACGAAAAAABGAAAAAADGAAAAAAAGAAAAAACGAAAAAACGAAAAAAAGAAAAAACYQAAAAAAIQAAAAADIQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADGAAAAAABPQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADHwAAAAACHwAAAAACYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAFgAAAAADYQAAAAAAYQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHwAAAAACHwAAAAABNwAAAAAAGAAAAAACGAAAAAAAGAAAAAABYQAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAAASwAAAAABSwAAAAADCQAAAAAACQAAAAAACQAAAAAAGAAAAAACGAAAAAABNwAAAAAAGAAAAAAAGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAISwAAAAADSwAAAAADCQAAAAAACQAAAAAACQAAAAALHwAAAAAAHwAAAAADPQAAAAAAGAAAAAADGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAAFQAAAAACCQAAAAAASwAAAAAASwAAAAAACQAAAAAACQAAAAAACQAAAAAA
           version: 6
         3,-2:
           ind: 3,-2
@@ -281,7 +281,7 @@ entities:
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: FQAAAAAAFQAAAAAEFQAAAAABFQAAAAAECQAAAAAACQAAAAAAPQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAHAAAAAAAHAAAAAACYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAAFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFYQAAAAAAXgAAAAABXgAAAAACXgAAAAACNwAAAAAAHAAAAAACHAAAAAABYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAEFQAAAAACFQAAAAABUgAAAAAAFQAAAAADUgAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAHAAAAAADHAAAAAABYQAAAAAAYQAAAAAAUQAAAAAAFQAAAAACFQAAAAACFQAAAAADUgAAAAAAFQAAAAABFQAAAAACYQAAAAAAOwAAAAAAOwAAAAAAOwAAAAABPQAAAAAAHAAAAAABHAAAAAADYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAOwAAAAACOwAAAAACOwAAAAAANwAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABFQAAAAAFFQAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHAAAAAABHAAAAAABYQAAAAAAPQAAAAAAPQAAAAAAFQAAAAAAFQAAAAADFQAAAAADFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAADGAAAAAADGAAAAAABGAAAAAABHAAAAAAAHAAAAAACHAAAAAAAGAAAAAABGAAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAAFFQAAAAAFFQAAAAAAUQAAAAAAGAAAAAACGAAAAAAAGAAAAAADGAAAAAABHAAAAAACHAAAAAACHAAAAAAAGAAAAAADGAAAAAAACQAAAAAKCQAAAAADFQAAAAAGFQAAAAAFFQAAAAACFQAAAAAEYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADGAAAAAAAGAAAAAABCQAAAAACCQAAAAAAFQAAAAAEFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAABGAAAAAACGAAAAAABYQAAAAAAHAAAAAADHAAAAAADHAAAAAAAYQAAAAAAGAAAAAABCQAAAAAAFQAAAAAAFQAAAAAGFQAAAAADFQAAAAADFQAAAAAFYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAACYQAAAAAAHAAAAAACHAAAAAADHAAAAAADYQAAAAAAGAAAAAABFQAAAAADFQAAAAACFQAAAAADFQAAAAADFQAAAAAAFQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAFQAAAAAFFQAAAAABFQAAAAABFQAAAAAFFQAAAAAAFQAAAAABUQAAAAAAGAAAAAACGAAAAAADGAAAAAACNwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACFQAAAAAGFQAAAAAGFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAAFQAAAAACGAAAAAACGAAAAAACGAAAAAADPQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAFQAAAAAEFQAAAAABFQAAAAABFQAAAAACFQAAAAADFQAAAAACFQAAAAADGAAAAAAAGAAAAAABGAAAAAACFQAAAAABHwAAAAACHwAAAAAAGAAAAAACGAAAAAACGAAAAAADFQAAAAAFFQAAAAACFQAAAAAAFQAAAAACFQAAAAAAFQAAAAACFQAAAAACFQAAAAAAFQAAAAADFQAAAAACFQAAAAAFHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAAB
+          tiles: FQAAAAAAFQAAAAAEFQAAAAABFQAAAAAECQAAAAAACQAAAAAAPQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAHAAAAAAAHAAAAAACYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAAFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFYQAAAAAAXgAAAAABXgAAAAACXgAAAAACNwAAAAAAHAAAAAACHAAAAAABYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAEFQAAAAACFQAAAAABUgAAAAAAFQAAAAADUgAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAHAAAAAADHAAAAAABYQAAAAAAYQAAAAAAUQAAAAAAFQAAAAACFQAAAAACFQAAAAADUgAAAAAAFQAAAAABFQAAAAACYQAAAAAAOwAAAAAAOwAAAAAAOwAAAAABPQAAAAAAHAAAAAABHAAAAAADYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAOwAAAAACOwAAAAACOwAAAAAANwAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABFQAAAAAFFQAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHAAAAAABHAAAAAABYQAAAAAAPQAAAAAAPQAAAAAAFQAAAAAAFQAAAAADFQAAAAADFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAADGAAAAAADGAAAAAABGAAAAAABHAAAAAAAHAAAAAACHAAAAAAAGAAAAAABGAAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAAFFQAAAAAFFQAAAAAAUQAAAAAAGAAAAAACGAAAAAAAGAAAAAADGAAAAAABHAAAAAACHAAAAAACHAAAAAAAGAAAAAADGAAAAAAACQAAAAAKCQAAAAADFQAAAAAGFQAAAAAFFQAAAAACFQAAAAAEYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADGAAAAAAAGAAAAAABCQAAAAACCQAAAAAAFQAAAAAEFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAABGAAAAAACGAAAAAABYQAAAAAAHAAAAAADHAAAAAADHAAAAAAAYQAAAAAAGAAAAAABCQAAAAAAFQAAAAAAFQAAAAAGFQAAAAADFQAAAAADFQAAAAAFYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAACYQAAAAAAHAAAAAACHAAAAAAAHAAAAAACYQAAAAAAGAAAAAABFQAAAAADFQAAAAACFQAAAAADFQAAAAADFQAAAAAAFQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAFQAAAAAFFQAAAAABFQAAAAABFQAAAAAFFQAAAAAAFQAAAAABUQAAAAAAGAAAAAACGAAAAAADGAAAAAACNwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACFQAAAAAGFQAAAAAGFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAAFQAAAAACGAAAAAACGAAAAAACGAAAAAADPQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAFQAAAAAEFQAAAAABFQAAAAABFQAAAAACFQAAAAADFQAAAAACFQAAAAADGAAAAAAAGAAAAAABGAAAAAACFQAAAAABHwAAAAACHwAAAAAAGAAAAAACGAAAAAACGAAAAAADFQAAAAAFFQAAAAACFQAAAAAAFQAAAAACFQAAAAAAFQAAAAACFQAAAAACFQAAAAAAFQAAAAADFQAAAAACFQAAAAAFHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAAB
           version: 6
         4,-2:
           ind: 4,-2
@@ -2702,7 +2702,6 @@ entities:
             3535: 13,16
             3541: 6,-8
             3583: 49,6
-            3587: 28,-22
             3591: 52,-23
             3647: 39,-23
             3732: 11,-4
@@ -14214,8 +14213,6 @@ entities:
     - type: Transform
       pos: -33.5,33.5
       parent: 2
-    - type: PowerNetworkBattery
-      canDischarge: False
   - uid: 254
     components:
     - type: MetaData
@@ -17141,6 +17138,11 @@ entities:
     - type: Transform
       pos: 24.449337,-17.398048
       parent: 2
+  - uid: 9184
+    components:
+    - type: Transform
+      pos: -0.4814006,1.10948
+      parent: 2
 - proto: BoxCardboard
   entities:
   - uid: 768
@@ -46283,10 +46285,10 @@ entities:
       parent: 2
 - proto: ClosetChefFilled
   entities:
-  - uid: 6018
+  - uid: 9183
     components:
     - type: Transform
-      pos: 16.5,15.5
+      pos: 7.5,17.5
       parent: 2
 - proto: ClosetEmergencyFilledRandom
   entities:
@@ -46361,6 +46363,11 @@ entities:
       parent: 2
 - proto: ClosetMaintenanceFilledRandom
   entities:
+  - uid: 3278
+    components:
+    - type: Transform
+      pos: 16.5,15.5
+      parent: 2
   - uid: 6028
     components:
     - type: Transform
@@ -49420,16 +49427,22 @@ entities:
     - type: Transform
       pos: -62.5,-9.5
       parent: 2
+    - type: NavMapBeacon
+      text: Tyrant
   - uid: 11132
     components:
     - type: Transform
       pos: -52.5,-11.5
       parent: 2
+    - type: NavMapBeacon
+      text: Tyrant Dock
   - uid: 13645
     components:
     - type: Transform
       pos: 63.5,-25.5
       parent: 2
+    - type: NavMapBeacon
+      text: Sauna
   - uid: 16454
     components:
     - type: Transform
@@ -55476,16 +55489,6 @@ entities:
     - type: Transform
       pos: 43.5,12.5
       parent: 2
-  - uid: 7261
-    components:
-    - type: Transform
-      pos: 32.5,-25.5
-      parent: 2
-  - uid: 7262
-    components:
-    - type: Transform
-      pos: 31.5,-25.5
-      parent: 2
   - uid: 17925
     components:
     - type: Transform
@@ -58204,6 +58207,12 @@ entities:
     - type: Transform
       pos: -15.5,57.5
       parent: 2
+  - uid: 8626
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-25.5
+      parent: 2
   - uid: 8922
     components:
     - type: Transform
@@ -58375,6 +58384,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
+  - uid: 7262
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7600
     components:
     - type: Transform
@@ -58389,6 +58406,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 7610
+    components:
+    - type: Transform
+      pos: 35.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7615
     components:
     - type: Transform
@@ -58832,14 +58856,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7713
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 7715
     components:
     - type: Transform
@@ -59117,6 +59133,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 8625
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 9821
     components:
     - type: Transform
@@ -59828,6 +59852,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
+  - uid: 7717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7718
     components:
     - type: Transform
@@ -65712,7 +65744,8 @@ entities:
   - uid: 8608
     components:
     - type: Transform
-      pos: 37.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-18.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -65761,14 +65794,15 @@ entities:
   - uid: 8617
     components:
     - type: Transform
-      pos: 37.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-18.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 8618
     components:
     - type: Transform
-      pos: 37.5,-21.5
+      pos: 28.5,-22.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -65776,7 +65810,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 36.5,-19.5
+      pos: 33.5,-23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -65784,23 +65818,15 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 35.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8621
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-19.5
+      pos: 32.5,-23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 8622
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-22.5
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -65808,7 +65834,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 34.5,-22.5
+      pos: 29.5,-23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -65816,46 +65842,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 33.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8625
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8626
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8627
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8628
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 8629
-    components:
-    - type: Transform
-      pos: 28.5,-23.5
+      pos: 30.5,-23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -69334,6 +69321,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 9286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 9297
     components:
     - type: Transform
@@ -69389,6 +69384,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#DD2222FF'
+  - uid: 10406
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10918
     components:
     - type: Transform
@@ -69741,6 +69744,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 18027
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 18028
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 18033
     components:
     - type: Transform
@@ -70888,6 +70907,28 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 18318
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 18319
+    components:
+    - type: Transform
+      pos: 28.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 18320
+    components:
+    - type: Transform
+      pos: 28.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 506
@@ -71083,14 +71124,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7610
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 35.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 7619
     components:
     - type: Transform
@@ -71105,21 +71138,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7716
+  - uid: 7713
     components:
     - type: Transform
-      pos: 28.5,-25.5
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-23.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 7717
+      color: '#990000FF'
+  - uid: 7716
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,-22.5
+      pos: 28.5,-25.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 7724
     components:
     - type: Transform
@@ -71201,6 +71234,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 8621
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 8937
     components:
     - type: Transform
@@ -71869,21 +71910,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 9183
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 9184
-    components:
-    - type: Transform
-      pos: 35.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9185
     components:
     - type: Transform
@@ -72499,6 +72525,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 18321
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPort
   entities:
   - uid: 544
@@ -72577,12 +72611,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,-32.5
       parent: 2
-  - uid: 9254
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-25.5
-      parent: 2
   - uid: 9268
     components:
     - type: Transform
@@ -72878,12 +72906,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 9286
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-25.5
-      parent: 2
 - proto: GasVentPump
   entities:
   - uid: 4959
@@ -74271,8 +74293,7 @@ entities:
   - uid: 9420
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-23.5
+      pos: 34.5,-22.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
@@ -74664,7 +74685,8 @@ entities:
   - uid: 17602
     components:
     - type: Transform
-      pos: 28.5,-21.5
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-21.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
@@ -80864,6 +80886,13 @@ entities:
     - type: Transform
       pos: -2.5,21.5
       parent: 2
+- proto: MedicalBiofabricator
+  entities:
+  - uid: 8628
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 2
 - proto: MedicalScannerMachineCircuitboard
   entities:
   - uid: 10350
@@ -81183,12 +81212,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-8.5
       parent: 2
-  - uid: 10406
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-6.5
-      parent: 2
   - uid: 16519
     components:
     - type: Transform
@@ -89203,12 +89226,12 @@ entities:
   - uid: 12104
     components:
     - type: Transform
-      pos: 7.6254354,17.978848
+      pos: 7.99691,17.851439
       parent: 2
   - uid: 12105
     components:
     - type: Transform
-      pos: 7.2112093,17.989098
+      pos: 8.137535,18.429564
       parent: 2
 - proto: OperatingTable
   entities:
@@ -99267,10 +99290,10 @@ entities:
       parent: 2
 - proto: ReverseEngineeringMachine
   entities:
-  - uid: 3278
+  - uid: 8629
     components:
     - type: Transform
-      pos: 34.5,-21.5
+      pos: 32.5,-25.5
       parent: 2
 - proto: RevolverCapGun
   entities:
@@ -99459,6 +99482,13 @@ entities:
     - type: Transform
       pos: 8.5,40.5
       parent: 2
+- proto: SecureCabinetEpistemics
+  entities:
+  - uid: 6018
+    components:
+    - type: Transform
+      pos: 31.5,-25.5
+      parent: 2
 - proto: SecureCabinetHoP
   entities:
   - uid: 7133
@@ -101661,6 +101691,13 @@ entities:
     - type: Transform
       pos: 41.5,-5.5
       parent: 2
+- proto: SpawnMobSmile
+  entities:
+  - uid: 8627
+    components:
+    - type: Transform
+      pos: 29.5,-25.5
+      parent: 2
 - proto: SpawnMobWalter
   entities:
   - uid: 5879
@@ -104523,27 +104560,6 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Reporter's Office
-  - uid: 18027
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-3.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraService
-      nameSet: True
-      id: Mime
-  - uid: 18028
-    components:
-    - type: Transform
-      pos: -23.5,-11.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraService
-      nameSet: True
-      id: Clown
   - uid: 18029
     components:
     - type: Transform
@@ -105458,6 +105474,11 @@ entities:
     - type: Transform
       pos: -3.5,12.5
       parent: 2
+  - uid: 9254
+    components:
+    - type: Transform
+      pos: 29.5,-25.5
+      parent: 2
   - uid: 12109
     components:
     - type: Transform
@@ -107067,6 +107088,11 @@ entities:
         - Middle: Toggle
 - proto: UnfinishedMachineFrame
   entities:
+  - uid: 7261
+    components:
+    - type: Transform
+      pos: 34.5,-21.5
+      parent: 2
   - uid: 14596
     components:
     - type: Transform
@@ -116486,15 +116512,15 @@ entities:
     - type: Transform
       pos: 36.5,70.5
       parent: 2
-  - uid: 17689
+  - uid: 15209
     components:
     - type: Transform
-      pos: 40.5,70.5
+      pos: 38.5,63.5
       parent: 2
-  - uid: 15209
+  - uid: 17689
     components:
     - type: Transform
-      pos: 38.5,63.5
+      pos: 40.5,70.5
       parent: 2
 - proto: WelderIndustrial
   entities:
@@ -116972,7 +116998,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -10354.103
+      secondsUntilStateChange: -10872.24
       state: Opening
     - type: Airlock
       autoClose: False
@@ -116988,7 +117014,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -10353.536
+      secondsUntilStateChange: -10871.674
       state: Opening
     - type: Airlock
       autoClose: False
@@ -117010,7 +117036,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -10353.069
+      secondsUntilStateChange: -10871.207
       state: Opening
     - type: Airlock
       autoClose: False
@@ -117026,7 +117052,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -10354.603
+      secondsUntilStateChange: -10872.74
       state: Opening
     - type: Airlock
       autoClose: False