Merge pull request #5838 from Trilbyspaceclone/microwave_fix

Cooking tweaks + fixes
sojourn-13 · Nov 13, 2024 · 4c97610 · 4c97610
2 parents 411c9d8 + 9bd2e8a
commit 4c97610
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
@@ -505,6 +505,10 @@
 		to_chat(user, SPAN_WARNING("Someone's already washing here."))
 		return
 
+	if(istype(O, /obj/item/reagent_containers/cooking_with_jane))
+		to_chat(user, SPAN_WARNING("The [O] doesn‘t seem to accept water directly from the tap. Use a beaker or other proxy to add reagents."))
+		return
+
 	var/obj/item/reagent_containers/RG = O
 	if (istype(RG) && RG.is_refillable())
 		var/amount_to_add = min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)

diff --git a/code/modules/cooking_with_jane/recipes/recipe.dm b/code/modules/cooking_with_jane/recipes/recipe.dm
@@ -1514,7 +1514,7 @@
 	cooking_container = OVEN
 	product_type = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
 	step_builder = list(
-		list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/sliceable/flatdough, qmod=0.5),
+		list(CWJ_ADD_ITEM, /obj/item/reagent_containers/food/snacks/doughslice, qmod=0.5),
 		list(CWJ_ADD_PRODUCE, "plumphelmet", qmod=0.2, reagent_skip=TRUE),
 		list(CWJ_ADD_REAGENT, "water", 5),
 		list(CWJ_ADD_REAGENT, "flour", 5),

diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
@@ -641,7 +641,7 @@ I said no!
 	result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
 
 /datum/recipe/mushroompizza
-	fruit = list("mushroom" = 5, "tomato" = 1)
+	fruit = list("plumphelmet" = 5, "tomato" = 1)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
 		/obj/item/reagent_containers/food/snacks/cheesewedge
@@ -837,7 +837,7 @@ I said no!
 	result = /obj/item/reagent_containers/food/snacks/rofflewaffles
 
 /datum/recipe/stew
-	fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "mushroom" = 1) // No eggplant! Terrible!
+	fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "plumphelmet" = 1) // No eggplant! Terrible!
 	reagents = list("water" = 10)
 	items = list(/obj/item/reagent_containers/food/snacks/meat)
 	result = /obj/item/reagent_containers/food/snacks/stew
@@ -1084,12 +1084,12 @@ I said no!
 	result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
 
 /datum/recipe/mushroomsoup
-	fruit = list("mushroom" = 1)
+	fruit = list("plumphelmet" = 1)
 	reagents = list("milk" = 5, "cream" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
 	result = /obj/item/reagent_containers/food/snacks/mushroomsoup
 
 /datum/recipe/chawanmushi
-	fruit = list("mushroom" = 1)
+	fruit = list("plumphelmet" = 1)
 	reagents = list("water" = 5, "soysauce" = 5)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/egg,