From 8006578845747e19bde1de74c19b0b1c435f8af9 Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 29 May 2025 00:57:12 +0300 Subject: [PATCH 1/3] fix #1311 --- Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml index 70951469b7..0eff97f038 100644 --- 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 From 2c5655ee6959a4a6741b641fee47f0ca3b0f4987 Mon Sep 17 00:00:00 2001 From: Kit Date: Thu, 29 May 2025 18:59:48 -0400 Subject: [PATCH 2/3] Update Blood healing and blood absorpsion (#1331) --- Resources/Prototypes/_CP14/Reagents/target_effects.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CP14/Reagents/target_effects.yml b/Resources/Prototypes/_CP14/Reagents/target_effects.yml index 0ea8e6ca00..26e8856466 100644 --- 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 @@ -528,4 +536,4 @@ Food: metabolismRate: 0.05 effects: - - !type:Jitter \ No newline at end of file + - !type:Jitter From 3972d047c7dd0ce6c369ec0e2b818643badf58d4 Mon Sep 17 00:00:00 2001 From: SenorJaba Date: Fri, 30 May 2025 09:49:21 +0300 Subject: [PATCH 3/3] Guard bell resprite change (#1335) --- .../Specific/Guard/guard_bell.rsi/base.png | Bin 4938 -> 1424 bytes .../Specific/Guard/guard_bell.rsi/meta.json | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/_CP14/Structures/Specific/Guard/guard_bell.rsi/base.png b/Resources/Textures/_CP14/Structures/Specific/Guard/guard_bell.rsi/base.png index 45151c94db5b8680037227f99b6fa9d73e5c2daf..474818194c36e2700f01df90ccf235b19efec2cb 100644 GIT binary patch delta 1419 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