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

Merge pull request #9141 from deathride58/removwarpwissle

Browse Source 
Actually fixes warp whistle runtimes
This commit is contained in:
kevinz000
2019-08-18 23:32:15 -07:00
committed by GitHub
parent 13f27c040e 20d71d1196
commit 86cfd8a561
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/wizard/equipment/artefact.dm
+5 -1
View File
@@ -405,8 +405,12 @@
var/breakout = 0 var/breakout = 0
while(breakout < 50) while(breakout < 50)
if(!T) if(!T)
break end_effect(user)
return
var/turf/potential_T = find_safe_turf() var/turf/potential_T = find_safe_turf()
if(!potential_T)
end_effect(user)
return
if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout) if(T.z != potential_T.z || abs(get_dist_euclidian(potential_T,T)) > 50 - breakout)
do_teleport(user, potential_T, channel = TELEPORT_CHANNEL_MAGIC) do_teleport(user, potential_T, channel = TELEPORT_CHANNEL_MAGIC)
user.canmove = 0 user.canmove = 0