From 81bc49cafed6cebc5f97b17b5fe0edda776f29fb Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jan 2018 22:33:36 -0800 Subject: [PATCH] Fixes Jaunters --- code/datums/helper_datums/teleport.dm | 4 ++-- code/modules/mining/equipment/wormhole_jaunter.dm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index f90d6eed32..0b208dd0ea 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -2,8 +2,8 @@ /proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null) var/datum/teleport/instant/science/D = new if(D.start(arglist(args))) - return 1 - return 0 + return TRUE + return FALSE /datum/teleport var/atom/movable/teleatom //atom to teleport diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index a482b36949..5915454ef8 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -54,7 +54,7 @@ to_chat(user, "The [src.name] found no beacons in the world to anchor a wormhole to.") return var/chosen_beacon = pick(L) - var/obj/effect/portal/wormhole/jaunt_tunnel/J = new (get_turf(src), src, 100, null, FALSE, get_turf(chosen_beacon)) + var/obj/effect/portal/jaunt_tunnel/J = new (get_turf(src), src, 100, null, FALSE, get_turf(chosen_beacon)) if(adjacent) try_move_adjacent(J) playsound(src,'sound/effects/sparks4.ogg',50,1) @@ -83,7 +83,7 @@ to_chat(user, "[src] is not attached to your belt, preventing it from saving you from the chasm. RIP.") //jaunter tunnel -/obj/effect/portal/wormhole/jaunt_tunnel +/obj/effect/portal/jaunt_tunnel name = "jaunt tunnel" icon = 'icons/effects/effects.dmi' icon_state = "bhole3" @@ -91,7 +91,7 @@ mech_sized = TRUE //save your ripley innate_accuracy_penalty = 6 -/obj/effect/portal/wormhole/jaunt_tunnel/teleport(atom/movable/M) +/obj/effect/portal/jaunt_tunnel/teleport(atom/movable/M) . = ..() if(.) // KERPLUNK