From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Thu, 28 Dec 2023 02:25:04 +0000 (+0000)
Subject: saltern apc 2 (#23085)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=63d708670e0426d8d12b8485f523ae54b678ea97;p=space-station-14.git

saltern apc 2 (#23085)

redo salv and qm apcs :trollface:

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

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 6bdd75de17..a17427b951 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -5533,20 +5533,6 @@ entities:
       type: Transform
     - startingCharge: 11999.066
       type: Battery
-  - uid: 2486
-    components:
-    - pos: 24.5,14.5
-      parent: 31
-      type: Transform
-    - startingCharge: 11999.733
-      type: Battery
-  - uid: 2487
-    components:
-    - pos: 28.5,14.5
-      parent: 31
-      type: Transform
-    - startingCharge: 11999.483
-      type: Battery
   - uid: 2489
     components:
     - name: Engi Lockers APC
@@ -5629,6 +5615,13 @@ entities:
       pos: 13.5,-23.5
       parent: 31
       type: Transform
+  - uid: 3625
+    components:
+    - name: Salvage APC
+      type: MetaData
+    - pos: 24.5,18.5
+      parent: 31
+      type: Transform
   - uid: 3797
     components:
     - name: Arrivals APC
@@ -5771,6 +5764,13 @@ entities:
     - pos: 20.5,-23.5
       parent: 31
       type: Transform
+  - uid: 11351
+    components:
+    - name: QM's Office APC
+      type: MetaData
+    - pos: 26.5,11.5
+      parent: 31
+      type: Transform
 - proto: APCElectronics
   entities:
   - uid: 86
@@ -7017,7 +7017,7 @@ entities:
       type: Transform
   - uid: 131
     components:
-    - pos: 24.5,15.5
+    - pos: 29.5,12.5
       parent: 31
       type: Transform
   - uid: 164
@@ -8040,6 +8040,11 @@ entities:
     - pos: 12.5,25.5
       parent: 31
       type: Transform
+  - uid: 2486
+    components:
+    - pos: 26.5,11.5
+      parent: 31
+      type: Transform
   - uid: 2488
     components:
     - pos: 43.5,-5.5
@@ -10470,11 +10475,6 @@ entities:
     - pos: 27.5,7.5
       parent: 31
       type: Transform
-  - uid: 3148
-    components:
-    - pos: 24.5,14.5
-      parent: 31
-      type: Transform
   - uid: 3149
     components:
     - pos: 24.5,13.5
@@ -11025,6 +11025,16 @@ entities:
     - pos: 12.5,19.5
       parent: 31
       type: Transform
+  - uid: 3599
+    components:
+    - pos: 24.5,18.5
+      parent: 31
+      type: Transform
+  - uid: 3601
+    components:
+    - pos: 24.5,17.5
+      parent: 31
+      type: Transform
   - uid: 3617
     components:
     - pos: -26.5,-4.5
@@ -11035,11 +11045,6 @@ entities:
     - pos: -4.5,25.5
       parent: 31
       type: Transform
-  - uid: 3625
-    components:
-    - pos: 28.5,11.5
-      parent: 31
-      type: Transform
   - uid: 3626
     components:
     - pos: 10.5,25.5
@@ -11050,11 +11055,6 @@ entities:
     - pos: 25.5,9.5
       parent: 31
       type: Transform
-  - uid: 3680
-    components:
-    - pos: 26.5,12.5
-      parent: 31
-      type: Transform
   - uid: 3703
     components:
     - pos: -4.5,15.5
@@ -12635,11 +12635,6 @@ entities:
     - pos: 35.5,-9.5
       parent: 31
       type: Transform
-  - uid: 7106
-    components:
-    - pos: 24.5,9.5
-      parent: 31
-      type: Transform
   - uid: 7144
     components:
     - pos: 8.5,26.5
@@ -15295,6 +15290,11 @@ entities:
     - pos: 20.5,-23.5
       parent: 31
       type: Transform
+  - uid: 11350
+    components:
+    - pos: 30.5,12.5
+      parent: 31
+      type: Transform
 - proto: CableApcStack
   entities:
   - uid: 94
@@ -19261,6 +19261,11 @@ entities:
     - pos: 15.5,-26.5
       parent: 31
       type: Transform
+  - uid: 2487
+    components:
+    - pos: 26.5,12.5
+      parent: 31
+      type: Transform
   - uid: 2645
     components:
     - pos: -32.5,-7.5
@@ -19376,6 +19381,11 @@ entities:
     - pos: 19.5,-13.5
       parent: 31
       type: Transform
+  - uid: 3148
+    components:
+    - pos: 26.5,11.5
+      parent: 31
+      type: Transform
   - uid: 3174
     components:
     - pos: 18.5,-11.5
@@ -19471,29 +19481,14 @@ entities:
     - pos: 28.5,13.5
       parent: 31
       type: Transform
-  - uid: 3599
-    components:
-    - pos: 28.5,14.5
-      parent: 31
-      type: Transform
   - uid: 3600
     components:
     - pos: 26.5,13.5
       parent: 31
       type: Transform
-  - uid: 3601
-    components:
-    - pos: 25.5,13.5
-      parent: 31
-      type: Transform
-  - uid: 3602
-    components:
-    - pos: 24.5,13.5
-      parent: 31
-      type: Transform
   - uid: 3603
     components:
-    - pos: 24.5,14.5
+    - pos: 25.5,12.5
       parent: 31
       type: Transform
   - uid: 3604
@@ -19796,6 +19791,11 @@ entities:
     - pos: 43.5,5.5
       parent: 31
       type: Transform
+  - uid: 3680
+    components:
+    - pos: 24.5,18.5
+      parent: 31
+      type: Transform
   - uid: 3681
     components:
     - pos: 21.5,-8.5
@@ -20841,6 +20841,11 @@ entities:
     - pos: 8.5,14.5
       parent: 31
       type: Transform
+  - uid: 7106
+    components:
+    - pos: 24.5,17.5
+      parent: 31
+      type: Transform
   - uid: 7128
     components:
     - pos: 7.5,14.5
@@ -21651,6 +21656,31 @@ entities:
     - pos: 16.5,-25.5
       parent: 31
       type: Transform
+  - uid: 11345
+    components:
+    - pos: 24.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 11346
+    components:
+    - pos: 25.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 11347
+    components:
+    - pos: 26.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 11348
+    components:
+    - pos: 26.5,15.5
+      parent: 31
+      type: Transform
+  - uid: 11349
+    components:
+    - pos: 26.5,14.5
+      parent: 31
+      type: Transform
 - proto: CableMVStack
   entities:
   - uid: 48
@@ -27753,6 +27783,12 @@ entities:
       type: Transform
 - proto: ComputerCargoOrders
   entities:
+  - uid: 3602
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 26.5,8.5
+      parent: 31
+      type: Transform
   - uid: 4309
     components:
     - rot: -1.5707963267948966 rad
@@ -32497,7 +32533,7 @@ entities:
     - pos: 38.5,-5.5
       parent: 31
       type: Transform
-    - secondsUntilStateChange: -3309.0667
+    - secondsUntilStateChange: -3421.156
       state: Closing
       type: Door
   - uid: 4019
@@ -43089,8 +43125,6 @@ entities:
       pos: 23.5,15.5
       parent: 31
       type: Transform
-    - joinedGrid: 31
-      type: AtmosDevice
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 4267