diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 3d63261a959..1856b286479 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -604,6 +604,11 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/baguette +/datum/recipe/croissant + reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5) + items = list(/obj/item/weapon/reagent_containers/food/snacks/dough) + result = /obj/item/weapon/reagent_containers/food/snacks/croissant + /datum/recipe/fishandchips items = list( /obj/item/weapon/reagent_containers/food/snacks/fries, diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 908c7d6332b..27defe26387 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3441,3 +3441,15 @@ reagents.add_reagent("protein", 8) reagents.add_reagent("capsaicin", 2) bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/croissant + name = "croissant" + desc = "True French cuisine." + filling_color = "#E3D796" + icon_state = "croissant" + nutriment_amt = 6 + nutriment_desc = list("french bread" = 6) + +/obj/item/weapon/reagent_containers/food/snacks/croissant/New() + ..() + bitesize = 2 \ No newline at end of file diff --git a/html/changelogs/Belsima-Croissant.yml b/html/changelogs/Belsima-Croissant.yml new file mode 100644 index 00000000000..d5cb79b23ef --- /dev/null +++ b/html/changelogs/Belsima-Croissant.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: Belsima + +# 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 croissants to the available recipes." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 373fdcb25ba..65410d4a943 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ