From 641e93403203628bcc4563ff966db0f70fa3877a Mon Sep 17 00:00:00 2001
From: nerocavalier <61446250+nerocavalier@users.noreply.github.com>
Date: Mon, 13 Sep 2021 04:31:08 -0500
Subject: [PATCH] Handcuff teamwork (#12481)

---
 code/game/objects/items/weapons/handcuffs.dm |  6 +--
 html/changelogs/nerocavalier-teamwork.yml    | 42 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/nerocavalier-teamwork.yml

diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 47a1bfc9e97..b3afc1b5ffe 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -41,7 +41,7 @@
 			can_place = TRUE
 		else
 			for (var/obj/item/grab/G in C.grabbed_by)
-				if (G.loc == user && G.state >= GRAB_AGGRESSIVE)
+				if (G.state >= GRAB_AGGRESSIVE)
 					can_place = TRUE
 					break
 
@@ -102,7 +102,7 @@
 		user.drop_from_inventory(cuffs,target)
 	else
 		cuffs.forceMove(target)
-	
+
 	if(!legcuff)
 		target.handcuffed = cuffs
 		target.update_inv_handcuffed()
@@ -250,4 +250,4 @@
 	icon_state = "legcuff"
 	legcuff = TRUE
 	breakouttime = 30 SECONDS
-	cuff_type = "legcuffs"
\ No newline at end of file
+	cuff_type = "legcuffs"
diff --git a/html/changelogs/nerocavalier-teamwork.yml b/html/changelogs/nerocavalier-teamwork.yml
new file mode 100644
index 00000000000..67f110f34af
--- /dev/null
+++ b/html/changelogs/nerocavalier-teamwork.yml
@@ -0,0 +1,42 @@
+################################
+# 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
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: NeroCavalier
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "You are now able to handcuff people being aggressively grabbed by other players."
+