Merge remote-tracking branch 'WD-core/master' into upstream-core

2025-01-12 00:21:09 +03:00
parent 3052f9c15c cf21b8b7b1
commit 5e227c9100
13 changed files with 250 additions and 56 deletions
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,23 +1,4 @@
 Entries:
- author: ThereDrD
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\
-      \u0430\u044F \u0438\u0433\u0440\u0443\u0448\u043A\u0430 \u0432 \u0434\u043E\u043D\
-      \u0430\u0442-\u043C\u0430\u0433\u0430\u0437\u0438\u043D"
-    type: Add
-  id: 156
-  time: '2024-02-26T18:27:13.0000000+00:00'
-  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/126
- author: Aviu
-  changes:
-  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D \u043A\u0440\u0430\u0448\
-      \ \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0438\u0437-\u0437\u0430 \u043F\
-      \u0440\u0435\u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u0442\u0435\u043B\
-      \u044F \u043F\u043E\u043A\u0440\u043E\u0432\u0430."
-    type: Fix
-  id: 157
-  time: '2024-02-27T06:12:53.0000000+00:00'
-  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/127
 - author: RedFoxIV
  changes:
  - message: "\u041D\u0438\u0447\u0435\u0433\u043E. \u041C\u0435\u043D\u044C\u0448\
@@ -8916,3 +8897,36 @@
  id: 655
  time: '2025-01-08T19:42:41.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/868
+- author: Hero_010
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043A\u0440\u0430\u0444\
+      \u0442 \u0432\u043D\u0435\u0448\u043D\u0435\u043C\u0443 \u0438 \u0441\u0442\u0435\
+      \u043A\u043B\u044F\u043D\u043D\u043E\u043C\u0443 \u0432\u043D\u0435\u0448\u043D\
+      \u0435\u043C\u0443 \u0448\u043B\u044E\u0437\u0430\u043C."
+    type: Add
+  id: 656
+  time: '2025-01-10T18:44:47.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/879
+- author: BIG_Zi_348
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0430\u043A\u0446\
+      \u0435\u043D\u0442 \u043C\u043E\u043B\u044F\u043C, \u043E\u043D\u0438 \u0442\
+      \u0435\u043F\u0435\u0440\u044C \u0436\u0443\u0436\u0436\u0430\u0442."
+    type: Fix
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0431\u043E\u043B\
+      \u044C\u0448\u0435 \u0441\u043C\u0435\u0448\u043D\u043E\u0433\u043E \u0432 \u0430\
+      \u043A\u0446\u0435\u043D\u0442 \u043F\u0440\u0438 \u043E\u043F\u044C\u044F\u043D\
+      \u0435\u043D\u0438\u0438."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0431\u043E\u043B\
+      \u044C\u0448\u0435 \u0430\u043A\u0446\u0435\u043D\u0442\u043E\u0432 \u0432 \u0430\
+      \u0441\u043F\u0435\u043A\u0442 \u0440\u0430\u043D\u0434\u043E\u043C\u043D\u044B\
+      \u0445 \u0430\u043A\u0446\u0435\u043D\u0442\u043E\u0432."
+    type: Add
+  - message: "\u0421\u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0420\u041F\u041A\
+      \ \u0432 \u043A\u0430\u0440\u0433\u043E \u0432\u043E\u0437\u0440\u043E\u0441\
+      \u043B\u0430."
+    type: Tweak
+  id: 657
+  time: '2025-01-11T21:05:59.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/880
--- a/Resources/Locale/ru-RU/_white/recipes/structures/airlocks.ftl
+++ b/Resources/Locale/ru-RU/_white/recipes/structures/airlocks.ftl
@@ -0,0 +1,5 @@
+ent-airlockExternal = { ent-AirlockExternal }
+    .desc = { ent-AirlockExternal.desc }
+
+ent-airlockExternalGlass = стеклянный внешний шлюз
+    .desc = { ent-airlockExternal.desc}
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
@@ -16,5 +16,5 @@ ent-BoxShotgunPractice = коробка ружейных патронов (уч
    .desc = Полная коробка учебных ружейных патронов.
 ent-BoxShellTranquilizer = коробка ружейных патронов (транквилизаторы)
    .desc = Полная коробка ружейных патронов-транквилизаторов.
-ent-BoxRubberShot = коробка ружейных патронов (резиновые).
+ent-BoxRubberShot = коробка ружейных патронов (резиновые)
    .desc = Полная коробка резиновых ружейных патронов.
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -108,6 +108,11 @@
  - type: Sprite
    sprite: Structures/Doors/Airlocks/Standard/external.rsi
    state: "assembly"
+  - type: Construction ## WD edit
+    graph: Airlock
+    node: externalAssembly
+    containers:
+    - board

 - type: entity
  parent: AirlockAssembly
@@ -117,6 +122,11 @@
  - type: Sprite
    sprite: Structures/Doors/Airlocks/Glass/external.rsi
    state: "assembly"
+  - type: Construction ## WD edit
+    graph: Airlock
+    node: externalAssemblyGlass
+    containers:
+    - board

 #Public (Glass Airlock)
 - type: entity
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -20,6 +20,9 @@
  - type: PaintableAirlock
    group: External
    department: null
+  - type: Construction ## WD edit
+    graph: Airlock
+    node: external

 - type: entity
  parent: AirlockExternal
@@ -34,3 +37,6 @@
    sprite: Structures/Doors/Airlocks/Glass/external.rsi
  - type: PaintableAirlock
    group: ExternalGlass
+  - type: Construction ## WD edit
+    graph: Airlock
+    node: externalGlass
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
@@ -77,6 +77,15 @@
      - material: ReinforcedGlass
        amount: 1
        doAfter: 2
+## WD edit start
+    - to: externalAssembly
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 2
+## WD edit end
    - to: wired
      conditions:
      - !type:EntityAnchored {}
@@ -114,6 +123,55 @@
      - tool: Prying
        doAfter: 5

+## WD edit start
+  - node: externalAssembly
+    entity: AirlockAssemblyExternal
+    edges:
+    - to: electronics
+      conditions:
+      - !type:EntityAnchored {}
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 1
+      steps:
+      - tool: Prying
+        doAfter: 5
+    - to: external
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2.5
+    - to: externalAssemblyGlass
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: ReinforcedGlass
+        amount: 1
+        doAfter: 2
+
+  - node: externalAssemblyGlass
+    entity: AirlockAssemblyExternalGlass
+    edges:
+    - to: externalGlass
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2.5 
+    - to: externalAssembly
+      conditions:
+      - !type:EntityAnchored {}
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetRGlass1
+        amount: 1
+      steps:
+      - tool: Prying
+        doAfter: 5
+## WD edit end
+
 ## Glass airlock
  - node: glassAirlock
    entity: AirlockGlass
@@ -154,6 +212,23 @@
        amount: 2
        doAfter: 2

+## WD edit start
+  - node: externalGlass
+    entity: AirlockExternalGlass
+    edges:
+    - to: externalAssemblyGlass
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorWelded {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      steps:
+      - tool: Prying
+        doAfter: 5
+## WD edit end
+
 ## Standard airlock
  - node: airlock
    entity: Airlock
@@ -194,6 +269,23 @@
        amount: 2
        doAfter: 2

+## WD edit start
+  - node: external
+    entity: AirlockExternal
+    edges:
+    - to: externalAssembly
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorWelded {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      steps:
+      - tool: Prying
+        doAfter: 5
+## WD edit end
+
 ## High security door
  - node: highSecDoor
    actions:
--- a/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml
@@ -4,6 +4,6 @@
    sprite: _Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi
    state: icon
  product: CrateArmoryKLMG
-  cost: 10000
+  cost: 14000
  category: cargoproduct-category-name-armory
  group: market
--- a/Resources/Prototypes/_White/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/_White/Recipes/Construction/structures.yml
@@ -0,0 +1,29 @@
+- type: construction
+  name: external airlock
+  id: airlockExternal
+  graph: Airlock
+  startNode: start
+  targetNode: external
+  category: construction-category-structures
+  description: It opens, it closes, it might crush you, and there might be only space behind it. Has to be manually activated.
+  icon: { sprite: Structures/Doors/Airlocks/Standard/external.rsi, state: closed }
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: external airlock
+  id: airlockExternalGlass
+  graph: Airlock
+  startNode: start
+  targetNode: externalGlass
+  category: construction-category-structures
+  description: It opens, it closes, it might crush you, and there might be only space behind it. Has to be manually activated. 
+  icon: { sprite: Structures/Doors/Airlocks/Glass/external.rsi, state: closed }
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked