From df080960d451e0a48605c6967c714e952f27e093 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 27 Dec 2017 20:31:51 -0500 Subject: [PATCH] Merge pull request #33888 from optimumtact/dothefandangomistersantiago relic teleport no longer recursively calls itself --- code/modules/research/experimentor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index bad8f1e5aa..2c1536b26e 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -664,9 +664,9 @@ /obj/item/relic/proc/teleport(mob/user) to_chat(user, "[src] begins to vibrate!") - addtimer(CALLBACK(src, .proc/do_teleport, user), rand(10, 30)) + addtimer(CALLBACK(src, .proc/do_the_teleport, user), rand(10, 30)) -/obj/item/relic/proc/do_teleport(mob/user) +/obj/item/relic/proc/do_the_teleport(mob/user) var/turf/userturf = get_turf(user) if(loc == user && userturf.z != ZLEVEL_CENTCOM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you! visible_message("[src] twists and bends, relocating itself!")