From a5961d8e0ea56dc8b2e3cdbd2f0eb195b473b709 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 4 Jul 2019 21:32:52 -0400 Subject: [PATCH 1/5] 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) From 45577f8c342bb3c3773b297d25626db82ef40c54 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 4 Jul 2019 21:48:36 -0400 Subject: [PATCH 2/5] Microwave was too fast, fixed. --- code/modules/food/kitchen/microwave.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index b70f9255d0..bb40355d6c 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(2.5)) //VOREStation Edit - Quicker Microwaves + if (!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves abort() return abort() @@ -256,18 +256,18 @@ var/obj/cooked if (!recipe) dirty += 1 - if (prob(max(2.5,dirty*5))) //VOREStation Edit - Quicker Microwaves - if (!wzhzhzh(1)) //VOREStation Edit - Quicker Microwaves + if (prob(max(10,dirty*5))) + if (!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves abort() return muck_start() - wzhzhzh(1) //VOREStation Edit - Quicker Microwaves + wzhzhzh(2) //VOREStation Edit - Quicker Microwaves muck_finish() cooked = fail() cooked.loc = src.loc return else if (has_extra_item()) - if (!wzhzhzh(1)) //VOREStation Edit - Quicker Microwaves + if (!wzhzhzh(2)) //VOREStation Edit - Quicker Microwaves abort() return broke() @@ -275,7 +275,7 @@ cooked.loc = src.loc return else - if (!wzhzhzh(2.5)) //VOREStation Edit - Quicker Microwaves + if (!wzhzhzh(5)) //VOREStation Edit - Quicker Microwaves abort() return abort() @@ -283,7 +283,7 @@ cooked.loc = src.loc return else - var/halftime = round(recipe.time/40/2) //VOREStation Edit - Quicker Microwaves + var/halftime = round(recipe.time/20/2) //VOREStation Edit - Quicker Microwaves if (!wzhzhzh(halftime)) abort() return @@ -303,7 +303,7 @@ if (stat & (NOPOWER|BROKEN)) return 0 use_power(500) - sleep(2.5) //VOREStation Edit - Quicker Microwaves + sleep(5) //VOREStation Edit - Quicker Microwaves return 1 /obj/machinery/microwave/proc/has_extra_item() From 3d3452bdca10cce0965104ceb3a324ec8f3d2c68 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 5 Jul 2019 20:24:41 -0400 Subject: [PATCH 3/5] Ups point cost of pizza --- code/datums/supplypacks/hospitality_vr.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index 95a921f817..822773b6f9 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -79,6 +79,3 @@ cost = 50 containertype = /obj/structure/closet/crate/freezer containername = "Chinese takeout crate" - -/datum/supply_pack/randomised/hospitality/pizza - cost = 25 From e18440a991ea0759ae064cd068564b5ea18802a7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 6 Jul 2019 15:36:44 -0400 Subject: [PATCH 4/5] Recommended suggestions --- code/modules/reagents/Chemistry-Recipes.dm | 16 ++++++++++++++-- code/modules/reagents/Chemistry-Recipes_vr.dm | 10 ++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 20d99d950e..a513773504 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -737,9 +737,12 @@ var/mob/living/L = holder.my_atom if(L.stat != DEAD) e.amount *= 0.5 + //VOREStation Add Start else holder.clear_reagents() //No more powergaming by creating a tiny amount of this + //VORESTation Add End e.start() + //holder.clear_reagents() //VOREStation Removal return /datum/chemical_reaction/flash_powder @@ -784,8 +787,10 @@ // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes. // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades. empulse(location, round(created_volume / 24), round(created_volume / 20), round(created_volume / 18), round(created_volume / 14), 1) + //VOREStation Edit Start if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this holder.clear_reagents() + //VOREStation Edit End return /datum/chemical_reaction/nitroglycerin @@ -804,10 +809,13 @@ var/mob/living/L = holder.my_atom if(L.stat!=DEAD) e.amount *= 0.5 + //VOREStation Add Start else holder.clear_reagents() //No more powergaming by creating a tiny amount of this + //VOREStation Add End e.start() + //holder.clear_reagents() //VOREStation Removal return /datum/chemical_reaction/napalm @@ -840,8 +848,10 @@ playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) S.start() + //VOREStation Edit Start if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this holder.clear_reagents() + //VOREStation Edit End return /datum/chemical_reaction/foam @@ -861,8 +871,10 @@ var/datum/effect/effect/system/foam_spread/s = new() s.set_up(created_volume, location, holder, 0) s.start() + //VOREStation Edit Start if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this holder.clear_reagents() + //VOREStation Edit End return /datum/chemical_reaction/metalfoam @@ -1243,7 +1255,7 @@ name = "Syntiflesh" id = "syntiflesh" result = null - required_reagents = list("blood" = 5, "clonexadone" = 1) //VOREStation Edit + required_reagents = list("blood" = 5, "clonexadone" = 5) result_amount = 1 /datum/chemical_reaction/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -2378,7 +2390,7 @@ id = "biomass" result = "biomass" required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1) - result_amount = 6 // Roughly 120u per phoron sheet //VOREStation Edit + result_amount = 1 // Roughly 20u per phoron sheet // Neutralization. diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 098cae99f0..1e60d5bae8 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -101,7 +101,7 @@ name = "Vermicetol" id = "vermicetol" result = "vermicetol" - required_reagents = list("kelotane" = 1, "dermaline" = 1, "shockchem" = 1, "phoron" = 0.1) + required_reagents = list("bicaridine" = 1, "shockchem" = 1, "phoron" = 0.1) catalysts = list("phoron" = 5) result_amount = 3 @@ -340,4 +340,10 @@ if(prob(50)) for(var/j = 1, j <= rand(1, 3), j++) step(C, pick(NORTH,SOUTH,EAST,WEST)) -*/ \ No newline at end of file +*/ + +/datum/chemical_reaction/food/syntiflesh + required_reagents = list("blood" = 5, "clonexadone" = 1) + +/datum/chemical_reaction/biomass + result_amount = 6 // Roughly 120u per phoron sheet From baa2d5805be32de223cb267fe8e8bba56af639b1 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 6 Jul 2019 16:17:10 -0400 Subject: [PATCH 5/5] Update Chemistry-Recipes_vr.dm --- code/modules/reagents/Chemistry-Recipes_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 1e60d5bae8..ac8fa9a7f2 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -101,7 +101,7 @@ name = "Vermicetol" id = "vermicetol" result = "vermicetol" - required_reagents = list("bicaridine" = 1, "shockchem" = 1, "phoron" = 0.1) + required_reagents = list("bicaridine" = 2, "shockchem" = 1, "phoron" = 0.1) catalysts = list("phoron" = 5) result_amount = 3