From 4db11f899e93823e024d1df3e5549aaf9c25850a Mon Sep 17 00:00:00 2001 From: ghostsheet Date: Mon, 9 Sep 2024 15:07:23 +1000 Subject: [PATCH] Atomised changes --- .../living/carbon/xenomorph/abilities/lurker/lurker_powers.dm | 4 ++-- .../carbon/xenomorph/abilities/ravager/ravager_powers.dm | 3 +-- code/modules/mob/living/carbon/xenomorph/life.dm | 2 +- 3 files changed, 4 insertions(+), 5 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 121110c8fafc..31a05daf62d4 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 @@ -199,7 +199,7 @@ target_turfs += current_turfs telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/red(current_turfs, 2) - var/can_heal = !(SEND_SIGNAL(xeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL) + var/can_heal = SEND_SIGNAL(xeno, COMSIG_XENO_PRE_HEAL) != COMPONENT_CANCEL_XENO_HEAL for (var/turf/current_turfs in target_turfs) for (var/mob/living/carbon/target in current_turfs) @@ -216,10 +216,10 @@ log_attack("[key_name(xeno)] attacked [key_name(target)] with Flurry") target.apply_armoured_damage(get_xeno_damage_slash(target, xeno.caste.melee_damage_upper), ARMOR_MELEE, BRUTE, rand_zone()) playsound(get_turf(target), 'sound/weapons/alien_claw_flesh4.ogg', 30, TRUE) + xeno.animation_attack_on(target) if(can_heal) xeno.flick_heal_overlay(1 SECONDS, "#00B800") xeno.gain_health(30) - xeno.animation_attack_on(target) if(can_heal)//No heals = No Roar xeno.emote("roar") diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm index 1d4febf141e5..eb3e074594f6 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm @@ -311,8 +311,7 @@ else carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, damage), ARMOR_MELEE, BRUTE) // just for consistency - if(!xeno.on_fire) - xeno.gain_health(heal_amount) + xeno.gain_health(heal_amount) // Fling var/facing = get_dir(xeno, carbon) diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index 51ad0937a5d0..d35779598a6a 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -338,7 +338,7 @@ Make sure their actual health updates immediately.*/ if(caste) if(caste.innate_healing || check_weeds_for_healing()) - if(!hive || on_fire) return // can't heal if you have no hive or on fire, sorry bud + if(!hive) return // can't heal if you have no hive or on fire, sorry bud plasma_stored += plasma_gain * plasma_max / 100 if(recovery_aura) plasma_stored += floor(plasma_gain * plasma_max / 100 * recovery_aura/4) //Divided by four because it gets massive fast. 1 is equivalent to weed regen! Only the strongest pheromones should bypass weeds