From b5ad5e3fda3018af19d601891c0c055300e8be28 Mon Sep 17 00:00:00 2001 From: Mycah142 <11076040+Mycah142@users.noreply.github.com> Date: Fri, 19 Apr 2024 19:33:47 -0400 Subject: [PATCH] add new examines to cooking (#8478) Cooking and food related examines weren't updated alongside every other examine when the new stat panel was merged. This fixes that. --- .../cooking_appliances/grill.dm | 4 ++-- .../cooking_items/cooking_containers.dm | 2 +- .../cooking_with_jane/food_overrides.dm | 24 ++++++++----------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/code/modules/cooking_with_jane/cooking_appliances/grill.dm b/code/modules/cooking_with_jane/cooking_appliances/grill.dm index 5823c54f42e..d5629f889a3 100644 --- a/code/modules/cooking_with_jane/cooking_appliances/grill.dm +++ b/code/modules/cooking_with_jane/cooking_appliances/grill.dm @@ -79,11 +79,11 @@ bin_rating += M.rating wood_maximum = 15 * bin_rating -/obj/machinery/cooking_with_jane/grill/examine(var/mob/user) +/obj/machinery/cooking_with_jane/grill/examine(var/mob/user, extra_description = "") if(!..(user, 1)) return FALSE if(contents) - to_chat(user, SPAN_NOTICE("Charcoal: [stored_wood]/[wood_maximum]")) + extra_description += SPAN_NOTICE("\nCharcoal: [stored_wood]/[wood_maximum]") //Process how a specific grill is interacting with material /obj/machinery/cooking_with_jane/grill/proc/cook_checkin(var/input) diff --git a/code/modules/cooking_with_jane/cooking_items/cooking_containers.dm b/code/modules/cooking_with_jane/cooking_items/cooking_containers.dm index ff53136a46b..00444a9b5c2 100644 --- a/code/modules/cooking_with_jane/cooking_items/cooking_containers.dm +++ b/code/modules/cooking_with_jane/cooking_items/cooking_containers.dm @@ -32,7 +32,7 @@ appearance_flags |= KEEP_TOGETHER -/obj/item/reagent_containers/cooking_with_jane/cooking_container/examine(var/mob/user) +/obj/item/reagent_containers/cooking_with_jane/cooking_container/examine(var/mob/user, extra_description = "") if(!..(user, 1)) return FALSE if(contents) diff --git a/code/modules/cooking_with_jane/food_overrides.dm b/code/modules/cooking_with_jane/food_overrides.dm index 1eb3c7f91f4..0581cf0457c 100644 --- a/code/modules/cooking_with_jane/food_overrides.dm +++ b/code/modules/cooking_with_jane/food_overrides.dm @@ -1,21 +1,17 @@ -/obj/item/reagent_containers/food/snacks/examine(mob/user) - if(!..(user, get_dist(user, src))) - return - - if(cooking_description_modifier) - to_chat(user, SPAN_NOTICE(cooking_description_modifier)) - +/obj/item/reagent_containers/food/snacks/examine(mob/user, extra_description = "") #ifdef CWJ_DEBUG - to_chat(user, SPAN_NOTICE("The food's level of quality is [food_quality]")) //Visual number should only be visible when debugging + extra_description += SPAN_NOTICE("\nThe food's level of quality is [food_quality]") //Visual number should only be visible when debugging #endif - - to_chat(user, SPAN_NOTICE(food_descriptor)) + if(cooking_description_modifier) + extra_description += cooking_description_modifier + extra_description += food_descriptor if (bitecount==0) - return + extra_description += SPAN_NOTICE("\nThe [src] is unbitten.") else if (bitecount==1) - to_chat(user, SPAN_NOTICE("\The [src] was bitten by someone!")) + extra_description += SPAN_NOTICE("\nThe [src] was bitten by someone!") else if (bitecount<=3) - to_chat(user, SPAN_NOTICE("\The [src] was bitten [bitecount] time\s!")) + extra_description += SPAN_NOTICE("\nThe [src] was bitten [bitecount] time\s!") else - to_chat(user, SPAN_NOTICE("\The [src] was bitten multiple times!")) + extra_description += SPAN_NOTICE("\nThe [src] was bitten multiple times!") + ..(user, extra_description)