diff --git a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm index 0e944bc038b..e135154877c 100644 --- a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm @@ -274,20 +274,15 @@ Doesn't work on other aliens/AI.*/ build_all_button_icons() on_who.update_icons() +// We do this in InterceptClickOn() instead of Activate() +// because we use the click parameters for aiming the projectile +// (or something like that) /datum/action/cooldown/alien/acid/neurotoxin/InterceptClickOn(mob/living/caller, params, atom/target) . = ..() if(!.) unset_click_ability(caller, refund_cooldown = FALSE) return FALSE - // We do this in InterceptClickOn() instead of Activate() - // because we use the click parameters for aiming the projectile - // (or something like that) - var/turf/user_turf = caller.loc - var/turf/target_turf = get_step(caller, target.dir) // Get the tile infront of the move, based on their direction - if(!isturf(target_turf)) - return FALSE - var/modifiers = params2list(params) caller.visible_message( span_danger("[caller] spits neurotoxin!"), @@ -297,7 +292,7 @@ Doesn't work on other aliens/AI.*/ neurotoxin.preparePixelProjectile(target, caller, modifiers) neurotoxin.firer = caller neurotoxin.fire() - caller.newtonian_move(get_dir(target_turf, user_turf)) + caller.newtonian_move(get_dir(target, caller)) return TRUE // Has to return TRUE, otherwise is skipped. diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 7c76a6bbcb1..a91f968e2d2 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -67,7 +67,7 @@ ranged = 1 retreat_distance = 5 minimum_distance = 5 - projectiletype = /obj/projectile/neurotox + projectiletype = /obj/projectile/neurotoxin/damaging projectilesound = 'sound/weapons/pierce.ogg' @@ -86,7 +86,7 @@ move_to_delay = 4 butcher_results = list(/obj/item/food/meat/slab/xeno = 4, /obj/item/stack/sheet/animalhide/xeno = 1) - projectiletype = /obj/projectile/neurotox + projectiletype = /obj/projectile/neurotoxin/damaging projectilesound = 'sound/weapons/pierce.ogg' status_flags = 0 unique_name = 0 @@ -140,11 +140,6 @@ mob_size = MOB_SIZE_LARGE gold_core_spawnable = NO_SPAWN -/obj/projectile/neurotox - name = "neurotoxin" - damage = 30 - icon_state = "toxin" - /mob/living/simple_animal/hostile/alien/maid name = "lusty xenomorph maid" melee_damage_lower = 0 diff --git a/code/modules/projectiles/projectile/special/neurotoxin.dm b/code/modules/projectiles/projectile/special/neurotoxin.dm index 7b8693632e0..c65f146c40d 100644 --- a/code/modules/projectiles/projectile/special/neurotoxin.dm +++ b/code/modules/projectiles/projectile/special/neurotoxin.dm @@ -4,7 +4,7 @@ damage = 5 damage_type = TOX nodamage = FALSE - paralyze = 100 + paralyze = 10 SECONDS armor_flag = BIO impact_effect_type = /obj/effect/temp_visual/impact_effect/neurotoxin @@ -13,3 +13,7 @@ paralyze = 0 nodamage = TRUE return ..() + +/obj/projectile/neurotoxin/damaging //for ai controlled aliums + damage = 30 + paralyze = 0 SECONDS diff --git a/icons/hud/screen_alien.dmi b/icons/hud/screen_alien.dmi index 88791da700b..82d0ed2f9f9 100644 Binary files a/icons/hud/screen_alien.dmi and b/icons/hud/screen_alien.dmi differ