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

Vanguard tweaks #5174

Merged
merged 5 commits into from
Dec 13, 2023
Merged

Vanguard tweaks #5174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2499a92
base_changes
Dec 9, 2023
2b06627
better feedback
Dec 9, 2023
20daab0
Merge branch 'master' into Vanguardchanges
Red-byte3D Dec 9, 2023
3d82e63
reverting the stun
Dec 9, 2023
1dec152
Merge branch 'master' into Vanguardchanges
Red-byte3D Dec 9, 2023
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
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

var/buff_duration = 12
var/damage = 40
var/shield_regen_threshold = 2
var/shield_regen_threshold = 1

var/activated_once = FALSE
var/time_until_timeout = 20
Expand All @@ -54,8 +54,8 @@
xeno_cooldown = 120

// Root config
var/root_duration_unbuffed = 5
var/root_duration_buffed = 12.5
var/root_duration_unbuffed = 1 SECONDS
var/root_duration_buffed = 2.5 SECONDS

// Fling config
var/fling_dist_unbuffed = 3
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
if(!(mob_to_act in target_mobs))
target_mobs += mob_to_act

source_xeno.visible_message(SPAN_XENODANGER("[source_xeno] slashes its tail through the area in front of it!"), SPAN_XENODANGER("You slash your tail through the area in front of you!"))
source_xeno.visible_message(SPAN_XENODANGER("[source_xeno] slashes its claws through the area in front of it!"), SPAN_XENODANGER("You slash your claws through the area in front of you!"))
source_xeno.animation_attack_on(targetted_atom, 15)

source_xeno.emote("roar")
Expand All @@ -67,6 +67,7 @@

current_mob.flick_attack_overlay(current_mob, "slash")
current_mob.apply_armoured_damage(get_xeno_damage_slash(current_mob, damage), ARMOR_MELEE, BRUTE, null, 20)
playsound(current_mob, 'sound/weapons/alien_tail_attack.ogg', 30, TRUE)

if (target_mobs.len >= shield_regen_threshold)
if (source_xeno.mutation_type == PRAETORIAN_VANGUARD)
Expand Down