shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33888 from optimumtact/dothefandangomistersantiago

Browse Source 
relic teleport no longer recursively calls itself
This commit is contained in:
Jordan Brown
2017-12-27 20:31:51 -05:00
committed by CitadelStationBot
parent a034383e15
commit df080960d4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/experimentor.dm
+2 -2
View File
@@ -664,9 +664,9 @@
/obj/item/relic/proc/teleport(mob/user)
to_chat(user, "<span class='notice'>[src] begins to vibrate!</span>")
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("<span class='notice'>[src] twists and bends, relocating itself!</span>")