From 0ee67a7d601ca0f26afde686be03c992abac0b6c Mon Sep 17 00:00:00 2001 From: mersen-tyn <128121177+mersen-tyn@users.noreply.github.com> Date: Thu, 23 May 2024 12:59:18 +0900 Subject: [PATCH 1/3] fix shuttle's --- .../Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml | 2 +- Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml index 1f0548fa2c3..b42a8b6ebcf 100644 --- 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: 149900 # 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 index a32bf3ffe78..6f78ca82a83 100644 --- 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 From 3aac1c542b52c60d34aab150e99377c0a1417d67 Mon Sep 17 00:00:00 2001 From: mersen-tyn <128121177+mersen-tyn@users.noreply.github.com> Date: Thu, 23 May 2024 13:39:34 +0900 Subject: [PATCH 2/3] fix zarya.yml --- .../Shuttles/Expedition/zarya.yml | 37 ++++++++++++++----- .../Shipyard/Expedition/zarya.yml | 2 +- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml index e63d2fa2d61..1ff874c7a08 100644 --- 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: @@ -1273,20 +1273,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 +2311,7 @@ entities: - type: DeviceLinkSink links: - 1298 + - 1134 - uid: 201 components: - type: Transform @@ -2318,6 +2321,7 @@ entities: - type: DeviceLinkSink links: - 1298 + - 1134 - uid: 202 components: - type: Transform @@ -2327,6 +2331,7 @@ entities: - type: DeviceLinkSink links: - 1298 + - 1134 - uid: 203 components: - type: Transform @@ -8452,6 +8457,9 @@ entities: - type: Transform pos: -9.5,-5.5 parent: 2 + - type: DeviceLinkSource + linkedPorts: + 35: [] - uid: 1130 components: - type: MetaData @@ -8507,6 +8515,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 diff --git a/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml b/Resources/Prototypes/CorvaxFrontier/Shipyard/Expedition/zarya.yml index b42a8b6ebcf..9b695d2ee9d 100644 --- 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: 149900 # 15% tax + price: 125900 # 15% tax category: Medium group: Expedition shuttlePath: /Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml From 4be5d851bc0c2df15976c3098627959a50c1a1fc Mon Sep 17 00:00:00 2001 From: mersen-tyn <128121177+mersen-tyn@users.noreply.github.com> Date: Thu, 23 May 2024 13:52:18 +0900 Subject: [PATCH 3/3] fix x2 zarya.yml --- .../Shuttles/Expedition/zarya.yml | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml index 1ff874c7a08..ab259f7e341 100644 --- a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml +++ b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml @@ -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 @@ -7515,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 @@ -9207,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