mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-01 13:02:02 +00:00
.loc = to forceMove() (#4937)
As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
@@ -62,9 +62,8 @@ var/global/list/rad_collectors = list()
|
||||
if(src.P)
|
||||
user << "<span class='warning'>There's already a phoron tank loaded.</span>"
|
||||
return 1
|
||||
user.drop_item()
|
||||
user.drop_from_inventory(W,src)
|
||||
src.P = W
|
||||
W.loc = src
|
||||
update_icons()
|
||||
return 1
|
||||
else if(iscrowbar(W))
|
||||
@@ -115,7 +114,7 @@ var/global/list/rad_collectors = list()
|
||||
var/obj/item/weapon/tank/phoron/Z = src.P
|
||||
if (!Z)
|
||||
return
|
||||
Z.loc = get_turf(src)
|
||||
Z.forceMove(get_turf(src))
|
||||
Z.layer = initial(Z.layer)
|
||||
src.P = null
|
||||
if(active)
|
||||
|
||||
@@ -268,7 +268,7 @@ field_generator power level display
|
||||
CF.set_master(src,G)
|
||||
fields += CF
|
||||
G.fields += CF
|
||||
CF.loc = T
|
||||
CF.forceMove(T)
|
||||
CF.set_dir(field_dir)
|
||||
var/listcheck = 0
|
||||
for(var/obj/machinery/field_generator/FG in connected_gens)
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
|
||||
/obj/effect/accelerated_particle/New(loc, dir = 2)
|
||||
src.loc = loc
|
||||
src.forceMove(loc)
|
||||
src.set_dir(dir)
|
||||
if(movement_range > 20)
|
||||
movement_range = 20
|
||||
@@ -70,15 +70,15 @@
|
||||
if(target)
|
||||
if(movetotarget)
|
||||
if(!step_towards(src,target))
|
||||
src.loc = get_step(src, get_dir(src,target))
|
||||
src.forceMove(get_step(src, get_dir(src,target)))
|
||||
if(get_dist(src,target) < 1)
|
||||
movetotarget = 0
|
||||
else
|
||||
if(!step(src, get_step_away(src,source)))
|
||||
src.loc = get_step(src, get_step_away(src,source))
|
||||
src.forceMove(get_step(src, get_step_away(src,source)))
|
||||
else
|
||||
if(!step(src,dir))
|
||||
src.loc = get_step(src,dir)
|
||||
src.forceMove(get_step(src,dir))
|
||||
movement_range--
|
||||
if(movement_range <= 0)
|
||||
qdel(src)
|
||||
|
||||
Reference in New Issue
Block a user