From e32605fa1777b3cdeb1fd4c9ee23a9ac994284d9 Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Mon, 27 Jul 2026 02:07:42 +0800
Subject: [PATCH] Flips yoke pickup and take out can interaction to be
 consistent (#22911)

This is for consistency. Was pretty annoying to take a can accidentally
because you can't put them back
---
 .../reagent_containers/food/drinks/yoke.dm    | 11 ----
 html/changelogs/wezzy-yoke-logic.yml          | 58 +++++++++++++++++++
 2 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 html/changelogs/wezzy-yoke-logic.yml

diff --git a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm
index 79d2af3b3f9..bf5f0db92af 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm
@@ -19,10 +19,6 @@
 		list(-10, 2)
 	)
 
-/obj/item/storage/box/fancy/yoke/mechanics_hints(mob/user, distance, is_adjacent)
-	. += ..()
-	. += "Click drag it to pick it up, click on it to take out a can."
-
 /obj/item/storage/box/fancy/yoke/fill()
 	. = ..()
 	for(var/obj/item/reagent_containers/food/drinks/cans/C in contents)
@@ -66,13 +62,6 @@
 	name = can_name_string
 
 /obj/item/storage/box/fancy/yoke/mouse_drop_dragged(atom/over, mob/user, src_location, over_location, params)
-	var/mob/mob_dropped_over = over
-	if(use_check_and_message(mob_dropped_over))
-		return
-	to_chat(mob_dropped_over, SPAN_NOTICE("You pick up \the [src]."))
-	mob_dropped_over.put_in_hands(src)
-
-/obj/item/storage/box/fancy/yoke/attack_hand(mob/user)
 	if(!length(contents)) // no more cans, continue as normal
 		return ..()
 
diff --git a/html/changelogs/wezzy-yoke-logic.yml b/html/changelogs/wezzy-yoke-logic.yml
new file mode 100644
index 00000000000..e7677f11735
--- /dev/null
+++ b/html/changelogs/wezzy-yoke-logic.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Can yoke interaction has been flipped for consistency - mousedrag to remove a can, click to pick up the whole yoke."