Merge pull request Corvax-Frontier#94 from Autsaider-IM/new_shuttle

Обновление шаттлов
NEirotoXiN00 · Dec 2, 2024 · 07da070 · 07da070
2 parents 5380da1 + 9445806
commit 07da070
Show file tree

Hide file tree

Showing 10 changed files with 18,275 additions and 1,968 deletions.
diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml
diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Expedition/boyaryshnik.yml b/Resources/Maps/Corvax/Shuttles/Expedition/boyaryshnik.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Expedition/brigand.yml b/Resources/Maps/Corvax/Shuttles/Expedition/brigand.yml
@@ -622,27 +622,27 @@ entities:
             0: 18288
           -1,2:
             0: 19656
-            2: 16
+            1: 16
           0,3:
-            1: 10
+            2: 10
           1,0:
             0: 12305
-            1: 1024
+            2: 1024
           1,1:
             0: 4355
-            1: 64
+            2: 64
           1,2:
-            2: 16
-            1: 2
+            1: 16
+            2: 2
           0,-4:
             0: 1808
-            2: 4
+            1: 4
           0,-5:
-            2: 12288
-            1: 32768
+            1: 12288
+            2: 32768
           -1,-4:
             0: 3072
-            2: 276
+            1: 276
           0,-3:
             0: 8191
           -1,-3:
@@ -654,37 +654,37 @@ entities:
           -1,-1:
             0: 36831
           1,-4:
-            2: 272
+            1: 272
           1,-3:
             0: 272
-            1: 2
+            2: 2
           1,-2:
             0: 13073
-            1: 64
+            2: 64
           1,-1:
             0: 819
-            1: 16384
+            2: 16384
           -2,-2:
-            1: 64
+            2: 64
             0: 2048
           -2,-1:
             0: 3084
-            1: 16384
+            2: 16384
           -2,-3:
-            1: 8
+            2: 8
           -1,-5:
-            1: 8192
-            2: 32768
+            2: 8192
+            1: 32768
           -2,0:
-            1: 1024
+            2: 1024
             0: 32768
           -2,1:
-            1: 64
+            2: 64
             0: 8
           -2,2:
-            1: 8
+            2: 8
           -1,3:
-            1: 10
+            2: 10
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -702,7 +702,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -717,7 +717,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          immutable: True
+          temperature: 293.15
           moles:
           - 0
           - 0
@@ -1208,7 +1208,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
 - proto: BenchSofaCorpLeft
@@ -1219,8 +1218,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpMiddle
   entities:
   - uid: 468
@@ -1229,8 +1226,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,0.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 445
@@ -1239,8 +1234,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,0.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BlastDoor
   entities:
   - uid: 153
@@ -2200,19 +2193,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-2.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Physics
-      canCollide: False
-    - type: ItemSlots
 - proto: DefaultStationBeaconAME
   entities:
   - uid: 738
@@ -4322,6 +4302,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,3.5
       parent: 1
+    - type: Drink
+      solution: tank
 - proto: SMESBasic
   entities:
   - uid: 190
@@ -4337,12 +4319,19 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-12.5
       parent: 1
-- proto: SpawnDungeonLootSuitStorageUnitsMercenary
+- proto: SpawnDungeonLootArmoryGuns
   entities:
-  - uid: 234
+  - uid: 683
     components:
     - type: Transform
-      pos: 4.5,7.5
+      pos: 4.5703125,6.480033
+      parent: 1
+- proto: SpawnDungeonLootVaultGuns
+  entities:
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 2.4765625,7.542533
       parent: 1
 - proto: SpawnDungeonVendomatsClothes
   entities:
@@ -4414,6 +4403,13 @@ entities:
     - type: Transform
       pos: -3.5,-6.5
       parent: 1
+- proto: SuitStorageMercenary
+  entities:
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 1
 - proto: SuitStorageWallmountCaptain
   entities:
   - uid: 657
@@ -5421,7 +5417,7 @@ entities:
     - type: Transform
       pos: 6.5,-3.5
       parent: 1
-- proto: WarpPointShip
+- proto: WarpPoint
   entities:
   - uid: 642
     components:

diff --git a/Resources/Maps/Corvax/Shuttles/Expedition/faron.yml b/Resources/Maps/Corvax/Shuttles/Expedition/faron.yml