Can only acid

cmss13-devs · Dec 21, 2023 · db6e165 · db6e165
1 parent 477c4c0
commit db6e165
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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)