diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index e2057c45ff..25864ee549 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -14,7 +14,8 @@ /obj/item/weapon/reagent_containers/food/drinks/soymilk = 2, /obj/item/weapon/storage/fancy/egg_box = 2, /obj/item/weapon/reagent_containers/food/snacks/tofu = 4, - /obj/item/weapon/reagent_containers/food/snacks/meat = 4 + /obj/item/weapon/reagent_containers/food/snacks/meat = 4, + /obj/item/weapon/reagent_containers/food/condiment/yeast = 3 ) cost = 10 containertype = /obj/structure/closet/crate/freezer diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index a18f4500a0..20eb846bda 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -692,6 +692,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5, + /obj/item/weapon/reagent_containers/food/condiment/cornoil = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps = 5, @@ -1017,6 +1018,8 @@ product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." icon_state = "dinnerware" products = list( + /obj/item/weapon/reagent_containers/food/condiment/yeast = 5, + /obj/item/weapon/reagent_containers/food/condiment/cornoil = 5, /obj/item/weapon/tray = 8, /obj/item/weapon/material/kitchen/utensil/fork = 6, /obj/item/weapon/material/knife = 6, diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 44558b1855..5ed00e00f6 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -98,6 +98,21 @@ name = "Sugar" desc = "Tastey space sugar!" center_of_mass = list("x"=16, "y"=6) + if("peanutbutter") + name = "Peanut Butter" + desc = "A jar of smooth peanut butter." + icon_state = "peanutbutter" + center_of_mass = list("x"=16, "y"=6) + if("mayo") + name = "Mayonnaise" + desc = "A jar of mayonnaise!" + icon_state = "mayo" + center_of_mass = list("x"=16, "y"=6) + if("yeast") + name = "Yeast" + desc = "This is what you use to make bread fluffy." + icon_state = "yeast" + center_of_mass = list("x"=16, "y"=6) else name = "Misc Condiment Bottle" if (reagents.reagent_list.len==1) @@ -134,6 +149,9 @@ . = ..() reagents.add_reagent("capsaicin", 50) +/obj/item/weapon/reagent_containers/food/condiment/cornoil + name = "Corn Oil" + /obj/item/weapon/reagent_containers/food/condiment/cornoil/Initialize() . = ..() reagents.add_reagent("cornoil", 50) @@ -146,6 +164,13 @@ . = ..() reagents.add_reagent("soysauce", 50) +/obj/item/weapon/reagent_containers/food/condiment/yeast + name = "Yeast" + +/obj/item/weapon/reagent_containers/food/condiment/yeast/Initialize() + . = ..() + reagents.add_reagent("yeast", 50) + /obj/item/weapon/reagent_containers/food/condiment/small possible_transfer_amounts = list(1,20) amount_per_transfer_from_this = 1 @@ -389,4 +414,4 @@ /obj/item/weapon/reagent_containers/food/condiment/flour/Initialize() . = ..() reagents.add_reagent("flour", 30) - randpixel_xy() + randpixel_xy() \ No newline at end of file diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 4f6e5adede..0877869870 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -611,7 +611,7 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight /datum/recipe/microwave/baguette - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/dough, @@ -619,7 +619,7 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/baguette /datum/recipe/microwave/croissant - reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5) + reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5) items = list(/obj/item/weapon/reagent_containers/food/snacks/dough) result = /obj/item/weapon/reagent_containers/food/snacks/croissant @@ -631,10 +631,8 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips /datum/recipe/microwave/bread - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/egg - ) + reagents = list("yeast" = 5) + items = list(/obj/item/weapon/reagent_containers/food/snacks/dough) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread /datum/recipe/microwave/sandwich 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 0be0640446..3d1a78f083 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -128,6 +128,14 @@ nutriment_factor = 10 color = "#FFFFFF" +/datum/reagent/nutriment/yeast + name = "Yeast" + id = "yeast" + description = "For making bread rise!" + taste_description = "yeast" + nutriment_factor = 1 + color = "#D3AF70" + /datum/reagent/nutriment/flour name = "Flour" id = "flour" diff --git a/html/changelogs/schnayy - cooking adjustments.yml b/html/changelogs/schnayy - cooking adjustments.yml new file mode 100644 index 0000000000..b45ba131d7 --- /dev/null +++ b/html/changelogs/schnayy - cooking adjustments.yml @@ -0,0 +1,10 @@ +author: schnayy + +delete-after: True + +changes: + - rscadd: "Adds the reagent yeast. It can be found in the kitchen vendor and in cargo kitchen supply crates." + - tweak: "Bread now calls for 5 units yeast instead of an egg, and baguettes and croissants call for 5 units yeast in addition to former ingredients." + - rscadd: "Corn oil added to the Dinnerware vendor and the Booze-o-Mat." + - imageadd: "Sprites for peanut butter, mayo, and yeast condiments." + - bugfix: "Boiled slime core now links to the proper sprite." \ No newline at end of file diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 4fc3bc05c6..64f4753b7b 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ