From 3164cb5b94a00c0fc6e2edc0da9ec387f9b7c30a Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Sat, 10 May 2025 21:45:11 +0300 Subject: [PATCH] Fixing issues (#1258) * fix * gib frog * zombie * not damage --- .../_CP14/Entities/Mobs/NPC/animals.yml | 3 +- .../_CP14/Entities/Mobs/Species/zombie.yml | 4 +-- .../Entities/Structures/Walls/natural.yml | 5 --- .../Recipes/Workbench/Workbench/misc.yml | 36 +++++++++++++++++++ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml index 43eddfb68d..f3eb916f3f 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml @@ -320,7 +320,8 @@ damageType: Blunt damage: 60 behaviors: - - !type:GibBehavior { } + - !type:GibBehavior + recursive: false - type: SpamEmitSound minInterval: 10 maxInterval: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index 53b04b2860..cfb5210a03 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml @@ -61,8 +61,8 @@ - type: Butcherable butcheringType: Spike spawned: - - id: FoodMeatHuman - amount: 5 + - id: CP14FoodMeatHuman + amount: 4 - type: Body prototype: CP14Zombie requiredLegs: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index f4360549eb..fc5e28e283 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -209,11 +209,6 @@ collection: CP14GrassGathering - type: TriggerOnCollide fixtureID: fix1 - - type: DamageContacts - damage: - types: - Slash: 0.2 - Piercing: 0.2 - type: Airtight airBlocked: false diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index 825032d44c..f660b6bb02 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -228,3 +228,39 @@ - !type:ProtoIdResource protoId: CP14CrossboltIron result: CP14Screwdriver + +- type: CP14Recipe + id: CP14FluteInstrument + tag: CP14RecipeWorkbench + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14ModularGripWooden + count: 2 + result: CP14FluteInstrument + +- type: CP14Recipe + id: CP14LyraInstrument + tag: CP14RecipeWorkbench + craftTime: 2 + requirements: + - !type:StackGroupResource + group: WoodenPlanks + count: 3 + - !type:ProtoIdResource + protoId: CP14String + count: 2 + result: CP14LyraInstrument + +- type: CP14Recipe + id: CP14LuteInstrument + tag: CP14RecipeWorkbench + craftTime: 2 + requirements: + - !type:StackGroupResource + group: WoodenPlanks + count: 4 + - !type:ProtoIdResource + protoId: CP14String + count: 1 + result: CP14LuteInstrument