From 8acfc2dc932cea77a31445a5bb20cfc282db810f Mon Sep 17 00:00:00 2001 From: Krausus Date: Fri, 22 May 2015 09:13:38 -0400 Subject: [PATCH] Fixes teleport artifacts inserting you into atoms --- .../artifact/effects/unknown_effect_teleport.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm index 254be3f3d09..7302523d2af 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm @@ -14,7 +14,7 @@ sparks.set_up(3, 0, get_turf(user)) sparks.start() // - user.loc = pick(orange(get_turf(holder), 50)) + user.forceMove(pick(trange(50, get_turf(holder)))) sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(user)) sparks.start() @@ -33,7 +33,7 @@ sparks.set_up(3, 0, get_turf(M)) sparks.start() // - M.loc = pick(orange(get_turf(T), 50)) + M.forceMove(pick(trange(50, T))) sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(M)) sparks.start() @@ -52,7 +52,7 @@ sparks.set_up(3, 0, get_turf(M)) sparks.start() // - M.loc = pick(orange(get_turf(T), 50)) + M.forceMove(pick(trange(50, T))) sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(M)) sparks.start()