From 5b1e4083e99107cfda2924006d8bd8966dc1722c Mon Sep 17 00:00:00 2001 From: Trilby Date: Tue, 12 Nov 2024 18:15:22 -0500 Subject: [PATCH 1/2] tweaks + fixes --- code/game/objects/structures/watercloset.dm | 4 ++++ code/modules/cooking_with_jane/recipes/recipe.dm | 2 +- code/modules/food/recipes_microwave.dm | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 70a42031264..53aa9efaac4 100644 --- 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] dosnt seem to like 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 index a781be35709..a5dda8cc6fd 100644 --- 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 index aa11c4b5775..0ebd5b06aba 100644 --- 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, From 9bd2e8ab916a05c7f1b2f6e29da42c9d5a76b424 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:56:11 -0500 Subject: [PATCH 2/2] Update code/game/objects/structures/watercloset.dm Co-authored-by: Smokingsquirrel <62299539+Smokingsquirrel@users.noreply.github.com> --- code/game/objects/structures/watercloset.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 53aa9efaac4..454ea0d2aca 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -506,7 +506,7 @@ return if(istype(O, /obj/item/reagent_containers/cooking_with_jane)) - to_chat(user, SPAN_WARNING("The [O] dosnt seem to like water directly from the tap. Use a beaker or other proxy to add reagents.")) + 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