cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9382 from Incoming5643/warpsandwarpsandwarps

Browse Source 
Fixes teleporting out of a jaunt
This commit is contained in:
Cheridan
2015-05-08 15:24:04 -05:00
parent 6a5d0d8b86 ccff89cdd1
commit feda2e8ffc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/ethereal_jaunt.dm
+5 -2
View File
@@ -19,7 +19,7 @@
for(var/mob/living/target in targets)
target.notransform = 1 //protects the mob from being transformed (replaced) midjaunt and getting stuck in bluespace
spawn(0)
var/mobloc = get_turf(target.loc)
var/turf/mobloc = get_turf(target.loc)
var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt( mobloc )
var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc )
animation.name = "water"
@@ -36,6 +36,9 @@
target.notransform=0 //mob is safely inside holder now, no need for protection.
jaunt_steam(mobloc)
sleep(jaunt_duration)
if(target.loc != holder) //mob warped out of the warp
qdel(holder)
return
mobloc = get_turf(target.loc)
animation.loc = mobloc
jaunt_steam(mobloc)
@@ -44,7 +47,7 @@
sleep(20)
jaunt_reappear(animation, target)
sleep(5)
if(!target.Move(mobloc))
if(mobloc.density)
for(var/direction in list(1,2,4,8,5,6,9,10))
var/turf/T = get_step(mobloc, direction)
if(T)