Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Pies/rootwiches #219

Merged
merged 1 commit into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions code/game/objects/items/food/lizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -810,3 +810,32 @@
tastes = list("sweet bugs" = 1)
foodtypes = MEAT | GORE | BUGS
w_class = WEIGHT_CLASS_SMALL

/obj/item/food/rootbread_peanut_butter_jelly
name = "peanut butter and jelly rootwich"
desc = "A classic PB&J rootwich, just like the replicant that replaced your mom used to make."
icon_state = "peanutbutter-jelly"
icon = 'icons/obj/food/lizard.dmi'
food_reagents = list(
/datum/reagent/consumable/nutriment = 2,
/datum/reagent/consumable/nutriment/protein = 4,
/datum/reagent/consumable/nutriment/vitamin = 2,
)
tastes = list("peanut butter" = 1, "jelly" = 1, "rootbread" = 2)
foodtypes = FRUIT | NUTS
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/rootbread_peanut_butter_banana
name = "peanut butter and banana rootwich"
desc = "A peanut butter rootwich with banana slices mixed in, a good high protein treat."
icon_state = "peanutbutter-banana"
icon = 'icons/obj/food/lizard.dmi'
food_reagents = list(
/datum/reagent/consumable/nutriment = 2,
/datum/reagent/consumable/nutriment/protein = 4,
/datum/reagent/consumable/banana = 5,
/datum/reagent/consumable/nutriment/vitamin = 2,
)
tastes = list("peanut butter" = 1, "banana" = 1, "rootbread" = 2)
foodtypes = FRUIT | NUTS
crafting_complexity = FOOD_COMPLEXITY_3
57 changes: 57 additions & 0 deletions code/game/objects/items/food/pie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@
tastes = list("pie" = 1, "meat" = 1)
foodtypes = GRAIN | MEAT
venue_value = FOOD_PRICE_NORMAL
slice_type = /obj/item/food/pieslice/meatpie
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pieslice/meatpie
name = "meat-pie slice"
desc = "Oh nice, meat pie!"
icon_state = "meatpie_slice"
tastes = list("pie" = 1, "meat" = 1)
foodtypes = GRAIN | MEAT
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pie/tofupie
Expand All @@ -135,6 +144,15 @@
)
tastes = list("pie" = 1, "tofu" = 1)
foodtypes = GRAIN | VEGETABLES
slice_type = /obj/item/food/pieslice/tofupie
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pieslice/tofupie
name = "tofu-pie slice"
desc = "Oh nice, meat pie- WAIT A MINUTE!!"
icon_state = "meatpie_slice"
tastes = list("pie" = 1, "disappointment" = 1, "tofu" = 1)
foodtypes = GRAIN | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pie/amanita_pie
Expand Down Expand Up @@ -187,6 +205,16 @@
)
tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
foodtypes = GRAIN | MEAT
slice_type = /obj/item/food/pieslice/xemeatpie
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pieslice/xemeatpie
name = "xeno-pie slice"
desc = "Oh god... Is that still moving?"
icon_state = "xenopie_slice"
tastes = list("pie" = 1, "acid" = 1, "meat" = 1)
foodtypes = GRAIN | MEAT
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pie/applepie
name = "apple pie"
Expand All @@ -198,6 +226,17 @@
)
tastes = list("pie" = 1, "apple" = 1)
foodtypes = GRAIN | FRUIT | SUGAR
slice_type = /obj/item/food/pieslice/apple
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pieslice/apple
name = "apple pie slice"
desc = "A slice of comfy apple pie, warm autumn memories ahead."
icon_state = "applepie_slice"
tastes = list("pie" = 1, "apples" = 1)
foodtypes = GRAIN | FRUIT | SUGAR
crafting_complexity = FOOD_COMPLEXITY_3


/obj/item/food/pie/cherrypie
name = "cherry pie"
Expand All @@ -209,6 +248,15 @@
)
tastes = list("pie" = 7, "Nicole Paige Brooks" = 2)
foodtypes = GRAIN | FRUIT | SUGAR
slice_type = /obj/item/food/pieslice/cherry
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pieslice/cherry
name = "cherry pie slice"
desc = "A slice of delicious cherry pie, I hope it's morellos!"
icon_state = "cherrypie_slice"
tastes = list("pie" = 1, "apples" = 1)
foodtypes = GRAIN | FRUIT | SUGAR
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pie/pumpkinpie
Expand Down Expand Up @@ -344,6 +392,15 @@
)
tastes = list("mint" = 1, "pie" = 1)
foodtypes = GRAIN | FRUIT | SUGAR
slice_type = /obj/item/food/pieslice/frostypie
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pieslice/frostypie
name = "frosty pie slice"
desc = "Tasty blue, like my favourite crayon!"
icon_state = "frostypie_slice"
tastes = list("pie" = 1, "mint" = 1)
foodtypes = GRAIN | FRUIT | SUGAR
crafting_complexity = FOOD_COMPLEXITY_3

/obj/item/food/pie/baklava
Expand Down
30 changes: 30 additions & 0 deletions code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,17 @@
result = /obj/item/food/rootdough
category = CAT_LIZARD

/datum/crafting_recipe/food/rootdough2
name = "Rootdough"
reqs = list(
/obj/item/food/grown/potato = 2,
/datum/reagent/consumable/soymilk = 15,
/datum/reagent/consumable/korta_flour = 5,
/datum/reagent/water = 10
)
result = /obj/item/food/rootdough
category = CAT_LIZARD

/datum/crafting_recipe/food/snail_nizaya
name = "Desert snail nizaya"
reqs = list(
Expand Down Expand Up @@ -432,6 +443,25 @@
result = /obj/item/food/steeped_mushrooms
category = CAT_LIZARD

/datum/crafting_recipe/food/rootbreadpbj
name = "Peanut butter and jelly rootwich"
reqs = list(
/obj/item/food/breadslice/root = 2,
/datum/reagent/consumable/peanut_butter = 5,
/datum/reagent/consumable/cherryjelly = 5
)
result = /obj/item/food/rootbread_peanut_butter_jelly
category = CAT_LIZARD

/datum/crafting_recipe/food/rootbreadpbb
name = "Peanut butter and banana rootwich"
reqs = list(
/obj/item/food/breadslice/root = 2,
/datum/reagent/consumable/peanut_butter = 5,
/obj/item/food/grown/banana = 1
)
result = /obj/item/food/rootbread_peanut_butter_banana
category = CAT_LIZARD
// Soups

/datum/crafting_recipe/food/reaction/soup/atrakor_dumplings
Expand Down
Binary file modified icons/obj/food/lizard.dmi
Binary file not shown.
Binary file modified icons/obj/food/piecake.dmi
Binary file not shown.