From b97f1975c000c19d1f340da12ad4aad7707da3db Mon Sep 17 00:00:00 2001 From: evilew Date: Fri, 16 Feb 2024 21:52:06 +0100 Subject: [PATCH] finishing framewrecker pizza wrapped up some details for it, more slices and made sure there's a recipe for it --- .../food_and_drinks/recipes_bigpizza.dm | 45 +++++++++++++++++-- tgstation.dme | 2 +- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/GainStation13/code/modules/food_and_drinks/recipes_bigpizza.dm b/GainStation13/code/modules/food_and_drinks/recipes_bigpizza.dm index d19b8a00..85635d8a 100644 --- a/GainStation13/code/modules/food_and_drinks/recipes_bigpizza.dm +++ b/GainStation13/code/modules/food_and_drinks/recipes_bigpizza.dm @@ -15,21 +15,25 @@ pixel_y = -16 inhand_x_dimension = 64 inhand_y_dimension = 64 - slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5) list_reagents = list(/datum/reagent/consumable/nutriment = 200, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 20) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "overwhelming surge of calories" = 10) foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | ANTITOXIC var/slicelist = list(/obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/mushroom, - /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/veggie) + /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/veggie, + /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/cheese, + /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/pineapple, + /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/meat) + +//slices /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker name = "Framewrecker Pizza Slice" desc = "This mere slice is the size of pizza on its own!" icon = 'icons/obj/food/ported_meals.dmi' - list_reagents = list(/datum/reagent/consumable/nutriment = 50) + list_reagents = list(/datum/reagent/consumable/nutriment = 60) icon_state = "big_mushroom_slice" filling_color = "#FFA500" @@ -42,7 +46,23 @@ /obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/veggie name = "Giant veggie pizza slice" icon_state = "big_veggie_slice" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushrooms" = 1, "delight" = 5) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "veggies" = 1, "delight" = 5) + foodtype = GRAIN | VEGETABLES | DAIRY | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/pineapple + name = "Giant pineapple pizza slice" + icon_state = "big_pineapple_slice" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "ham" = 1, "pineapple" = 5) + foodtype = GRAIN | VEGETABLES | DAIRY | JUNKFOOD | FRUIT +/obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/meat + name = "Giant meat pizza slice" + icon_state = "big_veggie_slice" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "delight" = 5) + foodtype = GRAIN | VEGETABLES | DAIRY | JUNKFOOD | MEAT +/obj/item/reagent_containers/food/snacks/pizzaslice/framewrecker/cheese + name = "Giant cheese pizza slice" + icon_state = "big_cheese_slice" + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "delight" = 5) foodtype = GRAIN | VEGETABLES | DAIRY | JUNKFOOD /obj/item/reagent_containers/food/snacks/pizza/framewrecker/attackby(var/obj/item/weapon/W, var/mob/living/user) @@ -54,3 +74,20 @@ for(var/slicetype in slicelist) new slicetype(src.loc) qdel(src) + + + +// recipe + +/datum/crafting_recipe/food/framewrecker_pizza + name = "Framewrecker Pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 4, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 4, + /obj/item/reagent_containers/food/snacks/cheesewedge = 8, + /obj/item/reagent_containers/food/snacks/grown/tomato = 8, + /obj/item/reagent_containers/food/snacks/pineappleslice = 2, + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 2 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/framewrecker + subcategory = CAT_PIZZA diff --git a/tgstation.dme b/tgstation.dme index 4f79111f..88bddf24 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3091,9 +3091,9 @@ #include "GainStation13\code\mobs\races\caloritegolem.dm" #include "GainStation13\code\modules\client\preferences\preferences.dm" #include "GainStation13\code\modules\clothing\under\jobs\modcivilian.dm" -#include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm" #include "GainStation13\code\modules\food_and_drinks\drinks.dm" #include "GainStation13\code\modules\food_and_drinks\food.dm" +#include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm" #include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm" #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"