]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
projects / space-station-14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 386e59b)
Cog update fix (#32657)
authorSpessmann <156740760+Spessmann@users.noreply.github.com>
Sun, 6 Oct 2024 02:30:10 +0000 (19:30 -0700)
committerGitHub <noreply@github.com>
Sun, 6 Oct 2024 02:30:10 +0000 (20:30 -0600)
* fixes for cog

* ok fixed that

Resources/Maps/cog.yml patch | blob | history

diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml
index 882aab9eb1f2f40940dcc10daeefc8e95d5688c3..30b4730a57d5e841e7d0511d165acded53c0abd5 100644 (file)
--- a/Resources/Maps/cog.yml
+++ b/Resources/Maps/cog.yml
@@ -47,6 +47,7 @@ tilemap:
   112: FloorTechMaint2
   13: FloorTechMaint3
   115: FloorWhite
+  40: FloorWhiteMini
   20: FloorWhiteMono
   125: FloorWood
   5: FloorWoodLarge
@@ -184,7 +185,7 @@ entities:
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: YAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAADgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAADgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAgAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAYAAAAAABYAAAAAACBwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABCwAAAAAACwAAAAAACwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAAwAAAAABAgAAAAABBwAAAAAAgQAAAAAAfQAAAAADfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABCwAAAAAAEgAAAAAACwAAAAAAgQAAAAAAYAAAAAACgQAAAAAAYAAAAAADBwAAAAAAYAAAAAACgQAAAAAAfQAAAAACfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACCwAAAAAACwAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAACYAAAAAACIAAAAAACIAAAAAADIAAAAAABIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAAAgQAAAAAAIAAAAAADIAAAAAABIAAAAAABIAAAAAACgQAAAAAAIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAADYAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAADIAAAAAABgQAAAAAAIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAADAgAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACBwAAAAAABwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAA
+          tiles: YAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAADgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAADgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAgAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAYAAAAAABYAAAAAACBwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABCwAAAAAACwAAAAAACwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAAwAAAAABAgAAAAABBwAAAAAAgQAAAAAAfQAAAAADfQAAAAAAKAAAAAAAKAAAAAAAgQAAAAAAIAAAAAABCwAAAAAAEgAAAAAACwAAAAAAgQAAAAAAYAAAAAACgQAAAAAAYAAAAAADBwAAAAAAYAAAAAACgQAAAAAAfQAAAAACfQAAAAAAgQAAAAAAKAAAAAAAgQAAAAAAIAAAAAACCwAAAAAACwAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAACYAAAAAACIAAAAAACIAAAAAADIAAAAAABIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAAAgQAAAAAAIAAAAAADIAAAAAABIAAAAAABIAAAAAACgQAAAAAAIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAADYAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAADIAAAAAABgQAAAAAAIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAADAgAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACBwAAAAAABwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAA
           version: 6
         2,0:
           ind: 2,0
@@ -490,6 +491,13 @@ entities:
             id: Arrows
           decals:
             8243: 29,5
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            8967: 6.0002394,17.436628
+            8968: 11.993295,17.42273
+            8969: 13.000239,17.436626
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -520,6 +528,9 @@ entities:
             8200: 30,-9
             8721: 57,11
             8722: 58,11
+            8961: 9,17
+            8962: 10,17
+            8963: 16,17
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
@@ -836,6 +847,7 @@ entities:
             8210: 40,4
             8253: 31,6
             8912: 51,-11
+            8970: 8,-14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1760,6 +1772,7 @@ entities:
             8713: -33,67
             8714: -33,68
             8755: -3,19
+            8960: 33,-13
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -8964,14 +8977,14 @@ entities:
             0: 511
           0,-2:
             0: 3581
+          1,-4:
+            0: 17623
           1,-2:
             0: 41718
-          1,-4:
-            0: 17638
+          1,-5:
+            0: 21591
           1,-3:
             0: 25668
-          1,-5:
-            0: 25687
           2,-4:
             0: 4095
           2,-3:
@@ -9710,9 +9723,9 @@ entities:
           7,0:
             0: 61006
           8,-4:
-            0: 33787
+            0: 41979
           8,-3:
-            0: 2746
+            0: 2744
           8,-2:
             0: 61167
           8,-1:
@@ -14040,6 +14053,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-17.5
       parent: 12
+  - uid: 4683
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-10.5
+      parent: 12
   - uid: 5517
     components:
     - type: Transform
@@ -14161,11 +14180,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,-19.5
       parent: 12
-  - uid: 21885
-    components:
-    - type: Transform
-      pos: 32.5,-10.5
-      parent: 12
   - uid: 22224
     components:
     - type: Transform
@@ -14187,6 +14201,12 @@ entities:
     - type: Transform
       pos: -23.5,58.5
       parent: 12
+  - uid: 26389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-15.5
+      parent: 12
   - uid: 27457
     components:
     - type: Transform
@@ -19146,6 +19166,13 @@ entities:
       rot: -12.566370614359172 rad
       pos: -3.622931,-15.409775
       parent: 12
+- proto: Ash
+  entities:
+  - uid: 26653
+    components:
+    - type: Transform
+      pos: -0.5,19.5
+      parent: 12
 - proto: Ashtray
   entities:
   - uid: 6886
@@ -22779,6 +22806,11 @@ entities:
     - type: Transform
       pos: -25.5,6.5
       parent: 12
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 11.5,24.5
+      parent: 12
   - uid: 51
     components:
     - type: Transform
@@ -22849,6 +22881,11 @@ entities:
     - type: Transform
       pos: 52.5,-11.5
       parent: 12
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 4.5,20.5
+      parent: 12
   - uid: 190
     components:
     - type: Transform
@@ -29594,11 +29631,6 @@ entities:
     - type: Transform
       pos: 11.5,19.5
       parent: 12
-  - uid: 9615
-    components:
-    - type: Transform
-      pos: 3.5,19.5
-      parent: 12
   - uid: 9617
     components:
     - type: Transform
@@ -29614,11 +29646,6 @@ entities:
     - type: Transform
       pos: 4.5,22.5
       parent: 12
-  - uid: 9655
-    components:
-    - type: Transform
-      pos: 4.5,21.5
-      parent: 12
   - uid: 9668
     components:
     - type: Transform
@@ -40279,6 +40306,21 @@ entities:
     - type: Transform
       pos: 55.5,2.5
       parent: 12
+  - uid: 26488
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 12
+  - uid: 26489
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 12
+  - uid: 26490
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 12
   - uid: 26500
     components:
     - type: Transform
@@ -40319,6 +40361,16 @@ entities:
     - type: Transform
       pos: 31.5,7.5
       parent: 12
+  - uid: 26536
+    components:
+    - type: Transform
+      pos: 11.5,26.5
+      parent: 12
+  - uid: 26537
+    components:
+    - type: Transform
+      pos: 11.5,25.5
+      parent: 12
   - uid: 26574
     components:
     - type: Transform
@@ -43719,8 +43771,8 @@ entities:
   - uid: 28714
     components:
     - type: Transform
-      rot: -37.69911184307754 rad
-      pos: 54.474026,-5.1717267
+      rot: -50.265482457436725 rad
+      pos: 55.51719,-5.372972
       parent: 12
 - proto: CableApcStack1
   entities:
@@ -43792,11 +43844,6 @@ entities:
     - type: Transform
       pos: 54.5,7.5
       parent: 12
-  - uid: 20
-    components:
-    - type: Transform
-      pos: 32.5,-10.5
-      parent: 12
   - uid: 21
     components:
     - type: Transform
@@ -43877,11 +43924,6 @@ entities:
     - type: Transform
       pos: 8.5,28.5
       parent: 12
-  - uid: 681
-    components:
-    - type: Transform
-      pos: 31.5,-10.5
-      parent: 12
   - uid: 693
     components:
     - type: Transform
@@ -45112,11 +45154,6 @@ entities:
     - type: Transform
       pos: -25.5,-55.5
       parent: 12
-  - uid: 5177
-    components:
-    - type: Transform
-      pos: 33.5,-10.5
-      parent: 12
   - uid: 5179
     components:
     - type: Transform
@@ -51762,6 +51799,11 @@ entities:
     - type: Transform
       pos: -26.5,27.5
       parent: 12
+  - uid: 25832
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 12
   - uid: 25839
     components:
     - type: Transform
@@ -51772,6 +51814,11 @@ entities:
     - type: Transform
       pos: 36.5,0.5
       parent: 12
+  - uid: 26072
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 12
   - uid: 26079
     components:
     - type: Transform
@@ -51817,6 +51864,26 @@ entities:
     - type: Transform
       pos: -56.5,21.5
       parent: 12
+  - uid: 26154
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 12
+  - uid: 26202
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 12
+  - uid: 26261
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 12
+  - uid: 26262
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 12
   - uid: 26417
     components:
     - type: Transform
@@ -51872,6 +51939,31 @@ entities:
     - type: Transform
       pos: 58.5,1.5
       parent: 12
+  - uid: 26525
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 12
+  - uid: 26526
+    components:
+    - type: Transform
+      pos: 6.5,-19.5
+      parent: 12
+  - uid: 26527
+    components:
+    - type: Transform
+      pos: 6.5,-18.5
+      parent: 12
+  - uid: 26528
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 12
+  - uid: 26529
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 12
   - uid: 26543
     components:
     - type: Transform
@@ -52047,11 +52139,6 @@ entities:
     - type: Transform
       pos: 30.5,-4.5
       parent: 12
-  - uid: 26927
-    components:
-    - type: Transform
-      pos: 33.5,-9.5
-      parent: 12
   - uid: 27028
     components:
     - type: Transform
@@ -55082,8 +55169,8 @@ entities:
   - uid: 28713
     components:
     - type: Transform
-      rot: -37.69911184307754 rad
-      pos: 54.49033,-5.6204934
+      rot: -50.265482457436725 rad
+      pos: 55.498672,-5.6926384
       parent: 12
 - proto: CableMV
   entities:
@@ -56487,6 +56574,11 @@ entities:
     - type: Transform
       pos: -17.5,-24.5
       parent: 12
+  - uid: 4715
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 12
   - uid: 4800
     components:
     - type: Transform
@@ -56532,6 +56624,11 @@ entities:
     - type: Transform
       pos: -27.5,65.5
       parent: 12
+  - uid: 4988
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 12
   - uid: 5036
     components:
     - type: Transform
@@ -56582,6 +56679,26 @@ entities:
     - type: Transform
       pos: -1.5,1.5
       parent: 12
+  - uid: 5170
+    components:
+    - type: Transform
+      pos: 9.5,-14.5
+      parent: 12
+  - uid: 5175
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 12
+  - uid: 5176
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 12
+  - uid: 5177
+    components:
+    - type: Transform
+      pos: 15.5,-16.5
+      parent: 12
   - uid: 5272
     components:
     - type: Transform
@@ -56597,6 +56714,11 @@ entities:
     - type: Transform
       pos: 14.5,4.5
       parent: 12
+  - uid: 5303
+    components:
+    - type: Transform
+      pos: 17.5,-16.5
+      parent: 12
   - uid: 5311
     components:
     - type: Transform
@@ -56605,7 +56727,7 @@ entities:
   - uid: 5378
     components:
     - type: Transform
-      pos: 33.5,-9.5
+      pos: 7.5,-21.5
       parent: 12
   - uid: 5405
     components:
@@ -56937,6 +57059,11 @@ entities:
     - type: Transform
       pos: 63.5,-23.5
       parent: 12
+  - uid: 6774
+    components:
+    - type: Transform
+      pos: 9.5,-21.5
+      parent: 12
   - uid: 6891
     components:
     - type: Transform
@@ -57042,6 +57169,11 @@ entities:
     - type: Transform
       pos: 43.5,-12.5
       parent: 12
+  - uid: 7524
+    components:
+    - type: Transform
+      pos: 11.5,-21.5
+      parent: 12
   - uid: 7580
     components:
     - type: Transform
@@ -57642,6 +57774,11 @@ entities:
     - type: Transform
       pos: 53.5,63.5
       parent: 12
+  - uid: 8805
+    components:
+    - type: Transform
+      pos: 13.5,-21.5
+      parent: 12
   - uid: 9002
     components:
     - type: Transform
@@ -57817,6 +57954,11 @@ entities:
     - type: Transform
       pos: 62.5,-0.5
       parent: 12
+  - uid: 9615
+    components:
+    - type: Transform
+      pos: 15.5,-21.5
+      parent: 12
   - uid: 9628
     components:
     - type: Transform
@@ -57832,6 +57974,11 @@ entities:
     - type: Transform
       pos: 30.5,4.5
       parent: 12
+  - uid: 9655
+    components:
+    - type: Transform
+      pos: 17.5,-21.5
+      parent: 12
   - uid: 9671
     components:
     - type: Transform
@@ -58367,6 +58514,11 @@ entities:
     - type: Transform
       pos: -6.5,28.5
       parent: 12
+  - uid: 10655
+    components:
+    - type: Transform
+      pos: 19.5,-21.5
+      parent: 12
   - uid: 10668
     components:
     - type: Transform
@@ -58427,6 +58579,11 @@ entities:
     - type: Transform
       pos: -47.5,15.5
       parent: 12
+  - uid: 11323
+    components:
+    - type: Transform
+      pos: 13.5,-16.5
+      parent: 12
   - uid: 11331
     components:
     - type: Transform
@@ -58437,6 +58594,11 @@ entities:
     - type: Transform
       pos: 32.5,15.5
       parent: 12
+  - uid: 11371
+    components:
+    - type: Transform
+      pos: 18.5,-21.5
+      parent: 12
   - uid: 11383
     components:
     - type: Transform
@@ -58477,6 +58639,11 @@ entities:
     - type: Transform
       pos: -9.5,-19.5
       parent: 12
+  - uid: 11574
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 12
   - uid: 11932
     components:
     - type: Transform
@@ -61052,6 +61219,11 @@ entities:
     - type: Transform
       pos: -60.5,24.5
       parent: 12
+  - uid: 17584
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 12
   - uid: 17735
     components:
     - type: Transform
@@ -61350,7 +61522,7 @@ entities:
   - uid: 18631
     components:
     - type: Transform
-      pos: 33.5,-10.5
+      pos: 8.5,-14.5
       parent: 12
   - uid: 18759
     components:
@@ -62752,6 +62924,11 @@ entities:
     - type: Transform
       pos: -6.5,32.5
       parent: 12
+  - uid: 21604
+    components:
+    - type: Transform
+      pos: 11.5,-15.5
+      parent: 12
   - uid: 21705
     components:
     - type: Transform
@@ -62775,7 +62952,12 @@ entities:
   - uid: 21884
     components:
     - type: Transform
-      pos: 32.5,-10.5
+      pos: 13.5,-15.5
+      parent: 12
+  - uid: 21885
+    components:
+    - type: Transform
+      pos: 14.5,-16.5
       parent: 12
   - uid: 21901
     components:
@@ -62902,6 +63084,11 @@ entities:
     - type: Transform
       pos: -31.5,70.5
       parent: 12
+  - uid: 23130
+    components:
+    - type: Transform
+      pos: 16.5,-16.5
+      parent: 12
   - uid: 23713
     components:
     - type: Transform
@@ -63787,6 +63974,41 @@ entities:
     - type: Transform
       pos: -30.5,12.5
       parent: 12
+  - uid: 25824
+    components:
+    - type: Transform
+      pos: 18.5,-16.5
+      parent: 12
+  - uid: 25825
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 12
+  - uid: 25826
+    components:
+    - type: Transform
+      pos: 10.5,-21.5
+      parent: 12
+  - uid: 25827
+    components:
+    - type: Transform
+      pos: 12.5,-21.5
+      parent: 12
+  - uid: 25828
+    components:
+    - type: Transform
+      pos: 14.5,-21.5
+      parent: 12
+  - uid: 25829
+    components:
+    - type: Transform
+      pos: 16.5,-21.5
+      parent: 12
+  - uid: 25830
+    components:
+    - type: Transform
+      pos: 9.5,-15.5
+      parent: 12
   - uid: 25833
     components:
     - type: Transform
@@ -63827,6 +64049,41 @@ entities:
     - type: Transform
       pos: -27.5,-27.5
       parent: 12
+  - uid: 26263
+    components:
+    - type: Transform
+      pos: 20.5,-21.5
+      parent: 12
+  - uid: 26264
+    components:
+    - type: Transform
+      pos: 21.5,-21.5
+      parent: 12
+  - uid: 26276
+    components:
+    - type: Transform
+      pos: 23.5,-21.5
+      parent: 12
+  - uid: 26311
+    components:
+    - type: Transform
+      pos: 22.5,-21.5
+      parent: 12
+  - uid: 26368
+    components:
+    - type: Transform
+      pos: 24.5,-21.5
+      parent: 12
+  - uid: 26382
+    components:
+    - type: Transform
+      pos: 19.5,-22.5
+      parent: 12
+  - uid: 26383
+    components:
+    - type: Transform
+      pos: 19.5,-20.5
+      parent: 12
   - uid: 26451
     components:
     - type: Transform
@@ -64527,86 +64784,6 @@ entities:
     - type: Transform
       pos: 54.5,1.5
       parent: 12
-  - uid: 28970
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 12
-  - uid: 28971
-    components:
-    - type: Transform
-      pos: -5.5,-20.5
-      parent: 12
-  - uid: 28972
-    components:
-    - type: Transform
-      pos: -4.5,-20.5
-      parent: 12
-  - uid: 28973
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 12
-  - uid: 28974
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 12
-  - uid: 28975
-    components:
-    - type: Transform
-      pos: -3.5,-22.5
-      parent: 12
-  - uid: 28976
-    components:
-    - type: Transform
-      pos: -1.5,-22.5
-      parent: 12
-  - uid: 28977
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 12
-  - uid: 28978
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 12
-  - uid: 28979
-    components:
-    - type: Transform
-      pos: 1.5,-22.5
-      parent: 12
-  - uid: 28980
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 12
-  - uid: 28981
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 12
-  - uid: 28982
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 12
-  - uid: 28983
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 12
-  - uid: 28984
-    components:
-    - type: Transform
-      pos: 6.5,-22.5
-      parent: 12
-  - uid: 28985
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 12
   - uid: 28986
     components:
     - type: Transform
@@ -65932,8 +66109,8 @@ entities:
   - uid: 28716
     components:
     - type: Transform
-      rot: -37.69911184307754 rad
-      pos: 54.425102,-5.334914
+      rot: -50.265482457436725 rad
+      pos: 55.50793,-5.5443873
       parent: 12
 - proto: CableMVStack1
   entities:
@@ -70937,12 +71114,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,15.5
       parent: 12
-  - uid: 11574
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-22.5
-      parent: 12
   - uid: 11688
     components:
     - type: Transform
@@ -72871,12 +73042,102 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,59.5
       parent: 12
+  - uid: 26414
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-22.5
+      parent: 12
+  - uid: 26421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-22.5
+      parent: 12
+  - uid: 26422
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-22.5
+      parent: 12
+  - uid: 26432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-22.5
+      parent: 12
+  - uid: 26438
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-22.5
+      parent: 12
+  - uid: 26440
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-22.5
+      parent: 12
+  - uid: 26445
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-22.5
+      parent: 12
+  - uid: 26446
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-22.5
+      parent: 12
   - uid: 26447
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 34.5,0.5
       parent: 12
+  - uid: 26452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-22.5
+      parent: 12
+  - uid: 26455
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-22.5
+      parent: 12
+  - uid: 26461
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-22.5
+      parent: 12
+  - uid: 26462
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-21.5
+      parent: 12
+  - uid: 26466
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-20.5
+      parent: 12
+  - uid: 26469
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-20.5
+      parent: 12
+  - uid: 26470
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-20.5
+      parent: 12
   - uid: 26778
     components:
     - type: Transform
@@ -73634,76 +73895,6 @@ entities:
     - type: Transform
       pos: -7.5,-20.5
       parent: 12
-  - uid: 28632
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 12
-  - uid: 28633
-    components:
-    - type: Transform
-      pos: -5.5,-20.5
-      parent: 12
-  - uid: 28634
-    components:
-    - type: Transform
-      pos: -4.5,-20.5
-      parent: 12
-  - uid: 28635
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 12
-  - uid: 28636
-    components:
-    - type: Transform
-      pos: -3.5,-22.5
-      parent: 12
-  - uid: 28637
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 12
-  - uid: 28638
-    components:
-    - type: Transform
-      pos: -1.5,-22.5
-      parent: 12
-  - uid: 28639
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 12
-  - uid: 28640
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 12
-  - uid: 28641
-    components:
-    - type: Transform
-      pos: 1.5,-22.5
-      parent: 12
-  - uid: 28642
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 12
-  - uid: 28643
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 12
-  - uid: 28644
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 12
-  - uid: 28647
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 12
   - uid: 28922
     components:
     - type: Transform
@@ -76223,11 +76414,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,0.5
       parent: 12
-  - uid: 23130
-    components:
-    - type: Transform
-      pos: 56.427277,-4.6059856
-      parent: 12
   - uid: 23441
     components:
     - type: Transform
@@ -76252,6 +76438,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 58.720875,57.492115
       parent: 12
+  - uid: 26532
+    components:
+    - type: Transform
+      pos: 56.5,-4.5
+      parent: 12
   - uid: 27066
     components:
     - type: Transform
@@ -76818,11 +77009,6 @@ entities:
     - type: Transform
       pos: -13.5,-19.5
       parent: 12
-  - uid: 8805
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 12
   - uid: 9567
     components:
     - type: Transform
@@ -76978,6 +77164,16 @@ entities:
     - type: Transform
       pos: -45.5,31.5
       parent: 12
+  - uid: 26027
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 12
+  - uid: 26205
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 12
   - uid: 26682
     components:
     - type: Transform
@@ -77265,11 +77461,6 @@ entities:
     - type: Transform
       pos: -52.5,-19.5
       parent: 12
-  - uid: 28442
-    components:
-    - type: Transform
-      pos: 5.5,-14.5
-      parent: 12
   - uid: 30472
     components:
     - type: Transform
@@ -77552,11 +77743,6 @@ entities:
     - type: Transform
       pos: -56.5,-29.5
       parent: 12
-  - uid: 17584
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 12
   - uid: 18105
     components:
     - type: Transform
@@ -79090,11 +79276,6 @@ entities:
     - type: Transform
       pos: 53.5,-42.5
       parent: 12
-  - uid: 5303
-    components:
-    - type: Transform
-      pos: 5.5,-14.5
-      parent: 12
   - uid: 9215
     components:
     - type: Transform
@@ -79232,6 +79413,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,58.5
       parent: 12
+  - uid: 25835
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-23.5
+      parent: 12
   - uid: 30201
     components:
     - type: Transform
@@ -79975,12 +80162,6 @@ entities:
       parent: 12
 - proto: ComputerSolarControl
   entities:
-  - uid: 499
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 55.5,-5.5
-      parent: 12
   - uid: 9217
     components:
     - type: Transform
@@ -80003,6 +80184,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -52.5,47.5
       parent: 12
+  - uid: 26073
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,-5.5
+      parent: 12
   - uid: 31765
     components:
     - type: Transform
@@ -81917,11 +82104,6 @@ entities:
     - type: Transform
       pos: -30.5,30.5
       parent: 12
-  - uid: 21604
-    components:
-    - type: Transform
-      pos: -22.5,44.5
-      parent: 12
 - proto: DefaultStationBeaconCryonics
   entities:
   - uid: 3938
@@ -82176,10 +82358,10 @@ entities:
       parent: 12
 - proto: DefaultStationBeaconSingularity
   entities:
-  - uid: 26754
+  - uid: 26654
     components:
     - type: Transform
-      pos: 59.5,4.5
+      pos: 60.5,5.5
       parent: 12
 - proto: DefaultStationBeaconSolars
   entities:
@@ -82224,6 +82406,13 @@ entities:
     - type: Transform
       pos: 40.5,-38.5
       parent: 12
+- proto: DefaultStationBeaconTEG
+  entities:
+  - uid: 26552
+    components:
+    - type: Transform
+      pos: 11.5,14.5
+      parent: 12
 - proto: DefaultStationBeaconTelecoms
   entities:
   - uid: 21869
@@ -83451,6 +83640,12 @@ entities:
     - type: Transform
       pos: 23.5,11.5
       parent: 12
+  - uid: 26523
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-10.5
+      parent: 12
   - uid: 26729
     components:
     - type: Transform
@@ -84112,6 +84307,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -38.5,-41.5
       parent: 12
+  - uid: 26519
+    components:
+    - type: Transform
+      pos: 30.5,-10.5
+      parent: 12
 - proto: DisposalMachineFrame
   entities:
   - uid: 12940
@@ -84121,6 +84321,12 @@ entities:
       parent: 12
 - proto: DisposalPipe
   entities:
+  - uid: 19
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-14.5
+      parent: 12
   - uid: 357
     components:
     - type: Transform
@@ -84133,6 +84339,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,-12.5
       parent: 12
+  - uid: 499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-12.5
+      parent: 12
   - uid: 637
     components:
     - type: Transform
@@ -84518,6 +84730,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,-12.5
       parent: 12
+  - uid: 2369
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-10.5
+      parent: 12
   - uid: 2538
     components:
     - type: Transform
@@ -85044,6 +85262,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 49.5,45.5
       parent: 12
+  - uid: 4681
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-10.5
+      parent: 12
+  - uid: 4684
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-11.5
+      parent: 12
   - uid: 4695
     components:
     - type: Transform
@@ -90806,6 +91036,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-23.5
       parent: 12
+  - uid: 26104
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-13.5
+      parent: 12
   - uid: 26114
     components:
     - type: Transform
@@ -92988,6 +93224,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,-13.5
       parent: 12
+  - uid: 26522
+    components:
+    - type: Transform
+      pos: 33.5,-9.5
+      parent: 12
   - uid: 27021
     components:
     - type: Transform
@@ -94153,6 +94394,13 @@ entities:
       rot: -12.566370614359172 rad
       pos: -29.330828,7.500151
       parent: 12
+- proto: ElectrolysisUnitMachineCircuitboard
+  entities:
+  - uid: 26647
+    components:
+    - type: Transform
+      pos: -3.5,21.5
+      parent: 12
 - proto: EmergencyFunnyOxygenTankFilled
   entities:
   - uid: 27129
@@ -101575,14 +101823,14 @@ entities:
       pos: 6.5,5.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 2733
     components:
     - type: Transform
       pos: 12.5,5.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 2734
     components:
     - type: Transform
@@ -101590,7 +101838,7 @@ entities:
       pos: 12.5,-0.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 2758
     components:
     - type: Transform
@@ -102092,7 +102340,7 @@ entities:
       pos: 3.5,7.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 5427
     components:
     - type: Transform
@@ -102155,7 +102403,7 @@ entities:
       pos: 6.5,7.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 6220
     components:
     - type: Transform
@@ -104037,6 +104285,40 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 26573
+    components:
+    - type: Transform
+      pos: 10.5,24.5
+      parent: 12
+  - uid: 26576
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,24.5
+      parent: 12
+  - uid: 26594
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,27.5
+      parent: 12
+  - uid: 26595
+    components:
+    - type: Transform
+      pos: 13.5,27.5
+      parent: 12
+  - uid: 26596
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,24.5
+      parent: 12
+  - uid: 26602
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,24.5
+      parent: 12
   - uid: 26985
     components:
     - type: Transform
@@ -106016,7 +106298,7 @@ entities:
       pos: 11.5,5.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 2448
     components:
     - type: Transform
@@ -106055,7 +106337,7 @@ entities:
       pos: 4.5,7.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 2677
     components:
     - type: Transform
@@ -106071,7 +106353,7 @@ entities:
       pos: 5.5,7.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 2692
     components:
     - type: Transform
@@ -106297,7 +106579,7 @@ entities:
       pos: 10.5,5.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 3464
     components:
     - type: Transform
@@ -107887,7 +108169,7 @@ entities:
       pos: 12.5,2.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 4390
     components:
     - type: Transform
@@ -109318,7 +109600,7 @@ entities:
       pos: 12.5,4.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 5387
     components:
     - type: Transform
@@ -109342,7 +109624,7 @@ entities:
       pos: 9.5,5.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 5399
     components:
     - type: Transform
@@ -109374,7 +109656,7 @@ entities:
       pos: 7.5,5.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 5408
     components:
     - type: Transform
@@ -109398,7 +109680,7 @@ entities:
       pos: 6.5,6.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 5418
     components:
     - type: Transform
@@ -109406,7 +109688,7 @@ entities:
       pos: 8.5,5.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 5422
     components:
     - type: Transform
@@ -109530,7 +109812,7 @@ entities:
       pos: 12.5,1.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 5634
     components:
     - type: Transform
@@ -109893,7 +110175,7 @@ entities:
       pos: 3.5,9.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 6854
     components:
     - type: Transform
@@ -110707,7 +110989,7 @@ entities:
       pos: 3.5,8.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 7117
     components:
     - type: Transform
@@ -110715,7 +110997,7 @@ entities:
       pos: 3.5,10.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 7119
     components:
     - type: Transform
@@ -110731,7 +111013,7 @@ entities:
       pos: 3.5,11.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 7137
     components:
     - type: Transform
@@ -110787,7 +111069,7 @@ entities:
       pos: 3.5,12.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 7147
     components:
     - type: Transform
@@ -112420,7 +112702,7 @@ entities:
       pos: 12.5,0.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 8981
     components:
     - type: Transform
@@ -114019,15 +114301,7 @@ entities:
       pos: 13.5,-0.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
-  - uid: 11323
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-0.5
-      parent: 12
-    - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 11344
     components:
     - type: Transform
@@ -114113,7 +114387,7 @@ entities:
       pos: 12.5,3.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
   - uid: 11592
     components:
     - type: Transform
@@ -124947,6 +125221,12 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 25831
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,14.5
+      parent: 12
   - uid: 25959
     components:
     - type: Transform
@@ -125260,6 +125540,100 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 26559
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,19.5
+      parent: 12
+  - uid: 26561
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,20.5
+      parent: 12
+  - uid: 26562
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,21.5
+      parent: 12
+  - uid: 26563
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,22.5
+      parent: 12
+  - uid: 26572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,23.5
+      parent: 12
+  - uid: 26578
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,23.5
+      parent: 12
+  - uid: 26581
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,22.5
+      parent: 12
+  - uid: 26582
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,21.5
+      parent: 12
+  - uid: 26585
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,20.5
+      parent: 12
+  - uid: 26587
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,19.5
+      parent: 12
+  - uid: 26603
+    components:
+    - type: Transform
+      pos: 9.5,25.5
+      parent: 12
+  - uid: 26604
+    components:
+    - type: Transform
+      pos: 9.5,26.5
+      parent: 12
+  - uid: 26605
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,27.5
+      parent: 12
+  - uid: 26608
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,27.5
+      parent: 12
+  - uid: 26612
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,25.5
+      parent: 12
+  - uid: 26613
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,26.5
+      parent: 12
   - uid: 26629
     components:
     - type: Transform
@@ -134737,7 +135111,28 @@ entities:
       pos: 3.5,13.5
       parent: 12
     - type: AtmosPipeColor
-      color: '#947507FF'
+      color: '#FFA500FF'
+  - uid: 26045
+    components:
+    - type: MetaData
+      name: volumetric gas pump to TEG
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-0.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#FFA500FF'
+  - uid: 26556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,18.5
+      parent: 12
+  - uid: 26592
+    components:
+    - type: Transform
+      pos: 12.5,18.5
+      parent: 12
 - proto: Gauze
   entities:
   - uid: 13825
@@ -141877,6 +142272,24 @@ entities:
     - type: Transform
       pos: -40.5,57.5
       parent: 12
+  - uid: 26156
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,22.5
+      parent: 12
+  - uid: 26157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,20.5
+      parent: 12
+  - uid: 26158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,20.5
+      parent: 12
   - uid: 26171
     components:
     - type: Transform
@@ -141990,6 +142403,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-54.5
       parent: 12
+  - uid: 26201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,22.5
+      parent: 12
   - uid: 26229
     components:
     - type: Transform
@@ -144638,6 +145057,12 @@ entities:
     - type: Transform
       pos: -45.5,-19.5
       parent: 12
+  - uid: 26617
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,27.5
+      parent: 12
   - uid: 28293
     components:
     - type: Transform
@@ -146019,11 +146444,6 @@ entities:
       parent: 12
 - proto: LockerElectricalSuppliesFilled
   entities:
-  - uid: 2369
-    components:
-    - type: Transform
-      pos: 33.5,-11.5
-      parent: 12
   - uid: 4523
     components:
     - type: Transform
@@ -146059,6 +146479,11 @@ entities:
     - type: Transform
       pos: 48.5,63.5
       parent: 12
+  - uid: 26159
+    components:
+    - type: Transform
+      pos: 33.5,-12.5
+      parent: 12
   - uid: 32071
     components:
     - type: Transform
@@ -146593,15 +147018,15 @@ entities:
     - type: Transform
       pos: 47.5,53.5
       parent: 12
-  - uid: 27154
+  - uid: 26203
     components:
     - type: Transform
-      pos: -54.5,-17.5
+      pos: 4.5,-14.5
       parent: 12
-  - uid: 28050
+  - uid: 27154
     components:
     - type: Transform
-      pos: 3.5,-23.5
+      pos: -54.5,-17.5
       parent: 12
 - proto: LogicGateOr
   entities:
@@ -148631,6 +149056,33 @@ entities:
     - type: Transform
       pos: 54.333927,24.618994
       parent: 12
+  - uid: 26645
+    components:
+    - type: Transform
+      pos: 58.5,6.5
+      parent: 12
+    - type: Paper
+      content: >-
+        Notes to self:
+
+
+        - [bold]BUILD METEOR DEFENCE FOR TESLA!!![/bold]
+
+        - Don't put tesla coils or grounding rods near the emitters
+
+        - Tesla coils need to be hooked up to HV to generate power, emitters need to be hooked up to MV to work
+
+        - Make sure [bold]ALL[/bold] the emitters and containment field generators are turned on and locked before starting the tesla
+
+        - Turn off the PA after the tesla starts
+
+        - Remember to repair tesla coils and grounding rods using welding fuel
+
+        - Don't put the emitters too close to the tesla, don't put the tesla coils too far from the tesla
+
+        - Make sure the emitters are not shooting at the tesla coils or grounding rods
+
+        - [bold]WEAR INSULATED GLOVES WHEN WORKING ON THE TESLA!!![/bold]
   - uid: 29970
     components:
     - type: Transform
@@ -149077,13 +149529,14 @@ entities:
   - uid: 8435
     components:
     - type: Transform
-      rot: -6.283185307179586 rad
-      pos: 53.5426,-3.492909
+      rot: -43.98229715025713 rad
+      pos: 61.374832,-3.3119311
       parent: 12
   - uid: 8436
     components:
     - type: Transform
-      pos: 61.5,-3.5
+      rot: -43.98229715025713 rad
+      pos: 61.708168,-3.4995613
       parent: 12
   - uid: 16482
     components:
@@ -149748,6 +150201,13 @@ entities:
       rot: -6.283185307179586 rad
       pos: -2.5359287,58.81089
       parent: 12
+- proto: PlushieSpaceLizard
+  entities:
+  - uid: 26670
+    components:
+    - type: Transform
+      pos: -3.4178286,7.476963
+      parent: 12
 - proto: PlushieVox
   entities:
   - uid: 21518
@@ -149881,8 +150341,11 @@ entities:
   - uid: 2465
     components:
     - type: Transform
+      anchored: True
       pos: 8.5,-13.5
       parent: 12
+    - type: Physics
+      bodyType: Static
 - proto: PortableScrubber
   entities:
   - uid: 1760
@@ -154113,6 +154576,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 58.5,-49.5
       parent: 12
+  - uid: 26520
+    components:
+    - type: Transform
+      pos: 33.5,-9.5
+      parent: 12
   - uid: 26560
     components:
     - type: Transform
@@ -154488,11 +154956,6 @@ entities:
     - type: Transform
       pos: 39.5,-19.5
       parent: 12
-  - uid: 7524
-    components:
-    - type: Transform
-      pos: 54.5,-5.5
-      parent: 12
   - uid: 8040
     components:
     - type: Transform
@@ -154981,6 +155444,11 @@ entities:
     - type: Transform
       pos: -34.5,-34.5
       parent: 12
+  - uid: 26007
+    components:
+    - type: Transform
+      pos: 55.5,-5.5
+      parent: 12
   - uid: 26301
     components:
     - type: Transform
@@ -157609,6 +158077,24 @@ entities:
     - type: Transform
       pos: 9.5,19.5
       parent: 12
+  - uid: 26622
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,20.5
+      parent: 12
+  - uid: 26637
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,20.5
+      parent: 12
+  - uid: 26638
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,22.5
+      parent: 12
   - uid: 26639
     components:
     - type: Transform
@@ -157619,6 +158105,12 @@ entities:
     - type: Transform
       pos: 10.5,0.5
       parent: 12
+  - uid: 26642
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,22.5
+      parent: 12
   - uid: 26672
     components:
     - type: Transform
@@ -164012,6 +164504,13 @@ entities:
     - type: Transform
       pos: 49.57303,47.439972
       parent: 12
+- proto: SheetPlasma
+  entities:
+  - uid: 26077
+    components:
+    - type: Transform
+      pos: 39.5,4.5
+      parent: 12
 - proto: SheetPlasma1
   entities:
   - uid: 22020
@@ -164028,14 +164527,6 @@ entities:
     - type: Transform
       pos: -35.41417,-37.542362
       parent: 12
-  - uid: 29092
-    components:
-    - type: Transform
-      rot: -12.566370614359172 rad
-      pos: 39.49274,4.534418
-      parent: 12
-    - type: Stack
-      count: 20
 - proto: SheetPlasteel
   entities:
   - uid: 7311
@@ -164051,8 +164542,14 @@ entities:
   - uid: 23173
     components:
     - type: Transform
-      rot: -6.283185307179586 rad
-      pos: 57.489006,-5.2227006
+      rot: -43.98229715025713 rad
+      pos: 53.468582,-3.3849072
+      parent: 12
+  - uid: 26101
+    components:
+    - type: Transform
+      rot: -43.98229715025713 rad
+      pos: 57.301918,-5.261206
       parent: 12
 - proto: SheetPlastic
   entities:
@@ -164117,7 +164614,8 @@ entities:
   - uid: 8439
     components:
     - type: Transform
-      pos: 61.5,-3.5
+      rot: -43.98229715025713 rad
+      pos: 57.63525,-5.083999
       parent: 12
   - uid: 8898
     components:
@@ -164165,14 +164663,14 @@ entities:
       parent: 12
 - proto: SheetUranium1
   entities:
-  - uid: 11371
+  - uid: 26534
     components:
     - type: Transform
-      rot: -18.84955592153876 rad
-      pos: 9.582282,-13.607407
+      rot: -56.54866776461632 rad
+      pos: 9.501114,-13.461607
       parent: 12
     - type: Stack
-      count: 10
+      count: 15
 - proto: ShelfBar
   entities:
   - uid: 22816
@@ -166249,6 +166747,12 @@ entities:
     - type: Transform
       pos: 30.5,60.5
       parent: 12
+  - uid: 26064
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-10.5
+      parent: 12
   - uid: 28212
     components:
     - type: Transform
@@ -166392,6 +166896,11 @@ entities:
     - type: Transform
       pos: 43.38873,16.572454
       parent: 12
+  - uid: 26524
+    components:
+    - type: Transform
+      pos: 33.465336,-10.465965
+      parent: 12
 - proto: SodaDispenser
   entities:
   - uid: 8983
@@ -170036,11 +170545,6 @@ entities:
       parent: 12
 - proto: SubstationBasic
   entities:
-  - uid: 19
-    components:
-    - type: Transform
-      pos: 33.5,-9.5
-      parent: 12
   - uid: 2121
     components:
     - type: Transform
@@ -170076,6 +170580,11 @@ entities:
     - type: Transform
       pos: -11.5,-19.5
       parent: 12
+  - uid: 4761
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 12
   - uid: 4890
     components:
     - type: Transform
@@ -170512,6 +171021,16 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: AI core
+  - uid: 26204
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI exterior
   - uid: 28804
     components:
     - type: Transform
@@ -170592,39 +171111,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Atmos lockers/engi hallway
-  - uid: 4715
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,1.5
-      parent: 12
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Engi hallway AME
-  - uid: 4761
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,16.5
-      parent: 12
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: TEG East
-  - uid: 6774
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,8.5
-      parent: 12
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Tesla containment
   - uid: 7157
     components:
     - type: Transform
@@ -170711,6 +171197,102 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Engineering entrance
+  - uid: 26102
+    components:
+    - type: Transform
+      pos: 52.5,4.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Break room
+  - uid: 26133
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,1.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Containment entrance
+  - uid: 26139
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,8.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Tesla North
+  - uid: 26533
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,4.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Station anchor
+  - uid: 26535
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,0.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Tesla South
+  - uid: 26549
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-3.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Containment control room
+  - uid: 26551
+    components:
+    - type: Transform
+      pos: 61.5,-3.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Containment airlock
+  - uid: 26553
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,16.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: TEG East
+  - uid: 26646
+    components:
+    - type: Transform
+      pos: 39.5,-2.5
+      parent: 12
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: AME hallway
   - uid: 27001
     components:
     - type: Transform
@@ -175994,10 +176576,10 @@ entities:
       bodyType: Dynamic
 - proto: TeslaGenerator
   entities:
-  - uid: 4988
+  - uid: 26531
     components:
     - type: Transform
-      pos: 60.5,10.5
+      pos: 57.5,10.5
       parent: 12
 - proto: TeslaGroundingRod
   entities:
@@ -176033,6 +176615,22 @@ entities:
       parent: 12
     - type: Physics
       bodyType: Dynamic
+  - uid: 26153
+    components:
+    - type: Transform
+      anchored: False
+      pos: 59.5,10.5
+      parent: 12
+    - type: Physics
+      bodyType: Dynamic
+  - uid: 26530
+    components:
+    - type: Transform
+      anchored: False
+      pos: 60.5,10.5
+      parent: 12
+    - type: Physics
+      bodyType: Dynamic
 - proto: ThermomachineFreezerMachineCircuitBoard
   entities:
   - uid: 11244
@@ -176171,6 +176769,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,54.5
       parent: 12
+  - uid: 26160
+    components:
+    - type: Transform
+      pos: 33.5,-9.5
+      parent: 12
 - proto: ToiletEmpty
   entities:
   - uid: 4220
@@ -176751,6 +177354,11 @@ entities:
       parent: 12
 - proto: TrashBakedBananaPeel
   entities:
+  - uid: 26132
+    components:
+    - type: Transform
+      pos: -1.5,21.5
+      parent: 12
   - uid: 31148
     components:
     - type: Transform
@@ -178005,6 +178613,11 @@ entities:
       parent: 12
 - proto: VendingMachineTankDispenserEngineering
   entities:
+  - uid: 26669
+    components:
+    - type: Transform
+      pos: 11.5,-13.5
+      parent: 12
   - uid: 27384
     components:
     - type: Transform
@@ -178601,12 +179214,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-16.5
       parent: 12
-  - uid: 185
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-16.5
-      parent: 12
   - uid: 186
     components:
     - type: Transform
@@ -179119,11 +179726,6 @@ entities:
     - type: Transform
       pos: -31.5,-33.5
       parent: 12
-  - uid: 683
-    components:
-    - type: Transform
-      pos: 32.5,-11.5
-      parent: 12
   - uid: 685
     components:
     - type: Transform
@@ -180097,27 +180699,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 63.5,-3.5
       parent: 12
-  - uid: 4681
-    components:
-    - type: Transform
-      pos: 10.5,22.5
-      parent: 12
   - uid: 4682
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-1.5
       parent: 12
-  - uid: 4683
-    components:
-    - type: Transform
-      pos: 12.5,20.5
-      parent: 12
-  - uid: 4684
-    components:
-    - type: Transform
-      pos: 10.5,20.5
-      parent: 12
   - uid: 4685
     components:
     - type: Transform
@@ -180358,30 +180945,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-10.5
       parent: 12
-  - uid: 5170
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,-9.5
-      parent: 12
   - uid: 5172
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 34.5,-12.5
       parent: 12
-  - uid: 5175
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,-12.5
-      parent: 12
-  - uid: 5176
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-12.5
-      parent: 12
   - uid: 5189
     components:
     - type: Transform
@@ -182306,11 +182875,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,15.5
       parent: 12
-  - uid: 10655
-    components:
-    - type: Transform
-      pos: 12.5,22.5
-      parent: 12
   - uid: 10669
     components:
     - type: Transform
@@ -186369,6 +186933,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,66.5
       parent: 12
+  - uid: 25870
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 12
+  - uid: 25889
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-14.5
+      parent: 12
   - uid: 25902
     components:
     - type: Transform
@@ -186679,12 +187254,6 @@ entities:
     - type: Transform
       pos: 5.5,-10.5
       parent: 12
-  - uid: 27991
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-15.5
-      parent: 12
   - uid: 28046
     components:
     - type: Transform
@@ -186848,12 +187417,6 @@ entities:
     - type: Transform
       pos: -4.5,7.5
       parent: 12
-  - uid: 28522
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-14.5
-      parent: 12
   - uid: 28527
     components:
     - type: Transform
@@ -188356,6 +188919,18 @@ entities:
     - type: Transform
       pos: -29.5,-22.5
       parent: 12
+  - uid: 681
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-9.5
+      parent: 12
+  - uid: 683
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-11.5
+      parent: 12
   - uid: 686
     components:
     - type: Transform
@@ -195138,6 +195713,18 @@ entities:
     - type: Transform
       pos: -21.5,-9.5
       parent: 12
+  - uid: 26155
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-12.5
+      parent: 12
+  - uid: 26162
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-11.5
+      parent: 12
   - uid: 26184
     components:
     - type: Transform
Форк Space Station 14 с переводами на русский