From db6e165da05cb405b2bda797d2ac41b3fb05ac1f Mon Sep 17 00:00:00 2001 From: private-tristan Date: Thu, 21 Dec 2023 18:38:08 -0500 Subject: [PATCH] Can only acid --- code/__DEFINES/xeno.dm | 2 +- code/game/objects/structures/window_frame.dm | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 2e9e5da9664b..630c9740dc80 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -27,7 +27,7 @@ /// Usually half a second's delay. #define xeno_miss_delay(X) (X.next_move = world.time + ((10 + X.caste.attack_delay + X.attack_speed_modifier) * 0.5)) -// Determines how xenos interact with walls. normal nothing, sharp can destroy normal walls, very sharp reinforced ones. +// Determines how xenos interact with walls, normal nothing, sharp can destroy normal walls and window frame, very sharp reinforced ones. #define CLAW_TYPE_NORMAL 1 #define CLAW_TYPE_SHARP 2 #define CLAW_TYPE_VERY_SHARP 3 diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm index fd0a30b157c0..2c165b424dad 100644 --- a/code/game/objects/structures/window_frame.dm +++ b/code/game/objects/structures/window_frame.dm @@ -135,10 +135,18 @@ . = ..() /obj/structure/window_frame/attack_alien(mob/living/carbon/xenomorph/user) + if(!reinforced && user.claw_type >= CLAW_TYPE_SHARP) user.animation_attack_on(src) playsound(src, 'sound/effects/metalhit.ogg', 25, 1) take_damage((max_health / XENO_HITS_TO_DESTROY_WINDOW_FRAME) + 1) return XENO_ATTACK_ACTION + else if (reinforced && user.claw_type >= CLAW_TYPE_SHARP) + user.animation_attack_on(src) + playsound(src, 'sound/effects/metalhit.ogg', 25, 1) + take_damage((max_health / XENO_HITS_TO_DESTROY_R_WINDOW_FRAME) + 1) + return XENO_ATTACK_ACTION + + . = ..() /obj/structure/window_frame/bullet_act(obj/projectile/P) bullet_ping(P)