From 23a6b58f799a4b0409f2e76c6cf05d686190c238 Mon Sep 17 00:00:00 2001
From: Merrgear <68803078+Merrgear@users.noreply.github.com>
Date: Tue, 13 Aug 2024 21:28:42 -0400
Subject: [PATCH] boberthastofindnewstufftocomplain

---
 code/modules/cm_marines/overwatch.dm                           | 3 +++
 .../mob/living/carbon/human/life/handle_regular_hud_updates.dm | 2 +-
 tgui/packages/tgui/interfaces/OverwatchConsole.jsx             | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
index 243ecd9342..58cfd2c797 100644
--- a/code/modules/cm_marines/overwatch.dm
+++ b/code/modules/cm_marines/overwatch.dm
@@ -218,6 +218,9 @@
 				if(DEAD)
 					mob_state = "Dead"
 
+			if(mob_state == "Conscious" && (locate(/datum/effects/crit) in marine_human.effects_list))
+				mob_state = "Incapacitated"
+
 			if(!istype(marine_human.head, /obj/item/clothing/head/helmet/marine))
 				has_helmet = FALSE
 
diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm
index b84c8e9d24..32dd9ddef8 100644
--- a/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm
+++ b/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm
@@ -7,7 +7,7 @@
 
 	if(stat != DEAD) //the dead get zero fullscreens
 
-		if(stat == UNCONSCIOUS)
+		if(stat == UNCONSCIOUS || (locate(/datum/effects/crit) in effects_list))
 			var/severity = 0
 			switch(health)
 				if(-20 to -10) severity = 1
diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx
index 0c2c4e801c..db9987529e 100644
--- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx
+++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx
@@ -370,12 +370,13 @@ const SquadMonitor = (props) => {
 
   let determine_status_color = (status) => {
     let conscious = status.includes('Conscious');
+    let incapacitated = status.includes('Incapacitated');
     let unconscious = status.includes('Unconscious');
 
     let state_color = 'red';
     if (conscious) {
       state_color = 'green';
-    } else if (unconscious) {
+    } else if (incapacitated || unconscious) {
       state_color = 'yellow';
     }
     return state_color;