diff --git a/code/_globalvars/lists/reagents_lists.dm b/code/_globalvars/lists/reagents_lists.dm index 92e50d01ed7..e25462c1aff 100644 --- a/code/_globalvars/lists/reagents_lists.dm +++ b/code/_globalvars/lists/reagents_lists.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(standard_medicines, list("charcoal","toxin","cyanide","morphine GLOBAL_LIST_INIT(rare_medicines, list("syndicate_nanites","minttoxin","blood", "xenomicrobes")) // Drinks GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","limejuice","carrotjuice", - "berryjuice","poisonberryjuice","watermelonjuice","lemonjuice","banana", + "berryjuice","poisonberryjuice","watermelonjuice","lemonjuice","banana", "bungojuice", "nothing","potato","milk","soymilk","cream","coffee","tea","icecoffee", "icetea","cola","nuka_cola","spacemountainwind","thirteenloko","dr_gibb", "space_up","lemon_lime","beer","whiskey","gin","rum","vodka","holywater", diff --git a/code/game/machinery/vendors/departmental_vendors.dm b/code/game/machinery/vendors/departmental_vendors.dm index 069f677f5b4..d19ccc0ea9b 100644 --- a/code/game/machinery/vendors/departmental_vendors.dm +++ b/code/game/machinery/vendors/departmental_vendors.dm @@ -208,6 +208,7 @@ /obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 3, /obj/item/seeds/pineapple = 3, + /obj/item/seeds/plum = 3, /obj/item/seeds/poppy = 3, /obj/item/seeds/potato = 3, /obj/item/seeds/pumpkin = 3, diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 8ec0d951e81..d48707468de 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -30,6 +30,7 @@ "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"), "vinegar" = list("vinegar", "vinegar", "Perfect for chips, if you're feeling Space British."), "mayonnaise" = list("mayonnaise", "mayonnaise bottle", "An oily condiment made from egg yolks."), + "yogurt" = list("yogurt", "yogurt tub", "Some yogurt, produced by bacterial fermentation of milk. Yum."), "cherryjelly" = list("cherryjelly", "cherry jelly jar", "A sweet jelly made out of red cherries."), "peanutbutter" = list("peanutbutter", "peanut butter jar", "A smooth, nutty spread. Perfect for sandwiches."), "honey" = list("honey", "honey jar", "A sweet substance produced by bees."), @@ -227,6 +228,13 @@ list_reagents = list("mayonnaise" = 50) possible_states = list() +/obj/item/reagent_containers/condiment/yogurt + name = "yogurt tub" + desc = "Some yogurt, produced by bacterial fermentation of milk. Yum." + icon_state = "yogurt" + list_reagents = list("yogurt" = 50) + possible_states = list() + /obj/item/reagent_containers/condiment/cherryjelly name = "cherry jelly" desc = "A sweet jelly made out of red cherries." diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 1ef81b5dc01..2f3be77168f 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -259,6 +259,259 @@ tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) goal_difficulty = FOOD_GOAL_EASY +/obj/item/food/sliceable/holy_cake + name = "angel food cake" + desc = "A cake made for angels and chaplains alike! Contains holy water." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "holy_cake" + slice_path = /obj/item/food/holy_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#ffffff" + list_reagents = list("nutriment" = 1, "vitamin" = 3, "holywater" = 10) + tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/holy_cake_slice + name = "holy cake slice" + desc = "A slice of heavenly cake." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "holy_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#ffffff" + tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/liars_cake + name = "strawberry chocolate cake" + desc = "A chocolate cake with five strawberries on top. For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "liars_cake" + slice_path = /obj/item/food/liars_slice + slices_num = 5 + bitesize = 3 + filling_color = "#240606c7" + list_reagents = list("nutriment" = 20, "vitamin" = 5, "cocoa" = 5) + tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/liars_slice + name = "strawberry chocolate cake slice" + desc = "Just a slice of cake with five strawberries on top. \ + For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "liars_slice" + trash = /obj/item/trash/plate + filling_color = "#ffffff" + tastes = list("strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/vanilla_berry_cake + name = "blackberry and strawberry vanilla cake" + desc = "A plain cake, filled with assortment of blackberries and strawberries!" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "vanilla_berry_cake" + slice_path = /obj/item/food/vanilla_berry_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#f0e3e3c7" + list_reagents = list("nutriment" = 20, "vitamin" = 5, "vanilla" = 5) + tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/vanilla_berry_cake_slice + name = "blackberry and strawberry vanilla cake slice" + desc = "Just a slice of cake filled with assortment of blackberries and strawberries!" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "vanilla_berry_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#ffffff" + tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/hardware_cake + name = "hardware cake" + desc = "A \"cake\" that is made with electronic boards and leaks acid..." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "hardware_cake" + slice_path = /obj/item/food/hardware_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#4ac25e" + list_reagents = list("nutriment" = 20, "vitamin" = 5, "sacid" = 15, "oil" = 15) + tastes = list("acid" = 3, "metal" = 4, "glass" = 5) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/hardware_cake_slice + name = "hardware cake slice" + desc = "A slice of electronic boards and some acid." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "hardware_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#4ac25e" + tastes = list("acid" = 3, "metal" = 4, "glass" = 5) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/plum_cake + name = "plum cake" + desc = "A cake centred with Plums." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "plum_cake" + slice_path = /obj/item/food/plum_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#a128c5" + list_reagents = list("nutriment" = 20, "vitamin" = 10) + tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/plum_cake_slice + name = "plum cake slice" + desc = "A slice of plum cake." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "plum_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#a128c5" + tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/pound_cake + name = "pound cake" + desc = "A condensed cake made for filling people up quickly." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "pound_cake" + slice_path = /obj/item/food/pound_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#c4cab7" + list_reagents = list("nutriment" = 60, "vitamin" = 20) + tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/pound_cake_slice + name = "pound cake slice" + desc = "A slice of condensed cake made for filling people up quickly." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "pound_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#ffffff" + tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/pumpkin_spice_cake + name = "pumpkin spice cake" + desc = "A hollow cake with real pumpkin." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "pumpkin_spice_cake" + slice_path = /obj/item/food/pumpkin_spice_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#ee710a" + list_reagents = list("nutriment" = 20, "vitamin" = 10) + tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/pumpkin_spice_cake_slice + name = "pumpkin spice cake slice" + desc = "A spicy slice of pumpkin goodness." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "pumpkin_spice_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#ee710a" + tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/slime_cake + name = "slime cake" + desc = "A cake made of slimes. Probably not electrified." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "slime_cake" + slice_path = /obj/item/food/slime_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#0adfee" + list_reagents = list("nutriment" = 20, "vitamin" = 10) + tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/slime_cake_slice + name = "slime cake slice" + desc = "A slice of slime cake." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "slime_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#0adfee" + tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/spaceman_cake + name = "spaceman's cake" + desc = "A spaceman's trumpet frosted cake." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "trumpet_cake" + slice_path = /obj/item/food/spaceman_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#610977" + list_reagents = list("nutriment" = 20, "vitamin" = 10, "cream" = 5, "berryjuice", 5) + tastes = list("cake" = 4, "violets" = 2, "jam" = 2) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/spaceman_cake_slice + name = "spaceman's cake slice" + desc = "A slice of spaceman's trumpet frosted cake." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "trumpet_cake_slice" + trash = /obj/item/trash/plate + filling_color = "#610977" + tastes = list("cake" = 4, "violets" = 2, "jam" = 2) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/vanilla_cake + name = "vanilla cake" + desc = "A vanilla frosted cake." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "vanilla_cake" + slice_path = /obj/item/food/vanilla_cake_slice + slices_num = 5 + bitesize = 3 + filling_color = "#ece7ee" + list_reagents = list("nutriment" = 20, "vitamin" = 5, "sugar" = 15, "vanilla" = 15) + tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/vanilla_cake_slice + name = "vanilla cake slice" + desc = "A slice of vanilla frosted cake." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "vanilla_cake_slice" + filling_color = "#ece7ee" + tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10) + goal_difficulty = FOOD_GOAL_EASY + +/obj/item/food/sliceable/mothmallow + name = "mothmallow tray" + desc = "A light and fluffy vegan marshmallow flavoured with vanilla and rum and topped with soft chocolate. These are known to the moths as höllflöfstarkken: cloud squares." //höllflöf = cloud (höll = wind, flöf = cotton), starkken = squares + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "mothmallow_tray" + list_reagents = list("nutriment" = 20, "sugar" = 20) + slice_path = /obj/item/food/mothmallowslice + slices_num = 5 + bitesize = 3 + filling_color = "#eebe98" + tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) + goal_difficulty = FOOD_GOAL_DUPLICATE + +/obj/item/food/mothmallowslice + name = "mothmallow" + desc = "Fluffy little clouds of joy- in a strangely moth-like colour." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "mothmallow_slice" + filling_color = "#ece7ee" + filling_color = "#eebe98" + tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) + goal_difficulty = FOOD_GOAL_EASY + ////////////////////// // Cookies // @@ -295,6 +548,32 @@ tastes = list("sweetness" = 1) goal_difficulty = FOOD_GOAL_EASY +/obj/item/food/oatmeal_cookie + name = "oatmeal cookie" + desc = "The best of both cookie and oat." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "oatmeal_cookie" + list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("cookie" = 2, "oat" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/raisin_cookie + name = "raisin cookie" + desc = "Why would you put raisins on a cookie?" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "raisin_cookie" + list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("cookie" = 1, "raisins" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/peanut_butter_cookie + name = "peanut butter cookie" + desc = "A tasty, chewy peanut butter cookie." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "peanut_butter_cookie" + list_reagents = list("nutriment" = 6, "peanutbutter" = 5) + tastes = list("cookie" = 1, "peanut butter" = 2) + goal_difficulty = FOOD_GOAL_NORMAL ////////////////////// // Pies // @@ -429,6 +708,85 @@ tastes = list("pie" = 1, "pumpkin" = 1) goal_difficulty = FOOD_GOAL_NORMAL +/obj/item/food/beary_pie + name = "beary pie" + desc = "No brown bears, this is a good sign." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "beary_pie" + filling_color = "#F5B951" + list_reagents = list("nutriment" = 12, "vitamin" = 5, "protein" = 5) + tastes = list("pie" = 1, "meat" = 1, "salmon" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/sliceable/blumpkin_pie + name = "blumpkin pie" + desc = "An odd blue pie made with toxic blumpkin." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "blumpkin_pie" + slice_path = /obj/item/food/blumpkin_pie_slice + slices_num = 5 + bitesize = 3 + filling_color = "#102d8b" + list_reagents = list("nutriment" = 13, "vitamin" = 6, "blumpkinjuice" = 5) + tastes = list("pie" = 1, "a mouthful of pool water" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/blumpkin_pie_slice + name = "blumpkin pie slice" + desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "blumpkin_pie_slice" + trash = /obj/item/trash/plate + filling_color = "#102d8b" + tastes = list("pie" = 1, "a mouthful of pool water" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/sliceable/french_silk_pie + name = "french silk pie" + desc = "A decadent pie made of a creamy chocolate mousse filling topped with a layer of whipped cream and chocolate shavings. Sliceable." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "french_silk_pie" + slice_path = /obj/item/food/french_silk_pie_slice + slices_num = 5 + bitesize = 3 + filling_color = "#5e4337" + list_reagents = list("nutriment" = 12, "vitamin" = 4) + tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/french_silk_pie_slice + name = "french silk pie slice" + desc = "A slice of french silk pie, filled with a chocolate mousse and topped with a layer of whipped cream and chocolate shavings. Delicious enough to make you cry." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "french_silk_pie_slice" + trash = /obj/item/trash/plate + filling_color = "#5e4337" + tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/sliceable/frosty_pie + name = "frosty pie" + desc = "Tastes like blue and cold." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "frosty_pie" + slice_path = /obj/item/food/frosty_pie_slice + slices_num = 5 + bitesize = 3 + filling_color = "#5e4337" + list_reagents = list("nutriment" = 14, "vitamin" = 6) + tastes = list("mint" = 1, "pie" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/frosty_pie_slice + name = "frosty pie slice" + desc = "Tasty blue, like my favourite crayon!" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "frosty_pie_slice" + trash = /obj/item/trash/plate + filling_color = "#338cb6" + tastes = list("mint" = 1, "pie" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + ////////////////////// // Donuts // ////////////////////// @@ -442,7 +800,7 @@ list_reagents = list("nutriment" = 3, "sugar" = 2) var/extra_reagent = null filling_color = "#D2691E" - var/randomized_sprinkles = 1 + var/randomized_sprinkles = TRUE var/donut_sprite_type = DONUT_NORMAL tastes = list("donut" = 1) @@ -461,7 +819,7 @@ list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2) filling_color = "#FF69B4" donut_sprite_type = DONUT_FROSTED - randomized_sprinkles = 0 + randomized_sprinkles = FALSE /obj/item/food/donut/chaos name = "chaos donut" @@ -512,6 +870,232 @@ icon_state = "jdonut1" extra_reagent = "cherryjelly" +/obj/item/food/donut/apple + name = "apple donut" + desc = "Goes great with a shot of cinnamon schnapps." + icon_state = "donut_green" + list_reagents = list("nutriment" = 3, "sugar" = 2, "applejuice" = 2) + filling_color = "#24d21e" + tastes = list("donut" = 1, "apples" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/apple/jelly + name = "jelly apple donut" + desc = "Goes great with a shot of cinnamon schnapps." + icon_state = "jelly_green" + extra_reagent = "berryjuice" + +/obj/item/food/donut/apple/jelly/cherry + name = "jelly apple donut" + desc = "Goes great with a shot of cinnamon schnapps." + icon_state = "jelly_green" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/apple/jelly/slime + name = "jelly apple donut" + desc = "Goes great with a shot of cinnamon schnapps." + icon_state = "jelly_green" + extra_reagent = "slimejelly" + +/obj/item/food/donut/pink + name = "jelly pink donut" + desc = "Goes great with a soy latte." + icon_state = "donut_pink" + list_reagents = list("nutriment" = 3, "sugar" = 2, "berryjuice" = 3) + filling_color = "#D2691E" + tastes = list("donut" = 1, "berries" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/pink/jelly + name = "jelly pink donut" + desc = "Goes great with a soy latte." + icon_state = "jelly_pink" + extra_reagent = "berryjuice" + +/obj/item/food/donut/pink/jelly/cherry + name = "jelly pink donut" + desc = "Goes great with a soy latte." + icon_state = "jelly_pink" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/pink/jelly/slime + name = "jelly pink donut" + desc = "Goes great with a soy latte." + icon_state = "jelly_pink" + extra_reagent = "slimejelly" + +/obj/item/food/donut/blumpkin + name = "blumpkin donut" + desc = "Goes great with a mug of soothing drunken blumpkin." + icon_state = "donut_blue" + list_reagents = list("nutriment" = 3, "sugar" = 2, "blumpkinjuice" = 2) + filling_color = "#D2691E" + tastes = list("donut" = 1, "blumpkin" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/blumpkin/jelly + name = "jelly blumpkin donut" + desc = "Goes great with a mug of soothing drunken blumpkin." + icon_state = "jelly_blue" + extra_reagent = "berryjuice" + +/obj/item/food/donut/blumpkin/jelly/cherry + name = "jelly blumpkin donut" + desc = "Goes great with a mug of soothing drunken blumpkin." + icon_state = "jelly_blue" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/blumpkin/jelly/slime + name = "jelly blumpkin donut" + desc = "Goes great with a mug of soothing drunken blumpkin." + icon_state = "jelly_blue" + extra_reagent = "slimejelly" + +/obj/item/food/donut/caramel + name = "caramel donut" + desc = "Goes great with a mug of hot cocoa." + icon_state = "donut_beige" + list_reagents = list("nutriment" = 3, "sugar" = 2) + filling_color = "#D2691E" + tastes = list("donut" = 1, "buttery sweetness" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/caramel/jelly + name = "jelly caramel donut" + desc = "Goes great with a mug of hot cocoa." + icon_state = "jelly_beige" + extra_reagent = "berryjuice" + +/obj/item/food/donut/caramel/jelly/cherry + name = "jelly caramel donut" + desc = "Goes great with a mug of hot cocoa." + icon_state = "jelly_beige" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/caramel/jelly/slime + name = "jelly caramel donut" + desc = "Goes great with a mug of hot cocoa." + icon_state = "jelly_beige" + extra_reagent = "slimejelly" + +/obj/item/food/donut/chocolate + name = "chocolate donut" + desc = "Goes great with a glass of warm milk." + icon_state = "donut_choc" + list_reagents = list("nutriment" = 3, "sugar" = 2, "hot_coco" = 3) + filling_color = "#D2691E" + tastes = list("donut" = 1, "bitterness" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/chocolate/jelly + name = "jelly chocolate donut" + desc = "Goes great with a glass of warm milk." + icon_state = "jelly_choc" + extra_reagent = "berryjuice" + +/obj/item/food/donut/chocolate/jelly/cherry + name = "jelly chocolate donut" + desc = "Goes great with a glass of warm milk." + icon_state = "jelly_choc" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/chocolate/jelly/slime + name = "jelly chocolate donut" + desc = "Goes great with a glass of warm milk." + icon_state = "jelly_choc" + extra_reagent = "slimejelly" + +/obj/item/food/donut/matcha + name = "matcha donut" + desc = "Goes great with a cup of tea." + icon_state = "donut_olive" + list_reagents = list("nutriment" = 3, "sugar" = 2, "teapowder" = 2) + filling_color = "#D2691E" + tastes = list("donut" = 1, "matcha" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/matcha/jelly + name = "jelly matcha donut" + desc = "Goes great with a cup of tea." + icon_state = "jelly_olive" + extra_reagent = "berryjuice" + +/obj/item/food/donut/matcha/jelly/cherry + name = "jelly matcha donut" + desc = "Goes great with a cup of tea." + icon_state = "jelly_olive" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/matcha/jelly/slime + name = "jelly matcha donut" + desc = "Goes great with a cup of tea." + icon_state = "jelly_olive" + extra_reagent = "slimejelly" + +/obj/item/food/donut/bungo + name = "bungo donut" + desc = "Goes great with a mason jar of hippie's delight." + icon_state = "donut_yellow" + list_reagents = list("nutriment" = 3, "sugar" = 2, "bungojuice" = 3) + filling_color = "#D2691E" + tastes = list("donut" = 1, "tropical sweetness" = 1, "an acidic, poisonous tang" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/bungo/jelly + name = "jelly bungo donut" + desc = "Goes great with a mason jar of hippie's delight." + icon_state = "jelly_yellow" + extra_reagent = "berryjuice" + +/obj/item/food/donut/bungo/jelly/cherry + name = "jelly bungo donut" + desc = "Goes great with a mason jar of hippie's delight." + icon_state = "jelly_yellow" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/bungo/jelly/slime + name = "jelly bungo donut" + desc = "Goes great with a mason jar of hippie's delight." + icon_state = "jelly_yellow" + extra_reagent = "slimejelly" + +/obj/item/food/donut/spaceman + name = "spaceman's donut" + desc = "Goes great with a cold beaker of malk." + icon_state = "donut_purple" + list_reagents = list("nutriment" = 3, "sugar" = 2) + filling_color = "#D2691E" + tastes = list("donut" = 1, "violets" = 1) + randomized_sprinkles = FALSE + +/obj/item/food/donut/spaceman/jelly + name = "jelly spaceman's donut" + desc = "Goes great with a cold beaker of malk." + icon_state = "jelly_purple" + extra_reagent = "berryjuice" + +/obj/item/food/donut/spaceman/jelly/cherry + name = "jelly spaceman's donut" + desc = "Goes great with a cold beaker of malk." + icon_state = "jelly_purple" + extra_reagent = "cherryjelly" + +/obj/item/food/donut/spaceman/jelly/slime + name = "jelly spaceman's donut" + desc = "Goes great with a cold beaker of malk." + icon_state = "jelly_purple" + extra_reagent = "slimejelly" + +/obj/item/food/donut/meat + name = "Meat Donut" + desc = "Tastes as gross as it looks." + icon_state = "donut_meat" + list_reagents = list("nutriment" = 3, "protein" = 3, "ketchup" = 3) + filling_color = "#D2691E" + tastes = list("meat" = 1, "ketchup" = 1) + randomized_sprinkles = FALSE + + ////////////////////// // Pancakes // ////////////////////// @@ -572,6 +1156,37 @@ tastes = list("muffin" = 1) goal_difficulty = FOOD_GOAL_NORMAL +/obj/item/food/berry_muffin + name = "berry_muffin" + desc = "A delicious and spongy little cake, with berries." + icon = 'icons/obj/food/breakfast.dmi' + icon_state = "berry_muffin" + filling_color = "#ad2bbe" + list_reagents = list("nutriment" = 6, "berryjuice" = 2) + tastes = list("muffin" = 3, "berry" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/booberry_muffin + name = "booberry muffin" + desc = "My stomach is a graveyard! No living being can quench my bloodthirst!" + icon = 'icons/obj/food/breakfast.dmi' + alpha = 125 + icon_state = "berry_muffin" + filling_color = "#d9b6f5" + list_reagents = list("nutriment" = 6) + tastes = list("muffin" = 3, "spookiness" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/moffin + name = "moffin" + desc = "A delicious and spongy little cake." + icon = 'icons/obj/food/breakfast.dmi' + icon_state = "moffin" + filling_color = "#c7ab56" + list_reagents = list("nutriment" = 6) + tastes = list("muffin" = 3, "dust" = 1, "lint" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + /obj/item/food/berryclafoutis name = "berry clafoutis" desc = "No black birds, this is a good sign." @@ -623,6 +1238,120 @@ tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1) goal_difficulty = FOOD_GOAL_NORMAL +/obj/item/food/grape_tart + name = "grape tart" + desc = "A tasty dessert that reminds you of the wine you didn't make." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "grape_tart" + trash = /obj/item/trash/plate + filling_color = "#8c00ff" + bitesize = 3 + list_reagents = list("nutriment" = 4, "vitamin" = 4) + tastes = list("pie" = 1, "grape" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/mime_tart + name = "mime tart" + desc = "..." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "mime_tart" + trash = /obj/item/trash/plate + filling_color = "#8c00ff" + bitesize = 3 + list_reagents = list("nutriment" = 5, "vitamin" = 5, "nothing" = 5) + tastes = list("nothing" = 3) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/cherry_cupcake + name = "cherry cupcake" + desc = "A sweet cupcake with cherry bits." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "cherry_cupcake" + filling_color = "#8b1236" + list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("cake" = 3, "cherry" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/cherry_cupcake/blue + name = "blue cherry cupcake" + desc = "Blue cherries inside a delicious cupcake." + icon_state = "bluecherry_cupcake" + filling_color = "#0d1694" + tastes = list("cake" = 3, "bluecherry" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/honey_bun + name = "honey bun" + desc = "A sticky pastry bun glazed with honey." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "honey_bun" + filling_color = "#d88e06" + list_reagents = list("nutriment" = 6, "honey" = 6) + tastes = list("pastry" = 1, "sweetness" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/cannoli + name = "cannoli" + desc = "A Sicilian treat that turns you into a wise guy." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "cannoli" + filling_color = "#d88e06" + list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("pastry" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/chocolate_lava_tart + name = "chocolate lava tart" + desc = "A tasty dessert made of chocolate, with a liquid core." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "coco_lava_tart" + filling_color = "#411b02" + list_reagents = list("nutriment" = 4, "vitamin" = 4) + tastes = list("pie" = 1, "dark chocolate" = 3) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/chocolate_cornet + name = "chocolate cornet" + desc = "Which side's the head, the fat end or the thin end?" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "choco_cornet" + filling_color = "#411b02" + list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("biscuit" = 3, "chocolate" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/sliceable/dulce_de_batata + name = "dulce de batata" + desc = "A delicious jelly made with sweet potatoes." + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "dulce_de_batata" + slice_path = /obj/item/food/dulce_de_batata_slice + slices_num = 5 + bitesize = 3 + filling_color = "#411b02" + list_reagents = list("nutriment" = 14, "vitamin" = 8) + tastes = list("jelly" = 1, "sweet potato" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/dulce_de_batata_slice + name = "dulce de batata slice" + desc = "Tasty blue, like my favourite crayon!" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "dulce_de_batata_slice" + trash = /obj/item/trash/plate + filling_color = "#411b02" + tastes = list("jelly" = 1, "sweet potato" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/cheese_balls + name = "\improper ælorölen" //ælo = cheese, rölen = balls + desc = "Ælorölen (cheese balls) are a traditional mothic dessert, made of soft cheese, powdered sugar and flour, rolled into balls, battered and then deep fried. They're often served with either chocolate sauce or honey, or sometimes both!" + icon = 'icons/obj/food/bakedgoods.dmi' + icon_state = "moth_cheese_cakes" + filling_color = "#411b02" + list_reagents = list("protein" = 8, "sugar" = 12) + tastes = list("cheesecake" = 1, "chocolate" = 1, "honey" = 1) + goal_difficulty = FOOD_GOAL_NORMAL /obj/item/food/cracker name = "cracker" diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm index b5293309ca3..486c47a3161 100644 --- a/code/modules/food_and_drinks/food/foods/candy.dm +++ b/code/modules/food_and_drinks/food/foods/candy.dm @@ -94,6 +94,51 @@ filling_color = "#7D5F46" goal_difficulty = FOOD_GOAL_NORMAL +/obj/item/food/candy/chocolate_orange + name = "chocolate orange" + desc = "A festive chocolate orange." + icon_state = "choco_orange" + filling_color = "#7D5F46" + list_reagents = list("nutriment" = 3, "sugar" = 1) + tastes = list("chocolate" = 3, "oranges" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/candy/candied_pineapple + name = "candied pineapple" + desc = "A chunk of pineapple coated in sugar and dried into a chewy treat." + icon_state = "candied_pineapple" + filling_color = "#ffbd35" + list_reagents = list("nutriment" = 3, "vitamin" = 3) + tastes = list("sugar" = 2, "chewy pineapple" = 4) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/candy/chocolate_coin + name = "chocolate coin" + desc = "A completely edible but non-flippable festive coin." + icon_state = "choco_coin" + filling_color = "#7D5F46" + list_reagents = list("nutriment" = 4, "sugar" = 1, "cocoa" = 1, "vitamin" = 1) + tastes = list("chocolate" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/candy/chocolate_bunny + name = "chocolate bunny" + desc = "Contains less than 10% real rabbit!" + icon_state = "chocolate_bunny" + filling_color = "#7D5F46" + list_reagents = list("nutriment" = 4, "sugar" = 1, "cocoa" = 1) + tastes = list("chocolate" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + +/obj/item/food/candy/fudge_dice + name = "fudge dice" + desc = "A little cube of chocolate that tends to have a less intense taste if you eat too many at once." + icon_state = "choco_dice" + filling_color = "#7D5F46" + list_reagents = list("nutriment" = 3, "sugar" = 1, "cocoa" = 1) + tastes = list("fudge" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + // *********************************************************** // Candy Products (Pre-existing) // *********************************************************** diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 7e50a1667d3..fda18eae17b 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -69,6 +69,12 @@ filling_color = "#00FF33" list_reagents = list("mercury" = 5, "lsd" = 5, "ethanol" = 5, "weird_cheese" = 5) +/obj/item/food/cheese_curds + name = "cheese curds" + desc = "Known by many names throughout human cuisine, curd cheese is useful for a wide variety of dishes." + icon_state = "cheese_curds" + filling_color = "#FFF700" + list_reagents = list("cheese_curds" = 4, "nutriment" = 3, "vitamin" = 1) ////////////////////// // Plants // diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm index 6da52d5685b..bb56ebf6809 100644 --- a/code/modules/food_and_drinks/food/foods/soups.dm +++ b/code/modules/food_and_drinks/food/foods/soups.dm @@ -224,6 +224,15 @@ tastes = list("bitterness" = 1, "sourness" = 1, "nature" = 1) goal_difficulty = FOOD_GOAL_NORMAL +/obj/item/food/soup/red_porridge + name = "\improper Eltsløsk ül a priktæolk" //eltsløsk = red porridge, ül a = with, prikt = sour, æolk = cream + desc = "Red porridge with yogurt. The name and vegetable ingredients obscure the sweet nature of the dish, which is commonly served as a dessert aboard the fleet." + icon_state = "red_porridge" + filling_color = "#b36e40" + list_reagents = list("nutriment" = 6, "vitamin" = 2, "sugar" = 2, "yogurt" = 2) + tastes = list("sweet beets" = 1, "sugar" = 1, "sweetened yogurt" = 1) + goal_difficulty = FOOD_GOAL_NORMAL + ////////////////////// // Stews // diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm index 46a2eec574f..e3ab57ad8ab 100644 --- a/code/modules/food_and_drinks/recipes/recipes_candy.dm +++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm @@ -87,6 +87,41 @@ reagents = list("milk" = 1, "sugar" = 1) result = /obj/item/food/wafflecone +/datum/recipe/candy/candied_pineapple + reagents = list("sugar" = 2, "water" = 2) + items = list( + /obj/item/food/pineappleslice + ) + result = /obj/item/food/candy/candied_pineapple + +/datum/recipe/candy/chocolate_orange + items = list( + /obj/item/food/grown/citrus/orange, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/candy/chocolate_orange + +/datum/recipe/candy/chocolate_coin + items = list( + /obj/item/coin, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/candy/chocolate_coin + +/datum/recipe/candy/chocolate_bunny + reagents = list("sugar" = 2) + items = list( + /obj/item/food/chocolatebar + ) + result = /obj/item/food/candy/chocolate_bunny + +/datum/recipe/candy/fudge_dice + items = list( + /obj/item/dice, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/candy/fudge_dice + // *********************************************************** // Base Candy Recipes (unflavored / plain) // *********************************************************** diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 7457a25c82e..8ed36bca48c 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -52,6 +52,247 @@ ) result = /obj/item/food/donut/sprinkles +/datum/recipe/microwave/apple_donut + reagents = list("applejuice" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/apple + +/datum/recipe/microwave/apple_donut/jelly + reagents = list("applejuice" = 5, "berryjuice" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/apple/jelly + +/datum/recipe/microwave/apple_donut/jelly/slime + reagents = list("applejuice" = 5, "slimejelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/apple/jelly/slime + +/datum/recipe/microwave/apple_donut/jelly/cherry + reagents = list("applejuice" = 5, "cherryjelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/apple/jelly/cherry + +/datum/recipe/microwave/pink_donut + reagents = list("berryjuice" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/pink + +/datum/recipe/microwave/pink_donut/jelly + reagents = list("berryjuice" = 5, "sugar" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/pink/jelly + +/datum/recipe/microwave/pink_donut/jelly/slime + reagents = list("berryjuice" = 5, "slimejelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/pink/jelly/slime + +/datum/recipe/microwave/pink_donut/jelly/cherry + reagents = list("berryjuice" = 5, "cherryjelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/pink/jelly/cherry + +/datum/recipe/microwave/blumpkin_donut + reagents = list("blumpkinjuice" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/blumpkin + +/datum/recipe/microwave/blumpkin_donut/jelly + reagents = list("blumpkinjuice" = 5, "berryjuice" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/blumpkin/jelly + +/datum/recipe/microwave/blumpkin_donut/jelly/slime + reagents = list("blumpkinjuice" = 5, "slimejelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/blumpkin/jelly/slime + +/datum/recipe/microwave/blumpkin_donut/jelly/cherry + reagents = list("blumpkinjuice" = 5, "cherryjelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/blumpkin/jelly/cherry + +/datum/recipe/microwave/bungo_donut + reagents = list("bungojuice" = 5, "coldsauce" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/bungo + +/datum/recipe/microwave/bungo_donut/jelly + reagents = list("bungojuice" = 5, "coldsauce" = 5, "berryjuice" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/bungo/jelly + +/datum/recipe/microwave/bungo_donut/jelly/slime + reagents = list("bungojuice" = 5, "coldsauce" = 5, "slimejelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/bungo/jelly/slime + +/datum/recipe/microwave/bungo_donut/jelly/cherry + reagents = list("bungojuice" = 5, "coldsauce" = 5, "cherryjelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/bungo/jelly/cherry + +/datum/recipe/microwave/caramel_donut + items = list( + /obj/item/food/donut, + /obj/item/food/candy/caramel + ) + result = /obj/item/food/donut/caramel + +/datum/recipe/microwave/caramel_donut/jelly + reagents = list("berryjuice" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/candy/caramel + ) + result = /obj/item/food/donut/caramel/jelly + +/datum/recipe/microwave/caramel_donut/jelly/slime + reagents = list("slimejelly" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/candy/caramel + ) + result = /obj/item/food/donut/caramel/jelly/slime + +/datum/recipe/microwave/caramel_donut/jelly/cherry + reagents = list("cherryjelly" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/candy/caramel + ) + result = /obj/item/food/donut/caramel/jelly/cherry + +/datum/recipe/microwave/chocolate_donut + items = list( + /obj/item/food/donut, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/donut/chocolate + +/datum/recipe/microwave/chocolate_donut/jelly + reagents = list("berryjuice" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/donut/chocolate/jelly + +/datum/recipe/microwave/chocolate_donut/jelly/slime + reagents = list("slimejelly" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/donut/chocolate/jelly/slime + +/datum/recipe/microwave/chocolate_donut/jelly/cherry + reagents = list("cherryjelly" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/donut/chocolate/jelly/cherry + +/datum/recipe/microwave/matcha_donut + reagents = list("teapowder" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/matcha + +/datum/recipe/microwave/matcha_donut/jelly + reagents = list("teapowder" = 5, "berryjuice" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/matcha/jelly + +/datum/recipe/microwave/matcha_donut/jelly/slime + reagents = list("teapowder" = 5, "slimejelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/matcha/jelly/slime + +/datum/recipe/microwave/matcha_donut/jelly/cherry + reagents = list("teapowder" = 5, "cherryjelly" = 5) + items = list( + /obj/item/food/donut + ) + result = /obj/item/food/donut/matcha/jelly/cherry + +/datum/recipe/microwave/meat_donut + reagents = list("ketchup" = 5) + items = list( + /obj/item/food/cookiedough, + /obj/item/food/meat + ) + result = /obj/item/food/donut/meat + +/datum/recipe/microwave/spaceman_donut + items = list( + /obj/item/food/donut, + /obj/item/food/grown/trumpet + ) + result = /obj/item/food/donut/spaceman + +/datum/recipe/microwave/spaceman_donut/jelly + reagents = list("berryjuice" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/grown/trumpet + ) + result = /obj/item/food/donut/spaceman/jelly + +/datum/recipe/microwave/spaceman_donut/jelly/slime + reagents = list("slimejelly" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/grown/trumpet + ) + result = /obj/item/food/donut/spaceman/jelly/slime + +/datum/recipe/microwave/spaceman_donut/jelly/cherry + reagents = list("cherryjelly" = 5) + items = list( + /obj/item/food/donut, + /obj/item/food/grown/trumpet + ) + result = /obj/item/food/donut/spaceman/jelly/cherry + /datum/recipe/microwave/human/burger items = list( /obj/item/food/meat/human, @@ -1144,6 +1385,29 @@ ) result = /obj/item/food/frozen/icecreamsandwich +/datum/recipe/microwave/cheese_balls + reagents = list("flour" = 5, "sugar" = 5, "honey" = 5) + items = list( + /obj/item/food/cheese_curds, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/cheese_balls + +/datum/recipe/microwave/red_porridge + reagents = list("vanilla" = 5, "sugar" = 5, "yogurt" = 10) + items = list( + /obj/item/food/grown/redbeet + ) + result = /obj/item/food/soup/red_porridge + +/datum/recipe/microwave/dulce_de_batata + reagents = list("vanilla" = 5, "water" = 5) + items = list( + /obj/item/food/grown/potato/sweet, + /obj/item/food/grown/potato/sweet + ) + result = /obj/item/food/sliceable/dulce_de_batata + /datum/recipe/microwave/berryicecreamsandwich reagents = list("ice" = 5, "cream" = 5) items = list( diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index 8b0dc71ba6b..9012cba58c6 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -77,6 +77,152 @@ ) result = /obj/item/food/muffin +/datum/recipe/oven/berry_muffin + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/grown/berries + ) + result = /obj/item/food/berry_muffin + +/datum/recipe/oven/booberry_muffin + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/grown/berries, + /obj/item/food/ectoplasm + ) + result = /obj/item/food/booberry_muffin + +/datum/recipe/oven/moffin + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/dough, + /obj/item/grown/cotton + ) + result = /obj/item/food/moffin + +/datum/recipe/oven/holy_cake + reagents = list("milk" = 5, "sugar" = 15, "holywater" = 15) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough + ) + result = /obj/item/food/sliceable/holy_cake + +/datum/recipe/oven/liars_cake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries, + /obj/item/food/chocolatebar, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/sliceable/liars_cake + +/datum/recipe/oven/vanilla_berry_cake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries, + /obj/item/food/grown/berries + ) + result = /obj/item/food/sliceable/vanilla_berry_cake + +/datum/recipe/oven/hardware_cake + reagents = list("milk" = 5, "sugar" = 15, "sacid" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/circuitboard, + /obj/item/circuitboard + ) + result = /obj/item/food/sliceable/hardware_cake + +/datum/recipe/oven/plum_cake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/grown/plum, + /obj/item/food/grown/plum + ) + result = /obj/item/food/sliceable/plum_cake + +/datum/recipe/oven/pound_cake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/food/sliceable/plaincake, + /obj/item/food/sliceable/plaincake, + /obj/item/food/sliceable/plaincake, + /obj/item/food/sliceable/plaincake + ) + result = /obj/item/food/sliceable/pound_cake + +/datum/recipe/oven/pumpkin_spice_cake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/grown/pumpkin, + /obj/item/food/grown/pumpkin + ) + result = /obj/item/food/sliceable/pumpkin_spice_cake + +/datum/recipe/oven/slime_cake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/slime_extract + ) + result = /obj/item/food/sliceable/slime_cake + +/datum/recipe/oven/spaceman_cake + reagents = list("milk" = 5, "sugar" = 15, "cream" = 5, "berryjuice" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/grown/trumpet, + /obj/item/food/grown/trumpet + ) + result = /obj/item/food/sliceable/spaceman_cake + +/datum/recipe/oven/vanilla_cake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/dough, + /obj/item/food/grown/vanillapod, + /obj/item/food/grown/vanillapod + ) + result = /obj/item/food/sliceable/vanilla_cake + +/datum/recipe/oven/mothmallow + reagents = list("vanilla" = 5, "sugar" = 15, "rum" = 5) + items = list( + /obj/item/food/grown/soybeans + ) + result = /obj/item/food/sliceable/mothmallow + /datum/recipe/oven/carrotcake reagents = list("milk" = 5, "sugar" = 15) items = list( @@ -169,6 +315,127 @@ ) result = /obj/item/food/berryclafoutis +/datum/recipe/oven/cherry_cupcake + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/grown/cherries + ) + result = /obj/item/food/cherry_cupcake + +/datum/recipe/oven/cherry_cupcake/blue + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/grown/bluecherries + ) + result = /obj/item/food/cherry_cupcake/blue + +/datum/recipe/oven/oatmeal_cookie + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/grown/oat + ) + result = /obj/item/food/oatmeal_cookie + +/datum/recipe/oven/raisin_cookie + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/dough, + /obj/item/food/no_raisin + ) + result = /obj/item/food/raisin_cookie + +/datum/recipe/oven/peanut_butter_cookie + reagents = list("milk" = 5, "sugar" = 5, "peanutbutter" = 5) + items = list( + /obj/item/food/dough + ) + result = /obj/item/food/peanut_butter_cookie + +/datum/recipe/oven/chocolate_cornet + reagents = list("milk" = 5, "sugar" = 5, "sodiumchloride" = 1) + items = list( + /obj/item/food/cookiedough, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/chocolate_cornet + +/datum/recipe/oven/honey_bun + reagents = list("milk" = 5, "sugar" = 5, "honey" = 5) + items = list( + /obj/item/food/cookiedough + ) + result = /obj/item/food/honey_bun + +/datum/recipe/oven/cannoli + reagents = list("milk" = 1, "sugar" = 3) + items = list( + /obj/item/food/cookiedough + ) + result = /obj/item/food/cannoli + +/datum/recipe/oven/beary_pie + items = list( + /obj/item/food/sliceable/flatdough, + /obj/item/food/monstermeat/bearmeat, + /obj/item/food/grown/berries + ) + result = /obj/item/food/beary_pie + +/datum/recipe/oven/blumpkin_pie + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/sliceable/flatdough, + /obj/item/food/grown/pumpkin/blumpkin + ) + result = /obj/item/food/sliceable/blumpkin_pie + +/datum/recipe/oven/chocolate_lava_tart + reagents = list("milk" = 5, "sugar" = 5) + items = list( + /obj/item/food/sliceable/flatdough, + /obj/item/food/chocolatebar, + /obj/item/food/chocolatebar, + /obj/item/food/chocolatebar, + /obj/item/slime_extract + ) + result = /obj/item/food/chocolate_lava_tart + +/datum/recipe/oven/french_silk_pie + reagents = list("sugar" = 5) + items = list( + /obj/item/food/sliceable/flatdough, + /obj/item/food/chocolatebar, + /obj/item/food/chocolatebar + ) + result = /obj/item/food/sliceable/french_silk_pie + +/datum/recipe/oven/frosty_pie + items = list( + /obj/item/food/sliceable/flatdough, + /obj/item/food/grown/bluecherries + ) + result = /obj/item/food/sliceable/frosty_pie + +/datum/recipe/oven/grape_tart + reagents = list("milk = 5", "sugar" = 5) + items = list( + /obj/item/food/sliceable/flatdough, + /obj/item/food/grown/grapes, + /obj/item/food/grown/grapes, + /obj/item/food/grown/grapes + ) + result = /obj/item/food/grape_tart + +/datum/recipe/oven/mime_tart + reagents = list("nothing" = 5, "milk = 5", "sugar" = 5) + items = list( + /obj/item/food/sliceable/flatdough + ) + result = /obj/item/food/mime_tart + /datum/recipe/oven/tofubread items = list( /obj/item/food/dough, diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index cc21fca814e..48c021c26e8 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -47,3 +47,40 @@ filling_color = "#FEFEFE" tastes = list("vanilla" = 1) distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it. + +// Bungo Pod + +/obj/item/seeds/cocoapod/bungotree + name = "pack of bungo tree seeds" + desc = "These seeds grow into bungo trees. They appear to be heavy and almost perfectly spherical." + icon_state = "seed-bungotree" + species = "bungotree" + plantname = "Bungo Tree" + product = /obj/item/food/grown/bungofruit + lifespan = 30 + maturation = 4 + yield = 3 + production = 7 + mutatelist = null + reagents_add = list("enzyme"= 0.1, "nutriment" = 0.1, "bungojuice" = 0.1) + growthstages = 4 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + icon_grow = "bungotree-grow" + icon_dead = "bungotree-dead" + +/obj/item/food/grown/bungofruit + seed = /obj/item/seeds/cocoapod/bungotree + name = "bungo fruit" + desc = "A strange fruit, tough leathery skin protects its juicy flesh and large poisonous seed." + icon_state = "bungo" + trash = /obj/item/food/grown/bungopit + tastes = list("bungo" = 2, "tropical fruitiness" = 1, "an acidic, poisonous tang" = 1) + distill_reagent = null + +/obj/item/food/grown/bungopit + seed = /obj/item/seeds/cocoapod/bungotree + name = "bungo pit" + icon_state = "bungopit" + desc = "A large seed from a bungo fruit." + w_class = WEIGHT_CLASS_TINY + tastes = list("acrid bitterness" = 1) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 095aeca5190..505ccd1b123 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -38,7 +38,7 @@ icon_grow = "lily-grow" icon_dead = "lily-dead" product = /obj/item/food/grown/lily - mutatelist = list() + mutatelist = list(/obj/item/seeds/poppy/lily/trumpet) /obj/item/food/grown/lily seed = /obj/item/seeds/poppy/lily @@ -51,6 +51,36 @@ filling_color = "#C7BBAD" distill_reagent = "vermouth" +//Spaceman's Trumpet + +/obj/item/seeds/poppy/lily/trumpet + name = "pack of spaceman's trumpet seeds" + desc = "A plant sculped by extensive genetic engineering. The spaceman's trumpet is said to bear no resemblance to its wild ancestors. Inside NT AgriSci circles it is better known as NTPW-0372." + icon_state = "seed-trumpet" + species = "spacemanstrumpet" + plantname = "Spaceman's Trumpet Plant" + product = /obj/item/food/grown/trumpet + lifespan = 80 + production = 5 + endurance = 10 + maturation = 12 + yield = 4 + potency = 20 + growthstages = 4 + weed_rate = 2 + weed_chance = 10 + growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' + icon_grow = "spacemanstrumpet-grow" + icon_dead = "spacemanstrumpet-dead" + mutatelist = null + reagents_add = list(/datum/reagent/consumable/nutriment = 0.05) + +/obj/item/food/grown/trumpet + seed = /obj/item/seeds/poppy/lily/trumpet + name = "spaceman's trumpet" + desc = "A vivid flower that smells faintly of freshly cut grass. Touching the flower seems to stain the skin some time after contact, yet most other surfaces seem to be unaffected by this phenomenon." + icon_state = "spacemanstrumpet" + // Geranium /obj/item/seeds/poppy/geranium name = "pack of geranium seeds" diff --git a/code/modules/hydroponics/grown/plum.dm b/code/modules/hydroponics/grown/plum.dm new file mode 100644 index 00000000000..dc342afa780 --- /dev/null +++ b/code/modules/hydroponics/grown/plum.dm @@ -0,0 +1,23 @@ +/obj/item/seeds/plum + name = "pack of plum seeds" + desc = "These seeds grow into plum trees." + icon_state = "seed-plum" + species = "plum" + plantname = "Plum Tree" + product = /obj/item/food/grown/plum + lifespan = 55 + endurance = 35 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + icon_grow = "plum-grow" + icon_dead = "plum-dead" + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list("nutriment" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.1) + +/obj/item/food/grown/plum + seed = /obj/item/seeds/plum + name = "plum" + desc = "A poet's favorite fruit. Noice." + icon_state = "plum" + filling_color = "#F6CB0B" + bitesize = 4 + tastes = list("plum" = 1) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 85376f0d8e2..45eae9706d4 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -76,7 +76,8 @@ /obj/item/food/grown/pumpkin = list("pumpkinjuice" = 0), /obj/item/food/grown/apple = list("applejuice" = 0), /obj/item/food/grown/grapes = list("grapejuice" = 0), - /obj/item/food/grown/pineapple = list("pineapplejuice" = 0) + /obj/item/food/grown/pineapple = list("pineapplejuice" = 0), + /obj/item/food/grown/bungofruit = list("bungojuice" = 0) ) var/list/dried_items = list( diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index c1561de6b6e..1371a3bf522 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -140,6 +140,15 @@ drink_desc = "Apple juice. Maybe it would have been better in a pie..." taste_description = "apple juice" +/datum/reagent/consumable/bungojuice + name = "Bungo Juice" + id = "bungojuice" + description = "Exotic! You feel like you are on vacation already." + color = "#F9E43D" + drink_name = "Bungo Juice" + drink_desc = "Exotic! You feel like you are on vacation already." + taste_description = "succulent bungo with an acidic poisonous tang" + /datum/reagent/consumable/drink/watermelonjuice name = "Watermelon Juice" id = "watermelonjuice" diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index a983c66b1a0..ead46024498 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -679,6 +679,22 @@ if(volume >= 5 && !isspaceturf(T)) new /obj/item/food/weirdcheesewedge(T) +/datum/reagent/consumable/cheese_curds + name = "Cheese Curds" + id = "cheese_curds" + description = "Some mushed up cheese curds. You're not quite sure why you did this." + reagent_state = SOLID + color = "#FFFF00" + taste_description = "salty cheese" + +/datum/reagent/consumable/yogurt + name = "yogurt" + id = "yogurt" + description = "Some yogurt, produced by bacterial fermentation of milk. Yum." + reagent_state = LIQUID + color = "#FFFFFF" + taste_description = "yogurt" + /datum/reagent/consumable/beans name = "Refried beans" id = "beans" diff --git a/code/modules/reagents/chemistry/recipes/food_reactions.dm b/code/modules/reagents/chemistry/recipes/food_reactions.dm index 4a0ab9df007..583f354d333 100644 --- a/code/modules/reagents/chemistry/recipes/food_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/food_reactions.dm @@ -77,6 +77,26 @@ for(var/i = 1, i <= created_volume, i++) new /obj/item/food/sliceable/cheesewheel(location) +/datum/chemical_reaction/cheese_curds + name = "Cheese Curds" + id = "cheese_curds" + result = null + required_reagents = list("milk" = 15, "vinegar" = 5, "cream" = 5) + result_amount = 1 + min_temp = T0C + 80 + +/datum/chemical_reaction/cheese_curds/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/food/cheese_curds(location) + +/datum/chemical_reaction/yogurt + name = "Yogurt" + id = "yogurt" + result = "yogurt" + required_reagents = list("milk" = 10, "virusfood" = 2) + result_amount = 10 + /datum/chemical_reaction/syntiflesh name = "Syntiflesh" id = "syntiflesh" diff --git a/icons/obj/food/bakedgoods.dmi b/icons/obj/food/bakedgoods.dmi index 967d54ae968..4f738921fa5 100644 Binary files a/icons/obj/food/bakedgoods.dmi and b/icons/obj/food/bakedgoods.dmi differ diff --git a/icons/obj/food/breakfast.dmi b/icons/obj/food/breakfast.dmi index 0d8cbc9bcbd..ae5aff5037e 100644 Binary files a/icons/obj/food/breakfast.dmi and b/icons/obj/food/breakfast.dmi differ diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi index a58abc2e9d0..dd7acd3200b 100644 Binary files a/icons/obj/food/candy.dmi and b/icons/obj/food/candy.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index 224c8bfb9bf..4ddb808bcd3 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index f5388ee4345..d5a6a5c1f09 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi index c92df9de768..5a16fcbaee2 100644 Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index 8d77be19157..f01bec11fce 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 0a096508541..ded1705672d 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index a303e76a4db..db4b781941c 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/paradise.dme b/paradise.dme index 6beefbae14c..7b2751bb20e 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1989,6 +1989,7 @@ #include "code\modules\hydroponics\grown\onion.dm" #include "code\modules\hydroponics\grown\peanut.dm" #include "code\modules\hydroponics\grown\pineapple.dm" +#include "code\modules\hydroponics\grown\plum.dm" #include "code\modules\hydroponics\grown\potato.dm" #include "code\modules\hydroponics\grown\pumpkin.dm" #include "code\modules\hydroponics\grown\random_seeds.dm"