Merge pull request Civ13#2658 from realkhad/new-sounds

add new sound effects for charging & clapping

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

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