fland update (#23400)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 07f22d2544f4b5cbec3374e915b6a0c31bec1ffa..fbd2ed4af659d3731490faba0eabe0340534385e 100644 (file)
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -17041,7 +17041,6 @@ entities:
       - 25004\r
       - 25944\r
       - 23661\r
-      - 23792\r
       type: DeviceList\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
@@ -100266,29 +100265,6 @@ entities:
       type: Transform\r
 - proto: CrateEngineeringAMEJar\r
   entities:\r
-  - uid: 23453\r
-    components:\r
-    - pos: 83.5,5.5\r
-      parent: 13329\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1495\r
-        moles:\r
-        - 3.0981817\r
-        - 11.655066\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
   - uid: 26563\r
     components:\r
     - pos: 74.5,-1.5\r
@@ -111720,13 +111696,6 @@ entities:
     - pos: 27.5,64.5\r
       parent: 13329\r
       type: Transform\r
-- proto: DresserFilled\r
-  entities:\r
-  - uid: 26271\r
-    components:\r
-    - pos: 52.5,-37.5\r
-      parent: 13329\r
-      type: Transform\r
 - proto: DresserHeadOfPersonnelFilled\r
   entities:\r
   - uid: 18915\r
@@ -111748,6 +111717,13 @@ entities:
     - pos: -5.5,-23.5\r
       parent: 13329\r
       type: Transform\r
+- proto: DresserResearchDirectorFilled\r
+  entities:\r
+  - uid: 23453\r
+    components:\r
+    - pos: 52.5,-37.5\r
+      parent: 13329\r
+      type: Transform\r
 - proto: DrinkAbsintheBottleFull\r
   entities:\r
   - uid: 1176\r
@@ -118268,21 +118244,6 @@ entities:
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
-  - uid: 23670\r
-    components:\r
-    - name: Air Mixer\r
-      type: MetaData\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 76.5,-35.5\r
-      parent: 13329\r
-      type: Transform\r
-    - inletTwoConcentration: 0.22000003\r
-      inletOneConcentration: 0.78\r
-      type: GasMixer\r
-    - joinedGrid: 13329\r
-      type: AtmosDevice\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
 - proto: GasOutletInjector\r
   entities:\r
   - uid: 5631\r
@@ -120052,25 +120013,14 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23667\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 72.5,-35.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 23678\r
-    components:\r
-    - pos: 78.5,-35.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
-  - uid: 23680\r
+  - uid: 23665\r
     components:\r
     - rot: -1.5707963267948966 rad\r
-      pos: 77.5,-38.5\r
+      pos: 80.5,-32.5\r
       parent: 13329\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
   - uid: 23696\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -120095,30 +120045,6 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23719\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 81.5,-38.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
-  - uid: 23736\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 83.5,-35.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23737\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 81.5,-35.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
   - uid: 23738\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -120164,6 +120090,8 @@ entities:
       pos: 79.5,-29.5\r
       parent: 13329\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
   - uid: 23833\r
     components:\r
     - pos: 101.5,-35.5\r
@@ -141926,12 +141854,6 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23662\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 72.5,-38.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 23663\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -141940,50 +141862,26 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23671\r
+  - uid: 23667\r
     components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 74.5,-35.5\r
+    - pos: 80.5,-29.5\r
       parent: 13329\r
       type: Transform\r
-    - color: '#03FCD3FF'\r
+    - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
-  - uid: 23672\r
+  - uid: 23668\r
     components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 75.5,-35.5\r
+    - pos: 80.5,-30.5\r
       parent: 13329\r
       type: Transform\r
-    - color: '#03FCD3FF'\r
+    - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
   - uid: 23673\r
     components:\r
-    - pos: 76.5,-36.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 23674\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 77.5,-35.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
-  - uid: 23675\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 78.5,-36.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
-  - uid: 23676\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 78.5,-37.5\r
+    - pos: 80.5,-31.5\r
       parent: 13329\r
       type: Transform\r
-    - color: '#03FCD3FF'\r
+    - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
   - uid: 23682\r
     components:\r
@@ -142015,22 +141913,6 @@ entities:
       pos: 90.5,-41.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 23720\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 81.5,-37.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
-  - uid: 23721\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 81.5,-36.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
   - uid: 23722\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -142075,49 +141957,6 @@ entities:
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
-  - uid: 23729\r
-    components:\r
-    - pos: 83.5,-29.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23730\r
-    components:\r
-    - pos: 83.5,-30.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23731\r
-    components:\r
-    - pos: 83.5,-31.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23733\r
-    components:\r
-    - pos: 83.5,-33.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23734\r
-    components:\r
-    - pos: 83.5,-34.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23743\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 80.5,-28.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
   - uid: 23744\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -142392,30 +142231,6 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23789\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 82.5,-32.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23790\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 81.5,-32.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-  - uid: 23791\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 80.5,-32.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
   - uid: 23821\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -151621,18 +151436,13 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23666\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 72.5,-36.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 23679\r
+  - uid: 23670\r
     components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 76.5,-38.5\r
+    - pos: 80.5,-28.5\r
       parent: 13329\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
   - uid: 23681\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -151641,14 +151451,6 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23685\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 80.5,-38.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
   - uid: 23701\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -151665,14 +151467,6 @@ entities:
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
-  - uid: 23732\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 83.5,-32.5\r
-      parent: 13329\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
   - uid: 23741\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -152869,72 +152663,54 @@ entities:
       type: AtmosDevice\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 23664\r
+  - uid: 23662\r
     components:\r
-    - name: Nitro Pump\r
-      type: MetaData\r
     - rot: 3.141592653589793 rad\r
-      pos: 72.5,-37.5\r
+      pos: 72.5,-38.5\r
       parent: 13329\r
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
-  - uid: 23665\r
+  - uid: 23664\r
     components:\r
-    - name: Oxygen to Air Mixer\r
-      type: MetaData\r
-    - rot: 3.141592653589793 rad\r
-      pos: 76.5,-37.5\r
+    - pos: 70.5,-38.5\r
       parent: 13329\r
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
-  - uid: 23668\r
+  - uid: 23666\r
     components:\r
-    - name: Nitro to Mix\r
-      type: MetaData\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 73.5,-36.5\r
+    - rot: 3.141592653589793 rad\r
+      pos: 83.5,-29.5\r
       parent: 13329\r
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
-    - color: '#947507FF'\r
+    - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
   - uid: 23669\r
     components:\r
-    - name: Nitro to Air Mixer\r
-      type: MetaData\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 73.5,-35.5\r
+    - pos: 74.5,-38.5\r
       parent: 13329\r
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
-  - uid: 23684\r
+  - uid: 23672\r
     components:\r
-    - name: Oxygen to Mix\r
-      type: MetaData\r
     - rot: 3.141592653589793 rad\r
-      pos: 77.5,-37.5\r
+      pos: 76.5,-38.5\r
       parent: 13329\r
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
-  - uid: 23686\r
+  - uid: 23674\r
     components:\r
-    - name: Air to Mix\r
-      type: MetaData\r
     - rot: 3.141592653589793 rad\r
-      pos: 80.5,-37.5\r
+      pos: 80.5,-38.5\r
       parent: 13329\r
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
-    - color: '#03FCD3FF'\r
-      type: AtmosPipeColor\r
   - uid: 23700\r
     components:\r
     - name: CO2 Pump\r
@@ -152961,6 +152737,8 @@ entities:
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
   - uid: 23709\r
     components:\r
     - name: H2O Pump\r
@@ -153007,18 +152785,6 @@ entities:
       type: AtmosDevice\r
     - color: '#03FCD3FF'\r
       type: AtmosPipeColor\r
-  - uid: 23735\r
-    components:\r
-    - name: Distro Pump\r
-      type: MetaData\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 82.5,-35.5\r
-      parent: 13329\r
-      type: Transform\r
-    - joinedGrid: 13329\r
-      type: AtmosDevice\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
   - uid: 23817\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -153027,6 +152793,8 @@ entities:
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
   - uid: 23838\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -153035,6 +152803,8 @@ entities:
       type: Transform\r
     - joinedGrid: 13329\r
       type: AtmosDevice\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
   - uid: 23861\r
     components:\r
     - name: Mixer Out Pump\r
@@ -154911,7 +154681,7 @@ entities:
       type: AtmosDevice\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
-  - uid: 23792\r
+  - uid: 23671\r
     components:\r
     - rot: 1.5707963267948966 rad\r
       pos: 79.5,-32.5\r
@@ -170172,32 +169942,36 @@ entities:
     - pos: 29.527367,-48.423893\r
       parent: 13329\r
       type: Transform\r
-- proto: ParticleAcceleratorControlBoxUnfinished\r
+- proto: ParticleAcceleratorControlBox\r
   entities:\r
-  - uid: 23875\r
+  - uid: 23675\r
     components:\r
-    - pos: 98.5,-8.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 95.5,-6.5\r
       parent: 13329\r
       type: Transform\r
 - proto: ParticleAcceleratorEmitterForeUnfinished\r
   entities:\r
-  - uid: 23881\r
+  - uid: 23680\r
     components:\r
-    - pos: 96.5,-8.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 97.5,-5.5\r
       parent: 13329\r
       type: Transform\r
 - proto: ParticleAcceleratorEmitterPortUnfinished\r
   entities:\r
-  - uid: 23882\r
+  - uid: 23679\r
     components:\r
-    - pos: 97.5,-8.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 97.5,-4.5\r
       parent: 13329\r
       type: Transform\r
 - proto: ParticleAcceleratorEmitterStarboardUnfinished\r
   entities:\r
-  - uid: 23884\r
+  - uid: 23676\r
     components:\r
-    - pos: 95.5,-8.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 97.5,-6.5\r
       parent: 13329\r
       type: Transform\r
 - proto: ParticleAcceleratorEndCapUnfinished\r
@@ -170218,9 +169992,10 @@ entities:
       type: Transform\r
 - proto: ParticleAcceleratorPowerBoxUnfinished\r
   entities:\r
-  - uid: 23874\r
+  - uid: 23678\r
     components:\r
-    - pos: 97.5,-2.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 96.5,-5.5\r
       parent: 13329\r
       type: Transform\r
 - proto: PartRodMetal\r