Fixes errors introduced by merge

Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).

code/modules/projectiles/projectile.dm

@@ -230,6 +230,12 @@
 /obj/item/projectile/process()
 	if(kill_count < 1)
 		del(src)
+	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)
@@ -239,7 +245,6 @@
 					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