From 580f908ca20eb9f51544ebf24437438b580c8ec1 Mon Sep 17 00:00:00 2001 From: Zokkie <6126135+Zokkie@users.noreply.github.com> Date: Thu, 20 Feb 2025 17:12:55 +0100 Subject: [PATCH] Fix to make all corpses butcher able and better disposable (#33727) * Made all corpses disposable. Argocytes, Mimics, Butterflies, Bees, Space Kangaroos, Laser Raptors and Watchers their corpses can now be butchered. * Accidentally removed a line break. restored it. * Removed a dash that did not belong there. * Changed mimic giving a "Changeling Sting Can" when butchered instead of normal meat. --- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 29 +++++++++++ .../Entities/Mobs/NPCs/argocyte.yml | 50 +++++++++++++++++++ .../Entities/Mobs/NPCs/lavaland.yml | 4 ++ .../Prototypes/Entities/Mobs/NPCs/mimic.yml | 4 ++ .../Entities/Mobs/NPCs/miscellaneous.yml | 6 ++- .../Prototypes/Entities/Mobs/NPCs/space.yml | 4 ++ 6 files changed, 96 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index aaca896175..2290269adf 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -107,6 +107,17 @@ Base: dead Dead: Base: dead + - type: Extractable + grindableSolutionName: food + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: GroundBee + Quantity: 1 + - type: Butcherable + spawned: + - id: null # Should give nothing when you butcher it so we set the item id it needs to spawn to null - type: Item size: Tiny - type: Tag @@ -114,6 +125,7 @@ - Bee - Trash - type: Bloodstream + bloodReagent: InsectBlood bloodMaxVolume: 0.1 - type: MobPrice price: 50 @@ -771,7 +783,24 @@ Base: dead Dead: Base: dead + - type: Extractable + grindableSolutionName: food + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 1 + - type: Butcherable + spawned: + - id: null # Should give nothing when you butcher it so we set the item id it needs to spawn to null + - type: Item + size: Tiny + - type: Tag + tags: + - Trash - type: Bloodstream + bloodReagent: InsectBlood bloodMaxVolume: 0.1 - type: MobPrice price: 50 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml index 3b6c4e8ed9..36ddf71d4b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml @@ -74,6 +74,10 @@ thresholds: 0: Alive 30: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 1 - type: MovementSpeedModifier baseSprintSpeed : 3.5 baseWalkSpeed : 3 @@ -104,6 +108,10 @@ thresholds: 0: Alive 30: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 1 - type: Fixtures fixtures: fix1: @@ -140,6 +148,10 @@ thresholds: 0: Alive 30: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 1 - type: Fixtures fixtures: fix1: @@ -176,6 +188,10 @@ thresholds: 0: Alive 60: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 2 - type: MovementSpeedModifier baseSprintSpeed : 5 @@ -198,6 +214,10 @@ thresholds: 0: Alive 100: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 2 - type: MovementSpeedModifier baseSprintSpeed : 4 baseWalkSpeed : 3.5 @@ -221,6 +241,10 @@ thresholds: 0: Alive 100: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 2 - type: MeleeWeapon damage: types: @@ -246,6 +270,10 @@ thresholds: 0: Alive 100: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 2 - type: MeleeWeapon damage: types: @@ -274,6 +302,10 @@ thresholds: 0: Alive 150: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 2 - type: MeleeWeapon damage: types: @@ -301,6 +333,10 @@ thresholds: 0: Alive 150: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 2 - type: MeleeWeapon damage: types: @@ -330,6 +366,10 @@ thresholds: 0: Alive 300: Dead + - type: Butcherable + spawned: + - id: FoodMeatXeno + amount: 3 - type: MeleeWeapon damage: types: @@ -356,6 +396,11 @@ Base: founder Dead: Base: founder_dead + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatXeno + amount: 5 - type: Fixtures fixtures: fix1: @@ -397,6 +442,11 @@ Base: leviathing Dead: Base: leviathing_dead + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatXeno + amount: 10 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml index 7571d8c8f4..7d6c28fc95 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml @@ -43,6 +43,10 @@ thresholds: 0: Alive 50: Dead + - type: Butcherable + spawned: + - id: DiamondOre1 + amount: 1 - type: MovementSpeedModifier baseWalkSpeed: 5 baseSprintSpeed: 7 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml index 6ef65cc1ae..829bbe4bf1 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml @@ -40,3 +40,7 @@ - type: MovementSpeedModifier baseWalkSpeed : 1 baseSprintSpeed : 1 + - type: Butcherable + spawned: + - id: DrinkChangelingStingCan + amount: 1 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml index f10d03886a..cdd90611f7 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml @@ -37,6 +37,10 @@ thresholds: 0: Alive 100: Dead + - type: Butcherable + spawned: + - id: FoodMeatChicken + amount: 2 - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 5 @@ -220,4 +224,4 @@ types: Blunt: 0.11 - type: StaticPrice - price: 400 \ No newline at end of file + price: 400 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index 6f6fa6afb3..7c549e484d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -167,6 +167,10 @@ collection: FootstepBounce - type: ReplacementAccent accent: kangaroo + - type: Butcherable + spawned: + - id: FoodMeat + amount: 1 - type: entity id: MobKangarooSpaceSalvage -- 2.51.2