Merge branch 'master' into mapsyncs43293845982

2018-01-07 22:06:04 +00:00
parent fcad1432a9 1f65e222b7
commit bc00ba540a
3 changed files with 14 additions and 9 deletions
@@ -391,7 +391,6 @@
 		yo = targloc.y - curloc.y
 		xo = targloc.x - curloc.x
 		setAngle(Get_Angle(src, targloc))
-		
 	if(isliving(source) && params)
 		var/list/calculated = calculate_projectile_angle_and_pixel_offsets(source, params)
 		p_x = calculated[2]