From cbaf2d663fb7129d4ce2d8d7d963aa0d51477139 Mon Sep 17 00:00:00 2001 From: Krysonism <49783092+Krysonism@users.noreply.github.com> Date: Sun, 12 Oct 2025 02:29:26 +0200 Subject: [PATCH] Fixes living food / creature hybrids not grabbing ghosts or storing brains. (#93405) ## About The Pull Request This PR fixes a long standing issue where food creatures created with player brains did not work correctly, due to their code checking for the brain within their contents, where it was absent. It also stores the heart used in contents for consistency. ## Why It's Good For The Game It lets people enjoy playing as these wonderous creatures, and lets these strange beasts be revived when destroyed with proper veterinary or culinary intervention. ## Changelog :cl: fix: food / animal hybrids like the butterbear and cak now once again correctly grab ghosts and store brains. /:cl: --- .../food_and_drinks/recipes/tablecraft/recipes_bread.dm | 4 ++++ .../food_and_drinks/recipes/tablecraft/recipes_cake.dm | 4 ++++ .../food_and_drinks/recipes/tablecraft/recipes_misc.dm | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index 574b70ce41f..82713b5c125 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -165,6 +165,10 @@ /datum/reagent/blood = 30, /datum/reagent/teslium = 1 //To shock the whole thing into life ) + parts = list( + /obj/item/organ/brain, + /obj/item/organ/heart + ) result = /mob/living/basic/pet/dog/breaddog category = CAT_BREAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index de8a2f4e57d..778d559aee0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -234,6 +234,10 @@ /datum/reagent/consumable/sprinkles = 5, /datum/reagent/teslium = 1 //To shock the whole thing into life ) + parts = list( + /obj/item/organ/brain, + /obj/item/organ/heart + ) result = /mob/living/basic/pet/cat/cak category = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Felines diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 1dead375c9f..ab213c2a2dc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -170,6 +170,10 @@ /datum/reagent/blood = 50, /datum/reagent/teslium = 1 //To shock the whole thing into life ) + parts = list( + /obj/item/organ/brain, + /obj/item/organ/heart + ) result = /mob/living/basic/bear/butter category = CAT_MISCFOOD