From 462009b3edd940838ae6d997d7fa4c4e987afb34 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 22 Jan 2020 21:35:07 +0100 Subject: [PATCH 1/3] Makes whispering hide your voice. And deaf people now can't see your voice --- code/modules/mob/hear_say.dm | 8 ++++---- code/modules/mob/living/say.dm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index a91aeed7bdf..cbbdff4b4f5 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -47,7 +47,7 @@ . = trim(. + trim(msg)) . += "\"" -/mob/proc/hear_say(var/list/message_pieces, var/verb = "says", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol) +/mob/proc/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, use_voice = TRUE) if(!client) return 0 @@ -74,7 +74,7 @@ return 0 var/speaker_name = speaker.name - if(ishuman(speaker)) + if(use_voice && ishuman(speaker)) var/mob/living/carbon/human/H = speaker speaker_name = H.GetVoice() @@ -99,9 +99,9 @@ if(speaker == src) to_chat(src, "You cannot hear yourself speak!") else - to_chat(src, "[speaker_name][speaker.GetAltName()] talks but you cannot hear [speaker.p_them()].") + to_chat(src, "[speaker_name] talks but you cannot hear [speaker.p_them()].") else - to_chat(src, "[speaker_name][speaker.GetAltName()] [track][message]") + to_chat(src, "[speaker_name][use_voice ? speaker.GetAltName() : ""] [track][message]") if(speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z)) var/turf/source = speaker? get_turf(speaker) : get_turf(src) src.playsound_local(source, speech_sound, sound_vol, 1) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index be5187fac5b..e26fe8746cf 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -442,14 +442,14 @@ proc/get_radio_key_from_channel(var/channel) var/speech_bubble_test = say_test(multilingual_to_message(message_pieces)) for(var/mob/M in listening) - M.hear_say(message_pieces, verb, italics, src) + M.hear_say(message_pieces, verb, italics, src, use_voice = FALSE) if(M.client) speech_bubble_recipients.Add(M.client) if(eavesdropping.len) stars_all(message_pieces) //hopefully passing the message twice through stars() won't hurt... I guess if you already don't understand the language, when they speak it too quietly to hear normally you would be able to catch even less. for(var/mob/M in eavesdropping) - M.hear_say(message_pieces, verb, italics, src) + M.hear_say(message_pieces, verb, italics, src, use_voice = FALSE) if(M.client) speech_bubble_recipients.Add(M.client) From 9ad3544aaf9525f1bc01e9df0f235b754d18f3c2 Mon Sep 17 00:00:00 2001 From: farie82 Date: Thu, 23 Jan 2020 13:06:17 +0100 Subject: [PATCH 2/3] Update hear_say.dm --- code/modules/mob/hear_say.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index cbbdff4b4f5..3d83b6d7865 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -99,7 +99,7 @@ if(speaker == src) to_chat(src, "You cannot hear yourself speak!") else - to_chat(src, "[speaker_name] talks but you cannot hear [speaker.p_them()].") + to_chat(src, "[speaker.name] talks but you cannot hear [speaker.p_them()].") else to_chat(src, "[speaker_name][use_voice ? speaker.GetAltName() : ""] [track][message]") if(speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z)) @@ -179,4 +179,4 @@ name = speaker.voice_name var/rendered = "[name] [message]" - to_chat(src, rendered) \ No newline at end of file + to_chat(src, rendered) From bf2f47a71e42d0f25ac0752b47bb637543f8fc67 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Tue, 2 Jun 2020 21:03:32 +0200 Subject: [PATCH 3/3] Linter fixes --- code/modules/mob/living/silicon/ai/freelook/eye.dm | 2 +- code/modules/mob/living/simple_animal/parrot.dm | 2 +- code/modules/mob/living/simple_animal/slime/say.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index d23fedb09bc..faacf9ba359 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -142,7 +142,7 @@ acceleration = !acceleration to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].") -/mob/camera/aiEye/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, sound_frequency) +/mob/camera/aiEye/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, sound_frequency, use_voice = TRUE) if(relay_speech) if(istype(ai)) ai.relay_speech(speaker, message_pieces, verb) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 49c63b59ab5..cce0b796910 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -710,7 +710,7 @@ ears.talk_into(src, message_pieces, message_mode, verb) used_radios += ears -/mob/living/simple_animal/parrot/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, sound_frequency) +/mob/living/simple_animal/parrot/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, sound_frequency, use_voice = TRUE) if(speaker != src && prob(50)) parrot_hear(html_decode(multilingual_to_message(message_pieces))) ..() diff --git a/code/modules/mob/living/simple_animal/slime/say.dm b/code/modules/mob/living/simple_animal/slime/say.dm index 74241dc676c..8679d64a699 100644 --- a/code/modules/mob/living/simple_animal/slime/say.dm +++ b/code/modules/mob/living/simple_animal/slime/say.dm @@ -9,7 +9,7 @@ return verb -/mob/living/simple_animal/slime/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, sound_frequency) +/mob/living/simple_animal/slime/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, sound_frequency, use_voice = TRUE) if(speaker != src && !stat) if(speaker in Friends) speech_buffer = list()