Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vamp lurker Tweaks #5625

Merged
merged 4 commits into from
Feb 18, 2024
Merged

Vamp lurker Tweaks #5625

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
650233b
vampo
Diegoflores31 Feb 1, 2024
052426c
a
Diegoflores31 Feb 18, 2024
be78042
finaly
Diegoflores31 Feb 18, 2024
821432e
Tweak whitespace
Drulikar Feb 18, 2024
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
23 changes: 16 additions & 7 deletions code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
if(distance > 2)
return

var/list/turf/path = get_line(xeno, hit_target, include_start_atom = FALSE)
var/list/turf/path = get_line(xeno, targeted_atom, include_start_atom = FALSE)
for(var/turf/path_turf as anything in path)
if(path_turf.density)
to_chat(xeno, SPAN_WARNING("There's something blocking us from striking!"))
Expand All @@ -211,8 +211,20 @@
if(current_structure.density && !current_structure.throwpass)
to_chat(xeno, SPAN_WARNING("There's something blocking us from striking!"))
return

if(!isxeno_human(hit_target) || xeno.can_not_harm(hit_target) || hit_target.stat == DEAD)
// find a target in the target turf
if(!iscarbon(targeted_atom) || hit_target.stat == DEAD)
for(var/mob/living/carbon/carbonara in get_turf(targeted_atom))
hit_target = carbonara
if(!xeno.can_not_harm(hit_target) && hit_target.stat != DEAD)
break
Drulikar marked this conversation as resolved.
Show resolved Hide resolved

if(iscarbon(hit_target) && !xeno.can_not_harm(hit_target) && hit_target.stat != DEAD)
if(targeted_atom == hit_target) //reward for a direct hit
to_chat(xeno, SPAN_XENOHIGHDANGER("We directly slam [hit_target] with our tail, throwing it back after impaling it on our tail!"))
hit_target.apply_armoured_damage(15, ARMOR_MELEE, BRUTE, "chest")
else
to_chat(xeno, SPAN_XENODANGER("We attack [hit_target] with our tail, throwing it back after stabbing it with our tail!"))
else
xeno.visible_message(SPAN_XENOWARNING("\The [xeno] swipes their tail through the air!"), SPAN_XENOWARNING("We swipe our tail through the air!"))
apply_cooldown(cooldown_modifier = 0.2)
playsound(xeno, 'sound/effects/alien_tail_swipe1.ogg', 50, TRUE)
Expand All @@ -221,11 +233,8 @@
// FX
var/stab_direction

to_chat(xeno, SPAN_XENOHIGHDANGER("We directly slam [hit_target] with our tail, throwing it back after impaling it on our tail!"))
stab_direction = turn(get_dir(xeno, targeted_atom), 180)
playsound(hit_target,'sound/weapons/alien_tail_attack.ogg', 50, TRUE)

stab_direction = turn(get_dir(xeno, hit_target), 180)

if(hit_target.mob_size < MOB_SIZE_BIG)
step_away(hit_target, xeno)

Expand Down
Loading