From 743177dae0fbe34c91a9eab52a98ebeb3053b11b Mon Sep 17 00:00:00 2001
From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com>
Date: Thu, 10 Nov 2022 20:16:55 -0800
Subject: [PATCH] more cluster fixes (#12546)

* door power and scrubbers

* wires
---
 Resources/Maps/cluster.yml | 410 ++++++++++++++++++++++++++++++-------
 1 file changed, 336 insertions(+), 74 deletions(-)

diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index d6b41e2c0f..160526d1c1 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -10633,8 +10633,8 @@ entities:
     - volume: 2500
       temperature: 293.15
       moles:
-      - 20.619795
-      - 77.56971
+      - 18.935778
+      - 71.2346
       - 0
       - 0
       - 0
@@ -10648,8 +10648,8 @@ entities:
     - volume: 2500
       temperature: 293.15
       moles:
-      - 21.389235
-      - 80.464264
+      - 20.713123
+      - 77.9208
       - 0
       - 0
       - 0
@@ -10663,8 +10663,8 @@ entities:
     - volume: 2500
       temperature: 293.15
       moles:
-      - 21.72303
-      - 81.71997
+      - 21.378712
+      - 80.42468
       - 0
       - 0
       - 0
@@ -10678,8 +10678,8 @@ entities:
     - volume: 2500
       temperature: 293.15
       moles:
-      - 21.756979
-      - 81.84769
+      - 21.540726
+      - 81.034164
       - 0
       - 0
       - 0
@@ -10753,8 +10753,8 @@ entities:
     - volume: 2500
       temperature: 293.15
       moles:
-      - 21.222336
-      - 79.83641
+      - 20.38033
+      - 76.66885
       - 0
       - 0
       - 0
@@ -10768,8 +10768,8 @@ entities:
     - volume: 2500
       temperature: 293.15
       moles:
-      - 21.40055
-      - 80.506836
+      - 20.767128
+      - 78.12396
       - 0
       - 0
       - 0
@@ -10783,8 +10783,8 @@ entities:
     - volume: 2500
       temperature: 293.15
       moles:
-      - 21.607056
-      - 81.28369
+      - 21.269001
+      - 80.01196
       - 0
       - 0
       - 0
@@ -15506,11 +15506,14 @@ entities:
     parent: 127
     type: Transform
 - uid: 853
-  type: SheetSteel
+  type: GasPort
   components:
-  - pos: -5.5,13.5
+  - rot: 3.141592653589793 rad
+    pos: 26.5,0.5
     parent: 127
     type: Transform
+  - color: '#990000FF'
+    type: AtmosPipeColor
 - uid: 854
   type: WallReinforced
   components:
@@ -21381,14 +21384,11 @@ entities:
     parent: 127
     type: Transform
 - uid: 1778
-  type: GasPipeStraight
+  type: SheetPlastic
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 25.5,1.5
+  - pos: -5.5,13.5
     parent: 127
     type: Transform
-  - color: '#0055CCFF'
-    type: AtmosPipeColor
 - uid: 1779
   type: ReinforcedPlasmaWindow
   components:
@@ -41801,7 +41801,7 @@ entities:
   type: GasPipeStraight
   components:
   - rot: -1.5707963267948966 rad
-    pos: 24.5,1.5
+    pos: 26.5,1.5
     parent: 127
     type: Transform
   - color: '#0055CCFF'
@@ -54479,7 +54479,7 @@ entities:
   - pos: 24.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -72123.1
+  - SecondsUntilStateChange: -73212.74
     state: Opening
     type: Door
   - inputs:
@@ -54495,7 +54495,7 @@ entities:
   - pos: 24.5,-4.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -72123.1
+  - SecondsUntilStateChange: -73212.74
     state: Opening
     type: Door
   - inputs:
@@ -54511,7 +54511,7 @@ entities:
   - pos: 24.5,-7.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -72123.1
+  - SecondsUntilStateChange: -73212.74
     state: Opening
     type: Door
   - inputs:
@@ -54527,7 +54527,7 @@ entities:
   - pos: 24.5,-6.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -72123.1
+  - SecondsUntilStateChange: -73212.74
     state: Opening
     type: Door
   - inputs:
@@ -54579,7 +54579,7 @@ entities:
   - pos: 13.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54595,7 +54595,7 @@ entities:
   - pos: 14.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54611,7 +54611,7 @@ entities:
   - pos: 15.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54627,7 +54627,7 @@ entities:
   - pos: 16.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54643,7 +54643,7 @@ entities:
   - pos: 17.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54659,7 +54659,7 @@ entities:
   - pos: 18.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54675,7 +54675,7 @@ entities:
   - pos: 12.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54691,7 +54691,7 @@ entities:
   - pos: 19.5,-5.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54707,7 +54707,7 @@ entities:
   - pos: 11.5,-6.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54723,7 +54723,7 @@ entities:
   - pos: 11.5,-7.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54739,7 +54739,7 @@ entities:
   - pos: 20.5,-6.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54755,7 +54755,7 @@ entities:
   - pos: 20.5,-7.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73173.98
+  - SecondsUntilStateChange: -74263.62
     state: Opening
     type: Door
   - inputs:
@@ -54771,7 +54771,7 @@ entities:
   - pos: 20.5,-9.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73089.375
+  - SecondsUntilStateChange: -74179.016
     state: Opening
     type: Door
   - inputs:
@@ -54787,7 +54787,7 @@ entities:
   - pos: 20.5,-11.5
     parent: 127
     type: Transform
-  - SecondsUntilStateChange: -73089.375
+  - SecondsUntilStateChange: -74179.016
     state: Opening
     type: Door
   - inputs:
@@ -56639,10 +56639,9 @@ entities:
   - color: '#990000FF'
     type: AtmosPipeColor
 - uid: 6863
-  type: GasPipeStraight
+  type: GasPipeTJunction
   components:
-  - rot: 3.141592653589793 rad
-    pos: 24.5,1.5
+  - pos: 27.5,2.5
     parent: 127
     type: Transform
   - color: '#990000FF'
@@ -56666,10 +56665,10 @@ entities:
     parent: 127
     type: Transform
 - uid: 6867
-  type: GasPipeStraight
+  type: GasPressurePump
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 26.5,2.5
+  - rot: 3.141592653589793 rad
+    pos: 26.5,1.5
     parent: 127
     type: Transform
   - color: '#990000FF'
@@ -56678,7 +56677,7 @@ entities:
   type: GasPipeStraight
   components:
   - rot: 1.5707963267948966 rad
-    pos: 27.5,2.5
+    pos: 25.5,2.5
     parent: 127
     type: Transform
   - color: '#990000FF'
@@ -66813,12 +66812,12 @@ entities:
     parent: 127
     type: Transform
 - uid: 8255
-  type: GasVentPump
+  type: GasPipeTJunction
   components:
   - pos: 26.5,2.5
     parent: 127
     type: Transform
-  - color: '#0055CCFF'
+  - color: '#990000FF'
     type: AtmosPipeColor
 - uid: 8256
   type: GasVentPump
@@ -66855,10 +66854,9 @@ entities:
   - color: '#990000FF'
     type: AtmosPipeColor
 - uid: 8260
-  type: GasVentScrubber
+  type: GasPipeStraight
   components:
-  - rot: 3.141592653589793 rad
-    pos: 25.5,1.5
+  - pos: 24.5,1.5
     parent: 127
     type: Transform
   - color: '#990000FF'
@@ -66906,8 +66904,7 @@ entities:
     - 8258
     - 8259
     - 8256
-    - 8260
-    - 8255
+    - null
     type: DeviceList
 - uid: 8263
   type: FirelockGlass
@@ -68683,21 +68680,23 @@ entities:
   - color: '#990000FF'
     type: AtmosPipeColor
 - uid: 8521
-  type: GasPipeTJunction
+  type: GasPipeStraight
   components:
-  - pos: 25.5,2.5
-    parent: 127
-    type: Transform
-  - color: '#990000FF'
-    type: AtmosPipeColor
-- uid: 8522
-  type: GasPipeFourway
-  components:
-  - pos: 26.5,1.5
+  - rot: -1.5707963267948966 rad
+    pos: 24.5,1.5
     parent: 127
     type: Transform
   - color: '#0055CCFF'
     type: AtmosPipeColor
+- uid: 8522
+  type: GasVentScrubber
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 25.5,0.5
+    parent: 127
+    type: Transform
+  - color: '#990000FF'
+    type: AtmosPipeColor
 - uid: 8523
   type: GasPipeTJunction
   components:
@@ -69761,36 +69760,299 @@ entities:
 - uid: 8684
   type: GasPipeTJunction
   components:
-  - pos: 24.5,2.5
+  - rot: 3.141592653589793 rad
+    pos: 25.5,1.5
     parent: 127
     type: Transform
-  - color: '#990000FF'
+  - color: '#0055CCFF'
     type: AtmosPipeColor
 - uid: 8685
-  type: GasPipeStraight
+  type: GasPressurePump
   components:
   - rot: 3.141592653589793 rad
-    pos: 24.5,0.5
+    pos: 27.5,1.5
     parent: 127
     type: Transform
   - color: '#990000FF'
     type: AtmosPipeColor
 - uid: 8686
-  type: GasPipeBend
+  type: GasVentPump
   components:
-  - rot: -1.5707963267948966 rad
-    pos: 26.5,0.5
+  - pos: 25.5,2.5
     parent: 127
     type: Transform
   - color: '#0055CCFF'
     type: AtmosPipeColor
 - uid: 8687
-  type: GasPipeBend
+  type: GasPipeTJunction
   components:
   - rot: 1.5707963267948966 rad
-    pos: 25.5,0.5
+    pos: 24.5,0.5
     parent: 127
     type: Transform
-  - color: '#0055CCFF'
+  - color: '#990000FF'
     type: AtmosPipeColor
+- uid: 8688
+  type: CableApcExtension
+  components:
+  - pos: 16.5,2.5
+    parent: 127
+    type: Transform
+- uid: 8689
+  type: CableApcExtension
+  components:
+  - pos: 17.5,2.5
+    parent: 127
+    type: Transform
+- uid: 8690
+  type: CableApcExtension
+  components:
+  - pos: 24.5,4.5
+    parent: 127
+    type: Transform
+- uid: 8691
+  type: CableApcExtension
+  components:
+  - pos: 9.5,-10.5
+    parent: 127
+    type: Transform
+- uid: 8692
+  type: CableApcExtension
+  components:
+  - pos: 9.5,2.5
+    parent: 127
+    type: Transform
+- uid: 8693
+  type: GasPipeTJunction
+  components:
+  - pos: 24.5,2.5
+    parent: 127
+    type: Transform
+  - color: '#990000FF'
+    type: AtmosPipeColor
+- uid: 8694
+  type: PortableScrubber
+  components:
+  - pos: 26.5,0.5
+    parent: 127
+    type: Transform
+- uid: 8695
+  type: GasPort
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 27.5,0.5
+    parent: 127
+    type: Transform
+  - color: '#990000FF'
+    type: AtmosPipeColor
+- uid: 8696
+  type: PortableScrubber
+  components:
+  - pos: 27.5,0.5
+    parent: 127
+    type: Transform
+- uid: 8697
+  type: BoxBodyBag
+  components:
+  - pos: 1.4925553,14.655643
+    parent: 127
+    type: Transform
+- uid: 8698
+  type: BoxFolderBlack
+  components:
+  - pos: 3.6539683,14.603813
+    parent: 127
+    type: Transform
+- uid: 8699
+  type: BoxFolderBlue
+  components:
+  - pos: 1.6588756,-5.4630365
+    parent: 127
+    type: Transform
+- uid: 8700
+  type: BoxFolderWhite
+  components:
+  - pos: -3.3254993,5.6008472
+    parent: 127
+    type: Transform
+- uid: 8701
+  type: BoxFolderWhite
+  components:
+  - pos: -3.3098743,8.586103
+    parent: 127
+    type: Transform
+- uid: 8702
+  type: BoxFolderWhite
+  components:
+  - pos: -3.3411243,11.5989
+    parent: 127
+    type: Transform
+- uid: 8703
+  type: BoxFolderWhite
+  components:
+  - pos: 1.9323192,7.6159186
+    parent: 127
+    type: Transform
+- uid: 8704
+  type: Paper
+  components:
+  - pos: 1.6979442,7.6159186
+    parent: 127
+    type: Transform
+- uid: 8705
+  type: Paper
+  components:
+  - pos: 1.5885692,7.6159186
+    parent: 127
+    type: Transform
+- uid: 8706
+  type: Paper
+  components:
+  - pos: 1.4635692,7.6159186
+    parent: 127
+    type: Transform
+- uid: 8707
+  type: Paper
+  components:
+  - pos: -3.4720547,8.584668
+    parent: 127
+    type: Transform
+- uid: 8708
+  type: Paper
+  components:
+  - pos: -3.4876797,11.607829
+    parent: 127
+    type: Transform
+- uid: 8709
+  type: Paper
+  components:
+  - pos: -3.5033047,5.609607
+    parent: 127
+    type: Transform
+- uid: 8710
+  type: Paper
+  components:
+  - pos: 1.5691693,-5.4552197
+    parent: 127
+    type: Transform
+- uid: 8711
+  type: Paper
+  components:
+  - pos: 1.3816693,-5.4708447
+    parent: 127
+    type: Transform
+- uid: 8712
+  type: Paper
+  components:
+  - pos: 1.2722943,-5.4708447
+    parent: 127
+    type: Transform
+- uid: 8713
+  type: Pen
+  components:
+  - pos: 1.2879193,-5.3927197
+    parent: 127
+    type: Transform
+- uid: 8714
+  type: Pen
+  components:
+  - pos: -3.7117822,8.609095
+    parent: 127
+    type: Transform
+- uid: 8715
+  type: Pen
+  components:
+  - pos: -3.6805322,5.62472
+    parent: 127
+    type: Transform
+- uid: 8716
+  type: Pen
+  components:
+  - pos: -3.6805322,11.62472
+    parent: 127
+    type: Transform
+- uid: 8717
+  type: Pen
+  components:
+  - pos: 1.2413428,7.577845
+    parent: 127
+    type: Transform
+- uid: 8718
+  type: Lamp
+  components:
+  - pos: 1.0291226,-4.466736
+    parent: 127
+    type: Transform
+- uid: 8719
+  type: EmergencyMedipen
+  components:
+  - pos: 0.5735941,9.110008
+    parent: 127
+    type: Transform
+- uid: 8720
+  type: EmergencyMedipen
+  components:
+  - pos: 0.4173441,8.891258
+    parent: 127
+    type: Transform
+- uid: 8721
+  type: Brutepack
+  components:
+  - pos: 0.6829691,8.641258
+    parent: 127
+    type: Transform
+- uid: 8722
+  type: Brutepack
+  components:
+  - pos: 0.6204691,8.453758
+    parent: 127
+    type: Transform
+- uid: 8723
+  type: Ointment
+  components:
+  - pos: 0.4642191,8.516258
+    parent: 127
+    type: Transform
+- uid: 8724
+  type: Ointment
+  components:
+  - pos: 0.3860941,8.235008
+    parent: 127
+    type: Transform
+- uid: 8725
+  type: Paper
+  components:
+  - pos: 3.57955,14.599159
+    parent: 127
+    type: Transform
+- uid: 8726
+  type: Paper
+  components:
+  - pos: 3.4858,14.599159
+    parent: 127
+    type: Transform
+- uid: 8727
+  type: Paper
+  components:
+  - pos: 3.376425,14.614784
+    parent: 127
+    type: Transform
+- uid: 8728
+  type: Pen
+  components:
+  - pos: 3.2983,14.521034
+    parent: 127
+    type: Transform
+- uid: 8729
+  type: CableApcExtension
+  components:
+  - pos: -5.5,-6.5
+    parent: 127
+    type: Transform
+- uid: 8730
+  type: CableApcExtension
+  components:
+  - pos: -4.5,-6.5
+    parent: 127
+    type: Transform
 ...