Merge pull request #8076 from Cyantime/whispdoubles

Fixes doublewhispering, Fixes encoding for russian radio codes
This commit is contained in:
Aronai Sieyes
2020-05-25 19:05:44 -04:00
committed by GitHub
+13 -13
View File
@@ -40,18 +40,18 @@ var/list/department_radio_keys = list(
//kinda localization -- rastaf0
//same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
":" = "right ear", "." = "right ear",
":" = "left ear", "." = "left ear",
":" = "intercom", "." = "intercom",
":" = "department", "." = "department",
":" = "Command", "." = "Command",
":" = "Science", "." = "Science",
":" = "Medical", "." = "Medical",
":" = "Engineering", "." = "Engineering",
":" = "Security", "." = "Security",
":" = "whisper", "." = "whisper",
":" = "Mercenary", "." = "Mercenary",
":" = "Supply", "." = "Supply",
":ê" = "right ear", ".ê" = "right ear",
":ä" = "left ear", ".ä" = "left ear",
":ø" = "intercom", ".ø" = "intercom",
":ð" = "department", ".ð" = "department",
":ñ" = "Command", ".ñ" = "Command",
":ò" = "Science", ".ò" = "Science",
":ü" = "Medical", ".ü" = "Medical",
":ó" = "Engineering", ".ó" = "Engineering",
":û" = "Security", ".û" = "Security",
":ö" = "whisper", ".ö" = "whisper",
":å" = "Mercenary", ".å" = "Mercenary",
":é" = "Supply", ".é" = "Supply",
)
@@ -369,7 +369,7 @@ proc/get_radio_key_from_channel(var/channel)
images_to_clients[I1] |= M.client
M << I1
M.hear_say(message_pieces, verb, italics, src, speech_sound, sound_vol)
if(whispering) //Don't even bother with these unless whispering
if(whispering && !isobserver(M)) //Don't even bother with these unless whispering
if(dst > message_range && dst <= w_scramble_range) //Inside whisper scramble range
if(M.client)
var/image/I2 = listening[M] || speech_bubble