Separate Changes

cmss13-devs · Sep 9, 2024 · 4ca4a83 · 4ca4a83
1 parent 0fb32b6
commit 4ca4a83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm
@@ -216,10 +216,10 @@
 			log_attack("[key_name(xeno)] attacked [key_name(target)] with Flurry")
 			target.apply_armoured_damage(get_xeno_damage_slash(target, xeno.caste.melee_damage_upper), ARMOR_MELEE, BRUTE, rand_zone())
 			playsound(get_turf(target), 'sound/weapons/alien_claw_flesh4.ogg', 30, TRUE)
+			xeno.animation_attack_on(target)
 			if(can_heal)
 				xeno.flick_heal_overlay(1 SECONDS, "#00B800")
 				xeno.gain_health(30)
-				xeno.animation_attack_on(target)
 
 	if(can_heal)//No heals = No Roar
 		xeno.emote("roar")
@@ -378,7 +378,7 @@
 	xeno.animation_attack_on(target_carbon, pixel_offset = 16)
 	target_carbon.apply_armoured_damage(60, ARMOR_MELEE, BRUTE, "head", 5) //DIE
 	target_carbon.death(create_cause_data("headbite execution", xeno), FALSE)
-	if(!SEND_SIGNAL(xeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL)
+	if(!(SEND_SIGNAL(xeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL))
 		xeno.gain_health(150)
 		xeno.xeno_jitter(1 SECONDS)
 		xeno.flick_heal_overlay(3 SECONDS, "#00B800")

diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm
@@ -311,8 +311,7 @@
 	else
 		carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, damage), ARMOR_MELEE, BRUTE) // just for consistency
 
-	if(!xeno.on_fire)
-		xeno.gain_health(heal_amount)
+	xeno.gain_health(heal_amount)
 
 	// Fling
 	var/facing = get_dir(xeno, carbon)

diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm
@@ -338,7 +338,7 @@ Make sure their actual health updates immediately.*/
 
 	if(caste)
 		if(caste.innate_healing || check_weeds_for_healing())
-			if(!hive || on_fire) return // can't heal if you have no hive or on fire, sorry bud
+			if(!hive) return // can't heal if you have no hive or on fire, sorry bud
 			plasma_stored += plasma_gain * plasma_max / 100
 			if(recovery_aura)
 				plasma_stored += floor(plasma_gain * plasma_max / 100 * recovery_aura/4) //Divided by four because it gets massive fast. 1 is equivalent to weed regen! Only the strongest pheromones should bypass weeds