From b5211aa6a630ba076f61e7b5fbeec4c3840a8472 Mon Sep 17 00:00:00 2001 From: xDanilcusx Date: Mon, 30 Oct 2023 20:34:35 +0300 Subject: [PATCH] clicking holes, aren't ya? --- code/game/objects/effects/acid_hole.dm | 8 ++++---- code/game/turfs/walls/walls.dm | 5 ++++- .../mob/living/carbon/xenomorph/xeno_ai_interaction.dm | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/acid_hole.dm b/code/game/objects/effects/acid_hole.dm index 415df0e7e5..1b320a9d26 100644 --- a/code/game/objects/effects/acid_hole.dm +++ b/code/game/objects/effects/acid_hole.dm @@ -44,10 +44,8 @@ qdel(src) //no wall?! then cease existence... return - if(!use_wall_hole(user)) - if(user.mob_size >= MOB_SIZE_BIG) - expand_hole(user) - return XENO_NO_DELAY_ACTION + expand_hole(user) + return XENO_NO_DELAY_ACTION /obj/effect/acid_hole/proc/expand_hole(mob/living/carbon/xenomorph/user) if(user.action_busy || user.lying) @@ -55,9 +53,11 @@ playsound(src, "pry", 25, 1) xeno_attack_delay(user) + user.freeze() if(do_after(user, 60, INTERRUPT_ALL, BUSY_ICON_GENERIC) && !QDELETED(src) && holed_wall && !user.lying && istype(holed_wall)) holed_wall.take_damage(rand(2000,3500)) user.emote("roar") + user.unfreeze() /obj/effect/acid_hole/proc/use_wall_hole(mob/user) diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index 2387a20861..229311325b 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -116,7 +116,10 @@ acided_hole.expand_hole(user) //This proc applies the attack delay itself. return XENO_NO_DELAY_ACTION - if(!hull && user.claw_type >= claws_minimum && !acided_hole) + if(!hull && user.claw_type >= claws_minimum) + if(acided_hole) + acided_hole.attack_alien(user) + return XENO_NO_DELAY_ACTION user.animation_attack_on(src) playsound(src, 'sound/effects/metalhit.ogg', 25, 1) if(damage >= (damage_cap - (damage_cap / XENO_HITS_TO_DESTROY_WALL))) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm index 8aa80e9c22..63ee7e07fb 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm @@ -92,3 +92,8 @@ return 0 return FIRE_PENALTY + +// HOLES +/obj/effect/acid_hole/xeno_ai_act(mob/living/carbon/xenomorph/X) + X.do_click(src, "", list()) + return TRUE