From ca9ef9803c9a87d23723049c5068d62d6024ce22 Mon Sep 17 00:00:00 2001
From: Theos <theubernyan@gmail.com>
Date: Mon, 8 Jul 2024 13:40:13 -0400
Subject: [PATCH] Projectiles are no longer bloodthirsty for stam/softcrit
 people (#3177)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

replaces stat == dead check with a generic stat check because any stat
above 0 means the target is incapable of doing much of anything

Stamcrit now gives TRAIT_HANDS_BLOCKED like other stuns, this shouldn't
do much except allow projectiles to fly over them since you can't do
hands stuff in stamcrit anyway

## Why It's Good For The Game

I don't WANT to fill the poor sod in the front with 500000 rubber
bullets I WANT to crowd control!!

## Changelog

:cl:
code: People who are stunned are now more reliably passed by bullets not
aimed directly at them
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/modules/mob/living/carbon/carbon.dm       | 1 +
 code/modules/mob/living/carbon/status_procs.dm | 1 +
 code/modules/projectiles/projectile.dm         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index dd5b29059085f..3ed2b86816ac4 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -538,6 +538,7 @@
 		REMOVE_TRAIT(src, TRAIT_INCAPACITATED, STAMINA)
 		REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA)
 		REMOVE_TRAIT(src, TRAIT_FLOORED, STAMINA)
+		REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA)
 	else
 		return
 	update_health_hud()
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index cc15c12d836e9..5ab2c57be0f48 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -17,6 +17,7 @@
 	ADD_TRAIT(src, TRAIT_INCAPACITATED, STAMINA)
 	ADD_TRAIT(src, TRAIT_IMMOBILIZED, STAMINA)
 	ADD_TRAIT(src, TRAIT_FLOORED, STAMINA)
+	ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, STAMINA)
 	if((maxHealth - health + getStaminaLoss()) > 120) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems.		//WS Edit - Stamina stacks with health damage
 		adjustStaminaLoss(30, FALSE)
 
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 0b9bcb8da4f78..66adeb53ac59f 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -490,7 +490,7 @@
 		if(direct_target)
 			return TRUE
 		// If target not able to use items, move and stand - or if they're just dead, pass over.
-		if(L.stat == DEAD || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED)))
+		if(L.stat || (!hit_stunned_targets && HAS_TRAIT(L, TRAIT_IMMOBILIZED) && HAS_TRAIT(L, TRAIT_FLOORED) && HAS_TRAIT(L, TRAIT_HANDS_BLOCKED)))
 			return FALSE
 	return TRUE