Merge branch 'master' into ed-27-05-2025-upstream-sync

2025-05-30 14:54:06 +03:00
parent df9c7e4439 3972d047c7
commit 7d658de8a1
4 changed files with 12 additions and 5 deletions
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
@@ -21,7 +21,7 @@
        Blunt: 8
        Piercing: 4
  - !type:EditItem
-    newSize: Large
+    newSize: Normal
    adjustShape: 0, 1
    storedOffsetBonus: 0, 5

--- a/Resources/Prototypes/_CP14/Reagents/target_effects.yml
+++ b/Resources/Prototypes/_CP14/Reagents/target_effects.yml
@@ -259,6 +259,10 @@
      effects:
      - !type:ModifyBloodLevel
        amount: 20
+      - !type:HealthChange
+        damage:
+          types:
+            Bloodloss: -10
  pricePerUnit: 2

 - type: reagent
@@ -276,6 +280,10 @@
      effects:
      - !type:ModifyBloodLevel
        amount: -10
+      - !type:HealthChange
+        damage:
+          types:
+            Bloodloss: 3
  pricePerUnit: 2

 - type: reagent
@@ -529,4 +537,3 @@
      metabolismRate: 0.05
      effects:
      - !type:Jitter
-