diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 046d8f9512e..be842eb5cb3 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -8,7 +8,7 @@ //A flashy ability, good for crowd control and sewing chaos. /obj/effect/proc_holder/changeling/resonant_shriek/sting_action(var/mob/user) - for(var/mob/living/M in hearers(4, user)) + for(var/mob/living/M in get_hearers_in_view(4, user)) if(iscarbon(M)) if(!M.mind || !M.mind.changeling) M.ear_deaf += 30 diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 1eea8712125..4ca3488ed64 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -164,8 +164,7 @@ for(var/datum/AI_Module/small/overload_machine/overload in current_modules) if(overload.uses > 0) overload.uses -- - for(var/mob/V in hearers(M, null)) - V.show_message("You hear a loud electrical buzzing sound!", 2) + audible_message("You hear a loud electrical buzzing sound!") src << "Overloading machine circuitry..." spawn(50) if(M) @@ -191,8 +190,7 @@ for(var/datum/AI_Module/small/override_machine/override in current_modules) if(override.uses > 0) override.uses -- - for(var/mob/V in hearers(M, null)) - V.show_message("You hear a loud electrical buzzing sound!", 2) + audible_message("You hear a loud electrical buzzing sound!") src << "Reprogramming machine behaviour..." spawn(50) if(M) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index f4e1171aadf..04226b689d2 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -434,7 +434,7 @@ customrecepient.tnote += "← From [customsender] ([customjob]):
[custommessage]
" if (!customrecepient.silent) playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) - customrecepient.loc.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, null, 3) + customrecepient.loc.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, 3) if( customrecepient.loc && ishuman(customrecepient.loc) ) var/mob/living/carbon/human/H = customrecepient.loc H << "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)" diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 5f0d1abfc68..8bdb4b90dd2 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -249,8 +249,8 @@ user << "It won't budge!" if(!lastbang) lastbang = 1 - for (var/mob/M in hearers(src, null)) - M.show_message("BANG, bang!", 2) + for (var/mob/M in get_hearers_in_view(src, null)) + audible_message("BANG, bang!") spawn(30) lastbang = 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 6a3efae3afd..e18feb404f3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -95,8 +95,8 @@ user << "The locker is locked!" if(world.time > lastbang+5) lastbang = world.time - for(var/mob/M in hearers(src, null)) - M.show_message("BANG, bang!", 2) + for(var/mob/M in get_hearers_in_view(src, null)) + audible_message("BANG, bang!") return /obj/structure/closet/secure_closet/attack_hand(mob/user as mob) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 1330585324e..061fdd3b141 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -57,7 +57,7 @@ return // and play var/turf/source = get_turf(instrumentObj) - for(var/mob/M in hearers(15, source)) + for(var/mob/M in get_hearers_in_view(15, source)) M.playsound_local(source, soundfile, 100, falloff = 5) /datum/song/proc/updateDialog(mob/user as mob) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e51e48b75b7..3a1017aacd0 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -78,7 +78,7 @@ var/list/admin_verbs_fun = list( /client/proc/send_space_ninja, /client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_random_ai_law, - /client/proc/make_sound, + /client/proc/object_say, /client/proc/toggle_random_events, /client/proc/set_ooc, /client/proc/forceEvent @@ -159,7 +159,7 @@ var/list/admin_verbs_hideable = list( /client/proc/cmd_admin_add_freeform_ai_law, /client/proc/cmd_admin_add_random_ai_law, /client/proc/cmd_admin_create_centcom_report, - /client/proc/make_sound, + /client/proc/object_say, /client/proc/toggle_random_events, /client/proc/cmd_admin_add_random_ai_law, /datum/admins/proc/startnow, @@ -449,12 +449,12 @@ var/list/admin_verbs_hideable = list( log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D].", 1) -/client/proc/make_sound(var/obj/O in world) +/client/proc/object_say(var/obj/O in world) set category = "Special Verbs" - set name = "Osay" + set name = "Object Say" set desc = "Makes an object say something." if(istype(O)) - var/message = input("What do you want the message to be?", "Make Sound") as text | null + var/message = input("What do you want the message to be?", "Object Say") as text | null if(!message) return var/templanguages = O.languages diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 40dd1e75730..510868fcd04 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -23,7 +23,9 @@ /mob/living/carbon/relaymove(var/mob/user, direction) if(user in src.stomach_contents) if(prob(40)) - audible_message("You hear something rumbling inside [src]'s stomach...", "Something is rumbling inside your stomach!", null, 4) + audible_message("You hear something rumbling inside [src]'s stomach...", \ + "You hear something rumbling.", 4,\ + "Something is rumbling inside your stomach!") var/obj/item/I = user.get_active_hand() if(I && I.force) var/d = rand(round(I.force / 4), I.force) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 467055e4d50..f383677391b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -100,10 +100,10 @@ var/next_mob_id = 0 // This would be for audible actions by the src mob // message is the message output to anyone who can hear. // self_message (optional) is what the src mob hears. -// blind_message (optional) is what deaf people will see. +// deaf_message (optional) is what deaf people will see. // hearing_distance (optional) is the range, how many tiles away the message can be heard. -/mob/audible_message(var/message, var/self_message, var/deaf_message, var/hearing_distance) +/mob/audible_message(var/message, var/deaf_message, var/hearing_distance, var/self_message) var/range = 7 if(hearing_distance) range = hearing_distance @@ -116,7 +116,7 @@ var/next_mob_id = 0 // Show a message to all mobs in earshot of this atom // Use for objects performing audible actions // message is the message output to anyone who can hear. -// blind_message (optional) is what deaf people will see. +// deaf_message (optional) is what deaf people will see. // hearing_distance (optional) is the range, how many tiles away the message can be heard. /atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 48ee0ec6299..a6ec9666694 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -581,8 +581,8 @@ if (user.stat) return if (src.loc) - for (var/mob/M in hearers(src.loc.loc)) - M.show_message("CLONG, clong!", 2) + for (var/mob/M in get_hearers_in_view(src.loc.loc)) + audible_message("CLONG, clong!") playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0)