From 39781326cc9e40e6b71db54abbc5919a962087cd Mon Sep 17 00:00:00 2001 From: Mloc Date: Wed, 1 Oct 2014 09:54:39 +0100 Subject: [PATCH] fix for artifact teleportation effect will no longer teleport you inside random objects. Signed-off-by: Mloc --- .../artifact/effects/unknown_effect_teleport.dm | 7 ++++--- 1 file changed, 4 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..8eca5f355d2 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm @@ -13,10 +13,11 @@ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(user)) sparks.start() - // - user.loc = pick(orange(get_turf(holder), 50)) + + user.Move(pick(trange(50, get_turf(holder)))) + sparks = new /datum/effect/effect/system/spark_spread() - sparks.set_up(3, 0, get_turf(user)) + sparks.set_up(3, 0, user.loc) sparks.start() /datum/artifact_effect/teleport/DoEffectAura()