From dd55ad6f883e405c3ee806f088627d2d1c87f1ee Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Sat, 17 Mar 2018 11:25:29 +1300
Subject: [PATCH] Merge pull request #36079 from
 deathride58/nerfstheskylarlinemanexperience

[S] Fixes tables being bluespace magnets
---
 code/game/objects/structures/tables_racks.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 3e6adb1aa8..3f47c7d7df 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -60,7 +60,7 @@
 	attack_hand(user)
 
 /obj/structure/table/attack_hand(mob/living/user)
-	if(user.pulling && isliving(user.pulling))
+	if(Adjacent(user) && user.pulling && isliving(user.pulling))
 		var/mob/living/pushed_mob = user.pulling
 		if(pushed_mob.buckled)
 			to_chat(user, "<span class='warning'>[pushed_mob] is buckled to [pushed_mob.buckled]!</span>")
@@ -81,6 +81,9 @@
 	else
 		..()
 
+/obj/structure/table/attack_tk()
+	return FALSE
+
 /obj/structure/table/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && (mover.pass_flags & PASSTABLE))
 		return 1