From a8ecf1e77663285a1070e4630baa8aa669dc9e8a Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Fri, 2 Jan 2026 02:49:01 +0530 Subject: [PATCH] Adds vegan cake batter for its chemical reaction (#94679) ## About The Pull Request - Fixes #94653 Vegan cake batter? Whaa..? ## Changelog :cl: fix: vegan cake batter is correctly vegan and has no dairy. /:cl: --- code/game/objects/items/food/cake.dm | 29 ++++++++++++++++++- code/game/objects/items/food/dough.dm | 8 +++++ .../food_and_drinks/recipes/food_mixtures.dm | 1 + .../recipes/tablecraft/recipes_guide.dm | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm index b5306367254..30a9ed37ffc 100644 --- a/code/game/objects/items/food/cake.dm +++ b/code/game/objects/items/food/cake.dm @@ -46,10 +46,26 @@ tastes = list("sweetness" = 2, "cake" = 5) foodtypes = GRAIN | DAIRY | SUGAR slice_type = /obj/item/food/cakeslice/plain + ///ingredient holder for this cake + VAR_PROTECTED/cake_holder = /obj/item/food/cake/empty /obj/item/food/cake/plain/Initialize(mapload) . = ..() - AddComponent(/datum/component/ingredients_holder, /obj/item/food/cake/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 16) + AddComponent(/datum/component/ingredients_holder, cake_holder, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 16) + +/obj/item/food/cake/plain/vegan + name = "vegan plain cake" + desc = "A plain vegan cake, not a lie." + tastes = list("cake" = 5) + foodtypes = GRAIN + cake_holder = /obj/item/food/cake/empty/vegan + slice_type = /obj/item/food/cakeslice/plain/vegan + +/obj/item/food/cakeslice/plain/vegan + name = "plain vegan cake slice" + desc = "Just a slice of vegan cake, it is enough for everyone." + tastes = list("cake" = 5) + foodtypes = GRAIN /obj/item/food/cakeslice/plain name = "plain cake slice" @@ -75,6 +91,17 @@ . = ..() AddComponent(/datum/component/ingredients_holder, null, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 16) +/obj/item/food/cake/empty/vegan + name = "vegan cake" + desc = "A custom vegan cake made by an really insane chef." + foodtypes = GRAIN + slice_type = /obj/item/food/cakeslice/empty/vegan + +/obj/item/food/cakeslice/empty/vegan + name = "vegan cake slice" + desc = "A slice of custom vegan cake, made by an really insane chef." + foodtypes = GRAIN + /obj/item/food/cake/carrot name = "carrot cake" desc = "A favorite desert of a certain wascally wabbit. Not a lie." diff --git a/code/game/objects/items/food/dough.dm b/code/game/objects/items/food/dough.dm index 9997b457bef..75fda88fc20 100644 --- a/code/game/objects/items/food/dough.dm +++ b/code/game/objects/items/food/dough.dm @@ -96,6 +96,14 @@ /obj/item/food/cakebatter/make_processable() AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/piedough, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten", sound_to_play = SFX_ROLLING_PIN_ROLLING) +/obj/item/food/cakebatter/vegan + name = "vegan cake batter" + desc = "Bake it to get a vegan cake?." + foodtypes = GRAIN + +/obj/item/food/cakebatter/vegan/make_bakeable() + AddComponent(/datum/component/bakeable, /obj/item/food/cake/plain/vegan, rand(70 SECONDS, 90 SECONDS), TRUE, TRUE) + /obj/item/food/piedough name = "pie dough" desc = "Cook it to get a pie." diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index ffa4b2c5c4f..184765c058a 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -209,6 +209,7 @@ /datum/chemical_reaction/food/cakebatter/vegan required_reagents = list(/datum/reagent/consumable/soymilk = 15, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5) + resulting_food_path = /obj/item/food/cakebatter/vegan /datum/chemical_reaction/food/pancakebatter results = list(/datum/reagent/consumable/pancakebatter = 15) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index 62e4add9f62..03539136933 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -131,6 +131,7 @@ /datum/crafting_recipe/food/reaction/cakebatter/vegan name = "Cake batter (vegan)" reaction = /datum/chemical_reaction/food/cakebatter/vegan + result = /obj/item/food/cakebatter/vegan /datum/crafting_recipe/food/reaction/pancakebatter result = /datum/reagent/consumable/pancakebatter