diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index 7e186185600..9defd4725b4 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -216,13 +216,13 @@ ) result = /obj/item/reagent_containers/food/snacks/pbtoast -/singleton/recipe/notellabread +/singleton/recipe/NTellabread appliance = MIX reagents = list(/singleton/reagent/nutriment/choconutspread = 5) items = list( /obj/item/reagent_containers/food/snacks/breadslice ) - result = /obj/item/reagent_containers/food/snacks/notellabread + result = /obj/item/reagent_containers/food/snacks/NTellabread /singleton/recipe/slimetoast appliance = SKILLET diff --git a/code/modules/cooking/recipes/recipes_confections.dm b/code/modules/cooking/recipes/recipes_confections.dm index 01e89b08254..6d4130e1131 100644 --- a/code/modules/cooking/recipes/recipes_confections.dm +++ b/code/modules/cooking/recipes/recipes_confections.dm @@ -59,3 +59,55 @@ reagents = list(/singleton/reagent/nutriment/coco = 10 , /singleton/reagent/drink/milk/cream = 5) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify it result = /obj/item/storage/box/fancy/food/pralinebox + +/singleton/recipe/chocolatecrepe + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/plaincrepe + ) + reagents = list(/singleton/reagent/nutriment/choconutspread = 5) + result = /obj/item/reagent_containers/food/snacks/crepe/chocolate + +/singleton/recipe/chocolatecrepe_fancy + fruit = list("banana" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/crepe/chocolate, + /obj/item/reagent_containers/food/snacks/icecream + ) + result = /obj/item/reagent_containers/food/snacks/crepe/chocolatefancy + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/whitechocolatecrepe + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/plaincrepe, + /obj/item/reagent_containers/food/snacks/whitechocolate + ) + result = /obj/item/reagent_containers/food/snacks/crepe/whitechocolate + +/singleton/recipe/whitechocolatecrepe_fancy + fruit = list("strawberries" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/crepe/whitechocolate, + /obj/item/reagent_containers/food/snacks/icecream + ) + result = /obj/item/reagent_containers/food/snacks/crepe/whitechocolate_fancy + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/breakfastcrepe //yeah savory crepes are not exactly confections but... still kind of the best place for it. + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/plaincrepe, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + reagents = list(/singleton/reagent/nutriment/protein/egg = 3) + result = /obj/item/reagent_containers/food/snacks/crepe/breakfast + +/singleton/recipe/hamcheesecrepe + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/plaincrepe, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cutlet + ) + result = /obj/item/reagent_containers/food/snacks/crepe/hamcheese diff --git a/code/modules/cooking/recipes/recipes_ingredients.dm b/code/modules/cooking/recipes/recipes_ingredients.dm index 3a49190440d..82534698a30 100644 --- a/code/modules/cooking/recipes/recipes_ingredients.dm +++ b/code/modules/cooking/recipes/recipes_ingredients.dm @@ -17,3 +17,9 @@ /singleton/recipe/whitechocolate/soy reagents = list(/singleton/reagent/nutriment/vanilla = 2, /singleton/reagent/drink/milk/soymilk = 2, /singleton/reagent/sugar = 2) + +/singleton/recipe/plaincrepe + appliance = SKILLET + reagents = list(/singleton/reagent/nutriment/coating/batter = 5) + result = /obj/item/reagent_containers/food/snacks/plaincrepe + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index f15b9f415aa..e9f430ff9eb 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -194,6 +194,19 @@ fruit = list("apple" = 2) result = /obj/item/reagent_containers/food/snacks/sliceable/cake/apple +/singleton/recipe/cake/NTellacheesecake + reagents = list(/singleton/reagent/drink/milk = 5, /singleton/reagent/nutriment/choconutspread = 15, /singleton/reagent/sugar = 10) + items = list( + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cookiesnack, + /obj/item/reagent_containers/food/snacks/cookiesnack, + /obj/item/reagent_containers/food/snacks/cookiesnack, + /obj/item/reagent_containers/food/snacks/cookiesnack, + /obj/item/reagent_containers/food/snacks/cookiesnack, + /obj/item/reagent_containers/food/snacks/cookiesnack //Oreo cookies aren't a thing in the game yet but if/when they're made, please replace this with them! + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/cake/NTellacheesecake + //Predesigned pies //======================= /singleton/recipe/berryclafoutis diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index b6f892d0d9e..748bc2fa7e6 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -135,6 +135,12 @@ /singleton/reagent/drink/milkshake value = 0.12 +/singleton/reagent/drink/NTellamilkshake + value = 0.14 + +/singleton/reagent/drink/NTellahotchocolate + value = 0.13 + /singleton/reagent/drink/rewriter value = 0.11 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 0e64fb221fa..01f57f48e37 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -608,9 +608,9 @@ color = "#2c1000" taste_description = "nutty chocolate" taste_mult = 2 - condiment_name = "notella jar" - condiment_desc = "Humans insist this chocolatey spread might be the best thing they've ever created." - condiment_icon_state = "notellajar" + condiment_name = "NTella jar" + condiment_desc = "Originally called 'Entella', it was rebranded after being bought by Getmore. Some Humans insist this chocolate hazelnut spread might be the best thing they've ever created." + condiment_icon_state = "NTellajar" condiment_center_of_mass = list("x"=16, "y"=8) /singleton/reagent/nutriment/groundpeanuts @@ -2407,6 +2407,28 @@ glass_name = "mug of apple cider juice" glass_desc = "It's just spiced up apple juice. Sometimes the barista can't work miracles." +/singleton/reagent/drink/NTellamilkshake + name = "NTella Milkshake" + description = "An intensely sweet chocolatey concoction with whipped cream on top." + color = "#6d4124" + taste_description = "overwhelmingly sweet chocolate" + + glass_icon_state = "NTellamilkshake" + glass_name = "glass of NTella milkshake" + glass_desc = "Oh look, it's that thing you actually want to get but probably shouldn't." + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/NTellahotchocolate + name = "NTella Hot Chocolate" + description = "It's like a cup of hot chocolate except... More everything." + color = "#63432e" + taste_description = "hazelnutty, creamy chocolate" + + glass_icon_state = "NTellahotchocolate" + glass_name = "glass of NTella hot chocolate" + glass_desc = "A very chocolatey drink for the days so rough, so cold, or so celebratory that a regular hot hcocolate just won't cut it. It has marshmallows!" + glass_center_of_mass = list("x"=16, "y"=7) + /singleton/reagent/drink/toothpaste name = "Toothpaste" description = "A paste commonly used in oral hygiene." @@ -2421,6 +2443,7 @@ glass_desc = "Dentists recommend drinking zero glasses a day, and instead brushing normally." glass_center_of_mass = list("x"=7, "y"=8) + /singleton/reagent/drink/toothpaste/affect_ingest(var/mob/living/carbon/human/M, var/alien, var/removed, var/datum/reagents/holder) if(!istype(M)) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 178c6ac9c08..0d548e047b5 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3020,6 +3020,20 @@ catalysts = list(/singleton/reagent/enzyme = 5) result_amount = 1 +/datum/chemical_reaction/drink/NTellashake + name = "NTella milkshake" + id = "NTellamilkshake" + result = /singleton/reagent/drink/NTellamilkshake + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/nutriment/choconutspread = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/NTellahotchocolate + name = "NTella hot chocolate" + id = "NTellahotchocolate" + result = /singleton/reagent/drink/NTellahotchocolate + required_reagents = list(/singleton/reagent/drink/milk = 2, /singleton/reagent/nutriment/choconutspread = 2, /singleton/reagent/drink/milk/cream = 2) + result_amount = 6 + /datum/chemical_reaction/drink/drink/mimosa name = "Mimosa" id = "mimosa" diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index 1e1a685e6a9..892d1235667 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -385,8 +385,8 @@ reagent_data = list(/singleton/reagent/nutriment = list("toasted bread" = 2)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/notellabread - name = "notella bread slice" +/obj/item/reagent_containers/food/snacks/NTellabread + name = "NTella bread slice" desc = "A slice of bread covered with delicious chocolate-hazelnut spread." icon = 'icons/obj/item/reagent_containers/food/bread.dmi' icon_state = "chocobread" diff --git a/code/modules/reagents/reagent_containers/food/snacks/confections.dm b/code/modules/reagents/reagent_containers/food/snacks/confections.dm index f75cbdae6fd..cced7194605 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/confections.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/confections.dm @@ -135,3 +135,67 @@ desc = "A square made of layers of three chocolates." icon_state = "praline10" reagent_data = list(/singleton/reagent/nutriment = list("milk, white, and dark chocolate" = 1)) + +//crepe dishes + +/obj/item/reagent_containers/food/snacks/crepe + name = "crepe" + desc = "A very thin pancake." + trash = /obj/item/trash/plate + icon = 'icons/obj/item/reagent_containers/food/confections.dmi' + filling_color = "#d4b28b" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/crepe/chocolate + name = "chocolate crepe" + desc = "A very thin pancake with some NTella spread in it." + icon_state = "chocolatecrepe" + filling_color = "#3d2313" + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/choconutspread = 4) + reagent_data = list(/singleton/reagent/nutriment = list("dough" = 2)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/crepe/chocolatefancy + name = "fancy chocolate crepe" + desc = "chocolate crepes, ice cream, blueberries and banana slices. separately they're all cheap snacks from a 10 year old's birthday party snack table. But together they somehow make a really fancy looking dessert." + icon_state = "chocolatecrepe_fancy" + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/choconutspread = 4) + reagent_data = list(/singleton/reagent/nutriment/choconutspread = list("hazelnutty chocolate" = 10), /singleton/reagent/nutriment = list("banana" = 4, "ice cream" = 4, "dough" = 3)) + filling_color = "#3d2313" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/crepe/whitechocolate + name = "white chocolate crepe" + desc = "A very thin pancake with some white chocolate in it." + icon_state = "whitechocolatecrepe" + filling_color = "#fffcd3" + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/choconutspread = 4, /singleton/reagent/sugar = 2) + reagent_data = list(/singleton/reagent/nutriment = list("dough" = 2)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/crepe/whitechocolate_fancy + name = "fancy white chocolate crepe" + desc = "White chocolate, strawberries and ice cream! Yum yum!" + icon_state = "whitechocolatecrepe_fancy" + filling_color = "#fffcd3" + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/sugar = 4, /singleton/reagent/nutriment/vanilla = 2) + reagent_data = list(/singleton/reagent/nutriment = list("white chocolate" = 8, "strawberry" = 5, "dough" = 2)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/crepe/breakfast + name = "savory breakfast crepe" + desc = "Cheddar cheese, eggs, crepe." + icon_state = "savorycrepe" + filling_color = "#ffe367" + reagents_to_add = list(/singleton/reagent/nutriment = 5) + reagent_data = list(/singleton/reagent/nutriment = list("egg" = 6, "cheese" = 7, "chives" = 4)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/crepe/hamcheese + name = "ham and cheese crepe" + desc = "For people who look at desserts and think 'this would be better if we took out all the sweet things and replaced them with meat'." + icon_state = "hamcheesecrepe" + filling_color = "#e7aac7" + reagents_to_add = list(/singleton/reagent/nutriment = 5) + reagent_data = list(/singleton/reagent/nutriment = list("chives" = 2)) + bitesize = 3 diff --git a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm index 33d86e4b86f..3269183f0a0 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm @@ -231,3 +231,14 @@ reagent_data = list(/singleton/reagent/nutriment = list("pickled lettuce" = 4)) bitesize = 2 trash = /obj/item/trash/plate + +/obj/item/reagent_containers/food/snacks/plaincrepe + name = "plain crepe" + desc = "A very thin type of pancake, typically used to wrap sweet things for desserts or, more controversially, savory things." + icon = 'icons/obj/item/reagent_containers/food/ingredients.dmi' + icon_state = "plaincrepe" + bitesize = 2 + reagent_data = list(/singleton/reagent/nutriment = list("dough" = 2)) + center_of_mass = list("x"=16, "y"=16) + reagents_to_add = list(/singleton/reagent/nutriment = 1) + filling_color = "#caa178" diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index d4dad657f87..f9162273bb5 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -415,6 +415,28 @@ reagents_to_add = list(/singleton/reagent/nutriment = 3) reagent_data = list(/singleton/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "apple" = 5)) +/obj/item/reagent_containers/food/snacks/sliceable/cake/NTellacheesecake + name = "NTella cheesecake" + desc = "An elaborate layer cheesecake made with chocolate hazelnut spread. You gain calories just by looking at it for too long." + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "NTellacheesecake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/NTellacheesecake_slice + slices_num = 5 + filling_color = "#331c03" + center_of_mass = list("x"=16, "y"=10) + reagents_to_add = list(/singleton/reagent/nutriment = 20) + reagent_data = list(/singleton/reagent/nutriment = list("hazelnut chocolate" = 15, "creamy cheese" = 10, "crunchy cookie base" = 5)) + +/obj/item/reagent_containers/food/snacks/cakeslice/NTellacheesecake_slice + name = "NTella cheesecake slice" + desc = "A slice of cake marrying the chocolate taste of NTella with the creamy smoothness of cheesecake, all on a cookie crumble base." + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "NTellacheesecake_slice" + trash = /obj/item/trash/plate + filling_color = "#331c03" + bitesize = 2 + center_of_mass = list("x"=16, "y"=14) + //Predesigned pies //======================= /obj/item/reagent_containers/food/snacks/berryclafoutis diff --git a/html/changelogs/tomixcomics-PR-17948.html.yml b/html/changelogs/tomixcomics-PR-17948.html.yml new file mode 100644 index 00000000000..24982292424 --- /dev/null +++ b/html/changelogs/tomixcomics-PR-17948.html.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Tomixcomics + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added two new drinks." + - rscadd: "Added a variety of crepes." + - rscadd: "Added a new type of cake." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index a9235108639..96370abf0a5 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/item/reagent_containers/food/confections.dmi b/icons/obj/item/reagent_containers/food/confections.dmi index eea20a0c438..8b2bd73ba65 100644 Binary files a/icons/obj/item/reagent_containers/food/confections.dmi and b/icons/obj/item/reagent_containers/food/confections.dmi differ diff --git a/icons/obj/item/reagent_containers/food/ingredients.dmi b/icons/obj/item/reagent_containers/food/ingredients.dmi index bc396d73b69..418d502847f 100644 Binary files a/icons/obj/item/reagent_containers/food/ingredients.dmi and b/icons/obj/item/reagent_containers/food/ingredients.dmi differ diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index 8da8485b59f..eef90e535bb 100644 Binary files a/icons/obj/item/reagent_containers/food/pastries.dmi and b/icons/obj/item/reagent_containers/food/pastries.dmi differ