diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index b085b222fb9..d0b4fb7be1e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -74,8 +74,10 @@ log_emote("[name]/[key] : [message]") if (act == "roar") playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1) + if (act == "deathgasp") playsound(src.loc, 'sound/voice/hiss6.ogg', 80, 1, 1) + if (m_type & 1) for(var/mob/O in viewers(src, null)) O.show_message(message, m_type) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 77a2d2eb766..8c139777168 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -4,7 +4,7 @@ icon = 'icons/mob/alien.dmi' icon_state = "alienh_running" icon_living = "alienh_running" - icon_dead = "alien_l" + icon_dead = "alienh_dead" icon_gib = "syndicate_gib" response_help = "pokes" response_disarm = "shoves" @@ -38,7 +38,7 @@ name = "alien drone" icon_state = "aliend_running" icon_living = "aliend_running" - icon_dead = "aliend_l" + icon_dead = "aliend_dead" health = 60 melee_damage_lower = 15 melee_damage_upper = 15 @@ -47,7 +47,7 @@ name = "alien sentinel" icon_state = "aliens_running" icon_living = "aliens_running" - icon_dead = "aliens_l" + icon_dead = "aliens_dead" health = 120 melee_damage_lower = 15 melee_damage_upper = 15 @@ -60,7 +60,7 @@ name = "alien queen" icon_state = "alienq_running" icon_living = "alienq_running" - icon_dead = "alienq_l" + icon_dead = "alienq_dead" health = 250 maxHealth = 250 melee_damage_lower = 15 @@ -83,6 +83,7 @@ health = 400 /obj/item/projectile/neurotox + name = "neurotoxin" damage = 30 icon_state = "toxin" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f28b503f533..01c37755aa5 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -82,7 +82,7 @@ return 0 - if(health < 1) + if(health < 1 && stat != DEAD) Die() if(health > maxHealth) @@ -457,7 +457,7 @@ /mob/living/simple_animal/adjustBruteLoss(damage) health = Clamp(health - damage, 0, maxHealth) - if(health < 1) + if(health < 1 && stat != DEAD) Die() /mob/living/simple_animal/proc/SA_attackable(target)