diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 410f66b3056..841d42bf3ff 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -570,7 +570,7 @@ GLOBAL_LIST_INIT(do_after_once_tracker, list()) log_admin("[key_name(usr)] attempted to use a mouse macro: [verbused] [params]") message_admins("[key_name_admin(usr)] attempted to use a mouse macro: [verbused] [html_encode(params)]") if(client.next_mouse_macro_warning < world.time) // Warn occasionally - usr << 'sound/misc/sadtrombone.ogg' + SEND_SOUND(usr, sound('sound/misc/sadtrombone.ogg')) client.next_mouse_macro_warning = world.time + 600 /mob/verb/ClickSubstitute(params as command_text) set hidden = 1 diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm index ee3d70814b4..9b1d5f3fa26 100644 --- a/code/controllers/subsystem/afk.dm +++ b/code/controllers/subsystem/afk.dm @@ -76,7 +76,7 @@ SUBSYSTEM_DEF(afk) /datum/controller/subsystem/afk/proc/warn(mob/living/carbon/human/H, text) to_chat(H, text) - SEND_SOUND(H, 'sound/effects/adminhelp.ogg') + SEND_SOUND(H, sound('sound/effects/adminhelp.ogg')) if(H.client) window_flash(H.client) diff --git a/code/controllers/subsystem/ghost_spawns.dm b/code/controllers/subsystem/ghost_spawns.dm index d8a4f29e20d..e0234c2616a 100644 --- a/code/controllers/subsystem/ghost_spawns.dm +++ b/code/controllers/subsystem/ghost_spawns.dm @@ -59,11 +59,12 @@ SUBSYSTEM_DEF(ghost_spawns) var/category = "[P.hash]_notify_action" + var/notice_sound = sound('sound/misc/notice2.ogg') for(var/mob/dead/observer/M in (ignore_respawnability ? GLOB.player_list : GLOB.respawnable_list)) if(!is_eligible(M, role, antag_age_check, role, min_hours, check_antaghud)) continue - SEND_SOUND(M, 'sound/misc/notice2.ogg') + SEND_SOUND(M, notice_sound) if(flash_window) window_flash(M.client) @@ -245,7 +246,7 @@ SUBSYSTEM_DEF(ghost_spawns) if(time_left() <= 0) if(!silent) to_chat(M, "Sorry, you were too late for the consideration!") - SEND_SOUND(M, 'sound/machines/buzz-sigh.ogg') + SEND_SOUND(M, sound('sound/machines/buzz-sigh.ogg')) return signed_up += M diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 1cce61e6ccb..2441d6521f8 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -142,8 +142,7 @@ SUBSYSTEM_DEF(tickets) //Inform the user that they have opened a ticket to_chat(C, "You have opened [ticket_name] number #[(getTicketCounter() - 1)]! Please be patient and we will help you soon!") - var/ticket_open_sound = sound('sound/effects/adminticketopen.ogg') - SEND_SOUND(C, ticket_open_sound) + SEND_SOUND(C, sound('sound/effects/adminticketopen.ogg')) message_staff(url_title, NONE, TRUE) @@ -245,8 +244,7 @@ SUBSYSTEM_DEF(tickets) if("Mentorhelp") convert_ticket(T) else - var/msg_sound = sound('sound/effects/adminhelp.ogg') - SEND_SOUND(returnClient(N), msg_sound) + SEND_SOUND(returnClient(N), sound('sound/effects/adminhelp.ogg')) to_chat_safe(returnClient(N), "[key_name_hidden(C)] is autoresponding with: [response_phrases[message_key]]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key] message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key] ") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key T.lastStaffResponse = "Autoresponse: [message_key]" diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index ffcdb3d0a68..bda1253a61c 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -54,7 +54,7 @@ if(3) if(prob(10)) to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!") - affected_mob << 'sound/items/airhorn.ogg' + SEND_SOUND(affected_mob, sound('sound/items/airhorn.ogg')) if(4) if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index a1f136daec6..1e5da319f0f 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -912,7 +912,7 @@ special_role = SPECIAL_ROLE_WIZARD //ticker.mode.learn_basic_spells(current) SSticker.mode.update_wiz_icons_added(src) - SEND_SOUND(current, 'sound/ambience/antag/ragesmages.ogg') + SEND_SOUND(current, sound('sound/ambience/antag/ragesmages.ogg')) to_chat(current, "You are a Space Wizard!") current.faction = list("wizard") log_admin("[key_name(usr)] has wizarded [key_name(current)]") @@ -958,7 +958,7 @@ SSticker.mode.grant_changeling_powers(current) SSticker.mode.update_change_icons_added(src) special_role = SPECIAL_ROLE_CHANGELING - SEND_SOUND(current, 'sound/ambience/antag/ling_aler.ogg') + SEND_SOUND(current, sound('sound/ambience/antag/ling_aler.ogg')) to_chat(current, "Your powers have awoken. A flash of memory returns to us... we are a changeling!") log_admin("[key_name(usr)] has changelinged [key_name(current)]") message_admins("[key_name_admin(usr)] has changelinged [key_name_admin(current)]") @@ -1003,7 +1003,7 @@ slaved.masters += src som = slaved //we MIGT want to mindslave someone special_role = SPECIAL_ROLE_VAMPIRE - SEND_SOUND(current, 'sound/ambience/antag/vampalert.ogg') + SEND_SOUND(current, sound('sound/ambience/antag/vampalert.ogg')) to_chat(current, "Your powers have awoken. Your lust for blood grows... You are a Vampire!") log_admin("[key_name(usr)] has vampired [key_name(current)]") message_admins("[key_name_admin(usr)] has vampired [key_name_admin(current)]") diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index fcc1e6c36dc..a1c04e93d46 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -103,7 +103,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) to_chat(blob.current, "Find a good location to spawn the core and then take control and overwhelm the station!") to_chat(blob.current, "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process.") to_chat(blob.current, "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover.") - SEND_SOUND(blob.current, 'sound/magic/mutate.ogg') + SEND_SOUND(blob.current, sound('sound/magic/mutate.ogg')) return /datum/game_mode/blob/proc/show_message(var/message) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 7cdaa6c3017..7d074e869e7 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -131,7 +131,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E return /datum/game_mode/proc/greet_changeling(datum/mind/changeling, you_are=1) - SEND_SOUND(changeling.current, 'sound/ambience/antag/ling_aler.ogg') + SEND_SOUND(changeling.current, sound('sound/ambience/antag/ling_aler.ogg')) if(you_are) to_chat(changeling.current, "You are a changeling!") to_chat(changeling.current, "Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.") diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 82f919e1e0c..04c9e13b605 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(all_cults) cult_objs.setup() for(var/datum/mind/cult_mind in cult) - SEND_SOUND(cult_mind.current, 'sound/ambience/antag/bloodcult.ogg') + SEND_SOUND(cult_mind.current, sound('sound/ambience/antag/bloodcult.ogg')) to_chat(cult_mind.current, CULT_GREETING) equip_cultist(cult_mind.current) cult_mind.current.faction |= "cult" @@ -187,7 +187,7 @@ GLOBAL_LIST_EMPTY(all_cults) singlemutcheck(cult_mind.current, GLOB.clumsyblock, MUTCHK_FORCED) var/datum/action/innate/toggle_clumsy/A = new A.Grant(cult_mind.current) - SEND_SOUND(cult_mind.current, 'sound/ambience/antag/bloodcult.ogg') + SEND_SOUND(cult_mind.current, sound('sound/ambience/antag/bloodcult.ogg')) cult_mind.current.create_attack_log("Has been converted to the cult!") cult_mind.current.create_log(CONVERSION_LOG, "converted to the cult") @@ -220,7 +220,7 @@ GLOBAL_LIST_EMPTY(all_cults) for(var/datum/mind/M in cult) if(!M.current || !ishuman(M.current)) continue - SEND_SOUND(M.current, 'sound/hallucinations/i_see_you2.ogg') + SEND_SOUND(M.current, sound('sound/hallucinations/i_see_you2.ogg')) to_chat(M.current, "The veil weakens as your cult grows, your eyes begin to glow...") addtimer(CALLBACK(src, .proc/rise, M.current), 20 SECONDS) @@ -229,7 +229,7 @@ GLOBAL_LIST_EMPTY(all_cults) for(var/datum/mind/M in cult) if(!M.current || !ishuman(M.current)) continue - SEND_SOUND(M.current, 'sound/hallucinations/im_here1.ogg') + SEND_SOUND(M.current, sound('sound/hallucinations/im_here1.ogg')) to_chat(M.current, "Your cult is ascendant and the red harvest approaches - you cannot hide your true nature for much longer!") addtimer(CALLBACK(src, .proc/ascend, M.current), 20 SECONDS) GLOB.command_announcement.Announce("Picking up extradimensional activity related to the Cult of [SSticker.cultdat ? SSticker.cultdat.entity_name : "Nar'Sie"] from your station. Data suggests that about [ascend_percent * 100]% of the station has been converted. Security staff are authorized to use lethal force freely against cultists. Non-security staff should be prepared to defend themselves and their work areas from hostile cultists. Self defense permits non-security staff to use lethal force as a last resort, but non-security staff should be defending their work areas, not hunting down cultists. Dead crewmembers must be revived and deconverted once the situation is under control.", "Central Command Higher Dimensional Affairs", 'sound/AI/commandreport.ogg') diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index d99f223e7fb..4c98a3c59d3 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -603,7 +603,7 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() return - SEND_SOUND(mob_to_revive, 'sound/ambience/antag/bloodcult.ogg') + SEND_SOUND(mob_to_revive, sound('sound/ambience/antag/bloodcult.ogg')) to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"") mob_to_revive.visible_message("[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \ "You awaken suddenly from the void. You're alive!") @@ -1001,7 +1001,7 @@ structure_check() searches for nearby cultist structures required for the invoca used = TRUE color = rgb(255, 0, 0) ..() - SEND_SOUND(world, 'sound/effects/dimensional_rend.ogg') + SEND_SOUND(world, sound('sound/effects/dimensional_rend.ogg')) to_chat(world, "The veil... is... TORN!!!--") icon_state = "rune_large_distorted" var/turf/T = get_turf(src) diff --git a/code/game/gamemodes/devil/devilinfo.dm b/code/game/gamemodes/devil/devilinfo.dm index 22a5f4a6cde..6a7646d5e2e 100644 --- a/code/game/gamemodes/devil/devilinfo.dm +++ b/code/game/gamemodes/devil/devilinfo.dm @@ -298,7 +298,7 @@ GLOBAL_LIST_INIT(lawlorify, list ( if(!D) return to_chat(world, "SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!") - world << 'sound/hallucinations/veryfar_noise.ogg' + SEND_SOUND(world, sound('sound/hallucinations/veryfar_noise.ogg')) sleep(50) if(!SSticker.mode.devil_ascended) SSshuttle.emergency.request(null, 0.3) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 8388e182989..69d37bf1ce6 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -318,8 +318,9 @@ announced = max(0, announced-1) /obj/machinery/doomsday_device/proc/detonate(z_level = 1) - for(var/mob/M in GLOB.player_list) - M << 'sound/machines/alarm.ogg' + var/doomsday_alarm = sound('sound/machines/alarm.ogg') + for(var/explodee in GLOB.player_list) + SEND_SOUND(explodee, doomsday_alarm) sleep(100) for(var/mob/living/L in GLOB.mob_list) var/turf/T = get_turf(L) diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm index 18a875e452d..dd1a198f6f8 100644 --- a/code/game/gamemodes/miniantags/morph/morph_event.dm +++ b/code/game/gamemodes/miniantags/morph/morph_event.dm @@ -26,7 +26,7 @@ player_mind.special_role = SPECIAL_ROLE_MORPH SSticker.mode.traitors |= player_mind to_chat(S, S.playstyle_string) - S << 'sound/magic/mutate.ogg' + SEND_SOUND(S, sound('sound/magic/mutate.ogg')) message_admins("[key_of_morph] has been made into morph by an event.") log_game("[key_of_morph] was spawned as a morph by an event.") diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 6121a3df808..f76ddbd64dd 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -159,7 +159,7 @@ /mob/living/simple_animal/revenant/proc/giveObjectivesandGoals() mind.wipe_memory() - SEND_SOUND(src, 'sound/effects/ghost.ogg') + SEND_SOUND(src, sound('sound/effects/ghost.ogg')) to_chat(src, "
") to_chat(src, "You are a revenant.") to_chat(src, "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.") diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 7707449df4f..507e63cb873 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -79,7 +79,7 @@ if(mind) to_chat(src, src.playstyle_string) to_chat(src, "You are not currently in the same plane of existence as the station. Use the blood crawl action at a blood pool to manifest.") - src << 'sound/misc/demon_dies.ogg' + SEND_SOUND(src, sound('sound/misc/demon_dies.ogg')) if(!(vialspawned)) var/datum/objective/slaughter/objective = new var/datum/objective/demonFluff/fluffObjective = new diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index fcfbe682b41..a1dbbf35644 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -238,7 +238,7 @@ /datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) - SEND_SOUND(syndicate.current, 'sound/ambience/antag/ops.ogg') + SEND_SOUND(syndicate.current, sound('sound/ambience/antag/ops.ogg')) if(you_are) to_chat(syndicate.current, "You are a [syndicate_name()] agent!") var/obj_count = 1 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b572890ab6b..ef3da7d5b8d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -60,7 +60,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) /datum/objective/proc/on_target_cryo() if(owner?.current) to_chat(owner.current, "
You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!") - SEND_SOUND(owner.current, 'sound/ambience/alarm4.ogg') + SEND_SOUND(owner.current, sound('sound/ambience/alarm4.ogg')) target = null INVOKE_ASYNC(src, .proc/post_target_cryo) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 37045d44d10..047bc322ccd 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -226,7 +226,7 @@ Made by Xhuis var/shadow_nag_messages = list("You can barely hold yourself in this lesser form!", "The urge to become something greater is overwhelming!", "You feel a burning passion to hatch free of this shell and assume godhood!") H.take_overall_damage(0, 3) to_chat(H, "[pick(shadow_nag_messages)]") - H << 'sound/weapons/sear.ogg' + SEND_SOUND(H, sound('sound/weapons/sear.ogg')) if(shadows_alive) return ..() diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index a3aa9919eb2..22faac6a489 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -462,7 +462,7 @@ else if(issilicon(target)) var/mob/living/silicon/S = target to_chat(S, "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#") - S << 'sound/misc/interference.ogg' + SEND_SOUND(S, sound('sound/misc/interference.ogg')) playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1) do_sparks(5, 1, S) S.Weaken(6) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index d1699850260..56f31a173be 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -175,7 +175,7 @@ /datum/game_mode/proc/greet_vampire(var/datum/mind/vampire, var/you_are=1) var/dat if(you_are) - SEND_SOUND(vampire.current, 'sound/ambience/antag/vampalert.ogg') + SEND_SOUND(vampire.current, sound('sound/ambience/antag/vampalert.ogg')) dat = "You are a Vampire!
" dat += {"To bite someone, target the head and use harm intent with an empty hand. Drink blood to gain new powers. You are weak to holy things and starlight. Don't go into space and avoid the Chaplain, the chapel and especially Holy Water."} diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 1307dc8424d..ee9fd069a76 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -826,7 +826,7 @@ GLOBAL_LIST_EMPTY(multiverse) GiveHint(target) else if(istype(I,/obj/item/bikehorn)) to_chat(target, "HONK") - target << 'sound/items/airhorn.ogg' + SEND_SOUND(target, sound('sound/items/airhorn.ogg')) target.AdjustEarDamage(0, 3) GiveHint(target) cooldown = world.time +cooldown_time diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 324ecae1c0a..2034b874610 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -108,7 +108,7 @@ player_mob = ghost var/client/player_client = player_mob.client to_chat(player_mob, "[user] is trying to capture your soul into [src]! Click the button in the top right of the game window to respond.") - player_client << 'sound/misc/notice2.ogg' + SEND_SOUND(player_client, sound('sound/misc/notice2.ogg')) window_flash(player_client) var/obj/screen/alert/notify_soulstone/A = player_mob.throw_alert("\ref[src]_soulstone_thingy", /obj/screen/alert/notify_soulstone) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 44f99e2edac..6e57fab9bb6 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -130,7 +130,7 @@ if(!istype(victim) || !victim.client) return to_chat(victim, "RIP AND TEAR") - victim << 'sound/misc/e1m1.ogg' + SEND_SOUND(victim, sound('sound/misc/e1m1.ogg')) var/old_color = victim.client.color var/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0) var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0) diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 30c0063ea78..3b89a3d0ce9 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -17,8 +17,9 @@ if(heavy_range > light_range) light_range = heavy_range + var/emp_sound = sound('sound/effects/empulse.ogg') for(var/mob/M in range(heavy_range, epicenter)) - M << 'sound/effects/empulse.ogg' + SEND_SOUND(M, emp_sound) for(var/atom/T in range(light_range, epicenter)) if(cause == "cult" && iscultist(T)) continue diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 06973e878a1..c013c489bc5 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1525,7 +1525,7 @@ /obj/item/toy/russian_revolver/trick_revolver/post_shot(user) to_chat(user, "[src] did look pretty dodgey!") - SEND_SOUND(user, 'sound/misc/sadtrombone.ogg') //HONK + SEND_SOUND(user, sound('sound/misc/sadtrombone.ogg')) //HONK /* * Rubber Chainsaw */ diff --git a/code/game/objects/items/weapons/storage/artistic_toolbox.dm b/code/game/objects/items/weapons/storage/artistic_toolbox.dm index 610f0d14ab0..f7b8a4eb200 100644 --- a/code/game/objects/items/weapons/storage/artistic_toolbox.dm +++ b/code/game/objects/items/weapons/storage/artistic_toolbox.dm @@ -49,7 +49,7 @@ break force += 4 throwforce += 4 - SEND_SOUND(user, 'sound/goonstation/effects/screech.ogg') + SEND_SOUND(user, sound('sound/goonstation/effects/screech.ogg')) shake_camera(user, 20, 1) var/acount = 0 var/amax = rand(10, 15) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index daf195af8f8..10417e2b937 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -34,7 +34,7 @@ GLOBAL_VAR_INIT(nologevent, 0) to_chat(C, msg) if(important) if(C.prefs?.sound & SOUND_ADMINHELP) - SEND_SOUND(C, 'sound/effects/adminhelp.ogg') + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) window_flash(C) /** @@ -51,7 +51,7 @@ GLOBAL_VAR_INIT(nologevent, 0) to_chat(C, msg) if(important) if(C.prefs?.sound & SOUND_MENTORHELP) - SEND_SOUND(C, 'sound/effects/adminhelp.ogg') + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) window_flash(C) /proc/admin_ban_mobsearch(var/mob/M, var/ckey_to_find, var/mob/admin_to_notify) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e4bd51f1f5b..65ca7edfded 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -987,7 +987,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( to_chat(T, "Man up and deal with it.") to_chat(T, "Move on.") - T << 'sound/voice/manup1.ogg' + SEND_SOUND(T, sound('sound/voice/manup1.ogg')) log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.") message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.") @@ -1003,9 +1003,10 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( var/confirm = alert("Are you sure you want to send the global message?", "Confirm Man Up Global", "Yes", "No") if(confirm == "Yes") - for(var/mob/T as mob in GLOB.mob_list) - to_chat(T, "
Man up.
Deal with it.
Move on.

") - T << 'sound/voice/manup1.ogg' + var/manned_up_sound = sound('sound/voice/manup1.ogg') + for(var/sissy in GLOB.player_list) + to_chat(sissy, "
Man up.
Deal with it.
Move on.

") + SEND_SOUND(sissy, manned_up_sound) log_admin("[key_name(usr)] told everyone to man up and deal with it.") message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 8bc4e3f2657..46a67e32a98 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -17,7 +17,7 @@ if(!isclient(C)) return - C << 'sound/effects/adminhelp.ogg' + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) to_chat(C, "- AdminHelp Rejected! -") to_chat(C, "Your admin help was rejected.") @@ -2326,7 +2326,7 @@ message_admins("[key_name_admin(usr)] sent [H.job] [H] to cryo.") if(href_list["cryoafk"]) // Warn them if they are send to storage and are AFK to_chat(H, "The admins have moved you to cryo storage for being AFK. Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.") - SEND_SOUND(H, 'sound/effects/adminhelp.ogg') + SEND_SOUND(H, sound('sound/effects/adminhelp.ogg')) if(H.client) window_flash(H.client) else if(href_list["FaxReplyTemplate"]) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 1e04cb7bd62..87009e78b52 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -169,7 +169,7 @@ //play the recieving admin the adminhelp sound (if they have them enabled) //non-admins always hear the sound, as they cannot toggle it if((!C.holder) || (C.prefs.sound & SOUND_ADMINHELP)) - C << 'sound/effects/adminhelp.ogg' + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]") //we don't use message_admins here because the sender/receiver might get it too diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 78f3caa7e53..be4a4763bff 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -16,7 +16,7 @@ if(R_ADMIN & C.holder.rights) // Lets see if this admin was pinged in the asay message if(findtext(msg, "@[C.ckey]") || findtext(msg, "@[C.key]")) // Check ckey and key, so you can type @AffectedArc07 or @affectedarc07 - SEND_SOUND(C, 'sound/misc/ping.ogg') + SEND_SOUND(C, sound('sound/misc/ping.ogg')) msg = replacetext(msg, "@[C.ckey]", "@[C.ckey]") msg = replacetext(msg, "@[C.key]", "@[C.key]") // Same applies here. key and ckey. diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index d8bb2a1c85d..a28a61043d3 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -102,52 +102,3 @@ GLOBAL_LIST_EMPTY(sounds_cache) if(!I.on && !ignore_power) continue playsound(I, melody, cvol) - -/* -/client/proc/cuban_pete() - set category = "Event" - set name = "Cuban Pete Time" - - message_admins("[key_name_admin(usr)] has declared Cuban Pete Time!", 1) - for(var/mob/M in world) - if(M.client) - if(M.client.midis) - M << 'cubanpetetime.ogg' - - for(var/mob/living/carbon/human/CP in world) - if(CP.real_name=="Cuban Pete" && CP.key!="Rosham") - C << "Your body can't contain the rhumba beat" - CP.gib() - - -/client/proc/bananaphone() - set category = "Event" - set name = "Banana Phone" - - message_admins("[key_name_admin(usr)] has activated Banana Phone!", 1) - for(var/mob/M in world) - if(M.client) - if(M.client.midis) - M << 'bananaphone.ogg' - - -client/proc/space_asshole() - set category = "Event" - set name = "Space Asshole" - - message_admins("[key_name_admin(usr)] has played the Space Asshole Hymn.", 1) - for(var/mob/M in world) - if(M.client) - if(M.client.midis) - M << 'sound/music/space_asshole.ogg' - - -client/proc/honk_theme() - set category = "Event" - set name = "Honk" - - message_admins("[key_name_admin(usr)] has creeped everyone out with Blackest Honks.", 1) - for(var/mob/M in world) - if(M.client) - if(M.client.midis) - M << 'honk_theme.ogg'*/ diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 32708a7f65e..ef76d110dc7 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -36,7 +36,7 @@ if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) if(X.prefs.sound & SOUND_PRAYERNOTIFY) - SEND_SOUND(X, 'sound/items/PDA/ambicha4-short.ogg') + SEND_SOUND(X, sound('sound/items/PDA/ambicha4-short.ogg')) to_chat(usr, "Your prayers have been received by the gods.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Pray") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -48,7 +48,7 @@ if(R_EVENT & X.holder.rights) to_chat(X, msg) if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' + SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) @@ -57,7 +57,7 @@ if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' + SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) /proc/HONK_announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) @@ -66,7 +66,7 @@ if(R_EVENT & X.holder.rights) to_chat(X, msg) if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' + SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) /proc/ERT_Announce(var/text , var/mob/Sender, var/repeat_warning) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) @@ -77,7 +77,7 @@ if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' + SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) /proc/Nuke_request(text , mob/Sender) var/nuke_code = get_nuke_code() @@ -88,4 +88,4 @@ to_chat(X, msg) to_chat(X, "The nuke code is [nuke_code].") if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' + SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 35dfc22b1fb..9d3bfdb18d4 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -285,4 +285,4 @@ M.mind.objectives += KillDaCrew to_chat(M, "Objective #[1]: [KillDaWiz.explanation_text]") to_chat(M, "Objective #[2]: [KillDaCrew.explanation_text]") - M << 'sound/magic/mutate.ogg' + SEND_SOUND(M, sound('sound/magic/mutate.ogg')) diff --git a/code/modules/mob/living/carbon/human/species/shadowling.dm b/code/modules/mob/living/carbon/human/species/shadowling.dm index 32c67401a57..fb9c0a23a57 100644 --- a/code/modules/mob/living/carbon/human/species/shadowling.dm +++ b/code/modules/mob/living/carbon/human/species/shadowling.dm @@ -33,7 +33,7 @@ H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN) if(H.stat != DEAD) to_chat(H, "The light burns you!")//Message spam to say "GET THE FUCK OUT" - H << 'sound/weapons/sear.ogg' + SEND_SOUND(H, sound('sound/weapons/sear.ogg')) else if(light_amount < LIGHT_HEAL_THRESHOLD) H.clear_alert("lightexposure") var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 92ca04aa5a8..2ec0dae0522 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -253,7 +253,7 @@ return TRUE A.visible_message("[src] points [hand_item] at [A]!", "[src] points [hand_item] at you!") - A << 'sound/weapons/targeton.ogg' + SEND_SOUND(A, sound('sound/weapons/targeton.ogg')) return TRUE visible_message("[src] points to [A]") return TRUE diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index a4e90b50f8e..6cfc0b7b5ce 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -153,12 +153,13 @@ GLOBAL_VAR_INIT(announcing_vox, 0) // Stores the time of the last announcement formatted_message += "
[words_string]" formatted_message += "
-[src]" + var/announce_sound = sound('sound/misc/notice2.ogg') for(var/player in GLOB.player_list) var/mob/M = player if(M.client && !(M.client.prefs.sound & SOUND_AI_VOICE)) var/turf/T = get_turf(M) if(T && T.z == z && M.can_hear()) - SEND_SOUND(M, 'sound/misc/notice2.ogg') + SEND_SOUND(M, announce_sound) to_chat(M, formatted_message) /proc/play_vox_word(word, z_level, mob/only_listener) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 2aba7f854b6..735b910d34f 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -346,11 +346,12 @@ GLOBAL_LIST_EMPTY(fax_blacklist) /obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/faxtype, var/obj/item/sent, font_colour="#9A04D1") var/msg = "[faxname]: [key_name_admin(sender)] | REPLY: (RADIO) (FAX) ([ADMIN_SM(sender,"SM")]) | REJECT: (TEMPLATE) ([ADMIN_BSA(sender,"BSA")]) (EVILFAX) : Receiving '[sent.name]' via secure connection... view message" + var/fax_sound = sound('sound/effects/adminhelp.ogg') for(var/client/C in GLOB.admins) if(check_rights(R_EVENT, 0, C.mob)) to_chat(C, msg) if(C.prefs.sound & SOUND_ADMINHELP) - C << 'sound/effects/adminhelp.ogg' + SEND_SOUND(C, fax_sound) /obj/machinery/photocopier/faxmachine/proc/become_mimic() if(scan) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 4eea225caea..e4f43373974 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -30,7 +30,7 @@ icon_state = SSticker.cultdat?.entity_icon_state name = SSticker.cultdat?.entity_name to_chat(world, " [uppertext(name)] HAS RISEN") - SEND_SOUND(world, pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg')) + SEND_SOUND(world, sound(pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg'))) var/datum/game_mode/gamemode = SSticker.mode if(gamemode) @@ -50,7 +50,7 @@ /obj/singularity/narsie/large/Destroy() to_chat(world, " [uppertext(name)] HAS FALLEN") - SEND_SOUND(world, 'sound/hallucinations/wail.ogg') + SEND_SOUND(world, sound('sound/hallucinations/wail.ogg')) var/datum/game_mode/gamemode = SSticker.mode if(gamemode) gamemode.cult_objs.narsie_death() diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 116faf9e883..26eb8cc9735 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -312,10 +312,12 @@ L.rad_act(rads) var/turf/T = get_turf(src) - for(var/mob/M in GLOB.player_list) + var/super_matter_charge_sound = sound('sound/magic/charge.ogg') + for(var/player in GLOB.player_list) + var/mob/M = player var/turf/mob_turf = get_turf(M) if(atoms_share_level(T, mob_turf)) - SEND_SOUND(M, 'sound/magic/charge.ogg') + SEND_SOUND(M, super_matter_charge_sound) if(atoms_share_level(M, src)) to_chat(M, "You feel reality distort for a moment...") @@ -632,8 +634,8 @@ investigate_log("Supermatter shard consumed by singularity.", "singulo") message_admins("Singularity has consumed a supermatter shard and can now become stage six.") visible_message("[src] is consumed by the singularity!") - var/supermatter_sound = 'sound/effects/supermatter.ogg' - for(var/mob/M in GLOB.player_list) + var/supermatter_sound = sound('sound/effects/supermatter.ogg') + for(var/M in GLOB.player_list) if(atoms_share_level(M, src)) SEND_SOUND(M, supermatter_sound) //everyone goan know bout this to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...") diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index db2c21bd9fa..201071745a8 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -143,7 +143,7 @@ else if(effect <= 7) M.emote("collapse") to_chat(M, "Your heart is pounding!") - M << 'sound/effects/singlebeat.ogg' + SEND_SOUND(M, sound('sound/effects/singlebeat.ogg')) update_flags |= M.Paralyse(5, FALSE) M.Jitter(30) update_flags |= M.adjustToxLoss(6, FALSE) @@ -407,7 +407,7 @@ /datum/reagent/bath_salts/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST) to_chat(M, "You feel FUCKED UP!!!!!!") - M << 'sound/effects/singlebeat.ogg' + SEND_SOUND(M, sound('sound/effects/singlebeat.ogg')) M.emote("faint") M.apply_effect(5, IRRADIATE) M.adjustToxLoss(5) diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm index af59809da27..c7c9fa46c75 100644 --- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm +++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm @@ -80,7 +80,7 @@ return ..() | update_flags /datum/reagent/consumable/drink/berry_banned2/on_mob_death(mob/living/M) - M << sound('sound/effects/adminhelp.ogg',0,1,0,25) + SEND_SOUND(M, sound('sound/effects/adminhelp.ogg', 0, 1, 0, 25)) to_chat(M, "PM from-Administrator: BWOINK!") ..() diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index fdfad83bee2..c7e709cdcaf 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -544,7 +544,7 @@ update_flags |= M.Weaken(8, FALSE) else if(effect <= 7) to_chat(M, "Your heartbeat is pounding inside your head!") - M << 'sound/effects/singlebeat.ogg' + SEND_SOUND(M, sound('sound/effects/singlebeat.ogg')) M.emote("collapse") update_flags |= M.adjustOxyLoss(8, FALSE) update_flags |= M.adjustToxLoss(3, FALSE) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 1686be9b083..8a5c2118794 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -249,8 +249,9 @@ if(time_left <= 50 && !sound_played) //4 seconds left - should sync up with the launch sound_played = 1 + var/hyperspace_sound = sound('sound/effects/hyperspace_begin.ogg') for(var/area/shuttle/escape/E in world) - E << 'sound/effects/hyperspace_begin.ogg' + SEND_SOUND(E, hyperspace_sound) if(time_left <= 0 && !SSshuttle.emergencyNoEscape) //move each escape pod to its corresponding transit dock @@ -258,8 +259,9 @@ if(is_station_level(M.z)) //Will not launch from the mine/planet M.enterTransit() //now move the actual emergency shuttle to its transit dock + var/hyperspace_progress_sound = sound('sound/effects/hyperspace_progress.ogg') for(var/area/shuttle/escape/E in world) - E << 'sound/effects/hyperspace_progress.ogg' + SEND_SOUND(E, hyperspace_progress_sound) enterTransit() mode = SHUTTLE_ESCAPE timer = world.time @@ -274,8 +276,9 @@ for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) M.dock(SSshuttle.getDock("[M.id]_away")) + var/hyperspace_end_sound = sound('sound/effects/hyperspace_end.ogg') for(var/area/shuttle/escape/E in world) - E << 'sound/effects/hyperspace_end.ogg' + SEND_SOUND(E, hyperspace_end_sound) // now move the actual emergency shuttle to centcomm // unless the shuttle is "hijacked" diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 62e175ead18..56d82e24833 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -253,7 +253,7 @@ crit_fail = FALSE if(owner) to_chat(owner, "Your translator implant beeps.") - SEND_SOUND(owner, 'sound/machines/twobeep.ogg') + SEND_SOUND(owner, sound('sound/machines/twobeep.ogg')) /obj/item/organ/internal/cyberimp/brain/speech_translator/ui_action_click() if(owner && crit_fail) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index a9665ec92e9..d30be78dbdc 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -265,7 +265,7 @@ owner.Stuttering(20) owner.AdjustEarDamage(0, 30) owner.Weaken(3) - owner << 'sound/items/airhorn.ogg' + SEND_SOUND(owner, sound('sound/items/airhorn.ogg')) if(prob(30)) owner.Stun(10) owner.Paralyse(4) diff --git a/code/modules/world_topic/adminmsg.dm b/code/modules/world_topic/adminmsg.dm index bc1a0f0718c..e3582b0ae46 100644 --- a/code/modules/world_topic/adminmsg.dm +++ b/code/modules/world_topic/adminmsg.dm @@ -26,7 +26,7 @@ C.received_discord_pm = world.time C.last_discord_pm_time = 0 - SEND_SOUND(C, 'sound/effects/adminhelp.ogg') + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) to_chat(C, message) for(var/client/A in GLOB.admins)