diff --git a/code/datums/effects/xeno_strains/execute_tag.dm b/code/datums/effects/xeno_strains/execute_tag.dm index 92cf326c9560..5503b35a296c 100644 --- a/code/datums/effects/xeno_strains/execute_tag.dm +++ b/code/datums/effects/xeno_strains/execute_tag.dm @@ -4,18 +4,18 @@ flags = DEL_ON_DEATH | INF_DURATION -/datum/effects/execute_tag/New(atom/A, mob/from = null, last_dmg_source = null, zone = "chest", ttl = 35) - . = ..(A, from, last_dmg_source, zone) +/datum/effects/execute_tag/New(atom/affected, mob/from = null, last_dmg_source = null, zone = "chest", ttl = 35) + . = ..() addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), ttl) - if (ishuman(A)) - var/mob/living/carbon/human/H = A - H.update_xeno_hostile_hud() + if (ishuman(affected)) + var/mob/living/carbon/human/affected_human = affected + affected_human.update_xeno_hostile_hud() -/datum/effects/execute_tag/validate_atom(mob/living/carbon/H) - if (!isxeno_human(H) || H.stat == DEAD) +/datum/effects/execute_tag/validate_atom(mob/living/carbon/affected_carbon) + if (!isxeno_human(affected_carbon) || affected_carbon.stat == DEAD) return FALSE return ..() @@ -27,15 +27,15 @@ if (!istype(affected_atom, /mob/living/carbon/human)) return - var/mob/living/carbon/human/H = affected_atom - H.update_xeno_hostile_hud() + var/mob/living/carbon/human/affected_human = affected_atom + affected_human.update_xeno_hostile_hud() /datum/effects/execute_tag/Destroy() if (!ishuman(affected_atom)) return ..() - var/mob/living/carbon/human/H = affected_atom - addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, update_xeno_hostile_hud)), 3) + var/mob/living/carbon/human/affected_human = affected_atom + addtimer(CALLBACK(affected_human, TYPE_PROC_REF(/mob/living/carbon/human, update_xeno_hostile_hud)), 0.3 SECONDS) return ..() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 71b0725e6c4a..0e38c7429378 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -100,6 +100,6 @@ qdel(target_tag) if (HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || stat == UNCONSCIOUS) - new /datum/effects/execute_tag(src, src, , , 35) + new /datum/effects/execute_tag(src, src, ttl = 35) src.update_execute_hud()