From d8a8384c41f631dbf98f401fb2a4d9159cebb73c Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 9 Feb 2015 17:53:47 -0500
Subject: [PATCH] Fixes errors introduced by merge

Fixes errors introduced by commit
fac32d07e939ccde5229bed9642b72b25ad6f55a.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
---
 code/modules/projectiles/projectile.dm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 5cd7e640b11..0ca1ab93fc8 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -230,16 +230,21 @@
 /obj/item/projectile/process()
 	if(kill_count < 1)
 		del(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)
+	kill_count--
+	spawn while(src)
+		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))
+			del(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)
 
-//"Tracing" projectile
 /obj/item/projectile/test //Used to see if you can hit them.
 	invisibility = 101 //Nope!  Can't see me!
 	yo = null