removes var/steelcrest

cmss13-devs · Nov 11, 2023 · c5277cb · c5277cb
1 parent 896d51a
commit c5277cb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -280,7 +280,6 @@
 	/// 0/FALSE - upright, 1/TRUE - all fours
 	var/agility = FALSE
 	var/ripping_limb = FALSE
-	var/steelcrest = FALSE
 	/// The world.time at which we will regurgitate our currently-vored victim
 	var/devour_timer = 0
 	/// For drones/hivelords. Extends the maximum build range they have

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm
@@ -51,7 +51,7 @@
 	if(!check_and_use_plasma_owner())
 		return
 
-	if(fendy.fortify && !fendy.steelcrest)
+	if(fendy.fortify && !fendy.mutation_type == DEFENDER_STEELCREST)
 		to_chat(fendy, SPAN_XENOWARNING("You cannot use headbutt while fortified."))
 		return
 
@@ -78,7 +78,9 @@
 	SPAN_XENOWARNING("You ram [carbone] with your armored crest!"))
 
 	if(carbone.stat != DEAD && (!(carbone.status_flags & XENO_HOST) || !HAS_TRAIT(carbone, TRAIT_NESTED)) )
-		var/h_damage = 30 - (fendy.crest_defense * 10) + (fendy.steelcrest * 7.5) //30 if crest up, 20 if down, plus 7.5
+		var/h_damage = 30 - (fendy.crest_defense * 10)
+		if(fendy.mutation_type == DEFENDER_STEELCREST)
+			h_damage += 7.5
 		carbone.apply_armoured_damage(get_xeno_damage_slash(carbone, h_damage), ARMOR_MELEE, BRUTE, "chest", 5)
 
 	var/facing = get_dir(fendy, carbone)
@@ -159,7 +161,7 @@
 	if (!istype(xeno))
 		return
 
-	if(xeno.crest_defense && xeno.steelcrest)
+	if(xeno.crest_defense && xeno.mutation_type == DEFENDER_STEELCREST)
 		to_chat(src, SPAN_XENOWARNING("You cannot fortify while your crest is already down!"))
 		return
 
@@ -207,7 +209,7 @@
 
 	if(fortify_state)
 		to_chat(X, SPAN_XENOWARNING("You tuck yourself into a defensive stance."))
-		if(X.steelcrest)
+		if(X.mutation_type == DEFENDER_STEELCREST)
 			X.armor_deflection_buff += 10
 			X.armor_explosive_buff += 60
 			X.ability_speed_modifier += 3
@@ -228,7 +230,7 @@
 		to_chat(X, SPAN_XENOWARNING("You resume your normal stance."))
 		X.frozen = FALSE
 		X.anchored = FALSE
-		if(X.steelcrest)
+		if(X.mutation_type == DEFENDER_STEELCREST)
 			X.armor_deflection_buff -= 10
 			X.armor_explosive_buff -= 60
 			X.ability_speed_modifier -= 3

diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/defender/steel_crest.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/defender/steel_crest.dm
@@ -23,7 +23,6 @@
 	defender.mutation_type = DEFENDER_STEELCREST
 	defender.mutation_icon_state = DEFENDER_STEELCREST
 	defender.damage_modifier -= XENO_DAMAGE_MOD_VERY_SMALL
-	defender.steelcrest = TRUE
 	if(defender.fortify)
 		defender.ability_speed_modifier += 2.5
 	mutator_update_actions(defender)