WIP

cmss13-devs · Nov 13, 2023 · 9425267 · 9425267
1 parent 99491e4
commit 9425267
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
@@ -299,10 +299,10 @@
 	health_threshold = max(CEILING((health * 4) / (maxHealth), 1), 0) //From 0 to 4, in 25% chunks
 	if(health > HEALTH_THRESHOLD_DEAD)
 		if(health_threshold > 3)
-			wound_icon_carrier.icon_state = "none"
+			wound_icon_holder.icon_state = "none"
 		else if(body_position == LYING_DOWN)
 			if(!HAS_TRAIT(src, TRAIT_INCAPACITATED) && !HAS_TRAIT(src, TRAIT_FLOORED))
-				wound_icon_carrier.icon_state = "[caste.caste_type]_rest_[health_threshold]"
+				wound_icon_holder.icon_state = "[caste.caste_type]_rest_[health_threshold]"
 			else
 				wound_icon_holder.icon_state = "[caste.caste_type]_downed_[health_threshold]"
 		else if(!handle_special_state())

diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -113,10 +113,10 @@
 	var/health_threshold = max(CEILING((health * 4) / (maxHealth), 1), 0) //From 0 to 4, in 25% chunks
 	if(health > HEALTH_THRESHOLD_DEAD)
 		if(health_threshold > 3)
-			wound_icon_carrier.icon_state = "none"
+			wound_icon_holder.icon_state = "none"
 		else if(body_position == LYING_DOWN)
 			if(!HAS_TRAIT(src, TRAIT_INCAPACITATED) && !HAS_TRAIT(src, TRAIT_FLOORED))
-				wound_icon_carrier.icon_state = "[caste_name]_rest_[health_threshold]"
+				wound_icon_holder.icon_state = "[caste_name]_rest_[health_threshold]"
 			else
 				wound_icon_holder.icon_state = "[caste_name]_downed_[health_threshold]"
 		else

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -314,6 +314,7 @@ var/global/list/limb_types_by_name = list(
 /// Returns if the mob is incapacitated and unable to perform general actions
 /mob/proc/is_mob_incapacitated(ignore_restrained)
 	// note that stat includes knockout via unconscious
+	// TODO: re-re-re-figure out if we need TRAIT_FLOORED here or using TRAIT_INCAPACITATED only is acceptable deviance from legacy behavior
 	return (stat || (!ignore_restrained && is_mob_restrained()) || (status_flags & FAKEDEATH) || HAS_TRAIT(src, TRAIT_INCAPACITATED))
 /mob/proc/get_eye_protection()
 	return EYE_PROTECTION_NONE