From 25289b8bc6391bd0448797e6f4fd07c9c0c0caba Mon Sep 17 00:00:00 2001 From: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Thu, 24 Oct 2024 07:52:55 -0600 Subject: [PATCH] fixes a fuck load of sounds --- code/__HELPERS/priority_announce.dm | 4 +- code/controllers/subsystem/shuttle.dm | 4 +- .../game/machinery/computer/communications.dm | 2 +- code/game/objects/items/melee/energy.dm | 4 +- code/game/objects/items/tools/weldingtool.dm | 3 - code/modules/admin/verbs/adminevents.dm | 4 +- .../admin/view_variables/admin_delete.dm | 2 +- code/modules/buildmode/submodes/advanced.dm | 2 +- code/modules/buildmode/submodes/basic.dm | 2 +- code/modules/buildmode/submodes/delete.dm | 2 +- code/modules/mod/mod_control.dm | 2 +- .../supermatter_delamination/_sm_delam.dm | 2 +- .../delamination_effects.dm | 2 +- .../code/datums/votes/_vote_datum.dm | 2 +- .../clothing/back/antigravityharness.dm | 4 +- .../head/monkey_magnification_helmet.dm | 6 +- .../modules/mining/equipment/explorer_gear.dm | 2 +- .../mining/equipment/kinetic_gauntlets.dm | 16 ++--- .../simple_animal/hostile/grabbagmob.dm | 2 +- .../airlock_override/code/airlock_override.dm | 2 +- .../modules/alerts/code/default_announcer.dm | 4 +- .../ammo_workbench/code/ammo_workbench.dm | 2 +- .../armaments/code/armament_component.dm | 2 +- .../assault_operatives/code/interrogator.dm | 12 ++-- .../modules/barricades/code/barricade.dm | 14 ++-- .../modules/black_mesa/code/turrets.dm | 2 +- .../bluespace_miner/code/bluespace_miner.dm | 2 +- .../modules/borgs/code/robot_items.dm | 16 ++--- .../modules/borgs/code/robot_upgrade.dm | 4 +- .../modules/cargo/code/export_gate.dm | 2 +- .../modules/cargo/code/items/gbp_punchcard.dm | 4 +- .../code/colony_fabricator.dm | 2 +- .../code/machines/ore_silo.dm | 2 +- .../code/repacking_element.dm | 2 +- .../colony_fabricator/code/tools/tools.dm | 2 +- .../game/objects/items/devices/ttsdevice.dm | 4 +- .../game/objects/items/plushes.dm | 24 +++---- .../clothing/~donator/donator_clothing.dm | 2 +- .../MOD_sprite_accessories/mod_actions.dm | 2 +- .../delam_emergency_stop/code/scram.dm | 2 +- .../electric_welder/code/electric_welder.dm | 2 +- modular_skyrat/modules/emotes/code/emotes.dm | 2 +- .../modules/emotes/code/laugh_datums.dm | 14 ++-- .../modules/emotes/code/scream_datums.dm | 70 +++++++++---------- .../modules/emotes/code/scream_emote.dm | 4 +- .../modules/emotes/code/synth_emotes.dm | 2 +- .../hostile/megafauna/markedone.dm | 2 +- .../modules/goofsec/code/sol_fed.dm | 2 +- .../modules/implants/code/augments_arms.dm | 4 +- .../modules/jukebox/code/dance_machine.dm | 2 +- .../modules/jukebox/code/ravemod.dm | 2 +- .../modules/mapping/code/areas/ruins.dm | 6 +- .../wounds/synth/blunt/secures_internals.dm | 2 +- .../code/wounds/synth/robotic_burns.dm | 2 +- .../microfusion/code/microfusion_cell.dm | 2 +- .../code/microfusion_energy_master.dm | 4 +- .../modules/modular_implants/code/nifs.dm | 2 +- .../code/soulcatcher/handheld_soulcatcher.dm | 4 +- .../modular_items/code/summon_beacon.dm | 2 +- .../saibasan/laser_guns.dm | 4 +- .../modules/mold/code/mold_controller.dm | 2 +- modular_skyrat/modules/mold/code/mold_mobs.dm | 4 +- .../modules/mold/code/mold_structures.dm | 4 +- .../code/mounted_machine_gun.dm | 4 +- .../novaya_ert/code/advanced_choice_beacon.dm | 4 +- .../sec_haul/code/misc/bullet_drive.dm | 2 +- .../code/self_actualization_device.dm | 4 +- .../synths/code/surgery/mechanic_steps.dm | 8 +-- .../code/surgery/robot_heart_surgery.dm | 4 +- .../code/surgery/robot_liver_surgery.dm | 4 +- .../synths/code/surgery/robot_lung_surgery.dm | 4 +- .../code/surgery/robot_stomach_surgery.dm | 4 +- .../modules/taur_mechanics/code/constrict.dm | 2 +- modular_skyrat/modules/verbs/code/subtle.dm | 4 +- .../subsystem/processing/sol_subsystem.dm | 2 +- modular_zubbers/code/game/Items/sec_hailer.dm | 2 +- .../code/game/area/areas/moonstation.dm | 2 +- .../code/game/machinery/crew_monitor.dm | 2 +- .../code/game/objects/items/plushes.dm | 4 +- .../game/objects/structures/trash_pile.dm | 2 +- .../antagonists/bloodsucker/clans/clan.dm | 2 +- .../bloodsucker/clans/clan_malkavian.dm | 2 +- .../bloodsucker/structures/crypt.dm | 2 +- .../modules/antagonists/malf/remove_malf.dm | 8 +-- .../arcades/code/minesweeper/minesweeper.dm | 2 +- .../code/modules/blooper/bark_list.dm | 6 +- modular_zubbers/code/modules/emotes/emotes.dm | 4 +- .../code/modules/lunchbox/code/lunchbox.dm | 6 +- .../programs/siliconmanagement.dm | 2 +- .../code/modules/silicons/silicon.dm | 4 +- .../code/modules/vehicles/mech_fabricator.dm | 2 +- .../entombed_quirk/code/entombed_mod.dm | 4 +- 92 files changed, 209 insertions(+), 212 deletions(-) diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 6efabd544b2..7375509a363 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -142,7 +142,7 @@ else finalized_announcement = CHAT_ALERT_DEFAULT_SPAN(jointext(minor_announcement_strings, "")) - var/custom_sound = sound_override || (alert ? 'modular_skyrat/modules/alerts/sound/alerts/alert1.ogg' : 'sound/announcer/notice/notice2.ogg') // SKYRAT EDIT CHANGE - CUSTOM ANNOUNCEMENTS - Original: 'sound/misc/notice1.ogg' + var/custom_sound = sound_override || (alert ? 'modular_skyrat/modules/alerts/sound/alerts/alert1.ogg' : 'sound/announcer/notice/notice2.ogg') // SKYRAT EDIT CHANGE - CUSTOM ANNOUNCEMENTS - Original: 'sound/announcer/notice/notice1.ogg' dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound) /// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message. @@ -211,7 +211,7 @@ if(!isnull(sound_override)) sound_override = sound(sound_override) - var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/misc/notice2.ogg' + var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/announcer/notice/notice2.ogg' alert_sound_to_playing(sound_to_play, players = players) for(var/mob/target in players) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 19248f83c0c..f2bb23ed671 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -286,7 +286,7 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text = "Emergency shuttle uplink interference detected, shuttle call disabled while the system reinitializes. Estimated restore in [DisplayTimeText(lockout_timer, round_seconds_to = 60)].", title = "Uplink Interference", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -300,7 +300,7 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text= "Emergency shuttle uplink services are now back online.", title = "Uplink Restored", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 0ea20d3bf03..2e50520f61b 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -491,7 +491,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) GLOB.pizza_order = pick(GLOB.pizza_names) call_911(EMERGENCY_RESPONSE_EMAG) to_chat(usr, span_notice("Thank you for choosing Dogginos, [GLOB.pizza_order]!")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE) if("toggleEngOverride") if(emergency_access_cooldown(usr)) //if were in cooldown, dont allow the following code return diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index ed791e5ca2e..eec42f8b60d 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -33,10 +33,10 @@ // SKYRAT EDIT ADD START /// The sound played when the item is turned on - var/enable_sound = 'sound/weapons/saberon.ogg' + var/enable_sound = 'sound/items/weapons/saberon.ogg' /// The sound played when the item is turned off - var/disable_sound = 'sound/weapons/saberoff.ogg' + var/disable_sound = 'sound/items/weapons/saberoff.ogg' // SKYRAT EDIT ADD END diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 017a79e5d0f..01342aeb05b 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -409,6 +409,3 @@ if(get_fuel() < max_fuel && nextrefueltick < world.time) nextrefueltick = world.time + 10 reagents.add_reagent(/datum/reagent/fuel, 1) - - -#undef WELDER_FUEL_BURN_INTERVAL diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index 98b177cad64..7ecadd4891c 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -168,7 +168,7 @@ ADMIN_VERB(disable_shuttle, R_ADMIN, "Disable Shuttle", "Those fuckers aren't ge priority_announce( text = "Emergency Shuttle uplink failure, shuttle disabled until further notice.", title = "Uplink Failure", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -194,7 +194,7 @@ ADMIN_VERB(enable_shuttle, R_ADMIN, "Enable Shuttle", "Those fuckers ARE getting priority_announce( text = "Emergency Shuttle uplink reestablished, shuttle enabled.", title = "Uplink Restored", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) diff --git a/code/modules/admin/view_variables/admin_delete.dm b/code/modules/admin/view_variables/admin_delete.dm index fe6e3380787..a2bd8d0b8ed 100644 --- a/code/modules/admin/view_variables/admin_delete.dm +++ b/code/modules/admin/view_variables/admin_delete.dm @@ -27,7 +27,7 @@ vv_update_display(D, "deleted", "") // Skyrat edit addition start -- optional bluespace sparks on delete if(T && prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/buildmode/submodes/advanced.dm b/code/modules/buildmode/submodes/advanced.dm index 2167a85a57c..2b5db1552da 100644 --- a/code/modules/buildmode/submodes/advanced.dm +++ b/code/modules/buildmode/submodes/advanced.dm @@ -62,7 +62,7 @@ var/turf/T = get_turf(object) qdel(object) if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/buildmode/submodes/basic.dm b/code/modules/buildmode/submodes/basic.dm index a37c6becfa1..4aacc5a6dba 100644 --- a/code/modules/buildmode/submodes/basic.dm +++ b/code/modules/buildmode/submodes/basic.dm @@ -41,7 +41,7 @@ var/turf/T = get_turf(object) qdel(object) if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/buildmode/submodes/delete.dm b/code/modules/buildmode/submodes/delete.dm index 79daeaa2c9d..cab05b45ae2 100644 --- a/code/modules/buildmode/submodes/delete.dm +++ b/code/modules/buildmode/submodes/delete.dm @@ -19,7 +19,7 @@ var/turf/T = get_turf(object) qdel(object) if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index e19c605a31e..162f5fc63b5 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -239,7 +239,7 @@ if(active) if(!wearer.incapacitated) balloon_alert(wearer, "deactivate first!") - playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) return // SKYRAT EDIT ADDITION END diff --git a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm index de45b46b33c..aaed210b1bd 100644 --- a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm +++ b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(sm_delam_list, list( if(SUPERMATTER_EMERGENCY) // SKYRAT EDIT ADDITION alert_sound_to_playing('modular_skyrat/master_files/sound/effects/reactor/core_overheating.ogg', override_volume = TRUE) - alert_sound_to_playing('sound/misc/notice1.ogg', override_volume = TRUE) + alert_sound_to_playing('sound/announcer/notice/notice1.ogg', override_volume = TRUE) // SKYRAT EDIT END if(SUPERMATTER_DANGER) playsound(sm, 'sound/machines/engine_alert/engine_alert2.ogg', 100, FALSE, 30, 30, falloff_distance = 10) diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm index 038a9153a0c..1d7cec3dd09 100644 --- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm +++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm @@ -140,7 +140,7 @@ priority_announce( text = "Fatal error occurred in emergency shuttle uplink during transit. Unable to reestablish connection.", title = "Shuttle Failure", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) diff --git a/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm b/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm index 7c0b057ce2a..9f31c7a3a1c 100644 --- a/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm +++ b/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm @@ -5,4 +5,4 @@ */ /datum/vote /// The sound effect played to everyone when this vote is initiated. - vote_sound = 'sound/misc/announce_dig.ogg' + vote_sound = 'sound/announcer/announcement/announce_dig.ogg' diff --git a/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm b/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm index 0cff51c5959..ec0e8ca0b55 100644 --- a/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm +++ b/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm @@ -259,12 +259,12 @@ if(!cell_cover_open) balloon_alert(user, "open the cell cover first!") - playsound(src, 'sound/machines/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return ITEM_INTERACT_BLOCKING if(current_cell) balloon_alert(user, "cell already installed!") - playsound(src, 'sound/machines/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return ITEM_INTERACT_BLOCKING /// Shadow realm? I'm sending you to Lake City, FL! diff --git a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm index c6eca255b1e..7ab31b43d1f 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm @@ -43,7 +43,7 @@ var/mob/living/something = user to_chat(something, span_boldnotice("You feel a stabbing pain in the back of your head for a moment.")) something.apply_damage(5, BRUTE, BODY_ZONE_HEAD, FALSE, FALSE, FALSE) // notably: no damage resist (it's in your helmet), no damage spread (it's in your helmet) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) return if(!(GLOB.ghost_role_flags & GHOSTROLE_STATION_SENTIENCE)) say("ERROR: Central Command has temporarily outlawed monkey sentience helmets in this sector. NEAREST LAWFUL SECTOR: 2.537 million light years away.") @@ -64,7 +64,7 @@ UnregisterSignal(magnification, COMSIG_SPECIES_LOSS) magnification = null visible_message(span_notice("[src] falls silent and drops on the floor. Maybe you should try again later?")) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) user.dropItemToGround(src) return @@ -88,7 +88,7 @@ return // either used up correctly or taken off before polling finished (punish this by having a chance to gib the monkey?) UnregisterSignal(magnification, COMSIG_SPECIES_LOSS) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) ADD_TRAIT(magnification, TRAIT_PRIMITIVE, SPECIES_TRAIT) // We removed it, now that they're back to being dumb, add the trait again. if(!polling)// put on a viable head, but taken off after polling finished. if(magnification.client) diff --git a/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm b/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm index bb167106187..f28eb8c9c9d 100644 --- a/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm +++ b/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm @@ -76,7 +76,7 @@ return success /obj/item/clothing/suit/hifl_suit/proc/make_sound() - playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /datum/movespeed_modifier/hifl_equip multiplicative_slowdown = 1.5 diff --git a/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm b/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm index 6f37a700689..d92c6f55309 100644 --- a/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm +++ b/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm @@ -114,14 +114,14 @@ can_deploy = FALSE if(!can_deploy) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You need both free hands to deploy [src]!")) return // equipping/unequipping shall take time wearer.add_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) if(!do_after(wearer, 1.5 SECONDS, src, IGNORE_USER_LOC_CHANGE, interaction_key = type)) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You fail to deploy [src]!")) wearer.remove_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) return @@ -134,7 +134,7 @@ can_deploy = FALSE if(!can_deploy) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You need both free hands to deploy [src]!")) return @@ -146,8 +146,8 @@ ADD_TRAIT(src, TRAIT_NODROP, type) - playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - playsound(src, 'sound/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(wearer, span_notice("You deploy [src].")) /obj/item/clothing/gloves/kinetic_gauntlets/proc/retract_gauntlets() @@ -165,7 +165,7 @@ wearer.add_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) if(!do_after(wearer, 1.5 SECONDS, src, IGNORE_USER_LOC_CHANGE)) wearer.remove_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You fail to retract [src]!")) return @@ -175,8 +175,8 @@ right_gauntlet?.forceMove(src) REMOVE_TRAIT(src, TRAIT_NODROP, type) - playsound(src, 'sound/mecha/powerloader_turn2.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - playsound(src, 'sound/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/powerloader_turn2.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(wearer, span_notice("You retract [src].")) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm index bf5c5777ddd..afa9c22f231 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm @@ -386,7 +386,7 @@ melee_damage_upper = 15 attack_verb_continuous = "welds" attack_verb_simple = "weld" - attack_sound = 'sound/items/welder.ogg' + attack_sound = 'sound/items/tools/welder.ogg' /mob/living/simple_animal/hostile/evilborg/sec name = "Malfunctioning Security Cyborg" diff --git a/modular_skyrat/modules/airlock_override/code/airlock_override.dm b/modular_skyrat/modules/airlock_override/code/airlock_override.dm index 0d05ae18082..1b86592db60 100644 --- a/modular_skyrat/modules/airlock_override/code/airlock_override.dm +++ b/modular_skyrat/modules/airlock_override/code/airlock_override.dm @@ -145,7 +145,7 @@ GLOBAL_VAR_INIT(force_eng_override, FALSE) /proc/toggle_eng_override() if(!GLOB.force_eng_override) GLOB.force_eng_override = TRUE - minor_announce("Engineering staff will have expanded access to areas of the station during the emergency.", "Engineering Emergency", sound_override = 'sound/misc/notice1.ogg') + minor_announce("Engineering staff will have expanded access to areas of the station during the emergency.", "Engineering Emergency", sound_override = 'sound/announcer/notice/notice1.ogg') SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FORCE_ENG_OVERRIDE, TRUE) SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("engineer override access", "enabled")) else diff --git a/modular_skyrat/modules/alerts/code/default_announcer.dm b/modular_skyrat/modules/alerts/code/default_announcer.dm index 86add70db58..01b7e50ac02 100644 --- a/modular_skyrat/modules/alerts/code/default_announcer.dm +++ b/modular_skyrat/modules/alerts/code/default_announcer.dm @@ -1,9 +1,9 @@ /datum/centcom_announcer/default - welcome_sounds = list('sound/ai/default/welcome.ogg') + welcome_sounds = list('sound/announcer/default/welcome.ogg') alert_sounds = list('modular_skyrat/modules/alerts/sound/alerts/alert2.ogg') command_report_sounds = list('modular_skyrat/modules/alerts/sound/alerts/commandreport.ogg') event_sounds = list( - ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg', + ANNOUNCER_AIMALF = 'sound/announcer/default/aimalf.ogg', ANNOUNCER_ALIENS = 'modular_skyrat/modules/alerts/sound/alerts/lifesigns.ogg', ANNOUNCER_ANIMES = 'modular_skyrat/modules/alerts/sound/alerts/animes.ogg', ANNOUNCER_INTERCEPT = 'modular_skyrat/modules/alerts/sound/alerts/alert2.ogg', diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm index 04a855ee5d6..23ccf2ce005 100644 --- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm +++ b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm @@ -394,7 +394,7 @@ if(successfully) playsound(loc, 'sound/machines/ping.ogg', 40, TRUE) else - playsound(loc, 'sound/machines/buzz-sigh.ogg', 40, TRUE) + playsound(loc, 'sound/machines/buzz/buzz-sigh.ogg', 40, TRUE) update_appearance() busy = FALSE if(timer_id) diff --git a/modular_skyrat/modules/armaments/code/armament_component.dm b/modular_skyrat/modules/armaments/code/armament_component.dm index 2c1ff2b915c..a089db93b91 100644 --- a/modular_skyrat/modules/armaments/code/armament_component.dm +++ b/modular_skyrat/modules/armaments/code/armament_component.dm @@ -177,7 +177,7 @@ user.put_in_hands(inserted_card) inserted_card = null to_chat(user, span_notice("Card ejected!")) - playsound(src, 'sound/machines/terminal_insert_disc.ogg', 70) + playsound(src, 'sound/machines/terminal/terminal_insert_disc.ogg', 70) /datum/component/armament/proc/select_armament(mob/user, datum/armament_entry/armament_entry) if(!inserted_card) diff --git a/modular_skyrat/modules/assault_operatives/code/interrogator.dm b/modular_skyrat/modules/assault_operatives/code/interrogator.dm index 6c61caaf498..e8d5cf0b43c 100644 --- a/modular_skyrat/modules/assault_operatives/code/interrogator.dm +++ b/modular_skyrat/modules/assault_operatives/code/interrogator.dm @@ -83,7 +83,7 @@ processing = FALSE locked = FALSE human_occupant = null - playsound(src, 'sound/machines/buzz-two.ogg', 100) + playsound(src, 'sound/machines/buzz/buzz-two.ogg', 100) balloon_alert_to_viewers("process aborted!") if(timer_id) deltimer(timer_id) @@ -120,7 +120,7 @@ return if(!SSgoldeneye.check_goldeneye_target(human_occupant.mind)) // Preventing abuse by method of duplication. balloon_alert_to_viewers("no GoldenEye data!") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return start_extract() @@ -136,7 +136,7 @@ /obj/machinery/interrogator/proc/stage_one() if(!check_requirements()) say("Critical error! Aborting.") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return to_chat(human_occupant, span_danger("As [src] whirrs to life you feel some cold metal restraints deploy around you, you can't move!")) playsound(loc, 'sound/items/rped.ogg', 60) @@ -147,20 +147,20 @@ /obj/machinery/interrogator/proc/stage_two() if(!check_requirements()) say("Critical error! Aborting.") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return to_chat(human_occupant, span_userdanger("You feel a sharp pain as a drill penetrates your skull, it's unbearable!")) human_occupant.emote("scream") human_occupant.apply_damage(30, BRUTE, BODY_ZONE_HEAD) playsound(src, 'sound/effects/wounds/blood1.ogg', 100) - playsound(src, 'sound/items/drill_use.ogg', 100) + playsound(src, 'sound/items/tools/drill_use.ogg', 100) say("Stage two complete!") timer_id = addtimer(CALLBACK(src, PROC_REF(stage_three)), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) /obj/machinery/interrogator/proc/stage_three() if(!check_requirements()) say("Critical error! Aborting.") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return to_chat(human_occupant, span_userdanger("You feel something penetrating your brain, it feels as though your childhood memories are fading! Please, make it stop! After a moment of silence, you realize you can't remember what happened to you!")) human_occupant.emote("scream") diff --git a/modular_skyrat/modules/barricades/code/barricade.dm b/modular_skyrat/modules/barricades/code/barricade.dm index a3faa5ebef9..41014c88e2b 100644 --- a/modular_skyrat/modules/barricades/code/barricade.dm +++ b/modular_skyrat/modules/barricades/code/barricade.dm @@ -123,7 +123,7 @@ if(!do_after(user, 2 SECONDS, src)) return TRUE - playsound(src, 'sound/items/wirecutter.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/wirecutter.ogg', 25, TRUE) user.visible_message(span_notice("[user] removed the barbed wire on [src]."), span_notice("You removed the barbed wire on [src].")) modify_max_integrity(max_integrity - 50) @@ -476,7 +476,7 @@ user.visible_message(span_notice("[user] attaches[choice] to [src]."), span_notice("You attach [choice] to [src].")) - playsound(src, 'sound/items/screwdriver.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 25, TRUE) update_icon() /obj/structure/deployable_barricade/metal/examine(mob/user) @@ -534,7 +534,7 @@ /obj/structure/deployable_barricade/metal/screwdriver_act(mob/living/user, obj/item/I) switch(build_state) if(BARRICADE_METAL_ANCHORED) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts - playsound(src, 'sound/items/screwdriver.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 25, TRUE) if(!do_after(user, 1 SECONDS, src)) return TRUE user.visible_message (span_notice ("[user] secures the panel on [src]."), @@ -543,7 +543,7 @@ return TRUE if(BARRICADE_METAL_FIRM) //Fully constructed step. Use screwdriver to remove the protection panels to reveal the bolts - playsound(src, 'sound/items/screwdriver.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 25, TRUE) if(!do_after(user, 1 SECONDS, src)) return TRUE @@ -598,7 +598,7 @@ user.visible_message(span_notice("[user] begins to disassemble [src]."), span_notice("You start to disassemble [src].")) - playsound(src, 'sound/items/crowbar.ogg', 25, 1) + playsound(src, 'sound/items/tools/crowbar.ogg', 25, 1) if(!do_after(user, 5 SECONDS, src)) return TRUE @@ -616,7 +616,7 @@ user.visible_message(span_notice("[user] begins to detach the armor plates from [src]."), span_notice("You begin to detach the armor plates from [src].")) - playsound(src, 'sound/items/crowbar.ogg', 25, 1) + playsound(src, 'sound/items/tools/crowbar.ogg', 25, 1) if(!do_after(user, 5 SECONDS, src)) return TRUE @@ -680,7 +680,7 @@ user.visible_message(span_notice("[user] begins to disassemble [src]."), span_notice("You start to disassemble [src].")) - playsound(src, 'sound/items/crowbar.ogg', 25, 1) + playsound(src, 'sound/items/tools/crowbar.ogg', 25, 1) if(!do_after(user, 5 SECONDS, src)) return TRUE diff --git a/modular_skyrat/modules/black_mesa/code/turrets.dm b/modular_skyrat/modules/black_mesa/code/turrets.dm index f210985ec1e..74f762a63b6 100644 --- a/modular_skyrat/modules/black_mesa/code/turrets.dm +++ b/modular_skyrat/modules/black_mesa/code/turrets.dm @@ -32,7 +32,7 @@ if(I.tool_behaviour == TOOL_WRENCH && user.combat_mode) user.visible_message(span_danger("[user] bashes [src] with [I]!"), \ span_danger("You bash [src] with [I]!"), null, COMBAT_MESSAGE_RANGE) - playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1) + playsound(src, "sound/items/tools/drill_use.ogg", 80, TRUE, -1) var/obj/machinery/porta_turret/syndicate/pod/toolbox/mesa/turret = new(get_turf(loc)) turret.faction = list(FACTION_HECU) qdel(src) diff --git a/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm b/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm index cd59940084c..e0acc7ff091 100644 --- a/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm +++ b/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm @@ -105,7 +105,7 @@ update_appearance() // Check if it is nonzero if(mining_stat) - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) return FALSE // mining_stat = 0, we are ready to go return TRUE diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm index 31404448f48..cfbffd4c44f 100644 --- a/modular_skyrat/modules/borgs/code/robot_items.dm +++ b/modular_skyrat/modules/borgs/code/robot_items.dm @@ -463,7 +463,7 @@ desc = "A cyborg fitted module resembling the jaws of life." icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi' icon_state = "jaws_pry_cyborg" - usesound = 'sound/items/jaws_pry.ogg' + usesound = 'sound/items/tools/jaws_pry.ogg' force = 10 toolspeed = 0.5 @@ -472,17 +472,17 @@ . += " It's fitted with a [tool_behaviour == TOOL_CROWBAR ? "prying" : "cutting"] head." /obj/item/crowbar/cyborg/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, TRUE) + playsound(get_turf(user), 'sound/items/tools/change_jaws.ogg', 50, TRUE) if(tool_behaviour == TOOL_CROWBAR) tool_behaviour = TOOL_WIRECUTTER to_chat(user, span_notice("You attach the cutting jaws to [src].")) icon_state = "jaws_cutter_cyborg" - usesound = 'sound/items/jaws_cut.ogg' + usesound = 'sound/items/tools/jaws_cut.ogg' else tool_behaviour = TOOL_CROWBAR to_chat(user, span_notice("You attach the prying jaws to [src].")) icon_state = "jaws_pry_cyborg" - usesound = 'sound/items/jaws_pry.ogg' + usesound = 'sound/items/tools/jaws_pry.ogg' /obj/item/screwdriver/cyborg/power name = "automated drill" @@ -490,7 +490,7 @@ icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi' icon_state = "drill_screw_cyborg" hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' + usesound = 'sound/items/tools/drill_use.ogg' toolspeed = 0.5 random_color = FALSE @@ -778,7 +778,7 @@ desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face." icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi' icon_state = "synthtongue" - hitsound = 'sound/effects/attackblob.ogg' + hitsound = 'sound/effects/blob/attackblob.ogg' desc = "For giving affectionate kisses." item_flags = NOBLUDGEON @@ -792,10 +792,10 @@ if(!HAS_TRAIT(target, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait if(check_zone(borg.zone_selected) == "head") borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!")) - playsound(borg, 'sound/effects/attackblob.ogg', 50, 1) + playsound(borg, 'sound/effects/blob/attackblob.ogg', 50, 1) else borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!")) - playsound(borg, 'sound/effects/attackblob.ogg', 50, 1) + playsound(borg, 'sound/effects/blob/attackblob.ogg', 50, 1) return ITEM_INTERACT_SUCCESS else to_chat(user, span_warning("ERROR: [target] is on the Do Not Lick registry!")) diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm index b1e354c655d..cbe208089d7 100644 --- a/modular_skyrat/modules/borgs/code/robot_upgrade.dm +++ b/modular_skyrat/modules/borgs/code/robot_upgrade.dm @@ -253,7 +253,7 @@ borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!")) else borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!")) - playsound(borg, 'sound/effects/attackblob.ogg', 50, 1) + playsound(borg, 'sound/effects/blob/attackblob.ogg', 50, 1) return ITEM_INTERACT_SUCCESS /obj/item/quadborg_nose/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) @@ -295,7 +295,7 @@ smoke.start() sleep(0.2 SECONDS) for(var/i in 1 to 4) - playsound(borg, pick('sound/items/drill_use.ogg', 'sound/items/jaws_cut.ogg', 'sound/items/jaws_pry.ogg', 'sound/items/welder.ogg', 'sound/items/ratchet.ogg'), 80, TRUE, -1) + playsound(borg, pick('sound/items/tools/drill_use.ogg', 'sound/items/tools/jaws_cut.ogg', 'sound/items/tools/jaws_pry.ogg', 'sound/items/tools/welder.ogg', 'sound/items/ratchet.ogg'), 80, TRUE, -1) sleep(1.2 SECONDS) if(!prev_lockcharge) borg.SetLockdown(FALSE) diff --git a/modular_skyrat/modules/cargo/code/export_gate.dm b/modular_skyrat/modules/cargo/code/export_gate.dm index 5a5f8d721d9..ca8acdc932f 100644 --- a/modular_skyrat/modules/cargo/code/export_gate.dm +++ b/modular_skyrat/modules/cargo/code/export_gate.dm @@ -167,7 +167,7 @@ scanline_timer = addtimer(CALLBACK(src, PROC_REF(set_scanline), "passive"), duration, TIMER_STOPPABLE) if(COOLDOWN_FINISHED(src, scanner_beep) && type != "passive") COOLDOWN_START(src, scanner_beep, 0.5 SECONDS) - playsound(src, type == "alarm" ? 'sound/machines/buzz-sigh.ogg' : 'sound/machines/chime.ogg', 45, TRUE) + playsound(src, type == "alarm" ? 'sound/machines/buzz/buzz-sigh.ogg' : 'sound/machines/chime.ogg', 45, TRUE) /obj/machinery/export_gate/proc/auto_scan(atom/movable/package) if(is_operational && istype(package, /obj/item/bounty_cube) && (!panel_open) && anchored) diff --git a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm index 4548fe02f67..b5176b2ba52 100644 --- a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm +++ b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm @@ -71,7 +71,7 @@ var/obj/item/gbp_punchcard/punchcard = attacking_item var/amount_to_reward = punchcard.punches * GBP_PUNCH_REWARD if(!punchcard.punches) - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) say("You can't redeem an unpunched card!") return @@ -88,7 +88,7 @@ return if(!card_used.registered_account || !istype(card_used.registered_account.account_job, /datum/job/assistant)) - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) say("You cannot redeem a punchcard without a valid assistant bank account!") return diff --git a/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm b/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm index 1eb2a4627e1..ef31342433e 100644 --- a/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm +++ b/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm @@ -74,7 +74,7 @@ if(design_delta > 0) say("Received [design_delta] new design[design_delta == 1 ? "" : "s"].") - playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE) + playsound(src, 'sound/machines/beep/twobeep_high.ogg', 50, TRUE) update_static_data_for_all_viewers() diff --git a/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm b/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm index 1e10a1b2fc3..6f71fb37498 100644 --- a/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm +++ b/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm @@ -9,7 +9,7 @@ /obj/machinery/ore_silo/colony_lathe/silo_log(obj/machinery/machinery_in_question, action, amount, noun, list/mats) . = ..() - playsound(src, 'sound/machines/beep.ogg', 30, TRUE) + playsound(src, 'sound/machines/beep/beep.ogg', 30, TRUE) AddElement(/datum/element/repackable, packed_type, 10 SECONDS) /obj/machinery/ore_silo/colony_lathe/default_deconstruction_crowbar() diff --git a/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm b/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm index dec98f4877e..824c4a9e4f9 100644 --- a/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm +++ b/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm @@ -49,7 +49,7 @@ if(!do_after(user, 3 SECONDS, target = source)) return - playsound(source, 'sound/items/ratchet.ogg', 50, TRUE) + playsound(source, 'sound/items/tools/ratchet.ogg', 50, TRUE) new item_to_pack_into(source.drop_location()) diff --git a/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm b/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm index 5dba39ef7c7..10784821402 100644 --- a/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm +++ b/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm @@ -24,7 +24,7 @@ attack_verb_continuous = list("drills", "screws", "jabs", "whacks") attack_verb_simple = list("drill", "screw", "jab", "whack") hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' + usesound = 'sound/items/tools/drill_use.ogg' w_class = WEIGHT_CLASS_SMALL toolspeed = 1 random_color = FALSE diff --git a/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm b/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm index 4d495464889..031fb691706 100644 --- a/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm +++ b/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm @@ -31,10 +31,10 @@ var/noisechoice = tgui_input_list(user, "What noise would you like to make?", "Robot Noises", list("Beep","Buzz","Ping")) if(noisechoice == "Beep") user.audible_message("makes their TTS beep!", audible_message_flags = EMOTE_MESSAGE) - playsound(user, 'sound/machines/twobeep.ogg', 50, 1, -1) + playsound(user, 'sound/machines/beep/twobeep.ogg', 50, 1, -1) if(noisechoice == "Buzz") user.audible_message("makes their TTS buzz!", audible_message_flags = EMOTE_MESSAGE) - playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 1, -1) + playsound(user, 'sound/machines/buzz/buzz-sigh.ogg', 50, 1, -1) if(noisechoice == "Ping") user.audible_message("makes their TTS ping!", audible_message_flags = EMOTE_MESSAGE) playsound(user, 'sound/machines/ping.ogg', 50, 1, -1) diff --git a/modular_skyrat/modules/customization/game/objects/items/plushes.dm b/modular_skyrat/modules/customization/game/objects/items/plushes.dm index 5b53be49c33..e1362b71768 100644 --- a/modular_skyrat/modules/customization/game/objects/items/plushes.dm +++ b/modular_skyrat/modules/customization/game/objects/items/plushes.dm @@ -48,7 +48,7 @@ icon_state = "plushie_securityk9" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/medihound name = "medi-hound plushie" @@ -56,7 +56,7 @@ icon_state = "plushie_medihound" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/engihound name = "engi-hound plushie" @@ -64,7 +64,7 @@ icon_state = "plushie_engihound" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/scrubpuppy name = "scrub-puppy plushie" @@ -72,7 +72,7 @@ icon_state = "plushie_scrubpuppy" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/meddrake name = "medi-drake plushie" @@ -80,7 +80,7 @@ icon_state = "plushie_meddrake" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/secdrake name = "sec-drake plushie" @@ -88,7 +88,7 @@ icon_state = "plushie_secdrake" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/fox name = "fox plushie" @@ -272,7 +272,7 @@ icon_state = "plushie_tyri" attack_verb_continuous = list("fixes", "unbolts", "welds") attack_verb_simple = list("fix", "unbolt", "weld") - squeak_override = list('sound/items/screwdriver.ogg' = 1, 'sound/items/drill_use.ogg' = 1, 'sound/items/welder.ogg' = 1) + squeak_override = list('sound/items/tools/screwdriver.ogg' = 1, 'sound/items/tools/drill_use.ogg' = 1, 'sound/items/tools/welder.ogg' = 1) /obj/item/toy/plush/skyrat/glitch_synth name = "glitching synthetic plushie" @@ -280,7 +280,7 @@ icon_state = "plushie_rex" attack_verb_continuous = list("beeps", "hugs", "health analyzes") attack_verb_simple = list("beep", "hug", "health analyze") - squeak_override = list('sound/machines/twobeep_high.ogg' = 1) + squeak_override = list('sound/machines/beep/twobeep_high.ogg' = 1) /obj/item/toy/plush/skyrat/boom_bird name = "boom bird plushie" @@ -345,7 +345,7 @@ icon_state = "plushie_zapp" attack_verb_continuous = list("boops", "nuzzles") attack_verb_simple = list("boop", "nuzzle") - squeak_override = list('sound/effects/can_open1.ogg' = 1, 'sound/effects/can_open2.ogg' = 1, 'sound/effects/can_open3.ogg' = 1) + squeak_override = list('sound/effects/can/can_open1.ogg' = 1, 'sound/effects/can/can_open2.ogg' = 1, 'sound/effects/can/can_open3.ogg' = 1) ///the list that is chosen from depending on gaming skill var/static/list/skill_response = list( "Weak! What are you, a mobile gamer?", @@ -383,9 +383,9 @@ skill_level = (max(6, skill_level)) say(skill_response[skill_level]) if(skill_level == 7) - playsound(src_turf, 'sound/effects/can_pop.ogg', 80, TRUE) + playsound(src_turf, 'sound/effects/can/can_pop.ogg', 80, TRUE) new /obj/effect/abstract/liquid_turf/pwr_gamr(src_turf) - playsound(src_turf, 'sound/effects/bubbles.ogg', 50, TRUE) + playsound(src_turf, 'sound/effects/bubbles/bubbles.ogg', 50, TRUE) qdel(src) /obj/effect/abstract/liquid_turf/pwr_gamr @@ -652,4 +652,4 @@ icon_state = "plush_janiborg" attack_verb_continuous = list("beeps", "washes", "mops", "squirts", "soaps") attack_verb_simple = list("beep", "wash", "mop", "squirt", "soap") - squeak_override = list('sound/machines/twobeep.ogg' = 1) + squeak_override = list('sound/machines/beep/twobeep.ogg' = 1) diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index b9957542ddf..6c33006f2d9 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -151,7 +151,7 @@ if("No") return if("Maybe") - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE) audible_message(span_warning("The [src] buzzes!")) return diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm index 33125dca3e7..1c2da88347e 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm @@ -15,7 +15,7 @@ mod.choose_sprite_accessories(usr) /obj/item/mod/control/proc/quick_sprite_accessories(mob/living/carbon/human/user) - playsound(user, 'sound/mecha/mechmove03.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(user, 'sound/vehicles/mecha/mechmove03.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) user.mutant_part_visibility(quick_toggle = TRUE) /obj/item/mod/control/proc/choose_sprite_accessories(mob/living/carbon/human/user) diff --git a/modular_skyrat/modules/delam_emergency_stop/code/scram.dm b/modular_skyrat/modules/delam_emergency_stop/code/scram.dm index 781fc49579c..f8f58034d33 100644 --- a/modular_skyrat/modules/delam_emergency_stop/code/scram.dm +++ b/modular_skyrat/modules/delam_emergency_stop/code/scram.dm @@ -306,7 +306,7 @@ return if(!validate_suppression_status()) - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE, BUTTON_SOUND_RANGE, falloff_distance = BUTTON_SOUND_FALLOFF_DISTANCE) + playsound(src.loc, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE, BUTTON_SOUND_RANGE, falloff_distance = BUTTON_SOUND_FALLOFF_DISTANCE) audible_message(span_danger("[src] makes a sad buzz and goes dark. Did someone activate it already?")) // Look through the window, buddy burn_out() return diff --git a/modular_skyrat/modules/electric_welder/code/electric_welder.dm b/modular_skyrat/modules/electric_welder/code/electric_welder.dm index fca6dc4fdf0..a60ae601c7e 100644 --- a/modular_skyrat/modules/electric_welder/code/electric_welder.dm +++ b/modular_skyrat/modules/electric_welder/code/electric_welder.dm @@ -38,7 +38,7 @@ light_on = TRUE force = 15 damtype = BURN - hitsound = 'sound/items/welder.ogg' + hitsound = 'sound/items/tools/welder.ogg' set_light_on(powered) update_appearance() START_PROCESSING(SSobj, src) diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index 3ddc300a533..520b34dcf38 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -214,7 +214,7 @@ if(ismoth(user)) return 'modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg' else - return'sound/creatures/chitter.ogg' + return 'sound/mobs/non-humanoids/insect/chitter.ogg' /datum/emote/living/sigh/get_sound(mob/living/user) if(iscarbon(user)) diff --git a/modular_skyrat/modules/emotes/code/laugh_datums.dm b/modular_skyrat/modules/emotes/code/laugh_datums.dm index 310c6ce63bc..752e16aee1d 100644 --- a/modular_skyrat/modules/emotes/code/laugh_datums.dm +++ b/modular_skyrat/modules/emotes/code/laugh_datums.dm @@ -13,8 +13,8 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/human name = "Human Laugh" male_laughsounds = list( - 'sound/voice/human/manlaugh1.ogg', - 'sound/voice/human/manlaugh2.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh1.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh2.ogg', ) female_laughsounds = list( 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg', @@ -24,8 +24,8 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/humanmasc name = "Masculine Human Laugh" male_laughsounds = list( - 'sound/voice/human/manlaugh1.ogg', - 'sound/voice/human/manlaugh2.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh1.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh2.ogg', ) female_laughsounds = null @@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/lizard name = "Lizard Laugh" - male_laughsounds = list('sound/voice/lizard/lizard_laugh1.ogg',) + male_laughsounds = list('sound/mobs/humanoids/lizard/lizard_laugh1.ogg',) female_laughsounds = null /datum/laugh_type/felinid @@ -53,8 +53,8 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/clown name = "Clown Laugh" male_laughsounds = list( - 'sound/creatures/clown/hohoho.ogg', - 'sound/creatures/clown/hehe.ogg', + 'sound/mobs/non-humanoids/clown/hohoho.ogg', + 'sound/mobs/non-humanoids/clown/hehe.ogg', ) female_laughsounds = null diff --git a/modular_skyrat/modules/emotes/code/scream_datums.dm b/modular_skyrat/modules/emotes/code/scream_datums.dm index aa3b5ae6ab1..a25efddb97b 100644 --- a/modular_skyrat/modules/emotes/code/scream_datums.dm +++ b/modular_skyrat/modules/emotes/code/scream_datums.dm @@ -24,12 +24,12 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/human_two name = "Human Scream 2" male_screamsounds = list( - 'sound/voice/human/malescream_1.ogg', - 'sound/voice/human/malescream_2.ogg', - 'sound/voice/human/malescream_3.ogg', - 'sound/voice/human/malescream_4.ogg', - 'sound/voice/human/malescream_5.ogg', - 'sound/voice/human/malescream_6.ogg', + 'sound/mobs/humanoids/human/scream/malescream_1.ogg', + 'sound/mobs/humanoids/human/scream/malescream_2.ogg', + 'sound/mobs/humanoids/human/scream/malescream_3.ogg', + 'sound/mobs/humanoids/human/scream/malescream_4.ogg', + 'sound/mobs/humanoids/human/scream/malescream_5.ogg', + 'sound/mobs/humanoids/human/scream/malescream_6.ogg', ) female_screamsounds = list( 'sound/voice/human/femalescream_1.ogg', @@ -45,12 +45,12 @@ GLOBAL_LIST_EMPTY(scream_types) male_screamsounds = list( 'modular_skyrat/modules/emotes/sound/voice/scream_m1.ogg', 'modular_skyrat/modules/emotes/sound/voice/scream_m2.ogg', - 'sound/voice/human/malescream_1.ogg', - 'sound/voice/human/malescream_2.ogg', - 'sound/voice/human/malescream_3.ogg', - 'sound/voice/human/malescream_4.ogg', - 'sound/voice/human/malescream_5.ogg', - 'sound/voice/human/malescream_6.ogg', + 'sound/mobs/humanoids/human/scream/malescream_1.ogg', + 'sound/mobs/humanoids/human/scream/malescream_2.ogg', + 'sound/mobs/humanoids/human/scream/malescream_3.ogg', + 'sound/mobs/humanoids/human/scream/malescream_4.ogg', + 'sound/mobs/humanoids/human/scream/malescream_5.ogg', + 'sound/mobs/humanoids/human/scream/malescream_6.ogg', ) female_screamsounds = null @@ -74,15 +74,15 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/wilhelm name = "Classic Scream" - male_screamsounds = list('sound/voice/human/wilhelm_scream.ogg') + male_screamsounds = list('sound/mobs/humanoids/human/scream/wilhelm_scream.ogg') female_screamsounds = null /datum/scream_type/lizard name = "Lizard Scream" male_screamsounds = list( - 'sound/voice/lizard/lizard_scream_1.ogg', - 'sound/voice/lizard/lizard_scream_2.ogg', - 'sound/voice/lizard/lizard_scream_3.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_1.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_2.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_3.ogg', ) female_screamsounds = null @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(scream_types) name = "Moth Scream" male_screamsounds = list( 'modular_skyrat/modules/emotes/sound/voice/scream_moth.ogg', - 'sound/voice/moth/scream_moth.ogg', + 'sound/mobs/humanoids/moth/scream_moth.ogg', ) female_screamsounds = null @@ -135,18 +135,18 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/chicken name = "Chicken Scream" - male_screamsounds = list('sound/creatures/bagawk.ogg') + male_screamsounds = list('sound/mobs/non-humanoids/chicken/bagawk.ogg') female_screamsounds = null /datum/scream_type/ethereal name = "Ethereal Scream" male_screamsounds = list( - 'sound/voice/ethereal/ethereal_scream_1.ogg', - 'sound/voice/ethereal/ethereal_scream_2.ogg', - 'sound/voice/ethereal/ethereal_scream_3.ogg', - 'sound/voice/ethereal/lustrous_scream_1.ogg', - 'sound/voice/ethereal/lustrous_scream_2.ogg', - 'sound/voice/ethereal/lustrous_scream_3.ogg', + 'sound/mobs/humanoids/ethereal/ethereal_scream_1.ogg', + 'sound/mobs/humanoids/ethereal/ethereal_scream_2.ogg', + 'sound/mobs/humanoids/ethereal/ethereal_scream_3.ogg', + 'sound/mobs/humanoids/ethereal/lustrous_scream_1.ogg', + 'sound/mobs/humanoids/ethereal/lustrous_scream_2.ogg', + 'sound/mobs/humanoids/ethereal/lustrous_scream_3.ogg', ) female_screamsounds = null @@ -160,19 +160,19 @@ GLOBAL_LIST_EMPTY(scream_types) name = "Monkey Scream" male_screamsounds = list( 'modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg', - 'sound/creatures/monkey/monkey_screech_1.ogg', - 'sound/creatures/monkey/monkey_screech_2.ogg', - 'sound/creatures/monkey/monkey_screech_3.ogg', - 'sound/creatures/monkey/monkey_screech_4.ogg', - 'sound/creatures/monkey/monkey_screech_5.ogg', - 'sound/creatures/monkey/monkey_screech_6.ogg', - 'sound/creatures/monkey/monkey_screech_7.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_1.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_2.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_3.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_4.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_5.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_6.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_7.ogg', ) female_screamsounds = null /datum/scream_type/gorilla name = "Gorilla Scream" - male_screamsounds = list('sound/creatures/gorilla.ogg') + male_screamsounds = list('sound/mobs/non-humanoids/gorilla/gorilla.ogg') female_screamsounds = null /datum/scream_type/skeleton @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/plasmaman name = "Plasmaman Scream" male_screamsounds = list( - 'sound/voice/plasmaman/plasmeme_scream_1.ogg', - 'sound/voice/plasmaman/plasmeme_scream_2.ogg', - 'sound/voice/plasmaman/plasmeme_scream_3.ogg') + 'sound/mobs/humanoids/plasmaman/plasmeme_scream_1.ogg', + 'sound/mobs/humanoids/plasmaman/plasmeme_scream_2.ogg', + 'sound/mobs/humanoids/plasmaman/plasmeme_scream_3.ogg') female_screamsounds = null diff --git a/modular_skyrat/modules/emotes/code/scream_emote.dm b/modular_skyrat/modules/emotes/code/scream_emote.dm index e8a81ff4b96..9ae0add2410 100644 --- a/modular_skyrat/modules/emotes/code/scream_emote.dm +++ b/modular_skyrat/modules/emotes/code/scream_emote.dm @@ -17,7 +17,7 @@ if(ismonkey(user)) return 'modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg' if(istype(user, /mob/living/basic/gorilla)) - return 'sound/mobs/non-humanoids/gorilla.ogg' + return 'sound/mobs/non-humanoids/gorilla/gorilla.ogg' if(isalien(user)) return 'sound/mobs/non-humanoids/hiss/hiss6.ogg' @@ -39,7 +39,7 @@ return if(isnull(user.selected_scream) || (LAZYLEN(user.selected_scream.male_screamsounds) && LAZYLEN(user.selected_scream.female_screamsounds))) //For things that don't have a selected scream(npcs) if(prob(1)) - return 'sound/voice/human/wilhelm_scream.ogg' + return 'sound/mobs/humanoids/human/scream/wilhelm_scream.ogg' return user.dna.species.get_scream_sound(user) if(user.gender == FEMALE && LAZYLEN(user.selected_scream.female_screamsounds)) return pick(user.selected_scream.female_screamsounds) diff --git a/modular_skyrat/modules/emotes/code/synth_emotes.dm b/modular_skyrat/modules/emotes/code/synth_emotes.dm index 63f96c0ca33..f7f07e8ad87 100644 --- a/modular_skyrat/modules/emotes/code/synth_emotes.dm +++ b/modular_skyrat/modules/emotes/code/synth_emotes.dm @@ -35,4 +35,4 @@ key = "laughtrack" message = "plays a laughtrack." emote_type = EMOTE_AUDIBLE - sound = 'sound/items/sitcomlaugh2.ogg' + sound = 'sound/items/sitcom_laugh/SitcomLaugh2.ogg' diff --git a/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm b/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm index 127238e6724..5f16b6a83ec 100644 --- a/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm +++ b/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm @@ -23,7 +23,7 @@ attack_verb_simple = "cleave" attack_verb_continuous = "cleaves" attack_sound = 'modular_skyrat/master_files/sound/weapons/bloodyslice.ogg' - death_sound = 'sound/creatures/space_dragon_roar.ogg' + death_sound = 'sound/mobs/non-humanoids/space_dragon/space_dragon_roar.ogg' death_message = "falls on his sword, ash evaporating from every hole in his armor." gps_name = "Forgotten Signal" gender = MALE diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm index 32c5fff612f..45cb28e1d1f 100644 --- a/modular_skyrat/modules/goofsec/code/sol_fed.dm +++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm @@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( call_911(called_group) to_chat(user, span_notice("Authorization confirmed. 911 call dispatched to the Sol Federation [called_group_pretty].")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE) /datum/antagonist/ert/request_911 name = "911 Responder" diff --git a/modular_skyrat/modules/implants/code/augments_arms.dm b/modular_skyrat/modules/implants/code/augments_arms.dm index 9a18850e6aa..75119307f48 100644 --- a/modular_skyrat/modules/implants/code/augments_arms.dm +++ b/modular_skyrat/modules/implants/code/augments_arms.dm @@ -4,8 +4,8 @@ #define KNIFE_ATTACK_VERB_SIMPLE list("slash", "tear", "slice", "tear", "lacerate", "rip", "dice", "cut", "rend") #define KNIFE_SHARPNESS SHARP_EDGED #define KNIFE_BARE_WOUND_BONUS 15 -#define CUTTER_HITSOUND 'sound/items/wirecutter.ogg' -#define CUTTER_USESOUND 'sound/items/wirecutter.ogg' +#define CUTTER_HITSOUND 'sound/items/tools/wirecutter.ogg' +#define CUTTER_USESOUND 'sound/items/tools/wirecutter.ogg' #define CUTTER_ATTACK_VERB_CONTINUOUS list("bashes", "batters", "bludgeons", "thrashes", "whacks") #define CUTTER_ATTACK_VERB_SIMPLE list("bash", "batter", "bludgeon", "thrash", "whack") #define CUTTER_FORCE 6 diff --git a/modular_skyrat/modules/jukebox/code/dance_machine.dm b/modular_skyrat/modules/jukebox/code/dance_machine.dm index 54c8e27ed89..42ddb57030d 100644 --- a/modular_skyrat/modules/jukebox/code/dance_machine.dm +++ b/modular_skyrat/modules/jukebox/code/dance_machine.dm @@ -459,7 +459,7 @@ update_use_power(IDLE_POWER_USE) STOP_PROCESSING(SSobj, src) dance_over() - playsound(src,'sound/machines/terminal_off.ogg',50,TRUE) + playsound(src,'sound/machines/terminal/terminal_off.ogg',50,TRUE) update_appearance(UPDATE_ICON_STATE) stop = world.time + 100 diff --git a/modular_skyrat/modules/jukebox/code/ravemod.dm b/modular_skyrat/modules/jukebox/code/ravemod.dm index ac64dd6dcde..47ce527810b 100644 --- a/modular_skyrat/modules/jukebox/code/ravemod.dm +++ b/modular_skyrat/modules/jukebox/code/ravemod.dm @@ -58,7 +58,7 @@ mod.wearer.stop_sound_channel(CHANNEL_JUKEBOX) if(deleting) return - SEND_SOUND(mod.wearer, sound('sound/machines/terminal_off.ogg', volume = 50, channel = CHANNEL_JUKEBOX)) + SEND_SOUND(mod.wearer, sound('sound/machines/terminal/terminal_off.ogg', volume = 50, channel = CHANNEL_JUKEBOX)) /obj/item/mod/module/visor/rave/generate_worn_overlay(mutable_appearance/standing) . = ..() diff --git a/modular_skyrat/modules/mapping/code/areas/ruins.dm b/modular_skyrat/modules/mapping/code/areas/ruins.dm index 120709108b1..c9c35025747 100644 --- a/modular_skyrat/modules/mapping/code/areas/ruins.dm +++ b/modular_skyrat/modules/mapping/code/areas/ruins.dm @@ -3,17 +3,17 @@ /area/ruin/powered/miningfacility name = "Abandoned Nanotrasen Mining Facility" icon_state = "dk_yellow" - ambientsounds = list('sound/ambience/title3.ogg') //Classic vibes + ambientsounds = list('sound/music/lobby_music/title3.ogg') //Classic vibes /area/ruin/powered/crashedshuttle name = "Crashed Shuttle" icon_state = "dk_yellow" - ambientsounds = list('sound/ambience/ambiodd.ogg') + ambientsounds = list('sound/ambience/misc/ambiodd.ogg') /area/ruin/powered/cozycabin name = "Cozy Cabin" icon_state = "dk_yellow" - ambientsounds = list('sound/ambience/ambicha1.ogg', 'sound/ambience/ambicha2.ogg', 'sound/ambience/ambicha3.ogg') + ambientsounds = list('sound/ambience/holy/ambicha1.ogg', 'sound/ambience/holy/ambicha2.ogg', 'sound/ambience/holy/ambicha3.ogg') /area/ruin/powered/biodome name = "Jungle Biodome" diff --git a/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm b/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm index 70a68a488ec..45221067489 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm @@ -173,7 +173,7 @@ victim_message = self_message to_chat(victim, victim_message) - playsound(get_turf(crowbarring_item), 'sound/machines/airlock_alien_prying.ogg', 30, TRUE) + playsound(get_turf(crowbarring_item), 'sound/machines/airlock/airlock_alien_prying.ogg', 30, TRUE) if (!crowbarring_item.use_tool(target = victim, user = user, delay = (7 SECONDS * delay_mult), volume = 50, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return TRUE diff --git a/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm b/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm index cc3643009fc..c41ac8d3d97 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm @@ -282,7 +282,7 @@ var/gauze_or_not = (!isnull(gauze) ? ", but [gauze] helps to keep it together" : "") var/clothing_text = (!get_location_accessible(victim, limb.body_zone) ? ", [victim.p_their()] clothing absorbing some of the liquid" : "") victim.visible_message(span_warning("[victim]'s [limb.plaintext_zone] strains from the thermal shock[clothing_text][gauze_or_not]!")) - playsound(victim, 'sound/items/welder.ogg', 25) + playsound(victim, 'sound/items/tools/welder.ogg', 25) var/damage = (((abs(temp_delta) * heat_shock_delta_to_damage_ratio) * gauze_mult) * heat_shock_damage_mult) * heat_adjustment_used limb.receive_damage(brute = damage, wound_bonus = CANT_WOUND) diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm index e8df9a46071..9549a6b8000 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm @@ -125,7 +125,7 @@ These are basically advanced cells. balloon_alert(user, "no attachments!") return remove_attachments() - playsound(src, 'sound/items/screwdriver.ogg', 70, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 70, TRUE) balloon_alert(user, "attachments removed") /obj/item/stock_parts/power_store/cell/microfusion/process(seconds_per_tick) diff --git a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm index 1c502060083..1f627080f9c 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm @@ -265,7 +265,7 @@ if(!phase_emitter) balloon_alert(user, "no phase emitter!") return - playsound(src, 'sound/items/crowbar.ogg', 70, TRUE) + playsound(src, 'sound/items/tools/crowbar.ogg', 70, TRUE) remove_emitter() /obj/item/gun/microfusion/click_alt(mob/user) @@ -663,7 +663,7 @@ /obj/item/gun/microfusion/proc/remove_attachment(obj/item/microfusion_gun_attachment/microfusion_gun_attachment, mob/living/user) balloon_alert(user, "removed attachment") - playsound(src, 'sound/items/screwdriver.ogg', 70) + playsound(src, 'sound/items/tools/screwdriver.ogg', 70) microfusion_gun_attachment.forceMove(get_turf(src)) attachments -= microfusion_gun_attachment microfusion_gun_attachment.remove_attachment(src) diff --git a/modular_skyrat/modules/modular_implants/code/nifs.dm b/modular_skyrat/modules/modular_implants/code/nifs.dm index 300c41413cf..5fba0c6a353 100644 --- a/modular_skyrat/modules/modular_implants/code/nifs.dm +++ b/modular_skyrat/modules/modular_implants/code/nifs.dm @@ -131,7 +131,7 @@ if(linked_mob && stored_ckey != insertee.ckey && theft_protection) insertee.audible_message(span_warning("[src] lets out a negative buzz before forcefully removing itself from [insertee]'s brain.")) - playsound(insertee, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(insertee, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) Remove(insertee) forceMove(get_turf(insertee)) diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm index 3ef62e68ac2..7c08663ae36 100644 --- a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm +++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm @@ -63,7 +63,7 @@ if(!target_room) return FALSE - SEND_SOUND(target_ghost, 'sound/misc/notice2.ogg') + SEND_SOUND(target_ghost, 'sound/announcer/notice/notice2.ogg') window_flash(target_ghost.client) if(tgui_alert(target_ghost, "[user] wants to transfer you to [target_room] inside of a soulcatcher, do you accept?", name, list("Yes", "No"), 30 SECONDS, autofocus = FALSE) != "Yes") @@ -86,7 +86,7 @@ if(!target_room) return FALSE - SEND_SOUND(target_mob, 'sound/misc/notice2.ogg') + SEND_SOUND(target_mob, 'sound/announcer/notice/notice2.ogg') window_flash(target_mob.client) if((tgui_alert(target_mob, "Do you wish to enter [target_room]? This will remove you from your body until you leave.", name, list("Yes", "No"), 30 SECONDS, FALSE) != "Yes") || (tgui_alert(target_mob, "Are you sure about this?", name, list("Yes", "No"), 30 SECONDS, FALSE) != "Yes")) diff --git a/modular_skyrat/modules/modular_items/code/summon_beacon.dm b/modular_skyrat/modules/modular_items/code/summon_beacon.dm index 9ca0d8a7a01..340053e92f4 100644 --- a/modular_skyrat/modules/modular_items/code/summon_beacon.dm +++ b/modular_skyrat/modules/modular_items/code/summon_beacon.dm @@ -47,7 +47,7 @@ if(user.can_perform_action(src, FORBID_TELEKINESIS_REACH)) return TRUE else - playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, TRUE) return FALSE /obj/item/summon_beacon/proc/generate_display_names() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm index 9c6e16f7015..d97a90bcbf4 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm @@ -195,7 +195,7 @@ if(!ignores_cooldown && !COOLDOWN_FINISHED(src, last_speech)) return say(pick_list_replacements(speech_json_file, json_string)) - playsound(src, 'sound/creatures/tourist/tourist_talk.ogg', 15, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, frequency = rand(2, 2.2)) + playsound(src, 'sound/mobs/non-humanoids/tourist/tourist_talk.ogg', 15, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, frequency = rand(2, 2.2)) Shake(2, 2, 1 SECONDS) COOLDOWN_START(src, last_speech, MOD_LASER_SPEECH_COOLDOWN) @@ -233,7 +233,7 @@ /obj/item/gun/energy/modular_laser_rifle/ui_action_click(mob/user, actiontype) if(!istype(actiontype, /datum/action/item_action/toggle_personality)) return ..() - playsound(src, 'sound/machines/beep.ogg', 30, TRUE) + playsound(src, 'sound/machines/beep/beep.ogg', 30, TRUE) personality_mode = !personality_mode speak_up("[personality_mode ? "pickup" : "putdown"]", ignores_personality_toggle = TRUE) return ..() diff --git a/modular_skyrat/modules/mold/code/mold_controller.dm b/modular_skyrat/modules/mold/code/mold_controller.dm index 8a9ed323827..bb4b793c65b 100644 --- a/modular_skyrat/modules/mold/code/mold_controller.dm +++ b/modular_skyrat/modules/mold/code/mold_controller.dm @@ -159,7 +159,7 @@ for(var/obj/O in open_turf) if(istype(O, /obj/machinery/door/airlock) || istype(O, /obj/machinery/door/firedoor) || istype(O, /obj/machinery/door/window) || istype(O, /obj/structure/door_assembly) || istype(O, /obj/machinery/door/window)) spreaded_resin.do_attack_animation(O, ATTACK_EFFECT_PUNCH) - playsound(O, 'sound/effects/attackblob.ogg', 50, TRUE) + playsound(O, 'sound/effects/blob/attackblob.ogg', 50, TRUE) O.take_damage(40, BRUTE, MELEE, 1, get_dir(O, spreaded_resin)) . = RESIN_ATTACKED_DOOR break diff --git a/modular_skyrat/modules/mold/code/mold_mobs.dm b/modular_skyrat/modules/mold/code/mold_mobs.dm index 6e5bf88887b..769874b3a77 100644 --- a/modular_skyrat/modules/mold/code/mold_mobs.dm +++ b/modular_skyrat/modules/mold/code/mold_mobs.dm @@ -42,7 +42,7 @@ melee_damage_lower = 5 //BUBBERSTATION CHANGE melee_damage_upper = 10 //BUBBERSTATION CHANGE obj_damage = 40 - attack_sound = 'sound/effects/attackblob.ogg' + attack_sound = 'sound/effects/blob/attackblob.ogg' basic_mob_flags = DEL_ON_DEATH gold_core_spawnable = HOSTILE_SPAWN @@ -188,7 +188,7 @@ obj_damage = 20 attack_verb_continuous = "stings" attack_verb_simple = "sting" - attack_sound = 'sound/effects/attackblob.ogg' + attack_sound = 'sound/effects/blob/attackblob.ogg' basic_mob_flags = DEL_ON_DEATH ai_controller = /datum/ai_controller/basic_controller/electric_mosquito diff --git a/modular_skyrat/modules/mold/code/mold_structures.dm b/modular_skyrat/modules/mold/code/mold_structures.dm index f16bfc948f0..334ec6ce777 100644 --- a/modular_skyrat/modules/mold/code/mold_structures.dm +++ b/modular_skyrat/modules/mold/code/mold_structures.dm @@ -20,9 +20,9 @@ /obj/structure/mold/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - playsound(loc, 'sound/effects/attackblob.ogg', 100, TRUE) + playsound(loc, 'sound/effects/blob/attackblob.ogg', 100, TRUE) if(BURN) - playsound(loc, 'sound/items/welder.ogg', 100, TRUE) + playsound(loc, 'sound/items/tools/welder.ogg', 100, TRUE) /obj/structure/mold/Initialize(mapload, passed_type) . = ..() diff --git a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm index 8987b344d9e..e6d036d52e9 100644 --- a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm +++ b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm @@ -140,7 +140,7 @@ //BUCKLE HOOKS /obj/machinery/mounted_machine_gun/unbuckle_mob(mob/living/buckled_mob, force = FALSE, can_fall = TRUE) - playsound(src,'sound/mecha/mechmove01.ogg', 50, TRUE) + playsound(src,'sound/vehicles/mecha/mechmove01.ogg', 50, TRUE) for(var/obj/item/iterating_item in buckled_mob.held_items) if(istype(iterating_item, /obj/item/gun_control)) qdel(iterating_item) @@ -166,7 +166,7 @@ layer = ABOVE_MOB_LAYER plane = ABOVE_GAME_PLANE setDir(SOUTH) - playsound(src,'sound/mecha/mechmove01.ogg', 50, TRUE) + playsound(src,'sound/vehicles/mecha/mechmove01.ogg', 50, TRUE) set_anchored(TRUE) update_positioning() diff --git a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm index 9b365ba666e..a2f40ca9437 100644 --- a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm +++ b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm @@ -20,7 +20,7 @@ if(user.can_perform_action(src, FORBID_TELEKINESIS_REACH)) return TRUE else - playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, TRUE) return FALSE @@ -113,7 +113,7 @@ if(I.tool_behaviour == TOOL_WRENCH && user.combat_mode) user.visible_message(span_danger("[user] bashes [src] with [I]!"), \ span_danger("You bash [src] with [I]!"), null, COMBAT_MESSAGE_RANGE) - playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1) + playsound(src, "sound/items/tools/drill_use.ogg", 80, TRUE, -1) var/obj/machinery/porta_turret/syndicate/pod/toolbox/nri/turret = new(get_turf(loc)) turret.faction = list(FACTION_NEUTRAL, FACTION_ERT) qdel(src) diff --git a/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm b/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm index 7cadd1f1d3e..241fc19b0f1 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm @@ -29,7 +29,7 @@ if(!bin) if(manual) visible_message(span_warning("[src] buzzes. There are no disposal bins in range!")) - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, TRUE) return var/disposed = 0 for(var/obj/item/ammo_casing/A in dish_drive_contents) diff --git a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm index 359c4b89b56..9aebd62898e 100644 --- a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm +++ b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm @@ -175,7 +175,7 @@ say("Procedure validation in progress...") var/mob/living/carbon/human/human_occupant = occupant if(!isnull(human_occupant.ckey) && isnull(human_occupant.client)) // player mob, currently disconnected - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE) say("ERROR: Validation failed: No elicited response from occupant genes. Subject may be suffering from Sudden Sleep Disorder.") return @@ -195,7 +195,7 @@ update_appearance() else player_consent = NO_CONSENT - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE) say("ERROR: Validation failed: Occupant genes have willfully rejected the procedure. You may try again if you think this was an error.") update_appearance() diff --git a/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm b/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm index cb1e15266ad..6befc85c0ef 100644 --- a/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm +++ b/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm @@ -8,7 +8,7 @@ /obj/item = 10, ) // 10% success with any sharp item. time = 2.4 SECONDS - preop_sound = 'sound/items/wirecutter.ogg' + preop_sound = 'sound/items/tools/wirecutter.ogg' /datum/surgery_step/cut_wires/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( @@ -32,7 +32,7 @@ TOOL_HEMOSTAT = 10, ) time = 2.4 SECONDS - preop_sound = 'sound/items/crowbar.ogg' + preop_sound = 'sound/items/tools/crowbar.ogg' /datum/surgery_step/pry_off_plating/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) do_sparks(rand(5, 9), FALSE, target.loc) @@ -54,7 +54,7 @@ TOOL_WELDER = 100, ) time = 2.4 SECONDS - preop_sound = 'sound/items/welder.ogg' + preop_sound = 'sound/items/tools/welder.ogg' /datum/surgery_step/weld_plating/tool_check(mob/user, obj/item/tool) if(implement_type == TOOL_WELDER && !tool.use_tool(user, user, 0, volume=50, amount=1)) @@ -77,7 +77,7 @@ TOOL_WELDER = 100, ) time = 2.4 SECONDS - preop_sound = 'sound/items/welder.ogg' + preop_sound = 'sound/items/tools/welder.ogg' /datum/surgery_step/weld_plating/tool_check(mob/user, obj/item/tool) if(implement_type == TOOL_WELDER && !tool.use_tool(user, user, 0, volume=50, amount=1)) diff --git a/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm index 380041e01dc..3b23802bc47 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm @@ -30,8 +30,8 @@ TOOL_WIRECUTTER = 35, /obj/item/stack/package_wrap = 15, ) - preop_sound = 'sound/items/ratchet_slow.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/ratchet_slow.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/hydraulic/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm index 4d2219c8167..685d36580ad 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm @@ -31,8 +31,8 @@ /obj/item/knife = 25, /obj/item/shard = 5, ) - preop_sound = 'sound/items/screwdriver_operating.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/screwdriver_operating.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/reagent_pump/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm index 0f1037bb74c..3213cc954b3 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm @@ -30,8 +30,8 @@ TOOL_RETRACTOR = 45, ) time = 2.4 SECONDS - preop_sound = 'sound/items/ratchet_fast.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/ratchet_fast.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/heatsink/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm index 890f095c638..92c91ff895d 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm @@ -31,8 +31,8 @@ /obj/item/knife = 25, /obj/item/shard = 5, ) - preop_sound = 'sound/items/ratchet_slow.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/ratchet_slow.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/bioreactor/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/taur_mechanics/code/constrict.dm b/modular_skyrat/modules/taur_mechanics/code/constrict.dm index 668e34038d7..0172b1bfee0 100644 --- a/modular_skyrat/modules/taur_mechanics/code/constrict.dm +++ b/modular_skyrat/modules/taur_mechanics/code/constrict.dm @@ -573,7 +573,7 @@ if(!damage_amount) return - playsound(loc, 'sound/items/welder.ogg', 100, TRUE) + playsound(loc, 'sound/items/tools/welder.ogg', 100, TRUE) /// Signal proc for when owner moves. Qdels src. diff --git a/modular_skyrat/modules/verbs/code/subtle.dm b/modular_skyrat/modules/verbs/code/subtle.dm index 0bf374e9cd9..bdac9637a8b 100644 --- a/modular_skyrat/modules/verbs/code/subtle.dm +++ b/modular_skyrat/modules/verbs/code/subtle.dm @@ -155,7 +155,7 @@ // BUBBER EDIT BEGIN - Subtler sounds var/datum/preferences/prefs = hologram.Impersonation.client?.prefs if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound)) - hologram.Impersonation.playsound_local(get_turf(hologram.Impersonation), 'sound/effects/glockenspiel_ping.ogg', 50) + hologram.Impersonation.playsound_local(get_turf(hologram.Impersonation), 'sound/effects/achievement/glockenspiel_ping.ogg', 50) // BUBBER EDIT END else var/ghostless = get_hearers_in_view(target, user) - GLOB.dead_mob_list @@ -173,7 +173,7 @@ // BUBBER EDIT BEGIN - Subtler sounds var/datum/preferences/prefs = receiver.client?.prefs if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound)) - receiver.playsound_local(get_turf(receiver), 'sound/effects/glockenspiel_ping.ogg', 50) + receiver.playsound_local(get_turf(receiver), 'sound/effects/achievement/glockenspiel_ping.ogg', 50) // BUBBER EDIT END return TRUE diff --git a/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm b/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm index aa93075e051..e3f4978d2b4 100644 --- a/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm +++ b/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm @@ -121,7 +121,7 @@ PROCESSING_SUBSYSTEM_DEF(sunlight) if(DANGER_LEVEL_SOL_ROSE) target.playsound_local(null, 'sound/ambience/misc/ambimystery.ogg', 75, TRUE) if(DANGER_LEVEL_SOL_ENDED) - target.playsound_local(null, '/sound/music/antag/bloodcult/ghosty_wind.ogg', 90, TRUE) + target.playsound_local(null, 'sound/music/antag/bloodcult/ghosty_wind.ogg', 90, TRUE) /datum/controller/subsystem/processing/sunlight/proc/is_sufferer(mob/victim) if(!sun_sufferers) diff --git a/modular_zubbers/code/game/Items/sec_hailer.dm b/modular_zubbers/code/game/Items/sec_hailer.dm index 28a7b9ddd79..7853b4bcba4 100644 --- a/modular_zubbers/code/game/Items/sec_hailer.dm +++ b/modular_zubbers/code/game/Items/sec_hailer.dm @@ -69,5 +69,5 @@ usr.audible_message("BACKUP REQUESTED!") balloon_alert_to_viewers("Backup Requested!", "Backup Requested!", 7) log_combat(usr, src, "has called for backup") - playsound(usr, 'sound/misc/whistle.ogg', 50, FALSE, 4) + playsound(usr, 'sound/items/whistle/whistle.ogg', 50, FALSE, 4) diff --git a/modular_zubbers/code/game/area/areas/moonstation.dm b/modular_zubbers/code/game/area/areas/moonstation.dm index 0bffdd38152..65a6b319915 100644 --- a/modular_zubbers/code/game/area/areas/moonstation.dm +++ b/modular_zubbers/code/game/area/areas/moonstation.dm @@ -93,7 +93,7 @@ area_flags = UNIQUE_AREA | FLORA_ALLOWED ambience_index = AMBIENCE_ICEMOON sound_environment = SOUND_AREA_ICEMOON - ambient_buzz = 'sound/ambience/magma.ogg' + ambient_buzz = 'sound/ambience/lavaland/magma.ogg' /area/moonstation/surface name = "Lunar Surface" diff --git a/modular_zubbers/code/game/machinery/crew_monitor.dm b/modular_zubbers/code/game/machinery/crew_monitor.dm index 4d935160c68..ca457e04600 100644 --- a/modular_zubbers/code/game/machinery/crew_monitor.dm +++ b/modular_zubbers/code/game/machinery/crew_monitor.dm @@ -33,7 +33,7 @@ update_appearance() set_light(l_range = 1.9, l_power = 5, l_color = CIRCUIT_COLOR_SECURITY, l_on = TRUE) if(COOLDOWN_FINISHED(src, alarm_cooldown)) - playsound(source = src, soundin = 'sound/machines/twobeep.ogg', vol = 50, vary = TRUE) + playsound(source = src, soundin = 'sound/machines/beep/twobeep.ogg', vol = 50, vary = TRUE) spasm_animation(1 SECONDS) COOLDOWN_START(src, alarm_cooldown, ALARM_PERIOD) else diff --git a/modular_zubbers/code/game/objects/items/plushes.dm b/modular_zubbers/code/game/objects/items/plushes.dm index 51031467013..36b40d127be 100644 --- a/modular_zubbers/code/game/objects/items/plushes.dm +++ b/modular_zubbers/code/game/objects/items/plushes.dm @@ -4,7 +4,7 @@ icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' icon_state = "chaotic_toaster" attack_verb_simple = list("beeped", "booped", "pinged") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/Synth name = "Synth plushie" @@ -32,7 +32,7 @@ icon_state = "chirp"//Sprited by Kan3/kaylexi attack_verb_continuous = list("chirps", "chimes") attack_verb_simple = list("chirps") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) gender = FEMALE /obj/item/toy/plush/bigdeer diff --git a/modular_zubbers/code/game/objects/structures/trash_pile.dm b/modular_zubbers/code/game/objects/structures/trash_pile.dm index b86fd9ad7d8..80888bae6b4 100644 --- a/modular_zubbers/code/game/objects/structures/trash_pile.dm +++ b/modular_zubbers/code/game/objects/structures/trash_pile.dm @@ -27,7 +27,7 @@ 'sound/effects/footstep/clownstep1.ogg' = 5, 'sound/effects/footstep/clownstep2.ogg' = 5, 'sound/effects/footstep/meowstep1.ogg' = 1, - 'sound/effects/attackblob.ogg' = 10, + 'sound/effects/blob/attackblob.ogg' = 10, 'sound/effects/bang.ogg' = 10, 'sound/effects/bin_close.ogg' = 20, 'sound/effects/bin_open.ogg' = 20, diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm index 2c02cff3337..0a8232b8212 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm @@ -131,7 +131,7 @@ */ /datum/bloodsucker_clan/proc/on_ghoul_made(datum/antagonist/bloodsucker/source, mob/living/user, mob/living/target) SIGNAL_HANDLER - user.playsound_local(null, 'sound/effects/explosion_distant.ogg', 40, TRUE) + user.playsound_local(null, 'sound/effects/explosion/explosion_distant.ogg', 40, TRUE) target.playsound_local(null, 'sound/effects/singlebeat.ogg', 40, TRUE) target.set_timed_status_effect(15 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) INVOKE_ASYNC(target, TYPE_PROC_REF(/mob, emote), "laugh") diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm index b2fdccd075b..74ffba7b495 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm @@ -26,7 +26,7 @@ carbon_owner.gain_trauma(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE) owner_datum.owner.current.update_sight() - bloodsuckerdatum.owner.current.playsound_local(get_turf(bloodsuckerdatum.owner.current), 'sound/ambience/antag/creepalert.ogg', 80, FALSE, pressure_affected = FALSE, use_reverb = FALSE) + bloodsuckerdatum.owner.current.playsound_local(get_turf(bloodsuckerdatum.owner.current), 'sound/music/antag/creepalert.ogg', 80, FALSE, pressure_affected = FALSE, use_reverb = FALSE) to_chat(bloodsuckerdatum.owner.current, span_hypnophrase("Welcome to the Malkavian...")) /datum/bloodsucker_clan/malkavian/Destroy(force) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm index 71b22cb0d2c..4cab379f4a8 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm @@ -39,7 +39,7 @@ /obj/structure/bloodsucker/attackby(obj/item/item, mob/living/user, params) /// If a Bloodsucker tries to wrench it in place, yell at them. if(item.tool_behaviour == TOOL_WRENCH && !anchored && IS_BLOODSUCKER(user)) - user.playsound_local(null, 'sound/machines/buzz-sigh.ogg', 40, FALSE, pressure_affected = FALSE) + user.playsound_local(null, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE, pressure_affected = FALSE) to_chat(user, span_announce("* Bloodsucker Tip: Examine Bloodsucker structures to understand how they function!")) return return ..() diff --git a/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm b/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm index a2587ec072a..b1b96275555 100644 --- a/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm +++ b/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm @@ -5,7 +5,7 @@ if(action == ANTIVIRUS) if(!occupier?.stat) to_chat(usr, span_notice("Dr. Moffson Antivirus is scanning your AI for corruption.")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 25, FALSE) restoring = TRUE run_antivirus() occupier.notify_revival("Dr. Moffson is debugging your programming!", source = src) @@ -44,7 +44,7 @@ return TRUE else say("I/O error in attempt to remove malicious files. Please try again later.") - playsound(occupier, 'sound/machines/buzz-two.ogg') + playsound(occupier, 'sound/machines/buzz/buzz-two.ogg') restoring = FALSE return FALSE @@ -54,7 +54,7 @@ . = ..() if(action == ANTIVIRUS) to_chat(usr, span_notice("Dr. Moffson Antivirus is scanning your AI for corruption.")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 25, FALSE) restoring = TRUE run_antivirus() . = TRUE @@ -93,7 +93,7 @@ return TRUE else computer.say("I/O error in attempt to remove malicious files. Please try again later.") - playsound(bad_ai, 'sound/machines/buzz-two.ogg') + playsound(bad_ai, 'sound/machines/buzz/buzz-two.ogg') restoring = FALSE return FALSE diff --git a/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm b/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm index d204d837219..caf6c753345 100644 --- a/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm +++ b/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm @@ -176,7 +176,7 @@ playsound(user, 'modular_zubbers/sound/arcade/minesweeper_emag1.ogg', 100, 0, extrarange = 3, falloff_exponent = 10) else //Can't let you do that, star fox! to_chat(user, span_warning("The machine buzzes and sparks... the game has been reset!")) - playsound(user, 'sound/machines/buzz-sigh.ogg', 100, 0, extrarange = 3, falloff_exponent = 10) //Loud buzz + playsound(user, 'sound/machines/buzz/buzz-sigh.ogg', 100, 0, extrarange = 3, falloff_exponent = 10) //Loud buzz board.game_status = MINESWEEPER_IDLE diff --git a/modular_zubbers/code/modules/blooper/bark_list.dm b/modular_zubbers/code/modules/blooper/bark_list.dm index c764217aa7d..902918d5a87 100644 --- a/modular_zubbers/code/modules/blooper/bark_list.dm +++ b/modular_zubbers/code/modules/blooper/bark_list.dm @@ -31,13 +31,13 @@ /datum/blooper/squeaky name = "Squeaky" id = "squeak" - soundpath = 'sound/items/toysqueak1.ogg' + soundpath = 'sound/items/toy_squeak/toysqueak1.ogg' maxspeed = 4 /datum/blooper/beep name = "Beepy" id = "beep" - soundpath = 'sound/machines/terminal_select.ogg' + soundpath = 'sound/machines/terminal/terminal_select.ogg' maxpitch = 1 //Bringing the pitch higher just hurts your ears :< maxspeed = 4 //This soundbyte's too short for larger speeds to not sound awkward @@ -55,7 +55,7 @@ /datum/blooper/synthetic name = "Synthetic (Normal)" id = "synth" - soundpath = 'sound/machines/uplinkerror.ogg' + soundpath = 'sound/machines/uplink/uplinkerror.ogg' /datum/blooper/bullet name = "Windy" diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm index 9b967dac9ad..f4a68900286 100644 --- a/modular_zubbers/code/modules/emotes/emotes.dm +++ b/modular_zubbers/code/modules/emotes/emotes.dm @@ -71,7 +71,7 @@ message = "snaps their fingers." message_param = "snaps their fingers at %t." emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE - sound = 'sound/misc/fingersnap1.ogg' + sound = 'sound/mobs/humanoids/human/snap/fingersnap1.ogg' /datum/emote/living/meow_alt key = "meow1" @@ -95,7 +95,7 @@ message = "rapidly flutters their wings!" emote_type = EMOTE_AUDIBLE vary = TRUE - sound = 'sound/voice/moth/moth_flutter.ogg' + sound = 'sound/mobs/humanoids/moth/moth_flutter.ogg' /datum/emote/living/sigh_exasperated key = "esigh" // short for exasperated sigh diff --git a/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm b/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm index 248dea523c4..2b535d6eab9 100644 --- a/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm +++ b/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm @@ -6,8 +6,8 @@ inhand_icon_state = "lunchbox" lefthand_file = 'modular_zubbers/code/modules/lunchbox/icons/lunchbox_lefthand.dmi' righthand_file = 'modular_zubbers/code/modules/lunchbox/icons/lunchbox_righthand.dmi' - drop_sound = 'sound/items/handling/cardboardbox_drop.ogg' - pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg' + drop_sound = 'sound/items/handling/cardboard_box/cardboardbox_drop.ogg' + pickup_sound = 'sound/items/handling/cardboard_box/cardboardbox_pickup.ogg' throw_speed = 3 throw_range = 7 @@ -59,4 +59,4 @@ name = "suspicious lunchbox" icon_state = "lunchbox_suspicious" inhand_icon_state = "lunchbox_suspicious" - desc = "A plain red lunchbox... right?" \ No newline at end of file + desc = "A plain red lunchbox... right?" diff --git a/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm b/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm index 1a1783f9263..0147b9e9267 100644 --- a/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm +++ b/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm @@ -23,7 +23,7 @@ SSjob.prioritized_jobs -= silicon else SSjob.prioritized_jobs += silicon - playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + playsound(computer, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE) return TRUE /datum/computer_file/program/silicon_management/ui_data(mob/user) diff --git a/modular_zubbers/code/modules/silicons/silicon.dm b/modular_zubbers/code/modules/silicons/silicon.dm index 1deb65b2fc4..d1372ee9ffe 100644 --- a/modular_zubbers/code/modules/silicons/silicon.dm +++ b/modular_zubbers/code/modules/silicons/silicon.dm @@ -48,9 +48,9 @@ door.visible_message(span_danger("Wow you really pissed [src] off, they bolted the door in your face!"), vision_distance = COMBAT_MESSAGE_RANGE) if("shock") door.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME) - playsound(door, 'sound/machines/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) + playsound(door, 'sound/machines/buzz/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) door.visible_message(span_notice("The door buzzes, [src] has denied your request"), vision_distance = COMBAT_MESSAGE_RANGE) if("deny") - playsound(door, 'sound/machines/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) + playsound(door, 'sound/machines/buzz/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) door.visible_message(span_notice("The door buzzes, [src] has denied your request"), vision_distance = COMBAT_MESSAGE_RANGE) to_chat(src, "You deny [requester]'s request") diff --git a/modular_zubbers/code/modules/vehicles/mech_fabricator.dm b/modular_zubbers/code/modules/vehicles/mech_fabricator.dm index 4e55344248a..c8727102743 100644 --- a/modular_zubbers/code/modules/vehicles/mech_fabricator.dm +++ b/modular_zubbers/code/modules/vehicles/mech_fabricator.dm @@ -17,7 +17,7 @@ illegal_local_designs |= illegal_mech_design cached_designs |= illegal_mech_design say("R$c!i&ed ERROR de#i$ns. C@n%ec$%ng to ~NULL~ se%ve$s.") - playsound(src, 'sound/machines/uplinkerror.ogg', 50, TRUE) + playsound(src, 'sound/machines/uplink/uplinkerror.ogg', 50, TRUE) update_static_data_for_all_viewers() return TRUE else diff --git a/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm b/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm index 2715fbe5022..75c801ffe7e 100644 --- a/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm +++ b/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm @@ -76,7 +76,7 @@ if (istype(part, /obj/item/clothing)) // make sure it's a modsuit piece and not a module, we retract those too if (!istype(part, /obj/item/clothing/head/mod)) // they can only retract the helmet, them's the sticks human_user.balloon_alert(human_user, "part is fused to you - can't retract!") - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return return ..() @@ -87,7 +87,7 @@ //if we're deploy_locked, just disable this functionality entirely if (tomb_quirk && tomb_quirk.deploy_locked) human_user.balloon_alert(human_user, "you can only retract your helmet, and only manually!") - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return return ..()