From a8f4988c364f28cdc925c8dc6e43a5d05653b4ff Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 19 Jun 2020 17:09:54 +0100 Subject: [PATCH 1/3] alter form updates hair --- .../modules/mob/living/carbon/human/species_types/jellypeople.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index b780af6b8a..84894a14e8 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -468,6 +468,7 @@ if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright H.dna.features["mcolor"] = sanitize_hexcolor(new_color) H.update_body() + H.update_hair() else to_chat(H, "Invalid color. Your color is not bright enough.") else if(select_alteration == "Hair Style") From 7fa5107b4be84b1c15060e890c5398da69476b28 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 19 Jun 2020 17:16:34 +0100 Subject: [PATCH 2/3] all methods of cooking define quality --- code/modules/food_and_drinks/kitchen_machinery/grill.dm | 1 + code/modules/hydroponics/grown/towercap.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 547ed244c0..d059925600 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -10,6 +10,7 @@ var/obj/item/reagent_containers/food/grilled_item var/grill_time = 0 var/datum/looping_sound/grill/grill_loop + var/quality_increase = 10 //cooking food via a grill gives it slightly higher quality /obj/machinery/grill/Initialize() . = ..() diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index a18dbe165d..757f104644 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -153,6 +153,7 @@ var/burn_icon = "bonfire_on_fire" //for a softer more burning embers icon, use "bonfire_warm" var/grill = FALSE var/fire_stack_strength = 5 + var/quality_increase = 0 //bonfires are not the greatest cooking appliance /obj/structure/bonfire/dense density = TRUE From 983aac10a24851a306d0cbc5959c18491b9d53a8 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sun, 21 Jun 2020 17:39:36 +0100 Subject: [PATCH 3/3] fixes it properly --- code/modules/food_and_drinks/food/snacks.dm | 8 ++++---- code/modules/food_and_drinks/kitchen_machinery/grill.dm | 1 - code/modules/hydroponics/grown/towercap.dm | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index ccac1d4a77..900fc99171 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -303,12 +303,12 @@ All foods are distributed among various categories. Use common sense. var/obj/item/result if(cooked_type) result = new cooked_type(T) - //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 + M.quality_increase) if(istype(M)) initialize_cooked_food(result, M.efficiency) + //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 + M.quality_increase) else initialize_cooked_food(result, 1) SSblackbox.record_feedback("tally", "food_made", 1, result.type) diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index d059925600..547ed244c0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -10,7 +10,6 @@ var/obj/item/reagent_containers/food/grilled_item var/grill_time = 0 var/datum/looping_sound/grill/grill_loop - var/quality_increase = 10 //cooking food via a grill gives it slightly higher quality /obj/machinery/grill/Initialize() . = ..() diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 757f104644..a18dbe165d 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -153,7 +153,6 @@ var/burn_icon = "bonfire_on_fire" //for a softer more burning embers icon, use "bonfire_warm" var/grill = FALSE var/fire_stack_strength = 5 - var/quality_increase = 0 //bonfires are not the greatest cooking appliance /obj/structure/bonfire/dense density = TRUE