shiz (#104)

PMC-Unga-Marines · Aug 22, 2024 · a4d4fb9 · a4d4fb9
1 parent 65cc135
commit a4d4fb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/code/game/objects/structures/xeno.dm b/code/game/objects/structures/xeno.dm
@@ -106,10 +106,7 @@
 	if(xeno_attacker.status_flags & INCORPOREAL)
 		return FALSE
 
-	if(xeno_attacker.a_intent != INTENT_DISARM)
-		return FALSE
-
-	if(xeno_attacker.a_intent == INTENT_DISARM)
+	if(xeno_attacker.a_intent == INTENT_HARM)
 		if(CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.should_refund(src, xeno_attacker) && refundable)
 			SSresinshaping.decrement_build_counter(xeno_attacker)
 		xeno_attacker.do_attack_animation(src, ATTACK_EFFECT_CLAW)
@@ -184,7 +181,7 @@
 	var/turf/cur_loc = xeno_attacker.loc
 	if(!istype(cur_loc))
 		return FALSE
-	if(xeno_attacker.a_intent != INTENT_DISARM)
+	if(xeno_attacker.a_intent != INTENT_HARM)
 		try_toggle_state(xeno_attacker)
 		return TRUE
 	if(CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.should_refund(src, xeno_attacker))

diff --git a/code/game/turfs/walls/resin.dm b/code/game/turfs/walls/resin.dm
@@ -67,7 +67,7 @@
 /turf/closed/wall/resin/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = MELEE, effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
 	if(xeno_attacker.status_flags & INCORPOREAL)
 		return
-	if(xeno_attacker.a_intent != INTENT_DISARM)
+	if(xeno_attacker.a_intent != INTENT_HARM)
 		return
 	if(CHECK_BITFIELD(SSticker.mode?.flags_round_type, MODE_ALLOW_XENO_QUICKBUILD) && SSresinshaping.should_refund(src, xeno_attacker))
 		SSresinshaping.decrement_build_counter(xeno_attacker)