From 0b28e17860fbc89cac3da4b7cbca20867f36ca9c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 10 Feb 2020 04:13:59 -0700 Subject: [PATCH] Update gravity.dm --- code/modules/projectiles/projectile/special/gravity.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/projectile/special/gravity.dm b/code/modules/projectiles/projectile/special/gravity.dm index 0efdc77806..418548bac9 100644 --- a/code/modules/projectiles/projectile/special/gravity.dm +++ b/code/modules/projectiles/projectile/special/gravity.dm @@ -32,15 +32,14 @@ if(!safety) break var/atom/movable/AM = i - if(can_throw(AM, thrown) && do_the_throw(T, AM, thrown)) + if(do_the_throw(T, AM, thrown)) safety-- for(var/turf/F in range(T,power)) new /obj/effect/temp_visual/gravpush(F) -/obj/item/projectile/gravity/proc/can_throw(atom/movable/AM, list/thrown) - return (AM != src) && (AM != firer) && !AM.anchored && !thrown[AM] - /obj/item/projectile/gravity/proc/do_the_throw(turf/origin, atom/movable/AM, list/thrown) + if((AM == src) || (AM == firer) || AM.anchored || thrown[AM]) + return thrown[AM] = TRUE var/target = get_target(origin, AM) if(!target)