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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Thalpy
2019-08-05 09:09:36 +01:00
committed by GitHub
parent ffa717e8d7 96dd255fe0
commit 5795f6bbe2
250 changed files with 5984 additions and 3941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/area_teleport.dm
+2 -2
View File
@@ -58,7 +58,7 @@
var/success = 0
while(tempL.len)
attempt = pick(tempL)
target.Move(attempt)
do_teleport(target, attempt, channel = TELEPORT_CHANNEL_MAGIC)
if(get_turf(target) == attempt)
success = 1
break
@@ -66,7 +66,7 @@
tempL.Remove(attempt)
if(!success)
target.forceMove(L)
do_teleport(target, L, forceMove = TRUE, channel = TELEPORT_CHANNEL_MAGIC)
playsound(get_turf(user), sound2, 50,1)
return
code/modules/spells/spell_types/turf_teleport.dm
+2 -3
View File
@@ -40,6 +40,5 @@
if(!picked || !isturf(picked))
return
if(!target.Move(picked))
target.forceMove(picked)
playsound(get_turf(user), sound2, 50,1)
if(do_teleport(user, picked, forceMove = TRUE, channel = TELEPORT_CHANNEL_MAGIC))
playsound(get_turf(user), sound1, 50,1)