cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13002 from Fox-McCloud/death-and-gasping-sounds

Browse Source 
Deathgasp and Gasping Sounds
This commit is contained in:
variableundefined
2020-02-21 22:11:08 -05:00
committed by GitHub
parent 691fc34941 6a93089e9d
commit 46ccd11302
15 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+15 -2
View File
@@ -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 = "<B>[src]</B> 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 = "<B>[src]</B> makes a weak noise."
@@ -509,6 +521,7 @@
if("deathgasp", "deathgasps")
message = "<B>[src]</B> [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 = "<B>[src]</B> [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 = "<B>[src]</B> makes a very loud noise[M ? " at [M]" : ""]."
code/modules/mob/living/carbon/human/species/_species.dm
+4
View File
@@ -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'