From 47be942c92e8e6bf9ba584bb9bcf2c4e3d96c809 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:29:10 +0100 Subject: [PATCH] more quality --- code/modules/food_and_drinks/food/snacks.dm | 11 +++++++++-- .../food_and_drinks/kitchen_machinery/microwave.dm | 4 +++- .../food_and_drinks/kitchen_machinery/processor.dm | 5 ++++- code/modules/food_and_drinks/recipes/food_mixtures.dm | 1 - 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 177dba0b86..92f8d104a6 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -162,6 +162,13 @@ All foods are distributed among various categories. Use common sense. else . += "[src] was bitten multiple times!" + //examine text for quality + if(food_quality >= 70) + . += "It is of a high quality." + else + if(food_quality <= 30) + . += "It is of a low quality." + /obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/storage)) @@ -291,7 +298,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) +/obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M, var/quality_increase) var/turf/T = get_turf(src) var/obj/item/result if(cooked_type) @@ -299,7 +306,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(istype(result, /obj/item/reagent_containers/food)) var/obj/item/reagent_containers/food/food_output = result - food_output.adjust_food_quality(food_quality) + food_output.adjust_food_quality(food_quality + quality_increase) if(istype(M)) initialize_cooked_food(result, M.efficiency) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 2adff414e8..9edcaf083c 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -19,6 +19,7 @@ var/broken = 0 // 0, 1 or 2 // How broken is it??? var/max_n_of_items = 10 var/efficiency = 0 + var/quality_increase = 5 // how much do we increase the quality of microwaved items var/datum/looping_sound/microwave/soundloop var/list/ingredients = list() // may only contain /atom/movables @@ -48,6 +49,7 @@ efficiency += M.rating for(var/obj/item/stock_parts/matter_bin/M in component_parts) max_n_of_items = 10 * M.rating + quality_increase = M.rating * 5 break /obj/machinery/microwave/examine(mob/user) @@ -308,7 +310,7 @@ var/metal = 0 for(var/obj/item/O in ingredients) - O.microwave_act(src) + O.microwave_act(src, quality_increase) if(O.custom_materials?.len) metal += O.custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)] diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 113378fbb4..9a3df0a92b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -14,10 +14,13 @@ var/processing = FALSE var/rating_speed = 1 var/rating_amount = 1 + var/quality_increase = 5 /obj/machinery/processor/RefreshParts() + quality_increase = 0 for(var/obj/item/stock_parts/matter_bin/B in component_parts) rating_amount = B.rating + quality_increase += B.rating * 5 for(var/obj/item/stock_parts/manipulator/M in component_parts) rating_speed = M.rating @@ -31,7 +34,7 @@ var/obj/item/reagent_containers/food/food_input = what for(var/i = 0, i < rating_amount, i++) var/obj/item/reagent_containers/food/food_output = new recipe.output(drop_location()) - food_output.adjust_food_quality(food_input.food_quality) //output quality equals input quality for the food processor + food_output.adjust_food_quality(food_input.food_quality + quality_increase) if (ismob(what)) var/mob/themob = what themob.gib(TRUE,TRUE,TRUE) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index c15c1cd2f5..ec96a4537c 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -8,7 +8,6 @@ parts |= reqs //////////////////////////////////////////FOOD MIXTURES//////////////////////////////////// - /datum/chemical_reaction/tofu name = "Tofu" id = "tofu"