.loc = to forceMove() (#4937)

As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
BurgerLUA
2018-08-04 01:48:58 +03:00
committed by Erki
parent 187613428e
commit 8519dcc393
376 changed files with 968 additions and 1261 deletions
@@ -532,7 +532,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
if (imp_in)
imp_in.put_in_hands(scanned)
else
scanned.loc = t
scanned.forceMove(t)
qdel(src)
/obj/item/weapon/implant/compressed/implanted(mob/source as mob)
@@ -45,7 +45,7 @@
if (M.imp)
if ((src.imp || M.imp.implanted))
return
M.imp.loc = src
M.imp.forceMove(src)
src.imp = M.imp
M.imp = null
src.update()
@@ -54,7 +54,7 @@
if (src.imp)
if (M.imp)
return
src.imp.loc = M
src.imp.forceMove(M)
M.imp = src.imp
src.imp = null
update()
@@ -97,7 +97,7 @@
if (src.occupant.client)
src.occupant.client.eye = src.occupant.client.mob
src.occupant.client.perspective = MOB_PERSPECTIVE
src.occupant.loc = src.loc
src.occupant.forceMove(src.loc)
if(injecting)
implant(src.occupant)
injecting = 0
@@ -117,7 +117,7 @@
M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src
M.stop_pulling()
M.loc = src
M.forceMove(src)
src.occupant = M
src.add_fingerprint(usr)
icon_state = "implantchair_on"
@@ -135,7 +135,7 @@
O.show_message("<span class='warning'>\The [M] has been implanted by \the [src].</span>", 1)
if(imp.implanted(M))
imp.loc = M
imp.forceMove(M)
imp.imp_in = M
imp.implanted = 1
implant_list -= imp
@@ -11,7 +11,7 @@
/obj/item/weapon/implanter/attack_self(var/mob/user)
if(!imp)
return ..()
imp.loc = get_turf(src)
imp.forceMove(get_turf(src))
user.put_in_hands(imp)
user << "<span class='notice'>You remove \the [imp] from \the [src].</span>"
name = "implanter"
@@ -43,7 +43,7 @@
admin_attack_log(user, M, "Implanted using \the [src.name] ([src.imp.name])", "Implanted with \the [src.name] ([src.imp.name])", "used an implanter, [src.name] ([src.imp.name]), on")
if(src.imp.implanted(M))
src.imp.loc = M
src.imp.forceMove(M)
src.imp.imp_in = M
src.imp.implanted = 1
if (ishuman(M))
@@ -197,6 +197,5 @@
return
ipc_tag = new_tag
user.drop_item()
new_tag.loc = src
user.drop_from_inventory(new_tag,src)
update()
@@ -29,7 +29,7 @@
if (source.client)
source.client.screen -= W
if (W)
W.loc = source.loc
W.forceMove(source.loc)
dropped(source)
if (W)
W.layer = initial(W.layer)
@@ -40,7 +40,7 @@
if (source.client)
source.client.screen -= W
if (W)
W.loc = source.loc
W.forceMove(source.loc)
dropped(source)
if (W)
W.layer = initial(W.layer)
@@ -42,8 +42,7 @@
..()
if(istype(C, /obj/item/weapon/implantcase))
if(!( src.case ))
user.drop_item()
C.loc = src
user.drop_from_inventory(C,src)
src.case = C
else
return