cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Jaunters

Browse Source
This commit is contained in:
kevinz000
2018-01-13 22:33:36 -08:00
committed by CitadelStationBot
parent 2c337dac81
commit 81bc49cafe
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/helper_datums/teleport.dm
View File

@@ -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

6
code/modules/mining/equipment/wormhole_jaunter.dm
View File

@@ -54,7 +54,7 @@
to_chat(user, "<span class='notice'>The [src.name] found no beacons in the world to anchor a wormhole to.</span>")
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.</span>")
//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