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

fixes AOE projectile automatic proximity detonation

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-25 07:29:47 -05:00
parent 869953cd18
commit 36c14b3e71
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/projectiles/projectile/magic.dm
View File

@@ -351,21 +351,9 @@
/obj/item/projectile/magic/aoe/Range()
if(proxdet)
var/turf/T1 = get_step(src,turn(dir, -45))
var/turf/T2 = get_step(src,turn(dir, 45))
var/turf/T3 = get_step(src,dir)
var/mob/living/L = locate(/mob/living) in T1 //if there's a mob alive in our front right diagonal, we hit it.
if(L && L.stat != DEAD)
Bump(L,1) //Magic Bullet #teachthecontroversy
return
L = locate(/mob/living) in T2
if(L && L.stat != DEAD)
Bump(L,1)
return
L = locate(/mob/living) in T3
if(L && L.stat != DEAD)
Bump(L,1)
return
for(var/mob/living/L in range(1, get_turf(src)))
if(L.stat != DEAD && L != firer)
return Bump(L, TRUE)
..()
/obj/item/projectile/magic/aoe/lightning