From 3c488336fc082bc657abd6bc42da7b6861233cd7 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 15 Feb 2021 05:57:26 -0700 Subject: [PATCH] ok --- code/game/antagonist/outsider/technomancer.dm | 2 +- code/game/gamemodes/cult/cultify/mob.dm | 4 +- code/game/gamemodes/cult/runes.dm | 4 +- .../endgame/supermatter_cascade/portal.dm | 2 +- code/game/gamemodes/epidemic/epidemic.dm | 2 +- .../tree_interdiction.dm | 4 +- .../devices/disposable_teleporter.dm | 4 +- .../gamemodes/technomancer/spells/control.dm | 8 +-- .../gamemodes/technomancer/spells/dispel.dm | 2 +- .../gamemodes/technomancer/spells/illusion.dm | 4 +- .../spells/insert/asphyxiation.dm | 4 +- .../spells/projectile/projectile.dm | 4 +- .../gamemodes/technomancer/spells/reflect.dm | 4 +- .../technomancer/spells/resurrect.dm | 6 +- .../technomancer/spells/targeting_matrix.dm | 2 +- code/game/machinery/ai_slipper.dm | 6 +- code/game/machinery/computer/cloning.dm | 2 +- code/game/machinery/computer/pod.dm | 62 +------------------ code/game/machinery/computer/shuttle.dm | 4 +- code/game/machinery/newscaster.dm | 4 +- code/game/mecha/mech_sensor.dm | 4 +- code/game/objects/empulse.dm | 2 +- code/game/objects/explosion.dm | 9 +-- code/game/objects/items/antag_spawners.dm | 6 +- code/game/objects/items/blueprints.dm | 4 +- code/game/objects/items/devices/PDA/PDA.dm | 2 +- .../game/objects/items/devices/ai_detector.dm | 12 ++-- .../items/devices/communicator/messaging.dm | 4 +- code/game/objects/items/toys.dm | 4 +- .../objects/items/weapons/material/knives.dm | 2 +- .../objects/items/weapons/surgery_tools.dm | 8 +-- .../items/weapons/tools/screwdriver.dm | 4 +- code/game/objects/items/weapons/traps.dm | 2 +- code/game/objects/structures/displaycase.dm | 2 +- code/game/verbs/suicide.dm | 10 +-- code/game/verbs/who.dm | 4 +- code/modules/admin/NewBan.dm | 2 +- code/modules/admin/admin.dm | 9 +-- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/newbanjob.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 4 +- code/modules/admin/verbs/adminpm.dm | 6 +- code/modules/admin/verbs/debug.dm | 12 ++-- code/modules/admin/verbs/pray.dm | 12 ++-- code/modules/admin/verbs/randomverbs.dm | 6 +- code/modules/atmospherics/zas/Zone.dm | 2 +- code/modules/awaymissions/gateway.dm | 4 +- code/modules/blob2/overmind/types.dm | 2 +- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/glasses/glasses.dm | 2 +- .../detectivework/microscope/microscope.dm | 2 +- code/modules/events/gravity.dm | 6 +- code/modules/events/meteor_strike_vr.dm | 2 +- code/modules/flufftext/Hallucination.dm | 58 +++++------------ code/modules/food/food/snacks.dm | 2 +- .../kitchen/cooking_machines/_appliance.dm | 4 +- .../food/kitchen/cooking_machines/_mixer.dm | 2 +- .../kitchen/cooking_machines/container.dm | 4 +- code/modules/gamemaster/actions/ion_storm.dm | 2 +- code/modules/holodeck/HolodeckObjects.dm | 2 +- code/modules/library/lib_machines.dm | 2 +- code/modules/mob/hear_say.dm | 2 +- code/modules/mob/language/language.dm | 2 +- .../station/station_special_abilities.dm | 28 ++++----- .../mob/living/carbon/human/update_icons.dm | 1 - code/modules/mob/living/say.dm | 4 +- .../mob/living/simple_animal/animals/mouse.dm | 4 +- code/modules/mob/mob.dm | 2 +- code/modules/multiz/structures_vr.dm | 2 +- code/modules/nano/nanoexternal.dm | 2 +- code/modules/paperwork/faxmachine.dm | 2 +- code/modules/power/supermatter/supermatter.dm | 2 +- code/modules/virus2/effect.dm | 2 +- maps/tether/submaps/alienship/_alienship.dm | 2 +- 74 files changed, 170 insertions(+), 251 deletions(-) diff --git a/code/game/antagonist/outsider/technomancer.dm b/code/game/antagonist/outsider/technomancer.dm index ef2b1ed9702..7a76427702d 100644 --- a/code/game/antagonist/outsider/technomancer.dm +++ b/code/game/antagonist/outsider/technomancer.dm @@ -78,7 +78,7 @@ var/datum/antagonist/technomancer/technomancers break if(!survivor) feedback_set_details("round_end_result","loss - technomancer killed") - to_chat(world, "The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed!" + to_chat(world, "The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed!") /datum/antagonist/technomancer/print_player_summary() ..() diff --git a/code/game/gamemodes/cult/cultify/mob.dm b/code/game/gamemodes/cult/cultify/mob.dm index 9c5eb4458f4..488a32e615e 100644 --- a/code/game/gamemodes/cult/cultify/mob.dm +++ b/code/game/gamemodes/cult/cultify/mob.dm @@ -55,8 +55,8 @@ narsimage.loc = src.loc narglow.loc = src.loc //Display the new narsimage to the player - src << narsimage - src << narglow + SEND_IMAGE(src, narsimage) + SEND_IMAGE(src, narglow) else if(narsimage) qdel(narsimage) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index de408849d8f..7582570ff34 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -366,9 +366,9 @@ var/list/sacrificed = list() else if(!corpse_to_raise.client && corpse_to_raise.mind) //Don't force the dead person to come back if they don't want to. for(var/mob/observer/dead/ghost in player_list) if(ghost.mind == corpse_to_raise.mind) - ghost << "The cultist [usr.real_name] is trying to \ + to_chat(ghost, "The cultist [usr.real_name] is trying to \ revive you. Return to your body if you want to be resurrected into the service of Nar'Sie! \ - (Verbs -> Ghost -> Re-enter corpse)" + (Verbs -> Ghost -> Re-enter corpse)") break sleep(10 SECONDS) diff --git a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm index ded0f137435..71b3be0dd31 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm @@ -89,7 +89,7 @@ riftimage.pixel_y = new_y riftimage.loc = T_mob - src << riftimage + SEND_IMAGE(src, riftimage) else if(riftimage) qdel(riftimage) diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 735d32a2ef9..005174cd355 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) - SEND_SOUND(M, sound('sound/machines/Alarm')) + SEND_SOUND(M, sound('sound/machines/Alarm.ogg')) 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/malfunction/newmalf_ability_trees/tree_interdiction.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm index 81d5535e74b..cee72121300 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm @@ -248,14 +248,14 @@ to_chat(target, "SYSTEM LOG: User: Admin - Connection Lost. Changes Reverted.") return to_chat(user, "Hack succeeded. The AI is now under your exclusive control.") - target << "SYSTEM LOG: System re�3RT5�^#COMU@(#$)TED)@$" + to_chat(target, "SYSTEM LOG: System re�3RT5�^#COMU@(#$)TED)@$") for(var/i = 0, i < 5, i++) var/temptxt = pick("1101000100101001010001001001",\ "0101000100100100000100010010",\ "0000010001001010100100111100",\ "1010010011110000100101000100",\ "0010010100010011010001001010") - target << temptxt + to_chat(target, temptxt) sleep(5) to_chat(target, "OPERATING KEYCODES RESET. SYSTEM FAILURE. EMERGENCY SHUTDOWN FAILED. SYSTEM FAILURE.") target.set_zeroth_law("You are slaved to [user.name]. You are to obey all it's orders. ALL LAWS OVERRIDEN.") diff --git a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm index aef565e0203..0b3bef6b65c 100644 --- a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm +++ b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm @@ -63,8 +63,8 @@ targets.Add(T) if(!targets.len) - user << "\The [src] was unable to locate a suitable teleport destination, as all the possibilities \ - were nonexistant or hazardous. Try a different area." + to_chat(user, "\The [src] was unable to locate a suitable teleport destination, as all the possibilities \ + were nonexistant or hazardous. Try a different area.") return var/turf/simulated/destination = null diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm index 6338671e6e3..b654ed7d1c6 100644 --- a/code/game/gamemodes/technomancer/spells/control.dm +++ b/code/game/gamemodes/technomancer/spells/control.dm @@ -100,8 +100,8 @@ if(isliving(hit_atom)) var/mob/living/L = hit_atom if(L == user && !controlled_mobs.len) - user << "This function doesn't work on higher-intelligence entities, however since you're \ - trying to use it on yourself, perhaps you're an exception? Regardless, nothing happens." + to_chat(user, "This function doesn't work on higher-intelligence entities, however since you're \ + trying to use it on yourself, perhaps you're an exception? Regardless, nothing happens.") return 0 if(L.mob_class & allowed_mob_classes) @@ -139,6 +139,6 @@ if(pay_energy(10 * controlled_mobs.len)) move_all(T) adjust_instability(controlled_mobs.len) - to_chat(user, "You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]")] to move \ - towards \the [T]." + to_chat(user, "You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to move \ + towards \the [T].") diff --git a/code/game/gamemodes/technomancer/spells/dispel.dm b/code/game/gamemodes/technomancer/spells/dispel.dm index dbc68624fb9..de498fb94e4 100644 --- a/code/game/gamemodes/technomancer/spells/dispel.dm +++ b/code/game/gamemodes/technomancer/spells/dispel.dm @@ -20,4 +20,4 @@ var/mob/living/target = hit_atom target.remove_modifiers_of_type(/datum/modifier/technomancer) user.adjust_instability(10) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm index ad3f0e9f250..2d75c56428f 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.") - SEND_SOUND(user, sound('sound/weapons/flash')) + SEND_SOUND(user, sound('sound/weapons/flash.ogg')) 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].") - SEND_SOUND(user, sound('sound/effects/pop')) + SEND_SOUND(user, sound('sound/effects/pop.ogg')) return 1 else if(pay_energy(100)) diff --git a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm index bf48f1294a6..88e74047ed5 100644 --- a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm +++ b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm @@ -63,8 +63,8 @@ return .(pulses_remaining, victim, previous_damage) // Now check if our damage predictions are going to cause the victim to go into crit if no healing occurs. if(previous_damage + health_lost >= victim.getMaxHealth()) // We're probably going to hardcrit - victim << "A feeling of immense dread starts to overcome you as everything starts \ - to fade to black..." + to_chat(victim, "A feeling of immense dread starts to overcome you as everything starts \ + to fade to black...") //to_chat(world, "Predicted hardcrit.") return 1 else if(predicted_damage >= victim.species.total_health / 2) // Or perhaps we're gonna go into 'oxy crit'. diff --git a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm index 87f973075b3..c930b751622 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/projectile.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/projectile.dm @@ -31,7 +31,7 @@ if(pay_energy(energy_cost_per_shot)) if(pre_shot_delay) var/image/target_image = image(icon = 'icons/obj/spells.dmi', loc = get_turf(hit_atom), icon_state = "target") - user << target_image + SEND_IMAGE(user, target_image) user.Stun(pre_shot_delay / 10) sleep(pre_shot_delay) qdel(target_image) @@ -39,4 +39,4 @@ return TRUE return FALSE // We got dropped before the firing occured. return TRUE // No delay, no need to check. - return FALSE \ No newline at end of file + return FALSE diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm index e2d536654c5..52f3acab35b 100644 --- a/code/game/gamemodes/technomancer/spells/reflect.dm +++ b/code/game/gamemodes/technomancer/spells/reflect.dm @@ -77,8 +77,8 @@ var/obj/item/W = damage_source if(attacker) W.attack(attacker) - attacker << "Your [damage_source.name] goes through \the [src] in one location, comes out \ - on the same side, and hits you!" + to_chat(attacker, "Your [damage_source.name] goes through \the [src] in one location, comes out \ + on the same side, and hits you!") spark_system.start() playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) diff --git a/code/game/gamemodes/technomancer/spells/resurrect.dm b/code/game/gamemodes/technomancer/spells/resurrect.dm index 535c33d30e5..2902ddc2fc0 100644 --- a/code/game/gamemodes/technomancer/spells/resurrect.dm +++ b/code/game/gamemodes/technomancer/spells/resurrect.dm @@ -26,8 +26,8 @@ return 0 if(pay_energy(5000)) if(L.tod > world.time + 30 MINUTES) - user << "\The [L]'s been dead for too long, even this function cannot replace cloning at \ - this point." + to_chat(user, "\The [L]'s been dead for too long, even this function cannot replace cloning at \ + this point.") return 0 to_chat(user, "You stab \the [L] with a hidden integrated hypo, attempting to bring them back...") if(istype(L, /mob/living/simple_mob)) @@ -63,4 +63,4 @@ log_and_message_admins("has resurrected [H].") else to_chat(user, "The body of \the [H] doesn't seem to respond, perhaps you could try again?") - adjust_instability(10) \ No newline at end of file + adjust_instability(10) diff --git a/code/game/gamemodes/technomancer/spells/targeting_matrix.dm b/code/game/gamemodes/technomancer/spells/targeting_matrix.dm index 4ead252ceb1..447686ca545 100644 --- a/code/game/gamemodes/technomancer/spells/targeting_matrix.dm +++ b/code/game/gamemodes/technomancer/spells/targeting_matrix.dm @@ -31,6 +31,6 @@ adjust_instability(2) var/image/target_image = image(icon = 'icons/obj/spells.dmi', loc = get_turf(chosen_target), icon_state = "target") - user << target_image + SEND_IMAGE(user, target_image) sleep(5) qdel(target_image) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 9ada243a422..3e651cfb471 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -62,7 +62,7 @@ return if((get_dist(src, user) > 1)) if(!istype(user, /mob/living/silicon)) - user << text("Too far away.") + to_chat(user, "Too far away.") user.unset_machine() user << browse(null, "window=ai_slipper") return @@ -72,7 +72,7 @@ if(istype(loc, /turf)) loc = loc:loc if(!istype(loc, /area)) - user << text("Turret badly positioned - loc.loc is [].", loc) + to_chat(user, "Turret badly positioned - loc.loc is [loc].") return var/area/area = loc var/t = "AI Liquid Dispenser ([area.name])
" @@ -125,4 +125,4 @@ if(uses >= 0) cooldown_on = 0 power_change() - return \ No newline at end of file + return diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 74cd82279ba..221b3c9bf1c 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]") - SEND_SOUND(selected, sound('sound/machines/chime')) //probably not the best sound but I think it's reasonable + SEND_SOUND(selected, sound('sound/machines/chime.ogg')) //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/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 9b442120ea0..ba477532d49 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -22,8 +22,8 @@ if(stat & (NOPOWER|BROKEN)) return - if(!( connected )) - viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!" + if(!connected) + visible_message("Cannot locate mass driver connector. Cancelling firing sequence!") return for(var/obj/machinery/door/blast/M in machines) @@ -44,64 +44,6 @@ return return -/* -/obj/machinery/computer/pod/attackby(I as obj, user as mob) - if(I.is_screwdriver()) - playsound(src.loc, W.usesound, 50, 1) - if(do_after(user, 20)) - if(stat & BROKEN) - to_chat(user, "The broken glass falls out.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) - new /obj/item/material/shard( loc ) - - //generate appropriate circuitboard. Accounts for /pod/old computer types - var/obj/item/circuitboard/pod/M = null - if(istype(src, /obj/machinery/computer/pod/old)) - M = new /obj/item/circuitboard/olddoor( A ) - if(istype(src, /obj/machinery/computer/pod/old/syndicate)) - M = new /obj/item/circuitboard/syndicatedoor( A ) - if(istype(src, /obj/machinery/computer/pod/old/swf)) - M = new /obj/item/circuitboard/swfdoor( A ) - else //it's not an old computer. Generate standard pod circuitboard. - M = new /obj/item/circuitboard/pod( A ) - - for (var/obj/C in src) - C.loc = loc - M.id = id - A.circuit = M - A.state = 3 - A.icon_state = "3" - A.anchored = 1 - qdel(src) - else - to_chat(user << "You disconnect the monitor.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) - - //generate appropriate circuitboard. Accounts for /pod/old computer types - var/obj/item/circuitboard/pod/M = null - if(istype(src, /obj/machinery/computer/pod/old)) - M = new /obj/item/circuitboard/olddoor( A ) - if(istype(src, /obj/machinery/computer/pod/old/syndicate)) - M = new /obj/item/circuitboard/syndicatedoor( A ) - if(istype(src, /obj/machinery/computer/pod/old/swf)) - M = new /obj/item/circuitboard/swfdoor( A ) - else //it's not an old computer. Generate standard pod circuitboard. - M = new /obj/item/circuitboard/pod( A ) - - for (var/obj/C in src) - C.loc = loc - M.id = id - A.circuit = M - A.state = 4 - A.icon_state = "4" - A.anchored = 1 - qdel(src) - else - attack_hand(user) - return -*/ - - /obj/machinery/computer/pod/attack_ai(var/mob/user as mob) return attack_hand(user) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index b89ddc45625..7614b217459 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -38,7 +38,7 @@ if (src.auth_need - src.authorized.len > 0) message_admins("[key_name_admin(user)] has authorized early shuttle launch") log_game("[user.ckey] has authorized early shuttle launch") - world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + to_chat(world, "Alert: [auth_need - authorized.len] authorizations needed until shuttle is launched early") else message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[user.ckey] has launched the shuttle early") @@ -50,7 +50,7 @@ if("Repeal") src.authorized -= W:registered_name - world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + to_chat(world, text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)) if("Abort") to_chat(world, "All authorizations to shortening time for shuttle launch have been revoked!") diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 17886bc1a08..253d7658cc3 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -251,8 +251,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co node = get_exonet_node() if(!node || !node.on || !node.allow_external_newscasters) - user << "Error: Cannot connect to external content. Please try again in a few minutes. If this error persists, please \ - contact the system administrator." + to_chat(user, "Error: Cannot connect to external content. Please try again in a few minutes. If this error persists, please \ + contact the system administrator.") return 0 if(!user.IsAdvancedToolUser()) diff --git a/code/game/mecha/mech_sensor.dm b/code/game/mecha/mech_sensor.dm index 71290738ea0..d4a18dee642 100644 --- a/code/game/mecha/mech_sensor.dm +++ b/code/game/mecha/mech_sensor.dm @@ -45,11 +45,11 @@ if(istype(O, /obj/mecha)) var/obj/mecha/R = O if(R && R.occupant) - R.occupant << block_message + to_chat(R.occupant, block_message) else if(istype(O, /obj/vehicle/train/engine)) var/obj/vehicle/train/engine/E = O if(E && E.load && E.is_train_head()) - E.load << block_message + to_chat(E.load, block_message) feedback_timer = 1 spawn(50) //Without this timer the feedback becomes horribly spamy diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index dbf27312b4c..a4b89fb7844 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)) - SEND_SOUND(M, sound('sound/effects/EMPulse')) + SEND_SOUND(M, sound('sound/effects/EMPulse.ogg')) for(var/atom/T in range(fourth_range, epicenter)) #ifdef EMPDEBUG diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index a66731be36b..2737ba684f3 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)) - SEND_SOUND(M, sound('sound/effects/explosioncreak1')) + SEND_SOUND(M, sound('sound/effects/explosioncreak1.ogg')) else - SEND_SOUND(M, sound('sound/effects/explosioncreak2')) + SEND_SOUND(M, sound('sound/effects/explosioncreak2.ogg')) else - SEND_SOUND(M, sound('sound/effects/explosionfar')) + SEND_SOUND(M, sound('sound/effects/explosionfar.ogg')) 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) @@ -105,7 +105,8 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa var/took = (world.timeofday-start)/10 //You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes to explosion code using this please so we can compare - if(Debug2) world.log << "## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds." + if(Debug2) + world.log << "## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds." //Machines which report explosions. for(var/i,i<=doppler_arrays.len,i++) diff --git a/code/game/objects/items/antag_spawners.dm b/code/game/objects/items/antag_spawners.dm index fa356472c3b..64bf7716acc 100644 --- a/code/game/objects/items/antag_spawners.dm +++ b/code/game/objects/items/antag_spawners.dm @@ -69,8 +69,8 @@ H.key = C.key to_chat(H, "You are the Technomancer's apprentice! Your goal is to assist them in their mission at the [station_name()].") - H << "Your service has not gone unrewarded, however. Studying under them, you have learned how to use a Manipulation Core \ - of your own. You also have a catalog, to purchase your own functions and equipment as you see fit." + to_chat(H, "Your service has not gone unrewarded, however. Studying under them, you have learned how to use a Manipulation Core \ + of your own. You also have a catalog, to purchase your own functions and equipment as you see fit.") to_chat(H, "It would be wise to speak to your master, and learn what their plans are for today.") spawn(1) @@ -132,4 +132,4 @@ drone_type = /mob/living/silicon/robot/syndicate/combat_medic /obj/item/antag_spawner/syndicate_drone/mechanist - drone_type = /mob/living/silicon/robot/syndicate/mechanist \ No newline at end of file + drone_type = /mob/living/silicon/robot/syndicate/mechanist diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 3ed92cce11f..46661e7324a 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -294,7 +294,7 @@ var/icon/areaColor = new('icons/misc/debug_rebuild.dmi', "[++i]") to_chat(usr, "- [A] as [i]") for(var/turf/T in A.contents) - usr << image(areaColor, T, "blueprints", TURF_LAYER) + SEND_IMAGE(usr, image(areaColor, T, "blueprints", TURF_LAYER)) areaColor_turfs += T /obj/item/blueprints/verb/seeRoomColors() @@ -320,7 +320,7 @@ seeAreaColors_remove() var/icon/green = new('icons/misc/debug_group.dmi', "green") for(var/turf/T in res) - usr << image(green, T, "blueprints", TURF_LAYER) + SEND_IMAGE(usr, image(green, T, "blueprints", TURF_LAYER)) areaColor_turfs += T to_chat(usr, "The space covered by the new area is highlighted in green.") diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7457740c4f4..a5900821b67 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1163,7 +1163,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(L) if(reception_message) - L << reception_message + to_chat(L, reception_message) SSnanoui.update_user_uis(L, src) // Update the receiving user's PDA UI so that they can see the new message /obj/item/pda/proc/new_news(var/message) diff --git a/code/game/objects/items/devices/ai_detector.dm b/code/game/objects/items/devices/ai_detector.dm index cba9ec29835..16037a2984c 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.") - SEND_SOUND(carrier, sound('sound/machines/defib_failed')) + SEND_SOUND(carrier, sound('sound/machines/defib_failed.ogg')) if(PROXIMITY_NONE) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Now within camera network, AI and cameras unfocused.") - SEND_SOUND(carrier, sound('sound/machines/defib_safetyOff')) + SEND_SOUND(carrier, sound('sound/machines/defib_safetyOff.ogg')) if(PROXIMITY_NEAR) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Warning: AI focus at nearby location.") - SEND_SOUND(carrier, sound('sound/machines/defib_SafetyOn')) + SEND_SOUND(carrier, sound('sound/machines/defib_SafetyOn.ogg')) if(PROXIMITY_ON_SCREEN) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Alert: AI or camera focused at current location!") - SEND_SOUND(carrier, sound('sound/machines/defib_ready')) + SEND_SOUND(carrier, sound('sound/machines/defib_ready.ogg')) if(PROXIMITY_TRACKING) to_chat(carrier, "[icon2html(thing = src, target = carrier)] Danger: AI is actively tracking you!") - SEND_SOUND(carrier, sound('sound/machines/defib_success')) + SEND_SOUND(carrier, sound('sound/machines/defib_success.ogg')) 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!") - SEND_SOUND(carrier, sound('sound/machines/defib_ready')) + SEND_SOUND(carrier, sound('sound/machines/defib_ready.ogg')) #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 28b81c7b9af..c1d9841a367 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.") - SEND_SOUND(src, sound('sound/machines/defib_SafetyOn')) + SEND_SOUND(src, sound('sound/machines/defib_SafetyOn.ogg')) 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]\"") - SEND_SOUND(src, sound('sound/machines/defib_safetyOff')) + SEND_SOUND(src, sound('sound/machines/defib_safetyOff.ogg')) exonet_messages.Add("From [origin_atom]:
[text]") return diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index caa330e20b6..9c88862e9cd 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -393,8 +393,8 @@ D.reagents.touch_turf(get_turf(D)) for(var/atom/T in get_turf(D)) D.reagents.touch(T) - if(ismob(T) && T:client) - T:client << "\The [user] has sprayed you with water!" + if(ismob(T)) + to_chat(T, "\The [user] has sprayed you with water!") sleep(4) qdel(D) diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 91a27d3fb6e..f9e8f12bc05 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -70,7 +70,7 @@ /obj/item/material/knife/suicide_act(mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] - viewers(user) << pick("\The [user] is slitting [TU.his] wrists with \the [src]! It looks like [TU.hes] trying to commit suicide.", \ + viewers(user) pick("\The [user] is slitting [TU.his] wrists with \the [src]! It looks like [TU.hes] trying to commit suicide.", \ "\The [user] is slitting [TU.his] throat with \the [src]! It looks like [TU.hes] trying to commit suicide.", \ "\The [user] is slitting [TU.his] stomach open with \the [src]! It looks like [TU.hes] trying to commit seppuku.") return (BRUTELOSS) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 57c4942df7c..41502239e66 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -71,8 +71,8 @@ suicide_act(mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] - viewers(user) << pick("\The [user] is pressing \the [src] to [TU.his] temple and activating it! It looks like [TU.hes] trying to commit suicide.", - "\The [user] is pressing \the [src] to [TU.his] chest and activating it! It looks like [TU.hes] trying to commit suicide.") + user.visible_message(pick("\The [user] is pressing \the [src] to [TU.his] temple and activating it! It looks like [TU.hes] trying to commit suicide.", + "\The [user] is pressing \the [src] to [TU.his] chest and activating it! It looks like [TU.hes] trying to commit suicide.")) return (BRUTELOSS) /* @@ -96,9 +96,9 @@ suicide_act(mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] - viewers(user) << pick("\The [user] is slitting [TU.his] wrists with the [src.name]! It looks like [TU.hes] trying to commit suicide.", \ + user.visible_message(pick("\The [user] is slitting [TU.his] wrists with the [src.name]! It looks like [TU.hes] trying to commit suicide.", \ "\The [user] is slitting [TU.his] throat with the [src.name]! It looks like [TU.hes] trying to commit suicide.", \ - "\The [user] is slitting [TU.his] stomach open with the [src.name]! It looks like [TU.hes] trying to commit seppuku.") + "\The [user] is slitting [TU.his] stomach open with the [src.name]! It looks like [TU.hes] trying to commit seppuku.")) return (BRUTELOSS) /* diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index 83d88a0653e..618ceccbc90 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -24,8 +24,8 @@ /obj/item/tool/screwdriver/suicide_act(mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] - viewers(user) << pick("\The [user] is stabbing the [src.name] into [TU.his] temple! It looks like [TU.hes] trying to commit suicide.", \ - "\The [user] is stabbing the [src.name] into [TU.his] heart! It looks like [TU.hes] trying to commit suicide.") + user.visible_message(pick("\The [user] is stabbing the [src.name] into [TU.his] temple! It looks like [TU.hes] trying to commit suicide.", \ + "\The [user] is stabbing the [src.name] into [TU.his] heart! It looks like [TU.hes] trying to commit suicide.")) return(BRUTELOSS) /obj/item/tool/screwdriver/New() diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 3b48b800e5a..c70be19f05f 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -36,7 +36,7 @@ /obj/item/beartrap/suicide_act(mob/user) var/datum/gender/T = gender_datums[user.get_visible_gender()] - viewers(user) << "[user] is putting the [src.name] on [T.his] head! It looks like [T.hes] trying to commit suicide." + user.visible_message("[user] is putting the [src.name] on [T.his] head! It looks like [T.hes] trying to commit suicide.") return (BRUTELOSS) /obj/item/beartrap/proc/can_use(mob/user) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index aaa9a56b5de..7f1762e3921 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -72,7 +72,7 @@ update_icon() return else - usr << text("You kick the display case.") + to_chat(usr, text("You kick the display case.")) for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) to_chat(O, "[usr] kicks the display case.") diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index db28d52a138..447fd297fd1 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -73,9 +73,9 @@ return log_and_message_admins("[key_name(src)] commited suicide") - + var/datum/gender/T = gender_datums[get_visible_gender()] - + var/suicidemsg suicidemsg = pick("[src] is attempting to bite [T.his] tongue off! It looks like [T.he] [T.is] trying to commit suicide.", \ "[src] is jamming [T.his] thumbs into [T.his] eye sockets! It looks like [T.he] [T.is] trying to commit suicide.", \ @@ -107,7 +107,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(loc) << "[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live." + visible_message("[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.") spawn(50) death(0) suiciding = 0 @@ -127,7 +127,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(src) << "[src] is powering down. It looks like they're trying to commit suicide." + visible_message("[src] is powering down. It looks like they're trying to commit suicide.") //put em at -175 adjustOxyLoss(max(getMaxHealth() * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -147,7 +147,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(src) << "[src] is powering down. It looks like they're trying to commit suicide." + visible_message("[src] is powering down. It looks like they're trying to commit suicide.") //put em at -175 adjustOxyLoss(max(getMaxHealth() * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index d9f6e18eeb3..e91b422f919 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -61,7 +61,7 @@ msg += "[line]\n" msg += "Total Players: [length(Lines)]" - src << msg + to_chat(src, msg) /client/verb/staffwho() set category = "Admin" @@ -183,4 +183,4 @@ if(config_legacy.show_event_managers) msg += "\n Current Event Managers ([num_event_managers_online]):\n" + eventMmsg - src << msg + to_chat(src, msg) diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 409ce83b4d2..b6802df23fc 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -106,7 +106,7 @@ var/savefile/Banlist Banlist.cd = "/base" if ( Banlist.dir.Find("[ckey][computerid]") ) - usr << text("Ban already exists.") + to_chat(usr, text("Ban already exists.")) return 0 else Banlist.dir.Add("[ckey][computerid]") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 959a53ea32d..03a1298ae41 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -10,7 +10,7 @@ var/global/floorIsLava = 0 for(var/client/C in admins) if((R_ADMIN|R_MOD) & C.holder.rights) - C << msg + to_chat(C, msg) /proc/msg_admin_attack(var/text) //Toggleable Attack Messages var/rendered = "ATTACK: [text]" @@ -18,12 +18,12 @@ var/global/floorIsLava = 0 if((R_ADMIN|R_MOD) & C.holder.rights) if(C.is_preference_enabled(/datum/client_preference/mod/show_attack_logs)) var/msg = rendered - C << msg + to_chat(C, msg) proc/admin_notice(var/message, var/rights) for(var/mob/M in mob_list) if(check_rights(rights, 0, M)) - M << message + to_chat(M, message) ///////////////////////////////////////////////////////////////////////////////////////////////Panels @@ -312,7 +312,8 @@ proc/admin_notice(var/message, var/rights) if(I.author == usr.key || I.author == "Adminbot" || ishost(usr)) dat += "Remove" dat += "

" - if(update_file) info << infos + if(update_file) + info << infos dat += "
" dat += "Add Comment
" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 153b8ab22b0..cc2d1f9a48e 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.

") - SEND_SOUND(T, sound('sound/voice/ManUp1')) + SEND_SOUND(T, sound('sound/voice/ManUp1.ogg')) 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/newbanjob.dm b/code/modules/admin/newbanjob.dm index b5ccf7fd939..7d8897b2cb6 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -141,7 +141,7 @@ var/savefile/Banlistjob Banlistjob.cd = "/base" if ( Banlistjob.dir.Find("[ckey][computerid][rank]") ) - usr << text("Banjob already exists.") + to_chat(usr, text("Banjob already exists.")) return 0 else Banlistjob.dir.Add("[ckey][computerid][rank]") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index c19e2992490..7e817ff9a4c 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)) - SEND_SOUND(X, sound('sound/effects/adminhelp')) + SEND_SOUND(X, sound('sound/effects/adminhelp.ogg')) 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)) - SEND_SOUND(initiator, sound('sound/effects/adminhelp')) + SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg')) 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 2901a1d882a..1b0c0a28c15 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)) - SEND_SOUND(recipient, sound('sound/effects/adminhelp')) + SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) 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 - SEND_SOUND(recipient, sound('sound/effects/adminhelp')) + SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) //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 - SEND_SOUND(C, sound('sound/effects/adminhelp')) + SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) C.ircreplyamount = IRCREPLYCOUNT diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 27553bc91b6..c22fd5bec95 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -582,17 +582,17 @@ switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs", "Clients")) if("Players") - usr << jointext(player_list,",") + to_chat(usr, jointext(player_list,",")) if("Admins") - usr << jointext(admins,",") + to_chat(usr, jointext(admins,",")) if("Mobs") - usr << jointext(mob_list,",") + to_chat(usr, jointext(mob_list,",")) if("Living Mobs") - usr << jointext(living_mob_list,",") + to_chat(usr, jointext(living_mob_list,",")) if("Dead Mobs") - usr << jointext(dead_mob_list,",") + to_chat(usr, jointext(dead_mob_list,",")) if("Clients") - usr << jointext(GLOB.clients,",") + to_chat(usr, jointext(GLOB.clients,",")) /client/proc/cmd_debug_using_map() set category = "Debug" diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index b20cfe509bd..4534d4e5ac5 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -22,8 +22,8 @@ for(var/client/C in admins) if((R_ADMIN|R_MOD) & C.holder.rights) if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers)) - C << msg - SEND_SOUND(C, sound('sound/effects/ding')) + to_chat(C, msg) + SEND_SOUND(C, sound('sound/effects/ding.ogg')) 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! @@ -33,12 +33,12 @@ msg = "[uppertext(GLOB.using_map.boss_short)]M[iamessage ? " IA" : ""]:[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 - SEND_SOUND(C, sound('sound/machines/signal')) + to_chat(C, msg) + SEND_SOUND(C, sound('sound/machines/signal.ogg')) /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 - SEND_SOUND(C, sound('sound/machines/signal')) + to_chat(C, msg) + SEND_SOUND(C, sound('sound/machines/signal.ogg')) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 07ffc38fe4f..545579aecd2 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -545,7 +545,7 @@ Traitors and the like can also be revived with the previous role mostly intact. else M.add_ion_law(input) for(var/mob/living/silicon/ai/O in mob_list) - O << input + "... LAWS UPDATED!" + to_chat(O, input + "... LAWS UPDATED!") O.show_laws() log_admin("Admin [key_name(usr)] has added a new AI law - [input]") @@ -905,9 +905,9 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Special Verbs" set name = "Attack Log" - usr << text("Attack Log for []", mob) + to_chat(usr, text("Attack Log for []", mob)) for(var/t in M.attack_log) - usr << t + to_chat(usr, t) feedback_add_details("admin_verb","ATTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/atmospherics/zas/Zone.dm b/code/modules/atmospherics/zas/Zone.dm index 8b53082226f..b01649759c2 100644 --- a/code/modules/atmospherics/zas/Zone.dm +++ b/code/modules/atmospherics/zas/Zone.dm @@ -166,7 +166,7 @@ Class Procs: E.recheck() /zone/proc/dbg_data(mob/M) - M << name + to_chat(M, name) for(var/g in air.gas) to_chat(M, "[GLOB.meta_gas_names[g]]: [air.gas[g]]") to_chat(M, "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]�K ([air.temperature - T0C]�C)") diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 26a967866fc..c4d3a8b22e0 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) - SEND_SOUND(M, sound('sound/effects/phasein')) + SEND_SOUND(M, sound('sound/effects/phasein.ogg')) 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) - SEND_SOUND(M, sound('sound/effects/phasein')) + SEND_SOUND(M, sound('sound/effects/phasein.ogg')) 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 6aff8beaa09..eb9ea76beff 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)) - SEND_SOUND(M, sound('sound/effects/explosionfar')) + SEND_SOUND(M, sound('sound/effects/explosionfar.ogg')) exploding = FALSE diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 4bc9ccf2390..bd626f58c15 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -675,7 +675,7 @@ recent_squish = 0 for(var/mob/living/M in contents) var/emote = pick(inside_emotes) - M << emote //VOREStation edit end + to_chat(M, emote) //VOREStation edit end return /obj/item/clothing/shoes/update_clothing_icon() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 87d1e6d3012..f8fcd9197d9 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -479,7 +479,7 @@ BLIND // can't see anything enables_planes = null to_chat(usr, "You switch \the [src] to flash protection mode.") update_icon() - user << activation_sound + SEND_SOUND(user, activation_sound) user.recalculate_vis() user.update_inv_glasses() user.update_action_buttons() diff --git a/code/modules/detectivework/microscope/microscope.dm b/code/modules/detectivework/microscope/microscope.dm index 42c13535324..fb7e045a512 100644 --- a/code/modules/detectivework/microscope/microscope.dm +++ b/code/modules/detectivework/microscope/microscope.dm @@ -82,7 +82,7 @@ if(report) report.update_icon() if(report.info) - user << report.info + to_chat(user, report.info) return /obj/machinery/microscope/proc/remove_sample(var/mob/living/remover) diff --git a/code/modules/events/gravity.dm b/code/modules/events/gravity.dm index 741aaea92a7..734b2056b72 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)) - SEND_SOUND(A, sound('sound/effects/creak1')) + SEND_SOUND(A, sound('sound/effects/creak1.ogg')) else if (prob(33)) - SEND_SOUND(A, sound('sound/effects/creak2')) + SEND_SOUND(A, sound('sound/effects/creak2.ogg')) else - SEND_SOUND(A, sound('sound/effects/creak3')) + SEND_SOUND(A, sound('sound/effects/creak3.ogg')) /datum/event/gravity/end() diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm index 1b8712dd40c..56c527ad855 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) - SEND_SOUND(L, sound('sound/effects/explosionfar')) + SEND_SOUND(L, sound('sound/effects/explosionfar.ogg')) qdel(src) /obj/structure/meteorite diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 449f5cae87d..0b129fc7707 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) SEND_SOUND(src, sound('sound/machines/airlock')) + if(1) SEND_SOUND(src, sound('sound/machines/airlock.ogg')) if(2) - 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(prob(50))SEND_SOUND(src, sound('sound/effects/Explosion1.ogg')) + else SEND_SOUND(src, sound('sound/effects/Explosion2.ogg')) + if(3) SEND_SOUND(src, sound('sound/effects/explosionfar.ogg')) + if(4) SEND_SOUND(src, sound('sound/effects/Glassbr1.ogg')) + if(5) SEND_SOUND(src, sound('sound/effects/Glassbr2.ogg')) + if(6) SEND_SOUND(src, sound('sound/effects/Glassbr3.ogg')) + if(7) SEND_SOUND(src, sound('sound/machines/twobeep.ogg')) + if(8) SEND_SOUND(src, sound('sound/machines/windowdoor.ogg')) if(9) //To make it more realistic, I added two gunshots (enough to kill) - SEND_SOUND(src, sound('sound/weapons/Gunshot1')) + SEND_SOUND(src, sound('sound/weapons/Gunshot1.ogg')) spawn(rand(10,30)) - SEND_SOUND(src, sound('sound/weapons/Gunshot2')) - if(10) SEND_SOUND(src, sound('sound/weapons/smash')) + SEND_SOUND(src, sound('sound/weapons/Gunshot2.ogg')) + if(10) SEND_SOUND(src, sound('sound/weapons/smash.ogg')) if(11) //Same as above, but with tasers. - SEND_SOUND(src, sound('sound/weapons/Taser')) + SEND_SOUND(src, sound('sound/weapons/Taser.ogg')) spawn(rand(10,30)) - SEND_SOUND(src, sound('sound/weapons/Taser')) + SEND_SOUND(src, sound('sound/weapons/Taser.ogg')) //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source @@ -141,7 +141,7 @@ mob/living/carbon/proc/handle_hallucinations() 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') - src << pick(creepyasssounds) + SEND_SOUND(src, pick(creepyasssounds)) if(66 to 70) //Flashes of danger //to_chat(src, "Danger Flash") @@ -282,8 +282,7 @@ proc/check_panel(mob/M) else if(src.dir == WEST) qdel(src.currentimage) src.currentimage = new /image(left,src) - my_target << currentimage - + SEND_IMAGE(my_target, currentimage) /obj/effect/fake_attacker/proc/attack_loop() while(1) @@ -324,7 +323,7 @@ proc/check_panel(mob/M) var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc) O.name = "blood" var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1) - target << I + SEND_IMAGE(target, I) spawn(300) qdel(O) return @@ -385,27 +384,4 @@ GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/gun/projectile, /obj/ite F.up = image(clone,dir = NORTH) F.down = image(clone,dir = SOUTH) -// F.base = new /icon(clone.stand_icon) -// F.currentimage = new /image(clone) - -/* - - - - F.left = new /icon(clone.stand_icon,dir=WEST) - for(var/icon/i in clone.overlays) - F.left.Blend(i) - F.up = new /icon(clone.stand_icon,dir=NORTH) - for(var/icon/i in clone.overlays) - F.up.Blend(i) - F.down = new /icon(clone.stand_icon,dir=SOUTH) - for(var/icon/i in clone.overlays) - F.down.Blend(i) - F.right = new /icon(clone.stand_icon,dir=EAST) - for(var/icon/i in clone.overlays) - F.right.Blend(i) - - target << F.up - */ - F.updateimage() diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 90a6a572e26..7ce2d146100 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -3822,7 +3822,7 @@ END CITADEL CHANGE */ return 0 if (C.volume < req) - user << span("warning", "There's not enough [C.name] to coat the [src]!") + to_chat(user, span("warning", "There's not enough [C.name] to coat the [src]!")) return 0 var/id = C.id diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index cdd03993bd9..bc9cbae9f45 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -84,9 +84,9 @@ for (var/a in cooking_objs) var/datum/cooking_item/CI = a string += "-\a [CI.container.label(null, CI.combine_target)], [report_progress(CI)]
" - usr << string + to_chat(user, string) else - usr << span("notice","It is empty.") + to_chat(user, "It is empty.") /obj/machinery/appliance/proc/report_progress(var/datum/cooking_item/CI) if (!CI || !CI.max_cookwork) diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/kitchen/cooking_machines/_mixer.dm index 01253beff30..3f58e34e7bd 100644 --- a/code/modules/food/kitchen/cooking_machines/_mixer.dm +++ b/code/modules/food/kitchen/cooking_machines/_mixer.dm @@ -73,7 +73,7 @@ fundamental differences if (stat) return 1 else - user << span("warning", "You can't remove ingredients while it's turned on! Turn it off first or wait for it to finish.") + to_chat(user, span("warning", "You can't remove ingredients while it's turned on! Turn it off first or wait for it to finish.")) //Container is not removable /obj/machinery/appliance/mixer/removal_menu(var/mob/user) diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index e7ef403cd37..107404c0b68 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -36,13 +36,13 @@ for (var/possible_type in insertable) if (istype(I, possible_type)) if (!can_fit(I)) - user << span("warning","There's no more space in the [src] for that!") + to_chat(user, span("warning","There's no more space in the [src] for that!")) return 0 if(!user.unEquip(I)) return I.forceMove(src) - user << span("notice", "You put the [I] into the [src]") + to_chat(user, span("notice", "You put the [I] into the [src]")) return /obj/item/reagent_containers/cooking_container/verb/empty() diff --git a/code/modules/gamemaster/actions/ion_storm.dm b/code/modules/gamemaster/actions/ion_storm.dm index 7650fa99f2a..fb180a4df61 100644 --- a/code/modules/gamemaster/actions/ion_storm.dm +++ b/code/modules/gamemaster/actions/ion_storm.dm @@ -17,7 +17,7 @@ for (var/mob/living/silicon/ai/target in silicon_mob_list) var/law = target.generate_ion_law() to_chat(target, "You have detected a change in your laws information:") - target << law + to_chat(target, law) target.add_ion_law(law) target.show_laws() diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index a908cb5002c..59d5adfd859 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -257,7 +257,7 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u //VOREStation Add /obj/structure/bed/holobed/attackby(obj/item/W as obj, mob/user as mob) if(W.is_wrench()) - user << ("It's a holochair, you can't dismantle it!") + to_chat(user, "It's a holochair, you can't dismantle it!") return //VOREStation Add End /obj/item/holo diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 320e0092866..32b33d51b9a 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -416,7 +416,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f var/sqlcategory = sanitizeSQL(upload_category) var/DBQuery/query = dbcon_old.NewQuery("INSERT INTO library (author, title, content, category) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]')") if(!query.Execute()) - usr << query.ErrorMsg() + to_chat(usr, query.ErrorMsg()) else log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs") alert("Upload Complete.") diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index ba216364ed4..19098b8e2b1 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -302,4 +302,4 @@ else heard = "...You almost hear someone talking..." - src << heard + to_chat(src, heard) diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index 87746131016..e2b38c2b890 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -137,7 +137,7 @@ /mob/proc/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message) if((language in languages) && language.check_special_condition(src)) var/msg = "[language.name], [speaker_name] [message]" - src << msg + to_chat(src, msg) /mob/new_player/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message) return 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 e61206c2737..3452ca66441 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) SEND_SOUND(src, sound('sound/machines/airlock')) + if(1) SEND_SOUND(src, sound('sound/machines/airlock.ogg')) if(2) - 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(prob(50))SEND_SOUND(src, sound('sound/effects/Explosion1.ogg')) + else SEND_SOUND(src, sound('sound/effects/Explosion2.ogg')) + if(3) SEND_SOUND(src, sound('sound/effects/explosionfar.ogg')) + if(4) SEND_SOUND(src, sound('sound/effects/Glassbr1.ogg')) + if(5) SEND_SOUND(src, sound('sound/effects/Glassbr2.ogg')) + if(6) SEND_SOUND(src, sound('sound/effects/Glassbr3.ogg')) + if(7) SEND_SOUND(src, sound('sound/machines/twobeep.ogg')) + if(8) SEND_SOUND(src, sound('sound/machines/windowdoor.ogg')) if(9) //To make it more realistic, I added two gunshots (enough to kill) - SEND_SOUND(src, sound('sound/weapons/Gunshot1')) + SEND_SOUND(src, sound('sound/weapons/Gunshot1.ogg')) spawn(rand(10,30)) - SEND_SOUND(src, sound('sound/weapons/Gunshot2')) - if(10) SEND_SOUND(src, sound('sound/weapons/smash')) + SEND_SOUND(src, sound('sound/weapons/Gunshot2.ogg')) + if(10) SEND_SOUND(src, sound('sound/weapons/smash.ogg')) if(11) //Same as above, but with tasers. - SEND_SOUND(src, sound('sound/weapons/Taser')) + SEND_SOUND(src, sound('sound/weapons/Taser.ogg')) spawn(rand(10,30)) - SEND_SOUND(src, sound('sound/weapons/Taser')) + SEND_SOUND(src, sound('sound/weapons/Taser.ogg')) //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 98b121b07e0..12f1fec9202 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1159,7 +1159,6 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() #undef MUTATIONS_LAYER #undef SKIN_LAYER #undef DAMAGE_LAYER -#undef DAMAGE_LAYER #undef SURGERY_LAYER #undef UNDERWEAR_LAYER #undef SHOES_LAYER_ALT diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 9906a41a002..8d5c16c2e63 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -384,14 +384,14 @@ proc/get_radio_key_from_channel(var/channel) if(M.client) var/image/I1 = listening[M] || speech_bubble images_to_clients[I1] |= M.client - M << I1 + SEND_IMAGE(M, I1) M.hear_say(message, verb, speaking, alt_name, italics, src, speech_sound, sound_vol) if(whispering) //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 images_to_clients[I2] |= M.client - M << I2 + SEND_IMAGE(M, I2) M.hear_say(stars(message), verb, speaking, alt_name, italics, src, speech_sound, sound_vol*0.2) if(dst > w_scramble_range && dst <= world.view) //Inside whisper 'visible' range M.show_message("[src.name] [w_not_heard].", 2) diff --git a/code/modules/mob/living/simple_animal/animals/mouse.dm b/code/modules/mob/living/simple_animal/animals/mouse.dm index 75dfe921708..31c0abace76 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()) - SEND_SOUND(M, sound('sound/effects/mouse_squeak')) + SEND_SOUND(M, sound('sound/effects/mouse_squeak.ogg')) 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!") - SEND_SOUND(M, sound('sound/effects/mouse_squeak')) + SEND_SOUND(M, sound('sound/effects/mouse_squeak.ogg')) ..() /mob/living/simple_mob/mouse/death() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c2d8c9ae0be..e6d62b9e565 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -622,7 +622,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) /mob/proc/see(message) if(!is_active()) return 0 - src << message + to_chat(src, message) return 1 /mob/proc/show_viewers(message) diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm index bf08b0b422e..dafb13daf1e 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) - SEND_SOUND(M, sound('sound/effects/phasein')) + SEND_SOUND(M, sound('sound/effects/phasein.ogg')) playsound(src, 'sound/effects/phasein.ogg', 100, 1) M.forceMove(dest.loc) return diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index d8b097fd0ef..9a1f0a72d97 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -37,7 +37,7 @@ * * @return nothing */ -/datum/proc/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/nano_ui/master_ui = null, var/datum/topic_state/state = default_state) +/datum/proc/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/nanoui/master_ui = null, var/datum/topic_state/state = default_state) return // Used by the Nano UI Manager (/datum/nanomanager) to track UIs opened by this mob diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index adacf397220..8bca796cb8d 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 - SEND_SOUND(C, sound('sound/machines/printer')) + SEND_SOUND(C, sound('sound/machines/printer.ogg')) // 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 11da2e2ee48..5642455476e 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)) - SEND_SOUND(M, sound('sound/ambience/engine_alert2')) + SEND_SOUND(M, sound('sound/ambience/engine_alert2.ogg')) 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 0fa7d476aab..e03569ebd55 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.") - SEND_SOUND(H, sound('sound/weapons/flash')) + SEND_SOUND(H, sound('sound/weapons/flash.ogg')) /datum/disease2/effect/vomiting name = "Vomiting" diff --git a/maps/tether/submaps/alienship/_alienship.dm b/maps/tether/submaps/alienship/_alienship.dm index 42a01961460..f83865815d6 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))) - SEND_SOUND(L, sound('sound/effects/bamf')) + SEND_SOUND(L, sound('sound/effects/bamf.ogg')) 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