From a7cc370c78467b78b0ce1c524ec23650fe5da7e7 Mon Sep 17 00:00:00 2001 From: Miauw Date: Wed, 25 Sep 2013 17:08:00 +0200 Subject: [PATCH 1/5] Simple_animals won't die every time they're hit after death anymore. Dead simple xenos use correct sprites. --- code/modules/mob/living/simple_animal/hostile/alien.dm | 7 ++++--- code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 77a2d2eb766..644464a0c42 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -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 d943a0e8fef..48c4947b392 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) From 1f50a508eb7bfc2e356b264dcd9cdd98141305c9 Mon Sep 17 00:00:00 2001 From: Miauw Date: Wed, 25 Sep 2013 17:45:51 +0200 Subject: [PATCH 2/5] Alien *roar and *deathgasp sounds are no longer spammable. --- code/modules/mob/living/carbon/alien/humanoid/emote.dm | 6 ++++-- code/modules/mob/living/carbon/alien/humanoid/life.dm | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index b085b222fb9..25402f282fe 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -72,10 +72,12 @@ if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") - if (act == "roar") + if (act == "roar" && xeno_emote_counter <= 0) playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1) - if (act == "deathgasp") + xeno_emote_counter = 4 + if (act == "deathgasp" && xeno_emote_counter <= 0) playsound(src.loc, 'sound/voice/hiss6.ogg', 80, 1, 1) + xeno_emote_counter = 4 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/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 97e09c42c18..e36a5962bed 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -6,12 +6,15 @@ fire_alert = 0 var/temperature_alert = 0 + var/xeno_emote_counter = 0 //See Life() /mob/living/carbon/alien/humanoid/Life() set invisibility = 0 set background = 1 + xeno_emote_counter -= 1 //Hack to stop *deathgasp and *roar spam for xenos. + if (monkeyizing) return From 543126911bc3595a79bfe9559df9c3973bee39e2 Mon Sep 17 00:00:00 2001 From: Miauw Date: Wed, 25 Sep 2013 18:13:20 +0200 Subject: [PATCH 3/5] Fixed simple hunter sprites, too. --- code/modules/mob/living/simple_animal/hostile/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 644464a0c42..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" From 3d0653ac30df2dea534065f4fd7c17c7ed850ea4 Mon Sep 17 00:00:00 2001 From: Miauw Date: Sun, 29 Sep 2013 15:57:30 +0200 Subject: [PATCH 4/5] Removed xeno emote limiter --- code/modules/mob/living/carbon/alien/humanoid/emote.dm | 9 +++++---- code/modules/mob/living/carbon/alien/humanoid/life.dm | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 25402f282fe..55dd20c836d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -1,5 +1,6 @@ /mob/living/carbon/alien/humanoid/emote(var/act) + var/cooldown = 0 //Used to limit *roar and *deathgasp spam. var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) @@ -72,12 +73,12 @@ if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") - if (act == "roar" && xeno_emote_counter <= 0) + if (act == "roar") playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1) - xeno_emote_counter = 4 - if (act == "deathgasp" && xeno_emote_counter <= 0) + + if (act == "deathgasp") playsound(src.loc, 'sound/voice/hiss6.ogg', 80, 1, 1) - xeno_emote_counter = 4 + 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/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index e36a5962bed..993f6d2e65f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -13,8 +13,6 @@ set invisibility = 0 set background = 1 - xeno_emote_counter -= 1 //Hack to stop *deathgasp and *roar spam for xenos. - if (monkeyizing) return From cf081cdef720cca2a7608c99cb91ca32a1f5f19d Mon Sep 17 00:00:00 2001 From: Miauw Date: Sun, 29 Sep 2013 18:16:20 +0200 Subject: [PATCH 5/5] More removing of emote limiter --- code/modules/mob/living/carbon/alien/humanoid/emote.dm | 1 - code/modules/mob/living/carbon/alien/humanoid/life.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 55dd20c836d..d0b4fb7be1e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -1,6 +1,5 @@ /mob/living/carbon/alien/humanoid/emote(var/act) - var/cooldown = 0 //Used to limit *roar and *deathgasp spam. var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 993f6d2e65f..97e09c42c18 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -6,7 +6,6 @@ fire_alert = 0 var/temperature_alert = 0 - var/xeno_emote_counter = 0 //See Life() /mob/living/carbon/alien/humanoid/Life()