Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

Conflicts:
	code/modules/mob/mob_defines.dm

code/modules/projectiles/gun.dm

@@ -392,7 +392,6 @@ mob/proc
 						m_intent = "walk"
 						hud_used.move_intent.icon_state = "walking"
 				while(targeted_by && T.client)
-					sleep(1)
 					if(last_move_intent > I.lock_time + 10 && !T.client.target_can_move) //If the target moved while targeted
 						I.TargetActed(src)
 						if(I.last_moved_mob == src) //If they were the last ones to move, give them more of a grace period, so that an automatic weapon can hold down a room better.
@@ -411,6 +410,7 @@ mob/proc
 							I.lock_time = world.time + 5
 						I.lock_time = world.time + 5
 						I.last_moved_mob = src
+					sleep(1)
 
 	NotTargeted(var/obj/item/weapon/gun/I)
 		if(!I.silenced)

code/modules/projectiles/projectile.dm

@@ -59,13 +59,11 @@
 	proc/check_fire(var/mob/living/target as mob, var/mob/living/user as mob)  //Checks if you can hit them or not.
 		if(!istype(target) || !istype(user))
 			return 0
-		var/obj/item/projectile/test/in_chamber = new /obj/item/projectile/test(get_turf(src)) //Making the test....
-		var/turf/curloc = get_turf(user)
-		var/turf/targloc = get_turf(target)
-		in_chamber.yo = targloc.y - curloc.y
-		in_chamber.xo = targloc.x - curloc.x
+		var/obj/item/projectile/test/in_chamber = new /obj/item/projectile/test(get_step_to(user,target)) //Making the test....
+		in_chamber.target = target
 		in_chamber.flags = flags //Set the flags...
 		in_chamber.pass_flags = pass_flags //And the pass flags to that of the real projectile...
+		in_chamber.firer = user
 		var/output = in_chamber.fired() //Test it!
 		del(in_chamber) //No need for it anymore
 		return output //Send it back to the gun!
@@ -151,24 +149,37 @@
 	yo = null
 	xo = null
 	var
-		turf/target = null
+		target = null
 		result = 0 //To pass the message back to the gun.
 
 	Bump(atom/A as mob|obj|turf|area)
+		if(A == firer)
+			loc = A.loc
+			return //cannot shoot yourself
+		if(istype(A, /obj/item/projectile))
+			return
 		if(istype(A, /mob/living))
 			result = 2 //We hit someone, return 1!
-		return ..()
+			return
+		result = 1
+		return
 
 	fired()
-		target = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z) //Finding the target turf at map edge
-		while(!result) //Loop on through!
-			if(!step_towards(src,target)) //If we hit something...
-				if(!result) //And the var is not already set....
-					result = 1 //Return 0
-				break
+		var/turf/curloc = get_turf(src)
+		var/turf/targloc = get_turf(target)
+		yo = targloc.y - curloc.y
+		xo = targloc.x - curloc.x
+		target = targloc
+		while(src) //Loop on through!
+			if(result)
+				return (result - 1)
+			if((!( target ) || loc == target))
+				target = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z) //Finding the target turf at map edge
+			step_towards(src, target)
+			var/mob/living/M = locate() in get_turf(src)
+			if(istype(M)) //If there is someting living...
+				return 1 //Return 1
 			else
-				var/mob/living/M = locate() in get_turf(src)
-				if(istype(M)) //If there is someting living...
-					result = 2 //Return 1
-					break
-		return (result-1)
+				M = locate() in get_step(src,target)
+				if(istype(M))
+					return 1