diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 9c064b32c31b7..319e49a5b0d4e 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -103,7 +103,6 @@ #define TIMESHIFT_TRAIT "timeshift" #define BRAIN_TRAIT "brain" #define WIDOW_ABILITY_TRAIT "widow_ability_trait" -#define PSYCHIC_BLAST_ABILITY_TRAIT "psychic_blast_ability_trait" #define PSYCHIC_CRUSH_ABILITY_TRAIT "psychic_crush_ability_trait" #define VORTEX_ABILITY_TRAIT "vortex_ability_trait" #define PETRIFY_ABILITY_TRAIT "petrify_ability_trait" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm b/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm index d745ef8fe1cab..162fa1fce188b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm @@ -582,14 +582,12 @@ /datum/action/ability/activable/xeno/psy_blast/use_ability(atom/A) owner.balloon_alert(owner, "We channel our psychic power") generate_particles(A, 7) - ADD_TRAIT(xeno_owner, TRAIT_IMMOBILE, PSYCHIC_BLAST_ABILITY_TRAIT) var/datum/ammo/energy/xeno/ammo_type = xeno_owner.ammo xeno_owner.update_glow(3, 3, ammo_type.glow_color) if(!do_after(xeno_owner, 1 SECONDS, IGNORE_TARGET_LOC_CHANGE, A, BUSY_ICON_DANGER) || !can_use_ability(A, FALSE) || !(A in range(get_screen_size(TRUE), owner))) owner.balloon_alert(owner, "Our focus is disrupted") end_channel() - REMOVE_TRAIT(xeno_owner, TRAIT_IMMOBILE, PSYCHIC_BLAST_ABILITY_TRAIT) return fail_activate() succeed_activate() @@ -609,7 +607,6 @@ add_cooldown() update_button_icon() - REMOVE_TRAIT(xeno_owner, TRAIT_IMMOBILE, PSYCHIC_BLAST_ABILITY_TRAIT) addtimer(CALLBACK(src, PROC_REF(end_channel)), 5) /datum/action/ability/activable/xeno/psy_blast/update_button_icon()