From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sun, 16 Jun 2024 19:38:00 +0000 (+0000)
Subject: atlas update (#28514)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ee2769ed9f4d075bb280d4c86c6ccf7c2f2fe741;p=space-station-14.git

atlas update (#28514)

* atlas update

* unkill previous changes

* fix lawyer room

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---

diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index 2db45c0308..18c63121f6 100644
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -77,7 +77,7 @@ entities:
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: eQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAA
+          tiles: eQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAOgAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAA
           version: 6
         2,0:
           ind: 2,0
@@ -2261,10 +2261,10 @@ entities:
             0: 57582
           7,-4:
             0: 4353
-            2: 16384
+            2: 50176
           7,-3:
-            0: 273
-            2: 16452
+            0: 497
+            2: 16384
           7,-2:
             0: 40209
             2: 12
@@ -2574,7 +2574,8 @@ entities:
           -12,-1:
             0: 65535
           -13,-1:
-            0: 47288
+            0: 34952
+            4: 12336
           -12,0:
             0: 65535
           -12,-5:
@@ -2610,7 +2611,7 @@ entities:
           -13,-6:
             2: 61680
           -13,-5:
-            0: 61152
+            4: 61152
           -11,-6:
             2: 49
             0: 56320
@@ -2639,8 +2640,8 @@ entities:
             0: 305
           -13,0:
             0: 34952
-            4: 48
-            5: 12288
+            5: 48
+            6: 12288
           -12,1:
             0: 30576
           -13,1:
@@ -2703,12 +2704,13 @@ entities:
             2: 3140
           -14,0:
             0: 13107
-            4: 128
-            5: 32768
+            5: 128
+            6: 32768
           -14,1:
             0: 243
           -14,-1:
-            0: 46003
+            0: 13107
+            4: 32896
           -14,2:
             0: 52352
             2: 8
@@ -2798,6 +2800,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -3032,11 +3049,9 @@ entities:
       devices:
       - 1989
       - 845
-      - 7333
       - 1231
       - 3817
       - 3815
-      - 929
       - 7599
   - uid: 7372
     components:
@@ -3342,6 +3357,11 @@ entities:
     - type: Transform
       pos: 16.5,-9.5
       parent: 30
+  - uid: 8524
+    components:
+    - type: Transform
+      pos: -43.5,-2.5
+      parent: 30
 - proto: Airlock
   entities:
   - uid: 33
@@ -3657,11 +3677,17 @@ entities:
       parent: 30
 - proto: AirlockExternalGlass
   entities:
-  - uid: 5372
+  - uid: 1296
     components:
     - type: Transform
       pos: 7.5,28.5
       parent: 30
+  - uid: 7393
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-10.5
+      parent: 30
   - uid: 7775
     components:
     - type: Transform
@@ -3757,11 +3783,6 @@ entities:
       parent: 30
 - proto: AirlockExternalGlassShuttleArrivals
   entities:
-  - uid: 1296
-    components:
-    - type: Transform
-      pos: 7.5,30.5
-      parent: 30
   - uid: 7628
     components:
     - type: Transform
@@ -3796,6 +3817,20 @@ entities:
     - type: Transform
       pos: 21.5,-24.5
       parent: 30
+- proto: AirlockExternalGlassShuttleEscape
+  entities:
+  - uid: 2908
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,30.5
+      parent: 30
+  - uid: 6972
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-10.5
+      parent: 30
 - proto: AirlockExternalGlassShuttleLocked
   entities:
   - uid: 1328
@@ -4743,12 +4778,14 @@ entities:
   - uid: 8507
     components:
     - type: Transform
-      pos: 22.5,34.5
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-10.5
       parent: 30
   - uid: 8508
     components:
     - type: Transform
-      pos: 15.5,34.5
+      rot: 3.141592653589793 rad
+      pos: 7.5,30.5
       parent: 30
 - proto: AtmosFixBlockerMarker
   entities:
@@ -16863,6 +16900,11 @@ entities:
     - type: Transform
       pos: -55.5,-7.5
       parent: 30
+  - uid: 8527
+    components:
+    - type: Transform
+      pos: -44.5,-3.5
+      parent: 30
 - proto: Carpet
   entities:
   - uid: 160
@@ -20989,6 +21031,11 @@ entities:
     - type: Transform
       pos: 7.5,29.5
       parent: 30
+  - uid: 8522
+    components:
+    - type: Transform
+      pos: 30.5,-10.5
+      parent: 30
 - proto: DefaultStationBeaconEVAStorage
   entities:
   - uid: 7600
@@ -23922,22 +23969,6 @@ entities:
       parent: 6004
     - type: Physics
       canCollide: False
-- proto: EncryptionKeyEngineering
-  entities:
-  - uid: 7113
-    components:
-    - type: Transform
-      parent: 6972
-    - type: Physics
-      canCollide: False
-- proto: EncryptionKeyScience
-  entities:
-  - uid: 7393
-    components:
-    - type: Transform
-      parent: 7379
-    - type: Physics
-      canCollide: False
 - proto: EncryptionKeySecurity
   entities:
   - uid: 6530
@@ -24659,6 +24690,13 @@ entities:
       parent: 30
     - type: Fixtures
       fixtures: {}
+  - uid: 8523
+    components:
+    - type: Transform
+      pos: -15.5,6.5
+      parent: 30
+    - type: Fixtures
+      fixtures: {}
 - proto: FloorTileItemCarpetClown
   entities:
   - uid: 4155
@@ -25974,6 +26012,13 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 8670
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 30
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 391
@@ -33465,6 +33510,13 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 8671
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 30
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 388
@@ -34663,6 +34715,14 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7333
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,9.5
+      parent: 30
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7336
     components:
     - type: Transform
@@ -35598,6 +35658,13 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 8669
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 30
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 373
@@ -35703,10 +35770,10 @@ entities:
   - uid: 929
     components:
     - type: Transform
-      pos: 2.5,6.5
+      pos: 1.5,10.5
       parent: 30
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 1099
     components:
     - type: Transform
@@ -36150,14 +36217,6 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,9.5
-      parent: 30
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 7349
     components:
     - type: Transform
@@ -36270,6 +36329,14 @@ entities:
       parent: 30
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 8668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,7.5
+      parent: 30
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVolumePump
   entities:
   - uid: 7730
@@ -38288,6 +38355,18 @@ entities:
     - type: Transform
       pos: -53.5,6.5
       parent: 30
+  - uid: 8515
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-9.5
+      parent: 30
+  - uid: 8516
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-11.5
+      parent: 30
   - uid: 8538
     components:
     - type: Transform
@@ -39670,6 +39749,18 @@ entities:
     - type: Transform
       pos: -51.5,-6.5
       parent: 30
+  - uid: 8525
+    components:
+    - type: Transform
+      pos: -43.5,-3.5
+      parent: 30
+- proto: NitrousOxideCanister
+  entities:
+  - uid: 8650
+    components:
+    - type: Transform
+      pos: -43.5,-4.5
+      parent: 30
 - proto: NoticeBoard
   entities:
   - uid: 7632
@@ -39747,6 +39838,11 @@ entities:
     - type: Transform
       pos: -35.5,-21.5
       parent: 30
+  - uid: 8526
+    components:
+    - type: Transform
+      pos: -44.5,-2.5
+      parent: 30
 - proto: PaintingCafeTerraceAtNight
   entities:
   - uid: 4137
@@ -40004,6 +40100,11 @@ entities:
     - type: Transform
       pos: -51.5,-9.5
       parent: 30
+  - uid: 8651
+    components:
+    - type: Transform
+      pos: -44.5,-4.5
+      parent: 30
 - proto: PlasmaTankFilled
   entities:
   - uid: 6099
@@ -42070,6 +42171,12 @@ entities:
       parent: 30
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 5372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-16.5
+      parent: 30
   - uid: 5409
     components:
     - type: Transform
@@ -44320,6 +44427,18 @@ entities:
     - type: Transform
       pos: -53.5,6.5
       parent: 30
+  - uid: 8519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-11.5
+      parent: 30
+  - uid: 8521
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-9.5
+      parent: 30
   - uid: 8542
     components:
     - type: Transform
@@ -47003,6 +47122,16 @@ entities:
     - type: Transform
       pos: -52.5,-11.5
       parent: 30
+  - uid: 8662
+    components:
+    - type: Transform
+      pos: -43.5,-5.5
+      parent: 30
+  - uid: 8663
+    components:
+    - type: Transform
+      pos: -44.5,-5.5
+      parent: 30
 - proto: SubstationBasic
   entities:
   - uid: 1695
@@ -48686,46 +48815,6 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-  - uid: 6972
-    components:
-    - type: Transform
-      pos: -48.5,7.5
-      parent: 30
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7113
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-  - uid: 7379
-    components:
-    - type: Transform
-      pos: -48.5,8.5
-      parent: 30
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7393
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: TelecomServerFilledCargo
   entities:
   - uid: 7438
@@ -48733,6 +48822,13 @@ entities:
     - type: Transform
       pos: -48.5,6.5
       parent: 30
+- proto: TelecomServerFilledEngineering
+  entities:
+  - uid: 7113
+    components:
+    - type: Transform
+      pos: -48.5,7.5
+      parent: 30
 - proto: TelecomServerFilledMedical
   entities:
   - uid: 7915
@@ -48740,6 +48836,13 @@ entities:
     - type: Transform
       pos: -47.5,6.5
       parent: 30
+- proto: TelecomServerFilledScience
+  entities:
+  - uid: 7379
+    components:
+    - type: Transform
+      pos: -48.5,8.5
+      parent: 30
 - proto: ToiletDirtyWater
   entities:
   - uid: 7674
@@ -50854,11 +50957,6 @@ entities:
     - type: Transform
       pos: 29.5,-12.5
       parent: 30
-  - uid: 2908
-    components:
-    - type: Transform
-      pos: 29.5,-10.5
-      parent: 30
   - uid: 2910
     components:
     - type: Transform
@@ -52899,6 +52997,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,19.5
       parent: 30
+  - uid: 8517
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-11.5
+      parent: 30
+  - uid: 8518
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-9.5
+      parent: 30
   - uid: 8603
     components:
     - type: Transform