fixes those two issues we found

cmss13-devs · Jul 22, 2024 · 9d0e872 · 9d0e872
1 parent 724b549
commit 9d0e872
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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