Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation

This commit is contained in:
Crazylemon64
2016-08-10 11:02:05 -07:00
54 changed files with 616 additions and 331 deletions
+1 -1
View File
@@ -542,7 +542,7 @@
to_chat(user, "<span class='notice'>The [src.name] failed to create a wormhole.</span>")
return
var/chosen_beacon = pick(L)
var/obj/effect/portal/wormhole/jaunt_tunnel/J = new /obj/effect/portal/wormhole/jaunt_tunnel(get_turf(src), chosen_beacon)
var/obj/effect/portal/wormhole/jaunt_tunnel/J = new /obj/effect/portal/wormhole/jaunt_tunnel(get_turf(src), chosen_beacon, lifespan=100)
try_move_adjacent(J)
playsound(src,'sound/effects/sparks4.ogg',50,1)
qdel(src)