cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8097 from mwerezak/projectile-fix

Browse Source 
Fixes errors introduced by merge
This commit is contained in:
Chinsky
2015-02-10 09:23:09 +03:00
parent 79aacd9f30 d8a8384c41
commit ec6278f028
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,16 +230,21 @@
/obj/item/projectile/process() /obj/item/projectile/process()
if(kill_count < 1) if(kill_count < 1)
del(src) del(src)
return kill_count--
step_towards(src, current) spawn while(src)
sleep(1) if((!( current ) || loc == current))
if(!bumped && !isturf(original)) current = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z)
if(loc == get_turf(original)) if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))
if(!(original in permutated)) del(src)
Bump(original) return
sleep(1) step_towards(src, current)
sleep(1)
if(!bumped && !isturf(original))
if(loc == get_turf(original))
if(!(original in permutated))
Bump(original)
sleep(1)
//"Tracing" projectile
/obj/item/projectile/test //Used to see if you can hit them. /obj/item/projectile/test //Used to see if you can hit them.
invisibility = 101 //Nope! Can't see me! invisibility = 101 //Nope! Can't see me!
yo = null yo = null