[Maps] ERT&Salvage shuttle update (space-syndicate#2789)

SS14RU · Dec 5, 2024 · c271333 · c271333
1 parent 93acdf6
commit c271333
Show file tree

Hide file tree

Showing 2 changed files with 1,832 additions and 1,308 deletions.
diff --git a/Resources/Maps/Shuttles/corvax_mining.yml b/Resources/Maps/Shuttles/corvax_mining.yml
@@ -16,7 +16,6 @@ entities:
       name: NT-SAL "Блоха"
     - type: Transform
       pos: -0.52229434,-0.43310228
-      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -147,7 +146,8 @@ entities:
       parent: 1
     - type: ContainerFill
       containers:
-        board: [ DoorElectronicsSalvage ]
+        board:
+        - DoorElectronicsSalvage
 - proto: APCBasic
   entities:
   - uid: 6
@@ -281,6 +281,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,0.5
       parent: 1
+- proto: ClosetWallMixed
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
 - proto: ComputerShuttleSalvage
   entities:
   - uid: 16
@@ -361,56 +368,6 @@ entities:
       parent: 1
     - type: Thruster
       thrust: 150
-- proto: MiningWindow
-  entities:
-  - uid: 64
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 1
-  - uid: 65
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-  - uid: 67
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      pos: -0.5,3.5
-      parent: 1
-  - uid: 69
-    components:
-    - type: Transform
-      pos: 0.5,4.5
-      parent: 1
-  - uid: 70
-    components:
-    - type: Transform
-      pos: 1.5,3.5
-      parent: 1
-- proto: MiningWindowDiagonal
-  entities:
-  - uid: 71
-    components:
-    - type: Transform
-      pos: -0.5,4.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,4.5
-      parent: 1
 - proto: PortableGeneratorJrPacman
   entities:
   - uid: 36
@@ -523,98 +480,90 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-2.5
       parent: 1
-- proto: WallMining
+- proto: WallSolidRust
   entities:
-  - uid: 5
+  - uid: 25
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 1.5,-2.5
       parent: 1
-  - uid: 9
+  - uid: 26
     components:
     - type: Transform
       pos: -0.5,-1.5
       parent: 1
-  - uid: 10
+  - uid: 27
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -0.5,-2.5
       parent: 1
-  - uid: 11
+  - uid: 30
     components:
     - type: Transform
       pos: 1.5,-1.5
       parent: 1
-  - uid: 13
+  - uid: 46
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -1.5,-0.5
       parent: 1
-  - uid: 14
+  - uid: 48
     components:
     - type: Transform
       pos: 2.5,-1.5
       parent: 1
-  - uid: 24
+  - uid: 64
     components:
     - type: Transform
       pos: -1.5,2.5
       parent: 1
-  - uid: 25
+  - uid: 65
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 26
+  - uid: 66
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -0.5,2.5
       parent: 1
-  - uid: 27
+  - uid: 67
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 1
-  - uid: 30
+  - uid: 68
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -2.5,-0.5
       parent: 1
-  - uid: 46
+  - uid: 69
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: 3.5,-0.5
       parent: 1
-  - uid: 48
+  - uid: 70
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 2.5,-0.5
       parent: 1
-  - uid: 82
+  - uid: 71
     components:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
-- proto: WallMiningDiagonal
+- proto: WallSolidDiagonal
   entities:
-  - uid: 12
+  - uid: 82
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,2.5
+      pos: -2.5,2.5
       parent: 1
-  - uid: 15
+  - uid: 83
     components:
     - type: Transform
-      pos: -2.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
       parent: 1
 - proto: WeldingFuelTankFull
   entities:
@@ -623,6 +572,63 @@ entities:
     - type: Transform
       pos: -1.5,1.5
       parent: 1
+- proto: Window
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,1.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,0.5
+      parent: 1
+- proto: WindowDiagonal
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
 - proto: Wrench
   entities:
   - uid: 59