mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 21:12:24 +01:00
.loc = to forceMove() (#4937)
As requested, this PR is changed to only include all .loc = to forceMove() changes.
This commit is contained in:
@@ -34,7 +34,6 @@
|
||||
for(var/spell_type in contract_spells)
|
||||
M.add_spell(new spell_type(user), "const_spell_ready")
|
||||
log_and_message_admins("signed their soul over to \the [contract_master] using \the [src].", user)
|
||||
user.drop_from_inventory(src)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/contract/proc/contract_effect(mob/user as mob)
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
break
|
||||
|
||||
if(!success)
|
||||
user.loc = pick(L)
|
||||
user.forceMove(pick(L))
|
||||
|
||||
return
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
if(delete_old)
|
||||
qdel(old_item)
|
||||
else
|
||||
old_item.loc = L.loc
|
||||
old_item.forceMove(L.loc)
|
||||
|
||||
if(duration)
|
||||
summoned_items += new_item //we store it in a list to remove later
|
||||
|
||||
@@ -34,12 +34,12 @@
|
||||
if(target.buckled)
|
||||
target.buckled = null
|
||||
jaunt_disappear(animation, target)
|
||||
target.loc = holder
|
||||
target.forceMove(holder)
|
||||
target.transforming=0 //mob is safely inside holder now, no need for protection.
|
||||
jaunt_steam(mobloc)
|
||||
sleep(duration)
|
||||
mobloc = holder.last_valid_turf
|
||||
animation.loc = mobloc
|
||||
animation.forceMove(mobloc)
|
||||
jaunt_steam(mobloc)
|
||||
target.canmove = 0
|
||||
holder.reappearing = 1
|
||||
@@ -93,7 +93,7 @@
|
||||
/obj/effect/dummy/spell_jaunt/Destroy()
|
||||
// Eject contents if deleted somehow
|
||||
for(var/atom/movable/AM in src)
|
||||
AM.loc = get_turf(src)
|
||||
AM.forceMove(get_turf(src))
|
||||
return ..()
|
||||
|
||||
/obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
|
||||
|
||||
Reference in New Issue
Block a user