diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 32841d3804d..01c2d773d51 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -118,6 +118,10 @@ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm if("cough", "coughs", "slap", "slaps", "highfive") on_CD = handle_emote_CD() + if("gasp", "gasps") + on_CD = handle_emote_CD() + if("deathgasp", "deathgasps") + on_CD = handle_emote_CD(50) if("sneeze", "sneezes") on_CD = handle_emote_CD() if("clap", "claps") @@ -502,6 +506,14 @@ else if(!muzzled) message = "[src] gasps!" + if(health <= 0) + if(gender == FEMALE) + playsound(loc, pick(dna.species.female_dying_gasp_sounds), 100, 1, frequency = get_age_pitch()) + else + playsound(loc, pick(dna.species.male_dying_gasp_sounds), 100, 1, frequency = get_age_pitch()) + + else + playsound(loc, dna.species.gasp_sound, 15, 1, frequency = get_age_pitch()) m_type = 2 else message = "[src] makes a weak noise." @@ -509,6 +521,7 @@ if("deathgasp", "deathgasps") message = "[src] [replacetext(dna.species.death_message, "their", p_their())]" + playsound(loc, pick(dna.species.death_sounds), 40, 1, frequency = get_age_pitch()) m_type = 1 if("giggle", "giggles") @@ -824,9 +837,9 @@ message = "[src] [dna.species.scream_verb][M ? " at [M]" : ""]!" m_type = 2 if(gender == FEMALE) - playsound(loc, "[dna.species.female_scream_sound]", 80, 1, frequency = get_age_pitch()) + playsound(loc, dna.species.female_scream_sound, 80, 1, frequency = get_age_pitch()) else - playsound(loc, "[dna.species.male_scream_sound]", 80, 1, frequency = get_age_pitch()) //default to male screams if no gender is present. + playsound(loc, dna.species.male_scream_sound, 80, 1, frequency = get_age_pitch()) //default to male screams if no gender is present. else message = "[src] makes a very loud noise[M ? " at [M]" : ""]." diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index c56f0140ee2..77de1175178 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -115,6 +115,10 @@ var/scream_verb = "screams" var/male_scream_sound = 'sound/goonstation/voice/male_scream.ogg' var/female_scream_sound = 'sound/goonstation/voice/female_scream.ogg' + var/list/death_sounds = list('sound/goonstation/voice/deathgasp_1.ogg', 'sound/goonstation/voice/deathgasp_2.ogg') + var/list/male_dying_gasp_sounds = list('sound/goonstation/voice/male_dying_gasp_1.ogg', 'sound/goonstation/voice/male_dying_gasp_2.ogg', 'sound/goonstation/voice/male_dying_gasp_3.ogg', 'sound/goonstation/voice/male_dying_gasp_4.ogg', 'sound/goonstation/voice/male_dying_gasp_5.ogg') + var/list/female_dying_gasp_sounds = list('sound/goonstation/voice/female_dying_gasp_1.ogg', 'sound/goonstation/voice/female_dying_gasp_2.ogg', 'sound/goonstation/voice/female_dying_gasp_3.ogg', 'sound/goonstation/voice/female_dying_gasp_4.ogg', 'sound/goonstation/voice/female_dying_gasp_5.ogg') + var/gasp_sound = 'sound/goonstation/voice/gasp.ogg' var/male_cough_sounds = list('sound/effects/mob_effects/m_cougha.ogg','sound/effects/mob_effects/m_coughb.ogg', 'sound/effects/mob_effects/m_coughc.ogg') var/female_cough_sounds = list('sound/effects/mob_effects/f_cougha.ogg','sound/effects/mob_effects/f_coughb.ogg') var/male_sneeze_sound = 'sound/effects/mob_effects/sneeze.ogg' diff --git a/sound/goonstation/voice/deathgasp_1.ogg b/sound/goonstation/voice/deathgasp_1.ogg new file mode 100644 index 00000000000..71788a14f45 Binary files /dev/null and b/sound/goonstation/voice/deathgasp_1.ogg differ diff --git a/sound/goonstation/voice/deathgasp_2.ogg b/sound/goonstation/voice/deathgasp_2.ogg new file mode 100644 index 00000000000..38daa763fc4 Binary files /dev/null and b/sound/goonstation/voice/deathgasp_2.ogg differ diff --git a/sound/goonstation/voice/female_dying_gasp_1.ogg b/sound/goonstation/voice/female_dying_gasp_1.ogg new file mode 100644 index 00000000000..0e329374617 Binary files /dev/null and b/sound/goonstation/voice/female_dying_gasp_1.ogg differ diff --git a/sound/goonstation/voice/female_dying_gasp_2.ogg b/sound/goonstation/voice/female_dying_gasp_2.ogg new file mode 100644 index 00000000000..76857f4ee92 Binary files /dev/null and b/sound/goonstation/voice/female_dying_gasp_2.ogg differ diff --git a/sound/goonstation/voice/female_dying_gasp_3.ogg b/sound/goonstation/voice/female_dying_gasp_3.ogg new file mode 100644 index 00000000000..e6e0898062c Binary files /dev/null and b/sound/goonstation/voice/female_dying_gasp_3.ogg differ diff --git a/sound/goonstation/voice/female_dying_gasp_4.ogg b/sound/goonstation/voice/female_dying_gasp_4.ogg new file mode 100644 index 00000000000..516f763f864 Binary files /dev/null and b/sound/goonstation/voice/female_dying_gasp_4.ogg differ diff --git a/sound/goonstation/voice/female_dying_gasp_5.ogg b/sound/goonstation/voice/female_dying_gasp_5.ogg new file mode 100644 index 00000000000..cb076af860a Binary files /dev/null and b/sound/goonstation/voice/female_dying_gasp_5.ogg differ diff --git a/sound/goonstation/voice/gasp.ogg b/sound/goonstation/voice/gasp.ogg new file mode 100644 index 00000000000..b1fe8bc177f Binary files /dev/null and b/sound/goonstation/voice/gasp.ogg differ diff --git a/sound/goonstation/voice/male_dying_gasp_1.ogg b/sound/goonstation/voice/male_dying_gasp_1.ogg new file mode 100644 index 00000000000..767d6ecb995 Binary files /dev/null and b/sound/goonstation/voice/male_dying_gasp_1.ogg differ diff --git a/sound/goonstation/voice/male_dying_gasp_2.ogg b/sound/goonstation/voice/male_dying_gasp_2.ogg new file mode 100644 index 00000000000..8a545f53265 Binary files /dev/null and b/sound/goonstation/voice/male_dying_gasp_2.ogg differ diff --git a/sound/goonstation/voice/male_dying_gasp_3.ogg b/sound/goonstation/voice/male_dying_gasp_3.ogg new file mode 100644 index 00000000000..acfbfe913ec Binary files /dev/null and b/sound/goonstation/voice/male_dying_gasp_3.ogg differ diff --git a/sound/goonstation/voice/male_dying_gasp_4.ogg b/sound/goonstation/voice/male_dying_gasp_4.ogg new file mode 100644 index 00000000000..516f763f864 Binary files /dev/null and b/sound/goonstation/voice/male_dying_gasp_4.ogg differ diff --git a/sound/goonstation/voice/male_dying_gasp_5.ogg b/sound/goonstation/voice/male_dying_gasp_5.ogg new file mode 100644 index 00000000000..cb076af860a Binary files /dev/null and b/sound/goonstation/voice/male_dying_gasp_5.ogg differ