Merge pull request #5968 from Citadel-Station-13/upstream-merge-36079

[MIRROR] [S] Fixes tables being bluespace magnets
This commit is contained in:
deathride58
2018-03-17 23:47:29 +00:00
committed by GitHub
+4 -1
View File
@@ -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