From d96c008be0d9c3007709348ba1225730ba8d9a4f Mon Sep 17 00:00:00 2001
From: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>
Date: Thu, 10 Oct 2024 06:00:41 +1100
Subject: [PATCH] Fix: #26850 - Allows kitchen utensils to be used on custom
dishes (#26901)
* Allows kitchen utensils to be used on custom dishes. Also tweaks fork use grammar a bit.
* if spacing. Whoopsie doo.
* Update code/modules/food_and_drinks/food_base.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>
---------
Signed-off-by: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
---
code/modules/food_and_drinks/food/customizables.dm | 9 ++++-----
code/modules/food_and_drinks/food_base.dm | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 3df6580452a..c048f8c3fc8 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -336,11 +336,10 @@ do {\
/obj/item/food/customizable/attackby(obj/item/I, mob/user, params)
- if(is_pen(I))
- var/new_name = rename_interactive(user, I, use_prefix = FALSE)
- if(!isnull(new_name))
- to_chat(user, "You declare this to be \a [name]. Delicious!")
- return
+ ..()
+
+ if(istype(I, /obj/item/kitchen/utensil) || is_pen(I))
+ return
if(!istype(I, /obj/item/food))
to_chat(user, "[I] isn't exactly something that you would want to eat.")
diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm
index 34faf1426a2..5290fcd736e 100644
--- a/code/modules/food_and_drinks/food_base.dm
+++ b/code/modules/food_and_drinks/food_base.dm
@@ -198,8 +198,8 @@
return
user.visible_message( \
- "[user] scoops up some [src] with \the [U]!", \
- "You scoop up some [src] with \the [U]!" \
+ "[user] scoops up some [name] with [U]!", \
+ "You scoop up some [name] with [U]!" \
)
bitecount++