From a86a0c5d0f409cf8e8c2678eb44a7eebbf53d078 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 30 Jun 2024 16:15:30 +0800 Subject: [PATCH 1/2] ChangeGalore --- .../abilities/lurker/lurker_powers.dm | 23 ++++++++----------- .../strains/castes/lurker/vampire.dm | 3 +-- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm index 094732300a1f..578cede8e979 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm @@ -267,10 +267,10 @@ 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 attack [hit_target], with our tail, piercing their body!")) + 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], slashing them with our tail!")) + 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) @@ -282,18 +282,9 @@ stab_direction = turn(get_dir(xeno, targeted_atom), 180) playsound(hit_target,'sound/weapons/alien_tail_attack.ogg', 50, TRUE) + if(hit_target.mob_size < MOB_SIZE_BIG) + step_away(hit_target, xeno) - var/direction = Get_Compass_Dir(xeno, targeted_atom) //More precise than get_dir. - - if(!step(hit_target, direction)) - playsound(hit_target.loc, "punch", 25, 1) - hit_target.visible_message(SPAN_DANGER("[hit_target] slams into an obstacle!"), - isxeno(hit_target) ? SPAN_XENODANGER("We slam into an obstacle!") : SPAN_HIGHDANGER("You slam into an obstacle!"), null, 4, CHAT_TYPE_TAKING_HIT) - hit_target.apply_damage(MELEE_FORCE_TIER_2) - if (hit_target.mob_size < MOB_SIZE_BIG) - hit_target.KnockDown(0.5) - else - hit_target.Slow(0.5) /// To reset the direction if they haven't moved since then in below callback. var/last_dir = xeno.dir @@ -305,7 +296,11 @@ addtimer(CALLBACK(src, PROC_REF(reset_direction), xeno, last_dir, new_dir), 0.5 SECONDS) hit_target.apply_armoured_damage(get_xeno_damage_slash(hit_target, xeno.caste.melee_damage_upper), ARMOR_MELEE, BRUTE, "chest") - hit_target.Slow(0.5) + + if(hit_target.mob_size < MOB_SIZE_BIG) + hit_target.apply_effect(0.5, WEAKEN) + else + hit_target.apply_effect(0.5, SLOW) hit_target.last_damage_data = create_cause_data(xeno.caste_type, xeno) log_attack("[key_name(xeno)] attacked [key_name(hit_target)] with Tail Jab") diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm index 820aa662c919..3b2a0ae9151e 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm @@ -20,8 +20,7 @@ /datum/xeno_strain/vampire/apply_strain(mob/living/carbon/xenomorph/lurker/lurker) lurker.plasmapool_modifier = 0 lurker.health_modifier -= XENO_HEALTH_MOD_MED - lurker.speed_modifier += XENO_SPEED_FASTMOD_TIER_1 - lurker.armor_modifier += XENO_ARMOR_MOD_LARGE + lurker.armor_modifier += XENO_ARMOR_MOD_SMALL lurker.damage_modifier -= XENO_DAMAGE_MOD_VERY_SMALL lurker.attack_speed_modifier -= 2 From a135f2936449908a8980f8fdf4b1f1085aae3786 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 30 Jun 2024 17:10:19 +0800 Subject: [PATCH 2/2] DescUpdate --- .../living/carbon/xenomorph/strains/castes/lurker/vampire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm index 3b2a0ae9151e..11e2d4e2f749 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm @@ -1,6 +1,6 @@ /datum/xeno_strain/vampire name = LURKER_VAMPIRE - description = "You lose all of your abilities and you forefeit a chunk of your health and damage in exchange for a large amount of armor, a little bit of movement speed, increased attack speed, and brand new abilities that make you an assassin. Rush on your opponent to disorient them and Flurry to unleash a forward cleave that can hit and slow three talls and heal you for every tall you hit. Use your special AoE Tail Jab to knock talls away, doing more damage with direct hits and even more damage and a stun if they smack into walls. Finally, execute unconscious talls with a headbite to heal your wounds." + description = "You lose all of your abilities and you forefeit a chunk of your health and damage in exchange for a small amount of armor, increased attack speed, and brand new abilities that make you an assassin. Rush on your opponent to disorient them and Flurry to unleash a forward cleave that can hit and slow three talls and heal you for every tall you hit. Use your special AoE Tail Jab to knock away talls and stun them, doing more damage with direct hits. Finally, execute unconscious talls with a headbite to heal your wounds." flavor_description = "Show no mercy! Slaughter them all!" icon_state_prefix = "Vampire"