review

code/datums/mob_hud.dm

@@ -782,19 +782,13 @@ GLOBAL_DATUM(hud_icon_hudfocus, /image)
 	holder.icon_state = holo_card_color ? "holo_card_[holo_card_color]" : "hudblank"
 
 // Vampire Execute HUD
-/mob/living/carbon/human/proc/update_execute_hud()
+/mob/living/carbon/human/proc/update_execute_hud(show)
 	var/image/execute_holder = hud_list[XENO_EXECUTE]
 
 	execute_holder.icon_state = "hudblank"
 	execute_holder.overlays.Cut()
 
-	var/execute_found = FALSE
-	for (var/datum/effects/execute_tag/ET in effects_list)
-		if (!QDELETED(ET))
-			execute_found = TRUE
-			break
-
-	if (execute_found)
+	if(show)
 		execute_holder.overlays += image('icons/mob/hud/hud.dmi', src, "prae_tag")
 
 // Xeno "hostile" HUD

code/modules/mob/living/carbon/human/human.dm

@@ -1704,3 +1704,21 @@
 			item.showoff(src)
 			return TRUE
 	return ..()
+
+/mob/living/carbon/human/on_knockedout_trait_gain(datum/source)
+	SIGNAL_HANDLER
+	. = ..()
+	if(!length(hud_list[XENO_EXECUTE].overlays))
+		update_execute_hud(show=TRUE)
+
+	return .
+
+/mob/living/carbon/human/on_knockedout_trait_loss(datum/source)
+	SIGNAL_HANDLER
+	. = ..()
+
+	if(stat != UNCONSCIOUS && length(hud_list[XENO_EXECUTE].overlays))
+		update_execute_hud(show=FALSE)
+
+	return .
+

code/modules/mob/living/carbon/human/life.dm

@@ -96,10 +96,7 @@
 	if(stat != .)
 		handle_regular_hud_updates()
 
-	for (var/datum/effects/execute_tag/target_tag in src.effects_list)
-		qdel(target_tag)
-
-	if (HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || stat == UNCONSCIOUS)
-		new /datum/effects/execute_tag(src, src, ttl = 35)
-
-	update_execute_hud()
+	if(stat == UNCONSCIOUS && !length(hud_list[XENO_EXECUTE].overlays))
+		update_execute_hud(show=TRUE)
+	else if(!HAS_TRAIT(src, TRAIT_KNOCKEDOUT) && length(hud_list[XENO_EXECUTE].overlays))
+		update_execute_hud(show=FALSE)

colonialmarines.dme

@@ -475,7 +475,6 @@
 #include "code\datums\effects\stamina\stamina_human.dm"
 #include "code\datums\effects\xeno_strains\boiler_trap.dm"
 #include "code\datums\effects\xeno_strains\dancer_tag.dm"
-#include "code\datums\effects\xeno_strains\execute_tag.dm"
 #include "code\datums\effects\xeno_strains\gain_xeno_cooldown_reduction_on_slash.dm"
 #include "code\datums\effects\xeno_strains\prae_acid_stacks.dm"
 #include "code\datums\effects\xeno_strains\xeno_buff.dm"