From a5961d8e0ea56dc8b2e3cdbd2f0eb195b473b709 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 4 Jul 2019 21:32:52 -0400 Subject: [PATCH] Ease of Eating Changes On request from Duke - Microwave cooking times cut to 25% of normal times - You now need 1/5 of the amount of clonexcadone for meat - Cargo pizzas start out cooked --- code/modules/food/food/snacks_vr.dm | 8 ++++---- code/modules/food/kitchen/microwave.dm | 16 ++++++++-------- code/modules/reagents/Chemistry-Recipes.dm | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 0321ca41bb..f3284f307e 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -597,16 +597,16 @@ filled = TRUE /obj/item/pizzabox/margherita/Initialize() - pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen(src) + pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margcargo(src) /obj/item/pizzabox/vegetable/Initialize() - pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen(src) + pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegcargo(src) /obj/item/pizzabox/mushroom/Initialize() - pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen(src) + pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushcargo(src) /obj/item/pizzabox/meat/Initialize() - pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen(src) + pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo(src) /obj/item/weapon/reagent_containers/food/snacks/liquidprotein name = "\improper LiquidProtein Ration" diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 0eb0683ba8..b70f9255d0 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -246,7 +246,7 @@ return start() if (reagents.total_volume==0 && !(locate(/obj) in ((contents - component_parts) - circuit))) //dry run - if (!wzhzhzh(10)) + if (!wzhzhzh(2.5)) //VOREStation Edit - Quicker Microwaves abort() return abort() @@ -256,18 +256,18 @@ var/obj/cooked if (!recipe) dirty += 1 - if (prob(max(10,dirty*5))) - if (!wzhzhzh(4)) + if (prob(max(2.5,dirty*5))) //VOREStation Edit - Quicker Microwaves + if (!wzhzhzh(1)) //VOREStation Edit - Quicker Microwaves abort() return muck_start() - wzhzhzh(4) + wzhzhzh(1) //VOREStation Edit - Quicker Microwaves muck_finish() cooked = fail() cooked.loc = src.loc return else if (has_extra_item()) - if (!wzhzhzh(4)) + if (!wzhzhzh(1)) //VOREStation Edit - Quicker Microwaves abort() return broke() @@ -275,7 +275,7 @@ cooked.loc = src.loc return else - if (!wzhzhzh(10)) + if (!wzhzhzh(2.5)) //VOREStation Edit - Quicker Microwaves abort() return abort() @@ -283,7 +283,7 @@ cooked.loc = src.loc return else - var/halftime = round(recipe.time/10/2) + var/halftime = round(recipe.time/40/2) //VOREStation Edit - Quicker Microwaves if (!wzhzhzh(halftime)) abort() return @@ -303,7 +303,7 @@ if (stat & (NOPOWER|BROKEN)) return 0 use_power(500) - sleep(10) + sleep(2.5) //VOREStation Edit - Quicker Microwaves return 1 /obj/machinery/microwave/proc/has_extra_item() diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 7d2a588d52..20d99d950e 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1243,7 +1243,7 @@ name = "Syntiflesh" id = "syntiflesh" result = null - required_reagents = list("blood" = 5, "clonexadone" = 5) + required_reagents = list("blood" = 5, "clonexadone" = 1) //VOREStation Edit result_amount = 1 /datum/chemical_reaction/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)