Merge pull request #1001 from ZomgPonies/reflec

Fixes reflecting projectiles
This commit is contained in:
Fox-McCloud
2015-05-10 20:19:31 -04:00
2 changed files with 4 additions and 2 deletions
@@ -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.
+2 -1
View File
@@ -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