Skip to content

[REFACTOR] Updates Vampire strain code, fixes missing headbite cooldown and early DEAD target check. #12632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Venuska1117 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[REFACTOR] Updates Vampire strain code, fixes missing headbite cooldown and early DEAD target check. #12632

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5ab530
vampire changes
Venuska1117 Jul 12, 2026
0fdb757
.
Venuska1117 Aug 11, 2026
d63d2a4
Merge branch 'master' into nu2-vampire
Venuska1117 Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@

if(!istype(xeno))
return
if(!xeno.check_state())
return
if(!action_cooldown_check())
return

XENO_ACTION_CHECK(xeno)

xeno.visible_message(SPAN_DANGER("[xeno] drags its claws in a wide area in front of it!"),
SPAN_XENOWARNING("We unleash a barrage of slashes!"))
Expand Down Expand Up @@ -113,16 +111,11 @@
return ..()

/datum/action/xeno_action/activable/tail_jab/use_ability(atom/targeted_atom)

var/mob/living/carbon/xenomorph/xeno = owner
var/mob/living/carbon/hit_target = targeted_atom
var/distance = get_dist(xeno, hit_target)

if(!action_cooldown_check())
return

if(!xeno.check_state())
return
XENO_ACTION_CHECK_USE_PLASMA(xeno)
Comment thread
Venuska1117 marked this conversation as resolved.
Outdated

if(distance > 2)
return
Expand Down Expand Up @@ -220,6 +213,10 @@
if(xeno.can_not_harm(target_carbon))
return

if(target_carbon.stat == DEAD)
to_chat(xeno, SPAN_XENODANGER("They are already dead!"))
return

if(!(HAS_TRAIT(target_carbon, TRAIT_KNOCKEDOUT) || target_carbon.stat == UNCONSCIOUS)) //called knocked out because for some reason .stat seems to have a delay .
to_chat(xeno, SPAN_XENOHIGHDANGER("We can only headbite an unconscious, adjacent target!"))
return
Expand All @@ -228,10 +225,7 @@
to_chat(xeno, SPAN_XENOHIGHDANGER("We can only headbite an unconscious, adjacent target!"))
return

if(xeno.stat == UNCONSCIOUS)
return

if(xeno.stat == DEAD)
if(xeno.stat == UNCONSCIOUS || xeno.stat == DEAD)
return

if(xeno.action_busy)
Expand All @@ -243,6 +237,8 @@
to_chat(xeno, SPAN_WARNING("We should not harm this host! It has a sister inside."))
return

XENO_ACTION_CHECK(xeno)

xeno.visible_message(SPAN_DANGER("[xeno] grabs [target_carbon]鈥檚 head aggressively."),
SPAN_XENOWARNING("We grab [target_carbon]鈥檚 head aggressively."))

Expand Down