Evacs update (#2715)

space-syndicate · Oct 30, 2024 · 09e85ac · 09e85ac
1 parent 1e51fdc
commit 09e85ac
Show file tree

Hide file tree

Showing 8 changed files with 7,546 additions and 10,689 deletions.
diff --git a/Resources/Maps/Shuttles/arrivals_corvaxsilly.yml b/Resources/Maps/Shuttles/arrivals_corvaxsilly.yml
diff --git a/Resources/Maps/Shuttles/corvax_emergency.yml b/Resources/Maps/Shuttles/corvax_emergency.yml
diff --git a/Resources/Maps/Shuttles/emergency_corvaxavrite.yml b/Resources/Maps/Shuttles/emergency_corvaxavrite.yml
diff --git a/Resources/Maps/Shuttles/emergency_corvaxdelta.yml b/Resources/Maps/Shuttles/emergency_corvaxdelta.yml
diff --git a/Resources/Maps/Shuttles/emergency_corvaxpaper.yml b/Resources/Maps/Shuttles/emergency_corvaxpaper.yml
diff --git a/Resources/Maps/Shuttles/emergency_corvaxsilly.yml b/Resources/Maps/Shuttles/emergency_corvaxsilly.yml
@@ -17,7 +17,7 @@ entities:
       name: Crappy PR-148
     - type: Transform
       pos: -3.7901773,-19.785557
-      parent: 6
+      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -238,18 +238,6 @@ entities:
     - type: RadiationGridResistance
     - type: PreventPilot
     - type: ProtectedGrid
-  - uid: 6
-    components:
-    - type: MetaData
-      name: map 100
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
 - proto: AirlockBarGlassLocked
   entities:
   - uid: 26
@@ -1162,7 +1150,15 @@ entities:
     - type: Transform
       pos: -3.5,-2.5
       parent: 1
-- proto: soda_dispenser
+- proto: Screen
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,3.5
+      parent: 1
+- proto: SodaDispenser
   entities:
   - uid: 155
     components:

diff --git a/Resources/Maps/Shuttles/emergency_maus.yml b/Resources/Maps/Shuttles/emergency_maus.yml
@@ -33,7 +33,7 @@ entities:
       name: EVAC - "Der Zug"- NT533
     - type: Transform
       pos: -25,-25
-      parent: 2
+      parent: invalid
     - type: MapGrid
       chunks:
         0,2:
@@ -1106,19 +1106,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-  - uid: 2
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
 - proto: AirAlarm
   entities:
   - uid: 463
@@ -4747,6 +4734,38 @@ entities:
     - type: Transform
       pos: 11.5,27.5
       parent: 1
+- proto: Screen
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,6.5
+      parent: 1
+  - uid: 846
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,14.5
+      parent: 1
+  - uid: 847
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 848
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,25.5
+      parent: 1
 - proto: ShuttleWindow
   entities:
   - uid: 60

diff --git a/Resources/Maps/Shuttles/emergency_pilgrim.yml b/Resources/Maps/Shuttles/emergency_pilgrim.yml
@@ -1000,17 +1000,13 @@ entities:
     - type: Transform
       pos: 3.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: AirCanister
   entities:
   - uid: 580
     components:
     - type: Transform
       pos: -2.5,-12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: AirlockCommandGlassLocked
   entities:
   - uid: 413
@@ -4487,7 +4483,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.311915,-8.600292
       parent: 1
-- proto: FoodMeatKebab
+- proto: FoodKebabSkewer
   entities:
   - uid: 597
     components:
@@ -4980,8 +4976,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
 - proto: GasVentPump
@@ -4992,26 +4986,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 513
     components:
     - type: Transform
       pos: -7.5,6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 514
     components:
     - type: Transform
       pos: 0.5,13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 515
@@ -5020,8 +5008,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 516
@@ -5030,8 +5016,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-13.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
 - proto: GravityGeneratorMini
@@ -5645,6 +5629,50 @@ entities:
     - type: Transform
       pos: -3.5,10.5
       parent: 1
+- proto: Screen
+  entities:
+  - uid: 861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-7.5
+      parent: 1
+  - uid: 862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 863
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 864
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,0.5
+      parent: 1
+  - uid: 865
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 866
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,12.5
+      parent: 1
+  - uid: 867
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-11.5
+      parent: 1
 - proto: ShuttleWindow
   entities:
   - uid: 71
@@ -5783,7 +5811,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,18.5
       parent: 1
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 427
     components: