From 6fe5db524ab343117b1ecb48bd96af072211602d Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sun, 10 May 2015 20:10:27 -0400 Subject: [PATCH] Fixes reflecting projectiles --- code/modules/mob/living/carbon/human/human_defense.dm | 3 ++- code/modules/projectiles/projectile.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 3da342387ea..7ba218dc9fa 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -27,6 +27,7 @@ emp_act P.current = curloc P.yo = new_y - curloc.y P.xo = new_x - curloc.x + P.Angle = ""//round(Get_Angle(P,P.original)) return -1 // complete projectile permutation @@ -488,7 +489,7 @@ emp_act ..() return - + /mob/living/carbon/human/experience_pressure_difference(pressure_difference, direction) if(shoes) if(istype(shoes,/obj/item/clothing/shoes/magboots)) //TODO: Make a not-shit shoe var system to negate airflow. diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index a4ce8cdeac2..c9d41e26531 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -155,7 +155,8 @@ var/turf/new_loc = get_turf(A) var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null if(permutation == -1 || forcedodge)// the bullet passes through a dense object! - bumped = 0 // reset bumped variable! + spawn(1) + bumped = 0 // reset bumped variable... after a delay. We don't want the projectile to hit AGAIN. Fixes deflecting projectiles. loc = new_loc permutated.Add(A) return 0