cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #793 from Aranclanos/projectiles

Browse Source 
Projectiles
This commit is contained in:
d3athrow
2014-05-24 11:29:04 -05:00
parent 266f257b8c 23b729a7a4
commit 5504e39ce4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/projectile.dm
View File

@@ -188,7 +188,7 @@
returnToPool(src)
return
kill_count--
spawn while(src)
spawn while(loc)
if((!( current ) || loc == current))
current = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z)
if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))
@@ -196,12 +196,12 @@
returnToPool(src)
return
step_towards(src, current)
sleep(1)
if(!bumped && !isturf(original))
if(loc == get_turf(original))
if(!(original in permutated))
Bump(original)
sleep(1)
sleep(1)
return
proc/dumbfire(var/dir) // for spacepods, go snowflake go
if(!dir)
@@ -211,15 +211,15 @@
//del(src)
returnToPool(src)
kill_count--
spawn while(src)
spawn while(loc)
var/turf/T = get_step(src, dir)
step_towards(src, T)
sleep(1)
if(!bumped && !isturf(original))
if(loc == get_turf(original))
if(!(original in permutated))
Bump(original)
sleep(1)
sleep(1)
return
/obj/item/projectile/test //Used to see if you can hit them.
@@ -249,7 +249,7 @@
yo = targloc.y - curloc.y
xo = targloc.x - curloc.x
target = targloc
while(src) //Loop on through!
while(loc) //Loop on through!
if(result)
return (result - 1)
if((!( target ) || loc == target))