Skip to content

Commit

Permalink
add new examines to cooking (#8478)
Browse files Browse the repository at this point in the history
Cooking and food related examines weren't updated alongside every other examine when the new stat panel was merged. This fixes that.
  • Loading branch information
Mycah142 authored Apr 19, 2024
1 parent dd6ca21 commit b5ad5e3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
4 changes: 2 additions & 2 deletions code/modules/cooking_with_jane/cooking_appliances/grill.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 10 additions & 14 deletions code/modules/cooking_with_jane/food_overrides.dm
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit b5ad5e3

Please sign in to comment.