update lox (#31035)

* lox update

* real

diff --git a/Resources/Maps/Shuttles/emergency_lox.yml b/Resources/Maps/Shuttles/emergency_lox.yml
index 4c993179e9f570151e155b4585b8881f5a803f45..9234aad7cb81113c8f4d19de1a228540ee36e548 100644 (file)
--- a/Resources/Maps/Shuttles/emergency_lox.yml
+++ b/Resources/Maps/Shuttles/emergency_lox.yml
@@ -718,8 +718,6 @@ entities:
     - type: Transform
       pos: -6.5,-8.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
 - proto: AirlockCargoLocked
   entities:
   - uid: 166
@@ -913,33 +911,21 @@ entities:
     - type: Transform
       pos: -7.5,10.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 244
   - uid: 657
     components:
     - type: Transform
       pos: 2.5,-8.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 660
   - uid: 658
     components:
     - type: Transform
       pos: 2.5,-6.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 660
   - uid: 659
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 660
 - proto: CableApcExtension
   entities:
   - uid: 196
@@ -2385,16 +2371,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-9.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
   - uid: 526
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,-9.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasPipeBend
@@ -2825,11 +2807,15 @@ entities:
   - uid: 555
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -1.5,2.5
       parent: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 556
     components:
     - type: Transform
@@ -2876,8 +2862,6 @@ entities:
     - type: Transform
       pos: -6.5,-8.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
 - proto: GasPressurePump
   entities:
   - uid: 528
@@ -2886,8 +2870,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-7.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
 - proto: GasVentPump
   entities:
   - uid: 533
@@ -2896,8 +2878,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-8.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 540
@@ -2906,8 +2886,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-6.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 541
@@ -2915,8 +2893,6 @@ entities:
     - type: Transform
       pos: -6.5,3.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 543
@@ -2925,8 +2901,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-1.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 564
@@ -2934,8 +2908,6 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 574
@@ -2944,8 +2916,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,-4.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 575
@@ -2954,8 +2924,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,2.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 592
@@ -2963,8 +2931,6 @@ entities:
     - type: Transform
       pos: -5.5,9.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 593
@@ -2973,8 +2939,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,5.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 594
@@ -2983,8 +2947,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,5.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 595
@@ -2992,8 +2954,6 @@ entities:
     - type: Transform
       pos: -2.5,7.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 602
@@ -3001,8 +2961,6 @@ entities:
     - type: Transform
       pos: 0.5,13.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 603
@@ -3011,8 +2969,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-1.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 604
@@ -3021,8 +2977,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 670
-    - type: AtmosDevice
-      joinedGrid: 670
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GeneratorBasic15kW
@@ -3594,6 +3548,33 @@ entities:
     - type: Transform
       pos: -4.5,-10.5
       parent: 670
+- proto: Screen
+  entities:
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 670
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 670
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 670
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 670
+  - uid: 177
+    components:
+    - type: Transform
+      pos: -2.5,12.5
+      parent: 670
 - proto: ShotGunCabinetFilled
   entities:
   - uid: 106
@@ -3608,49 +3589,31 @@ entities:
     - type: Transform
       pos: -2.5,-2.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 54
   - uid: 99
     components:
     - type: Transform
       pos: -6.5,-3.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 54
   - uid: 251
     components:
     - type: Transform
       pos: -6.5,8.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 244
   - uid: 257
     components:
     - type: Transform
       pos: -2.5,9.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 244
   - uid: 274
     components:
     - type: Transform
       pos: -3.5,9.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 244
   - uid: 284
     components:
     - type: Transform
       pos: -1.5,9.5
       parent: 670
-    - type: DeviceLinkSink
-      links:
-      - 244
 - proto: ShuttleWindow
   entities:
   - uid: 2