From 5891e7afe58e59645a4eceaea4b77efee048f0a4 Mon Sep 17 00:00:00 2001 From: Morrow Date: Mon, 13 Nov 2023 21:53:13 -0500 Subject: [PATCH] spawn sound and partial firaview --- .../living/carbon/xenomorph/castes/Crusher.dm | 15 +++------------ sound/voice/alien_crusher_spawn.ogg | Bin 0 -> 61818 bytes 2 files changed, 3 insertions(+), 12 deletions(-) create mode 100644 sound/voice/alien_crusher_spawn.ogg diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm index ae7243af9f..4ae1916521 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm @@ -14,7 +14,7 @@ speed = XENO_SPEED_TIER_4 heal_standing = 0.66 - behavior_delegate_type = /datum/behavior_delegate/crusher_base + behavior_delegate_type = /datum/behavior_delegate/crusher_charger minimum_evolve_time = 15 MINUTES @@ -78,19 +78,10 @@ /mob/living/carbon/xenomorph/crusher/init_movement_handler() return new /datum/xeno_ai_movement/crusher(src) -/mob/living/carbon/xenomorph/crusher/New(loc, ...) +/mob/living/carbon/xenomorph/crusher/Initialize(mapload, mob/living/carbon/xenomorph/oldXeno, h_number, ai_hard_off = FALSE) . = ..() - qdel(behavior_delegate) - behavior_delegate = new /datum/behavior_delegate/crusher_charger() - behavior_delegate.bound_xeno = src - behavior_delegate.add_to_xeno() - RegisterSignal(src, COMSIG_MOB_PRE_CLICK, PROC_REF(on_click)) - -/mob/living/carbon/xenomorph/crusher/proc/on_click(mob/living/carbon/xenomorph/X, atom/target, list/mods) - SIGNAL_HANDLER - if(HAS_TRAIT(src, TRAIT_CHARGING) && !istype(target, /atom/movable/screen)) - return COMPONENT_INTERRUPT_CLICK + playsound(src, 'sound/voice/alien_crusher_spawn.ogg', 100, 1, 30) // Refactored to handle all of crusher's interactions with object during charge. /mob/living/carbon/xenomorph/proc/handle_collision(atom/target) diff --git a/sound/voice/alien_crusher_spawn.ogg b/sound/voice/alien_crusher_spawn.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b93030e3edd58093395331ca1432ce8c880a762f GIT binary patch literal 61818 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