From 113e2e6068aabcaa3686f8d133fd8538fe1f1735 Mon Sep 17 00:00:00 2001 From: atermonera Date: Tue, 2 Mar 2021 13:10:22 -0900 Subject: [PATCH] Throwing still has max range --- code/game/atoms_movable.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index a5374cc7ba..050f7a6517 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -450,8 +450,10 @@ minor_dir = dx minor_dist = dist_x + range = min(dist_x + dist_y, range) + while(src && target && src.throwing && istype(src.loc, /turf) \ - && ((abs(target.x - src.x)+abs(target.y - src.y) > 0 && dist_travelled < (dist_x + dist_y)) \ + && ((abs(target.x - src.x)+abs(target.y - src.y) > 0 && dist_travelled < range) \ || (a && a.has_gravity == 0) \ || istype(src.loc, /turf/space))) // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up