From 7f53f7dc08cc568bc110ba364e9a9e7c449f29d7 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 7 Jan 2018 15:20:59 -0500 Subject: [PATCH] Update projectile.dm --- code/modules/projectiles/projectile.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 6bdd4b31be..dc3d584061 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -362,10 +362,7 @@ 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)