Merge branch 'master' into patch-4

cmss13-devs · Jul 19, 2024 · 5b4b5e3 · 5b4b5e3
2 parents 71b910d + ee0b038
commit 5b4b5e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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)

diff --git a/html/changelogs/AutoChangeLog-pr-6679.yml 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"