From 005683d074605d08b4dd3733c8183b4191abd241 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C4=81da?= Date: Tue, 23 Sep 2025 18:41:11 -0500 Subject: [PATCH] Miscellaneous Food/Drink/Edible fixes (#40060) * bugfixes * Revert "bugfixes" This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19. * Revert "bugfixes" This reverts commit 7fe31a866fc4dc299a1667291c0744716092db19. * more reverting * conflicts --------- Co-authored-by: iaada --- Resources/Prototypes/Entities/Effects/puddle.yml | 2 +- .../Entities/Objects/Consumable/Food/Baked/cake.yml | 1 - .../Entities/Objects/Consumable/Food/Baked/donut.yml | 1 - .../Prototypes/Entities/Objects/Consumable/Food/egg.yml | 2 +- .../Prototypes/Entities/Objects/Materials/Sheets/other.yml | 2 +- .../Prototypes/Entities/Objects/Materials/materials.yml | 7 ------- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index 4e758e4e1c..dbde82b534 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -206,7 +206,7 @@ delay: 3 transferAmount: 1 solution: puddle - utensil: None + utensil: Spoon - type: ExaminableSolution solution: puddle locVolume: "examinable-solution-on-examine-volume-puddle" diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index a1b69a0966..820814a468 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -9,7 +9,6 @@ - type: FlavorProfile flavors: - sweet - - type: Food - type: Sprite sprite: Objects/Consumable/Food/Baked/cake.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index c13f52194f..2403aefe6d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -6,7 +6,6 @@ abstract: true description: Goes great with robust coffee. components: - - type: Food - type: Tag tags: - Donut diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml index 7228a21366..20e61869b0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml @@ -10,7 +10,7 @@ tags: - Egg - Meat - - type: Food + - type: Edible trash: - Eggshells - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index b10e071fd9..34aff04489 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -205,7 +205,7 @@ suffix: Full components: - type: Material - - type: Food + - type: Edible transferAmount: 10 - type: BadFood - type: PhysicalComposition diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 9eeed7af80..4b7477eed3 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -226,13 +226,6 @@ state: durathread - type: Stack count: 1 - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: #Hell if I know what durathread is made out of. - - ReagentId: Fiber - Quantity: 6 - type: entity parent: MaterialBase -- 2.51.2