From 22427dda3b73ab865f614768f61151454e313d63 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Thu, 18 Jul 2024 22:06:25 -0400 Subject: [PATCH 1/2] Fixes utensils attacking when trying to feed while full (#6679) # About the pull request Using a utensil with food on a target that's not hungry no longer stabs them. # Explain why it's good for the game You have a fork with some food, you're on help intent, you use it on yourself... and you stab yourself to the chorus of "You don't feel like eating more right now." # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: no longer stab with utensil when trying to feed while target full /:cl: --- code/game/objects/items/tools/kitchen_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm index d6473b156a67..a4c4925fba2c 100644 --- a/code/game/objects/items/tools/kitchen_tools.dm +++ b/code/game/objects/items/tools/kitchen_tools.dm @@ -48,7 +48,7 @@ var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) if(fullness > NUTRITION_HIGH) to_chat(user, SPAN_WARNING("[user == M ? "You" : "They"] don't feel like eating more right now.")) - return ..() + return reagents.set_source_mob(user) reagents.trans_to_ingest(M, reagents.total_volume) if(M == user) From ee0b03820a5fa5ebc8734caf466c834587ffa00c Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Fri, 19 Jul 2024 03:11:55 +0100 Subject: [PATCH 2/2] Automatic changelog for PR #6679 [ci skip] --- html/changelogs/AutoChangeLog-pr-6679.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6679.yml diff --git a/html/changelogs/AutoChangeLog-pr-6679.yml b/html/changelogs/AutoChangeLog-pr-6679.yml new file mode 100644 index 000000000000..7ffa71d87dd5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6679.yml @@ -0,0 +1,4 @@ +author: "Doubleumc" +delete-after: True +changes: + - bugfix: "no longer stab with utensil when trying to feed while target full" \ No newline at end of file