From e4b5e2291798f503a6710c78515abc2cfa922513 Mon Sep 17 00:00:00 2001 From: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Sun, 28 Sep 2025 12:29:35 -0400 Subject: [PATCH] Fixes some basic mob zaps (#30569) --- .../ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm | 2 +- code/game/machinery/doors/airlock.dm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm b/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm index 09fc8ab4105..4c05ef3399f 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm @@ -66,7 +66,7 @@ return FALSE /datum/ai_behavior/attack_obstructions/proc/can_smash_object(mob/living/basic/basic_mob, obj/object) - if(!object.density && !can_attack_dense_objects) + if(!object.density || !can_attack_dense_objects) return FALSE if(object.IsObscured()) return FALSE diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index aa3cd014c22..87fda0e43e2 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -810,6 +810,11 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) if(isElectrified()) shock(user, 100) +/obj/machinery/door/airlock/attack_basic_mob(mob/user, list/modifiers) + . = ..() + if(isElectrified()) + shock(user, 100) + /obj/machinery/door/airlock/attack_hand(mob/user) if(shock_user(user, 100)) return