From 9d312d7fef6d54cd63aef7b1bbfbd450bf853fb0 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 17 Apr 2020 13:59:48 +0100 Subject: [PATCH] small refactor to some stuff quality_increase no longer passed to microwave_act because it's defined in obj/machinery/microwave deepfryer code uses adjust_food_quality in a place where it didn't before --- code/modules/food_and_drinks/food/snacks.dm | 4 ++-- code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 2 +- code/modules/food_and_drinks/kitchen_machinery/microwave.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 6274a70d0e..7b914e2e2f 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -297,7 +297,7 @@ All foods are distributed among various categories. Use common sense. else S.reagents.add_reagent(r_id, amount) -/obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M, var/quality_increase) +/obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M) var/turf/T = get_turf(src) var/obj/item/result if(cooked_type) @@ -305,7 +305,7 @@ All foods are distributed among various categories. Use common sense. //if the result is food, set its food quality to the original food item's quality if(isfood(result)) var/obj/item/reagent_containers/food/food_output = result - food_output.adjust_food_quality(food_quality + quality_increase) + food_output.adjust_food_quality(food_quality + M.quality_increase) if(istype(M)) initialize_cooked_food(result, M.efficiency) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index e42ad07c26..0a3d172bb0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -109,7 +109,7 @@ God bless America. var/obj/item/reagent_containers/food/original_food = I frying.adjust_food_quality(original_food.food_quality) //food quality remains unchanged until degree of frying is calculated else - frying.food_quality = 10 //inedible fried item has low quality + frying.adjust_food_quality(10) //inedible fried item has low quality icon_state = "fryer_on" fry_loop.start() diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 9edcaf083c..3b0ae52578 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -310,7 +310,7 @@ var/metal = 0 for(var/obj/item/O in ingredients) - O.microwave_act(src, quality_increase) + O.microwave_act(src) if(O.custom_materials?.len) metal += O.custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)]