Merge pull request #209 from mersen-tyn/maps_mersen

fix shuttle's
Corvax-Frontier · May 23, 2024 · f41b226 · f41b226
2 parents 1b9e378 + 4be5d85
commit f41b226
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 24 deletions.
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml
@@ -26,10 +26,10 @@ entities:
       pos: -0.53125,-0.5
       parent: invalid
     - type: AutoDelete
-      delayToCheck: 60
-      delayToDelete: 2400
       distanceToCheck: 40
-      isHumanoidNear: true
+      delayToDelete: 2400
+      delayToCheck: 60
+      isHumanoidNear: True
     - type: MapGrid
       chunks:
         0,0:
@@ -1213,6 +1213,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-11.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 1134
   - uid: 25
     components:
     - type: Transform
@@ -1273,20 +1276,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-8.5
       parent: 2
-- proto: AirlockMercenary
+- proto: AirlockMercenaryGlassLocked
   entities:
-  - uid: 34
+  - uid: 35
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,3.5
+      pos: -10.5,-5.5
       parent: 2
-- proto: AirlockMercenaryGlass
+    - type: DeviceLinkSink
+      links:
+      - 1129
+- proto: AirlockMercenaryLocked
   entities:
-  - uid: 35
+  - uid: 34
     components:
     - type: Transform
-      pos: -10.5,-5.5
+      pos: 8.5,3.5
       parent: 2
 - proto: AirlockScienceGlass
   entities:
@@ -2309,6 +2314,7 @@ entities:
     - type: DeviceLinkSink
       links:
       - 1298
+      - 1134
   - uid: 201
     components:
     - type: Transform
@@ -2318,6 +2324,7 @@ entities:
     - type: DeviceLinkSink
       links:
       - 1298
+      - 1134
   - uid: 202
     components:
     - type: Transform
@@ -2327,6 +2334,7 @@ entities:
     - type: DeviceLinkSink
       links:
       - 1298
+      - 1134
   - uid: 203
     components:
     - type: Transform
@@ -7510,6 +7518,18 @@ entities:
     - type: Transform
       pos: -10.5,-13.5
       parent: 2
+- proto: LockerSalvageSpecialistFilledHardsuit
+  entities:
+  - uid: 1638
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 2
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 2
 - proto: MachineAPE
   entities:
   - uid: 990
@@ -8452,6 +8472,9 @@ entities:
     - type: Transform
       pos: -9.5,-5.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        35: []
   - uid: 1130
     components:
     - type: MetaData
@@ -8507,6 +8530,15 @@ entities:
     - type: Transform
       pos: 0.5,-8.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        200:
+        - Pressed: Close
+        201:
+        - Pressed: Close
+        202:
+        - Pressed: Close
+        24: []
   - uid: 1672
     components:
     - type: Transform
@@ -9190,18 +9222,6 @@ entities:
     - type: Transform
       pos: -10.5,-16.5
       parent: 2
-- proto: SuitStorageSalv
-  entities:
-  - uid: 1638
-    components:
-    - type: Transform
-      pos: -1.5,-12.5
-      parent: 2
-  - uid: 1639
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 2
 - proto: Table
   entities:
   - uid: 1250

diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml
@@ -2,7 +2,7 @@
   id: Zarya
   name: NVE Заря
   description: Штурмовое судно Zarya, произведено частной военно-производственной компаний Vitezstvi. Рекомендуемый состав команды 3-8 человек.
-  price: 120000 # 15% tax
+  price: 125900 # 15% tax
   category: Medium
   group: Expedition
   shuttlePath: /Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml

diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml
@@ -10,7 +10,7 @@
 #
 - type: vessel
   id: Kestrel
-  name: NMSwwww Пустельга
+  name: NMS Пустельга
   description: Среднегабаритный добывающий шаттл. Рекомендуемый состав команды 2-6 человек.
   price: 54000
   category: Medium