From 9e767f935acd7758b1b9a2a6d125f2fc7d69d368 Mon Sep 17 00:00:00 2001
From: mersen-tyn <128121177+mersen-tyn@users.noreply.github.com>
Date: Mon, 10 Jun 2024 00:08:20 +0900
Subject: [PATCH] Fix's Zarya and Sunset

---
 .../Shuttles/Expedition/zarya.yml             | 1859 +++++++++--------
 .../Shipyard/Expedition/Sunset.yml            |    2 +-
 .../Shipyard/Expedition/zarya.yml             |    2 +-
 3 files changed, 951 insertions(+), 912 deletions(-)

diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml
index 5cd70a31a44..5c9d1f1702d 100644
--- a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml
+++ b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml
@@ -959,7 +959,8 @@ entities:
             1: 257
             0: 19660
           -3,-5:
-            0: 57344
+            3: 8192
+            0: 49152
             1: 208
           -2,-4:
             0: 65535
@@ -2351,13 +2352,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,10.5
       parent: 2
-- proto: AutolatheMachineCircuitboard
+- proto: Autolathe
   entities:
-  - uid: 689
+  - uid: 993
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.515997,6.4859166
+      pos: -5.5,6.5
       parent: 2
 - proto: BarricadeBlock
   entities:
@@ -3549,6 +3549,16 @@ entities:
     - type: Transform
       pos: 12.5,-15.5
       parent: 2
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: -5.5,1.5
+      parent: 2
+  - uid: 1781
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 2
 - proto: CableApcStack1
   entities:
   - uid: 407
@@ -4919,6 +4929,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,0.5
       parent: 2
+- proto: chem_master
+  entities:
+  - uid: 1012
+    components:
+    - type: Transform
+      pos: -9.5,-16.5
+      parent: 2
 - proto: ChemDispenser
   entities:
   - uid: 1237
@@ -4933,12 +4950,12 @@ entities:
     - type: Transform
       pos: -7.5,-15.5
       parent: 2
-- proto: CircuitImprinterMachineCircuitboard
+- proto: CircuitImprinter
   entities:
-  - uid: 1777
+  - uid: 1776
     components:
     - type: Transform
-      pos: -7.4223404,11.722757
+      pos: -5.5,8.5
       parent: 2
 - proto: ClockworkGrille
   entities:
@@ -5604,7 +5621,7 @@ entities:
       pos: -3.5,-8.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -6732.823
+      secondsUntilStateChange: -7239.0684
       state: Closing
   - uid: 749
     components:
@@ -5625,7 +5642,7 @@ entities:
       pos: 4.5,-6.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -8234.833
+      secondsUntilStateChange: -8741.078
       state: Closing
   - uid: 752
     components:
@@ -7755,6 +7772,13 @@ entities:
       isPlaceable: True
 - proto: Gyroscope
   entities:
+  - uid: 689
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 977
     components:
     - type: Transform
@@ -7769,6 +7793,13 @@ entities:
       parent: 2
     - type: Thruster
       originalPowerLoad: 1500
+  - uid: 1777
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
 - proto: HandHeldMassScanner
   entities:
   - uid: 1070
@@ -7785,6 +7816,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: HypoBrigmedic
+  entities:
+  - uid: 1775
+    components:
+    - type: Transform
+      parent: 1249
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: Jug
   entities:
   - uid: 1239
@@ -7968,13 +8008,6 @@ entities:
     - type: Transform
       pos: -10.5,-13.5
       parent: 2
-- proto: MachineFrame
-  entities:
-  - uid: 1160
-    components:
-    - type: Transform
-      pos: -5.5,6.5
-      parent: 2
 - proto: MachineFrameDestroyed
   entities:
   - uid: 991
@@ -7992,11 +8025,6 @@ entities:
     - type: Transform
       pos: 6.5,-10.5
       parent: 2
-  - uid: 1266
-    components:
-    - type: Transform
-      pos: -9.5,-16.5
-      parent: 2
 - proto: Mattress
   entities:
   - uid: 1001
@@ -8093,6 +8121,73 @@ entities:
     - type: Transform
       pos: 9.497397,11.580221
       parent: 2
+- proto: PlastitaniumWindow
+  entities:
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+  - uid: 1015
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 2
+  - uid: 1016
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 2
+  - uid: 1160
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 2
+  - uid: 1266
+    components:
+    - type: Transform
+      pos: 9.5,-4.5
+      parent: 2
+  - uid: 1646
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 2
+  - uid: 1660
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 2
+  - uid: 1661
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 2
+  - uid: 1662
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 2
+  - uid: 1667
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 2
+  - uid: 1668
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 2
+  - uid: 1669
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 2
 - proto: PlushieDeer
   entities:
   - uid: 1247
@@ -8440,12 +8535,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-4.5
       parent: 2
-- proto: ProtolatheMachineCircuitboard
+- proto: Protolathe
   entities:
-  - uid: 1776
+  - uid: 1013
     components:
     - type: Transform
-      pos: -7.4379654,11.425882
+      pos: -5.5,7.5
       parent: 2
 - proto: Rack
   entities:
@@ -8575,6 +8670,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-10.5
       parent: 2
+- proto: RandomArtifactSpawner20
+  entities:
+  - uid: 1782
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
 - proto: RandomFoodBakedSingle
   entities:
   - uid: 1006
@@ -8822,84 +8924,6 @@ entities:
     - type: Transform
       pos: 6.5,-11.5
       parent: 2
-- proto: ReinforcedUraniumWindow
-  entities:
-  - uid: 1011
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,6.5
-      parent: 2
-  - uid: 1012
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,6.5
-      parent: 2
-  - uid: 1013
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,6.5
-      parent: 2
-  - uid: 1014
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-4.5
-      parent: 2
-  - uid: 1015
-    components:
-    - type: Transform
-      pos: -8.5,-3.5
-      parent: 2
-  - uid: 1016
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-3.5
-      parent: 2
-  - uid: 1017
-    components:
-    - type: Transform
-      pos: -8.5,-4.5
-      parent: 2
-  - uid: 1660
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,9.5
-      parent: 2
-  - uid: 1661
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,9.5
-      parent: 2
-  - uid: 1662
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,9.5
-      parent: 2
-  - uid: 1667
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,13.5
-      parent: 2
-  - uid: 1668
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,13.5
-      parent: 2
-  - uid: 1669
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,13.5
-      parent: 2
 - proto: ResearchAndDevelopmentServer
   entities:
   - uid: 994
@@ -9811,6 +9835,33 @@ entities:
     - type: Transform
       pos: -10.5,-16.5
       parent: 2
+    - type: Lock
+      locked: False
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14923
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1775
 - proto: Table
   entities:
   - uid: 1122
@@ -10200,18 +10251,6 @@ entities:
         - Left: Open
         - Right: Open
         - Middle: Close
-- proto: UnfinishedMachineFrame
-  entities:
-  - uid: 993
-    components:
-    - type: Transform
-      pos: -5.5,8.5
-      parent: 2
-  - uid: 1646
-    components:
-    - type: Transform
-      pos: -5.5,7.5
-      parent: 2
 - proto: VendingMachineBooze
   entities:
   - uid: 1627
@@ -10285,1876 +10324,1876 @@ entities:
     - type: Transform
       pos: 7.5,-10.5
       parent: 2
-- proto: WallPlastitaniumShuttle
+- proto: WallPlastitaniumDiagonal
   entities:
-  - uid: 999
+  - uid: 1564
     components:
     - type: Transform
-      pos: -1.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-6.5
       parent: 2
-  - uid: 1314
+  - uid: 1565
     components:
     - type: Transform
-      pos: -9.5,-5.5
+      rot: 3.141592653589793 rad
+      pos: -6.5,12.5
       parent: 2
-  - uid: 1315
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
-      parent: 2
-  - uid: 1316
+  - uid: 1566
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,2.5
+      pos: -2.5,3.5
       parent: 2
-  - uid: 1317
+  - uid: 1567
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,1.5
+      pos: 3.5,3.5
       parent: 2
-  - uid: 1318
+  - uid: 1568
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-2.5
       parent: 2
-  - uid: 1319
+  - uid: 1569
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-2.5
       parent: 2
-  - uid: 1320
+  - uid: 1570
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 5.5,-2.5
+      pos: 5.5,-4.5
       parent: 2
-  - uid: 1321
+  - uid: 1571
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -1.5,-3.5
+      pos: 2.5,6.5
       parent: 2
-  - uid: 1322
+  - uid: 1572
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
+      pos: -1.5,6.5
       parent: 2
-  - uid: 1323
+  - uid: 1573
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-4.5
       parent: 2
-  - uid: 1324
+  - uid: 1574
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-17.5
       parent: 2
-  - uid: 1325
+  - uid: 1575
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,12.5
       parent: 2
-  - uid: 1326
+  - uid: 1576
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-4.5
       parent: 2
-  - uid: 1327
+  - uid: 1577
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,3.5
+      pos: -4.5,10.5
       parent: 2
-  - uid: 1328
+  - uid: 1578
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,12.5
       parent: 2
-  - uid: 1329
+  - uid: 1579
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,1.5
+      pos: 4.5,-3.5
       parent: 2
-  - uid: 1330
+  - uid: 1580
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -1.5,4.5
+      pos: -3.5,-3.5
       parent: 2
-  - uid: 1331
+  - uid: 1581
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,4.5
       parent: 2
-  - uid: 1332
+  - uid: 1582
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,2.5
+      pos: 5.5,10.5
       parent: 2
-  - uid: 1333
+  - uid: 1583
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,-2.5
+      pos: -3.5,8.5
       parent: 2
-  - uid: 1334
+  - uid: 1584
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,8.5
       parent: 2
-  - uid: 1335
+  - uid: 1585
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,5.5
+      pos: -3.5,14.5
       parent: 2
-  - uid: 1336
+  - uid: 1586
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,4.5
+      pos: -11.5,12.5
       parent: 2
-  - uid: 1337
+  - uid: 1587
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-4.5
+      pos: -6.5,14.5
       parent: 2
-  - uid: 1338
+  - uid: 1588
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-2.5
+      pos: -13.5,4.5
       parent: 2
-  - uid: 1339
+  - uid: 1589
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,-3.5
+      pos: -10.5,8.5
       parent: 2
-  - uid: 1340
+  - uid: 1590
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,-17.5
+      pos: -13.5,-3.5
       parent: 2
-  - uid: 1341
+  - uid: 1591
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
+      pos: -11.5,-11.5
       parent: 2
-  - uid: 1342
+  - uid: 1592
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 2.5,-11.5
+      pos: 5.5,4.5
       parent: 2
-  - uid: 1343
+  - uid: 1593
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-1.5
+      pos: -8.5,13.5
       parent: 2
-  - uid: 1344
+  - uid: 1594
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,-1.5
-      parent: 2
-  - uid: 1345
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-4.5
+      pos: -11.5,-9.5
       parent: 2
-  - uid: 1346
+  - uid: 1595
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-16.5
       parent: 2
-  - uid: 1347
+  - uid: 1596
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,1.5
+      pos: -12.5,-13.5
       parent: 2
-  - uid: 1348
+  - uid: 1597
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,-0.5
+      pos: -11.5,-18.5
       parent: 2
-  - uid: 1349
+  - uid: 1598
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-18.5
       parent: 2
-  - uid: 1350
+  - uid: 1599
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,4.5
       parent: 2
-  - uid: 1351
+  - uid: 1600
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,8.5
       parent: 2
-  - uid: 1352
+  - uid: 1601
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 12.5,12.5
       parent: 2
-  - uid: 1353
+  - uid: 1602
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,5.5
+      pos: 5.5,12.5
       parent: 2
-  - uid: 1354
+  - uid: 1603
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-8.5
       parent: 2
-  - uid: 1355
+  - uid: 1604
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-9.5
       parent: 2
-  - uid: 1356
+  - uid: 1605
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-18.5
       parent: 2
-  - uid: 1357
+  - uid: 1606
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-17.5
       parent: 2
-  - uid: 1358
+  - uid: 1607
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,9.5
+      pos: 12.5,-18.5
       parent: 2
-  - uid: 1359
+  - uid: 1608
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-13.5
       parent: 2
-  - uid: 1360
+  - uid: 1609
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-11.5
       parent: 2
-  - uid: 1361
+  - uid: 1610
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -5.5,14.5
+      pos: 13.5,-16.5
       parent: 2
-  - uid: 1362
+  - uid: 1611
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -5.5,13.5
+      pos: 12.5,-9.5
       parent: 2
-  - uid: 1363
+  - uid: 1612
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,10.5
+      pos: 4.5,14.5
       parent: 2
-  - uid: 1364
+  - uid: 1613
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -8.5,12.5
+      pos: 14.5,-3.5
       parent: 2
-  - uid: 1365
+  - uid: 1614
     components:
     - type: Transform
-      pos: -10.5,11.5
+      rot: 3.141592653589793 rad
+      pos: 13.5,-6.5
       parent: 2
-  - uid: 1366
+  - uid: 1615
     components:
     - type: Transform
-      pos: -9.5,11.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,14.5
       parent: 2
-  - uid: 1367
+  - uid: 1616
     components:
     - type: Transform
-      pos: -10.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 9.5,13.5
       parent: 2
-  - uid: 1368
+  - uid: 1617
     components:
     - type: Transform
-      pos: -9.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-4.5
       parent: 2
-  - uid: 1369
+  - uid: 1618
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,14.5
+      pos: 7.5,-8.5
       parent: 2
-  - uid: 1370
+  - uid: 1619
     components:
     - type: Transform
-      pos: -11.5,8.5
+      pos: 4.5,-9.5
       parent: 2
-  - uid: 1371
+  - uid: 1620
     components:
     - type: Transform
-      pos: -12.5,6.5
+      pos: -12.5,8.5
       parent: 2
-  - uid: 1372
+  - uid: 1621
     components:
     - type: Transform
-      pos: -12.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,8.5
       parent: 2
-  - uid: 1373
+  - uid: 1622
     components:
     - type: Transform
-      pos: -12.5,5.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,1.5
       parent: 2
-  - uid: 1374
+  - uid: 1623
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-0.5
       parent: 2
-  - uid: 1375
+  - uid: 1624
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,1.5
       parent: 2
-  - uid: 1376
+  - uid: 1625
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,3.5
+      pos: 2.5,-0.5
       parent: 2
-  - uid: 1377
+  - uid: 1659
     components:
     - type: Transform
-      pos: -12.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,13.5
       parent: 2
-  - uid: 1378
+  - uid: 1663
     components:
     - type: Transform
-      pos: -11.5,-5.5
+      pos: -1.5,13.5
       parent: 2
-  - uid: 1379
+  - uid: 1666
     components:
     - type: Transform
-      pos: -8.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,9.5
       parent: 2
-  - uid: 1380
+  - uid: 1670
     components:
     - type: Transform
-      pos: -9.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,9.5
       parent: 2
-  - uid: 1381
+- proto: WallPlastitaniumShuttle
+  entities:
+  - uid: 999
     components:
     - type: Transform
-      pos: -10.5,-2.5
+      pos: -1.5,12.5
       parent: 2
-  - uid: 1382
+  - uid: 1314
     components:
     - type: Transform
-      pos: -11.5,-2.5
+      pos: -9.5,-5.5
       parent: 2
-  - uid: 1383
+  - uid: 1315
     components:
     - type: Transform
-      pos: -13.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
       parent: 2
-  - uid: 1384
+  - uid: 1316
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,2.5
       parent: 2
-  - uid: 1385
+  - uid: 1317
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,1.5
       parent: 2
-  - uid: 1386
+  - uid: 1318
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 2
-  - uid: 1387
+  - uid: 1319
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
       parent: 2
-  - uid: 1388
+  - uid: 1320
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,6.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-2.5
       parent: 2
-  - uid: 1389
+  - uid: 1321
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-3.5
       parent: 2
-  - uid: 1390
+  - uid: 1322
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,3.5
       parent: 2
-  - uid: 1391
+  - uid: 1323
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
       parent: 2
-  - uid: 1392
+  - uid: 1324
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
       parent: 2
-  - uid: 1393
+  - uid: 1325
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-0.5
       parent: 2
-  - uid: 1394
+  - uid: 1326
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 2
-  - uid: 1395
+  - uid: 1327
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,3.5
       parent: 2
-  - uid: 1396
+  - uid: 1328
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,5.5
       parent: 2
-  - uid: 1397
+  - uid: 1329
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
       parent: 2
-  - uid: 1398
+  - uid: 1330
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,4.5
       parent: 2
-  - uid: 1399
+  - uid: 1331
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
       parent: 2
-  - uid: 1400
+  - uid: 1332
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
       parent: 2
-  - uid: 1401
+  - uid: 1333
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,8.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,-2.5
       parent: 2
-  - uid: 1402
+  - uid: 1334
     components:
     - type: Transform
-      pos: 6.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
       parent: 2
-  - uid: 1403
+  - uid: 1335
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
       parent: 2
-  - uid: 1404
+  - uid: 1336
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
       parent: 2
-  - uid: 1405
+  - uid: 1337
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -6.5,13.5
+      pos: 4.5,-4.5
       parent: 2
-  - uid: 1406
+  - uid: 1338
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -7.5,13.5
+      pos: -6.5,-2.5
       parent: 2
-  - uid: 1407
+  - uid: 1339
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -7.5,12.5
+      pos: -4.5,-3.5
       parent: 2
-  - uid: 1408
+  - uid: 1340
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,-9.5
+      pos: -4.5,-17.5
       parent: 2
-  - uid: 1409
+  - uid: 1341
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-10.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-3.5
       parent: 2
-  - uid: 1410
+  - uid: 1342
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-11.5
+      pos: 2.5,-11.5
       parent: 2
-  - uid: 1411
+  - uid: 1343
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-12.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-1.5
       parent: 2
-  - uid: 1412
+  - uid: 1344
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,-11.5
+      pos: 6.5,-1.5
       parent: 2
-  - uid: 1413
+  - uid: 1345
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,-4.5
       parent: 2
-  - uid: 1414
+  - uid: 1346
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-0.5
       parent: 2
-  - uid: 1415
+  - uid: 1347
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,1.5
       parent: 2
-  - uid: 1416
+  - uid: 1348
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -5.5,-17.5
+      pos: 6.5,-0.5
       parent: 2
-  - uid: 1417
+  - uid: 1349
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -6.5,-17.5
+      pos: 6.5,1.5
       parent: 2
-  - uid: 1418
+  - uid: 1350
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-17.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,2.5
       parent: 2
-  - uid: 1419
+  - uid: 1351
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-17.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,5.5
       parent: 2
-  - uid: 1420
+  - uid: 1352
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-17.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,4.5
       parent: 2
-  - uid: 1421
+  - uid: 1353
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,9.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,5.5
       parent: 2
-  - uid: 1422
+  - uid: 1354
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,12.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,3.5
       parent: 2
-  - uid: 1423
+  - uid: 1355
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,6.5
       parent: 2
-  - uid: 1424
+  - uid: 1356
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -3.5,13.5
+      pos: -4.5,7.5
       parent: 2
-  - uid: 1425
+  - uid: 1357
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,8.5
       parent: 2
-  - uid: 1426
+  - uid: 1358
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,9.5
       parent: 2
-  - uid: 1427
+  - uid: 1359
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,9.5
       parent: 2
-  - uid: 1428
+  - uid: 1360
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,10.5
       parent: 2
-  - uid: 1429
+  - uid: 1361
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,14.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,14.5
       parent: 2
-  - uid: 1430
+  - uid: 1362
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,14.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,13.5
       parent: 2
-  - uid: 1431
+  - uid: 1363
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -7.5,-9.5
+      pos: 4.5,10.5
       parent: 2
-  - uid: 1432
+  - uid: 1364
     components:
     - type: Transform
-      pos: -12.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -8.5,12.5
       parent: 2
-  - uid: 1433
+  - uid: 1365
     components:
     - type: Transform
-      pos: -8.5,-5.5
+      pos: -10.5,11.5
       parent: 2
-  - uid: 1434
+  - uid: 1366
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,3.5
+      pos: -9.5,11.5
       parent: 2
-  - uid: 1435
+  - uid: 1367
     components:
     - type: Transform
-      pos: -11.5,6.5
+      pos: -10.5,12.5
       parent: 2
-  - uid: 1436
+  - uid: 1368
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-10.5
+      pos: -9.5,12.5
       parent: 2
-  - uid: 1437
+  - uid: 1369
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-11.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,14.5
       parent: 2
-  - uid: 1438
+  - uid: 1370
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-13.5
+      pos: -11.5,8.5
       parent: 2
-  - uid: 1439
+  - uid: 1371
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-14.5
+      pos: -12.5,6.5
       parent: 2
-  - uid: 1440
+  - uid: 1372
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-16.5
+      pos: -12.5,7.5
       parent: 2
-  - uid: 1441
+  - uid: 1373
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-17.5
+      pos: -12.5,5.5
       parent: 2
-  - uid: 1442
+  - uid: 1374
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: -8.5,3.5
       parent: 2
-  - uid: 1443
+  - uid: 1375
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-17.5
+      rot: 3.141592653589793 rad
+      pos: -10.5,3.5
       parent: 2
-  - uid: 1444
+  - uid: 1376
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-11.5
+      rot: 3.141592653589793 rad
+      pos: -11.5,3.5
       parent: 2
-  - uid: 1445
+  - uid: 1377
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-7.5
+      pos: -12.5,-1.5
       parent: 2
-  - uid: 1446
+  - uid: 1378
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-8.5
+      pos: -11.5,-5.5
       parent: 2
-  - uid: 1447
+  - uid: 1379
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-8.5
+      pos: -8.5,-2.5
       parent: 2
-  - uid: 1448
+  - uid: 1380
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-10.5
+      pos: -9.5,-2.5
       parent: 2
-  - uid: 1449
+  - uid: 1381
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-11.5
+      pos: -10.5,-2.5
       parent: 2
-  - uid: 1450
+  - uid: 1382
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-12.5
+      pos: -11.5,-2.5
       parent: 2
-  - uid: 1451
+  - uid: 1383
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-11.5
+      pos: -13.5,-2.5
       parent: 2
-  - uid: 1452
+  - uid: 1384
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -10.5,-9.5
+      pos: -8.5,-8.5
       parent: 2
-  - uid: 1453
+  - uid: 1385
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -10.5,-12.5
+      pos: -7.5,-8.5
       parent: 2
-  - uid: 1454
+  - uid: 1386
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -11.5,-17.5
+      pos: -6.5,-9.5
       parent: 2
-  - uid: 1455
+  - uid: 1387
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-15.5
+      pos: -5.5,-9.5
       parent: 2
-  - uid: 1456
+  - uid: 1388
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,-18.5
+      pos: 5.5,6.5
       parent: 2
-  - uid: 1457
+  - uid: 1389
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 9.5,-17.5
+      pos: 6.5,2.5
       parent: 2
-  - uid: 1458
+  - uid: 1390
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 10.5,-17.5
+      pos: 5.5,7.5
       parent: 2
-  - uid: 1459
+  - uid: 1391
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 4.5,-16.5
+      pos: 5.5,9.5
       parent: 2
-  - uid: 1460
+  - uid: 1392
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,-17.5
+      pos: 6.5,3.5
       parent: 2
-  - uid: 1461
+  - uid: 1393
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,-17.5
+      pos: 6.5,4.5
       parent: 2
-  - uid: 1462
+  - uid: 1394
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,-17.5
+      pos: 5.5,5.5
       parent: 2
-  - uid: 1463
+  - uid: 1395
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 8.5,-17.5
+      pos: -11.5,-15.5
       parent: 2
-  - uid: 1464
+  - uid: 1396
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,-18.5
+      pos: 3.5,-16.5
       parent: 2
-  - uid: 1465
+  - uid: 1397
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,-17.5
+      pos: 4.5,-17.5
       parent: 2
-  - uid: 1466
+  - uid: 1398
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-17.5
+      pos: 3.5,-14.5
       parent: 2
-  - uid: 1467
+  - uid: 1399
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-16.5
+      pos: 3.5,-13.5
       parent: 2
-  - uid: 1468
+  - uid: 1400
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-14.5
+      pos: 3.5,-12.5
       parent: 2
-  - uid: 1469
+  - uid: 1401
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-15.5
+      pos: 5.5,8.5
       parent: 2
-  - uid: 1470
+  - uid: 1402
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-13.5
+      pos: 6.5,5.5
       parent: 2
-  - uid: 1471
+  - uid: 1403
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-12.5
+      pos: -11.5,-14.5
       parent: 2
-  - uid: 1472
+  - uid: 1404
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-11.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,13.5
       parent: 2
-  - uid: 1473
+  - uid: 1405
     components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-12.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,13.5
       parent: 2
-  - uid: 1474
+  - uid: 1406
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,13.5
       parent: 2
-  - uid: 1475
+  - uid: 1407
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-10.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,12.5
       parent: 2
-  - uid: 1476
+  - uid: 1408
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,-10.5
+      pos: -4.5,-9.5
       parent: 2
-  - uid: 1477
+  - uid: 1409
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,-9.5
+      pos: -3.5,-10.5
       parent: 2
-  - uid: 1478
+  - uid: 1410
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,-9.5
+      pos: -3.5,-11.5
       parent: 2
-  - uid: 1479
+  - uid: 1411
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 8.5,-9.5
+      pos: -2.5,-12.5
       parent: 2
-  - uid: 1480
+  - uid: 1412
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 9.5,-8.5
+      pos: -2.5,-11.5
       parent: 2
-  - uid: 1481
+  - uid: 1413
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 8.5,-8.5
+      pos: -2.5,-15.5
       parent: 2
-  - uid: 1482
+  - uid: 1414
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,-8.5
+      pos: -1.5,-15.5
       parent: 2
-  - uid: 1483
+  - uid: 1415
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,-9.5
+      pos: -6.5,-18.5
       parent: 2
-  - uid: 1484
+  - uid: 1416
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,-10.5
+      pos: -5.5,-17.5
       parent: 2
-  - uid: 1485
+  - uid: 1417
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-8.5
+      pos: -6.5,-17.5
       parent: 2
-  - uid: 1486
+  - uid: 1418
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,-9.5
+      pos: -8.5,-17.5
       parent: 2
-  - uid: 1487
+  - uid: 1419
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -11.5,-16.5
+      pos: -9.5,-17.5
       parent: 2
-  - uid: 1488
+  - uid: 1420
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-7.5
+      pos: -10.5,-17.5
       parent: 2
-  - uid: 1489
+  - uid: 1421
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-6.5
+      pos: 4.5,9.5
       parent: 2
-  - uid: 1490
+  - uid: 1422
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-5.5
+      pos: 4.5,12.5
       parent: 2
-  - uid: 1491
+  - uid: 1423
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,-4.5
+      pos: 4.5,13.5
       parent: 2
-  - uid: 1492
+  - uid: 1424
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,13.5
       parent: 2
-  - uid: 1493
+  - uid: 1425
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,-2.5
+      pos: 5.5,13.5
       parent: 2
-  - uid: 1494
+  - uid: 1426
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 14.5,-1.5
+      pos: 6.5,13.5
       parent: 2
-  - uid: 1495
+  - uid: 1427
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,2.5
+      pos: 7.5,13.5
       parent: 2
-  - uid: 1496
+  - uid: 1428
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,0.5
+      pos: 8.5,13.5
       parent: 2
-  - uid: 1497
+  - uid: 1429
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 14.5,2.5
+      pos: 6.5,14.5
       parent: 2
-  - uid: 1498
+  - uid: 1430
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 14.5,0.5
+      pos: 5.5,14.5
       parent: 2
-  - uid: 1499
+  - uid: 1431
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,3.5
+      pos: -7.5,-9.5
       parent: 2
-  - uid: 1500
+  - uid: 1432
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,4.5
+      pos: -12.5,-2.5
       parent: 2
-  - uid: 1501
+  - uid: 1433
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,5.5
+      pos: -8.5,-5.5
       parent: 2
-  - uid: 1502
+  - uid: 1434
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,7.5
+      rot: 3.141592653589793 rad
+      pos: -9.5,3.5
       parent: 2
-  - uid: 1503
+  - uid: 1435
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,8.5
+      pos: -11.5,6.5
       parent: 2
-  - uid: 1504
+  - uid: 1436
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,3.5
+      pos: -4.5,-10.5
       parent: 2
-  - uid: 1505
+  - uid: 1437
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,-5.5
+      pos: -1.5,-11.5
       parent: 2
-  - uid: 1506
+  - uid: 1438
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 14.5,-2.5
+      pos: -2.5,-13.5
       parent: 2
-  - uid: 1507
+  - uid: 1439
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 14.5,3.5
+      pos: -2.5,-14.5
       parent: 2
-  - uid: 1508
+  - uid: 1440
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,6.5
+      pos: -2.5,-16.5
       parent: 2
-  - uid: 1509
+  - uid: 1441
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,7.5
+      pos: -3.5,-17.5
       parent: 2
-  - uid: 1510
+  - uid: 1442
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,11.5
+      pos: -3.5,-16.5
       parent: 2
-  - uid: 1511
+  - uid: 1443
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,11.5
+      pos: -7.5,-17.5
       parent: 2
-  - uid: 1512
+  - uid: 1444
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,12.5
+      pos: 3.5,-11.5
       parent: 2
-  - uid: 1513
+  - uid: 1445
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 10.5,12.5
+      pos: -11.5,-7.5
       parent: 2
-  - uid: 1514
+  - uid: 1446
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 9.5,12.5
+      pos: -11.5,-8.5
       parent: 2
-  - uid: 1515
+  - uid: 1447
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-8.5
       parent: 2
-  - uid: 1516
+  - uid: 1448
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-10.5
       parent: 2
-  - uid: 1517
+  - uid: 1449
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 9.5,-2.5
+      pos: -10.5,-11.5
       parent: 2
-  - uid: 1518
+  - uid: 1450
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-12.5
       parent: 2
-  - uid: 1519
+  - uid: 1451
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,-1.5
+      pos: 4.5,-11.5
       parent: 2
-  - uid: 1520
+  - uid: 1452
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-9.5
       parent: 2
-  - uid: 1521
+  - uid: 1453
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,0.5
+      pos: -10.5,-12.5
       parent: 2
-  - uid: 1522
+  - uid: 1454
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 10.5,3.5
+      pos: -11.5,-17.5
       parent: 2
-  - uid: 1523
+  - uid: 1455
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,3.5
+      pos: 3.5,-15.5
       parent: 2
-  - uid: 1524
+  - uid: 1456
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,3.5
+      pos: 7.5,-18.5
       parent: 2
-  - uid: 1525
+  - uid: 1457
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-2.5
+      pos: 9.5,-17.5
       parent: 2
-  - uid: 1526
+  - uid: 1458
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,-2.5
+      pos: 10.5,-17.5
       parent: 2
-  - uid: 1527
+  - uid: 1459
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 9.5,3.5
+      pos: 4.5,-16.5
       parent: 2
-  - uid: 1528
+  - uid: 1460
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-17.5
       parent: 2
-  - uid: 1529
+  - uid: 1461
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 10.5,-2.5
+      pos: 6.5,-17.5
       parent: 2
-  - uid: 1530
+  - uid: 1462
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,-2.5
+      pos: 7.5,-17.5
       parent: 2
-  - uid: 1531
+  - uid: 1463
     components:
     - type: Transform
-      pos: -12.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-17.5
       parent: 2
-  - uid: 1532
+  - uid: 1464
     components:
     - type: Transform
-      pos: -13.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-18.5
       parent: 2
-  - uid: 1533
+  - uid: 1465
     components:
     - type: Transform
-      pos: -12.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-17.5
       parent: 2
-  - uid: 1534
+  - uid: 1466
     components:
     - type: Transform
-      pos: -11.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-17.5
       parent: 2
-  - uid: 1535
+  - uid: 1467
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
       parent: 2
-  - uid: 1536
+  - uid: 1468
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-14.5
       parent: 2
-  - uid: 1537
+  - uid: 1469
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.5,2.5
+      pos: 12.5,-15.5
       parent: 2
-  - uid: 1538
+  - uid: 1470
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,-1.5
+      pos: 12.5,-13.5
       parent: 2
-  - uid: 1539
+  - uid: 1471
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 2.5,-15.5
+      pos: 12.5,-12.5
       parent: 2
-  - uid: 1540
+  - uid: 1472
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-11.5
       parent: 2
-  - uid: 1541
+  - uid: 1473
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 9.5,-5.5
+      pos: 11.5,-12.5
       parent: 2
-  - uid: 1542
+  - uid: 1474
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 10.5,-5.5
+      pos: -11.5,-13.5
       parent: 2
-  - uid: 1543
+  - uid: 1475
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-10.5
       parent: 2
-  - uid: 1544
+  - uid: 1476
     components:
     - type: Transform
-      pos: -12.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-10.5
       parent: 2
-  - uid: 1545
+  - uid: 1477
     components:
     - type: Transform
-      pos: -11.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-9.5
       parent: 2
-  - uid: 1546
+  - uid: 1478
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-9.5
       parent: 2
-  - uid: 1547
+  - uid: 1479
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -10.5,-18.5
+      pos: 8.5,-9.5
       parent: 2
-  - uid: 1548
+  - uid: 1480
     components:
     - type: Transform
-      pos: -12.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-8.5
       parent: 2
-  - uid: 1549
+  - uid: 1481
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,-2.5
+      pos: 8.5,-8.5
       parent: 2
-  - uid: 1550
+  - uid: 1482
     components:
     - type: Transform
-      pos: -11.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-8.5
       parent: 2
-  - uid: 1551
+  - uid: 1483
     components:
     - type: Transform
-      pos: -13.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-9.5
       parent: 2
-  - uid: 1552
+  - uid: 1484
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-10.5
       parent: 2
-  - uid: 1553
+  - uid: 1485
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-8.5
       parent: 2
-  - uid: 1554
+  - uid: 1486
     components:
     - type: Transform
-      pos: -10.5,9.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-9.5
       parent: 2
-  - uid: 1555
+  - uid: 1487
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,10.5
+      pos: -11.5,-16.5
       parent: 2
-  - uid: 1556
+  - uid: 1488
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 8.5,12.5
+      pos: 12.5,-7.5
       parent: 2
-  - uid: 1557
+  - uid: 1489
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 10.5,11.5
+      pos: 12.5,-6.5
       parent: 2
-  - uid: 1558
+  - uid: 1490
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,9.5
+      pos: 12.5,-5.5
       parent: 2
-  - uid: 1559
+  - uid: 1491
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 12.5,6.5
+      pos: 13.5,-4.5
       parent: 2
-  - uid: 1560
+  - uid: 1492
     components:
     - type: Transform
-      pos: -10.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-3.5
       parent: 2
-  - uid: 1561
+  - uid: 1493
     components:
     - type: Transform
-      pos: -11.5,11.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-2.5
       parent: 2
-  - uid: 1562
+  - uid: 1494
     components:
     - type: Transform
-      pos: -11.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-1.5
       parent: 2
-  - uid: 1563
+  - uid: 1495
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,2.5
       parent: 2
-  - uid: 1664
+  - uid: 1496
     components:
     - type: Transform
-      pos: 2.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,0.5
       parent: 2
-  - uid: 1665
+  - uid: 1497
     components:
     - type: Transform
-      pos: -1.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,2.5
       parent: 2
-  - uid: 1671
+  - uid: 1498
     components:
     - type: Transform
-      pos: 2.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,0.5
       parent: 2
-- proto: WallPlastitaniumDiagonal
-  entities:
-  - uid: 1564
+  - uid: 1499
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -12.5,-6.5
+      pos: 13.5,3.5
       parent: 2
-  - uid: 1565
+  - uid: 1500
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,4.5
       parent: 2
-  - uid: 1566
+  - uid: 1501
     components:
     - type: Transform
-      pos: -2.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,5.5
       parent: 2
-  - uid: 1567
+  - uid: 1502
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,7.5
       parent: 2
-  - uid: 1568
+  - uid: 1503
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,-2.5
+      pos: 12.5,8.5
       parent: 2
-  - uid: 1569
+  - uid: 1504
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,3.5
       parent: 2
-  - uid: 1570
+  - uid: 1505
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-5.5
       parent: 2
-  - uid: 1571
+  - uid: 1506
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-2.5
       parent: 2
-  - uid: 1572
+  - uid: 1507
     components:
     - type: Transform
-      pos: -1.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 14.5,3.5
       parent: 2
-  - uid: 1573
+  - uid: 1508
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,6.5
       parent: 2
-  - uid: 1574
+  - uid: 1509
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-17.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,7.5
       parent: 2
-  - uid: 1575
+  - uid: 1510
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,12.5
+      pos: 12.5,11.5
       parent: 2
-  - uid: 1576
+  - uid: 1511
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 2.5,-4.5
+      pos: 11.5,11.5
       parent: 2
-  - uid: 1577
+  - uid: 1512
     components:
     - type: Transform
-      pos: -4.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,12.5
       parent: 2
-  - uid: 1578
+  - uid: 1513
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,12.5
+      pos: 10.5,12.5
       parent: 2
-  - uid: 1579
+  - uid: 1514
     components:
     - type: Transform
-      pos: 4.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,12.5
       parent: 2
-  - uid: 1580
+  - uid: 1515
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,2.5
       parent: 2
-  - uid: 1581
+  - uid: 1516
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,4.5
+      pos: -12.5,2.5
       parent: 2
-  - uid: 1582
+  - uid: 1517
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-2.5
       parent: 2
-  - uid: 1583
+  - uid: 1518
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -3.5,8.5
+      pos: -12.5,3.5
       parent: 2
-  - uid: 1584
+  - uid: 1519
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 4.5,8.5
+      pos: 13.5,-1.5
       parent: 2
-  - uid: 1585
+  - uid: 1520
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,14.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-4.5
       parent: 2
-  - uid: 1586
+  - uid: 1521
     components:
     - type: Transform
-      pos: -11.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,0.5
       parent: 2
-  - uid: 1587
+  - uid: 1522
     components:
     - type: Transform
-      pos: -6.5,14.5
+      rot: 1.5707963267948966 rad
+      pos: 10.5,3.5
       parent: 2
-  - uid: 1588
+  - uid: 1523
     components:
     - type: Transform
-      pos: -13.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,3.5
       parent: 2
-  - uid: 1589
+  - uid: 1524
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,3.5
       parent: 2
-  - uid: 1590
+  - uid: 1525
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -13.5,-3.5
+      pos: 12.5,-2.5
       parent: 2
-  - uid: 1591
+  - uid: 1526
     components:
     - type: Transform
-      pos: -11.5,-11.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-2.5
       parent: 2
-  - uid: 1592
+  - uid: 1527
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5,4.5
+      pos: 9.5,3.5
       parent: 2
-  - uid: 1593
+  - uid: 1528
     components:
     - type: Transform
-      pos: -8.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-4.5
       parent: 2
-  - uid: 1594
+  - uid: 1529
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -11.5,-9.5
+      pos: 10.5,-2.5
       parent: 2
-  - uid: 1595
+  - uid: 1530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -12.5,-16.5
+      pos: 6.5,-2.5
       parent: 2
-  - uid: 1596
+  - uid: 1531
     components:
     - type: Transform
-      pos: -12.5,-13.5
+      pos: -12.5,-3.5
       parent: 2
-  - uid: 1597
+  - uid: 1532
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-18.5
+      pos: -13.5,0.5
       parent: 2
-  - uid: 1598
+  - uid: 1533
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-18.5
+      pos: -12.5,0.5
       parent: 2
-  - uid: 1599
+  - uid: 1534
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,4.5
+      pos: -11.5,0.5
       parent: 2
-  - uid: 1600
+  - uid: 1535
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,8.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-2.5
       parent: 2
-  - uid: 1601
+  - uid: 1536
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,12.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,4.5
       parent: 2
-  - uid: 1602
+  - uid: 1537
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,2.5
       parent: 2
-  - uid: 1603
+  - uid: 1538
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-1.5
       parent: 2
-  - uid: 1604
+  - uid: 1539
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-15.5
       parent: 2
-  - uid: 1605
+  - uid: 1540
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,2.5
+      parent: 2
+  - uid: 1541
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,-18.5
+      pos: 9.5,-5.5
       parent: 2
-  - uid: 1606
+  - uid: 1542
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-17.5
+      pos: 10.5,-5.5
       parent: 2
-  - uid: 1607
+  - uid: 1543
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 12.5,-18.5
+      pos: -6.5,3.5
       parent: 2
-  - uid: 1608
+  - uid: 1544
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-13.5
+      pos: -12.5,-5.5
       parent: 2
-  - uid: 1609
+  - uid: 1545
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-11.5
+      pos: -11.5,-6.5
       parent: 2
-  - uid: 1610
+  - uid: 1546
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 13.5,-16.5
+      pos: -13.5,3.5
       parent: 2
-  - uid: 1611
+  - uid: 1547
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-18.5
       parent: 2
-  - uid: 1612
+  - uid: 1548
     components:
     - type: Transform
-      pos: 4.5,14.5
+      pos: -12.5,-4.5
       parent: 2
-  - uid: 1613
+  - uid: 1549
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-2.5
       parent: 2
-  - uid: 1614
+  - uid: 1550
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-6.5
+      pos: -11.5,-1.5
       parent: 2
-  - uid: 1615
+  - uid: 1551
+    components:
+    - type: Transform
+      pos: -13.5,-1.5
+      parent: 2
+  - uid: 1552
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 7.5,14.5
+      pos: 2.5,-1.5
       parent: 2
-  - uid: 1616
+  - uid: 1553
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 9.5,13.5
+      pos: -1.5,-1.5
       parent: 2
-  - uid: 1617
+  - uid: 1554
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-4.5
+      pos: -10.5,9.5
       parent: 2
-  - uid: 1618
+  - uid: 1555
     components:
     - type: Transform
-      pos: 7.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 11.5,10.5
       parent: 2
-  - uid: 1619
+  - uid: 1556
     components:
     - type: Transform
-      pos: 4.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,12.5
       parent: 2
-  - uid: 1620
+  - uid: 1557
     components:
     - type: Transform
-      pos: -12.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 10.5,11.5
       parent: 2
-  - uid: 1621
+  - uid: 1558
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,8.5
+      pos: 11.5,9.5
       parent: 2
-  - uid: 1622
+  - uid: 1559
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,6.5
       parent: 2
-  - uid: 1623
+  - uid: 1560
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-0.5
+      pos: -10.5,10.5
       parent: 2
-  - uid: 1624
+  - uid: 1561
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,1.5
+      pos: -11.5,11.5
       parent: 2
-  - uid: 1625
+  - uid: 1562
     components:
     - type: Transform
-      pos: 2.5,-0.5
+      pos: -11.5,7.5
       parent: 2
-  - uid: 1659
+  - uid: 1563
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,12.5
       parent: 2
-  - uid: 1663
+  - uid: 1664
     components:
     - type: Transform
-      pos: -1.5,13.5
+      pos: 2.5,12.5
       parent: 2
-  - uid: 1666
+  - uid: 1665
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,9.5
+      pos: -1.5,10.5
       parent: 2
-  - uid: 1670
+  - uid: 1671
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,9.5
+      pos: 2.5,10.5
       parent: 2
 - proto: WallWeaponCapacitorRecharger
   entities:
diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/Sunset.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/Sunset.yml
index 073ddbf4450..6a2a592f0a1 100644
--- a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/Sunset.yml
+++ b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/Sunset.yml
@@ -2,7 +2,7 @@
   id: Sunset
   name: NLE Закат
   description: Крупногабаритный экспедиционный шаттл, ранее был использовался для выполнения разведывательных задач. Рекомендуемый состав команды 3-8 человек.
-  price: 135000 # 33% tax
+  price: 145000 # 33% tax
   category: Large
   group: Expedition
   shuttlePath: /Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml
diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml
index d26e519d47f..728d65ef897 100644
--- a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml
+++ b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml
@@ -2,7 +2,7 @@
   id: Zarya
   name: VMF Заря # Vitezstvi Military Force
   description: Штурмовое судно Zarya, произведено частной военно-производственной компаний Vitezstvi. Рекомендуемый состав команды 3-8 человек.
-  price: 145000 # 33% tax
+  price: 140000 # 33% tax
   category: Large
   group: Expedition
   shuttlePath: /Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml