Skip to content

Commit

Permalink
bugfix: починил спичвербы шёпота (#6624)
Browse files Browse the repository at this point in the history
* тык

* Update living_say.dm
  • Loading branch information
PlayerUnknown14 authored Mar 3, 2025
1 parent c0cc5f2 commit 6a1868a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions code/modules/mob/language.dm
Original file line number Diff line number Diff line change
Expand Up @@ -489,18 +489,18 @@
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
name = "Общесолнечный"
desc = "Искуственный язык, созданный на основе английского, китайского и эсперанто. Является основным для Людей."
speech_verbs = list("говор%(ит,ят)%")
exclaim_verbs = list("восклица%(ет,ют)%", "выкрикива%(ет,ют)%")
whisper_verbs = list("шепч%(ет,ут)%", "тихо произнос%(ит,ят)%")
whisper_verbs = list("шепч%(ет,ут)%")
colour = "solcom"
runechat_span = "solcom"
key = "1"
Expand Down
22 changes: 11 additions & 11 deletions code/modules/mob/living/living_say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 6a1868a

Please sign in to comment.