Evac fixes (#2525)

* Map Edits: Evac Shuttle Updates * timer * metadata * more meta * meerup * holopads --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: deltanedas <@deltanedas:kde.org>
DeltaV-Station · Jan 1, 2025 · 4028e50 · 4028e50
1 parent 2ecab77
commit 4028e50
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 114 deletions.
diff --git a/Resources/Maps/_DV/Shuttles/NTES_BC20.yml b/Resources/Maps/_DV/Shuttles/NTES_BC20.yml
@@ -25,6 +25,7 @@ entities:
   - uid: 1
     components:
     - type: MetaData
+      name: NTES BC20
     - type: Transform
       pos: 0.5104167,0.43224397
       parent: invalid
@@ -75,10 +76,10 @@ entities:
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
     - type: DeviceNetwork
+      deviceNetId: Wireless
       configurators: []
       deviceLists: []
       transmitFrequencyId: ShuttleTimer
-      deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -682,107 +683,107 @@ entities:
     - type: Transform
       pos: 9.5,-17.5
       parent: 1
-- proto: AirlockGlass
+- proto: AirlockExternalGlassShuttleLocked
   entities:
-  - uid: 581
+  - uid: 164
     components:
     - type: Transform
-      pos: -9.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
       parent: 1
-  - uid: 590
+  - uid: 165
     components:
     - type: Transform
-      pos: 7.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-24.5
       parent: 1
-  - uid: 1046
+  - uid: 306
     components:
     - type: Transform
-      pos: -6.5,-24.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-16.5
       parent: 1
-  - uid: 1048
+  - uid: 314
     components:
     - type: Transform
-      pos: -6.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-26.5
       parent: 1
-  - uid: 1049
+  - uid: 716
     components:
     - type: Transform
-      pos: 4.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-18.5
       parent: 1
-  - uid: 1050
+  - uid: 1308
     components:
     - type: Transform
-      pos: 4.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-18.5
       parent: 1
-  - uid: 1054
+  - uid: 1311
     components:
     - type: Transform
-      pos: -4.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-24.5
       parent: 1
-  - uid: 1055
+  - uid: 1353
     components:
     - type: Transform
-      pos: -4.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-26.5
       parent: 1
-  - uid: 1056
+- proto: AirlockGlass
+  entities:
+  - uid: 581
     components:
     - type: Transform
-      pos: 2.5,-12.5
+      pos: -9.5,-16.5
       parent: 1
-  - uid: 1057
+  - uid: 590
     components:
     - type: Transform
-      pos: 2.5,-13.5
+      pos: 7.5,-16.5
       parent: 1
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 164
+  - uid: 1046
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-18.5
+      pos: -6.5,-24.5
       parent: 1
-  - uid: 165
+  - uid: 1048
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-16.5
+      pos: -6.5,-25.5
       parent: 1
-  - uid: 314
+  - uid: 1049
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-26.5
+      pos: 4.5,-25.5
       parent: 1
-  - uid: 360
+  - uid: 1050
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-24.5
+      pos: 4.5,-24.5
       parent: 1
-  - uid: 760
+  - uid: 1054
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-18.5
+      pos: -4.5,-12.5
       parent: 1
-  - uid: 821
+  - uid: 1055
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-24.5
+      pos: -4.5,-13.5
       parent: 1
-  - uid: 930
+  - uid: 1056
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-26.5
+      pos: 2.5,-12.5
       parent: 1
-  - uid: 1353
+  - uid: 1057
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-16.5
+      pos: 2.5,-13.5
       parent: 1
 - proto: AirlockMedicalGlassLocked
   entities:
@@ -855,50 +856,50 @@ entities:
   - uid: 222
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-24.5
       parent: 1
   - uid: 301
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -14.5,-18.5
+      pos: -14.5,-16.5
       parent: 1
   - uid: 303
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-18.5
       parent: 1
-  - uid: 306
+  - uid: 360
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-24.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-26.5
       parent: 1
-  - uid: 716
+  - uid: 760
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-24.5
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-18.5
       parent: 1
-  - uid: 1308
+  - uid: 821
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,-26.5
       parent: 1
-  - uid: 1311
+  - uid: 930
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 12.5,-16.5
       parent: 1
-  - uid: 1639
+  - uid: 1310
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-26.5
+      pos: 12.5,-24.5
       parent: 1
 - proto: AtmosFixNitrogenMarker
   entities:
@@ -5920,6 +5921,12 @@ entities:
     - type: Transform
       pos: -3.5,-34.5
       parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-39.5
+      parent: 1
 - proto: GasPipeBend
   entities:
   - uid: 858
@@ -8092,12 +8099,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 884
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-39.5
-      parent: 1
   - uid: 993
     components:
     - type: Transform
@@ -8974,6 +8975,13 @@ entities:
     - type: Transform
       pos: -1.0302026,-5.3806286
       parent: 1
+- proto: HolopadCentCommEvacShuttle
+  entities:
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 1301
@@ -9427,13 +9435,6 @@ entities:
       parent: 1
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 1310
-    components:
-    - type: Transform
-      pos: 5.5,-34.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 1312
     components:
     - type: Transform

diff --git a/Resources/Maps/_DV/Shuttles/NTES_Centipede.yml b/Resources/Maps/_DV/Shuttles/NTES_Centipede.yml
@@ -85,10 +85,10 @@ entities:
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
     - type: DeviceNetwork
+      deviceNetId: Wireless
       configurators: []
       deviceLists: []
       transmitFrequencyId: ShuttleTimer
-      deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -5358,6 +5358,13 @@ entities:
     - type: Transform
       pos: -14.386516,-29.520695
       parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 1509
+    components:
+    - type: Transform
+      pos: -8.5,-1.5
+      parent: 1
 - proto: DisposalBend
   entities:
   - uid: 713
@@ -10759,6 +10766,13 @@ entities:
     - type: Transform
       pos: -10.532349,-3.2752516
       parent: 1
+- proto: HolopadCentCommEvacShuttle
+  entities:
+  - uid: 1510
+    components:
+    - type: Transform
+      pos: -10.5,16.5
+      parent: 1
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 1561