Replaced loc setting with forceMove. (#11490)

* Replaced loc setting with forceMove.

* Update forceMove to permit moving to null loc.

Also fixed atom locking with offsets not following properly.
This commit is contained in:
ComicIronic
2016-08-29 12:40:45 +01:00
committed by clusterfack
parent b0e22029ab
commit b35eaa65d8
348 changed files with 1019 additions and 1016 deletions

View File

@@ -759,7 +759,7 @@
if("Jump to Blob")
if(isovermind(usr) && linked_blob)
var/mob/camera/blob/overmind = usr
overmind.loc = linked_blob.loc
overmind.forceMove(linked_blob.loc)
return 1
/obj/screen/inventory/Click()
@@ -793,4 +793,4 @@
src.screen = null
/obj/screen/acidable()
return 0
return 0

View File

@@ -91,11 +91,11 @@
var/atom/l = loc
var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(l.x - 2, l.y, l.z))
if(com.locked)
user.loc = get_turf(com.locked)
user.forceMove(get_turf(com.locked))
/obj/effect/portal/attack_ghost(mob/user as mob)
if(target)
user.loc = get_turf(target)
user.forceMove(get_turf(target))
// -------------------------------------------
// This was supposed to be used by adminghosts

View File

@@ -218,7 +218,7 @@
// ------- YOU TRIED TO CLICK ON AN ITEM THROUGH A WINDOW (OR SIMILAR THING THAT LIMITS ON BORDERS) ON THE TILE YOU'RE ON -------
check_1 = 0
D.loc = usr.loc
D.forceMove(usr.loc)
if(step_to(D, Step_2))
check_2 = 1
@@ -269,7 +269,7 @@
//del(D)
// Garbage Collect Dummy
D.loc = null
D.forceMove(null)
D = null
// ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE -------

View File

@@ -24,4 +24,4 @@ mob/camera/blob/DblClickOn(var/atom/A) //Teleport view to another blob
if(!B)
return
else
usr.loc = T
usr.forceMove(T)

View File

@@ -82,7 +82,7 @@ var/const/tk_maxrange = 15
/obj/item/tk_grab/dropped(mob/user as mob)
if(focus && user && loc != user && loc != user.loc) // drop_item(null, ) gets called when you tk-attack a table/closet with an item
if(focus.Adjacent(loc))
focus.loc = loc
focus.forceMove(loc)
qdel(src)