nerfs window frames

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

Hide file tree

Showing 4 changed files with 1 addition and 20 deletions.
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 and window frame, very sharp reinforced ones.
+// Determines how xenos interact with walls. normal nothing, sharp can destroy normal walls, 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,18 +135,10 @@
 		. = ..()
 
 /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)

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
@@ -31,11 +31,6 @@
 	if(isobj(O))
 		I = O
 
-		if(istype(I, /obj/structure/window_frame))
-			var/obj/structure/window_frame/WF = I
-			if(WF.reinforced && acid_type != /obj/effect/xenomorph/acid/strong)
-				to_chat(src, SPAN_WARNING("This [O.name] is too tough to be melted by our weak acid."))
-				return
 
 		wait_time = I.get_applying_acid_time()
 		if(wait_time == -1)

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm
@@ -77,12 +77,6 @@
 	if(isobj(affected_atom))
 		object = affected_atom
 
-		if(istype(object, /obj/structure/window_frame))
-			var/obj/structure/window_frame/window_frame = object
-			if(window_frame.reinforced && acid_type != /obj/effect/xenomorph/acid/strong)
-				to_chat(src, SPAN_WARNING("This [object.name] is too tough to be melted by our weak acid."))
-				return
-
 		wait_time = object.get_applying_acid_time()
 		if(wait_time == -1)
 			to_chat(src, SPAN_WARNING("We cannot dissolve [object]."))