From e5b5d04dbefed0fea95bdf7c717b2db20a407bef Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:28:12 +0100 Subject: [PATCH] Projectiles now can hit border objects on other turfs instead of passing through them (#84975) ## About The Pull Request Title. Due to Guncode:tm: firing at a directional window/windoor/whatever facing you will make the projectile pass through it due to incorrect arguments (it does not ignore projectile's current loc while it should) Originally discovered by Kapu ## Changelog :cl: SmArtKar, Kapu balance: Projectiles now can hit border objects on other turfs instead of passing through them /:cl: --- code/modules/projectiles/projectile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 7870c10e9ef..000ce04e5b0 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -565,7 +565,7 @@ */ /obj/projectile/proc/select_target(turf/our_turf, atom/target, atom/bumped) // 1. special bumped border object check - if((bumped?.flags_1 & ON_BORDER_1) && can_hit_target(bumped, original == bumped, FALSE, TRUE)) + if((bumped?.flags_1 & ON_BORDER_1) && can_hit_target(bumped, original == bumped, TRUE, TRUE)) return bumped // 2. original if(can_hit_target(original, TRUE, FALSE, original == bumped))