chonky tonky

cmss13-devs · Nov 9, 2023 · a1e5364 · a1e5364
1 parent 9fd5f57
commit a1e5364
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -85,6 +85,7 @@
 	melee_damage_lower = 5
 	melee_damage_upper = 10
 	var/melee_vehicle_damage = 10
+	var/melee_sentry_damage_multiplier = 1
 	var/claw_type = CLAW_TYPE_SHARP
 	var/burn_damage_lower = 0
 	var/burn_damage_upper = 0

diff --git a/code/modules/mob/living/carbon/xenomorph/ai/movement/crusher.dm b/code/modules/mob/living/carbon/xenomorph/ai/movement/crusher.dm
@@ -4,7 +4,7 @@
 	var/turf/charge_turf
 
 
-#define AI_NEW_TARGET_COOLDOWN 5 SECONDS
+#define AI_NEW_TARGET_COOLDOWN 2 SECONDS
 
 /datum/xeno_ai_movement/crusher/New(mob/living/carbon/xenomorph/parent)
 	. = ..()

diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -659,7 +659,7 @@
 
 	M.animation_attack_on(src)
 	playsound(src, 'sound/effects/metalhit.ogg', 25, 1)
-	update_health(rand(M.melee_damage_lower, M.melee_damage_upper))
+	update_health(rand(M.melee_damage_lower, M.melee_damage_upper) * M.melee_sentry_damage_multiplier)
 	if(health <= 0)
 		M.visible_message(SPAN_DANGER("[M] slices \the [src] apart!"), \
 		SPAN_DANGER("You slice \the [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT)

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm
@@ -4,8 +4,8 @@
 
 	melee_damage_lower = XENO_DAMAGE_TIER_5
 	melee_damage_upper = XENO_DAMAGE_TIER_5
-	melee_vehicle_damage = XENO_DAMAGE_TIER_5
-	max_health = XENO_HEALTH_QUEEN
+	melee_vehicle_damage = XENO_DAMAGE_TIER_5 * 8
+	max_health = XENO_HEALTH_IMMORTAL
 	plasma_gain = XENO_PLASMA_GAIN_TIER_7
 	plasma_max = XENO_PLASMA_TIER_8
 	xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_10
@@ -25,6 +25,8 @@
 	evolution_allowed = FALSE
 	deevolves_to = list(XENO_CASTE_WARRIOR)
 	caste_desc = "A huge tanky xenomorph."
+	fire_intensity_resistance = 40
+	fire_vulnerability_mult = 0.25
 
 	minimap_icon = "crusher"
 
@@ -37,6 +39,7 @@
 	plasma_types = list(PLASMA_CHITIN)
 	tier = 3
 	drag_delay = 6 //pulling a big dead xeno is hard
+	melee_sentry_damage_multiplier = 2
 
 	small_explosives_stun = FALSE
 

diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm
@@ -83,7 +83,7 @@
 		G.die()
 		drop_inv_item_on_ground(G)
 	if(!caste || !(caste.fire_immunity & FIRE_IMMUNITY_NO_DAMAGE) || fire_reagent.fire_penetrating)
-		if(caste.fire_immunity & FIRE_VULNERABILITY && caste.fire_vulnerability_mult >= 1)
+		if(caste.fire_immunity & FIRE_VULNERABILITY && caste.fire_vulnerability_mult != 1)
 			apply_damage(PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks) * caste.fire_vulnerability_mult, BURN)
 		else
 			apply_damage(armor_damage_reduction(GLOB.xeno_fire, PASSIVE_BURN_DAM_CALC(fire_reagent.intensityfire, fire_reagent.durationfire, fire_stacks)), BURN)