From 10c8dbbb6e8e579915d8bf8e2eb2ab5f4c8fb42f Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 8 Mar 2020 02:47:38 +0100
Subject: [PATCH] hOLd oN

---
 code/game/objects/items.dm               | 4 ++--
 code/modules/mob/living/carbon/carbon.dm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index f941daf749..fd6ae1bb43 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -373,11 +373,11 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.Remove(user)
+	if(item_flags & DROPDEL)
+		qdel(src)
 	item_flags &= ~IN_INVENTORY
 	SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user)
 	user.update_equipment_speed_mods()
-	if(item_flags & DROPDEL)
-		qdel(src)
 
 // called just as an item is picked up (loc is not yet changed)
 /obj/item/proc/pickup(mob/user)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index ff2f894dab..0b87af4eb1 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -420,7 +420,7 @@
 			return
 		if(I == legcuffed)
 			legcuffed.forceMove(drop_location())
-			legcuffed.dropped()
+			legcuffed.dropped(src)
 			legcuffed = null
 			update_inv_legcuffed()
 			return