mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
fixes neurotoxin newtonian movement and alien hud hand icons (#72269)
neurotoxin now properly moves u also the alien spit shot by simplemob xenos is now a subtype of normal because it was fucking stupid also the nt hud pr broke the hud hand icons so fixes that
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Reference in New Issue
Block a user