Merge remote-tracking branch 'upstream/master' into ups

2024-08-25 15:35:27 +03:00
parent f57fd7423e ee498d3718
commit ecf9a43bdc
12 changed files with 160 additions and 71 deletions
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,50 +1,4 @@
 Entries:
- author: EnefFlow
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043F\u0440\u043E\
-      \u0432\u0435\u0440\u043A\u0430 \u043F\u0440\u0438 \u043D\u0430\u0436\u0430\u0442\
-      \u0438\u0438 \u043A\u043D\u043E\u043F\u043A\u0438 \u0432\u044B\u0437\u043E\u0432\
-      \u0430 \u0441\u0442\u0430\u043D\u0446\u0438\u0438. \u0415\u0441\u043B\u0438\
-      \ \u043A\u043E\u043D\u0441\u043E\u043B\u044C \u043D\u0430\u0445\u043E\u0434\u0438\
-      \u0442\u0441\u044F \u043D\u0435 \u043D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\
-      \u0438, \u0442\u043E \u0432\u044B\u0434\u0430\u0451\u0442 \u043F\u043E\u043F\
-      \u0430\u043F \"\u041E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435\
-      \ \u0441\u0432\u044F\u0437\u0438\"."
-    type: Add
-  id: 19
-  time: '2023-01-06T17:33:46.0000000+00:00'
- author: NCast-Hops
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\u0441\
-      \u0435\u043B\u044C\u0435!"
-    type: Add
-  - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\
-      \u0435!"
-    type: Remove
-  id: 20
-  time: '2023-01-12T11:08:53.0000000+00:00'
- author: HitPanda
-  changes:
-  - message: "\u041D\u043E\u0432\u044B\u0439 \u043F\u0440\u0435\u0441\u0435\u0442\
-      \ \u0438 \u043F\u0440\u0430\u0432\u0438\u043B\u043E \u0434\u043B\u044F \u043D\
-      \u0435\u0433\u043E."
-    type: Add
-  - message: "\u0415\u0441\u043B\u0438 \u0437\u0430\u043F\u0443\u0449\u0435\u043D\u043E\
-      \ \u043F\u0440\u0430\u0432\u0438\u043B\u043E, \u0442\u043E \u043A\u043E\u043D\
-      \u0441\u043E\u043B\u044C \u043A\u043E\u043C\u043C\u0443\u043D\u0438\u043A\u0430\
-      \u0446\u0438\u0438 \u043D\u0435 \u0434\u0430\u0451\u0442 \u0432\u044B\u0437\u0432\
-      \u0430\u0442\u044C \u0448\u0430\u0442\u0442\u043B, \u043F\u043E\u043A\u0430\
-      \ \u043D\u0435 \"\u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0441\
-      \u044F \u0441\u0432\u044F\u0437\u044C\"."
-    type: Add
-  - message: "\u0414\u043B\u044F \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043F\
-      \u0440\u043E\u043F\u0438\u0441\u0430\u043D\u044B \u043C\u0435\u0442\u043E\u0434\
-      \u044B \u0434\u043B\u044F \u043F\u043E\u0438\u0441\u043A\u0430 \u043A\u043E\u043D\
-      \u043A\u0440\u0435\u0442\u043D\u043E\u0433\u043E \u0438\u0432\u0435\u043D\u0442\
-      \u0430."
-    type: Add
-  id: 21
-  time: '2023-01-12T12:56:46.0000000+00:00'
 - author: HitPanda
  changes:
  - message: "\u0423\u0431\u0440\u0430\u043B \u0438\u0437 \u0433\u043E\u043B\u043E\
@@ -8555,3 +8509,92 @@
  id: 518
  time: '2024-08-23T08:38:47.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/660
+- author: ThereDrD0
+  changes:
+  - message: "\u041C\u0435\u0442\u0435\u043E\u0440 \u043C\u0435\u043D\u044E \u0441\
+      \u043D\u043E\u0432\u0430 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442\
+      \u0441\u044F"
+    type: Fix
+  - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u044B\u0445 \u0444\u0438\u043A\
+      \u0441 \u0442\u0430\u0439\u043C\u0435\u0440\u043E\u0432"
+    type: Fix
+  - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u044B\u0439 \u0444\u0438\u043A\
+      \u0441 \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u0442\u0435\
+      \u0445\u0444\u0430\u0431\u0430 \u0421\u0411"
+    type: Fix
+  id: 519
+  time: '2024-08-24T22:37:24.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/664
+- author: ThereDrD0
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0431\
+      \u0440\u0430\u0441\u044B\u0432\u0430\u044E\u0449\u0438\u0435\u0441\u044F \u0438\
+      \u043C\u0435\u043D\u0430"
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u0435\
+      \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043F\u043E\
+      \u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0442\u043E\u0447\u043A\u0438 \u0432\
+      \ \u0438\u043C\u0435\u043D\u0438 \u0431\u043E\u0440\u0433\u043E\u0432"
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u0432\
+      \u0442\u043E\u0437\u0430\u043C\u0435\u043D\u0430 \u0431\u0443\u043A\u0432 \u043D\
+      \u0430 \u0431\u043E\u043B\u044C\u0448\u0438\u0435 \u0432 \u0438\u043C\u0435\u043D\
+      \u0430\u0445 \u043C\u0438\u043C\u043E\u0432, \u043A\u043B\u043E\u0443\u043D\u043E\
+      \u0432 \u0438 \u0431\u043E\u0440\u0433\u043E\u0432"
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\
+      \u0440\u0435\u043F\u0443\u0442\u0430\u043D\u043D\u044B\u0435 \u0440\u0443\u043A\
+      \u0438 \u0443 \u0444\u0435\u043B\u0438\u043D\u0438\u0434\u043E\u0432, \u0433\
+      \u0430\u0440\u043F\u0438\u0439 \u0438 \u0442\u0435\u0440\u043C\u0438\u043D\u0430\
+      \u0442\u043E\u0440\u0430"
+    type: Fix
+  id: 520
+  time: '2024-08-24T09:36:44.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/663
+- author: ThereDrD0
+  changes:
+  - message: "\u0421\u043A\u043E\u0440\u0435\u0435 \u0432\u0441\u0435\u0433\u043E\
+      \ \u0442\u0430\u0439\u043C\u0435\u0440\u044B \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0442\u043E\u0447\u043D\u043E \u0434\u043E\u043B\u0436\u043D\u044B \u0437\
+      \u0430\u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C"
+    type: Fix
+  - message: "\u0420\u0443\u043A\u0438 \u0443 \u0444\u0435\u043B\u0438\u043D\u0438\
+      \u0434\u043E\u0432, \u0433\u0430\u0440\u043F\u0438\u0439 \u0438 \u0442\u0435\
+      \u0440\u043C\u0438\u043D\u0430\u0442\u043E\u0440\u0430 \u0442\u0435\u043F\u0435\
+      \u0440\u044C \u0432 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E\u043C\
+      \ \u043F\u043E\u0440\u044F\u0434\u043A\u0435."
+    type: Fix
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0445\u0440\u0430\u043D\u0438\u043B\
+      \u0438\u0449\u0435 \u0432\u043D\u0443\u0442\u0440\u0438 \u0442\u0435\u043B\u0430\
+      \ \u0441\u043B\u0438\u0437\u043D\u0435\u043B\u044E\u0434\u043E\u0432 \u043D\u0435\
+      \ \u043C\u0435\u0448\u0430\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\
+      \u043E\u0432\u0430\u0442\u044C \u043D\u0430 \u043D\u0435\u043C \u043F\u0440\u0435\
+      \u0434\u043C\u0435\u0442\u044B \u0438 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\
+      \u0435\u0442\u0441\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438\
+      \ \u043D\u0430\u0436\u0430\u0442\u0438\u0438 \u043F\u0443\u0441\u0442\u043E\u0439\
+      \ \u0440\u0443\u043A\u0438 \u0438\u043B\u0438 \u0447\u0435\u0440\u0435\u0437\
+      \ \u041F\u041A\u041C \u043C\u0435\u043D\u044E."
+    type: Fix
+  - message: "\u042D\u0444\u0444\u0435\u043A\u0442 \u0440\u0430\u0434\u0438\u0430\u0446\
+      \u0438\u0438 \u0443 \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u0430 \u043F\
+      \u043E\u0432\u044B\u0448\u0435\u043D \u0432 \u0446\u0435\u043D\u0435 \u0441\
+      \ 1 \u0434\u043E 4 \u043E\u0447\u043A\u043E\u0432. \u0412\u0441\u0435\u0433\u043E\
+      \ \u0438\u0445 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u043C\u043E\
+      \u0436\u0435\u0442 \u0431\u044B\u0442\u044C 10 \u0443 \u0430\u0440\u0442\u0435\
+      \u0444\u0430\u043A\u0442\u0430"
+    type: Tweak
+  - message: "\u042D\u0444\u0444\u0435\u043A\u0442 \u0441\u043F\u0430\u0432\u043D\u0430\
+      \ \u0441\u0438\u043D\u0433\u0443\u043B\u044F\u0440\u043D\u043E\u0441\u0442\u0438\
+      \ \u043F\u043E\u043D\u0438\u0436\u0435\u043D \u0432 \u0446\u0435\u043D\u0435\
+      \ \u0441 10 \u0434\u043E 8 \u043E\u0447\u043A\u043E\u0432, \u0442\u0430\u043A\
+      \ \u043A\u0430\u043A \u043A\u0430\u0436\u0435\u0442\u0441\u044F, \u0447\u0442\
+      \u043E \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435\u0433\u043E\
+      \ 1 \u044D\u0444\u0444\u0435\u043A\u0442 \u0434\u043B\u044F \u0430\u0440\u0442\
+      \u0435\u0444\u0430\u043A\u0442\u0430 \u0438\u0433\u0440\u0430 \u043D\u0435 \u0441\
+      \u043F\u043E\u0441\u043E\u0431\u043D\u0430 \u0438 \u0442\u0440\u0430\u0442\u0438\
+      \u0442 \u043E\u0447\u043A\u0438 \u043D\u0430 \u0440\u0430\u0437\u043D\u0443\u044E\
+      \ \u0445\u0443\u0439\u043D\u044E."
+    type: Tweak
+  id: 521
+  time: '2024-08-25T07:37:38.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/665
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -235,8 +235,17 @@
        type: SpellSelectorBUI
      enum.CultEmpowerRemoveUiKey.Key:
        type: SpellRemoverBUI
+      enum.StoreUiKey.Key:
+        type: StoreBoundUserInterface
      # WD-EDIT END
  - type: Puller
+  # WD edit start
+  - type: Store
+    preset: StorePresetMeatyOre
+    balance:
+      MeatyOreCoin: 0
+  - type: IgnorBUIInteractionRange # Oleg kryt
+  # WD edit end
  - type: Butcherable
    butcheringType: Spike # TODO human.
    spawned:
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -17,6 +17,7 @@
    grid:
    - 0,0,1,2
    maxItemSize: Large
+    clickInsert: false
    storageInsertSound:
      path: /Audio/Voice/Slime/slime_squish.ogg
  - type: ContainerContainer
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -38,7 +38,7 @@
  materials:
    Steel: 250
    Plastic: 100
-    
+
 - type: latheRecipe
  id: WeaponLaserCarbine
  result: WeaponLaserCarbine
@@ -390,6 +390,30 @@
  materials:
    Steel: 120

+- type: latheRecipe # WD
+  id: MagazineShotgun
+  result: MagazineShotgun
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 300
+
+- type: latheRecipe # WD
+  id: MagazineShotgunSlug
+  result: MagazineShotgunSlug
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 300
+
+- type: latheRecipe # WD
+  id: MagazinePistolCaselessRifle
+  result: MagazinePistolCaselessRifle
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 300
+
 - type: latheRecipe
  id: ShellShotgunIncendiary
  result: ShellShotgunIncendiary
--- a/Resources/Prototypes/Store/meatyore_store_presset.yml
+++ b/Resources/Prototypes/Store/meatyore_store_presset.yml
@@ -19,6 +19,7 @@
  currencyWhitelist:
    - MeatyOreCoin

+# This is unused now
 - type: entity
  id: StoreMeatyOreEntity
  name: ThisIsDumb
@@ -32,5 +33,4 @@
      interfaces:
        enum.StoreUiKey.Key:
          type: StoreBoundUserInterface
-          range: -1
    - type: IgnorBUIInteractionRange
--- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
@@ -254,7 +254,7 @@

 - type: artifactEffect
  id: EffectRadiate
-  targetDepth: 1
+  targetDepth: 4
  effectHint: artifact-effect-hint-release
  components:
  - type: RadiationSource
@@ -714,7 +714,7 @@

 - type: artifactEffect
  id: EffectSingulo
-  targetDepth: 10
+  targetDepth: 8
  effectHint: artifact-effect-hint-destruction
  components:
  - type: SpawnArtifact
@@ -724,7 +724,7 @@

 - type: artifactEffect
  id: EffectTesla
-  targetDepth: 10
+  targetDepth: 8
  effectHint: artifact-effect-hint-destruction
  components:
  - type: SpawnArtifact