From 71d6fd86fe1fa9638f5359a42b3d436ced5bf8bf Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 15 Jun 2022 18:55:27 -0400 Subject: [PATCH 1/3] you can now shoot over people who are near you --- code/modules/projectiles/projectile.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 1590376f3916..fb12d782bff1 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -579,6 +579,8 @@ else var/mob/living/L = target if(!direct_target) + if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_STAND && (L in range(2, starting)) //if we're shooting over someone who's prone and nearby bc formations are cool and not going to be unbalanced + return FALSE if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_USE | MOBILITY_STAND | MOBILITY_MOVE) || !(L.stat == CONSCIOUS)) //If they're able to 1. stand or 2. use items or 3. move, AND they are not softcrit, they are not stunned enough to dodge projectiles passing over. return FALSE return TRUE From 1372f5caae9737d813b458aea75cc3be62c2fb68 Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 15 Jun 2022 18:58:56 -0400 Subject: [PATCH 2/3] Update projectile.dm --- 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 fb12d782bff1..363912b51adb 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -579,7 +579,7 @@ else var/mob/living/L = target if(!direct_target) - if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_STAND && (L in range(2, starting)) //if we're shooting over someone who's prone and nearby bc formations are cool and not going to be unbalanced + if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_STAND) && (L in range(2, starting)) //if we're shooting over someone who's prone and nearby bc formations are cool and not going to be unbalanced return FALSE if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_USE | MOBILITY_STAND | MOBILITY_MOVE) || !(L.stat == CONSCIOUS)) //If they're able to 1. stand or 2. use items or 3. move, AND they are not softcrit, they are not stunned enough to dodge projectiles passing over. return FALSE From f8f246da339806065b29b1320af9d7b20eb243c3 Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 15 Jun 2022 19:01:57 -0400 Subject: [PATCH 3/3] Update projectile.dm --- 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 363912b51adb..ca2cd87abf4c 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -579,7 +579,7 @@ else var/mob/living/L = target if(!direct_target) - if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_STAND) && (L in range(2, starting)) //if we're shooting over someone who's prone and nearby bc formations are cool and not going to be unbalanced + if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_STAND) && (L in range(2, starting))) //if we're shooting over someone who's prone and nearby bc formations are cool and not going to be unbalanced return FALSE if(!CHECK_BITFIELD(L.mobility_flags, MOBILITY_USE | MOBILITY_STAND | MOBILITY_MOVE) || !(L.stat == CONSCIOUS)) //If they're able to 1. stand or 2. use items or 3. move, AND they are not softcrit, they are not stunned enough to dodge projectiles passing over. return FALSE