diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index ed758c81b40..735d32a2ef9 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -168,7 +168,7 @@ SSticker.mode:explosion_in_progress = 1 for(var/mob/M in world) if(M.client) - M << 'sound/machines/Alarm.ogg' + SEND_SOUND(M, sound('sound/machines/Alarm')) to_chat(world, "Incoming missile detected.. Impact in 10..") for (var/i=9 to 1 step -1) sleep(10) diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm index a89a1292dbb..ad3f0e9f250 100644 --- a/code/game/gamemodes/technomancer/spells/illusion.dm +++ b/code/game/gamemodes/technomancer/spells/illusion.dm @@ -23,7 +23,7 @@ copied = AM update_icon() to_chat(user, "You've copied \the [AM]'s appearance.") - user << 'sound/weapons/flash.ogg' + SEND_SOUND(user, sound('sound/weapons/flash')) return 1 else if(istype(hit_atom, /turf)) var/turf/T = hit_atom @@ -34,7 +34,7 @@ illusion = new(T) illusion.copy_appearance(copied) to_chat(user, "An illusion of \the [copied] is made on \the [T].") - user << 'sound/effects/pop.ogg' + SEND_SOUND(user, sound('sound/effects/pop')) return 1 else if(pay_energy(100)) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index eb08b22043e..74cd82279ba 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -267,7 +267,7 @@ else var/mob/selected = find_dead_player("[C.ckey]") - selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable + SEND_SOUND(selected, sound('sound/machines/chime')) //probably not the best sound but I think it's reasonable var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") if(answer != "No" && pod.growclone(C)) temp = "Initiating cloning cycle..." diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index e354a1beb61..dbf27312b4c 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -31,7 +31,7 @@ proc/empulse(turf/epicenter, first_range, second_range, third_range, fourth_rang fourth_range = third_range for(var/mob/M in range(first_range, epicenter)) - M << 'sound/effects/EMPulse.ogg' + SEND_SOUND(M, sound('sound/effects/EMPulse')) for(var/atom/T in range(fourth_range, epicenter)) #ifdef EMPDEBUG @@ -71,4 +71,4 @@ proc/empulse(turf/epicenter, first_range, second_range, third_range, fourth_rang if((world.timeofday - time) >= EMPDEBUG) log_and_message_admins("EMPDEBUG: [T.name] - [T.type] - took [world.timeofday - time]ds to process emp_act()!") #endif - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 45438c83508..a66731be36b 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -57,11 +57,11 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(!istype(M.loc,/turf/space)) if(creaking_explosion) if(prob(65)) - M << 'sound/effects/explosioncreak1.ogg' + SEND_SOUND(M, sound('sound/effects/explosioncreak1')) else - M << 'sound/effects/explosioncreak2.ogg' + SEND_SOUND(M, sound('sound/effects/explosioncreak2')) else - M << 'sound/effects/explosionfar.ogg' + SEND_SOUND(M, sound('sound/effects/explosionfar')) if(creaking_explosion) addtimer(CALLBACK(M, /mob/proc/playsound_local, epicenter, null, rand(25, 40), 1, frequency, null, null, FALSE, 'sound/effects/creak1.ogg', null, null, null, null, 0), 5 SECONDS) diff --git a/code/game/objects/items/devices/ai_detector.dm b/code/game/objects/items/devices/ai_detector.dm index 3b539d91b56..cba9ec29835 100644 --- a/code/game/objects/items/devices/ai_detector.dm +++ b/code/game/objects/items/devices/ai_detector.dm @@ -95,22 +95,22 @@ switch(new_state) if(PROXIMITY_OFF_CAMERANET) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Now outside of camera network.") - carrier << 'sound/machines/defib_failed.ogg' + SEND_SOUND(carrier, sound('sound/machines/defib_failed')) if(PROXIMITY_NONE) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Now within camera network, AI and cameras unfocused.") - carrier << 'sound/machines/defib_safetyOff.ogg' + SEND_SOUND(carrier, sound('sound/machines/defib_safetyOff')) if(PROXIMITY_NEAR) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Warning: AI focus at nearby location.") - carrier << 'sound/machines/defib_SafetyOn.ogg' + SEND_SOUND(carrier, sound('sound/machines/defib_SafetyOn')) if(PROXIMITY_ON_SCREEN) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Alert: AI or camera focused at current location!") - carrier <<'sound/machines/defib_ready.ogg' + SEND_SOUND(carrier, sound('sound/machines/defib_ready')) if(PROXIMITY_TRACKING) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Danger: AI is actively tracking you!") - carrier << 'sound/machines/defib_success.ogg' + SEND_SOUND(carrier, sound('sound/machines/defib_success')) if(PROXIMITY_TRACKING_FAIL) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Danger: AI is attempting to actively track you, but you are outside of the camera network!") - carrier <<'sound/machines/defib_ready.ogg' + SEND_SOUND(carrier, sound('sound/machines/defib_ready')) #undef PROXIMITY_OFF_CAMERANET diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm index b11e5ad5b3b..28b81c7b9af 100644 --- a/code/game/objects/items/devices/communicator/messaging.dm +++ b/code/game/objects/items/devices/communicator/messaging.dm @@ -36,7 +36,7 @@ return to_chat(src, "[icon2html(thing = origin_atom, target = src)] Receiving communicator request from [origin_atom]. To answer, use the Call Communicator \ verb, and select that name to answer the call.") - src << 'sound/machines/defib_SafetyOn.ogg' + SEND_SOUND(src, sound('sound/machines/defib_SafetyOn')) comm.voice_invites |= src if(message == "ping") if(client && client.prefs.communicator_visibility) @@ -45,7 +45,7 @@ exonet.send_message(origin_address, "64 bytes received from [exonet.address] ecmp_seq=1 ttl=51 time=[random] ms") if(message == "text") to_chat(src, "[icon2html(thing = origin_atom, target = src)] Received text message from [origin_atom]: \"[text]\"") - src << 'sound/machines/defib_safetyOff.ogg' + SEND_SOUND(src, sound('sound/machines/defib_safetyOff')) exonet_messages.Add("From [origin_atom]:
[text]") return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index fea1d7c2e84..153b8ab22b0 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1074,7 +1074,7 @@ var/list/admin_verbs_event_manager = list( for (var/mob/T as mob in mob_list) to_chat(T, "
Man up.
Deal with it.

Move along.

") - T << 'sound/voice/ManUp1.ogg' + SEND_SOUND(T, sound('sound/voice/ManUp1')) 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.", 1) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 3a64463b7b3..c19e2992490 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -255,7 +255,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) for(var/client/X in admins) if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping)) - X << 'sound/effects/adminhelp.ogg' + SEND_SOUND(X, sound('sound/effects/adminhelp')) window_flash(X) to_chat(X, chat_msg) @@ -342,7 +342,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(initiator) if(initiator.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping)) - initiator << 'sound/effects/adminhelp.ogg' + SEND_SOUND(initiator, sound('sound/effects/adminhelp')) to_chat(initiator, "- AdminHelp Rejected! -") to_chat(initiator, "Your admin help was rejected.") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 7cb5d872d34..2901a1d882a 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -164,7 +164,7 @@ //play the recieving admin the adminhelp sound (if they have them enabled) if(recipient.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping)) - recipient << 'sound/effects/adminhelp.ogg' + SEND_SOUND(recipient, sound('sound/effects/adminhelp')) else if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT @@ -179,7 +179,7 @@ admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") //always play non-admin recipients the adminhelp sound - recipient << 'sound/effects/adminhelp.ogg' + SEND_SOUND(recipient, sound('sound/effects/adminhelp')) //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config_legacy.txt ~Carn if(config_legacy.popup_admin_pm) @@ -264,7 +264,7 @@ window_flash(C) //always play non-admin recipients the adminhelp sound - C << 'sound/effects/adminhelp.ogg' + SEND_SOUND(C, sound('sound/effects/adminhelp')) C.ircreplyamount = IRCREPLYCOUNT diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index b3e9ae44456..b20cfe509bd 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -23,7 +23,7 @@ if((R_ADMIN|R_MOD) & C.holder.rights) if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers)) C << msg - C << 'sound/effects/ding.ogg' + SEND_SOUND(C, sound('sound/effects/ding')) to_chat(usr, "Your prayers have been received by the gods.") feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -34,11 +34,11 @@ for(var/client/C in admins) if((R_ADMIN|R_MOD) & C.holder.rights) C << msg - C << 'sound/machines/signal.ogg' + SEND_SOUND(C, sound('sound/machines/signal')) /proc/Syndicate_announce(var/msg, var/mob/Sender) msg = "ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, null)]) (CA) (BSA) (RPLY): [msg]" for(var/client/C in admins) if((R_ADMIN|R_MOD) & C.holder.rights) C << msg - C << 'sound/machines/signal.ogg' + SEND_SOUND(C, sound('sound/machines/signal')) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 361bff88e5f..26a967866fc 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -126,7 +126,7 @@ obj/machinery/gateway/centerstation/process(delta_time) if(!awaygate) return use_power(5000) - M << 'sound/effects/phasein.ogg' + SEND_SOUND(M, sound('sound/effects/phasein')) playsound(src, 'sound/effects/phasein.ogg', 100, 1) if(awaygate.calibrated) M.forceMove(get_step(awaygate.loc, SOUTH)) @@ -243,7 +243,7 @@ obj/machinery/gateway/centerstation/process(delta_time) return M.forceMove(get_step(stationgate.loc, SOUTH)) M.setDir(SOUTH) - M << 'sound/effects/phasein.ogg' + SEND_SOUND(M, sound('sound/effects/phasein')) playsound(src, 'sound/effects/phasein.ogg', 100, 1) diff --git a/code/modules/blob2/overmind/types.dm b/code/modules/blob2/overmind/types.dm index 3a42dce08fa..6aff8beaa09 100644 --- a/code/modules/blob2/overmind/types.dm +++ b/code/modules/blob2/overmind/types.dm @@ -515,7 +515,7 @@ for(var/mob/M in player_list) // For everyone else. if(M.z == T.z && get_dist(M, T) > world.view && !M.ear_deaf && !istype(M.loc,/turf/space)) - M << 'sound/effects/explosionfar.ogg' + SEND_SOUND(M, sound('sound/effects/explosionfar')) exploding = FALSE diff --git a/code/modules/events/gravity.dm b/code/modules/events/gravity.dm index fc646b4b9a8..741aaea92a7 100644 --- a/code/modules/events/gravity.dm +++ b/code/modules/events/gravity.dm @@ -19,11 +19,11 @@ if(A.z in zLevels) A.gravitychange(gravity_is_on, A) if(prob(50)) - A << 'sound/effects/creak1.ogg' + SEND_SOUND(A, sound('sound/effects/creak1')) else if (prob(33)) - A << 'sound/effects/creak2.ogg' + SEND_SOUND(A, sound('sound/effects/creak2')) else - A << 'sound/effects/creak3.ogg' + SEND_SOUND(A, sound('sound/effects/creak3')) /datum/event/gravity/end() diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm index 2e6a5134d8b..1b8712dd40c 100644 --- a/code/modules/events/meteor_strike_vr.dm +++ b/code/modules/events/meteor_strike_vr.dm @@ -69,7 +69,7 @@ to_chat(L, "The ground lurches beneath you!") shake_camera(L, 6, 1) if(!L.ear_deaf) - L << 'sound/effects/explosionfar.ogg' + SEND_SOUND(L, sound('sound/effects/explosionfar')) qdel(src) /obj/structure/meteorite @@ -111,4 +111,4 @@ for(var/obj/O in src) O.forceMove(get_turf(src)) qdel(src) - return \ No newline at end of file + return diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 7be7b93a307..449f5cae87d 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -112,27 +112,27 @@ mob/living/carbon/proc/handle_hallucinations() //Strange audio //to_chat(src, "Strange Audio") switch(rand(1,12)) - if(1) src << 'sound/machines/airlock.ogg' + if(1) SEND_SOUND(src, sound('sound/machines/airlock')) if(2) - if(prob(50))src << 'sound/effects/Explosion1.ogg' - else src << 'sound/effects/Explosion2.ogg' - if(3) src << 'sound/effects/explosionfar.ogg' - if(4) src << 'sound/effects/Glassbr1.ogg' - if(5) src << 'sound/effects/Glassbr2.ogg' - if(6) src << 'sound/effects/Glassbr3.ogg' - if(7) src << 'sound/machines/twobeep.ogg' - if(8) src << 'sound/machines/windowdoor.ogg' + if(prob(50))SEND_SOUND(src, sound('sound/effects/Explosion1')) + else SEND_SOUND(src, sound('sound/effects/Explosion2')) + if(3) SEND_SOUND(src, sound('sound/effects/explosionfar')) + if(4) SEND_SOUND(src, sound('sound/effects/Glassbr1')) + if(5) SEND_SOUND(src, sound('sound/effects/Glassbr2')) + if(6) SEND_SOUND(src, sound('sound/effects/Glassbr3')) + if(7) SEND_SOUND(src, sound('sound/machines/twobeep')) + if(8) SEND_SOUND(src, sound('sound/machines/windowdoor')) if(9) //To make it more realistic, I added two gunshots (enough to kill) - src << 'sound/weapons/Gunshot1.ogg' + SEND_SOUND(src, sound('sound/weapons/Gunshot1')) spawn(rand(10,30)) - src << 'sound/weapons/Gunshot2.ogg' - if(10) src << 'sound/weapons/smash.ogg' + SEND_SOUND(src, sound('sound/weapons/Gunshot2')) + if(10) SEND_SOUND(src, sound('sound/weapons/smash')) if(11) //Same as above, but with tasers. - src << 'sound/weapons/Taser.ogg' + SEND_SOUND(src, sound('sound/weapons/Taser')) spawn(rand(10,30)) - src << 'sound/weapons/Taser.ogg' + SEND_SOUND(src, sound('sound/weapons/Taser')) //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm index 8f5d5e94961..e61206c2737 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm @@ -246,27 +246,27 @@ //Strange audio //to_chat(src, "Strange Audio") switch(rand(1,12)) - if(1) src << 'sound/machines/airlock.ogg' + if(1) SEND_SOUND(src, sound('sound/machines/airlock')) if(2) - if(prob(50))src << 'sound/effects/Explosion1.ogg' - else src << 'sound/effects/Explosion2.ogg' - if(3) src << 'sound/effects/explosionfar.ogg' - if(4) src << 'sound/effects/Glassbr1.ogg' - if(5) src << 'sound/effects/Glassbr2.ogg' - if(6) src << 'sound/effects/Glassbr3.ogg' - if(7) src << 'sound/machines/twobeep.ogg' - if(8) src << 'sound/machines/windowdoor.ogg' + if(prob(50))SEND_SOUND(src, sound('sound/effects/Explosion1')) + else SEND_SOUND(src, sound('sound/effects/Explosion2')) + if(3) SEND_SOUND(src, sound('sound/effects/explosionfar')) + if(4) SEND_SOUND(src, sound('sound/effects/Glassbr1')) + if(5) SEND_SOUND(src, sound('sound/effects/Glassbr2')) + if(6) SEND_SOUND(src, sound('sound/effects/Glassbr3')) + if(7) SEND_SOUND(src, sound('sound/machines/twobeep')) + if(8) SEND_SOUND(src, sound('sound/machines/windowdoor')) if(9) //To make it more realistic, I added two gunshots (enough to kill) - src << 'sound/weapons/Gunshot1.ogg' + SEND_SOUND(src, sound('sound/weapons/Gunshot1')) spawn(rand(10,30)) - src << 'sound/weapons/Gunshot2.ogg' - if(10) src << 'sound/weapons/smash.ogg' + SEND_SOUND(src, sound('sound/weapons/Gunshot2')) + if(10) SEND_SOUND(src, sound('sound/weapons/smash')) if(11) //Same as above, but with tasers. - src << 'sound/weapons/Taser.ogg' + SEND_SOUND(src, sound('sound/weapons/Taser')) spawn(rand(10,30)) - src << 'sound/weapons/Taser.ogg' + SEND_SOUND(src, sound('sound/weapons/Taser')) //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source @@ -373,7 +373,7 @@ if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) to_chat(src, "You cannot bite in your current state.") - return + return last_special = world.time + 600 src.visible_message("[src] leans in close to [B]...") @@ -397,7 +397,7 @@ H.drip(1) sleep(50) H.drip(1) - + if(!B.bitten) // first time biting them src.nutrition += 300 B.nutrition -= 150 @@ -410,7 +410,7 @@ B.apply_damage(15, BRUTE, BP_TORSO) // if they have nothing to give, this just harms them B.bitten = 1 //debuff tracking for balance else if(!istype(B,/mob/living/carbon) && src.isSynthetic() || istype(B,/mob/living/carbon) && B.isSynthetic() && src.isSynthetic()) // for synths to feed on robots and other synths - if(do_after(src, 50, B)) + if(do_after(src, 50, B)) if(!Adjacent(B)) return src.visible_message("[src] suddenly lunges at [B]!") if(B.nutrition > 100) @@ -419,7 +419,7 @@ if(B.nutrition < 100) B.apply_damage(15, BRUTE, BP_TORSO) else if(istype(B,/mob/living/silicon) && !istype(src,/mob/living/silicon)) - if(do_after(src, 50, B)) + if(do_after(src, 50, B)) to_chat(src, "You don't sense any viable blood...") diff --git a/code/modules/mob/living/simple_animal/animals/mouse.dm b/code/modules/mob/living/simple_animal/animals/mouse.dm index 93f4d258fee..75dfe921708 100644 --- a/code/modules/mob/living/simple_animal/animals/mouse.dm +++ b/code/modules/mob/living/simple_animal/animals/mouse.dm @@ -49,7 +49,7 @@ if(prob(speak_chance)) for(var/mob/M in view()) - M << 'sound/effects/mouse_squeak.ogg' + SEND_SOUND(M, sound('sound/effects/mouse_squeak')) if(!resting && prob(0.5)) lay_down() @@ -97,7 +97,7 @@ if(!stat) var/mob/M = AM M.visible_message("[icon2html(thing = src, target = world)] Squeek!") - M << 'sound/effects/mouse_squeak.ogg' + SEND_SOUND(M, sound('sound/effects/mouse_squeak')) ..() /mob/living/simple_mob/mouse/death() diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm index 72c4159bb26..bf08b0b422e 100644 --- a/code/modules/multiz/structures_vr.dm +++ b/code/modules/multiz/structures_vr.dm @@ -69,7 +69,7 @@ return //do not send ghosts, zshadows, ai eyes, etc var/obj/effect/landmark/dest = pick(eventdestinations) if(dest) - M << 'sound/effects/phasein.ogg' + SEND_SOUND(M, sound('sound/effects/phasein')) playsound(src, 'sound/effects/phasein.ogg', 100, 1) M.forceMove(dest.loc) return diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 7a979c1eb9e..adacf397220 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -207,7 +207,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins for(var/client/C in admins) if(check_rights((R_ADMIN|R_MOD),0,C)) C << msg - C << 'sound/machines/printer.ogg' + SEND_SOUND(C, sound('sound/machines/printer')) // VoreStation Edit Start var/faxid = export_fax(sent) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index cde00489f8e..11da2e2ee48 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -219,7 +219,7 @@ global_announcer.autosay("DANGER: SUPERMATTER CRYSTAL DEGRADATION IN PROGRESS! INTEGRITY AT [integrity]%", "Supermatter Monitor") for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << 'sound/ambience/engine_alert2.ogg' + SEND_SOUND(M, sound('sound/ambience/engine_alert2')) else if(safe_warned && public_alert) global_announcer.autosay(alert_msg, "Supermatter Monitor") public_alert = 0 diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index fc2800764b1..0fa7d476aab 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -552,7 +552,7 @@ if(istype(mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = mob to_chat(H, "You hear an awful ringing in your ears.") - H << 'sound/weapons/flash.ogg' + SEND_SOUND(H, sound('sound/weapons/flash')) /datum/disease2/effect/vomiting name = "Vomiting" diff --git a/maps/tether/submaps/alienship/_alienship.dm b/maps/tether/submaps/alienship/_alienship.dm index 848ecec7c2d..42a01961460 100644 --- a/maps/tether/submaps/alienship/_alienship.dm +++ b/maps/tether/submaps/alienship/_alienship.dm @@ -160,7 +160,7 @@ L.drop_from_inventory(I, loc) L.Paralyse(10) L.forceMove(get_turf(pick(teleport_to))) - L << 'sound/effects/bamf.ogg' + SEND_SOUND(L, sound('sound/effects/bamf')) to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") /area/tether_away/alienship