Hopefully doesnt break the ai

cmss13-devs · Jul 20, 2024 · 724b549 · 724b549
1 parent d12b65f
commit 724b549
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/code/datums/effects/mob_crit/human_crit.dm b/code/datums/effects/mob_crit/human_crit.dm
@@ -8,7 +8,7 @@
 		qdel(src)
 		return FALSE
 
-	affected_mob.apply_effect(3, PARALYZE)
+	affected_mob.apply_effect(3, WEAKEN)
 	if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline"))
 		affected_mob.apply_damage(1, OXY)
 

diff --git a/code/datums/effects/pain/human_pain.dm b/code/datums/effects/pain/human_pain.dm
@@ -58,7 +58,7 @@
 
 	var/mob/living/carbon/affected_mob = affected_atom
 	if(do_once)
-		affected_mob.apply_effect(3, PARALYZE)
+		affected_mob.apply_effect(3, WEAKEN)
 		do_once = FALSE
 
 	affected_mob.EyeBlur(2)
@@ -83,7 +83,7 @@
 	affected_mob.EyeBlur(2)
 	if(affected_mob.pain && affected_mob.pain.feels_pain)
 		affected_mob.TalkStutter(2)
-	affected_mob.apply_effect(2, PARALYZE)
+	affected_mob.apply_effect(2, WEAKEN)
 	if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline"))
 		affected_mob.apply_damage(0.5, OXY)
 

diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm
@@ -42,7 +42,7 @@
 
 		//UNCONSCIOUS. NO-ONE IS HOME
 		if(regular_update && ((getOxyLoss() > 50)))
-			apply_effect(3, PARALYZE)
+			apply_effect(3, WEAKEN)
 
 		if((src.species.flags & HAS_HARDCRIT) && HEALTH_THRESHOLD_CRIT > health)
 			var/already_in_crit = FALSE

diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
@@ -127,7 +127,7 @@ At bare minimum, make sure the relevant checks from parent types gets copied in
 //          MOBS           //
 /////////////////////////////
 /mob/living/ai_check_stat(mob/living/carbon/xenomorph/X)
-	return stat == CONSCIOUS
+	return stat == CONSCIOUS && !(HAS_TRAIT(src, TRAIT_FLOORED) && HAS_TRAIT(src, TRAIT_INCAPACITATED))
 
 
 /////////////////////////////