mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-17 11:05:16 +01:00
Projectiles now can hit border objects on other turfs instead of passing through them (#84975)
## About The Pull Request Title. Due to Guncode™️ 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 🆑 SmArtKar, Kapu balance: Projectiles now can hit border objects on other turfs instead of passing through them /🆑
This commit is contained in:
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user