From 9d0e872e63096725aed4d1a8e89b9b71d7b2b2f4 Mon Sep 17 00:00:00 2001
From: Merrgear <68803078+Merrgear@users.noreply.github.com>
Date: Mon, 22 Jul 2024 01:48:59 -0400
Subject: [PATCH] fixes those two issues we found

---
 .../xeno/ai_behavior_overrides/capture_override_behavior.dm     | 2 +-
 code/modules/mob/living/carbon/human/human_attackhand.dm        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm
index 96eaa7d8fb..7f5734c8ee 100644
--- a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm
+++ b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm
@@ -45,7 +45,7 @@
 	if(distance > 10)
 		return FALSE
 
-	if(captee_stat == CONSCIOUS)
+	if(captee_stat == CONSCIOUS && !(HAS_TRAIT(parent_mob, TRAIT_FLOORED) && HAS_TRAIT(parent_mob, TRAIT_INCAPACITATED)))
 		return FALSE
 
 	if(isxeno(pulledby) && pulledby != checked_xeno)
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 2bb113d677..1c115d5537 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -22,7 +22,7 @@
 				return 1
 
 			// If unconcious with oxygen damage, do CPR. If dead, we do CPR
-			if(!(stat == UNCONSCIOUS && getOxyLoss() > 0) && !(stat == DEAD))
+			if(!((stat == UNCONSCIOUS || (HAS_TRAIT(src, TRAIT_FLOORED) && HAS_TRAIT(src, TRAIT_INCAPACITATED))) && getOxyLoss() > 0) && !(stat == DEAD))
 				help_shake_act(attacking_mob)
 				return 1