From d079fc6329e15f205e4574b562d01d5193380e2f Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Tue, 25 Feb 2020 01:31:16 -0800
Subject: [PATCH] Fixes custom table placement (#6735)

---
 code/modules/tables/interactions.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm
index 4d5f2dceb0..5d6691027f 100644
--- a/code/modules/tables/interactions.dm
+++ b/code/modules/tables/interactions.dm
@@ -66,13 +66,11 @@
 		return ..()
 	if(isrobot(user))
 		return
-	user.drop_item()
-	if (O.loc != src.loc)
-		step(O, get_dir(O, src))
+	user.unEquip(O, 0, src.loc)
 	return
 
 
-/obj/structure/table/attackby(obj/item/W as obj, mob/user as mob, var/click_parameters)
+/obj/structure/table/attackby(obj/item/W as obj, mob/user as mob, var/hit_modifier, var/click_parameters)
 	if (!W) return
 
 	// Handle harm intent grabbing/tabling.