diff --git a/code/game/mob/living/carbon/human/emotes/emote.dm b/code/game/mob/living/carbon/human/emotes/emote.dm index e63b2cfed2..429714b45b 100644 --- a/code/game/mob/living/carbon/human/emotes/emote.dm +++ b/code/game/mob/living/carbon/human/emotes/emote.dm @@ -174,6 +174,7 @@ var/list/vocal_emotes = list( if (!restrained()) message = "claps." m_type = 2 + playsound(get_turf(src), "sound/effects/emotes/clap.ogg", 100) if (miming) m_type = 1 if ("flap") @@ -391,6 +392,8 @@ var/list/vocal_emotes = list( playsound(get_turf(src), "charge_IRANIAN", 100) else if (original_job.is_heist && original_job.is_law) playsound(get_turf(src), "charge_POLICE", 100) + else // we default to generic charges if there's no appropriate civilian charge + playsound(get_turf(src), "charge_GENERIC_[gender]", 100) if (PIRATES) if (original_job.is_event) playsound(get_turf(src), "charge_REDMENIA", 100) @@ -461,6 +464,8 @@ var/list/vocal_emotes = list( playsound(get_turf(src), "charge_VIETNAMESE", 100) if (FILIPINO) playsound(get_turf(src), "charge_FILIPINO", 100) + else // if no corresponding faction is found we'll default to generic charges + playsound(get_turf(src), "charge_GENERIC_[gender]", 100) else message = "makes a weak noise." m_type = 2 diff --git a/code/game/sound.dm b/code/game/sound.dm index bb8503fb76..abc294b84d 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -338,6 +338,30 @@ var/list/charge_sounds_ballas = list( 'sound/effects/emotes/ballas_vsgrov2.ogg', 'sound/effects/emotes/ballas_vsgrov3.ogg', 'sound/effects/emotes/ballas_vsgrov4.ogg',) +// generic charge sounds from cm +var/list/charge_sounds_generic_male = list( + 'sound/effects/emotes/male_generic_warcry1.ogg', + 'sound/effects/emotes/male_generic_warcry2.ogg', + 'sound/effects/emotes/male_generic_warcry3.ogg', + 'sound/effects/emotes/male_generic_warcry4.ogg', + 'sound/effects/emotes/male_generic_warcry5.ogg', + 'sound/effects/emotes/male_generic_warcry6.ogg', + 'sound/effects/emotes/male_generic_warcry7.ogg', + 'sound/effects/emotes/male_generic_warcry8.ogg', + 'sound/effects/emotes/male_generic_warcry9.ogg', + 'sound/effects/emotes/male_generic_warcry10.ogg', + 'sound/effects/emotes/male_generic_warcry11.ogg', + 'sound/effects/emotes/male_generic_warcry12.ogg', + 'sound/effects/emotes/male_generic_warcry13.ogg', +) +var/list/charge_sounds_generic_female = list( + 'sound/effects/emotes/female_generic_warcry1.ogg', + 'sound/effects/emotes/female_generic_warcry2.ogg', + 'sound/effects/emotes/female_generic_warcry3.ogg', + 'sound/effects/emotes/female_generic_warcry4.ogg', + 'sound/effects/emotes/female_generic_warcry5.ogg', + 'sound/effects/emotes/female_generic_warcry6.ogg', +) // pain, etc sounds from Interbay /proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/list/excluded = list()) @@ -604,4 +628,9 @@ var/const/FALLOFF_SOUNDS = 0.5 soundin = pick(charge_sounds_grove) if ("charge_BALLAS") soundin = pick(charge_sounds_ballas) + // generic charges from cm + if ("charge_GENERIC_male") + soundin = pick(charge_sounds_generic_male) + if ("charge_GENERIC_female") + soundin = pick(charge_sounds_generic_female) return soundin diff --git a/sound/effects/emotes/clap.ogg b/sound/effects/emotes/clap.ogg new file mode 100644 index 0000000000..c67c353c07 Binary files /dev/null and b/sound/effects/emotes/clap.ogg differ diff --git a/sound/effects/emotes/female_generic_warcry1.ogg b/sound/effects/emotes/female_generic_warcry1.ogg new file mode 100644 index 0000000000..ba4ce0762f Binary files /dev/null and b/sound/effects/emotes/female_generic_warcry1.ogg differ diff --git a/sound/effects/emotes/female_generic_warcry2.ogg b/sound/effects/emotes/female_generic_warcry2.ogg new file mode 100644 index 0000000000..7bb2542e53 Binary files /dev/null and b/sound/effects/emotes/female_generic_warcry2.ogg differ diff --git a/sound/effects/emotes/female_generic_warcry3.ogg b/sound/effects/emotes/female_generic_warcry3.ogg new file mode 100644 index 0000000000..f4e660852f Binary files /dev/null and b/sound/effects/emotes/female_generic_warcry3.ogg differ diff --git a/sound/effects/emotes/female_generic_warcry4.ogg b/sound/effects/emotes/female_generic_warcry4.ogg new file mode 100644 index 0000000000..683d0fa1b3 Binary files /dev/null and b/sound/effects/emotes/female_generic_warcry4.ogg differ diff --git a/sound/effects/emotes/female_generic_warcry5.ogg b/sound/effects/emotes/female_generic_warcry5.ogg new file mode 100644 index 0000000000..b8f1c3ccdf Binary files /dev/null and b/sound/effects/emotes/female_generic_warcry5.ogg differ diff --git a/sound/effects/emotes/female_generic_warcry6.ogg b/sound/effects/emotes/female_generic_warcry6.ogg new file mode 100644 index 0000000000..1e36327cf6 Binary files /dev/null and b/sound/effects/emotes/female_generic_warcry6.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry1.ogg b/sound/effects/emotes/male_generic_warcry1.ogg new file mode 100644 index 0000000000..580b079336 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry1.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry10.ogg b/sound/effects/emotes/male_generic_warcry10.ogg new file mode 100644 index 0000000000..786a90ebe0 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry10.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry11.ogg b/sound/effects/emotes/male_generic_warcry11.ogg new file mode 100644 index 0000000000..e7be045b6e Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry11.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry12.ogg b/sound/effects/emotes/male_generic_warcry12.ogg new file mode 100644 index 0000000000..98e2e38e0d Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry12.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry13.ogg b/sound/effects/emotes/male_generic_warcry13.ogg new file mode 100644 index 0000000000..740ab0d42f Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry13.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry2.ogg b/sound/effects/emotes/male_generic_warcry2.ogg new file mode 100644 index 0000000000..1f378d32b9 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry2.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry3.ogg b/sound/effects/emotes/male_generic_warcry3.ogg new file mode 100644 index 0000000000..9227a73ca3 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry3.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry4.ogg b/sound/effects/emotes/male_generic_warcry4.ogg new file mode 100644 index 0000000000..d37dff440f Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry4.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry5.ogg b/sound/effects/emotes/male_generic_warcry5.ogg new file mode 100644 index 0000000000..399b181e11 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry5.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry6.ogg b/sound/effects/emotes/male_generic_warcry6.ogg new file mode 100644 index 0000000000..bcdc2615ec Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry6.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry7.ogg b/sound/effects/emotes/male_generic_warcry7.ogg new file mode 100644 index 0000000000..b67d345ca7 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry7.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry8.ogg b/sound/effects/emotes/male_generic_warcry8.ogg new file mode 100644 index 0000000000..1ddfb770b1 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry8.ogg differ diff --git a/sound/effects/emotes/male_generic_warcry9.ogg b/sound/effects/emotes/male_generic_warcry9.ogg new file mode 100644 index 0000000000..af36c45161 Binary files /dev/null and b/sound/effects/emotes/male_generic_warcry9.ogg differ