From 5c23780e80b4e3b2e2730bba934e1515204030ea Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Thu, 1 Sep 2022 06:10:54 -0500 Subject: [PATCH 1/4] Update snacks_pastry.dm --- .../modules/food_and_drinks/food/snacks_pastry.dm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 94c0984f0604..94b0ec4d8d2c 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -270,13 +270,22 @@ /obj/item/reagent_containers/food/snacks/donkpocket/warm/MakeBakeable() AddComponent(/datum/component/bakeable, /obj/item/reagent_containers/food/snacks/badrecipe, rand(10 SECONDS, 15 SECONDS), FALSE) -/obj/item/reagent_containers/food/snacks/dankpocket +/obj/item/reagent_containers/food/snacks/donkpocket/dank name = "dankpocket" desc = "The food of choice for the seasoned botanist." icon_state = "dankpocket" - list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) + list_reagents = list(/datum/reagent/drug/space_drugs = 1, /datum/reagent/consumable/nutriment = 1) + cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm/dank filling_color = "#00FF00" - tastes = list("meat" = 2, "dough" = 2) + tastes = list("grass" = 2, "dough" = 2) + foodtype = GRAIN | VEGETABLES + +/obj/item/reagent_containers/food/snacks/dankpocket/warm + name = "warm dankpocket" + desc = "The food of choice for the seasoned botanist. Smells danker now." + icon_state = "dankpocket" + list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) + tastes = list("grass" = 2, "dough" = 2, "drugs" = 2) foodtype = GRAIN | VEGETABLES /obj/item/reagent_containers/food/snacks/donkpocket/spicy From 51ee51c8696f931d803ef4135485a35ae4894e25 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Thu, 1 Sep 2022 06:12:48 -0500 Subject: [PATCH 2/4] Update recipes_pizza.dm --- .../modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index 9054c69fc533..46f84ab92377 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -19,7 +19,7 @@ name = "Dank Pizza" reqs = list( /obj/item/reagent_containers/food/snacks/flatdough = 1, - /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, + /obj/item/reagent_containers/food/snacks/grown/cannabis = 3, /obj/item/reagent_containers/food/snacks/cheesewedge = 1, /obj/item/reagent_containers/food/snacks/grown/tomato = 1 ) From d4d11db5bfe9c8c2cbe3f125939c566f24cabd3e Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Thu, 1 Sep 2022 06:13:15 -0500 Subject: [PATCH 3/4] Update snacks_pastry.dm --- code/modules/food_and_drinks/food/snacks_pastry.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index 94b0ec4d8d2c..fca83fc04962 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -280,7 +280,7 @@ tastes = list("grass" = 2, "dough" = 2) foodtype = GRAIN | VEGETABLES -/obj/item/reagent_containers/food/snacks/dankpocket/warm +/obj/item/reagent_containers/food/snacks/donkpocket/warm/dank name = "warm dankpocket" desc = "The food of choice for the seasoned botanist. Smells danker now." icon_state = "dankpocket" From adb45d1ac2f281c7b04c355d4af91a66ca17d797 Mon Sep 17 00:00:00 2001 From: Vaelophis Nyx Date: Thu, 1 Sep 2022 06:21:12 -0500 Subject: [PATCH 4/4] Update recipes_pastry.dm --- .../food_and_drinks/recipes/tablecraft/recipes_pastry.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 91b1c080269a..9ec234d57961 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -199,7 +199,7 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/pastrybase = 1, /obj/item/reagent_containers/food/snacks/grown/cannabis = 1 ) - result = /obj/item/reagent_containers/food/snacks/dankpocket + result = /obj/item/reagent_containers/food/snacks/donkpocket/dank subcategory = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/spicy