From 6a1868a6bc5076e760906ddfeaab6740b60420e8 Mon Sep 17 00:00:00 2001 From: PlayerUnknown14 <139672964+PlayerUnknown14@users.noreply.github.com> Date: Tue, 4 Mar 2025 01:14:42 +0700 Subject: [PATCH] =?UTF-8?q?bugfix:=20=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BF=D0=B8=D1=87=D0=B2=D0=B5=D1=80=D0=B1=D1=8B?= =?UTF-8?q?=20=D1=88=D1=91=D0=BF=D0=BE=D1=82=D0=B0=20(#6624)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * тык * Update living_say.dm --- code/modules/mob/language.dm | 6 +++--- code/modules/mob/living/living_say.dm | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index e4b924b0b21..e1ed6131e53 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -489,10 +489,10 @@ desc = "Универсальный язык, разработанный людьми для упрощения общения с другими гуманоидными расами." speech_verbs = list("говор%(ит,ят)%") exclaim_verbs = list("восклица%(ет,ют)%", "выкрикива%(ет,ют)%") - whisper_verbs = list("шепч%(ет,ут)%", "тихо произнос%(ит,ят)%") + whisper_verbs = list("шепч%(ет,ут)%") key = "9" flags = RESTRICTED - syllables = list("блах","блях","блах","блех","мех","нех","нах","вах") + syllables = list("бла","бле","ме","не","на","ва","блю","вак","ке","бэ","вэ","гэ") english_names = TRUE /datum/language/human @@ -500,7 +500,7 @@ desc = "Искуственный язык, созданный на основе английского, китайского и эсперанто. Является основным для Людей." speech_verbs = list("говор%(ит,ят)%") exclaim_verbs = list("восклица%(ет,ют)%", "выкрикива%(ет,ют)%") - whisper_verbs = list("шепч%(ет,ут)%", "тихо произнос%(ит,ят)%") + whisper_verbs = list("шепч%(ет,ут)%") colour = "solcom" runechat_span = "solcom" key = "1" diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index d8b465f4a74..16d4b9b6285 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -461,7 +461,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key) return src -/mob/living/whisper_say(list/message_pieces, verb = "whispers") +/mob/living/whisper_say(list/message_pieces, verb = "шепч%(ет,ут)%") if(client && check_mute(client.ckey, MUTE_IC)) to_chat(src, span_danger("You cannot speak in IC (Muted).")) return @@ -495,23 +495,23 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key) var/datum/multilingual_say_piece/first_piece = message_pieces[1] if(first_piece.speaking) if(first_piece.speaking.whisper_verbs) - verb = first_piece.speaking.whisper_verbs - not_heard = "[verb] something" + verb = pick(first_piece.speaking.whisper_verbs) + not_heard = "[verb] что-то" else - var/adverb = pick("quietly", "softly") + var/adverb = pick("еле слышно", "едва слышно", "тихо", "очень тихо", "негромко") adverb_added = TRUE - verb = "[first_piece.speaking.speech_verbs] [adverb]" - not_heard = "[first_piece.speaking.speech_verbs] something [adverb]" + verb = "[adverb] [genderize_decode(src, pick(first_piece.speaking.speech_verbs))]" + not_heard = "[adverb] [genderize_decode(src, pick(first_piece.speaking.speech_verbs))] что-то" else - not_heard = "[verb] something" + not_heard = "[genderize_decode(src, verb)] что-то" var/list/hsp = handle_speech_problems(message_pieces, verb) verb = hsp["verb"] - if(verb == "yells loudly") - verb = "slurs emphatically" + if(verb == "громко крич%(ит,ат)%") + verb = "громко бормоч%(ет,ут)%" else if(!adverb_added) - var/adverb = pick("quietly", "softly") - verb = "[verb] [adverb]" + var/adverb = pick("еле слышно", "едва слышно", "тихо", "очень тихо", "негромко") + verb = "[adverb] [genderize_decode(src, verb)]" var/atom/whisper_loc = get_whisper_loc() var/list/listening = hear(message_range, whisper_loc)