From a0a1f2bbf449d78aecc34b6f6d4e6aa00eb15520 Mon Sep 17 00:00:00 2001
From: KalevTait <107985691+KalevTait@users.noreply.github.com>
Date: Sun, 26 Jun 2022 17:43:49 +0100
Subject: [PATCH] Fix cutting meat to be consistent with itself and cutting
other food items (#18092)
* make scalple work to cut cutlets into bacon
* Fix displayed messages to work with scalpel, and brought formating in line with everywhere else in the game.
* brings messaging for cutting meat in line with messages for other actions in the game.
* removed the extra 'the's from the the messages
* Add space between arguments in function call
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
---
code/modules/food_and_drinks/food/foods/meat.dm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index 31cdb6fd331..5ee95d24740 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -17,7 +17,10 @@
new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
- to_chat(user, "You cut the meat in thin strips.")
+ user.visible_message( \
+ "[user] cuts [src] with [W]!", \
+ "You cut [src] with [W]!" \
+ )
qdel(src)
else
..()
@@ -69,10 +72,10 @@
list_reagents = list("protein" = 1)
/obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W, mob/user, params)
- if(istype(W,/obj/item/kitchen/knife))
+ if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
user.visible_message( \
- "[user] cuts the raw cutlet with the knife!", \
- "You cut the raw cutlet with your knife!" \
+ "[user] cuts the raw cutlet with [W]!", \
+ "You cut the raw cutlet with [W]!" \
)
new /obj/item/reagent_containers/food/snacks/raw_bacon(loc)
qdel(src)