Merge pull request #6803 from Schnayy/CookingUpdate1

Cooking adjustments

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

code/game/machinery/vending.dm

@@ -694,6 +694,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,
@@ -999,6 +1000,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,

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()

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

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -134,6 +134,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"

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."