Fixes armor penetration not working on objects and therefore mechs

2018-01-07 15:02:30 -02:00
parent 277320b126
commit be1fe799db
2 changed files with 14 additions and 8 deletions
@@ -362,6 +362,10 @@
 	if(targloc || !params)
 		yo = targloc.y - curloc.y
 		xo = targloc.x - curloc.x
+<<<<<<< HEAD
+=======
+		setAngle(Get_Angle(src, targloc))
+>>>>>>> e1e10ca... Merge pull request #34140 from kevinz000/quickfix-1

 	if(isliving(source) && params)
 		var/list/calculated = calculate_projectile_angle_and_pixel_offsets(source, params)