Merge pull request cmss13-devs#23 from Noname995/BANZAI

БАНЗААААЙ
Noname995 · Aug 13, 2024 · b3cc0ff · b3cc0ff
2 parents 7180066 + 1668a79
commit b3cc0ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/code/game/sound.dm b/code/game/sound.dm
@@ -527,6 +527,9 @@
 				S = pick('sound/voice/pred_pain1.ogg','sound/voice/pred_pain2.ogg','sound/voice/pred_pain3.ogg','sound/voice/pred_pain4.ogg','sound/voice/pred_pain5.ogg',5;'sound/voice/pred_pain_rare1.ogg')
 			if("clownstep")
 				S = pick('sound/effects/clownstep1.ogg', 'sound/effects/clownstep2.ogg')
+//RUCM START
+			if("male_clf_warcry")
+				S = pick('sound/voice/clf_warcry/warcry_male_1.ogg')
 	return S
 
 /client/proc/generate_sound_queues()

diff --git a/sound/voice/clf_warcry/warcry_male_1.ogg b/sound/voice/clf_warcry/warcry_male_1.ogg
diff --git a/void-marines/code/modules/mob/living/carbon/human/emote.dm b/void-marines/code/modules/mob/living/carbon/human/emote.dm
@@ -243,11 +243,15 @@
 		if(user.gender == MALE)
 			if(default_lang == GLOB.all_languages[LANGUAGE_RUSSIAN])
 				return get_sfx("male_upp_warcry")
+			else if(default_lang == GLOB.all_languages[LANGUAGE_JAPANESE])
+				return get_sfx("male_clf_warcry")
 			else
 				return get_sfx("male_warcry")
 		if(user.gender == FEMALE)
 			if(default_lang == GLOB.all_languages[LANGUAGE_RUSSIAN])
 				return get_sfx("female_upp_warcry")
+			else if(default_lang == GLOB.all_languages[LANGUAGE_JAPANESE])
+				return get_sfx("male_clf_warcry") // ( ͡° ͜ʖ ͡°)
 			else
 				return get_sfx("female_warcry")