From f7f20fd23e9c203a3f781420e0ffb3f07c7aaaf2 Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:57:39 +0300 Subject: [PATCH] language_fixes_and_tweaks --- code/modules/gear_presets/uscm.dm | 1 + code/modules/mob/living/carbon/human/emote.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 591f48afd2..dbb22df531 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -148,6 +148,7 @@ assignment = JOB_SQUAD_SMARTGUN_UPP paygrade = "UE3" role_comm_title = "MG" + languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE) /datum/equipment_preset/uscm/sg/upp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/lightpack/upp diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index d8954ef74a..06f9891378 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -361,12 +361,12 @@ /datum/emote/living/carbon/human/warcry/get_sound(mob/living/carbon/human/user) if(ishumansynth_strict(user)) if(user.gender == MALE) - if(user.faction == FACTION_UPP || (user.job in ROLES_AI_UPP)) + if(user.get_default_language().name == LANGUAGE_RUSSIAN) return get_sfx("male_upp_warcry") else return get_sfx("male_warcry") else - if(user.faction == FACTION_UPP || (user.job in ROLES_AI_UPP)) + if(user.get_default_language().name == LANGUAGE_RUSSIAN) return get_sfx("female_upp_warcry") else return get_sfx("female_warcry")