Cleanup to various loc assignments and nearby code
This commit is contained in:
committed by
CitadelStationBot
parent
fceb289072
commit
98d6927eb6
@@ -627,7 +627,7 @@ so as to remain in compliance with the most up-to-date laws."
|
||||
if(NOTIFY_JUMP)
|
||||
var/turf/T = get_turf(target)
|
||||
if(T && isturf(T))
|
||||
G.loc = T
|
||||
G.forceMove(T)
|
||||
if(NOTIFY_ORBIT)
|
||||
G.ManualFollow(target)
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
/obj/item/tk_grab/dropped(mob/user)
|
||||
if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item
|
||||
if(focus.Adjacent(loc))
|
||||
focus.loc = loc
|
||||
focus.forceMove(loc)
|
||||
. = ..()
|
||||
|
||||
//stops TK grabs being equipped anywhere but into hands
|
||||
|
||||
Reference in New Issue
Block a user