]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
saltern update (#29001)
authordeltanedas <39013340+deltanedas@users.noreply.github.com>
Sat, 15 Jun 2024 06:01:13 +0000 (06:01 +0000)
committerGitHub <noreply@github.com>
Sat, 15 Jun 2024 06:01:13 +0000 (00:01 -0600)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Resources/Maps/saltern.yml

index 09df7eeb527ec393d5afc39fd5703575f74945fa..c9d3218c45fbc3c4577eacd8ccb7681ad4422273 100644 (file)
@@ -772,7 +772,8 @@ entities:
           6,6:
             2: 35049
           7,5:
-            0: 36063
+            0: 35999
+            3: 64
             2: 4096
           7,6:
             2: 53196
@@ -783,7 +784,7 @@ entities:
             2: 57344
           8,5:
             0: 272
-            3: 17472
+            4: 17472
           8,6:
             2: 65345
           8,7:
@@ -824,10 +825,10 @@ entities:
             0: 53759
           11,2:
             0: 4319
-            4: 49152
+            5: 49152
           11,3:
             0: 61457
-            4: 204
+            5: 204
           11,-1:
             0: 30583
           11,4:
@@ -839,9 +840,9 @@ entities:
             0: 28791
           12,2:
             0: 119
-            4: 28672
+            5: 28672
           12,3:
-            4: 119
+            5: 119
             0: 61440
           12,-1:
             0: 29311
@@ -1259,17 +1260,17 @@ entities:
           8,8:
             2: 65534
           9,5:
-            5: 4368
-            4: 17472
+            6: 4368
+            5: 17472
           9,6:
             2: 7936
           10,5:
-            4: 4368
-            6: 17472
+            5: 4368
+            7: 17472
           10,6:
             2: 3840
           11,5:
-            4: 21840
+            5: 21840
           11,6:
             2: 3856
           12,5:
@@ -1425,6 +1426,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 23.57087
+          - 88.67137
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -14253,6 +14269,11 @@ entities:
     - type: Transform
       pos: 33.5,-17.5
       parent: 31
+  - uid: 9867
+    components:
+    - type: Transform
+      pos: 48.5,19.5
+      parent: 31
   - uid: 9927
     components:
     - type: Transform
@@ -15333,6 +15354,11 @@ entities:
     - type: Transform
       pos: -27.5,-18.5
       parent: 31
+  - uid: 11305
+    components:
+    - type: Transform
+      pos: 48.5,20.5
+      parent: 31
   - uid: 11328
     components:
     - type: Transform
@@ -15368,6 +15394,11 @@ entities:
     - type: Transform
       pos: 17.5,11.5
       parent: 31
+  - uid: 11384
+    components:
+    - type: Transform
+      pos: 48.5,21.5
+      parent: 31
   - uid: 11415
     components:
     - type: Transform
@@ -15433,6 +15464,66 @@ entities:
     - type: Transform
       pos: -25.5,-3.5
       parent: 31
+  - uid: 11454
+    components:
+    - type: Transform
+      pos: 48.5,22.5
+      parent: 31
+  - uid: 11455
+    components:
+    - type: Transform
+      pos: 48.5,23.5
+      parent: 31
+  - uid: 11456
+    components:
+    - type: Transform
+      pos: 48.5,24.5
+      parent: 31
+  - uid: 11457
+    components:
+    - type: Transform
+      pos: 49.5,24.5
+      parent: 31
+  - uid: 11458
+    components:
+    - type: Transform
+      pos: 50.5,24.5
+      parent: 31
+  - uid: 11459
+    components:
+    - type: Transform
+      pos: 51.5,24.5
+      parent: 31
+  - uid: 11460
+    components:
+    - type: Transform
+      pos: 52.5,24.5
+      parent: 31
+  - uid: 11461
+    components:
+    - type: Transform
+      pos: 52.5,23.5
+      parent: 31
+  - uid: 11462
+    components:
+    - type: Transform
+      pos: 52.5,22.5
+      parent: 31
+  - uid: 11463
+    components:
+    - type: Transform
+      pos: 52.5,21.5
+      parent: 31
+  - uid: 11464
+    components:
+    - type: Transform
+      pos: 52.5,20.5
+      parent: 31
+  - uid: 11465
+    components:
+    - type: Transform
+      pos: 52.5,19.5
+      parent: 31
 - proto: CableApcStack
   entities:
   - uid: 94
@@ -28356,46 +28447,6 @@ entities:
     - type: Transform
       pos: 16.5,-29.5
       parent: 31
-- proto: CrateEngineeringSecure
-  entities:
-  - uid: 11305
-    components:
-    - type: MetaData
-      desc: Stores logic gates that control the salvage-atmos airlocks.
-      name: logic gate crate
-    - type: Transform
-      pos: 30.5,21.5
-      parent: 31
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 11306
-          - 11307
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: CrateEngineeringSingularityContainment
   entities:
   - uid: 6437
@@ -49183,7 +49234,9 @@ entities:
   - uid: 11306
     components:
     - type: Transform
-      parent: 11305
+      anchored: True
+      pos: 31.5,20.5
+      parent: 31
     - type: DeviceLinkSink
       links:
       - 9067
@@ -49196,11 +49249,13 @@ entities:
         - Output: DoorBolt
     - type: Physics
       canCollide: False
-    - type: InsideEntityStorage
+      bodyType: Static
   - uid: 11307
     components:
     - type: Transform
-      parent: 11305
+      anchored: True
+      pos: 31.5,21.5
+      parent: 31
     - type: DeviceLinkSink
       links:
       - 6522
@@ -49213,7 +49268,7 @@ entities:
         - Output: DoorBolt
     - type: Physics
       canCollide: False
-    - type: InsideEntityStorage
+      bodyType: Static
 - proto: MachineAnomalyGenerator
   entities:
   - uid: 6098