From 4073ac9b0000176787e37845b2b8055144bef6eb Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sat, 18 Aug 2012 16:33:40 +0000 Subject: [PATCH] Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus. All credits to the author for this handy little script. I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work. To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders" If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e --- .../components/binary_devices/passive_gate.dm | 2 +- .../components/binary_devices/pump.dm | 2 +- .../components/portables_connector.dm | 2 +- .../components/trinary_devices/filter.dm | 2 +- .../components/trinary_devices/mixer.dm | 2 +- .../components/unary/vent_pump.dm | 4 +- .../components/unary/vent_scrubber.dm | 2 +- code/ATMOSPHERICS/components/valve.dm | 2 +- code/ATMOSPHERICS/pipes.dm | 4 +- code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm | 22 +- code/WorkInProgress/virus2/analyser.dm | 2 +- .../virus2/biohazard destroyer.dm | 4 +- code/WorkInProgress/virus2/cureimplanter.dm | 2 +- code/WorkInProgress/virus2/curer.dm | 4 +- code/WorkInProgress/virus2/diseasesplicer.dm | 6 +- code/WorkInProgress/virus2/dishincubator.dm | 2 +- code/WorkInProgress/virus2/isolator.dm | 4 +- code/WorkInProgress/virus2/monkeydispensor.dm | 2 +- code/datums/diseases/alien_embryo.dm | 2 +- code/datums/diseases/appendicitis.dm | 2 +- code/datums/shuttle_controller.dm | 4 +- code/datums/spell.dm | 4 +- code/datums/spells/area_teleport.dm | 4 +- code/defines/area/Space Station 13 areas.dm | 6 +- code/defines/obj/toy.dm | 16 +- code/defines/obj/weapon.dm | 6 +- code/defines/procs/helpers.dm | 2 +- code/game/area/areas.dm | 24 +- code/game/atom_procs.dm | 2 +- code/game/cellautomata.dm | 6 +- code/game/chemistry.dm | 8 +- code/game/gamemodes/blob/blob.dm | 2 +- code/game/gamemodes/blob/blobs/core.dm | 2 +- code/game/gamemodes/blob/blobs/factory.dm | 2 +- code/game/gamemodes/blob/blobs/node.dm | 2 +- code/game/gamemodes/blob/blobs/shield.dm | 2 +- code/game/gamemodes/blob/theblob.dm | 6 +- code/game/gamemodes/events.dm | 24 +- code/game/gamemodes/events/dust.dm | 2 +- code/game/gamemodes/events/miniblob.dm | 2 +- code/game/gamemodes/events/ninja_abilities.dm | 16 +- code/game/gamemodes/events/ninja_equipment.dm | 12 +- code/game/gamemodes/events/space_ninja.dm | 2 +- code/game/gamemodes/events/wormholes.dm | 2 +- code/game/gamemodes/game_mode.dm | 2 +- code/game/gamemodes/gameticker.dm | 18 +- .../game/gamemodes/malfunction/malfunction.dm | 4 +- code/game/gamemodes/meteor/meteors.dm | 4 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 2 +- code/game/gamemodes/nuclear/pinpointer.dm | 4 +- code/game/machinery/alarm.dm | 2 +- code/game/machinery/atmo_control.dm | 4 +- .../atmoalter/area_atmos_computer.dm | 2 +- code/game/machinery/atmoalter/canister.dm | 2 +- code/game/machinery/atmoalter/meter.dm | 2 +- code/game/machinery/autolathe.dm | 2 +- code/game/machinery/biogenerator.dm | 2 +- code/game/machinery/bots/bots.dm | 2 +- code/game/machinery/bots/ed209bot.dm | 10 +- code/game/machinery/bots/mulebot.dm | 20 +- code/game/machinery/bots/secbot.dm | 8 +- code/game/machinery/camera.dm | 8 +- code/game/machinery/cell_charger.dm | 2 +- .../machinery/computer/HolodeckControl.dm | 8 +- code/game/machinery/computer/ai_core.dm | 26 +- code/game/machinery/computer/aifixer.dm | 2 +- code/game/machinery/computer/arcade.dm | 2 +- code/game/machinery/computer/atmos_alert.dm | 2 +- .../game/machinery/computer/buildandrepair.dm | 24 +- code/game/machinery/computer/cloning.dm | 2 +- .../game/machinery/computer/communications.dm | 6 +- code/game/machinery/computer/computer.dm | 2 +- code/game/machinery/computer/message.dm | 4 +- code/game/machinery/computer/pod.dm | 2 +- code/game/machinery/computer/power.dm | 2 +- code/game/machinery/constructable_frame.dm | 12 +- code/game/machinery/doors/airlock.dm | 18 +- code/game/machinery/doors/windowdoor.dm | 12 +- code/game/machinery/flasher.dm | 2 +- code/game/machinery/hydroponics.dm | 10 +- code/game/machinery/kitchen/blender.dm | 2 +- code/game/machinery/kitchen/gibber.dm | 2 +- code/game/machinery/kitchen/juicer.dm | 2 +- code/game/machinery/kitchen/microwave.dm | 6 +- code/game/machinery/kitchen/processor.dm | 2 +- code/game/machinery/morgue.dm | 10 +- code/game/machinery/newscaster.dm | 10 +- code/game/machinery/pipe/construction.dm | 4 +- code/game/machinery/pipe/pipe_dispenser.dm | 4 +- code/game/machinery/portable_turret.dm | 22 +- code/game/machinery/recharger.dm | 2 +- code/game/machinery/requests_console.dm | 6 +- code/game/machinery/shieldgen.dm | 14 +- code/game/machinery/suit_storage_unit.dm | 2 +- code/game/machinery/telecomms/logbrowser.dm | 4 +- .../telecomms/machine_interactions.dm | 12 +- code/game/machinery/telecomms/telemonitor.dm | 4 +- .../machinery/telecomms/traffic_control.dm | 4 +- code/game/machinery/turrets.dm | 6 +- code/game/magic/cultist/runes.dm | 2 +- code/game/magic/musician.dm | 342 ++--- code/game/mecha/combat/combat.dm | 4 +- code/game/mecha/combat/honker.dm | 2 +- code/game/mecha/combat/marauder.dm | 2 +- code/game/mecha/equipment/mecha_equipment.dm | 4 +- .../mecha/equipment/tools/medical_tools.dm | 1342 ++++++++--------- code/game/mecha/equipment/tools/tools.dm | 20 +- .../mecha/equipment/tools/unused_tools.dm | 314 ++-- code/game/mecha/equipment/weapons/weapons.dm | 24 +- code/game/mecha/mech_fabricator.dm | 2 +- code/game/mecha/mecha.dm | 24 +- code/game/mecha/mecha_construction_paths.dm | 22 +- code/game/mecha/medical/medical.dm | 6 +- code/game/objects/alien/egg.dm | 2 +- code/game/objects/alien/nest.dm | 2 +- code/game/objects/alien/resin.dm | 6 +- code/game/objects/alien/weeds.dm | 2 +- code/game/objects/cleaner.dm | 2 +- code/game/objects/closets.dm | 8 +- code/game/objects/closets/fireaxe.dm | 8 +- code/game/objects/closets/secure/personal.dm | 2 +- .../objects/closets/secure/secure_closets.dm | 2 +- code/game/objects/contraband.dm | 6 +- code/game/objects/crates.dm | 6 +- code/game/objects/devices/PDA/PDA.dm | 10 +- code/game/objects/devices/chameleonproj.dm | 6 +- code/game/objects/devices/flash.dm | 4 +- code/game/objects/devices/lightreplacer.dm | 4 +- code/game/objects/devices/powersink.dm | 2 +- code/game/objects/devices/traitordevices.dm | 2 +- code/game/objects/displaycase.dm | 2 +- code/game/objects/door_assembly.dm | 32 +- code/game/objects/effect_system.dm | 4 +- code/game/objects/electricchair.dm | 2 +- code/game/objects/explosion.dm | 2 +- code/game/objects/explosion2.dm | 2 +- code/game/objects/explosion_recursive.dm | 2 +- code/game/objects/grenades/chem_grenade.dm | 38 +- code/game/objects/grenades/flashbang.dm | 8 +- code/game/objects/grenades/grenade.dm | 6 +- code/game/objects/grenades/smokebomb.dm | 2 +- code/game/objects/grenades/spawnergrenade.dm | 2 +- code/game/objects/grille.dm | 14 +- code/game/objects/items.dm | 16 +- code/game/objects/items/robot_items.dm | 16 +- code/game/objects/items/weapons/RCD.dm | 28 +- code/game/objects/items/weapons/RSF.dm | 28 +- code/game/objects/items/weapons/cameras.dm | 2 +- .../game/objects/items/weapons/clown_items.dm | 8 +- code/game/objects/items/weapons/kitchen.dm | 16 +- code/game/objects/items/weapons/spray.dm | 4 +- code/game/objects/items/weapons/stunbaton.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 10 +- code/game/objects/items/weapons/toilets.dm | 2 +- code/game/objects/items/weapons/tools.dm | 2 +- code/game/objects/lamarr.dm | 2 +- code/game/objects/mineral_doors.dm | 12 +- code/game/objects/radio/beacon.dm | 2 +- code/game/objects/secstorage/secstorage.dm | 2 +- code/game/objects/stacks/glass.dm | 2 +- code/game/objects/stool.dm | 6 +- code/game/objects/storage/lockbox.dm | 2 +- code/game/objects/structures.dm | 12 +- code/game/objects/tables_racks.dm | 24 +- code/game/objects/tank.dm | 4 +- code/game/objects/tanks/emergency.dm | 2 +- code/game/objects/tanks/jetpack.dm | 4 +- code/game/objects/tanks/oxygen.dm | 2 +- code/game/objects/watercloset.dm | 2 +- code/game/objects/weapons.dm | 4 +- code/game/objects/windoor_assembly.dm | 14 +- code/game/objects/window.dm | 18 +- code/game/prisonshuttle.dm | 2 +- code/game/sound.dm | 38 +- code/game/supplyshuttle.dm | 2 +- code/game/turf.dm | 60 +- code/modules/admin/admin.dm | 8 +- code/modules/admin/create_mob.dm | 2 +- code/modules/admin/create_object.dm | 4 +- code/modules/admin/create_turf.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 4 +- code/modules/admin/verbs/adminpm.dm | 4 +- code/modules/admin/verbs/randomverbs.dm | 8 +- code/modules/chemical/Chemistry-Holder.dm | 2 +- code/modules/chemical/Chemistry-Machinery.dm | 6 +- code/modules/chemical/Chemistry-Recipes.dm | 10 +- code/modules/chemical/Chemistry-Tools.dm | 16 +- code/modules/critters/critter_defenses.dm | 4 +- code/modules/critters/critters.dm | 6 +- code/modules/critters/hivebots/hivebot.dm | 4 +- code/modules/flufftext/Hallucination.dm | 42 +- code/modules/mining/mine_items.dm | 2 +- code/modules/mining/mine_turfs.dm | 8 +- code/modules/mob/dead/observer/say.dm | 8 +- .../mob/living/carbon/alien/humanoid/death.dm | 2 +- .../mob/living/carbon/alien/humanoid/emote.dm | 4 +- .../living/carbon/alien/humanoid/humanoid.dm | 14 +- .../mob/living/carbon/alien/larva/larva.dm | 8 +- code/modules/mob/living/carbon/carbon.dm | 4 +- .../living/carbon/human/human_attackalien.dm | 12 +- .../living/carbon/human/human_attackhand.dm | 16 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../mob/living/carbon/metroid/metroid.dm | 22 +- .../mob/living/carbon/monkey/monkey.dm | 18 +- code/modules/mob/living/silicon/ai/ai.dm | 4 +- code/modules/mob/living/silicon/ai/death.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 6 +- .../mob/living/silicon/pai/software.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 10 +- .../mob/living/simple_animal/behemoth.dm | 2 +- code/modules/mob/living/simple_animal/carp.dm | 2 +- .../mob/living/simple_animal/constructs.dm | 6 +- code/modules/mob/living/simple_animal/crab.dm | 2 +- code/modules/mob/mob.dm | 40 +- code/modules/mob/new_player/login.dm | 78 +- code/modules/paperwork/filingcabinet.dm | 2 +- code/modules/paperwork/paper.dm | 2 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/power/antimatter/control.dm | 8 +- code/modules/power/apc.dm | 16 +- code/modules/power/lighting.dm | 16 +- code/modules/power/port_gen.dm | 4 +- code/modules/power/singularity/collector.dm | 2 +- code/modules/power/singularity/emitter.dm | 10 +- .../power/singularity/field_generator.dm | 8 +- code/modules/power/singularity/generator.dm | 2 +- .../particle_accelerator.dm | 8 +- code/modules/power/solar.dm | 2 +- code/modules/power/turbine.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 6 +- .../projectiles/guns/energy/nuclear.dm | 6 +- code/modules/projectiles/guns/energy/pulse.dm | 8 +- .../projectiles/guns/energy/special.dm | 8 +- code/modules/projectiles/guns/energy/stun.dm | 8 +- .../projectiles/guns/energy/temperature.dm | 2 +- .../projectiles/guns/projectile/automatic.dm | 4 +- .../projectiles/guns/projectile/pistol.dm | 4 +- .../projectiles/guns/projectile/shotgun.dm | 2 +- .../recycling/disposal-construction.dm | 4 +- code/modules/recycling/disposal.dm | 30 +- code/modules/recycling/sortingmachinery.dm | 8 +- code/modules/research/circuitprinter.dm | 2 +- code/modules/research/destructive_analyzer.dm | 2 +- code/modules/research/protolathe.dm | 2 +- code/modules/research/rdconsole.dm | 4 +- code/modules/research/server.dm | 6 +- code/setup.dm | 2 +- code/unused/AI_Visibility.dm | 10 +- code/unused/Agouri_stuff.dm | 70 +- code/unused/BrokenInhands.dm | 4 +- code/unused/Ultralight.dm | 2 +- code/unused/_debug.dm | 30 +- code/unused/airtunnel.dm | 2 +- code/unused/assemblies.dm | 8 +- code/unused/asteroiddevice.dm | 2 +- code/unused/computer2/buildandrepair.dm | 32 +- code/unused/computer2/computerII.dm | 4 +- code/unused/computer2/messenger.dm | 2 +- code/unused/computer2/peripherals.dm | 4 +- code/unused/conveyor.dm | 6 +- code/unused/disease2/analyser.dm | 2 +- code/unused/disease2/biohazard destroyer.dm | 4 +- code/unused/disease2/cureimplanter.dm | 2 +- code/unused/disease2/curer.dm | 4 +- code/unused/disease2/diseasesplicer.dm | 6 +- code/unused/disease2/dishincubator.dm | 2 +- code/unused/disease2/isolator.dm | 4 +- code/unused/disease2/monkeydispensor.dm | 2 +- code/unused/filter_control.dm | 22 +- code/unused/hivebot/hive_modules.dm | 2 +- code/unused/hivebot/hivebot.dm | 10 +- code/unused/hivebot/hivebotdefine.dm | 2 +- code/unused/hivebot/hud.dm | 46 +- .../mining/machine_gas_extractor_unused.dm | 2 +- code/unused/mining/machine_purifier_unused.dm | 2 +- code/unused/mining/rail_unused.dm | 8 +- .../unused/mining/spaceship_builder_unused.dm | 2 +- code/unused/new_year.dm | 6 +- code/unused/optics/beam.dm | 4 +- code/unused/pda2/pda2.dm | 8 +- code/unused/pipe.dm | 12 +- code/unused/pipe_filter.dm | 16 +- code/unused/spacecraft/manufacturing.dm | 10 +- maps/tgstation.2.0.9.dmm | 56 +- tgstation.dme | 199 --- tools/expand_filedir_paths.py | 93 ++ 288 files changed, 2212 insertions(+), 2318 deletions(-) create mode 100644 tools/expand_filedir_paths.py diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index aee6b2fa37..203e17e130 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -1,7 +1,7 @@ obj/machinery/atmospherics/binary/passive_gate //Tries to achieve target pressure at output (like a normal pump) except // Uses no power but can not transfer gases from a low pressure area to a high pressure area - icon = 'passive_gate.dmi' + icon = 'icons/obj/atmospherics/passive_gate.dmi' icon_state = "intact_off" name = "Passive gate" diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index b547e636c0..8c57db80e0 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -188,7 +188,7 @@ obj/machinery/atmospherics/binary/pump user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index 6652de9ffb..8d7a6efb05 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -146,7 +146,7 @@ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index b7101ab5b8..55b0a19516 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -144,7 +144,7 @@ Filter types: user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 9001d56ef8..026c3531fd 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -95,7 +95,7 @@ obj/machinery/atmospherics/trinary/mixer user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 15fcac1e39..191f8d37d1 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -258,7 +258,7 @@ user << "\blue Now welding the vent." if(do_after(user, 20)) if(!src || !WT.isOn()) return - playsound(src.loc, 'Welder2.ogg', 50, 1) + playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) if(!welded) user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.") welded = 1 @@ -301,7 +301,7 @@ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index bbad62b892..012ee2cc96 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -248,7 +248,7 @@ user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index f8cd56462e..835adeed27 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -320,7 +320,7 @@ obj/machinery/atmospherics/valve user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 4b3d2b5bb3..422b4e941d 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -159,7 +159,7 @@ obj/machinery/atmospherics/pipe proc/burst() src.visible_message("\red \bold [src] bursts!"); - playsound(src.loc, 'bang.ogg', 25, 1) + playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) var/datum/effect/effect/system/harmless_smoke_spread/smoke = new smoke.set_up(1,0, src.loc, 0) smoke.start() @@ -818,7 +818,7 @@ obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/u user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm index 35125615cb..339af71e29 100644 --- a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm +++ b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm @@ -372,23 +372,23 @@ mob var/datum/pipe_network/master = P.return_network() if(master) - P.overlays += icon('atmos_testing.dmi',"marker[master.marker]") + P.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[master.marker]") else world << "error" - P.overlays += icon('atmos_testing.dmi',"marker0") + P.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0") for(var/obj/machinery/atmospherics/valve/V in world) V.overlays = null if(V.network_node1) - V.overlays += icon('atmos_testing.dmi',"marker[V.network_node1.marker]") + V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[V.network_node1.marker]") else - V.overlays += icon('atmos_testing.dmi',"marker0") + V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0") if(V.network_node2) - V.overlays += icon('atmos_testing.dmi',"marker[V.network_node2.marker]") + V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker[V.network_node2.marker]") else - V.overlays += icon('atmos_testing.dmi',"marker0") + V.overlays += icon('icons/Testing/atmos_testing.dmi',"marker0") turf/simulated var/fire_verbose = 0 @@ -399,9 +399,9 @@ turf/simulated overlays = null for(var/direction in list(NORTH,SOUTH,EAST,WEST)) if(group_border&direction) - overlays += icon('turf_analysis.dmi',"red_arrow",direction) + overlays += icon('icons/Testing/turf_analysis.dmi',"red_arrow",direction) else if(air_check_directions&direction) - overlays += icon('turf_analysis.dmi',"arrow",direction) + overlays += icon('icons/Testing/turf_analysis.dmi',"arrow",direction) air_status() set src in world set category = "Minor" @@ -446,7 +446,7 @@ turf/simulated assume_air(adding) obj/indicator - icon = 'air_meter.dmi' + icon = 'icons/Testing/air_meter.dmi' var/measure = "temperature" anchored = 1 @@ -562,7 +562,7 @@ mob group.marker = 0 for(var/turf/simulated/floor/S in world) - S.icon = 'turf_analysis.dmi' + S.icon = 'icons/Testing/turf_analysis.dmi' if(S.parent) if(S.parent.group_processing) if (S.parent.check_delay < 2) @@ -608,7 +608,7 @@ mob group.marker = 0 for(var/turf/simulated/floor/S in world) - S.icon = 'turf_analysis.dmi' + S.icon = 'icons/Testing/turf_analysis.dmi' if(S.parent) if(S.parent.group_processing) if(S.parent.marker == 0) diff --git a/code/WorkInProgress/virus2/analyser.dm b/code/WorkInProgress/virus2/analyser.dm index 3604d7955f..fa2407e69f 100644 --- a/code/WorkInProgress/virus2/analyser.dm +++ b/code/WorkInProgress/virus2/analyser.dm @@ -1,6 +1,6 @@ /obj/machinery/disease2/diseaseanalyser name = "Disease Analyser" - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "analyser" anchored = 1 density = 1 diff --git a/code/WorkInProgress/virus2/biohazard destroyer.dm b/code/WorkInProgress/virus2/biohazard destroyer.dm index 3e5f16df59..abd1803de8 100644 --- a/code/WorkInProgress/virus2/biohazard destroyer.dm +++ b/code/WorkInProgress/virus2/biohazard destroyer.dm @@ -1,6 +1,6 @@ /obj/machinery/disease2/biodestroyer name = "Biohazard destroyer" - icon = 'disposal.dmi' + icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposalbio" var/list/accepts = list(/obj/item/clothing,/obj/item/weapon/virusdish/,/obj/item/weapon/cureimplanter,/obj/item/weapon/diseasedisk,/obj/item/weapon/reagent_containers) density = 1 @@ -11,7 +11,7 @@ if(I.type in typesof(path)) user.drop_item() del(I) - overlays += image('disposal.dmi', "dispover-handle") + overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle") return user.drop_item() I.loc = src.loc diff --git a/code/WorkInProgress/virus2/cureimplanter.dm b/code/WorkInProgress/virus2/cureimplanter.dm index 80354e5765..7fc9ea9683 100644 --- a/code/WorkInProgress/virus2/cureimplanter.dm +++ b/code/WorkInProgress/virus2/cureimplanter.dm @@ -1,6 +1,6 @@ /obj/item/weapon/cureimplanter name = "Hypospray injector" - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "implanter1" var/datum/disease2/resistance/resistance = null var/works = 0 diff --git a/code/WorkInProgress/virus2/curer.dm b/code/WorkInProgress/virus2/curer.dm index f4f53cff1b..cbd155711c 100644 --- a/code/WorkInProgress/virus2/curer.dm +++ b/code/WorkInProgress/virus2/curer.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/curer name = "Cure Research Machine" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "dna" var/curing var/virusing @@ -9,7 +9,7 @@ /obj/machinery/computer/curer/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." diff --git a/code/WorkInProgress/virus2/diseasesplicer.dm b/code/WorkInProgress/virus2/diseasesplicer.dm index 624f725f09..e238af93c8 100644 --- a/code/WorkInProgress/virus2/diseasesplicer.dm +++ b/code/WorkInProgress/virus2/diseasesplicer.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/diseasesplicer name = "Disease Splicer" - icon = 'computer.dmi' + icon = 'icons/obj/computer.dmi' icon_state = "crew" var/datum/disease2/effectholder/memorybank = null @@ -13,7 +13,7 @@ /obj/machinery/computer/diseasesplicer/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." @@ -173,7 +173,7 @@ /obj/item/weapon/diseasedisk name = "Blank GNA disk" - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "datadisk0" var/datum/disease2/effectholder/effect = null var/stage = 1 diff --git a/code/WorkInProgress/virus2/dishincubator.dm b/code/WorkInProgress/virus2/dishincubator.dm index e6d0da1239..06833ab550 100644 --- a/code/WorkInProgress/virus2/dishincubator.dm +++ b/code/WorkInProgress/virus2/dishincubator.dm @@ -2,7 +2,7 @@ name = "Pathogenic incubator" density = 1 anchored = 1 - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "incubator" var/obj/item/weapon/virusdish/dish var/obj/item/weapon/reagent_containers/glass/beaker = null diff --git a/code/WorkInProgress/virus2/isolator.dm b/code/WorkInProgress/virus2/isolator.dm index 2da3be53ec..3e20e4b8ac 100644 --- a/code/WorkInProgress/virus2/isolator.dm +++ b/code/WorkInProgress/virus2/isolator.dm @@ -2,7 +2,7 @@ name = "Pathogenic Isolator" density = 1 anchored = 1 - icon = 'virology.dmi' + icon = 'icons/obj/virology.dmi' icon_state = "isolator" var/datum/disease2/disease/virus2 = null var/isolating = 0 @@ -115,7 +115,7 @@ /obj/item/weapon/virusdish name = "Virus containment/growth dish" - icon = 'items.dmi' + icon = 'icons/obj/items.dmi' icon_state = "implantcase-b" var/datum/disease2/disease/virus2 = null var/growth = 0 diff --git a/code/WorkInProgress/virus2/monkeydispensor.dm b/code/WorkInProgress/virus2/monkeydispensor.dm index aee24b0d4a..d4da072c64 100644 --- a/code/WorkInProgress/virus2/monkeydispensor.dm +++ b/code/WorkInProgress/virus2/monkeydispensor.dm @@ -1,6 +1,6 @@ /obj/machinery/disease2/monkeycloner name = "Monkey dispensor" - icon = 'cloning.dmi' + icon = 'icons/obj/cloning.dmi' icon_state = "pod_0" density = 1 anchored = 1 diff --git a/code/datums/diseases/alien_embryo.dm b/code/datums/diseases/alien_embryo.dm index b1da92b74c..5a6f16fb5d 100644 --- a/code/datums/diseases/alien_embryo.dm +++ b/code/datums/diseases/alien_embryo.dm @@ -82,7 +82,7 @@ else new_xeno.key = affected_mob.key - new_xeno << sound('hiss5.ogg',0,0,0,100) //To get the player's attention + new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100) //To get the player's attention affected_mob.gib() src.cure(0) gibbed = 1 diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 6c822adb1e..68a0eeabf8 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -29,7 +29,7 @@ affected_mob.Stun(rand(4,6)) for(var/mob/O in viewers(world.view, affected_mob)) O.show_message(text("\red [] throws up!", affected_mob), 1) - playsound(affected_mob.loc, 'splat.ogg', 50, 1) + playsound(affected_mob.loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = affected_mob.loc if (istype(location, /turf/simulated)) location.add_vomit_floor(affected_mob) diff --git a/code/datums/shuttle_controller.dm b/code/datums/shuttle_controller.dm index 0f1710a00c..2af57a876d 100644 --- a/code/datums/shuttle_controller.dm +++ b/code/datums/shuttle_controller.dm @@ -39,7 +39,7 @@ datum/shuttle_controller if(timeleft >= 600) return captain_announce("The emergency shuttle has been recalled.") - world << sound('shuttlerecalled.ogg') + world << sound('sound/AI/shuttlerecalled.ogg') setdirection(-1) online = 1 @@ -257,7 +257,7 @@ datum/shuttle_controller settimeleft(SHUTTLELEAVETIME) send2irc("Server", "The Emergency Shuttle has docked with the station.") captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.") - world << sound('shuttledock.ogg') + world << sound('sound/AI/shuttledock.ogg') return 1 diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 8863bac0cd..c7d7d88cfd 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -98,9 +98,9 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin else usr.say(dd_replacetext(invocation," ","`")) if(usr.gender=="male") - playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1) + playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1) else - playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1) + playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1) if("whisper") if(prob(50)) usr.whisper(invocation) diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm index 046a2d39db..9dc457aa1b 100644 --- a/code/datums/spells/area_teleport.dm +++ b/code/datums/spells/area_teleport.dm @@ -60,9 +60,9 @@ if("shout") usr.say("[invocation] [uppertext(chosenarea.name)]") if(usr.gender=="male") - playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1) + playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1) else - playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1) + playsound(usr.loc, pick('sound/misc/null.ogg','sound/misc/null.ogg'), 100, 1) if("whisper") usr.whisper("[invocation] [uppertext(chosenarea.name)]") diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm index 24169a16e5..e6e24e4f70 100644 --- a/code/defines/area/Space Station 13 areas.dm +++ b/code/defines/area/Space Station 13 areas.dm @@ -931,7 +931,7 @@ proc/process_ghost_teleport_locs() /area/medical/medbay name = "Medbay" icon_state = "medbay" - music = 'signal.ogg' + music = 'sound/ambience/signal.ogg' /area/medical/patients_rooms name = "\improper Patient's Rooms" @@ -1515,7 +1515,7 @@ var/list/the_station_areas = list ( ..() var/sound/S = new/sound() mysound = S - S.file = 'shore.ogg' + S.file = 'sound/ambience/shore.ogg' S.repeat = 1 S.wait = 0 S.channel = 123 @@ -1543,7 +1543,7 @@ var/list/the_station_areas = list ( var/sound/S = null var/sound_delay = 0 if(prob(25)) - S = sound(file=pick('seag1.ogg','seag2.ogg','seag3.ogg'), volume=100) + S = sound(file=pick('sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag3.ogg'), volume=100) sound_delay = rand(0, 50) for(var/mob/living/carbon/human/H in src) diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index dec4df8c02..b82ff17903 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -175,7 +175,7 @@ if (src.bullets < 1) user.show_message("\red *click* *click*", 2) return - playsound(user, 'Gunshot.ogg', 100, 1) + playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1) src.bullets-- for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] fires a cap gun at []!", user, target), 1, "\red You hear a gunshot", 2) @@ -195,13 +195,13 @@ src.active = !( src.active ) if (src.active) user << "\blue You extend the plastic blade with a quick flick of your wrist." - playsound(user, 'saberon.ogg', 50, 1) + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) src.icon_state = "swordblue" src.item_state = "swordblue" src.w_class = 4 else user << "\blue You push the plastic blade back down into the handle." - playsound(user, 'saberoff.ogg', 50, 1) + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) src.icon_state = "sword0" src.item_state = "sword0" src.w_class = 2 @@ -248,7 +248,7 @@ bullets-- D.icon_state = "foamdart" D.name = "foam dart" - playsound(user.loc, 'syringeproj.ogg', 50, 1) + playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1) for(var/i=0, i<6, i++) if (D) @@ -296,7 +296,7 @@ O.show_message(text("\red [] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "\red You hear the sound of foam against skull", 2) O.show_message(text("\red [] was hit in the head by the foam dart!", M), 1) - playsound(user.loc, 'syringeproj.ogg', 50, 1) + playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1) new /obj/item/toy/ammo/crossbow(M.loc) src.bullets-- else if (M.lying && src.bullets == 0) @@ -343,7 +343,7 @@ s.start() new /obj/effect/decal/cleanable/ash(src.loc) src.visible_message("\red The [src.name] explodes!","\red You hear a snap!") - playsound(src, 'snap.ogg', 50, 1) + playsound(src, 'sound/effects/snap.ogg', 50, 1) del(src) /obj/item/toy/snappop/HasEntered(H as mob|obj) @@ -357,7 +357,7 @@ s.start() new /obj/effect/decal/cleanable/ash(src.loc) src.visible_message("\red The [src.name] explodes!","\red You hear a snap!") - playsound(src, 'snap.ogg', 50, 1) + playsound(src, 'sound/effects/snap.ogg', 50, 1) del(src) /obj/item/toy/waterflower @@ -406,7 +406,7 @@ D.icon_state = "chempuff" D.create_reagents(5) src.reagents.trans_to(D, 1) - playsound(src.loc, 'spray3.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6) spawn(0) for(var/i=0, i<1, i++) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 3163577b5c..243ebb5122 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -657,7 +657,7 @@ icon_state = "fire_extinguisher0" var/last_use = 1.0 var/safety = 1 - hitsound = 'smash.ogg' + hitsound = 'sound/weapons/smash.ogg' flags = FPRINT | USEDELAY | TABLEPASS | CONDUCT throwforce = 10 w_class = 3.0 @@ -1484,7 +1484,7 @@ desc = "You can drill using this item. You dig?" icon = 'icons/obj/surgery.dmi' icon_state = "drill" - hitsound = 'circsawhit.ogg' + hitsound = 'sound/weapons/circsawhit.ogg' m_amt = 15000 g_amt = 10000 flags = FPRINT | TABLEPASS | CONDUCT @@ -1498,7 +1498,7 @@ desc = "For heavy duty cutting." icon = 'icons/obj/surgery.dmi' icon_state = "saw3" - hitsound = 'circsawhit.ogg' + hitsound = 'sound/weapons/circsawhit.ogg' flags = FPRINT | TABLEPASS | CONDUCT force = 15.0 w_class = 1.0 diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index 9647317068..6e64ee8bb1 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -319,7 +319,7 @@ Turf and target are seperate in case you want to teleport some distance from a t if(cmptext("ai",role)) oldname = null//don't bother with the records update crap world << "[newname] is the AI!" - world << sound('newAI.ogg') + world << sound('sound/AI/newAI.ogg') fully_replace_character_name(oldname,newname) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 622b0ef650..de3a5db706 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -284,7 +284,7 @@ var/sound = null var/musVolume = 25 - sound = 'ambigen1.ogg' + sound = 'sound/ambience/ambigen1.ogg' if (ismob(A)) @@ -308,24 +308,24 @@ if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch A:client:ambience_playing = 1 - A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) + A << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) switch(src.name) - if ("Chapel") sound = pick('ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg') - if ("Morgue") sound = pick('ambimo1.ogg','ambimo2.ogg','title2.ogg') - if ("Space") sound = pick('ambispace.ogg','title2.ogg',) - if ("Engine Control", "Engineering", "Engineering SMES") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg') - if ("AI Satellite Teleporter Room") sound = pick('ambimalf.ogg') - if ("AI Upload Foyer") sound = pick('ambimalf.ogg') - if ("AI Upload Chamber") sound = pick('ambimalf.ogg') + if ("Chapel") sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg') + if ("Morgue") sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/title2.ogg') + if ("Space") sound = pick('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',) + if ("Engine Control", "Engineering", "Engineering SMES") sound = pick('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg') + if ("AI Satellite Teleporter Room") sound = pick('sound/ambience/ambimalf.ogg') + if ("AI Upload Foyer") sound = pick('sound/ambience/ambimalf.ogg') + if ("AI Upload Chamber") sound = pick('sound/ambience/ambimalf.ogg') if ("Mine") - sound = pick('ambimine.ogg') + sound = pick('sound/ambience/ambimine.ogg') musVolume = 25 else - sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg') + sound = pick('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg') if(findtext(src.name, "Telecommunications")) - sound = pick('ambisin2.ogg', 'signal.ogg', 'signal.ogg', 'ambigen10.ogg') + sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') if (prob(35)) if(A && A:client && !A:client:played) diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 64f7548f8a..3b8a6207db 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -1007,7 +1007,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl var/obj/item/projectile/beam/A = new /obj/item/projectile/beam( usr.loc ) A.icon = 'icons/effects/genetics.dmi' A.icon_state = "eyelasers" - playsound(usr.loc, 'taser2.ogg', 75, 1) + playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1) A.firer = usr A.def_zone = usr:get_organ_target() diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm index d778a5ed11..5495d0a75b 100644 --- a/code/game/cellautomata.dm +++ b/code/game/cellautomata.dm @@ -120,15 +120,15 @@ //Crispy fullban /world/Reboot(var/reason) spawn(0) - world << sound(pick('newroundsexy.ogg','apcdestroyed.ogg','bangindonk.ogg')) // random end sounds!! - LastyBatsy + world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy //if(prob(40)) // for(var/mob/M in world) // if(M.client) - // M << sound('newroundsexy.ogg') + // M << sound('sound/AI/newroundsexy.ogg') //else // for(var/mob/M in world) // if(M.client) - // M << sound('apcdestroyed.ogg') + // M << sound('sound/misc/apcdestroyed.ogg') for(var/client/C) if (config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite diff --git a/code/game/chemistry.dm b/code/game/chemistry.dm index daa7a66f4e..7b4a7d945e 100644 --- a/code/game/chemistry.dm +++ b/code/game/chemistry.dm @@ -62,7 +62,7 @@ user << "\red You prime the smoke bomb! [det_time/10] seconds!" src.state = 1 src.icon_state = "flashbang1" - playsound(src.loc, 'armbomb.ogg', 75, 1, -3) + playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn( src.det_time ) prime() return @@ -82,7 +82,7 @@ return /obj/item/weapon/smokebomb/proc/prime() - playsound(src.loc, 'smoke.ogg', 50, 1, -3) + playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) src.smoke.start() sleep(10) @@ -131,7 +131,7 @@ user << "\red You prime the mustard gas bomb! [det_time/10] seconds!" src.state = 1 src.icon_state = "flashbang1" - playsound(src.loc, 'armbomb.ogg', 75, 1, -3) + playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn( src.det_time ) prime() return @@ -151,7 +151,7 @@ return /obj/item/weapon/mustardbomb/proc/prime() - playsound(src.loc, 'smoke.ogg', 50, 1, -3) + playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) src.mustard_gas.start() sleep(10) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 13cf9b1bc7..7454370030 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -109,7 +109,7 @@ var/list/blob_nodes = list() if (1) command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('outbreak5.ogg') + world << sound('sound/AI/outbreak5.ogg') autoexpand = 0//No more extra pulses stage = -1 //next stage in 4-5 minutes diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index b6cc8ba70c..e4791c9945 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -23,7 +23,7 @@ update_icon() if(health <= 0) - playsound(src.loc, 'splat.ogg', 50, 1) + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) del(src) return return diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 936e12c1eb..bc83a3bb3b 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -11,7 +11,7 @@ update_icon() if(health <= 0) - playsound(src.loc, 'splat.ogg', 50, 1) + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) del(src) return return diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index 6716effa36..c9ffaf96f1 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -23,7 +23,7 @@ update_icon() if(health <= 0) - playsound(src.loc, 'splat.ogg', 50, 1) + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) del(src) return return diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm index a86640d780..4c77520846 100644 --- a/code/game/gamemodes/blob/blobs/shield.dm +++ b/code/game/gamemodes/blob/blobs/shield.dm @@ -13,7 +13,7 @@ update_icon() if(health <= 0) - playsound(src.loc, 'splat.ogg', 50, 1) + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) del(src) return return diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 907a5eae43..4508c15ba0 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -133,7 +133,7 @@ update_icon()//Needs to be updated with the types if(health <= 0) - playsound(src.loc, 'splat.ogg', 50, 1) + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) del(src) return if(health <= 15) @@ -157,14 +157,14 @@ attackby(var/obj/item/weapon/W, var/mob/user) - playsound(src.loc, 'attackblob.ogg', 50, 1) + playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) src.visible_message("\red The [src.name] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = 0 switch(W.damtype) if("fire") damage = (W.force / max(src.fire_resist,1)) if(istype(W, /obj/item/weapon/weldingtool)) - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) if("brute") damage = (W.force / max(src.brute_resist,1)) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 65ffba2f22..59f2dd98a3 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -28,7 +28,7 @@ switch(pick(eventNumbersToPickFrom)) if(1) command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") - world << sound('meteors.ogg') + world << sound('sound/AI/meteors.ogg') spawn(100) meteor_wave() spawn_meteors() @@ -38,7 +38,7 @@ if(2) command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('granomalies.ogg') + world << sound('sound/AI/granomalies.ogg') var/turf/T = pick(blobstart) var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) spawn(rand(50, 300)) @@ -46,7 +46,7 @@ /* if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('spanomalies.ogg') + world << sound('sound/AI/spanomalies.ogg') var/list/turfs = new var/turf/picked for(var/turf/simulated/floor/T in world) @@ -95,7 +95,7 @@ /proc/power_failure() command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure") - world << sound('poweroff.ogg') + world << sound('sound/AI/poweroff.ogg') for(var/obj/machinery/power/smes/S in world) if(istype(get_area(S), /area/turret_protected) || S.z != 1) continue @@ -143,7 +143,7 @@ /proc/power_restore() command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal") - world << sound('poweron.ogg') + world << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/apc/C in world) if(C.cell && C.z == 1) C.cell.charge = C.cell.maxcharge @@ -165,7 +165,7 @@ /proc/power_restore_quick() command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal") - world << sound('poweron.ogg') + world << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/smes/S in world) if(S.z != 1) continue @@ -191,7 +191,7 @@ /proc/viral_outbreak(var/virus = null) // command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") -// world << sound('outbreak7.ogg') +// world << sound('sound/AI/outbreak7.ogg') var/virus_type if(!virus) virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat) @@ -246,11 +246,11 @@ break spawn(rand(1500, 3000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('outbreak7.ogg') + world << sound('sound/AI/outbreak7.ogg') /proc/alien_infestation(var/spawncount = 1) // -- TLE //command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - //world << sound('aliens.ogg') + //world << sound('sound/AI/aliens.ogg') var/list/vents = list() for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world) if(temp_vent.loc.z == 1 && !temp_vent.welded && temp_vent.network) @@ -279,7 +279,7 @@ spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes. command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - world << sound('aliens.ogg') + world << sound('sound/AI/aliens.ogg') /proc/high_radiation_event() @@ -306,7 +306,7 @@ M.apply_effect((rand(15,75)),IRRADIATE,0) sleep(100) command_alert("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert") - world << sound('radiation.ogg') + world << sound('sound/AI/radiation.ogg') @@ -360,7 +360,7 @@ //sleep(100) spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes. command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm index 2104f0d16d..939c377309 100644 --- a/code/game/gamemodes/events/dust.dm +++ b/code/game/gamemodes/events/dust.dm @@ -96,7 +96,7 @@ The "dust" will damage the hull of the station causin minor hull breaches. if(!M.stat && !istype(M, /mob/living/silicon/ai)) shake_camera(M, 3, 1) if (A) - playsound(src.loc, 'meteorimpact.ogg', 40, 1) + playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1) if(ismob(A)) A.meteorhit(src)//This should work for now I guess diff --git a/code/game/gamemodes/events/miniblob.dm b/code/game/gamemodes/events/miniblob.dm index c4582f76aa..fec1968a23 100644 --- a/code/game/gamemodes/events/miniblob.dm +++ b/code/game/gamemodes/events/miniblob.dm @@ -13,7 +13,7 @@ blobevent = 0 spawn(rand(1000, 2000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('outbreak5.ogg') + world << sound('sound/AI/outbreak5.ogg') /proc/dotheblobbaby() if (blobevent) diff --git a/code/game/gamemodes/events/ninja_abilities.dm b/code/game/gamemodes/events/ninja_abilities.dm index 2838e61852..38419ff351 100644 --- a/code/game/gamemodes/events/ninja_abilities.dm +++ b/code/game/gamemodes/events/ninja_abilities.dm @@ -60,7 +60,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread() smoke.set_up(10, 0, U.loc) smoke.start() - playsound(U.loc, 'bamf.ogg', 50, 2) + playsound(U.loc, 'sound/effects/bamf.ogg', 50, 2) s_bombs-- s_coold = 1 return @@ -88,7 +88,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo spawn(0) spark_system.start() - playsound(U.loc, 'phasein.ogg', 25, 1) + playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1) playsound(U.loc, "sparks", 50, 1) anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir) @@ -114,7 +114,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below. if((!T.density)&&istype(mobloc, /turf)) spawn(0) - playsound(U.loc, 'sparks4.ogg', 50, 1) + playsound(U.loc, 'sound/effects/sparks4.ogg', 50, 1) anim(mobloc,src,'icons/mob/mob.dmi',,"phaseout",,U.dir) handle_teleport_grab(T, U) @@ -122,8 +122,8 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo spawn(0) spark_system.start() - playsound(U.loc, 'phasein.ogg', 25, 1) - playsound(U.loc, 'sparks2.ogg', 50, 1) + playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1) + playsound(U.loc, 'sound/effects/sparks2.ogg', 50, 1) anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir) spawn(0)//Any living mobs in teleport area are gibbed. @@ -145,7 +145,7 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo var/C = 250 if(!ninjacost(C,1)) var/mob/living/carbon/human/U = affecting - playsound(U.loc, 'EMPulse.ogg', 60, 2) + playsound(U.loc, 'sound/effects/EMPulse.ogg', 60, 2) empulse(U, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch. s_coold = 2 cell.charge-=(C*10) @@ -344,7 +344,7 @@ Or otherwise known as anime mode. Which also happens to be ridiculously powerful spawn(0) spark_system.start() - playsound(U.loc, 'phasein.ogg', 25, 1) + playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1) playsound(U.loc, "sparks", 50, 1) anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir) s_coold = 1 @@ -418,7 +418,7 @@ This is so anime it hurts. But that's the point.*/ spawn(0) spark_system.start() - playsound(U.loc, 'phasein.ogg', 25, 1) + playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1) playsound(U.loc, "sparks", 50, 1) anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir) s_coold = 1 diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 460c2af76a..dd77de486b 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -537,7 +537,7 @@ ________________________________________________________________________________ return P.tnote += "← From [!s_control?(A):"an unknown source"]:
[t]
" if (!P.silent) - playsound(P.loc, 'twobeep.ogg', 50, 1) + playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, P.loc)) O.show_message(text("\icon[P] *[P.ttone]*")) P.overlays = null @@ -1358,7 +1358,7 @@ It is possible to destroy the net by the occupant or someone else. M.drop_from_inventory(W) spawn(0) - playsound(M.loc, 'sparks4.ogg', 50, 1) + playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1) anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir) M.loc = pick(holdingfacility)//Throw mob in to the holding facility. @@ -1368,8 +1368,8 @@ It is possible to destroy the net by the occupant or someone else. var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, M.loc) spark_system.start() - playsound(M.loc, 'phasein.ogg', 25, 1) - playsound(M.loc, 'sparks2.ogg', 50, 1) + playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1) + playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1) anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir) del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0). @@ -1420,7 +1420,7 @@ It is possible to destroy the net by the occupant or someone else. tforce = 10 else tforce = AM:throwforce - playsound(src.loc, 'slash.ogg', 80, 1) + playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1) health = max(0, health - tforce) healthcheck() ..() @@ -1444,7 +1444,7 @@ It is possible to destroy the net by the occupant or someone else. usr << text("\green You claw at the net.") for(var/mob/O in oviewers(src)) O.show_message(text("\red [] claws at the energy net!", usr), 1) - playsound(src.loc, 'slash.ogg', 80, 1) + playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1) health -= rand(10, 20) if(health <= 0) usr << text("\green You slice the energy net to pieces.") diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index 5fc72ca1ba..622ad64dea 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -593,7 +593,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. /mob/proc/NinjaStealthMalf() invisibility = 0//Set ninja invis to 0. overlays += image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = layer+0.9) - playsound(loc, 'stealthoff.ogg', 75, 1) + playsound(loc, 'sound/effects/stealthoff.ogg', 75, 1) //=======//GENERIC VERB MODIFIERS//=======// diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm index 7f1783d0cf..45f2993b20 100644 --- a/code/game/gamemodes/events/wormholes.dm +++ b/code/game/gamemodes/events/wormholes.dm @@ -8,7 +8,7 @@ if(pick_turfs.len) //All ready. Announce that bad juju is afoot. command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('spanomalies.ogg') + world << sound('sound/AI/spanomalies.ogg') //prob(20) can be approximated to 1 wormhole every 5 turfs! //admittedly less random but totally worth it >_< diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 66d2cb61f2..76e4ae567d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -227,7 +227,7 @@ Whitespace:Seperator; comm.messagetext.Add(intercepttext) command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") - world << sound('intercept.ogg') + world << sound('sound/AI/intercept.ogg') if(security_level < SEC_LEVEL_BLUE) set_security_level(SEC_LEVEL_BLUE) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index ba6b8e7bcd..49341193c1 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -37,7 +37,7 @@ var/global/datum/controller/gameticker/ticker var/triai = 0//Global holder for Triumvirate /datum/controller/gameticker/proc/pregame() - login_music = pick('title2.ogg') // choose title music! + login_music = pick('sound/ambience/title2.ogg') // choose title music! do pregame_timeleft = 90 @@ -116,7 +116,7 @@ var/global/datum/controller/gameticker/ticker if (S.name != "AI") del(S) world << "Enjoy the game!" -// world << sound('welcome.ogg') // Skie +// world << sound('sound/AI/welcome.ogg') // Skie //Holiday Round-start stuff ~Carn Holiday_Game_Start() @@ -187,19 +187,19 @@ var/global/datum/controller/gameticker/ticker if("nuclear emergency") //Nuke wasn't on station when it blew up flick("intro_nuke",cinematic) sleep(35) - world << sound('explosionfar.ogg') + world << sound('sound/effects/explosionfar.ogg') flick("station_intact_fade_red",cinematic) cinematic.icon_state = "summary_nukefail" else flick("intro_nuke",cinematic) sleep(35) - world << sound('explosionfar.ogg') + world << sound('sound/effects/explosionfar.ogg') //flick("end",cinematic) if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation sleep(50) - world << sound('explosionfar.ogg') + world << sound('sound/effects/explosionfar.ogg') else //station was destroyed @@ -210,25 +210,25 @@ var/global/datum/controller/gameticker/ticker flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('explosionfar.ogg') + world << sound('sound/effects/explosionfar.ogg') cinematic.icon_state = "summary_nukewin" if("AI malfunction") //Malf (screen,explosion,summary) flick("intro_malf",cinematic) sleep(76) flick("station_explode_fade_red",cinematic) - world << sound('explosionfar.ogg') + world << sound('sound/effects/explosionfar.ogg') cinematic.icon_state = "summary_malf" if("blob") //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('explosionfar.ogg') + world << sound('sound/effects/explosionfar.ogg') cinematic.icon_state = "summary_selfdes" else //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red", cinematic) - world << sound('explosionfar.ogg') + world << sound('sound/effects/explosionfar.ogg') cinematic.icon_state = "summary_selfdes" //If its actually the end of the round, wait for it to end. diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 13a3802f31..34545842cc 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -165,7 +165,7 @@ ticker.mode:malf_mode_declared = 1 for(var/datum/mind/AI_mind in ticker.mode:malf_ai) AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover - world << sound('aimalf.ogg') + world << sound('sound/AI/aimalf.ogg') /datum/game_mode/malfunction/proc/ai_win() @@ -179,7 +179,7 @@ AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/ai_win ticker.mode:explosion_in_progress = 1 for(var/mob/M in player_list) - M << 'Alarm.ogg' + M << 'sound/machines/Alarm.ogg' world << "Self-destructing in 10" for (var/i=9 to 1 step -1) sleep(10) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 68c71aeff1..57feddf7ca 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -109,7 +109,7 @@ shake_camera(M, 3, 1) if (A) A.meteorhit(src) - playsound(src.loc, 'meteorimpact.ogg', 40, 1) + playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1) if (--src.hits <= 0) //Prevent meteors from blowing up the singularity's containment. @@ -151,7 +151,7 @@ shake_camera(M, 3, 1) if (A) explosion(src.loc, 0, 1, 2, 3, 0) - playsound(src.loc, 'meteorimpact.ogg', 40, 1) + playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1) if (--src.hits <= 0) if(prob(15) && !istype(A, /obj/structure/grille)) explosion(src.loc, 1, 2, 3, 4, 0) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 2cc2b14207..4168fbcc43 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -167,7 +167,7 @@ src.yes_code = 0 src.safety = 1 src.icon_state = "nuclearbomb3" - playsound(src,'Alarm.ogg',100,0,5) + playsound(src,'sound/machines/Alarm.ogg',100,0,5) if (ticker && ticker.mode) ticker.mode.explosion_in_progress = 1 sleep(100) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 6da61d5a97..8f6e9a7bcc 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -200,7 +200,7 @@ if(bomb_set)//If the bomb is set, lead to the shuttle mode = 1//Ensures worklocation() continues to work worklocation() - playsound(src.loc, 'twobeep.ogg', 50, 1)//Plays a beep + playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1)//Plays a beep for (var/mob/O in hearers(1, src.loc)) O.show_message(text("Shuttle Locator active."))//Lets the mob holding it know that the mode has changed return//Get outta here @@ -233,7 +233,7 @@ if(!bomb_set) mode = 0 workdisk() - playsound(src.loc, 'twobeep.ogg', 50, 1) + playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(2, src.loc)) O.show_message(text("Authentication Disk Locator active.")) if(!home) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index e42cd217f0..8acfe1740a 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1158,7 +1158,7 @@ table tr:first-child th:first-child { border: none;} return for(var/area/RA in A.related) RA.firealert() - //playsound(src.loc, 'signal.ogg', 75, 0) + //playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0) return /obj/machinery/partyalarm/attack_paw(mob/user as mob) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index b606b9784d..a5930088ef 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -97,7 +97,7 @@ obj/machinery/computer/general_air_control attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." @@ -296,7 +296,7 @@ Max Output Pressure: [output_pressure] kPa
"} attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 8d61cfe4ab..8eff4e741e 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -49,7 +49,7 @@ attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/area_atmos/M = new /obj/item/weapon/circuitboard/area_atmos( A ) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index ab98f6ec72..4f68d9a5ef 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -89,7 +89,7 @@ location.assume_air(air_contents) src.destroyed = 1 - playsound(src.loc, 'spray.ogg', 10, 1, -3) + playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) src.density = 0 update_icon() diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index be131922db..c4f40ebb13 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -97,7 +97,7 @@ /obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if (!istype(W, /obj/item/weapon/wrench)) return ..() - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c2e3f5babc..bce0465d46 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -146,7 +146,7 @@ var/global/list/autolathe_recipes_hidden = list( \ return 1 if (opened) if(istype(O, /obj/item/weapon/crowbar)) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) M.state = 2 M.icon_state = "box_1" diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 7f629e4197..170fe5ded2 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -139,7 +139,7 @@ processing = 1 update_icon() updateUsrDialog() - playsound(src.loc, 'blender.ogg', 50, 1) + playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) use_power(S*30) sleep(S+15) processing = 0 diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 516d994360..f619c5ebcf 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -51,7 +51,7 @@ */ src.health -= rand(15,30)*brute_dam_coeff src.visible_message("\red [user] has slashed [src]!") - playsound(src.loc, 'slice.ogg', 25, 1, -1) + playsound(src.loc, 'sound/weapons/slice.ogg', 25, 1, -1) if(prob(10)) new /obj/effect/decal/cleanable/oil(src.loc) healthcheck() diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 95d0c9d751..62aa9fe277 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -268,7 +268,7 @@ Auto Patrol: []"}, if (target) // make sure target exists if (get_dist(src, src.target) <= 1) // if right next to perp - playsound(src.loc, 'Egloves.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) src.icon_state = "[lasercolor]ed209-c" spawn(2) src.icon_state = "[lasercolor]ed209[src.on]" @@ -317,7 +317,7 @@ Auto Patrol: []"}, return if (!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) + playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) mode = SECBOT_ARREST for(var/mob/O in viewers(src, null)) O.show_message("\red [src] is trying to put handcuffs on [src.target]!", 1) @@ -337,7 +337,7 @@ Auto Patrol: []"}, src.last_found = world.time src.frustration = 0 - // playsound(src.loc, pick('bgod.ogg', 'biamthelaw.ogg', 'bsecureday.ogg', 'bradio.ogg', 'binsult.ogg', 'bcreep.ogg'), 50, 0) + // playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") // src.speak(arrest_message) @@ -639,7 +639,7 @@ Auto Patrol: []"}, src.oldtarget_name = C.name src.speak("Level [src.threatlevel] infraction alert!") if(!src.lasercolor) - playsound(src.loc, pick('ed209_20sec.ogg', 'EDPlaceholder.ogg'), 50, 0) + playsound(src.loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0) src.visible_message("[src] points at [C.name]!") mode = SECBOT_HUNT spawn(0) @@ -990,7 +990,7 @@ Auto Patrol: []"}, if(8) if( istype(W, /obj/item/weapon/screwdriver) ) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) var/turf/T = get_turf(user) user << "Now attaching the gun to the frame..." sleep(40) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 1b4ee3c2b8..9e6af7a13f 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -127,7 +127,7 @@ locked = !locked user << "\blue You [locked ? "lock" : "unlock"] the mulebot's controls!" flick("mulebot-emagged", src) - playsound(src.loc, 'sparks1.ogg', 100, 0) + playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0) else if(istype(I,/obj/item/weapon/cell) && open && !cell) var/obj/item/weapon/cell/C = I user.drop_item() @@ -465,7 +465,7 @@ /obj/machinery/bot/mulebot/proc/load(var/atom/movable/C) if((wires & wire_loadcheck) && !istype(C,/obj/structure/closet/crate)) src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") - playsound(src.loc, 'buzz-sigh.ogg', 50, 0) + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) return // if not emagged, only allow crates to be loaded //I'm sure someone will come along and ask why this is here... well people were dragging screen items onto the mule, and that was not cool. @@ -655,25 +655,25 @@ mode = 4 if(blockcount == 3) src.visible_message("[src] makes an annoyed buzzing sound", "You hear an electronic buzzing sound.") - playsound(src.loc, 'buzz-two.ogg', 50, 0) + playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) if(blockcount > 5) // attempt 5 times before recomputing // find new path excluding blocked turf src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") - playsound(src.loc, 'buzz-sigh.ogg', 50, 0) + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) spawn(2) calc_path(next) if(path.len > 0) src.visible_message("[src] makes a delighted ping!", "You hear a ping.") - playsound(src.loc, 'ping.ogg', 50, 0) + playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) mode = 4 mode =6 return return else src.visible_message("[src] makes an annoyed buzzing sound", "You hear an electronic buzzing sound.") - playsound(src.loc, 'buzz-two.ogg', 50, 0) + playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) //world << "Bad turf." mode = 5 return @@ -693,11 +693,11 @@ blockcount = 0 mode = 4 src.visible_message("[src] makes a delighted ping!", "You hear a ping.") - playsound(src.loc, 'ping.ogg', 50, 0) + playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) else src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") - playsound(src.loc, 'buzz-sigh.ogg', 50, 0) + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) mode = 7 //if(6) @@ -743,7 +743,7 @@ /obj/machinery/bot/mulebot/proc/at_target() if(!reached_target) src.visible_message("[src] makes a chiming sound!", "You hear a chime.") - playsound(src.loc, 'chime.ogg', 50, 0) + playsound(src.loc, 'sound/machines/chime.ogg', 50, 0) reached_target = 1 if(load) // if loaded, unload at target @@ -797,7 +797,7 @@ // when mulebot is in the same loc /obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H) src.visible_message("\red [src] drives over [H]!") - playsound(src.loc, 'splat.ogg', 50, 1) + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) var/damage = rand(5,15) H.apply_damage(2*damage, BRUTE, "head") diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 564b4a5e06..30ddfef920 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -216,7 +216,7 @@ Auto Patrol: []"}, if(target) // make sure target exists if(get_dist(src, src.target) <= 1) // if right next to perp - playsound(src.loc, 'Egloves.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) src.icon_state = "secbot-c" spawn(2) src.icon_state = "secbot[src.on]" @@ -259,7 +259,7 @@ Auto Patrol: []"}, return if(!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) + playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) mode = SECBOT_ARREST for(var/mob/O in viewers(src, null)) O.show_message("\red [src] is trying to put handcuffs on [src.target]!", 1) @@ -279,7 +279,7 @@ Auto Patrol: []"}, src.last_found = world.time src.frustration = 0 - playsound(src.loc, pick('bgod.ogg', 'biamthelaw.ogg', 'bsecureday.ogg', 'bradio.ogg', 'binsult.ogg', 'bcreep.ogg'), 50, 0) + playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") // src.speak(arrest_message) @@ -571,7 +571,7 @@ Auto Patrol: []"}, src.target = C src.oldtarget_name = C.name src.speak("Level [src.threatlevel] infraction alert!") - playsound(src.loc, pick('bcriminal.ogg', 'bjustice.ogg', 'bfreeze.ogg'), 50, 0) + playsound(src.loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0) src.visible_message("[src] points at [C.name]!") mode = SECBOT_HUNT spawn(0) diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm index 9bfd1d91fc..ff86e2ae3c 100644 --- a/code/game/machinery/camera.dm +++ b/code/game/machinery/camera.dm @@ -276,7 +276,7 @@ var/global/list/obj/machinery/camera/Cameras = list() status = 0 for(var/mob/O in viewers(user, null)) O.show_message("\The [user] slashes at [src]!", 1) - playsound(src.loc, 'slash.ogg', 100, 1) + playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) icon_state = "camera1" add_hiddenprint(user) deactivate(user,0) @@ -343,7 +343,7 @@ var/global/list/obj/machinery/camera/Cameras = list() var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, loc) spark_system.start() - playsound(loc, 'blade1.ogg', 50, 1) + playsound(loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(loc, "sparks", 50, 1) var/obj/item/weapon/grenade/chem_grenade/case = new /obj/item/weapon/grenade/chem_grenade(loc) @@ -369,13 +369,13 @@ var/global/list/obj/machinery/camera/Cameras = list() if (!(src.status)) for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] has deactivated []!", user, src), 1) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) icon_state = "camera1" add_hiddenprint(user) else for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] has reactivated []!", user, src), 1) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) icon_state = "camera" add_hiddenprint(user) // now disconnect anyone using the camera diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index c8c3b8c49d..b7f82cc728 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -66,7 +66,7 @@ anchored = !anchored user << "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground" - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) attack_hand(mob/user) if(charging) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 25d7148ab6..462f6c98a8 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -127,7 +127,7 @@ //Warning, uncommenting this can have concequences. For example, deconstructing the computer may cause holographic eswords to never derez /* if(istype(D, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." @@ -155,7 +155,7 @@ */ if(istype(D, /obj/item/weapon/card/emag) && !emagged) - playsound(src.loc, 'sparks4.ogg', 75, 1) + playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 user << "\blue You vastly increase projector power and override the safety and security protocols." user << "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator." @@ -477,13 +477,13 @@ force = 30 icon_state = "sword[color]" w_class = 4 - playsound(user, 'saberon.ogg', 50, 1) + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) user << "\blue [src] is now active." else force = 3 icon_state = "sword0" w_class = 2 - playsound(user, 'saberoff.ogg', 50, 1) + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) user << "\blue [src] can now be concealed." add_fingerprint(user) return diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 80c401c5ba..af88e3175c 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -14,7 +14,7 @@ switch(state) if(0) if(istype(P, /obj/item/weapon/wrench)) - playsound(loc, 'Ratchet.ogg', 50, 1) + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "\blue You wrench the frame into place." anchored = 1 @@ -24,7 +24,7 @@ if(!WT.isOn()) user << "The welder must be on for this task." return - playsound(loc, 'Welder.ogg', 50, 1) + playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20)) if(!src || !WT.remove_fuel(0, user)) return user << "\blue You deconstruct the frame." @@ -32,25 +32,25 @@ del(src) if(1) if(istype(P, /obj/item/weapon/wrench)) - playsound(loc, 'Ratchet.ogg', 50, 1) + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "\blue You unfasten the frame." anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) - playsound(loc, 'Deconstruct.ogg', 50, 1) + playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You place the circuit board inside the frame." icon_state = "1" circuit = P user.drop_item() P.loc = src if(istype(P, /obj/item/weapon/screwdriver) && circuit) - playsound(loc, 'Screwdriver.ogg', 50, 1) + playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You screw the circuit board into place." state = 2 icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) - playsound(loc, 'Crowbar.ogg', 50, 1) + playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the circuit board." state = 1 icon_state = "0" @@ -58,13 +58,13 @@ circuit = null if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) - playsound(loc, 'Screwdriver.ogg', 50, 1) + playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You unfasten the circuit board." state = 1 icon_state = "1" if(istype(P, /obj/item/weapon/cable_coil)) if(P:amount >= 5) - playsound(loc, 'Deconstruct.ogg', 50, 1) + playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) P:amount -= 5 if(!P:amount) del(P) @@ -76,7 +76,7 @@ if (brain) user << "Get that brain out of there first" else - playsound(loc, 'wirecutter.ogg', 50, 1) + playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "\blue You remove the cables." state = 2 icon_state = "2" @@ -85,7 +85,7 @@ if(istype(P, /obj/item/stack/sheet/rglass)) if(P:amount >= 2) - playsound(loc, 'Deconstruct.ogg', 50, 1) + playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) if (P) P:amount -= 2 @@ -133,7 +133,7 @@ icon_state = "3b" if(istype(P, /obj/item/weapon/crowbar) && brain) - playsound(loc, 'Crowbar.ogg', 50, 1) + playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the brain." brain.loc = loc brain = null @@ -141,7 +141,7 @@ if(4) if(istype(P, /obj/item/weapon/crowbar)) - playsound(loc, 'Crowbar.ogg', 50, 1) + playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the glass panel." state = 3 if (brain) @@ -152,7 +152,7 @@ return if(istype(P, /obj/item/weapon/screwdriver)) - playsound(loc, 'Screwdriver.ogg', 50, 1) + playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You connect the monitor." new /mob/living/silicon/ai ( loc, laws, brain ) feedback_inc("cyborg_ais_created",1) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 74fce4a0a4..1b09e2f1bc 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -13,7 +13,7 @@ /obj/machinery/computer/aifixer/attackby(I as obj, user as mob) /* if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index afed5053bf..479edbc984 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -250,7 +250,7 @@ src.updateUsrDialog() else if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/arcade/M = new /obj/item/weapon/circuitboard/arcade( A ) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index aa3a5eed2a..08afdb2677 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -108,7 +108,7 @@ attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/atmos_alert/M = new /obj/item/weapon/circuitboard/atmos_alert( A ) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 4df45ba29d..9fa0859262 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -244,7 +244,7 @@ switch(state) if(0) if(istype(P, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "\blue You wrench the frame into place." src.anchored = 1 @@ -254,7 +254,7 @@ if(!WT.remove_fuel(0, user)) user << "The welding tool must be on to complete this task." return - playsound(src.loc, 'Welder.ogg', 50, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20)) if(!src || !WT.isOn()) return user << "\blue You deconstruct the frame." @@ -262,7 +262,7 @@ del(src) if(1) if(istype(P, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "\blue You unfasten the frame." src.anchored = 0 @@ -270,7 +270,7 @@ if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "computer") - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You place the circuit board inside the frame." src.icon_state = "1" src.circuit = P @@ -279,12 +279,12 @@ else user << "\red This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/screwdriver) && circuit) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You screw the circuit board into place." src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the circuit board." src.state = 1 src.icon_state = "0" @@ -292,13 +292,13 @@ src.circuit = null if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You unfasten the circuit board." src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/weapon/cable_coil)) if(P:amount >= 5) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) if(P) P:amount -= 5 @@ -308,7 +308,7 @@ src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'wirecutter.ogg', 50, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "\blue You remove the cables." src.state = 2 src.icon_state = "2" @@ -317,7 +317,7 @@ if(istype(P, /obj/item/stack/sheet/glass)) if(P:amount >= 2) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) if(P) P:use(2) @@ -326,13 +326,13 @@ src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the glass panel." src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You connect the monitor." var/B = new src.circuit.build_path ( src.loc ) if(circuit.powernet) B:powernet = circuit.powernet diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 3ac1bc2490..3f7c20d324 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -40,7 +40,7 @@ /obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 229dcc8e1b..6000589992 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -468,7 +468,7 @@ log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") - world << sound('shuttlecalled.ogg') + world << sound('sound/AI/shuttlecalled.ogg') return @@ -527,7 +527,7 @@ log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.") message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1) captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") - world << sound('shuttlecalled.ogg') + world << sound('sound/AI/shuttlecalled.ogg') ..() @@ -552,6 +552,6 @@ log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.") message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1) captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") - world << sound('shuttlecalled.ogg') + world << sound('sound/AI/shuttlecalled.ogg') ..() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index e004977e92..1986368ab2 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -102,7 +102,7 @@ attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver) && circuit) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/M = new circuit( A ) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 201179c37b..b4d4c8894b 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -445,7 +445,7 @@ src.linkedServer.send_pda_message("[customrecepient.owner]", "[customsender]","[custommessage]") customrecepient.tnote += "← From [customsender] ([customjob]):
[custommessage]
" if (!customrecepient.silent) - playsound(customrecepient.loc, 'twobeep.ogg', 50, 1) + playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, customrecepient.loc)) O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*")) if( customrecepient.loc && ishuman(customrecepient.loc) ) @@ -459,7 +459,7 @@ src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]") customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
" if (!customrecepient.silent) - playsound(customrecepient.loc, 'twobeep.ogg', 50, 1) + playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, customrecepient.loc)) O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*")) if( customrecepient.loc && ishuman(customrecepient.loc) ) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 2e34481abf..f8e6894b3f 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -53,7 +53,7 @@ /obj/machinery/computer/pod/attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(loc, 'Screwdriver.ogg', 50, 1) + playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (stat & BROKEN) user << "\blue The broken glass falls out." diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index 92a84398f9..39d6fe4b31 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -39,7 +39,7 @@ /obj/machinery/power/monitor/attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index cf79c1ee9c..701cf3fb92 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -21,7 +21,7 @@ if(1) if(istype(P, /obj/item/weapon/cable_coil)) if(P:amount >= 5) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You start to add cables to the frame." if(do_after(user, 20)) P:amount -= 5 @@ -30,7 +30,7 @@ state = 2 icon_state = "box_1" if(istype(P, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "\blue You dismantle the frame" new /obj/item/stack/sheet/metal(src.loc, 5) del(src) @@ -38,7 +38,7 @@ if(istype(P, /obj/item/weapon/circuitboard)) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You add the circuit board to the frame." circuit = P user.drop_item() @@ -53,7 +53,7 @@ else user << "\red This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'wirecutter.ogg', 50, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "\blue You remove the cables." state = 1 icon_state = "box_0" @@ -62,7 +62,7 @@ if(3) if(istype(P, /obj/item/weapon/crowbar)) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) state = 2 circuit.loc = src.loc circuit = null @@ -84,7 +84,7 @@ component_check = 0 break if(component_check) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) var/obj/machinery/new_machine = new src.circuit.build_path(src.loc) for(var/obj/O in new_machine.component_parts) del(O) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index f8fe867f5e..cf6e0d9ee0 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -813,7 +813,7 @@ About the new airlock wires panel: if(ishuman(user) && prob(40) && src.density) var/mob/living/carbon/human/H = user if(H.getBrainLoss() >= 60) - playsound(src.loc, 'bang.ogg', 25, 1) + playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) for(var/mob/M in viewers(src, null)) M << "\red [user] headbutts the airlock." @@ -1141,7 +1141,7 @@ About the new airlock wires panel: else beingcrowbarred = 0 if( beingcrowbarred && (density && welded && !operating && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) ) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user,40)) user << "\blue You removed the airlock electronics!" @@ -1276,11 +1276,11 @@ About the new airlock wires panel: return 0 use_power(50) if(istype(src, /obj/machinery/door/airlock/glass)) - playsound(src.loc, 'windowdoor.ogg', 100, 1) + playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) if(istype(src, /obj/machinery/door/airlock/clown)) - playsound(src.loc, 'bikehorn.ogg', 30, 1) + playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1) else - playsound(src.loc, 'airlock.ogg', 30, 1) + playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1) if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density) src.closeOther.close() return ..() @@ -1290,7 +1290,7 @@ About the new airlock wires panel: return if(safe) if(locate(/mob/living) in get_turf(src)) - // playsound(src.loc, 'buzz-two.ogg', 50, 0) //THE BUZZING IT NEVER STOPS -Pete + // playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) //THE BUZZING IT NEVER STOPS -Pete spawn (60) close() return @@ -1315,11 +1315,11 @@ About the new airlock wires panel: use_power(50) if(istype(src, /obj/machinery/door/airlock/glass)) - playsound(src.loc, 'windowdoor.ogg', 30, 1) + playsound(src.loc, 'sound/machines/windowdoor.ogg', 30, 1) if(istype(src, /obj/machinery/door/airlock/clown)) - playsound(src.loc, 'bikehorn.ogg', 30, 1) + playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1) else - playsound(src.loc, 'airlock.ogg', 30, 1) + playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1) var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src)) if(killthis) killthis.ex_act(2)//Smashin windows diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 44ea87ce9a..6a237f26f8 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -101,7 +101,7 @@ if(!src.operating) //in case of emag src.operating = 1 flick(text("[]opening", src.base_state), src) - playsound(src.loc, 'windowdoor.ogg', 100, 1) + playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) src.icon_state = text("[]open", src.base_state) sleep(10) @@ -118,7 +118,7 @@ return 0 src.operating = 1 flick(text("[]closing", src.base_state), src) - playsound(src.loc, 'windowdoor.ogg', 100, 1) + playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1) src.icon_state = text("[]", src.base_state) src.density = 1 @@ -142,7 +142,7 @@ tforce = 40 else tforce = AM:throwforce - playsound(src.loc, 'Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) src.health = max(0, src.health - tforce) if (src.health <= 0) new /obj/item/weapon/shard(src.loc) @@ -163,7 +163,7 @@ if(src.operating) return src.health = max(0, src.health - 25) - playsound(src.loc, 'Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) for(var/mob/O in viewers(src, null)) O.show_message("\red [user] smashes against the [src.name].", 1) if (src.health <= 0) @@ -193,7 +193,7 @@ spark_system.set_up(5, 0, src.loc) spark_system.start() playsound(src.loc, "sparks", 50, 1) - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) for(var/mob/O in viewers(user, 5)) O.show_message(text("\blue The glass door was sliced open by []!", user), 1, text("\red You hear glass being sliced and sparks flying."), 2) flick(text("[]spark", src.base_state), src) @@ -206,7 +206,7 @@ var/aforce = I.force if(I.damtype == BRUTE || I.damtype == BURN) src.health = max(0, src.health - aforce) - playsound(src.loc, 'Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) for(var/mob/O in viewers(src, null)) O.show_message("\red [src] was hit by [I].", 1) if (src.health <= 0) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index eb4eb6d3bf..447d4e80af 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -60,7 +60,7 @@ if ((src.disable) || (src.last_flash && world.time < src.last_flash + 150)) return - playsound(src.loc, 'flash.ogg', 100, 1) + playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) flick("[base_state]_flash", src) src.last_flash = world.time use_power(1000) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 8c96cfbcdd..3311dbb888 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -444,7 +444,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) b_amount = 100 - src.waterlevel O.reagents.remove_reagent("water", b_amount) src.waterlevel += b_amount - playsound(src.loc, 'slosh.ogg', 25, 1) + playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1) user << "You fill the [src] with [b_amount] units of water." // Toxicity dilutation code. The more water you put in, the lesser the toxin concentration. @@ -701,7 +701,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) src.weedlevel = 0 src.toxic += 4 // Oops src.visible_message("\red \The [src] has been sprayed with \the [O][(user ? " by [user]." : ".")]") - playsound(src.loc, 'spray3.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6) else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe //var/deweeding @@ -721,7 +721,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) if (src.toxic > 100 ) // Make sure it won't go overoboard src.toxic = 100 user << "You apply the weedkiller solution into the [src]." - playsound(src.loc, 'spray3.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6) del(O) src.updateicon() @@ -735,11 +735,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) if (src.toxic > 100 ) // Make sure it won't go overoboard src.toxic = 100 user << "You apply the pestkiller solution into the [src]." - playsound(src.loc, 'spray3.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/spray3.ogg', 50, 1, -6) del(O) src.updateicon() else if(istype(O, /obj/item/weapon/wrench)) - playsound(loc, 'Ratchet.ogg', 50, 1) + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored user << "You [anchored ? "wrench" : "unwrench"] \the [src]." else if(istype(O, /obj/item/weapon/shovel)) diff --git a/code/game/machinery/kitchen/blender.dm b/code/game/machinery/kitchen/blender.dm index 50b4db8bd6..b76b74cf59 100644 --- a/code/game/machinery/kitchen/blender.dm +++ b/code/game/machinery/kitchen/blender.dm @@ -94,7 +94,7 @@ the blender or the processor: Processor items are solid objects and Blender resu if(!src.container) usr << "\red The blender doesn't have an attached container!" return - playsound(src.loc, 'blender.ogg', 50, 1) + playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) src.processing = 1 usr << "\blue You turn on the blender." use_power(250) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 9027ce0ac4..2352c0134f 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -162,7 +162,7 @@ src.occupant.ghostize() del(src.occupant) spawn(src.gibtime) - playsound(src.loc, 'splat.ogg', 50, 1) + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) operating = 0 for (var/i=1 to totalslabs) var/obj/item/meatslab = allmeat[i] diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index df8ead81b3..3d81185698 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -147,7 +147,7 @@ return if (!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume) return - playsound(src.loc, 'juicer.ogg', 50, 1) + playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents) var/r_id = get_juice_id(O) beaker.reagents.add_reagent(r_id,get_juice_amount(O)) diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index e50e7a42a8..6c7380a155 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -303,7 +303,7 @@ src.updateUsrDialog() /obj/machinery/microwave/proc/stop() - playsound(src.loc, 'ding.ogg', 50, 1) + playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) src.operating = 0 // Turn it off again aferwards src.icon_state = "mw" src.updateUsrDialog() @@ -318,11 +318,11 @@ src.updateUsrDialog() /obj/machinery/microwave/proc/muck_start() - playsound(src.loc, 'splat.ogg', 50, 1) // Play a splat sound + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound src.icon_state = "mwbloody1" // Make it look dirty!! /obj/machinery/microwave/proc/muck_finish() - playsound(src.loc, 'ding.ogg', 50, 1) + playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) src.visible_message("\red The microwave gets covered in muck!") src.dirty = 100 // Make it dirty so it can't be used util cleaned src.flags = null //So you can't add condiments diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index fa542ad508..0cfb53d0f8 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -151,7 +151,7 @@ user.visible_message("\blue [user] turns on \a [src].", \ "You turn on \a [src].", \ "You hear a food processor") - playsound(src.loc, 'blender.ogg', 50, 1) + playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) use_power(500) sleep(P.time) P.process(src.loc, O) diff --git a/code/game/machinery/morgue.dm b/code/game/machinery/morgue.dm index 7262f036c0..c864eaadac 100644 --- a/code/game/machinery/morgue.dm +++ b/code/game/machinery/morgue.dm @@ -43,11 +43,11 @@ for(var/atom/movable/A as mob|obj in src.connected.loc) if (!( A.anchored )) A.loc = src - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) //src.connected = null del(src.connected) else - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) src.connected = new /obj/structure/m_tray( src.loc ) step(src.connected, EAST) src.connected.layer = OBJ_LAYER @@ -188,11 +188,11 @@ for(var/atom/movable/A as mob|obj in src.connected.loc) if (!( A.anchored )) A.loc = src - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) //src.connected = null del(src.connected) else if (src.locked == 0) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) src.connected = new /obj/structure/c_tray( src.loc ) step(src.connected, SOUTH) src.connected.layer = OBJ_LAYER @@ -284,7 +284,7 @@ sleep(30) cremating = 0 locked = 0 - playsound(src.loc, 'ding.ogg', 50, 1) + playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) return /obj/structure/c_tray/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 5ad51389ce..65685905f4 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -623,7 +623,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r src.screen=2*/ //Obsolete after autorecognition if (src.isbroken) - playsound(src.loc, 'hit_on_shattered_glass.ogg', 100, 1) + playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] further abuses the shattered [src.name].") else @@ -632,18 +632,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r if(W.force <15) for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." ) - playsound(src.loc, 'Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else src.hitstaken++ if(src.hitstaken==3) for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] smashes the [src.name]!" ) src.isbroken=1 - playsound(src.loc, 'Glassbr3.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glassbr3.ogg', 100, 1) else for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) - playsound(src.loc, 'Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else user << "This does nothing." src.update_icon() @@ -849,4 +849,4 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob) else for(var/mob/O in hearers(world.view-1, T)) O.show_message("[src.name] beeps, \"Wanted notice posted!\"",2) - playsound(src.loc, 'twobeep.ogg', 75, 1) + playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 0cfda53f84..543546380a 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -451,7 +451,7 @@ Buildable meters P.node2.initialize() P.node2.build_network() - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message( \ "[user] fastens the [src].", \ "\blue You have fastened the [src].", \ @@ -483,7 +483,7 @@ Buildable meters user << "\red You need to fasten it to a pipe" return 1 new/obj/machinery/meter( src.loc ) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You have fastened the meter to the pipe" del(src) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index b58a32988e..76c0ca083f 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -76,7 +76,7 @@ return else if (istype(W, /obj/item/weapon/wrench)) if (unwrenched==0) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to unfasten \the [src] from the floor..." if (do_after(user, 40)) user.visible_message( \ @@ -89,7 +89,7 @@ if (usr.machine==src) usr << browse(null, "window=pipedispenser") else /*if (unwrenched==1)*/ - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to fasten \the [src] to the floor..." if (do_after(user, 20)) user.visible_message( \ diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index d169d4f82b..f16f1ee81e 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -661,7 +661,7 @@ Status: []
"}, else icon_state = "[lasercolor]orange_target_prism" if(sound) - playsound(src.loc, 'Taser.ogg', 75, 1) + playsound(src.loc, 'sound/weapons/Taser.ogg', 75, 1) var/obj/item/projectile/A if(emagged) A = new eprojectile( loc ) @@ -708,14 +708,14 @@ Status: []
"}, switch(build_step) if(0) // first step if(istype(W, /obj/item/weapon/wrench) && !anchored) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "\blue You secure the external bolts." anchored = 1 build_step = 1 return else if(istype(W, /obj/item/weapon/crowbar) && !anchored) - playsound(src.loc, 'Crowbar.ogg', 75, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1) user << "You dismantle the turret construction." new /obj/item/stack/sheet/metal( loc, 5) del(src) @@ -733,7 +733,7 @@ Status: []
"}, return else if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "You unfasten the external bolts." anchored = 0 build_step = 0 @@ -742,7 +742,7 @@ Status: []
"}, if(2) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "\blue You bolt the metal armor into place." build_step = 3 return @@ -754,7 +754,7 @@ Status: []
"}, user << "\red You need more fuel to complete this task." return - playsound(src.loc, pick('Welder.ogg', 'Welder2.ogg'), 50, 1) + playsound(src.loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) if(do_after(user, 20)) if(!src || !WT.remove_fuel(5, user)) return build_step = 1 @@ -775,7 +775,7 @@ Status: []
"}, return else if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "You remove the turret's metal armor bolts." build_step = 2 return @@ -791,7 +791,7 @@ Status: []
"}, if(5) if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 6 user << "\blue You close the internal access hatch." return @@ -809,7 +809,7 @@ Status: []
"}, return else if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 5 user << "You open the internal access hatch." return @@ -821,7 +821,7 @@ Status: []
"}, if (WT.get_fuel() < 5) user << "\red You need more fuel to complete this task." - playsound(src.loc, pick('Welder.ogg', 'Welder2.ogg'), 50, 1) + playsound(src.loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) if(do_after(user, 30)) if(!src || !WT.remove_fuel(5, user)) return build_step = 8 @@ -840,7 +840,7 @@ Status: []
"}, del(src) else if(istype(W, /obj/item/weapon/crowbar)) - playsound(src.loc, 'Crowbar.ogg', 75, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1) user << "You pry off the turret's exterior armor." new /obj/item/stack/sheet/metal( loc, 2) build_step = 6 diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index d831159438..190aef1ce9 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -40,7 +40,7 @@ obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob) return anchored = !anchored user << "You [anchored ? "attached" : "detached"] the recharger." - playsound(loc, 'Ratchet.ogg', 75, 1) + playsound(loc, 'sound/items/Ratchet.ogg', 75, 1) obj/machinery/recharger/attack_hand(mob/user as mob) add_fingerprint(user) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index ee222ba7d6..84c6d917e8 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -265,7 +265,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() Console.newmessagepriority = 2 Console.icon_state = "req_comp2" if(!Console.silent) - playsound(Console.loc, 'twobeep.ogg', 50, 1) + playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(5, Console.loc)) O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [department]'")) Console.messages += "High Priority message from [department]
[sending]" @@ -275,7 +275,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() // Console.newmessagepriority = 3 // Console.icon_state = "req_comp3" // if(!Console.silent) - // playsound(Console.loc, 'twobeep.ogg', 50, 1) + // playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) // for (var/mob/O in hearers(7, Console.loc)) // O.show_message(text("\icon[Console] *The Requests Console yells: 'EXTREME PRIORITY alert in [department]'")) // Console.messages += "Extreme Priority message from [ckey(department)]
[message]" @@ -285,7 +285,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() Console.newmessagepriority = 1 Console.icon_state = "req_comp1" if(!Console.silent) - playsound(Console.loc, 'twobeep.ogg', 50, 1) + playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(4, Console.loc)) O.show_message(text("\icon[Console] *The Requests Console beeps: 'Message from [department]'")) Console.messages += "Message from [department]
[message]" diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 7fcdb63973..d45f936107 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -80,7 +80,7 @@ src.health -= aforce //Play a fitting sound - playsound(src.loc, 'EMPulse.ogg', 75, 1) + playsound(src.loc, 'sound/effects/EMPulse.ogg', 75, 1) if (src.health <= 0) @@ -158,7 +158,7 @@ src.health -= tforce //This seemed to be the best sound for hitting a force field. - playsound(src.loc, 'EMPulse.ogg', 100, 1) + playsound(src.loc, 'sound/effects/EMPulse.ogg', 100, 1) //Handle the destruction of the shield if (src.health <= 0) @@ -298,7 +298,7 @@ update_icon() else if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) if(is_open) user << "\blue You close the panel." is_open = 0 @@ -323,7 +323,7 @@ user << "The bolts are covered, unlocking this would retract the covers." return if(anchored) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "\blue You unsecure the [src] from the floor!" if(active) user << "\blue The [src] shuts off!" @@ -331,7 +331,7 @@ anchored = 0 else if(istype(get_turf(src), /turf/space)) return //No wrenching these in space! - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "\blue You secure the [src] to the floor!" anchored = 1 @@ -531,14 +531,14 @@ else if(state == 0) state = 1 - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "You secure the external reinforcing bolts to the floor." src.anchored = 1 return else if(state == 1) state = 0 - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) user << "You undo the external reinforcing bolts." src.anchored = 0 return diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 1f5bc34886..3f0070a955 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -477,7 +477,7 @@ return if(istype(I, /obj/item/weapon/screwdriver)) src.panelopen = !src.panelopen - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user << text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") ) src.updateUsrDialog() return diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 8c01cfcf15..4ebd595e86 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -212,7 +212,7 @@ attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) if(istype(D, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." @@ -238,7 +238,7 @@ A.anchored = 1 del(src) else if(istype(D, /obj/item/weapon/card/emag) && !emagged) - playsound(src.loc, 'sparks4.ogg', 75, 1) + playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 user << "\blue You you disable the security protocols" src.updateUsrDialog() diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 74c3c8e784..9d905075c4 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -23,24 +23,24 @@ if(0) if(istype(P, /obj/item/weapon/screwdriver)) user << "You unfasten the bolts." - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op ++ if(1) if(istype(P, /obj/item/weapon/screwdriver)) user << "You fasten the bolts." - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op -- if(istype(P, /obj/item/weapon/wrench)) user << "You dislodge the external plating." - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op ++ if(2) if(istype(P, /obj/item/weapon/wrench)) user << "You secure the external plating." - playsound(src.loc, 'Ratchet.ogg', 75, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op -- if(istype(P, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'wirecutter.ogg', 50, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." construct_op ++ var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( user.loc ) @@ -59,7 +59,7 @@ stat &= ~BROKEN // the machine's not borked anymore! if(istype(P, /obj/item/weapon/crowbar)) user << "You begin prying out the circuit board other components..." - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,60)) user << "You finish prying out the components." diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 64f934369f..4742cc76d9 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -125,7 +125,7 @@ attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) if(istype(D, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." @@ -151,7 +151,7 @@ A.anchored = 1 del(src) else if(istype(D, /obj/item/weapon/card/emag) && !emagged) - playsound(src.loc, 'sparks4.ogg', 75, 1) + playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 user << "\blue You you disable the security protocols" src.updateUsrDialog() diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index c4684e0250..c380d9a16f 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -208,7 +208,7 @@ attackby(var/obj/item/weapon/D as obj, var/mob/user as mob) if(istype(D, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." @@ -234,7 +234,7 @@ A.anchored = 1 del(src) else if(istype(D, /obj/item/weapon/card/emag) && !emagged) - playsound(src.loc, 'sparks4.ogg', 75, 1) + playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 user << "\blue You you disable the security protocols" src.updateUsrDialog() diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 640e71a9dd..15ec833373 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -272,7 +272,7 @@ /obj/machinery/turret/attackby(obj/item/weapon/W, mob/user)//I can't believe no one added this before/N ..() - playsound(src.loc, 'smash.ogg', 60, 1) + playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1) src.spark_system.start() src.health -= W.force * 0.5 if (src.health <= 0) @@ -418,7 +418,7 @@ /obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if(!(stat & BROKEN)) - playsound(src.loc, 'slash.ogg', 25, 1, -1) + playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has slashed at []!", M, src), 1) @@ -632,7 +632,7 @@ continue if (targloc == curloc) continue - playsound(src, 'Gunshot.ogg', 50, 1) + playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1) var/obj/item/projectile/A = new /obj/item/projectile(curloc) src.projectiles-- A.current = curloc diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index cf217317b1..aa468cbba2 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -144,7 +144,7 @@ var/list/sacrificed = list() usr.say("Ta'gh fara[pick("'","`")]qha fel d'amar det!") else usr.whisper("Ta'gh fara[pick("'","`")]qha fel d'amar det!") - playsound(U, 'Welder2.ogg', 25, 1) + playsound(U, 'sound/items/Welder2.ogg', 25, 1) var/turf/T = get_turf(U) if(T) T.hotspot_expose(700,125) diff --git a/code/game/magic/musician.dm b/code/game/magic/musician.dm index 95b0606482..5bcece15ea 100644 --- a/code/game/magic/musician.dm +++ b/code/game/magic/musician.dm @@ -25,343 +25,343 @@ Tried doing it dynamically at first but its more trouble than its worth. Would have saved many lines tho.*/ switch(note) if("Cn1") - soundfile = 'Cn1.ogg' + soundfile = 'sound/piano/Cn1.ogg' if("C#1") - soundfile = 'C#1.ogg' + soundfile = 'sound/piano/C#1.ogg' if("Db1") - soundfile = 'Db1.ogg' + soundfile = 'sound/piano/Db1.ogg' if("Dn1") - soundfile = 'Dn1.ogg' + soundfile = 'sound/piano/Dn1.ogg' if("D#1") - soundfile = 'D#1.ogg' + soundfile = 'sound/piano/D#1.ogg' if("Eb1") - soundfile = 'Eb1.ogg' + soundfile = 'sound/piano/Eb1.ogg' if("En1") - soundfile = 'En1.ogg' + soundfile = 'sound/piano/En1.ogg' if("E#1") - soundfile = 'E#1.ogg' + soundfile = 'sound/piano/E#1.ogg' if("Fb1") - soundfile = 'Fb1.ogg' + soundfile = 'sound/piano/Fb1.ogg' if("Fn1") - soundfile = 'Fn1.ogg' + soundfile = 'sound/piano/Fn1.ogg' if("F#1") - soundfile = 'F#1.ogg' + soundfile = 'sound/piano/F#1.ogg' if("Gb1") - soundfile = 'Gb1.ogg' + soundfile = 'sound/piano/Gb1.ogg' if("Gn1") - soundfile = 'Gn1.ogg' + soundfile = 'sound/piano/Gn1.ogg' if("G#1") - soundfile = 'G#1.ogg' + soundfile = 'sound/piano/G#1.ogg' if("Ab1") - soundfile = 'Ab1.ogg' + soundfile = 'sound/piano/Ab1.ogg' if("An1") - soundfile = 'An1.ogg' + soundfile = 'sound/piano/An1.ogg' if("A#1") - soundfile = 'A#1.ogg' + soundfile = 'sound/piano/A#1.ogg' if("Bb1") - soundfile = 'Bb1.ogg' + soundfile = 'sound/piano/Bb1.ogg' if("Bn1") - soundfile = 'Bn1.ogg' + soundfile = 'sound/piano/Bn1.ogg' if("B#1") - soundfile = 'B#1.ogg' + soundfile = 'sound/piano/B#1.ogg' if("Cb2") - soundfile = 'Cb2.ogg' + soundfile = 'sound/piano/Cb2.ogg' if("Cn2") - soundfile = 'Cn2.ogg' + soundfile = 'sound/piano/Cn2.ogg' if("C#2") - soundfile = 'C#2.ogg' + soundfile = 'sound/piano/C#2.ogg' if("Db2") - soundfile = 'Db2.ogg' + soundfile = 'sound/piano/Db2.ogg' if("Dn2") - soundfile = 'Dn2.ogg' + soundfile = 'sound/piano/Dn2.ogg' if("D#2") - soundfile = 'D#2.ogg' + soundfile = 'sound/piano/D#2.ogg' if("Eb2") - soundfile = 'Eb2.ogg' + soundfile = 'sound/piano/Eb2.ogg' if("En2") - soundfile = 'En2.ogg' + soundfile = 'sound/piano/En2.ogg' if("E#2") - soundfile = 'E#2.ogg' + soundfile = 'sound/piano/E#2.ogg' if("Fb2") - soundfile = 'Fb2.ogg' + soundfile = 'sound/piano/Fb2.ogg' if("Fn2") - soundfile = 'Fn2.ogg' + soundfile = 'sound/piano/Fn2.ogg' if("F#2") - soundfile = 'F#2.ogg' + soundfile = 'sound/piano/F#2.ogg' if("Gb2") - soundfile = 'Gb2.ogg' + soundfile = 'sound/piano/Gb2.ogg' if("Gn2") - soundfile = 'Gn2.ogg' + soundfile = 'sound/piano/Gn2.ogg' if("G#2") - soundfile = 'G#2.ogg' + soundfile = 'sound/piano/G#2.ogg' if("Ab2") - soundfile = 'Ab2.ogg' + soundfile = 'sound/piano/Ab2.ogg' if("An2") - soundfile = 'An2.ogg' + soundfile = 'sound/piano/An2.ogg' if("A#2") - soundfile = 'A#2.ogg' + soundfile = 'sound/piano/A#2.ogg' if("Bb2") - soundfile = 'Bb2.ogg' + soundfile = 'sound/piano/Bb2.ogg' if("Bn2") - soundfile = 'Bn2.ogg' + soundfile = 'sound/piano/Bn2.ogg' if("B#2") - soundfile = 'B#2.ogg' + soundfile = 'sound/piano/B#2.ogg' if("Cb3") - soundfile = 'Cb3.ogg' + soundfile = 'sound/piano/Cb3.ogg' if("Cn3") - soundfile = 'Cn3.ogg' + soundfile = 'sound/piano/Cn3.ogg' if("C#3") - soundfile = 'C#3.ogg' + soundfile = 'sound/piano/C#3.ogg' if("Db3") - soundfile = 'Db3.ogg' + soundfile = 'sound/piano/Db3.ogg' if("Dn3") - soundfile = 'Dn3.ogg' + soundfile = 'sound/piano/Dn3.ogg' if("D#3") - soundfile = 'D#3.ogg' + soundfile = 'sound/piano/D#3.ogg' if("Eb3") - soundfile = 'Eb3.ogg' + soundfile = 'sound/piano/Eb3.ogg' if("En3") - soundfile = 'En3.ogg' + soundfile = 'sound/piano/En3.ogg' if("E#3") - soundfile = 'E#3.ogg' + soundfile = 'sound/piano/E#3.ogg' if("Fb3") - soundfile = 'Fb3.ogg' + soundfile = 'sound/piano/Fb3.ogg' if("Fn3") - soundfile = 'Fn3.ogg' + soundfile = 'sound/piano/Fn3.ogg' if("F#3") - soundfile = 'F#3.ogg' + soundfile = 'sound/piano/F#3.ogg' if("Gb3") - soundfile = 'Gb3.ogg' + soundfile = 'sound/piano/Gb3.ogg' if("Gn3") - soundfile = 'Gn3.ogg' + soundfile = 'sound/piano/Gn3.ogg' if("G#3") - soundfile = 'G#3.ogg' + soundfile = 'sound/piano/G#3.ogg' if("Ab3") - soundfile = 'Ab3.ogg' + soundfile = 'sound/piano/Ab3.ogg' if("An3") - soundfile = 'An3.ogg' + soundfile = 'sound/piano/An3.ogg' if("A#3") - soundfile = 'A#3.ogg' + soundfile = 'sound/piano/A#3.ogg' if("Bb3") - soundfile = 'Bb3.ogg' + soundfile = 'sound/piano/Bb3.ogg' if("Bn3") - soundfile = 'Bn3.ogg' + soundfile = 'sound/piano/Bn3.ogg' if("B#3") - soundfile = 'B#3.ogg' + soundfile = 'sound/piano/B#3.ogg' if("Cb4") - soundfile = 'Cb4.ogg' + soundfile = 'sound/piano/Cb4.ogg' if("Cn4") - soundfile = 'Cn4.ogg' + soundfile = 'sound/piano/Cn4.ogg' if("C#4") - soundfile = 'C#4.ogg' + soundfile = 'sound/piano/C#4.ogg' if("Db4") - soundfile = 'Db4.ogg' + soundfile = 'sound/piano/Db4.ogg' if("Dn4") - soundfile = 'Dn4.ogg' + soundfile = 'sound/piano/Dn4.ogg' if("D#4") - soundfile = 'D#4.ogg' + soundfile = 'sound/piano/D#4.ogg' if("Eb4") - soundfile = 'Eb4.ogg' + soundfile = 'sound/piano/Eb4.ogg' if("En4") - soundfile = 'En4.ogg' + soundfile = 'sound/piano/En4.ogg' if("E#4") - soundfile = 'E#4.ogg' + soundfile = 'sound/piano/E#4.ogg' if("Fb4") - soundfile = 'Fb4.ogg' + soundfile = 'sound/piano/Fb4.ogg' if("Fn4") - soundfile = 'Fn4.ogg' + soundfile = 'sound/piano/Fn4.ogg' if("F#4") - soundfile = 'F#4.ogg' + soundfile = 'sound/piano/F#4.ogg' if("Gb4") - soundfile = 'Gb4.ogg' + soundfile = 'sound/piano/Gb4.ogg' if("Gn4") - soundfile = 'Gn4.ogg' + soundfile = 'sound/piano/Gn4.ogg' if("G#4") - soundfile = 'G#4.ogg' + soundfile = 'sound/piano/G#4.ogg' if("Ab4") - soundfile = 'Ab4.ogg' + soundfile = 'sound/piano/Ab4.ogg' if("An4") - soundfile = 'An4.ogg' + soundfile = 'sound/piano/An4.ogg' if("A#4") - soundfile = 'A#4.ogg' + soundfile = 'sound/piano/A#4.ogg' if("Bb4") - soundfile = 'Bb4.ogg' + soundfile = 'sound/piano/Bb4.ogg' if("Bn4") - soundfile = 'Bn4.ogg' + soundfile = 'sound/piano/Bn4.ogg' if("B#4") - soundfile = 'B#4.ogg' + soundfile = 'sound/piano/B#4.ogg' if("Cb5") - soundfile = 'Cb5.ogg' + soundfile = 'sound/piano/Cb5.ogg' if("Cn5") - soundfile = 'Cn5.ogg' + soundfile = 'sound/piano/Cn5.ogg' if("C#5") - soundfile = 'C#5.ogg' + soundfile = 'sound/piano/C#5.ogg' if("Db5") - soundfile = 'Db5.ogg' + soundfile = 'sound/piano/Db5.ogg' if("Dn5") - soundfile = 'Dn5.ogg' + soundfile = 'sound/piano/Dn5.ogg' if("D#5") - soundfile = 'D#5.ogg' + soundfile = 'sound/piano/D#5.ogg' if("Eb5") - soundfile = 'Eb5.ogg' + soundfile = 'sound/piano/Eb5.ogg' if("En5") - soundfile = 'En5.ogg' + soundfile = 'sound/piano/En5.ogg' if("E#5") - soundfile = 'E#5.ogg' + soundfile = 'sound/piano/E#5.ogg' if("Fb5") - soundfile = 'Fb5.ogg' + soundfile = 'sound/piano/Fb5.ogg' if("Fn5") - soundfile = 'Fn5.ogg' + soundfile = 'sound/piano/Fn5.ogg' if("F#5") - soundfile = 'F#5.ogg' + soundfile = 'sound/piano/F#5.ogg' if("Gb5") - soundfile = 'Gb5.ogg' + soundfile = 'sound/piano/Gb5.ogg' if("Gn5") - soundfile = 'Gn5.ogg' + soundfile = 'sound/piano/Gn5.ogg' if("G#5") - soundfile = 'G#5.ogg' + soundfile = 'sound/piano/G#5.ogg' if("Ab5") - soundfile = 'Ab5.ogg' + soundfile = 'sound/piano/Ab5.ogg' if("An5") - soundfile = 'An5.ogg' + soundfile = 'sound/piano/An5.ogg' if("A#5") - soundfile = 'A#5.ogg' + soundfile = 'sound/piano/A#5.ogg' if("Bb5") - soundfile = 'Bb5.ogg' + soundfile = 'sound/piano/Bb5.ogg' if("Bn5") - soundfile = 'Bn5.ogg' + soundfile = 'sound/piano/Bn5.ogg' if("B#5") - soundfile = 'B#5.ogg' + soundfile = 'sound/piano/B#5.ogg' if("Cb6") - soundfile = 'Cb6.ogg' + soundfile = 'sound/piano/Cb6.ogg' if("Cn6") - soundfile = 'Cn6.ogg' + soundfile = 'sound/piano/Cn6.ogg' if("C#6") - soundfile = 'C#6.ogg' + soundfile = 'sound/piano/C#6.ogg' if("Db6") - soundfile = 'Db6.ogg' + soundfile = 'sound/piano/Db6.ogg' if("Dn6") - soundfile = 'Dn6.ogg' + soundfile = 'sound/piano/Dn6.ogg' if("D#6") - soundfile = 'D#6.ogg' + soundfile = 'sound/piano/D#6.ogg' if("Eb6") - soundfile = 'Eb6.ogg' + soundfile = 'sound/piano/Eb6.ogg' if("En6") - soundfile = 'En6.ogg' + soundfile = 'sound/piano/En6.ogg' if("E#6") - soundfile = 'E#6.ogg' + soundfile = 'sound/piano/E#6.ogg' if("Fb6") - soundfile = 'Fb6.ogg' + soundfile = 'sound/piano/Fb6.ogg' if("Fn6") - soundfile = 'Fn6.ogg' + soundfile = 'sound/piano/Fn6.ogg' if("F#6") - soundfile = 'F#6.ogg' + soundfile = 'sound/piano/F#6.ogg' if("Gb6") - soundfile = 'Gb6.ogg' + soundfile = 'sound/piano/Gb6.ogg' if("Gn6") - soundfile = 'Gn6.ogg' + soundfile = 'sound/piano/Gn6.ogg' if("G#6") - soundfile = 'G#6.ogg' + soundfile = 'sound/piano/G#6.ogg' if("Ab6") - soundfile = 'Ab6.ogg' + soundfile = 'sound/piano/Ab6.ogg' if("An6") - soundfile = 'An6.ogg' + soundfile = 'sound/piano/An6.ogg' if("A#6") - soundfile = 'A#6.ogg' + soundfile = 'sound/piano/A#6.ogg' if("Bb6") - soundfile = 'Bb6.ogg' + soundfile = 'sound/piano/Bb6.ogg' if("Bn6") - soundfile = 'Bn6.ogg' + soundfile = 'sound/piano/Bn6.ogg' if("B#6") - soundfile = 'B#6.ogg' + soundfile = 'sound/piano/B#6.ogg' if("Cb7") - soundfile = 'Cb7.ogg' + soundfile = 'sound/piano/Cb7.ogg' if("Cn7") - soundfile = 'Cn7.ogg' + soundfile = 'sound/piano/Cn7.ogg' if("C#7") - soundfile = 'C#7.ogg' + soundfile = 'sound/piano/C#7.ogg' if("Db7") - soundfile = 'Db7.ogg' + soundfile = 'sound/piano/Db7.ogg' if("Dn7") - soundfile = 'Dn7.ogg' + soundfile = 'sound/piano/Dn7.ogg' if("D#7") - soundfile = 'D#7.ogg' + soundfile = 'sound/piano/D#7.ogg' if("Eb7") - soundfile = 'Eb7.ogg' + soundfile = 'sound/piano/Eb7.ogg' if("En7") - soundfile = 'En7.ogg' + soundfile = 'sound/piano/En7.ogg' if("E#7") - soundfile = 'E#7.ogg' + soundfile = 'sound/piano/E#7.ogg' if("Fb7") - soundfile = 'Fb7.ogg' + soundfile = 'sound/piano/Fb7.ogg' if("Fn7") - soundfile = 'Fn7.ogg' + soundfile = 'sound/piano/Fn7.ogg' if("F#7") - soundfile = 'F#7.ogg' + soundfile = 'sound/piano/F#7.ogg' if("Gb7") - soundfile = 'Gb7.ogg' + soundfile = 'sound/piano/Gb7.ogg' if("Gn7") - soundfile = 'Gn7.ogg' + soundfile = 'sound/piano/Gn7.ogg' if("G#7") - soundfile = 'G#7.ogg' + soundfile = 'sound/piano/G#7.ogg' if("Ab7") - soundfile = 'Ab7.ogg' + soundfile = 'sound/piano/Ab7.ogg' if("An7") - soundfile = 'An7.ogg' + soundfile = 'sound/piano/An7.ogg' if("A#7") - soundfile = 'A#7.ogg' + soundfile = 'sound/piano/A#7.ogg' if("Bb7") - soundfile = 'Bb7.ogg' + soundfile = 'sound/piano/Bb7.ogg' if("Bn7") - soundfile = 'Bn7.ogg' + soundfile = 'sound/piano/Bn7.ogg' if("B#7") - soundfile = 'B#7.ogg' + soundfile = 'sound/piano/B#7.ogg' if("Cb8") - soundfile = 'Cb8.ogg' + soundfile = 'sound/piano/Cb8.ogg' if("Cn8") - soundfile = 'Cn8.ogg' + soundfile = 'sound/piano/Cn8.ogg' if("C#8") - soundfile = 'C#8.ogg' + soundfile = 'sound/piano/C#8.ogg' if("Db8") - soundfile = 'Db8.ogg' + soundfile = 'sound/piano/Db8.ogg' if("Dn8") - soundfile = 'Dn8.ogg' + soundfile = 'sound/piano/Dn8.ogg' if("D#8") - soundfile = 'D#8.ogg' + soundfile = 'sound/piano/D#8.ogg' if("Eb8") - soundfile = 'Eb8.ogg' + soundfile = 'sound/piano/Eb8.ogg' if("En8") - soundfile = 'En8.ogg' + soundfile = 'sound/piano/En8.ogg' if("E#8") - soundfile = 'E#8.ogg' + soundfile = 'sound/piano/E#8.ogg' if("Fb8") - soundfile = 'Fb8.ogg' + soundfile = 'sound/piano/Fb8.ogg' if("Fn8") - soundfile = 'Fn8.ogg' + soundfile = 'sound/piano/Fn8.ogg' if("F#8") - soundfile = 'F#8.ogg' + soundfile = 'sound/piano/F#8.ogg' if("Gb8") - soundfile = 'Gb8.ogg' + soundfile = 'sound/piano/Gb8.ogg' if("Gn8") - soundfile = 'Gn8.ogg' + soundfile = 'sound/piano/Gn8.ogg' if("G#8") - soundfile = 'G#8.ogg' + soundfile = 'sound/piano/G#8.ogg' if("Ab8") - soundfile = 'Ab8.ogg' + soundfile = 'sound/piano/Ab8.ogg' if("An8") - soundfile = 'An8.ogg' + soundfile = 'sound/piano/An8.ogg' if("A#8") - soundfile = 'A#8.ogg' + soundfile = 'sound/piano/A#8.ogg' if("Bb8") - soundfile = 'Bb8.ogg' + soundfile = 'sound/piano/Bb8.ogg' if("Bn8") - soundfile = 'Bn8.ogg' + soundfile = 'sound/piano/Bn8.ogg' if("B#8") - soundfile = 'B#8.ogg' + soundfile = 'sound/piano/B#8.ogg' if("Cb9") - soundfile = 'Cb9.ogg' + soundfile = 'sound/piano/Cb9.ogg' if("Cn9") - soundfile = 'Cn9.ogg' + soundfile = 'sound/piano/Cn9.ogg' else return @@ -566,7 +566,7 @@ attackby(obj/item/O as obj, mob/user as mob) if (istype(O, /obj/item/weapon/wrench)) if (anchored) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to loosen \the [src]'s casters..." if (do_after(user, 40)) user.visible_message( \ @@ -575,7 +575,7 @@ "You hear ratchet.") src.anchored = 0 else - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You begin to tighten \the [src] to the floor..." if (do_after(user, 20)) user.visible_message( \ diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 901868c281..6c8ea5effc 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -27,7 +27,7 @@ if(istype(target, /mob/living)) var/mob/living/M = target if(src.occupant.a_intent == "hurt") - playsound(src, 'punch4.ogg', 50, 1) + playsound(src, 'sound/weapons/punch4.ogg', 50, 1) if(damtype == "brute") step_away(M,src,15) /* @@ -102,7 +102,7 @@ target:dismantle_wall(1) src.occupant_message("\blue You smash through the wall.") src.visible_message("[src.name] smashes through the wall") - playsound(src, 'smash.ogg', 50, 1) + playsound(src, 'sound/weapons/smash.ogg', 50, 1) melee_can_hit = 0 if(do_after(melee_cooldown)) melee_can_hit = 1 diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index bf7aac9c92..62dcd59b49 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -150,7 +150,7 @@ obj/mecha/combat/honker/Topic(href, href_list) if (href_list["play_sound"]) switch(href_list["play_sound"]) if("sadtrombone") - playsound(src, 'sadtrombone.ogg', 50) + playsound(src, 'sound/misc/sadtrombone.ogg', 50) return proc/rand_hex_color() diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index defb8c2244..b366b9e770 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -161,7 +161,7 @@ src.occupant_message("Zoom mode [zoom?"en":"dis"]abled.") if(zoom) src.occupant.client.view = 12 - src.occupant << sound('imag_enh.ogg',volume=50) + src.occupant << sound('sound/mecha/imag_enh.ogg',volume=50) else src.occupant.client.view = world.view//world.view - default mob view size return diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index d17a62d955..4ca4d89acf 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -54,9 +54,9 @@ chassis.occupant_message("The [src] is destroyed!") chassis.log_append_to_last("[src] is destroyed.",1) if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon)) - chassis.occupant << sound('weapdestr.ogg',volume=50) + chassis.occupant << sound('sound/mecha/weapdestr.ogg',volume=50) else - chassis.occupant << sound('critdestr.ogg',volume=50) + chassis.occupant << sound('sound/mecha/critdestr.ogg',volume=50) spawn del src return diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index ac83b11c07..1a292b6706 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -1,672 +1,672 @@ -/obj/item/mecha_parts/mecha_equipment/tool/sleeper - name = "Mounted Sleeper" - desc = "Mounted Sleeper. (Can be attached to: Medical Exosuits)" - icon = 'icons/obj/Cryogenic2.dmi' - icon_state = "sleeper_0" - origin_tech = "programming=2;biotech=3" - energy_drain = 20 - range = MELEE - construction_cost = list("metal"=5000,"glass"=10000) - reliability = 1000 - equip_cooldown = 20 - var/mob/living/carbon/occupant = null - var/datum/global_iterator/pr_mech_sleeper - var/inject_amount = 10 - salvageable = 0 - - can_attach(obj/mecha/medical/M) - if(..()) - if(istype(M)) - return 1 - return 0 - - New() - ..() - pr_mech_sleeper = new /datum/global_iterator/mech_sleeper(list(src),0) - pr_mech_sleeper.set_delay(equip_cooldown) - return - - allow_drop() - return 0 - - destroy() - for(var/atom/movable/AM in src) - AM.forceMove(get_turf(src)) - return ..() - - Exit(atom/movable/O) - return 0 - - action(var/mob/living/carbon/target) - if(!action_checks(target)) - return - if(!istype(target)) - return - if(target.buckled) - occupant_message("[target] will not fit into the sleeper because they are buckled to [target.buckled].") - return - if(occupant) - occupant_message("The sleeper is already occupied") - return - for(var/mob/living/carbon/metroid/M in range(1,target)) - if(M.Victim == target) - occupant_message("[target] will not fit into the sleeper because they have a Metroid latched onto their head.") - return - occupant_message("You start putting [target] into [src].") - chassis.visible_message("[chassis] starts putting [target] into the [src].") - var/C = chassis.loc - var/T = target.loc - if(do_after_cooldown(target)) - if(chassis.loc!=C || target.loc!=T) - return - if(occupant) - occupant_message("The sleeper is already occupied!") - return - target.forceMove(src) - occupant = target - target.reset_view(src) - /* - if(target.client) - target.client.perspective = EYE_PERSPECTIVE - target.client.eye = chassis - */ - set_ready_state(0) - pr_mech_sleeper.start() - occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") - chassis.visible_message("[chassis] loads [target] into [src].") - log_message("[target] loaded. Life support functions engaged.") - return - - proc/go_out() - if(!occupant) - return - occupant.forceMove(get_turf(src)) - occupant_message("[occupant] ejected. Life support functions disabled.") - log_message("[occupant] ejected. Life support functions disabled.") - occupant.reset_view() - /* - if(occupant.client) - occupant.client.eye = occupant.client.mob - occupant.client.perspective = MOB_PERSPECTIVE - */ - occupant = null - pr_mech_sleeper.stop() - set_ready_state(1) - return - - detach() - if(occupant) - occupant_message("Unable to detach [src] - equipment occupied.") - return - pr_mech_sleeper.stop() - return ..() - - get_equip_info() - var/output = ..() - if(output) - var/temp = "" - if(occupant) - temp = "
\[Occupant: [occupant] (Health: [occupant.health]%)\]
View stats|Eject" - return "[output] [temp]" - return - - Topic(href,href_list) - ..() - var/datum/topic_input/filter = new /datum/topic_input(href,href_list) - if(filter.get("eject")) - go_out() - if(filter.get("view_stats")) - chassis.occupant << browse(get_occupant_stats(),"window=msleeper") - onclose(chassis.occupant, "msleeper") - return - if(filter.get("inject")) - inject_reagent(filter.getType("inject",/datum/reagent),filter.getObj("source")) - return - - proc/get_occupant_stats() - if(!occupant) - return - return {" - - [occupant] statistics - - - - -

Health statistics

-
- [get_occupant_dam()] -
-

Reagents in bloodstream

-
- [get_occupant_reagents()] -
-
- [get_available_reagents()] -
- - "} - - proc/get_occupant_dam() - var/t1 - switch(occupant.stat) - if(0) - t1 = "Conscious" - if(1) - t1 = "Unconscious" - if(2) - t1 = "*dead*" - else - t1 = "Unknown" - return {"Health: [occupant.health]% ([t1])
- Core Temperature: [src.occupant.bodytemperature-T0C]°C ([src.occupant.bodytemperature*1.8-459.67]°F)
- Brute Damage: [occupant.getBruteLoss()]%
- Respiratory Damage: [occupant.getOxyLoss()]%
- Toxin Content: [occupant.getToxLoss()]%
- Burn Severity: [occupant.getFireLoss()]%
- "} - - proc/get_occupant_reagents() - if(occupant.reagents) - for(var/datum/reagent/R in occupant.reagents.reagent_list) - if(R.volume > 0) - . += "[R]: [round(R.volume,0.01)]
" - return . || "None" - - proc/get_available_reagents() - var/output - var/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/SG = locate(/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun) in chassis - if(SG && SG.reagents && islist(SG.reagents.reagent_list)) - for(var/datum/reagent/R in SG.reagents.reagent_list) - if(R.volume > 0) - output += "Inject [R.name]
" - return output - - - proc/inject_reagent(var/datum/reagent/R,var/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/SG) - if(!R || !occupant || !SG || !(SG in chassis.equipment)) - return 0 - var/to_inject = min(R.volume, inject_amount) - if(to_inject && occupant.reagents.get_reagent_amount(R.id) + to_inject <= inject_amount*2) - SG.reagents.trans_id_to(occupant,R.id,to_inject) - occupant_message("[occupant] injected with [to_inject] units of [R.name].") - log_message("[occupant] injected with [to_inject] units of [R.name].") - update_equip_info() - return - - update_equip_info() - if(..()) - send_byjax(chassis.occupant,"msleeper.browser","lossinfo",get_occupant_dam()) - send_byjax(chassis.occupant,"msleeper.browser","reagents",get_occupant_reagents()) - send_byjax(chassis.occupant,"msleeper.browser","injectwith",get_available_reagents()) - return 1 - return - -/datum/global_iterator/mech_sleeper - - process(var/obj/item/mecha_parts/mecha_equipment/tool/sleeper/S) - if(!S.chassis) - S.set_ready_state(1) - return stop() - if(!S.chassis.has_charge(S.energy_drain)) - S.set_ready_state(1) - S.log_message("Deactivated.") - S.occupant_message("[src] deactivated - no power.") - return stop() - var/mob/living/carbon/M = S.occupant - if(!M) - return - if(M.health > 0) - M.adjustOxyLoss(-1) - M.updatehealth() - M.AdjustStunned(-4) - M.AdjustWeakened(-4) - M.AdjustStunned(-4) - M.Paralyse(2) - M.Weaken(2) - M.Stun(2) - if(M.reagents.get_reagent_amount("inaprovaline") < 5) - M.reagents.add_reagent("inaprovaline", 5) - S.chassis.use_power(S.energy_drain) - S.update_equip_info() - return - - -/obj/item/mecha_parts/mecha_equipment/tool/cable_layer - name = "Cable Layer" - icon_state = "mecha_wire" - var/datum/event/event - var/turf/old_turf - var/obj/structure/cable/last_piece - var/obj/item/weapon/cable_coil/cable - var/max_cable = 1000 - - New() - cable = new(src) - cable.amount = 0 - ..() - - can_attach(obj/mecha/working/M) - if(..()) - if(istype(M)) - return 1 - return 0 - - attach() - ..() - event = chassis.events.addEvent("onMove",src,"layCable") - return - - detach() - chassis.events.clearEvent("onMove",event) - return ..() - - destroy() - chassis.events.clearEvent("onMove",event) - return ..() - - action(var/obj/item/weapon/cable_coil/target) - if(!action_checks(target)) - return - var/result = load_cable(target) - var/message - if(isnull(result)) - message = "Unable to load [target] - no cable found." - else if(!result) - message = "Reel is full." - else - message = "[result] meters of cable successfully loaded." - send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) - occupant_message(message) - return - - Topic(href,href_list) - ..() - if(href_list["toggle"]) - set_ready_state(!equip_ready) - occupant_message("[src] [equip_ready?"dea":"a"]ctivated.") - log_message("[equip_ready?"Dea":"A"]ctivated.") - return - if(href_list["cut"]) - if(cable && cable.amount) - var/m = round(input(chassis.occupant,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1) - m = min(m, cable.amount) - if(m) - use_cable(m) - var/obj/item/weapon/cable_coil/CC = new (get_turf(chassis)) - CC.amount = m - else - occupant_message("There's no more cable on the reel.") - return - - get_equip_info() - var/output = ..() - if(output) - return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]" - return - - proc/load_cable(var/obj/item/weapon/cable_coil/CC) - if(istype(CC) && CC.amount) - var/cur_amount = cable? cable.amount : 0 - var/to_load = max(max_cable - cur_amount,0) - if(to_load) - to_load = min(CC.amount, to_load) - if(!cable) - cable = new(src) - cable.amount = 0 - cable.amount += to_load - CC.use(to_load) - return to_load - else - return 0 - return - - proc/use_cable(amount) - if(!cable || cable.amount<1) - set_ready_state(1) - occupant_message("Cable depleted, [src] deactivated.") - log_message("Cable depleted, [src] deactivated.") - return - if(cable.amount < amount) - occupant_message("No enough cable to finish the task.") - return - cable.use(amount) - update_equip_info() - return 1 - - proc/reset() - last_piece = null - - proc/dismantleFloor(var/turf/new_turf) - if(istype(new_turf, /turf/simulated/floor)) - var/turf/simulated/floor/T = new_turf - if(!T.is_plating()) - if(!T.broken && !T.burnt) - new T.floor_tile.type(T) - T.make_plating() - return !new_turf.intact - - proc/layCable(var/turf/new_turf) - if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf)) - return reset() - var/fdirn = turn(chassis.dir,180) - for(var/obj/structure/cable/LC in new_turf) // check to make sure there's not a cable there already - if(LC.d1 == fdirn || LC.d2 == fdirn) - return reset() - if(!use_cable(1)) - return reset() - var/obj/structure/cable/NC = new(new_turf) - NC.cableColor("red") - NC.d1 = 0 - NC.d2 = fdirn - NC.updateicon() - var/netnum - var/datum/powernet/PN - if(last_piece && last_piece.d2 != chassis.dir) - last_piece.d1 = min(last_piece.d2, chassis.dir) - last_piece.d2 = max(last_piece.d2, chassis.dir) - last_piece.updateicon() - netnum = last_piece.netnum - if(netnum) - NC.netnum = netnum - PN = powernets[netnum] - else - PN = new() - PN.number = powernets.len + 1 - powernets += PN - NC.netnum = PN.number - PN.cables += NC - NC.mergeConnectedNetworks(NC.d2) - //NC.mergeConnectedNetworksOnTurf() - last_piece = NC - return 1 - -/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun - name = "Syringe Gun" - desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)" - icon = 'icons/obj/gun.dmi' - icon_state = "syringegun" - var/list/syringes - var/list/known_reagents - var/list/processed_reagents - var/max_syringes = 10 - var/max_volume = 75 //max reagent volume - var/synth_speed = 5 //[num] reagent units per cycle - energy_drain = 10 - var/mode = 0 //0 - fire syringe, 1 - analyze reagents. - var/datum/global_iterator/mech_synth/synth - range = MELEE|RANGED - equip_cooldown = 10 - origin_tech = "materials=3;biotech=4;magnets=4;programming=3" - construction_time = 200 - construction_cost = list("metal"=3000,"glass"=2000) - - New() - ..() - flags |= NOREACT - syringes = new - known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Anti-Toxin (Dylovene)") - processed_reagents = new - create_reagents(max_volume) - synth = new (list(src),0) - - detach() - synth.stop() - return ..() - - critfail() - ..() - flags &= ~NOREACT - return - - can_attach(obj/mecha/medical/M) - if(..()) - if(istype(M)) - return 1 - return 0 - - get_equip_info() - var/output = ..() - if(output) - return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [syringes.len]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list" - return - - action(atom/movable/target) - if(!action_checks(target)) - return - if(istype(target,/obj/item/weapon/reagent_containers/syringe)) - return load_syringe(target) - if(istype(target,/obj/item/weapon/storage))//Loads syringes from boxes - for(var/obj/item/weapon/reagent_containers/syringe/S in target.contents) - load_syringe(S) - return - if(mode) - return analyze_reagents(target) - if(!syringes.len) - occupant_message("No syringes loaded.") - return - if(reagents.total_volume<=0) - occupant_message("No available reagents to load syringe with.") - return - set_ready_state(0) - chassis.use_power(energy_drain) - var/turf/trg = get_turf(target) - var/obj/item/weapon/reagent_containers/syringe/S = syringes[1] - S.forceMove(get_turf(chassis)) - reagents.trans_to(S, min(S.volume, reagents.total_volume)) - syringes -= S - S.icon = 'icons/obj/chemical.dmi' - S.icon_state = "syringeproj" - playsound(chassis, 'syringeproj.ogg', 50, 1) - log_message("Launched [S] from [src], targeting [target].") - spawn(-1) - src = null //if src is deleted, still process the syringe - for(var/i=0, i<6, i++) - if(!S) - break - if(step_towards(S,trg)) - var/list/mobs = new - for(var/mob/living/carbon/M in S.loc) - mobs += M - var/mob/living/carbon/M = safepick(mobs) - if(M) - S.icon_state = initial(S.icon_state) - S.icon = initial(S.icon) - S.reagents.trans_to(M, S.reagents.total_volume) - M.take_organ_damage(2) - S.visible_message(" [M] was hit by the syringe!") - break - else if(S.loc == trg) - S.icon_state = initial(S.icon_state) - S.icon = initial(S.icon) - S.update_icon() - break - else - S.icon_state = initial(S.icon_state) - S.icon = initial(S.icon) - S.update_icon() - break - sleep(1) - do_after_cooldown() - return 1 - - - Topic(href,href_list) - ..() - var/datum/topic_input/filter = new (href,href_list) - if(filter.get("toggle_mode")) - mode = !mode - update_equip_info() - return - if(filter.get("select_reagents")) - processed_reagents.len = 0 - var/m = 0 - var/message - for(var/i=1 to known_reagents.len) - if(m>=synth_speed) - break - var/reagent = filter.get("reagent_[i]") - if(reagent && (reagent in known_reagents)) - message = "[m ? ", " : null][known_reagents[reagent]]" - processed_reagents += reagent - m++ - if(processed_reagents.len) - message += " added to production" - synth.start() - occupant_message(message) - occupant_message("Reagent processing started.") - log_message("Reagent processing started.") - return - if(filter.get("show_reagents")) - chassis.occupant << browse(get_reagents_page(),"window=msyringegun") - if(filter.get("purge_reagent")) - var/reagent = filter.get("purge_reagent") - if(reagent) - reagents.del_reagent(reagent) - return - if(filter.get("purge_all")) - reagents.clear_reagents() - return - return - - proc/get_reagents_page() - var/output = {" - - Reagent Synthesizer - - - - -

Current reagents:

-
- [get_current_reagents()] -
-

Reagents production:

-
- [get_reagents_form()] -
- - - "} - return output - - proc/get_reagents_form() - var/r_list = get_reagents_list() - var/inputs - if(r_list) - inputs += "" - inputs += "" - inputs += "" - var/output = {"
- [r_list || "No known reagents"] - [inputs] -
- [r_list? "Only the first [synth_speed] selected reagent\s will be added to production" : null] - "} - return output - - proc/get_reagents_list() - var/output - for(var/i=1 to known_reagents.len) - var/reagent_id = known_reagents[i] - output += {" [known_reagents[reagent_id]]
"} - return output - - proc/get_current_reagents() - var/output - for(var/datum/reagent/R in reagents.reagent_list) - if(R.volume > 0) - output += "[R]: [round(R.volume,0.001)] - Purge Reagent
" - if(output) - output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] - Purge All" - return output || "None" - - proc/load_syringe(obj/item/weapon/reagent_containers/syringe/S) - if(syringes.len= 2) - occupant_message("The syringe is too far away.") - return 0 - for(var/obj/structure/D in S.loc)//Basic level check for structures in the way (Like grilles and windows) - if(!(D.CanPass(S,src.loc))) - occupant_message("Unable to load syringe.") - return 0 - for(var/obj/machinery/door/D in S.loc)//Checks for doors - if(!(D.CanPass(S,src.loc))) - occupant_message("Unable to load syringe.") - return 0 - S.reagents.trans_to(src, S.reagents.total_volume) - S.forceMove(src) - syringes += S - occupant_message("Syringe loaded.") - update_equip_info() - return 1 - occupant_message("The [src] syringe chamber is full.") - return 0 - - proc/analyze_reagents(atom/A) - if(get_dist(src,A) >= 4) - occupant_message("The object is too far away.") - return 0 - if(!A.reagents || istype(A,/mob)) - occupant_message("No reagent info gained from [A].") - return 0 - occupant_message("Analyzing reagents...") - for(var/datum/reagent/R in A.reagents.reagent_list) - if(R.reagent_state == 2 && add_known_reagent(R.id,R.name)) - occupant_message("Reagent analyzed, identified as [R.name] and added to database.") - send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) - occupant_message("Analyzis complete.") - return 1 - - proc/add_known_reagent(r_id,r_name) - set_ready_state(0) - do_after_cooldown() - if(!(r_id in known_reagents)) - known_reagents += r_id - known_reagents[r_id] = r_name - return 1 - return 0 - - - update_equip_info() - if(..()) - send_byjax(chassis.occupant,"msyringegun.browser","reagents",get_current_reagents()) - send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) - return 1 - return - - on_reagent_change() - ..() - update_equip_info() - return - -/datum/global_iterator/mech_synth - delay = 100 - - process(var/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/S) - if(!S.chassis) - return stop() - var/energy_drain = S.energy_drain*10 - if(!S.processed_reagents.len || S.reagents.total_volume >= S.reagents.maximum_volume || !S.chassis.has_charge(energy_drain)) - S.occupant_message("Reagent processing stopped.") - S.log_message("Reagent processing stopped.") - return stop() - if(anyprob(S.reliability)) - S.critfail() - var/amount = S.synth_speed / S.processed_reagents.len - for(var/reagent in S.processed_reagents) - S.reagents.add_reagent(reagent,amount) - S.chassis.use_power(energy_drain) +/obj/item/mecha_parts/mecha_equipment/tool/sleeper + name = "Mounted Sleeper" + desc = "Mounted Sleeper. (Can be attached to: Medical Exosuits)" + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "sleeper_0" + origin_tech = "programming=2;biotech=3" + energy_drain = 20 + range = MELEE + construction_cost = list("metal"=5000,"glass"=10000) + reliability = 1000 + equip_cooldown = 20 + var/mob/living/carbon/occupant = null + var/datum/global_iterator/pr_mech_sleeper + var/inject_amount = 10 + salvageable = 0 + + can_attach(obj/mecha/medical/M) + if(..()) + if(istype(M)) + return 1 + return 0 + + New() + ..() + pr_mech_sleeper = new /datum/global_iterator/mech_sleeper(list(src),0) + pr_mech_sleeper.set_delay(equip_cooldown) + return + + allow_drop() + return 0 + + destroy() + for(var/atom/movable/AM in src) + AM.forceMove(get_turf(src)) + return ..() + + Exit(atom/movable/O) + return 0 + + action(var/mob/living/carbon/target) + if(!action_checks(target)) + return + if(!istype(target)) + return + if(target.buckled) + occupant_message("[target] will not fit into the sleeper because they are buckled to [target.buckled].") + return + if(occupant) + occupant_message("The sleeper is already occupied") + return + for(var/mob/living/carbon/metroid/M in range(1,target)) + if(M.Victim == target) + occupant_message("[target] will not fit into the sleeper because they have a Metroid latched onto their head.") + return + occupant_message("You start putting [target] into [src].") + chassis.visible_message("[chassis] starts putting [target] into the [src].") + var/C = chassis.loc + var/T = target.loc + if(do_after_cooldown(target)) + if(chassis.loc!=C || target.loc!=T) + return + if(occupant) + occupant_message("The sleeper is already occupied!") + return + target.forceMove(src) + occupant = target + target.reset_view(src) + /* + if(target.client) + target.client.perspective = EYE_PERSPECTIVE + target.client.eye = chassis + */ + set_ready_state(0) + pr_mech_sleeper.start() + occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") + chassis.visible_message("[chassis] loads [target] into [src].") + log_message("[target] loaded. Life support functions engaged.") + return + + proc/go_out() + if(!occupant) + return + occupant.forceMove(get_turf(src)) + occupant_message("[occupant] ejected. Life support functions disabled.") + log_message("[occupant] ejected. Life support functions disabled.") + occupant.reset_view() + /* + if(occupant.client) + occupant.client.eye = occupant.client.mob + occupant.client.perspective = MOB_PERSPECTIVE + */ + occupant = null + pr_mech_sleeper.stop() + set_ready_state(1) + return + + detach() + if(occupant) + occupant_message("Unable to detach [src] - equipment occupied.") + return + pr_mech_sleeper.stop() + return ..() + + get_equip_info() + var/output = ..() + if(output) + var/temp = "" + if(occupant) + temp = "
\[Occupant: [occupant] (Health: [occupant.health]%)\]
View stats|Eject" + return "[output] [temp]" + return + + Topic(href,href_list) + ..() + var/datum/topic_input/filter = new /datum/topic_input(href,href_list) + if(filter.get("eject")) + go_out() + if(filter.get("view_stats")) + chassis.occupant << browse(get_occupant_stats(),"window=msleeper") + onclose(chassis.occupant, "msleeper") + return + if(filter.get("inject")) + inject_reagent(filter.getType("inject",/datum/reagent),filter.getObj("source")) + return + + proc/get_occupant_stats() + if(!occupant) + return + return {" + + [occupant] statistics + + + + +

Health statistics

+
+ [get_occupant_dam()] +
+

Reagents in bloodstream

+
+ [get_occupant_reagents()] +
+
+ [get_available_reagents()] +
+ + "} + + proc/get_occupant_dam() + var/t1 + switch(occupant.stat) + if(0) + t1 = "Conscious" + if(1) + t1 = "Unconscious" + if(2) + t1 = "*dead*" + else + t1 = "Unknown" + return {"Health: [occupant.health]% ([t1])
+ Core Temperature: [src.occupant.bodytemperature-T0C]°C ([src.occupant.bodytemperature*1.8-459.67]°F)
+ Brute Damage: [occupant.getBruteLoss()]%
+ Respiratory Damage: [occupant.getOxyLoss()]%
+ Toxin Content: [occupant.getToxLoss()]%
+ Burn Severity: [occupant.getFireLoss()]%
+ "} + + proc/get_occupant_reagents() + if(occupant.reagents) + for(var/datum/reagent/R in occupant.reagents.reagent_list) + if(R.volume > 0) + . += "[R]: [round(R.volume,0.01)]
" + return . || "None" + + proc/get_available_reagents() + var/output + var/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/SG = locate(/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun) in chassis + if(SG && SG.reagents && islist(SG.reagents.reagent_list)) + for(var/datum/reagent/R in SG.reagents.reagent_list) + if(R.volume > 0) + output += "Inject [R.name]
" + return output + + + proc/inject_reagent(var/datum/reagent/R,var/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/SG) + if(!R || !occupant || !SG || !(SG in chassis.equipment)) + return 0 + var/to_inject = min(R.volume, inject_amount) + if(to_inject && occupant.reagents.get_reagent_amount(R.id) + to_inject <= inject_amount*2) + SG.reagents.trans_id_to(occupant,R.id,to_inject) + occupant_message("[occupant] injected with [to_inject] units of [R.name].") + log_message("[occupant] injected with [to_inject] units of [R.name].") + update_equip_info() + return + + update_equip_info() + if(..()) + send_byjax(chassis.occupant,"msleeper.browser","lossinfo",get_occupant_dam()) + send_byjax(chassis.occupant,"msleeper.browser","reagents",get_occupant_reagents()) + send_byjax(chassis.occupant,"msleeper.browser","injectwith",get_available_reagents()) + return 1 + return + +/datum/global_iterator/mech_sleeper + + process(var/obj/item/mecha_parts/mecha_equipment/tool/sleeper/S) + if(!S.chassis) + S.set_ready_state(1) + return stop() + if(!S.chassis.has_charge(S.energy_drain)) + S.set_ready_state(1) + S.log_message("Deactivated.") + S.occupant_message("[src] deactivated - no power.") + return stop() + var/mob/living/carbon/M = S.occupant + if(!M) + return + if(M.health > 0) + M.adjustOxyLoss(-1) + M.updatehealth() + M.AdjustStunned(-4) + M.AdjustWeakened(-4) + M.AdjustStunned(-4) + M.Paralyse(2) + M.Weaken(2) + M.Stun(2) + if(M.reagents.get_reagent_amount("inaprovaline") < 5) + M.reagents.add_reagent("inaprovaline", 5) + S.chassis.use_power(S.energy_drain) + S.update_equip_info() + return + + +/obj/item/mecha_parts/mecha_equipment/tool/cable_layer + name = "Cable Layer" + icon_state = "mecha_wire" + var/datum/event/event + var/turf/old_turf + var/obj/structure/cable/last_piece + var/obj/item/weapon/cable_coil/cable + var/max_cable = 1000 + + New() + cable = new(src) + cable.amount = 0 + ..() + + can_attach(obj/mecha/working/M) + if(..()) + if(istype(M)) + return 1 + return 0 + + attach() + ..() + event = chassis.events.addEvent("onMove",src,"layCable") + return + + detach() + chassis.events.clearEvent("onMove",event) + return ..() + + destroy() + chassis.events.clearEvent("onMove",event) + return ..() + + action(var/obj/item/weapon/cable_coil/target) + if(!action_checks(target)) + return + var/result = load_cable(target) + var/message + if(isnull(result)) + message = "Unable to load [target] - no cable found." + else if(!result) + message = "Reel is full." + else + message = "[result] meters of cable successfully loaded." + send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) + occupant_message(message) + return + + Topic(href,href_list) + ..() + if(href_list["toggle"]) + set_ready_state(!equip_ready) + occupant_message("[src] [equip_ready?"dea":"a"]ctivated.") + log_message("[equip_ready?"Dea":"A"]ctivated.") + return + if(href_list["cut"]) + if(cable && cable.amount) + var/m = round(input(chassis.occupant,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1) + m = min(m, cable.amount) + if(m) + use_cable(m) + var/obj/item/weapon/cable_coil/CC = new (get_turf(chassis)) + CC.amount = m + else + occupant_message("There's no more cable on the reel.") + return + + get_equip_info() + var/output = ..() + if(output) + return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]" + return + + proc/load_cable(var/obj/item/weapon/cable_coil/CC) + if(istype(CC) && CC.amount) + var/cur_amount = cable? cable.amount : 0 + var/to_load = max(max_cable - cur_amount,0) + if(to_load) + to_load = min(CC.amount, to_load) + if(!cable) + cable = new(src) + cable.amount = 0 + cable.amount += to_load + CC.use(to_load) + return to_load + else + return 0 + return + + proc/use_cable(amount) + if(!cable || cable.amount<1) + set_ready_state(1) + occupant_message("Cable depleted, [src] deactivated.") + log_message("Cable depleted, [src] deactivated.") + return + if(cable.amount < amount) + occupant_message("No enough cable to finish the task.") + return + cable.use(amount) + update_equip_info() + return 1 + + proc/reset() + last_piece = null + + proc/dismantleFloor(var/turf/new_turf) + if(istype(new_turf, /turf/simulated/floor)) + var/turf/simulated/floor/T = new_turf + if(!T.is_plating()) + if(!T.broken && !T.burnt) + new T.floor_tile.type(T) + T.make_plating() + return !new_turf.intact + + proc/layCable(var/turf/new_turf) + if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf)) + return reset() + var/fdirn = turn(chassis.dir,180) + for(var/obj/structure/cable/LC in new_turf) // check to make sure there's not a cable there already + if(LC.d1 == fdirn || LC.d2 == fdirn) + return reset() + if(!use_cable(1)) + return reset() + var/obj/structure/cable/NC = new(new_turf) + NC.cableColor("red") + NC.d1 = 0 + NC.d2 = fdirn + NC.updateicon() + var/netnum + var/datum/powernet/PN + if(last_piece && last_piece.d2 != chassis.dir) + last_piece.d1 = min(last_piece.d2, chassis.dir) + last_piece.d2 = max(last_piece.d2, chassis.dir) + last_piece.updateicon() + netnum = last_piece.netnum + if(netnum) + NC.netnum = netnum + PN = powernets[netnum] + else + PN = new() + PN.number = powernets.len + 1 + powernets += PN + NC.netnum = PN.number + PN.cables += NC + NC.mergeConnectedNetworks(NC.d2) + //NC.mergeConnectedNetworksOnTurf() + last_piece = NC + return 1 + +/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun + name = "Syringe Gun" + desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)" + icon = 'icons/obj/gun.dmi' + icon_state = "syringegun" + var/list/syringes + var/list/known_reagents + var/list/processed_reagents + var/max_syringes = 10 + var/max_volume = 75 //max reagent volume + var/synth_speed = 5 //[num] reagent units per cycle + energy_drain = 10 + var/mode = 0 //0 - fire syringe, 1 - analyze reagents. + var/datum/global_iterator/mech_synth/synth + range = MELEE|RANGED + equip_cooldown = 10 + origin_tech = "materials=3;biotech=4;magnets=4;programming=3" + construction_time = 200 + construction_cost = list("metal"=3000,"glass"=2000) + + New() + ..() + flags |= NOREACT + syringes = new + known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Anti-Toxin (Dylovene)") + processed_reagents = new + create_reagents(max_volume) + synth = new (list(src),0) + + detach() + synth.stop() + return ..() + + critfail() + ..() + flags &= ~NOREACT + return + + can_attach(obj/mecha/medical/M) + if(..()) + if(istype(M)) + return 1 + return 0 + + get_equip_info() + var/output = ..() + if(output) + return "[output] \[[mode? "Analyze" : "Launch"]\]
\[Syringes: [syringes.len]/[max_syringes] | Reagents: [reagents.total_volume]/[reagents.maximum_volume]\]
Reagents list" + return + + action(atom/movable/target) + if(!action_checks(target)) + return + if(istype(target,/obj/item/weapon/reagent_containers/syringe)) + return load_syringe(target) + if(istype(target,/obj/item/weapon/storage))//Loads syringes from boxes + for(var/obj/item/weapon/reagent_containers/syringe/S in target.contents) + load_syringe(S) + return + if(mode) + return analyze_reagents(target) + if(!syringes.len) + occupant_message("No syringes loaded.") + return + if(reagents.total_volume<=0) + occupant_message("No available reagents to load syringe with.") + return + set_ready_state(0) + chassis.use_power(energy_drain) + var/turf/trg = get_turf(target) + var/obj/item/weapon/reagent_containers/syringe/S = syringes[1] + S.forceMove(get_turf(chassis)) + reagents.trans_to(S, min(S.volume, reagents.total_volume)) + syringes -= S + S.icon = 'icons/obj/chemical.dmi' + S.icon_state = "syringeproj" + playsound(chassis, 'sound/items/syringeproj.ogg', 50, 1) + log_message("Launched [S] from [src], targeting [target].") + spawn(-1) + src = null //if src is deleted, still process the syringe + for(var/i=0, i<6, i++) + if(!S) + break + if(step_towards(S,trg)) + var/list/mobs = new + for(var/mob/living/carbon/M in S.loc) + mobs += M + var/mob/living/carbon/M = safepick(mobs) + if(M) + S.icon_state = initial(S.icon_state) + S.icon = initial(S.icon) + S.reagents.trans_to(M, S.reagents.total_volume) + M.take_organ_damage(2) + S.visible_message(" [M] was hit by the syringe!") + break + else if(S.loc == trg) + S.icon_state = initial(S.icon_state) + S.icon = initial(S.icon) + S.update_icon() + break + else + S.icon_state = initial(S.icon_state) + S.icon = initial(S.icon) + S.update_icon() + break + sleep(1) + do_after_cooldown() + return 1 + + + Topic(href,href_list) + ..() + var/datum/topic_input/filter = new (href,href_list) + if(filter.get("toggle_mode")) + mode = !mode + update_equip_info() + return + if(filter.get("select_reagents")) + processed_reagents.len = 0 + var/m = 0 + var/message + for(var/i=1 to known_reagents.len) + if(m>=synth_speed) + break + var/reagent = filter.get("reagent_[i]") + if(reagent && (reagent in known_reagents)) + message = "[m ? ", " : null][known_reagents[reagent]]" + processed_reagents += reagent + m++ + if(processed_reagents.len) + message += " added to production" + synth.start() + occupant_message(message) + occupant_message("Reagent processing started.") + log_message("Reagent processing started.") + return + if(filter.get("show_reagents")) + chassis.occupant << browse(get_reagents_page(),"window=msyringegun") + if(filter.get("purge_reagent")) + var/reagent = filter.get("purge_reagent") + if(reagent) + reagents.del_reagent(reagent) + return + if(filter.get("purge_all")) + reagents.clear_reagents() + return + return + + proc/get_reagents_page() + var/output = {" + + Reagent Synthesizer + + + + +

Current reagents:

+
+ [get_current_reagents()] +
+

Reagents production:

+
+ [get_reagents_form()] +
+ + + "} + return output + + proc/get_reagents_form() + var/r_list = get_reagents_list() + var/inputs + if(r_list) + inputs += "" + inputs += "" + inputs += "" + var/output = {"
+ [r_list || "No known reagents"] + [inputs] +
+ [r_list? "Only the first [synth_speed] selected reagent\s will be added to production" : null] + "} + return output + + proc/get_reagents_list() + var/output + for(var/i=1 to known_reagents.len) + var/reagent_id = known_reagents[i] + output += {" [known_reagents[reagent_id]]
"} + return output + + proc/get_current_reagents() + var/output + for(var/datum/reagent/R in reagents.reagent_list) + if(R.volume > 0) + output += "[R]: [round(R.volume,0.001)] - Purge Reagent
" + if(output) + output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] - Purge All" + return output || "None" + + proc/load_syringe(obj/item/weapon/reagent_containers/syringe/S) + if(syringes.len= 2) + occupant_message("The syringe is too far away.") + return 0 + for(var/obj/structure/D in S.loc)//Basic level check for structures in the way (Like grilles and windows) + if(!(D.CanPass(S,src.loc))) + occupant_message("Unable to load syringe.") + return 0 + for(var/obj/machinery/door/D in S.loc)//Checks for doors + if(!(D.CanPass(S,src.loc))) + occupant_message("Unable to load syringe.") + return 0 + S.reagents.trans_to(src, S.reagents.total_volume) + S.forceMove(src) + syringes += S + occupant_message("Syringe loaded.") + update_equip_info() + return 1 + occupant_message("The [src] syringe chamber is full.") + return 0 + + proc/analyze_reagents(atom/A) + if(get_dist(src,A) >= 4) + occupant_message("The object is too far away.") + return 0 + if(!A.reagents || istype(A,/mob)) + occupant_message("No reagent info gained from [A].") + return 0 + occupant_message("Analyzing reagents...") + for(var/datum/reagent/R in A.reagents.reagent_list) + if(R.reagent_state == 2 && add_known_reagent(R.id,R.name)) + occupant_message("Reagent analyzed, identified as [R.name] and added to database.") + send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) + occupant_message("Analyzis complete.") + return 1 + + proc/add_known_reagent(r_id,r_name) + set_ready_state(0) + do_after_cooldown() + if(!(r_id in known_reagents)) + known_reagents += r_id + known_reagents[r_id] = r_name + return 1 + return 0 + + + update_equip_info() + if(..()) + send_byjax(chassis.occupant,"msyringegun.browser","reagents",get_current_reagents()) + send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form()) + return 1 + return + + on_reagent_change() + ..() + update_equip_info() + return + +/datum/global_iterator/mech_synth + delay = 100 + + process(var/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/S) + if(!S.chassis) + return stop() + var/energy_drain = S.energy_drain*10 + if(!S.processed_reagents.len || S.reagents.total_volume >= S.reagents.maximum_volume || !S.chassis.has_charge(energy_drain)) + S.occupant_message("Reagent processing stopped.") + S.log_message("Reagent processing stopped.") + return stop() + if(anyprob(S.reliability)) + S.critfail() + var/amount = S.synth_speed / S.processed_reagents.len + for(var/reagent in S.processed_reagents) + S.reagents.add_reagent(reagent,amount) + S.chassis.use_power(energy_drain) return 1 \ No newline at end of file diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 548ba32ea6..f38c40a024 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -200,10 +200,10 @@ var/obj/o = target o.reagents.trans_to(src, 200) occupant_message("\blue Extinguisher refilled") - playsound(chassis, 'refill.ogg', 50, 1, -6) + playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6) else if(src.reagents.total_volume > 0) - playsound(chassis, 'extinguish.ogg', 75, 1, -3) + playsound(chassis, 'sound/effects/extinguish.ogg', 75, 1, -3) var/direction = get_dir(chassis,target) var/turf/T = get_turf(target) var/turf/T1 = get_step(T,turn(direction, 90)) @@ -269,7 +269,7 @@ if(!istype(target, /turf) && !istype(target, /obj/machinery/door/airlock)) target = get_turf(target) if(!action_checks(target) || disabled || get_dist(chassis, target)>3) return - playsound(chassis, 'click.ogg', 50, 1) + playsound(chassis, 'sound/machines/click.ogg', 50, 1) //meh switch(mode) if(0) @@ -280,7 +280,7 @@ if(disabled) return chassis.spark_system.start() target:ReplaceWithPlating() - playsound(target, 'Deconstruct.ogg', 50, 1) + playsound(target, 'sound/items/Deconstruct.ogg', 50, 1) chassis.give_power(energy_drain) else if (istype(target, /turf/simulated/floor)) occupant_message("Deconstructing [target]...") @@ -289,7 +289,7 @@ if(disabled) return chassis.spark_system.start() target:ReplaceWithSpace() - playsound(target, 'Deconstruct.ogg', 50, 1) + playsound(target, 'sound/items/Deconstruct.ogg', 50, 1) chassis.give_power(energy_drain) else if (istype(target, /obj/machinery/door/airlock)) occupant_message("Deconstructing [target]...") @@ -298,7 +298,7 @@ if(disabled) return chassis.spark_system.start() del(target) - playsound(target, 'Deconstruct.ogg', 50, 1) + playsound(target, 'sound/items/Deconstruct.ogg', 50, 1) chassis.give_power(energy_drain) if(1) if(istype(target, /turf/space)) @@ -307,7 +307,7 @@ if(do_after_cooldown(target)) if(disabled) return target:ReplaceWithPlating() - playsound(target, 'Deconstruct.ogg', 50, 1) + playsound(target, 'sound/items/Deconstruct.ogg', 50, 1) chassis.spark_system.start() chassis.use_power(energy_drain*2) else if(istype(target, /turf/simulated/floor)) @@ -316,7 +316,7 @@ if(do_after_cooldown(target)) if(disabled) return target:ReplaceWithWall() - playsound(target, 'Deconstruct.ogg', 50, 1) + playsound(target, 'sound/items/Deconstruct.ogg', 50, 1) chassis.spark_system.start() chassis.use_power(energy_drain*2) if(2) @@ -328,8 +328,8 @@ chassis.spark_system.start() var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock(target) T.autoclose = 1 - playsound(target, 'Deconstruct.ogg', 50, 1) - playsound(target, 'sparks2.ogg', 50, 1) + playsound(target, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(target, 'sound/effects/sparks2.ogg', 50, 1) chassis.use_power(energy_drain*2) return diff --git a/code/game/mecha/equipment/tools/unused_tools.dm b/code/game/mecha/equipment/tools/unused_tools.dm index 73485ed05e..6857891381 100644 --- a/code/game/mecha/equipment/tools/unused_tools.dm +++ b/code/game/mecha/equipment/tools/unused_tools.dm @@ -1,157 +1,157 @@ - - - -/****** Do not tick this file in without looking over this code first ******/ - - - - - -//NEEDS SPRITE! (When this gets ticked in search for 'TODO MECHA JETPACK SPRITE MISSING' through code to uncomment the place where it's missing.) -/obj/item/mecha_parts/mecha_equipment/jetpack - name = "Jetpack" - desc = "Using directed ion bursts and cunning solar wind reflection technique, this device enables controlled space flight." - icon_state = "mecha_equip" - equip_cooldown = 5 - energy_drain = 50 - var/wait = 0 - var/datum/effect/effect/system/ion_trail_follow/ion_trail - - - can_attach(obj/mecha/M as obj) - if(!(locate(src.type) in M.equipment) && !M.proc_res["dyndomove"]) - return ..() - - detach() - ..() - chassis.proc_res["dyndomove"] = null - return - - attach(obj/mecha/M as obj) - ..() - if(!ion_trail) - ion_trail = new - ion_trail.set_up(chassis) - return - - proc/toggle() - if(!chassis) - return - !equip_ready? turn_off() : turn_on() - return equip_ready - - proc/turn_on() - set_ready_state(0) - chassis.proc_res["dyndomove"] = src - ion_trail.start() - occupant_message("Activated") - log_message("Activated") - - proc/turn_off() - set_ready_state(1) - chassis.proc_res["dyndomove"] = null - ion_trail.stop() - occupant_message("Deactivated") - log_message("Deactivated") - - proc/dyndomove(direction) - if(!action_checks()) - return chassis.dyndomove(direction) - var/move_result = 0 - if(chassis.hasInternalDamage(MECHA_INT_CONTROL_LOST)) - move_result = step_rand(chassis) - else if(chassis.dir!=direction) - chassis.dir = direction - move_result = 1 - else - move_result = step(chassis,direction) - if(chassis.occupant) - for(var/obj/effect/speech_bubble/B in range(1, chassis)) - if(B.parent == chassis.occupant) - B.loc = chassis.loc - if(move_result) - wait = 1 - chassis.use_power(energy_drain) - if(!chassis.pr_inertial_movement.active()) - chassis.pr_inertial_movement.start(list(chassis,direction)) - else - chassis.pr_inertial_movement.set_process_args(list(chassis,direction)) - do_after_cooldown() - return 1 - return 0 - - action_checks() - if(equip_ready || wait) - return 0 - if(energy_drain && !chassis.has_charge(energy_drain)) - return 0 - if(crit_fail) - return 0 - if(chassis.check_for_support()) - return 0 - return 1 - - get_equip_info() - if(!chassis) return - return "* [src.name] \[Toggle\]" - - - Topic(href,href_list) - ..() - if(href_list["toggle"]) - toggle() - - do_after_cooldown() - sleep(equip_cooldown) - wait = 0 - return 1 - - -/obj/item/mecha_parts/mecha_equipment/defence_shocker - name = "Exosuit Defence Shocker" - desc = "" - icon_state = "mecha_teleport" - equip_cooldown = 10 - energy_drain = 100 - range = RANGED - var/shock_damage = 15 - var/active - - can_attach(obj/mecha/M as obj) - if(..()) - if(!istype(M, /obj/mecha/combat/honker)) - if(!M.proc_res["dynattackby"] && !M.proc_res["dynattackhand"] && !M.proc_res["dynattackalien"]) - return 1 - return 0 - - attach(obj/mecha/M as obj) - ..() - chassis.proc_res["dynattackby"] = src - return - - proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) - if(!action_checks(user) || !active) - return - user.electrocute_act(shock_damage, src) - return chassis.dynattackby(W,user) - - -/* -/obj/item/mecha_parts/mecha_equipment/book_stocker - - action(var/mob/target) - if(!istype(target)) - return - if(target.search_contents_for(/obj/item/book/WGW)) - target.gib() - target.client.gib() - target.client.mom.monkeyize() - target.client.mom.gib() - for(var/mob/M in range(target, 1000)) - M.gib() - explosion(target.loc,100000,100000,100000) - usr.gib() - world.Reboot() - return 1 - -*/ + + + +/****** Do not tick this file in without looking over this code first ******/ + + + + + +//NEEDS SPRITE! (When this gets ticked in search for 'TODO MECHA JETPACK SPRITE MISSING' through code to uncomment the place where it's missing.) +/obj/item/mecha_parts/mecha_equipment/jetpack + name = "Jetpack" + desc = "Using directed ion bursts and cunning solar wind reflection technique, this device enables controlled space flight." + icon_state = "mecha_equip" + equip_cooldown = 5 + energy_drain = 50 + var/wait = 0 + var/datum/effect/effect/system/ion_trail_follow/ion_trail + + + can_attach(obj/mecha/M as obj) + if(!(locate(src.type) in M.equipment) && !M.proc_res["dyndomove"]) + return ..() + + detach() + ..() + chassis.proc_res["dyndomove"] = null + return + + attach(obj/mecha/M as obj) + ..() + if(!ion_trail) + ion_trail = new + ion_trail.set_up(chassis) + return + + proc/toggle() + if(!chassis) + return + !equip_ready? turn_off() : turn_on() + return equip_ready + + proc/turn_on() + set_ready_state(0) + chassis.proc_res["dyndomove"] = src + ion_trail.start() + occupant_message("Activated") + log_message("Activated") + + proc/turn_off() + set_ready_state(1) + chassis.proc_res["dyndomove"] = null + ion_trail.stop() + occupant_message("Deactivated") + log_message("Deactivated") + + proc/dyndomove(direction) + if(!action_checks()) + return chassis.dyndomove(direction) + var/move_result = 0 + if(chassis.hasInternalDamage(MECHA_INT_CONTROL_LOST)) + move_result = step_rand(chassis) + else if(chassis.dir!=direction) + chassis.dir = direction + move_result = 1 + else + move_result = step(chassis,direction) + if(chassis.occupant) + for(var/obj/effect/speech_bubble/B in range(1, chassis)) + if(B.parent == chassis.occupant) + B.loc = chassis.loc + if(move_result) + wait = 1 + chassis.use_power(energy_drain) + if(!chassis.pr_inertial_movement.active()) + chassis.pr_inertial_movement.start(list(chassis,direction)) + else + chassis.pr_inertial_movement.set_process_args(list(chassis,direction)) + do_after_cooldown() + return 1 + return 0 + + action_checks() + if(equip_ready || wait) + return 0 + if(energy_drain && !chassis.has_charge(energy_drain)) + return 0 + if(crit_fail) + return 0 + if(chassis.check_for_support()) + return 0 + return 1 + + get_equip_info() + if(!chassis) return + return "* [src.name] \[Toggle\]" + + + Topic(href,href_list) + ..() + if(href_list["toggle"]) + toggle() + + do_after_cooldown() + sleep(equip_cooldown) + wait = 0 + return 1 + + +/obj/item/mecha_parts/mecha_equipment/defence_shocker + name = "Exosuit Defence Shocker" + desc = "" + icon_state = "mecha_teleport" + equip_cooldown = 10 + energy_drain = 100 + range = RANGED + var/shock_damage = 15 + var/active + + can_attach(obj/mecha/M as obj) + if(..()) + if(!istype(M, /obj/mecha/combat/honker)) + if(!M.proc_res["dynattackby"] && !M.proc_res["dynattackhand"] && !M.proc_res["dynattackalien"]) + return 1 + return 0 + + attach(obj/mecha/M as obj) + ..() + chassis.proc_res["dynattackby"] = src + return + + proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) + if(!action_checks(user) || !active) + return + user.electrocute_act(shock_damage, src) + return chassis.dynattackby(W,user) + + +/* +/obj/item/mecha_parts/mecha_equipment/book_stocker + + action(var/mob/target) + if(!istype(target)) + return + if(target.search_contents_for(/obj/item/book/WGW)) + target.gib() + target.client.gib() + target.client.mom.monkeyize() + target.client.mom.gib() + for(var/mob/M in range(target, 1000)) + M.gib() + explosion(target.loc,100000,100000,100000) + usr.gib() + world.Reboot() + return 1 + +*/ diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 197610167a..2dbce333dd 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -44,7 +44,7 @@ icon_state = "mecha_laser" energy_drain = 30 projectile = /obj/item/projectile/beam - fire_sound = 'Laser.ogg' + fire_sound = 'sound/weapons/Laser.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy equip_cooldown = 15 @@ -52,7 +52,7 @@ icon_state = "mecha_laser" energy_drain = 60 projectile = /obj/item/projectile/beam/heavylaser - fire_sound = 'lasercannonfire.ogg' + fire_sound = 'sound/weapons/lasercannonfire.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion equip_cooldown = 40 @@ -60,7 +60,7 @@ icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion - fire_sound = 'Laser.ogg' + fire_sound = 'sound/weapons/Laser.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse @@ -70,7 +70,7 @@ energy_drain = 120 origin_tech = "materials=3;combat=6;powerstorage=4" projectile = /obj/item/projectile/beam/pulse/heavy - fire_sound = 'marauder.ogg' + fire_sound = 'sound/weapons/marauder.ogg' /obj/item/projectile/beam/pulse/heavy @@ -91,7 +91,7 @@ energy_drain = 20 equip_cooldown = 8 projectile = /obj/item/projectile/energy/electrode - fire_sound = 'Taser.ogg' + fire_sound = 'sound/weapons/Taser.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/honker @@ -117,7 +117,7 @@ if(!equip_ready) return 0 - playsound(chassis, 'AirHorn.ogg', 100, 1) + playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1) chassis.occupant_message("HONK") for(var/mob/living/carbon/M in ohearers(6, chassis)) if(istype(M, /mob/living/carbon/human)) @@ -187,7 +187,7 @@ icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/midbullet - fire_sound = 'Gunshot.ogg' + fire_sound = 'sound/weapons/Gunshot.ogg' projectiles = 40 projectile_energy_cost = 25 var/projectiles_per_shot = 4 @@ -226,7 +226,7 @@ icon_state = "mecha_uac2" equip_cooldown = 10 projectile = /obj/item/projectile/bullet/weakbullet - fire_sound = 'Gunshot.ogg' + fire_sound = 'sound/weapons/Gunshot.ogg' projectiles = 300 projectile_energy_cost = 20 var/projectiles_per_shot = 3 @@ -266,7 +266,7 @@ name = "SRM-8 Missile Rack" icon_state = "mecha_missilerack" projectile = /obj/item/missile - fire_sound = 'bang.ogg' + fire_sound = 'sound/effects/bang.ogg' projectiles = 8 projectile_energy_cost = 1000 equip_cooldown = 60 @@ -304,7 +304,7 @@ name = "SGL-6 Grenade Launcher" icon_state = "mecha_grenadelnchr" projectile = /obj/item/weapon/grenade/flashbang - fire_sound = 'bang.ogg' + fire_sound = 'sound/effects/bang.ogg' projectiles = 6 missile_speed = 1.5 projectile_energy_cost = 800 @@ -332,7 +332,7 @@ name = "Banana Mortar" icon_state = "mecha_bananamrtr" projectile = /obj/item/weapon/bananapeel - fire_sound = 'bikehorn.ogg' + fire_sound = 'sound/items/bikehorn.ogg' projectiles = 15 missile_speed = 1.5 projectile_energy_cost = 100 @@ -362,7 +362,7 @@ name = "Mousetrap Mortar" icon_state = "mecha_mousetrapmrtr" projectile = /obj/item/weapon/mousetrap - fire_sound = 'bikehorn.ogg' + fire_sound = 'sound/items/bikehorn.ogg' projectiles = 15 missile_speed = 1.5 projectile_energy_cost = 100 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index a2cc63b0d0..284160755b 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -709,7 +709,7 @@ return if (opened) if(istype(W, /obj/item/weapon/crowbar)) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc) M.state = 2 M.icon_state = "box_1" diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 20d0709db0..3d175a441e 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -306,20 +306,20 @@ /obj/mecha/proc/mechturn(direction) dir = direction - playsound(src,'mechturn.ogg',40,1) + playsound(src,'sound/mecha/mechturn.ogg',40,1) return 1 /obj/mecha/proc/mechstep(direction) var/result = step(src,direction) if(result) - playsound(src,'mechstep.ogg',40,1) + playsound(src,'sound/mecha/mechstep.ogg',40,1) return result /obj/mecha/proc/mechsteprand() var/result = step_rand(src) if(result) - playsound(src,'mechstep.ogg',40,1) + playsound(src,'sound/mecha/mechstep.ogg',40,1) return result /obj/mecha/Bump(var/atom/obstacle) @@ -370,7 +370,7 @@ internal_damage |= int_dam_flag pr_internal_damage.start() log_append_to_last("Internal damage of type [int_dam_flag].",1) - occupant << sound('warning-buzzer.ogg',wait=0) + occupant << sound('sound/machines/warning-buzzer.ogg',wait=0) return /obj/mecha/proc/clearInternalDamage(int_dam_flag) @@ -438,14 +438,14 @@ if(!prob(src.deflect_chance)) src.take_damage(15) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - playsound(src.loc, 'slash.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) user << "\red You slash at the armored suit!" for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) V.show_message("\red The [user] slashes at [src.name]'s armor!", 1) else src.log_append_to_last("Armor saved.") - playsound(src.loc, 'slash.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) user << "\green Your claws had no effect!" src.occupant_message("\blue The [user]'s claws are stopped by the armor.") for (var/mob/V in viewers(src)) @@ -469,7 +469,7 @@ user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") else src.log_append_to_last("Armor saved.") - playsound(src.loc, 'slash.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) src.occupant_message("\blue The [user]'s attack is stopped by the armor.") for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) @@ -620,14 +620,14 @@ if(!prob(src.deflect_chance)) src.take_damage(6) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - playsound(src.loc, 'blobattack.ogg', 50, 1, -1) + playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) user << "\red You smash at the armored suit!" for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) V.show_message("\red The [user] smashes against [src.name]'s armor!", 1) else src.log_append_to_last("Armor saved.") - playsound(src.loc, 'blobattack.ogg', 50, 1, -1) + playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) user << "\green Your attack had no effect!" src.occupant_message("\blue The [user]'s attack is stopped by the armor.") for (var/mob/V in viewers(src)) @@ -1028,9 +1028,9 @@ src.log_append_to_last("[H] moved in as pilot.") src.icon_state = initial(icon_state) dir = dir_in - playsound(src, 'windowdoor.ogg', 50, 1) + playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) - src.occupant << sound('nominal.ogg',volume=50) + src.occupant << sound('sound/mecha/nominal.ogg',volume=50) return 1 else return 0 @@ -1091,7 +1091,7 @@ dir = dir_in src.log_message("[mmi_as_oc] moved in as pilot.") if(!hasInternalDamage()) - src.occupant << sound('nominal.ogg',volume=50) + src.occupant << sound('sound/mecha/nominal.ogg',volume=50) return 1 else return 0 diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index b2cf28ea9f..d5349ceae6 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -6,17 +6,17 @@ if(istype(used_atom, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = used_atom if (W.remove_fuel(0, user)) - playsound(holder, 'Welder2.ogg', 50, 1) + playsound(holder, 'sound/items/Welder2.ogg', 50, 1) else return 0 else if(istype(used_atom, /obj/item/weapon/wrench)) - playsound(holder, 'Ratchet.ogg', 50, 1) + playsound(holder, 'sound/items/Ratchet.ogg', 50, 1) else if(istype(used_atom, /obj/item/weapon/screwdriver)) - playsound(holder, 'Screwdriver.ogg', 50, 1) + playsound(holder, 'sound/items/Screwdriver.ogg', 50, 1) else if(istype(used_atom, /obj/item/weapon/wirecutters)) - playsound(holder, 'Wirecutter.ogg', 50, 1) + playsound(holder, 'sound/items/Wirecutter.ogg', 50, 1) else if(istype(used_atom, /obj/item/weapon/cable_coil)) var/obj/item/weapon/cable_coil/C = used_atom @@ -25,7 +25,7 @@ return 0 else C.use(4) - playsound(holder, 'Deconstruct.ogg', 50, 1) + playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) @@ -39,17 +39,17 @@ if(istype(used_atom, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = used_atom if (W.remove_fuel(0, user)) - playsound(holder, 'Welder2.ogg', 50, 1) + playsound(holder, 'sound/items/Welder2.ogg', 50, 1) else return 0 else if(istype(used_atom, /obj/item/weapon/wrench)) - playsound(holder, 'Ratchet.ogg', 50, 1) + playsound(holder, 'sound/items/Ratchet.ogg', 50, 1) else if(istype(used_atom, /obj/item/weapon/screwdriver)) - playsound(holder, 'Screwdriver.ogg', 50, 1) + playsound(holder, 'sound/items/Screwdriver.ogg', 50, 1) else if(istype(used_atom, /obj/item/weapon/wirecutters)) - playsound(holder, 'Wirecutter.ogg', 50, 1) + playsound(holder, 'sound/items/Wirecutter.ogg', 50, 1) else if(istype(used_atom, /obj/item/weapon/cable_coil)) var/obj/item/weapon/cable_coil/C = used_atom @@ -58,7 +58,7 @@ return 0 else C.use(4) - playsound(holder, 'Deconstruct.ogg', 50, 1) + playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) @@ -834,7 +834,7 @@ return 0 if(istype(used_atom, /obj/item/weapon/bikehorn)) - playsound(holder, 'bikehorn.ogg', 50, 1) + playsound(holder, 'sound/items/bikehorn.ogg', 50, 1) user.visible_message("HONK!") //TODO: better messages. diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm index d9b203bec7..a63a8d3d6d 100644 --- a/code/game/mecha/medical/medical.dm +++ b/code/game/mecha/medical/medical.dm @@ -6,17 +6,17 @@ /obj/mecha/medical/mechturn(direction) dir = direction - playsound(src,'mechmove01.ogg',40,1) + playsound(src,'sound/mecha/mechmove01.ogg',40,1) return 1 /obj/mecha/medical/mechstep(direction) var/result = step(src,direction) if(result) - playsound(src,'mechstep.ogg',25,1) + playsound(src,'sound/mecha/mechstep.ogg',25,1) return result /obj/mecha/medical/mechsteprand() var/result = step_rand(src) if(result) - playsound(src,'mechstep.ogg',25,1) + playsound(src,'sound/mecha/mechstep.ogg',25,1) return result \ No newline at end of file diff --git a/code/game/objects/alien/egg.dm b/code/game/objects/alien/egg.dm index 37c4178cf3..ed292d7381 100644 --- a/code/game/objects/alien/egg.dm +++ b/code/game/objects/alien/egg.dm @@ -87,7 +87,7 @@ if(WT.remove_fuel(0, user)) damage = 15 - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) src.health -= damage src.healthcheck() diff --git a/code/game/objects/alien/nest.dm b/code/game/objects/alien/nest.dm index 8217516262..0879e83bfa 100644 --- a/code/game/objects/alien/nest.dm +++ b/code/game/objects/alien/nest.dm @@ -54,7 +54,7 @@ /obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob) var/aforce = W.force health = max(0, health - aforce) - playsound(loc, 'attackblob.ogg', 100, 1) + playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) for(var/mob/M in viewers(src, 7)) M.show_message("[user] hits [src] with [W]!", 1) healthcheck() diff --git a/code/game/objects/alien/resin.dm b/code/game/objects/alien/resin.dm index e7e16f0060..6aee96423d 100644 --- a/code/game/objects/alien/resin.dm +++ b/code/game/objects/alien/resin.dm @@ -56,7 +56,7 @@ tforce = 10 else tforce = AM:throwforce - playsound(loc, 'attackblob.ogg', 100, 1) + playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) health = max(0, health - tforce) healthcheck() ..() @@ -80,7 +80,7 @@ usr << "\green You claw at the [name]." for(var/mob/O in oviewers(src)) O.show_message("\red [usr] claws at the resin!", 1) - playsound(loc, 'attackblob.ogg', 100, 1) + playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) health -= rand(10, 20) if(health <= 0) usr << "\green You slice the [name] to pieces." @@ -113,7 +113,7 @@ var/aforce = W.force health = max(0, health - aforce) - playsound(loc, 'attackblob.ogg', 100, 1) + playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) healthcheck() ..() return diff --git a/code/game/objects/alien/weeds.dm b/code/game/objects/alien/weeds.dm index 4bac17a337..60a72feec8 100644 --- a/code/game/objects/alien/weeds.dm +++ b/code/game/objects/alien/weeds.dm @@ -81,7 +81,7 @@ Alien plants should do something if theres a lot of poison if(WT.remove_fuel(0, user)) damage = 15 - playsound(loc, 'Welder.ogg', 100, 1) + playsound(loc, 'sound/items/Welder.ogg', 100, 1) health -= damage healthcheck() diff --git a/code/game/objects/cleaner.dm b/code/game/objects/cleaner.dm index 1e829a2c2a..530aeddf96 100644 --- a/code/game/objects/cleaner.dm +++ b/code/game/objects/cleaner.dm @@ -14,7 +14,7 @@ if (src.reagents.total_volume >= 2) src.reagents.trans_to(W, 2) user << "\blue You wet the mop" - playsound(src.loc, 'slosh.ogg', 25, 1) + playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1) if (src.reagents.total_volume < 1) user << "\blue Out of water!" return diff --git a/code/game/objects/closets.dm b/code/game/objects/closets.dm index 4c46a38d34..9d0e89eb32 100644 --- a/code/game/objects/closets.dm +++ b/code/game/objects/closets.dm @@ -42,9 +42,9 @@ src.icon_state = src.icon_opened src.opened = 1 if(istype(src, /obj/structure/closet/body_bag)) - playsound(src.loc, 'zip.ogg', 15, 1, -3) + playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3) else - playsound(src.loc, 'click.ogg', 15, 1, -3) + playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) density = 0 return 1 @@ -88,9 +88,9 @@ src.icon_state = src.icon_closed src.opened = 0 if(istype(src, /obj/structure/closet/body_bag)) - playsound(src.loc, 'zip.ogg', 15, 1, -3) + playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3) else - playsound(src.loc, 'click.ogg', 15, 1, -3) + playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) density = 1 return 1 diff --git a/code/game/objects/closets/fireaxe.dm b/code/game/objects/closets/fireaxe.dm index d7d0b91694..be2654df1f 100644 --- a/code/game/objects/closets/fireaxe.dm +++ b/code/game/objects/closets/fireaxe.dm @@ -24,7 +24,7 @@ if (isrobot(usr) || src.locked) if(istype(O, /obj/item/device/multitool)) user << "\red Resetting circuitry..." - playsound(user, 'lockreset.ogg', 50, 1) + playsound(user, 'sound/machines/lockreset.ogg', 50, 1) sleep(50) // Sleeping time~ src.locked = 0 user << "\blue You disable the locking modules." @@ -39,13 +39,13 @@ spawn(10) update_icon() return else - playsound(user, 'Glasshit.ogg', 100, 1) //We don't want this playing every time + playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time if(W.force < 15) user << "\blue The cabinet's protective glass glances off the hit." else src.hitstaken++ if(src.hitstaken == 4) - playsound(user, 'Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that. + playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that. src.smashed = 1 src.locked = 0 src.localopened = 1 @@ -86,7 +86,7 @@ sleep(50) src.locked = 1 user << "\blue You re-enable the locking modules." - playsound(user, 'lockenable.ogg', 50, 1) + playsound(user, 'sound/machines/lockenable.ogg', 50, 1) return else localopened = !localopened diff --git a/code/game/objects/closets/secure/personal.dm b/code/game/objects/closets/secure/personal.dm index dd59988615..28b220918e 100644 --- a/code/game/objects/closets/secure/personal.dm +++ b/code/game/objects/closets/secure/personal.dm @@ -60,7 +60,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 3)) O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2) diff --git a/code/game/objects/closets/secure/secure_closets.dm b/code/game/objects/closets/secure/secure_closets.dm index f431a5121e..efe451b660 100644 --- a/code/game/objects/closets/secure/secure_closets.dm +++ b/code/game/objects/closets/secure/secure_closets.dm @@ -60,7 +60,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 3)) O.show_message("The locker has been sliced open by [user] with an energy blade!", 1, "You hear metal being sliced and sparks flying.", 2) diff --git a/code/game/objects/contraband.dm b/code/game/objects/contraband.dm index be0ac4d4ca..edef7e5532 100644 --- a/code/game/objects/contraband.dm +++ b/code/game/objects/contraband.dm @@ -141,7 +141,7 @@ obj/effect/decal/poster/New(var/serial) obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) if( istype(W, /obj/item/weapon/wirecutters) ) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) if(src.ruined) user << "You remove the remnants of the poster." del(src) @@ -161,7 +161,7 @@ obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) return for (var/mob/O in hearers(5, src.loc)) O.show_message("[user.name] rips the [src.name] in a single, decisive motion!" ) - playsound(src.loc, 'poster_ripped.ogg', 100, 1) + playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) src.ruined = 1 src.icon_state = "poster_ripped" src.name = "Ripped poster" @@ -200,7 +200,7 @@ obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) flick("poster_being_set",D) D.loc = src del(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway - playsound(D.loc, 'poster_being_created.ogg', 100, 1) + playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1) sleep(17) if(!D) return diff --git a/code/game/objects/crates.dm b/code/game/objects/crates.dm index 237fec54b5..c09bae884c 100644 --- a/code/game/objects/crates.dm +++ b/code/game/objects/crates.dm @@ -233,7 +233,7 @@ new /obj/item/clothing/head/radiation(src) /obj/structure/closet/crate/open() - playsound(src.loc, 'click.ogg', 15, 1, -3) + playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) for(var/obj/O in src) O.loc = get_turf(src) @@ -242,7 +242,7 @@ src.opened = 1 /obj/structure/closet/crate/close() - playsound(src.loc, 'click.ogg', 15, 1, -3) + playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3) var/itemcount = 0 @@ -322,7 +322,7 @@ overlays += emag overlays += sparks spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, 'sparks4.ogg', 75, 1) + playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) src.locked = 0 if(!opened && prob(20/severity)) if(!locked) diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index ddcb3678a6..9ce5d981a8 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -186,7 +186,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/ai/attack_self(mob/user as mob) if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- - playsound(loc, 'bikehorn.ogg', 30, 1) + playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) return /* @@ -526,7 +526,7 @@ var/global/list/obj/item/device/pda/PDAs = list() scanmode = 4 if("Honk") if ( !(last_honk && world.time < last_honk + 20) ) - playsound(loc, 'bikehorn.ogg', 50, 1) + playsound(loc, 'sound/items/bikehorn.ogg', 50, 1) last_honk = world.time //MESSENGER/NOTE FUNCTIONS=================================== @@ -673,7 +673,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if ((honkamt > 0) && (prob(60)))//For clown virus. honkamt-- - playsound(loc, 'bikehorn.ogg', 30, 1) + playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) if(U.machine == src && href_list["skiprefresh"]!="1")//Final safety. attack_self(U)//It auto-closes the menu prior if the user is not in range and so on. @@ -749,7 +749,7 @@ var/global/list/obj/item/device/pda/PDAs = list() ai.show_message("Intercepted message from [who]: [t]") if (!P.silent) - playsound(P.loc, 'twobeep.ogg', 50, 1) + playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) for (var/mob/O in hearers(3, P.loc)) if(!P.silent) O.show_message(text("\icon[P] *[P.ttone]*")) //Search for holder of the PDA. @@ -1009,7 +1009,7 @@ var/global/list/obj/item/device/pda/PDAs = list() M.stop_pulling() M << "\blue You slipped on the PDA!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) diff --git a/code/game/objects/devices/chameleonproj.dm b/code/game/objects/devices/chameleonproj.dm index 5a18b8a3bb..90f4949261 100644 --- a/code/game/objects/devices/chameleonproj.dm +++ b/code/game/objects/devices/chameleonproj.dm @@ -64,14 +64,14 @@ afterattack(atom/target, mob/user , flag) if(istype(target,/obj/item)) - playsound(src, 'flash.ogg', 100, 1, 1) + playsound(src, 'sound/weapons/flash.ogg', 100, 1, 1) user << "\blue Scanned [target]." saved_item = target.type proc/toggle() if(!can_use || !saved_item) return if(active_dummy) - playsound(src, 'pop.ogg', 100, 1, 1) + playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) for(var/atom/movable/A in active_dummy) A.loc = active_dummy.loc if(ismob(A)) @@ -85,7 +85,7 @@ flick("emppulse",T) spawn(8) del(T) else - playsound(src, 'pop.ogg', 100, 1, 1) + playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) var/obj/O = new saved_item(src) if(!O) return var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) diff --git a/code/game/objects/devices/flash.dm b/code/game/objects/devices/flash.dm index 60eb8ff74d..c0945a79f4 100644 --- a/code/game/objects/devices/flash.dm +++ b/code/game/objects/devices/flash.dm @@ -61,7 +61,7 @@ else //can only use it 5 times a minute user << "*click* *click*" return - playsound(src.loc, 'flash.ogg', 100, 1) + playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) var/flashfail = 0 if(iscarbon(M)) @@ -145,7 +145,7 @@ else //can only use it 5 times a minute user.show_message("*click* *click*", 2) return - playsound(src.loc, 'flash.ogg', 100, 1) + playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) flick("flash2", src) if(user && isrobot(user)) spawn(0) diff --git a/code/game/objects/devices/lightreplacer.dm b/code/game/objects/devices/lightreplacer.dm index c4968e7790..e1d07158d3 100644 --- a/code/game/objects/devices/lightreplacer.dm +++ b/code/game/objects/devices/lightreplacer.dm @@ -124,11 +124,11 @@ /obj/item/device/lightreplacer/proc/Use(var/mob/user) if(inuse) return - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) var/pass = 0 inuse = 1 if(do_after(user, 30)) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) AddUses(-1) pass = 1 inuse = 0 diff --git a/code/game/objects/devices/powersink.dm b/code/game/objects/devices/powersink.dm index 4edc453e01..330790ace8 100644 --- a/code/game/objects/devices/powersink.dm +++ b/code/game/objects/devices/powersink.dm @@ -115,7 +115,7 @@ if(power_drained > max_power * 0.95) - playsound(src, 'screech.ogg', 100, 1, 1) + playsound(src, 'sound/effects/screech.ogg', 100, 1, 1) if(power_drained >= max_power) processing_objects.Remove(src) explosion(src.loc, 3,6,9,12) diff --git a/code/game/objects/devices/traitordevices.dm b/code/game/objects/devices/traitordevices.dm index 3ec1a25db0..9cb58f01c7 100644 --- a/code/game/objects/devices/traitordevices.dm +++ b/code/game/objects/devices/traitordevices.dm @@ -50,7 +50,7 @@ effective or pretty fucking useless. else M << "\red You feel a sudden, electric jolt travel through your head." - playsound(src.loc, 'interference.ogg', 50, 1) + playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) user << "\blue You trigger [src]." times_used += 1 if(times_used >= max_uses) diff --git a/code/game/objects/displaycase.dm b/code/game/objects/displaycase.dm index aa06f50f3f..9fd89980da 100644 --- a/code/game/objects/displaycase.dm +++ b/code/game/objects/displaycase.dm @@ -47,7 +47,7 @@ playsound(src, "shatter", 70, 1) update_icon() else - playsound(src.loc, 'Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) return /obj/structure/displaycase/update_icon() diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm index 923bb897ab..fa1a37f603 100644 --- a/code/game/objects/door_assembly.dm +++ b/code/game/objects/door_assembly.dm @@ -284,7 +284,7 @@ obj/structure/door_assembly var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.") - playsound(src.loc, 'Welder2.ogg', 50, 1) + playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) if(do_after(user, 40)) if(!src || !WT.isOn()) return @@ -320,7 +320,7 @@ obj/structure/door_assembly return else if(istype(W, /obj/item/weapon/wrench) && !anchored ) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] secures the airlock assembly to the floor.", "You start to secure the airlock assembly to the floor.") if(do_after(user, 40)) @@ -330,7 +330,7 @@ obj/structure/door_assembly src.anchored = 1 else if(istype(W, /obj/item/weapon/wrench) && anchored ) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor.") if(do_after(user, 40)) if(!src) return @@ -349,7 +349,7 @@ obj/structure/door_assembly src.name = "Wired Airlock Assembly" else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 ) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.") if(do_after(user, 40)) @@ -360,7 +360,7 @@ obj/structure/door_assembly src.name = "Secured Airlock Assembly" else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 ) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.") user.drop_item() W.loc = src @@ -377,7 +377,7 @@ obj/structure/door_assembly //del(W) else if(istype(W, /obj/item/weapon/crowbar) && state == 2 ) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to install electronics into the airlock assembly.") if(do_after(user, 40)) @@ -398,7 +398,7 @@ obj/structure/door_assembly if(G.amount>=1) switch(G.type) if(/obj/item/stack/sheet/rglass) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed reinforced glass windows into the airlock assembly!" @@ -409,7 +409,7 @@ obj/structure/door_assembly src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end. if(/obj/item/stack/sheet/gold) if(G.amount>=2) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed gold plating into the airlock assembly!" @@ -420,7 +420,7 @@ obj/structure/door_assembly src.base_icon_state = "door_as_gold" if(/obj/item/stack/sheet/silver) if(G.amount>=2) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed silver plating into the airlock assembly!" @@ -431,7 +431,7 @@ obj/structure/door_assembly src.base_icon_state = "door_as_silver" if(/obj/item/stack/sheet/diamond) if(G.amount>=2) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed diamond plating into the airlock assembly!" @@ -442,7 +442,7 @@ obj/structure/door_assembly src.base_icon_state = "door_as_diamond" if(/obj/item/stack/sheet/uranium) if(G.amount>=2) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed uranium plating into the airlock assembly!" @@ -453,7 +453,7 @@ obj/structure/door_assembly src.base_icon_state = "door_as_uranium" if(/obj/item/stack/sheet/plasma) if(G.amount>=2) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed plasma plating into the airlock assembly!" @@ -464,19 +464,19 @@ obj/structure/door_assembly src.base_icon_state = "door_as_plasma" if(/obj/item/stack/sheet/clown) if(G.amount>=2) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed bananium plating into the airlock assembly!HONK" G.use(2) - playsound(src.loc, 'bikehorn.ogg', 15, 1, -3) + playsound(src.loc, 'sound/items/bikehorn.ogg', 15, 1, -3) src.mineral = "clown" src.name = "Near finished Bananium Airlock Assembly" src.airlock_type = /obj/machinery/door/airlock/clown src.base_icon_state = "door_as_clown" if(/obj/item/stack/sheet/sandstone) if(G.amount>=2) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.") if(do_after(user, 40)) user << "\blue You installed sandstone plating into the airlock assembly!" @@ -487,7 +487,7 @@ obj/structure/door_assembly src.base_icon_state = "door_as_sandstone" else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 ) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user << "\blue Now finishing the airlock." if(do_after(user, 40)) diff --git a/code/game/objects/effect_system.dm b/code/game/objects/effect_system.dm index 2c24efd358..a2e19d19a3 100644 --- a/code/game/objects/effect_system.dm +++ b/code/game/objects/effect_system.dm @@ -803,7 +803,7 @@ steam.start() -- spawns the effect ..(loc) icon_state = "[ismetal ? "m":""]foam" metal = ismetal - playsound(src, 'bubbles2.ogg', 80, 1, -3) + playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3) spawn(3 + metal*3) process() spawn(120) @@ -877,7 +877,7 @@ steam.start() -- spawns the effect M.stop_pulling() M << "\blue You slipped on the foam!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(5) M.Weaken(2) diff --git a/code/game/objects/electricchair.dm b/code/game/objects/electricchair.dm index eb084f5d2c..950d7f8ca5 100644 --- a/code/game/objects/electricchair.dm +++ b/code/game/objects/electricchair.dm @@ -14,7 +14,7 @@ if(istype(W, /obj/item/weapon/wrench)) var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(src.loc) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) C.dir = src.dir src.part.loc = src.loc src.part.master = null diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 0ab211abcf..0a5b91648f 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -17,7 +17,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z])") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ") - playsound(epicenter, 'explosionfar.ogg', 100, 1, round(devastation_range*2,1) ) + playsound(epicenter, 'sound/effects/explosionfar.ogg', 100, 1, round(devastation_range*2,1) ) playsound(epicenter, "explosion", 100, 1, round(devastation_range,1) ) if(defer_powernet_rebuild != 2) diff --git a/code/game/objects/explosion2.dm b/code/game/objects/explosion2.dm index 5f6ee6a678..a50a6f5e32 100644 --- a/code/game/objects/explosion2.dm +++ b/code/game/objects/explosion2.dm @@ -10,7 +10,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ") - playsound(epicenter, 'explosionfar.ogg', 100, 1, round(devastation_range*2,1) ) + playsound(epicenter, 'sound/effects/explosionfar.ogg', 100, 1, round(devastation_range*2,1) ) playsound(epicenter, "explosion", 100, 1, round(devastation_range,1) ) tension_master.explosion() diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm index cc6d9a52b4..3171db1fb3 100644 --- a/code/game/objects/explosion_recursive.dm +++ b/code/game/objects/explosion_recursive.dm @@ -46,7 +46,7 @@ proc/explosion_rec(turf/epicenter, power) message_admins("Explosion with size ([power]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z])") log_game("Explosion with size ([power]) in area [epicenter.loc.name] ") - playsound(epicenter, 'explosionfar.ogg', 100, 1, round(power*2,1) ) + playsound(epicenter, 'sound/effects/explosionfar.ogg', 100, 1, round(power*2,1) ) playsound(epicenter, "explosion", 100, 1, round(power,1) ) explosion_in_progress = 1 diff --git a/code/game/objects/grenades/chem_grenade.dm b/code/game/objects/grenades/chem_grenade.dm index bdd00c3e11..52dc55cbba 100644 --- a/code/game/objects/grenades/chem_grenade.dm +++ b/code/game/objects/grenades/chem_grenade.dm @@ -28,7 +28,7 @@ if(istype(W,/obj/item/device/assembly_holder) && !stage && path != 2) path = 1 user << "\blue You add [W] to the metal casing." - playsound(src.loc, 'Screwdriver2.ogg', 25, -3) + playsound(src.loc, 'sound/items/Screwdriver2.ogg', 25, -3) del(W) //Okay so we're not really adding anything here. cheating. icon_state = initial(icon_state) +"_ass" name = "unsecured grenade" @@ -37,7 +37,7 @@ path = 1 if(beakers.len) user << "\blue You lock the assembly." - playsound(src.loc, 'Screwdriver.ogg', 25, -3) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3) name = "grenade" icon_state = initial(icon_state) +"_locked" stage = 2 @@ -64,7 +64,7 @@ switch(state) if(0) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "\blue You wrench the canister in place." src.name = "Camera Assembly" @@ -73,7 +73,7 @@ path = 2 if(1) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) user << "\blue You unfasten the canister." src.name = "Grenade Casing" @@ -81,29 +81,29 @@ src.state = 0 path = 0 if(istype(W, /obj/item/device/multitool)) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You place the electronics inside the canister." src.circuit = W user.drop_item() W.loc = src if(istype(W, /obj/item/weapon/screwdriver) && circuit) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You screw the circuitry into place." src.state = 2 if(istype(W, /obj/item/weapon/crowbar) && circuit) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the circuitry." src.state = 1 circuit.loc = src.loc src.circuit = null if(2) if(istype(W, /obj/item/weapon/screwdriver) && circuit) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You unfasten the circuitry." src.state = 1 if(istype(W, /obj/item/weapon/cable_coil)) if(W:amount >= 1) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) W:amount -= 1 if(!W:amount) del(W) @@ -111,51 +111,51 @@ src.state = 3 if(3) if(istype(W, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'wirecutter.ogg', 50, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "\blue You remove the cabling." src.state = 2 var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc ) A.amount = 1 if(issignaler(W)) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You attach the wireless signaller unit to the circutry." user.drop_item() W.loc = src src.state = 4 if(4) if(istype(W, /obj/item/weapon/crowbar) && !motion) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the remote signalling device." src.state = 3 new /obj/item/device/assembly/signaler( src.loc, 1 ) if(isprox(W) && motion == 0) // if(W:amount >= 1) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) // W:use(1) user << "\blue You attach the proximity sensor." user.drop_item() W.loc = src motion = 1 if(istype(W, /obj/item/weapon/crowbar) && motion) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the proximity sensor." new /obj/item/device/assembly/prox_sensor( src.loc, 1 ) motion = 0 if(istype(W, /obj/item/stack/sheet/glass)) if(W:amount >= 1) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) W:use(1) user << "\blue You put in the glass lens." src.state = 5 if(5) if(istype(W, /obj/item/weapon/crowbar)) - playsound(src.loc, 'Crowbar.ogg', 50, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) user << "\blue You remove the glass lens." src.state = 4 new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) user << "\blue You connect the lense." var/obj/machinery/camera/B = null if(motion == 1) @@ -189,11 +189,11 @@ if(G.reagents.total_volume) has_reagents = 1 if(!has_reagents) - playsound(src.loc, 'Screwdriver2.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver2.ogg', 50, 1) state = 0 return - playsound(src.loc, 'bamf.ogg', 50, 1) + playsound(src.loc, 'sound/effects/bamf.ogg', 50, 1) for(var/obj/item/weapon/reagent_containers/glass/G in beakers) G.reagents.trans_to(src, G.reagents.total_volume) diff --git a/code/game/objects/grenades/flashbang.dm b/code/game/objects/grenades/flashbang.dm index fc762d1b7b..2ff047a746 100644 --- a/code/game/objects/grenades/flashbang.dm +++ b/code/game/objects/grenades/flashbang.dm @@ -30,7 +30,7 @@ S.icon_state = "shield0" M << "\red BANG" - playsound(src.loc, 'bang.ogg', 25, 1) + playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) //Checking for protections var/eye_safety = 0 @@ -116,12 +116,12 @@ for(,numspawned > 0, numspawned--) spawn(0) new /obj/item/weapon/grenade/flashbang/cluster(src.loc)//Launches flashbangs - playsound(src.loc, 'armbomb.ogg', 75, 1, -3) + playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) for(,again > 0, again--) spawn(0) new /obj/item/weapon/grenade/flashbang/clusterbang/segment(src.loc)//Creates a 'segment' that launches a few more flashbangs - playsound(src.loc, 'armbomb.ogg', 75, 1, -3) + playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn(0) del(src) return @@ -153,7 +153,7 @@ for(,numspawned > 0, numspawned--) spawn(0) new /obj/item/weapon/grenade/flashbang/cluster(src.loc) - playsound(src.loc, 'armbomb.ogg', 75, 1, -3) + playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn(0) del(src) return diff --git a/code/game/objects/grenades/grenade.dm b/code/game/objects/grenades/grenade.dm index 8a8000a2e8..035ef2f3ee 100644 --- a/code/game/objects/grenades/grenade.dm +++ b/code/game/objects/grenades/grenade.dm @@ -17,7 +17,7 @@ user << "Huh? How does this thing work?" active = 1 icon_state = initial(icon_state) + "_active" - playsound(loc, 'armbomb.ogg', 75, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn(5) if(user) user.drop_item() @@ -33,7 +33,7 @@ user << "You prime the [name]! [det_time/10] seconds!" active = 1 icon_state = initial(icon_state) + "_active" - playsound(loc, 'armbomb.ogg', 75, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn(det_time) prime() return @@ -72,7 +72,7 @@ /obj/item/weapon/grenade/proc/prime() -// playsound(loc, 'Welder2.ogg', 25, 1) +// playsound(loc, 'sound/items/Welder2.ogg', 25, 1) var/turf/T = get_turf(src) if(T) T.hotspot_expose(700,125) diff --git a/code/game/objects/grenades/smokebomb.dm b/code/game/objects/grenades/smokebomb.dm index a394d2ad62..aa8920bb4f 100644 --- a/code/game/objects/grenades/smokebomb.dm +++ b/code/game/objects/grenades/smokebomb.dm @@ -16,7 +16,7 @@ src.smoke.set_up(10, 0, usr.loc) prime() - playsound(src.loc, 'smoke.ogg', 50, 1, -3) + playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) src.smoke.start() sleep(10) diff --git a/code/game/objects/grenades/spawnergrenade.dm b/code/game/objects/grenades/spawnergrenade.dm index 739b6562e5..fe15703fa2 100644 --- a/code/game/objects/grenades/spawnergrenade.dm +++ b/code/game/objects/grenades/spawnergrenade.dm @@ -14,7 +14,7 @@ if(spawner_type && deliveryamt) // Make a quick flash var/turf/T = get_turf(src) - playsound(T, 'phasein.ogg', 100, 1) + playsound(T, 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/carbon/human/M in viewers(T, null)) if(M:eyecheck() <= 0) flick("e_flash", M.flash) // flash dose faggots diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index 0ea3fd94e0..b87a41be60 100644 --- a/code/game/objects/grille.dm +++ b/code/game/objects/grille.dm @@ -45,7 +45,7 @@ attack_hand(var/mob/user) - playsound(src.loc, 'grillehit.ogg', 80, 1) + playsound(src.loc, 'sound/effects/grillehit.ogg', 80, 1) user.visible_message("[user.name] kicks the [src.name].", \ "You kick the [src.name].", \ "You hear a noise") @@ -63,7 +63,7 @@ attack_alien(var/mob/user) if (istype(usr, /mob/living/carbon/alien/larva)) return - playsound(src.loc, 'grillehit.ogg', 80, 1) + playsound(src.loc, 'sound/effects/grillehit.ogg', 80, 1) user.visible_message("[user.name] mangles the [src.name].", \ "You mangle the [src.name].", \ "You hear a noise") @@ -74,7 +74,7 @@ attack_metroid(var/mob/user) if(!istype(usr, /mob/living/carbon/metroid/adult)) return - playsound(src.loc, 'grillehit.ogg', 80, 1) + playsound(src.loc, 'sound/effects/grillehit.ogg', 80, 1) user.visible_message("[user.name] smashes against the [src.name].", \ "You smash against the [src.name].", \ "You hear a noise") @@ -84,7 +84,7 @@ attack_animal(var/mob/living/simple_animal/M as mob) if(M.melee_damage_upper == 0) return - playsound(src.loc, 'grillehit.ogg', 80, 1) + playsound(src.loc, 'sound/effects/grillehit.ogg', 80, 1) M.visible_message("[M.name] smashes against the [src.name].", \ "You smash against the [src.name].", \ "You hear a noise") @@ -106,13 +106,13 @@ attackby(obj/item/weapon/W, mob/user) if(iswirecutter(W)) if(!shock(user, 100)) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) src.health = 0 if(!destroyed) src.health = -100 else if ((isscrewdriver(W)) && (istype(src.loc, /turf/simulated) || src.anchored)) if(!shock(user, 90)) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) src.anchored = !( src.anchored ) user << (src.anchored ? "You have fastened the grille to the floor." : "You have unfastened the grill.") for(var/mob/O in oviewers()) @@ -164,7 +164,7 @@ else if(istype(W, /obj/item/weapon/shard)) src.health -= W.force * 0.1 else if(!shock(user, 70)) - playsound(src.loc, 'grillehit.ogg', 80, 1) + playsound(src.loc, 'sound/effects/grillehit.ogg', 80, 1) switch(W.damtype) if("fire") src.health -= W.force diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 392370903a..dcfacd4fc5 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -19,7 +19,7 @@ if(!M.handcuffed) var/turf/p_loc = user.loc var/turf/p_loc_m = M.loc - playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) + playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) for(var/mob/O in viewers(user, null)) O.show_message("\red [user] is trying to put handcuffs on [M]!", 1) spawn(30) @@ -66,10 +66,10 @@ spawn( 0 ) if(istype(src, /obj/item/weapon/handcuffs/cable)) feedback_add_details("handcuffs","C") - playsound(src.loc, 'cablecuff.ogg', 30, 1, -2) + playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) else feedback_add_details("handcuffs","H") - playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) + playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) O.process() return else @@ -84,9 +84,9 @@ M.requests += O spawn( 0 ) if(istype(src, /obj/item/weapon/handcuffs/cable)) - playsound(src.loc, 'cablecuff.ogg', 30, 1, -2) + playsound(src.loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) else - playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) + playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) O.process() return return @@ -121,7 +121,7 @@ var/obj/o = target o.reagents.trans_to(src, 50) user << "\blue \The [src] is now refilled" - playsound(src.loc, 'refill.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return if (!safety) @@ -134,7 +134,7 @@ src.last_use = world.time - playsound(src.loc, 'extinguish.ogg', 75, 1, -3) + playsound(src.loc, 'sound/effects/extinguish.ogg', 75, 1, -3) var/direction = get_dir(src,target) @@ -479,7 +479,7 @@ /obj/item/latexballon/proc/burst() if (!air_contents) return - playsound(src, 'Gunshot.ogg', 100, 1) + playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1) icon_state = "latexballon_bursted" item_state = "lgloves" loc.assume_air(air_contents) diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm index 04b0d27bf9..44f263970e 100644 --- a/code/game/objects/items/robot_items.dm +++ b/code/game/objects/items/robot_items.dm @@ -236,12 +236,12 @@ proc/activate() // spark_system.set_up(5, 0, src) // src.spark_system.start() - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) attack_self(mob/user as mob) //Change the mode - playsound(src.loc, 'pop.ogg', 50, 0) + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) if(mode == 1) mode = 2 user << "Changed mode to 'Airlock'" @@ -284,7 +284,7 @@ if(istype(A, /turf/simulated/floor)) if(!cell.use(90)) return user << "Building Wall (3)..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20)) activate() A:ReplaceWithWall() @@ -294,7 +294,7 @@ if(istype(A, /turf/simulated/floor)) if(!cell.use(300)) return user << "Building Airlock..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) activate() if(locate(/obj/machinery/door) in get_turf(src)) return @@ -306,7 +306,7 @@ if(istype(A, /turf/simulated/wall)) if(!cell.use(150)) return user << "Deconstructing Wall..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40)) activate() A:ReplaceWithPlating() @@ -317,7 +317,7 @@ if(istype(A, /turf/simulated/floor)) user << "Deconstructing Floor..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) activate() A:ReplaceWithSpace() @@ -325,9 +325,9 @@ if(istype(A, /obj/machinery/door/airlock)) user << "Deconstructing Airlock..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) del(A) return return diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index f7ebaf1242..d413668f26 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -44,7 +44,7 @@ RCD user.drop_item() del(W) matter += 10 - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) user << "The RCD now holds [matter]/30 matter-units." desc = "A RCD. It currently holds [matter]/30 matter-units." return @@ -52,7 +52,7 @@ RCD attack_self(mob/user as mob) //Change the mode - playsound(src.loc, 'pop.ogg', 50, 0) + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) switch(mode) if(1) mode = 2 @@ -82,7 +82,7 @@ RCD if(istype(A, /turf) && mode == 1) if(istype(A, /turf/space) && matter >= 1) if(!disabled && matter >= 1) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) spark_system.set_up(5, 0, src) src.spark_system.start() A:ReplaceWithPlating() @@ -90,19 +90,19 @@ RCD desc = "A RCD. It currently holds [matter]/30 matter-units." return if(istype(A, /turf/simulated/floor) && matter >= 3) - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20)) if(!disabled && matter >= 3) spark_system.set_up(5, 0, src) src.spark_system.start() A:ReplaceWithWall() - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) matter -= 3 desc = "A RCD. It currently holds [matter]/30 matter-units." return else if(istype(A, /turf/simulated/floor) && mode == 2 && matter >= 10) user << "Building Airlock (10)..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!disabled && matter >= 10) spark_system.set_up(5, 0, src) @@ -113,21 +113,21 @@ RCD if(killthis) killthis.ex_act(2)//Smashin windows T.autoclose = 1 - playsound(src.loc, 'Deconstruct.ogg', 50, 1) - playsound(src.loc, 'sparks2.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/effects/sparks2.ogg', 50, 1) matter -= 10 desc = "A RCD. It currently holds [matter]/30 matter-units." return else if(mode == 3 && (istype(A, /turf) || istype(A, /obj/machinery/door/airlock) ) ) if(istype(A, /turf/simulated/wall) && !istype(A, /turf/simulated/wall/r_wall) && matter >= 4) user << "Deconstructing Wall (4)..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40)) if(!disabled && matter >= 4) spark_system.set_up(5, 0, src) src.spark_system.start() A:ReplaceWithPlating() - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) matter -= 4 desc = "A RCD. It currently holds [matter]/30 matter-units." return @@ -135,25 +135,25 @@ RCD return if(istype(A, /turf/simulated/floor) && matter >= 5) user << "Deconstructing Floor (5)..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!disabled && matter >= 5) spark_system.set_up(5, 0, src) src.spark_system.start() A:ReplaceWithSpace() - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) matter -= 5 desc = "A RCD. It currently holds [matter]/30 matter-units." return if(istype(A, /obj/machinery/door/airlock) && matter >= 10) user << "Deconstructing Airlock (10)..." - playsound(src.loc, 'click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!disabled && matter >= 10) spark_system.set_up(5, 0, src) src.spark_system.start() del(A) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) matter -= 10 desc = "A RCD. It currently holds [matter]/30 matter-units." return diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 1bdecd7d5e..b122382e5f 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -15,13 +15,13 @@ RSF return del(W) matter += 10 - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) user << "The RSF now holds [matter]/30 fabrication-units." desc = "A RSF. It currently holds [matter]/30 fabrication-units." return /obj/item/weapon/rsf/attack_self(mob/user as mob) - playsound(src.loc, 'pop.ogg', 50, 0) + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) if (mode == 1) mode = 2 user << "Changed dispensing mode to 'Drinking Glass'" @@ -55,7 +55,7 @@ RSF if (istype(A, /obj/structure/table) && mode == 1) if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Dosh..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -69,7 +69,7 @@ RSF else if (istype(A, /turf/simulated/floor) && mode == 1) if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Dosh..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -83,7 +83,7 @@ RSF else if (istype(A, /obj/structure/table) && mode == 2) if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Drinking Glass..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -97,7 +97,7 @@ RSF else if (istype(A, /turf/simulated/floor) && mode == 2) if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Drinking Glass..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -111,7 +111,7 @@ RSF else if (istype(A, /obj/structure/table) && mode == 3) if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Paper Sheet..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -125,7 +125,7 @@ RSF else if (istype(A, /turf/simulated/floor) && mode == 3) if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Paper Sheet..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -139,7 +139,7 @@ RSF else if (istype(A, /obj/structure/table) && mode == 4) if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Pen..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -153,7 +153,7 @@ RSF else if (istype(A, /turf/simulated/floor) && mode == 4) if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Pen..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -167,7 +167,7 @@ RSF else if (istype(A, /obj/structure/table) && mode == 5) if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Dice Pack..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/dice( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -181,7 +181,7 @@ RSF else if (istype(A, /turf/simulated/floor) && mode == 5) if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Dice Pack..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/dice( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -195,7 +195,7 @@ RSF else if (istype(A, /obj/structure/table) && mode == 6) if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Cigarette..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user @@ -209,7 +209,7 @@ RSF else if (istype(A, /turf/simulated/floor) && mode == 6) if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Cigarette..." - playsound(src.loc, 'click.ogg', 10, 1) + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm index a821bf6656..ae99680c64 100644 --- a/code/game/objects/items/weapons/cameras.dm +++ b/code/game/objects/items/weapons/cameras.dm @@ -152,7 +152,7 @@ P.name = finished_title P.desc = finished_detail - playsound(src.loc, pick('polaroid1.ogg','polaroid2.ogg'), 75, 1, -3) + playsound(src.loc, pick('sound/items/polaroid1.ogg','sound/items/polaroid2.ogg'), 75, 1, -3) pictures_left-- src.desc = "A one use - polaroid camera. [pictures_left] photos left." diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index bfe02c9ced..cb14957ec5 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -15,7 +15,7 @@ BIKE HORN M.stop_pulling() M << "\blue You slipped on the [name]!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(4) M.Weaken(2) @@ -27,7 +27,7 @@ BIKE HORN M.stop_pulling() M << "\blue You slipped on the [name]!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) @@ -39,7 +39,7 @@ BIKE HORN M.stop_pulling() M << "\blue You slipped on the [name]!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(3) M.Weaken(2) @@ -65,7 +65,7 @@ BIKE HORN /obj/item/weapon/bikehorn/attack_self(mob/user as mob) if (spam_flag == 0) spam_flag = 1 - playsound(src.loc, 'bikehorn.ogg', 50, 1) + playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) src.add_fingerprint(user) spawn(20) spam_flag = 0 diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index c061928d35..da0812e7e2 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -115,10 +115,10 @@ KNIFE M.Weaken(1) user.take_organ_damage(2) if(prob(50)) - playsound(M, 'trayhit1.ogg', 50, 1) + playsound(M, 'sound/items/trayhit1.ogg', 50, 1) return else - playsound(M, 'trayhit2.ogg', 50, 1) //sound playin' + playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3 var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later. @@ -143,12 +143,12 @@ KNIFE else M.take_organ_damage(5) if(prob(50)) - playsound(M, 'trayhit1.ogg', 50, 1) + playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] slams [] with the tray!", user, M), 1) return else - playsound(M, 'trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc + playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] slams [] with the tray!", user, M), 1) return @@ -171,11 +171,11 @@ KNIFE location.add_blood(H) if(prob(50)) - playsound(M, 'trayhit1.ogg', 50, 1) + playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] slams [] with the tray!", user, M), 1) else - playsound(M, 'trayhit2.ogg', 50, 1) //sound playin' + playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] slams [] with the tray!", user, M), 1) if(prob(10)) @@ -195,11 +195,11 @@ KNIFE location.add_blood(H) if(prob(50)) - playsound(M, 'trayhit1.ogg', 50, 1) + playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1) else - playsound(M, 'trayhit2.ogg', 50, 1) //sound playin' again + playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1) if(prob(30)) diff --git a/code/game/objects/items/weapons/spray.dm b/code/game/objects/items/weapons/spray.dm index 2a8e2ffd0d..d3aadde792 100644 --- a/code/game/objects/items/weapons/spray.dm +++ b/code/game/objects/items/weapons/spray.dm @@ -58,7 +58,7 @@ sleep(3) del(D) - playsound(src.loc, 'spray2.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) if(reagents.has_reagent("sacid")) message_admins("[key_name_admin(user)] fired sulphuric acid from a spray bottle.") @@ -181,7 +181,7 @@ sleep(2) del(D) - playsound(src.loc, 'spray2.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) if(reagents.has_reagent("sacid")) message_admins("[key_name_admin(user)] fired sulphuric acid from a chem sprayer.") diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 62065188df..39584aea53 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -78,7 +78,7 @@ user.attack_log += "\[[time_stamp()]\] Stunned [H.name] ([H.ckey]) with [src.name]" H.attack_log += "\[[time_stamp()]\] Stunned by [user.name] ([user.ckey]) with [src.name]" log_attack("[user.name] ([user.ckey]) stunned [H.name] ([H.ckey]) with [src.name]" ) - playsound(src.loc, 'Egloves.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) if(charges < 1) status = 0 update_icon() diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 832224914b..b23050d0e0 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -34,7 +34,7 @@ ENERGY SHIELD (where else should i even put this) else icon_state = "sword[color]" w_class = 4 - playsound(user, 'saberon.ogg', 50, 1) + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) user << "\blue [src] is now active." else force = 3 @@ -43,7 +43,7 @@ ENERGY SHIELD (where else should i even put this) else icon_state = "sword0" w_class = 2 - playsound(user, 'saberoff.ogg', 50, 1) + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) user << "\blue [src] can now be concealed." add_fingerprint(user) return @@ -132,7 +132,7 @@ ENERGY SHIELD (where else should i even put this) for(var/mob/O in viewers(M)) if (O.client) O.show_message("\red [M] has been beaten with the police baton by [user]!", 1, "\red You hear someone fall", 2) else - playsound(src.loc, 'Genhit.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1, -1) M.Stun(5) M.Weaken(5) for(var/mob/O in viewers(M)) @@ -154,13 +154,13 @@ ENERGY SHIELD (where else should i even put this) force = 10 icon_state = "eshield[active]" w_class = 4 - playsound(user, 'saberon.ogg', 50, 1) + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) user << "\blue [src] is now active." else force = 3 icon_state = "eshield[active]" w_class = 1 - playsound(user, 'saberoff.ogg', 50, 1) + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) user << "\blue [src] can now be concealed." add_fingerprint(user) return \ No newline at end of file diff --git a/code/game/objects/items/weapons/toilets.dm b/code/game/objects/items/weapons/toilets.dm index 9217b6f53b..f943a1cc54 100644 --- a/code/game/objects/items/weapons/toilets.dm +++ b/code/game/objects/items/weapons/toilets.dm @@ -25,7 +25,7 @@ TOILET if (istype(W, /obj/item/weapon/storage/)) return if (istype(W, /obj/item/weapon/grab)) - playsound(src.loc, 'slosh.ogg', 50, 1) + playsound(src.loc, 'sound/effects/slosh.ogg', 50, 1) for(var/mob/O in viewers(user, null)) O << text("\blue [] gives [] a swirlie!", user, W) return diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 4f971a32cb..07218fd593 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -187,7 +187,7 @@ WIRECUTTERS if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && !src.welding) O.reagents.trans_to(src, max_fuel) user << "\blue Welder refueled" - playsound(src.loc, 'refill.ogg', 50, 1, -6) + playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding) message_admins("[key_name_admin(user)] triggered a fueltank explosion.") diff --git a/code/game/objects/lamarr.dm b/code/game/objects/lamarr.dm index 127d1bb159..eebe9fb343 100644 --- a/code/game/objects/lamarr.dm +++ b/code/game/objects/lamarr.dm @@ -55,7 +55,7 @@ playsound(src, "shatter", 70, 1) Break() else - playsound(src.loc, 'Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) return /obj/structure/lamarr/update_icon() diff --git a/code/game/objects/mineral_doors.dm b/code/game/objects/mineral_doors.dm index 56e091a003..4b2a2972f0 100644 --- a/code/game/objects/mineral_doors.dm +++ b/code/game/objects/mineral_doors.dm @@ -69,7 +69,7 @@ proc/Open() isSwitchingStates = 1 - playsound(loc, 'stonedoor_openclose.ogg', 100, 1) + playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) flick("[mineralType]opening",src) sleep(10) density = 0 @@ -80,7 +80,7 @@ proc/Close() isSwitchingStates = 1 - playsound(loc, 'stonedoor_openclose.ogg', 100, 1) + playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1) flick("[mineralType]closing",src) sleep(10) density = 1 @@ -256,7 +256,7 @@ Open() isSwitchingStates = 1 - playsound(loc, 'doorcreaky.ogg', 100, 1) + playsound(loc, 'sound/effects/doorcreaky.ogg', 100, 1) flick("[mineralType]opening",src) sleep(10) density = 0 @@ -267,7 +267,7 @@ Close() isSwitchingStates = 1 - playsound(loc, 'doorcreaky.ogg', 100, 1) + playsound(loc, 'sound/effects/doorcreaky.ogg', 100, 1) flick("[mineralType]closing",src) sleep(10) density = 1 @@ -293,7 +293,7 @@ Open() isSwitchingStates = 1 - playsound(loc, 'attackblob.ogg', 100, 1) + playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) flick("[mineralType]opening",src) sleep(10) density = 0 @@ -308,7 +308,7 @@ Close() isSwitchingStates = 1 - playsound(loc, 'attackblob.ogg', 100, 1) + playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) flick("[mineralType]closing",src) sleep(10) density = 1 diff --git a/code/game/objects/radio/beacon.dm b/code/game/objects/radio/beacon.dm index 2d29968457..116de2e084 100644 --- a/code/game/objects/radio/beacon.dm +++ b/code/game/objects/radio/beacon.dm @@ -44,6 +44,6 @@ if(user) user << "\blue Locked In" new /obj/machinery/singularity_beacon/syndicate( user.loc ) - playsound(src, 'pop.ogg', 100, 1, 1) + playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) del(src) return \ No newline at end of file diff --git a/code/game/objects/secstorage/secstorage.dm b/code/game/objects/secstorage/secstorage.dm index f7087ac33c..b9fb7f65f7 100644 --- a/code/game/objects/secstorage/secstorage.dm +++ b/code/game/objects/secstorage/secstorage.dm @@ -113,7 +113,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) user << "You slice through the lock on [src]." else diff --git a/code/game/objects/stacks/glass.dm b/code/game/objects/stacks/glass.dm index 645936a6fc..37fa99b51a 100644 --- a/code/game/objects/stacks/glass.dm +++ b/code/game/objects/stacks/glass.dm @@ -255,7 +255,7 @@ SHARDS if(ismob(AM)) var/mob/M = AM M << "\red You step in the broken glass!" - playsound(src.loc, 'glass_step.ogg', 50, 1) + playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) if(ishuman(M)) var/mob/living/carbon/human/H = M if(!H.shoes) diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 84f94cab11..2ede6de660 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -20,7 +20,7 @@ /obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/metal(src.loc) del(src) return @@ -29,7 +29,7 @@ ..() if(istype(W, /obj/item/assembly/shock_kit)) var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) E.dir = src.dir E.part = W W.loc = E @@ -43,7 +43,7 @@ /obj/structure/stool/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/stack/sheet/wood(src.loc) del(src) else diff --git a/code/game/objects/storage/lockbox.dm b/code/game/objects/storage/lockbox.dm index 3b83ab90ac..ec0e17efb5 100644 --- a/code/game/objects/storage/lockbox.dm +++ b/code/game/objects/storage/lockbox.dm @@ -43,7 +43,7 @@ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 3)) O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 51ee5022c2..dbb931758a 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -32,7 +32,7 @@ obj/structure/meteorhit(obj/O as obj) attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/wrench) && state == 0) if(anchored && !istype(src,/obj/structure/girder/displaced)) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "\blue Now disassembling the girder" if(do_after(user,40)) if(!src) return @@ -40,7 +40,7 @@ obj/structure/meteorhit(obj/O as obj) new /obj/item/stack/sheet/metal(get_turf(src)) del(src) else if(!anchored) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "\blue Now securing the girder" if(get_turf(user, 40)) user << "\blue You secured the girder!" @@ -61,7 +61,7 @@ obj/structure/meteorhit(obj/O as obj) del(src) else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced)) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user << "\blue Now unsecuring support struts" if(do_after(user,40)) if(!src) return @@ -69,7 +69,7 @@ obj/structure/meteorhit(obj/O as obj) state = 1 else if(istype(W, /obj/item/weapon/wirecutters) && istype(src,/obj/structure/girder/reinforced) && state == 1) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user << "\blue Now removing support struts" if(do_after(user,40)) if(!src) return @@ -78,7 +78,7 @@ obj/structure/meteorhit(obj/O as obj) del(src) else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored ) - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user << "\blue Now dislodging the girder" if(do_after(user, 40)) if(!src) return @@ -354,7 +354,7 @@ obj/structure/meteorhit(obj/O as obj) attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user << "\blue Now disassembling the girder" if(do_after(user,40)) user << "\blue You dissasembled the girder!" diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm index 42141d6ab0..ce79641e8c 100644 --- a/code/game/objects/tables_racks.dm +++ b/code/game/objects/tables_racks.dm @@ -151,10 +151,10 @@ TABLE AND RACK OBJECT INTERATIONS if (istype(W, /obj/item/weapon/wrench)) user << "\blue Now disassembling table" - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50)) new /obj/item/weapon/table_parts( src.loc ) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) //SN src = null del(src) return @@ -166,7 +166,7 @@ TABLE AND RACK OBJECT INTERATIONS var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 4)) O.show_message("\blue The table was sliced apart by [user]!", 1, "\red You hear metal coming apart.", 2) @@ -196,10 +196,10 @@ TABLE AND RACK OBJECT INTERATIONS return if (istype(W, /obj/item/weapon/wrench)) user << "\blue Now disassembling the wooden table" - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/wood( src.loc ) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) del(src) return if(isrobot(user)) @@ -208,7 +208,7 @@ TABLE AND RACK OBJECT INTERATIONS var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 4)) O.show_message("\blue The wooden table was sliced apart by [user]!", 1, "\red You hear wood coming apart.", 2) @@ -242,14 +242,14 @@ TABLE AND RACK OBJECT INTERATIONS if(WT.remove_fuel(0, user)) if(src.status == 2) user << "\blue Now weakening the reinforced table" - playsound(src.loc, 'Welder.ogg', 50, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50)) if(!src || !WT.isOn()) return user << "\blue Table weakened" src.status = 1 else user << "\blue Now strengthening the reinforced table" - playsound(src.loc, 'Welder.ogg', 50, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50)) if(!src || !WT.isOn()) return user << "\blue Table strengthened" @@ -264,10 +264,10 @@ TABLE AND RACK OBJECT INTERATIONS if (istype(W, /obj/item/weapon/wrench)) if(src.status == 1) user << "\blue Now disassembling the reinforced table" - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if (do_after(user, 50)) new /obj/item/weapon/table_parts/reinforced( src.loc ) - playsound(src.loc, 'Deconstruct.ogg', 50, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) del(src) return if(isrobot(user)) @@ -277,7 +277,7 @@ TABLE AND RACK OBJECT INTERATIONS var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 4)) O.show_message("\blue The reinforced table was sliced apart by [user]!", 1, "\red You hear metal coming apart.", 2) @@ -335,7 +335,7 @@ TABLE AND RACK OBJECT INTERATIONS /obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/weapon/rack_parts( src.loc ) - playsound(src.loc, 'Ratchet.ogg', 50, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) //SN src = null del(src) return diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm index e271e4966b..2544bf75a8 100644 --- a/code/game/objects/tank.dm +++ b/code/game/objects/tank.dm @@ -36,7 +36,7 @@ ..() if(air_contents.oxygen < 1 && loc==usr) usr << "\red The meter on the [src.name] indicates you are almost out of air!" - usr << sound('alert.ogg') + usr << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/plasma @@ -183,7 +183,7 @@ //world << "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]" if(integrity <= 0) loc.assume_air(air_contents) - playsound(src.loc, 'spray.ogg', 10, 1, -3) + playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) del(src) else integrity-- diff --git a/code/game/objects/tanks/emergency.dm b/code/game/objects/tanks/emergency.dm index 8bd707ec9a..6640d3eeda 100644 --- a/code/game/objects/tanks/emergency.dm +++ b/code/game/objects/tanks/emergency.dm @@ -21,7 +21,7 @@ ..() if(air_contents.oxygen < 0.2 && loc==usr) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") - usr << sound('alert.ogg') + usr << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/emergency_oxygen/engi icon_state = "emergency_engi" diff --git a/code/game/objects/tanks/jetpack.dm b/code/game/objects/tanks/jetpack.dm index eab9c3d51b..b6ff531981 100644 --- a/code/game/objects/tanks/jetpack.dm +++ b/code/game/objects/tanks/jetpack.dm @@ -25,7 +25,7 @@ ..() if(air_contents.oxygen < 10) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") - playsound(usr, 'alert.ogg', 50, 1) + playsound(usr, 'sound/effects/alert.ogg', 50, 1) return @@ -113,5 +113,5 @@ ..() if(air_contents.carbon_dioxide < 10) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") - playsound(usr, 'alert.ogg', 50, 1) + playsound(usr, 'sound/effects/alert.ogg', 50, 1) return diff --git a/code/game/objects/tanks/oxygen.dm b/code/game/objects/tanks/oxygen.dm index 2ce809aeaa..fdf86cd29a 100644 --- a/code/game/objects/tanks/oxygen.dm +++ b/code/game/objects/tanks/oxygen.dm @@ -17,7 +17,7 @@ ..() if(air_contents.oxygen < 10) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") - playsound(usr, 'alert.ogg', 50, 1) + playsound(usr, 'sound/effects/alert.ogg', 50, 1) /obj/item/weapon/tank/oxygen/yellow diff --git a/code/game/objects/watercloset.dm b/code/game/objects/watercloset.dm index 28a1c24b1c..524522ac92 100644 --- a/code/game/objects/watercloset.dm +++ b/code/game/objects/watercloset.dm @@ -45,7 +45,7 @@ /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/weapon/crowbar)) user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]." - playsound(loc, 'stonedoor_openclose.ogg', 50, 1) + playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30)) user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") cistern = !cistern diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 26a2b3405f..8df8ecabfe 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -145,7 +145,7 @@ var/mob/living/simple_animal/mouse/M = target src.visible_message("\red SPLAT!") M.splat() - playsound(target.loc, 'snap.ogg', 50, 1) + playsound(target.loc, 'sound/effects/snap.ogg', 50, 1) icon_state = "mousetrap" armed = 0 /* @@ -172,7 +172,7 @@ return user << "\blue You disarm the mousetrap." armed = !armed - playsound(user.loc, 'handcuffs.ogg', 30, 1, -3) + playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) /obj/item/weapon/mousetrap/attack_hand(mob/living/user as mob) if(armed) diff --git a/code/game/objects/windoor_assembly.dm b/code/game/objects/windoor_assembly.dm index c4545bfff0..2e15e49e4c 100644 --- a/code/game/objects/windoor_assembly.dm +++ b/code/game/objects/windoor_assembly.dm @@ -65,7 +65,7 @@ obj/structure/windoor_assembly/Del() var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) user.visible_message("[user] dissassembles the windoor assembly.", "You start to dissassemble the windoor assembly.") - playsound(src.loc, 'Welder2.ogg', 50, 1) + playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) if(do_after(user, 40)) if(!src || !WT.isOn()) return @@ -80,7 +80,7 @@ obj/structure/windoor_assembly/Del() //Wrenching an unsecure assembly anchors it in place. Step 4 complete if(istype(W, /obj/item/weapon/wrench) && !anchored) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor.") if(do_after(user, 40)) @@ -94,7 +94,7 @@ obj/structure/windoor_assembly/Del() //Unwrenching an unsecure assembly un-anchors it. Step 4 undone else if(istype(W, /obj/item/weapon/wrench) && anchored) - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] unsecures the windoor assembly to the floor.", "You start to unsecure the windoor assembly to the floor.") if(do_after(user, 40)) @@ -146,7 +146,7 @@ obj/structure/windoor_assembly/Del() //Removing wire from the assembly. Step 5 undone. if(istype(W, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.") if(do_after(user, 40)) @@ -162,7 +162,7 @@ obj/structure/windoor_assembly/Del() //Adding airlock electronics for access. Step 6 complete. else if(istype(W, /obj/item/weapon/airlock_electronics)) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.") if(do_after(user, 40)) @@ -178,7 +178,7 @@ obj/structure/windoor_assembly/Del() //Screwdriver to remove airlock electronics. Step 6 undone. else if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly.") if(do_after(user, 40)) @@ -200,7 +200,7 @@ obj/structure/windoor_assembly/Del() usr << "\red The assembly is missing electronics." return usr << browse(null, "window=windoor_access") - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame.") if(do_after(user, 40)) diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index 040d780c75..4a1a5aee4c 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -75,7 +75,7 @@ else tforce = AM:throwforce if(reinf) tforce /= 4.0 - playsound(src.loc, 'Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) src.health = max(0, src.health - tforce) if (src.health <= 7 && !reinf) src.anchored = 0 @@ -125,7 +125,7 @@ for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) O << "\red [usr] smashes against the window." - playsound(src.loc, 'Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) src.health -= 15 if(src.health <= 0) usr << "\green You smash through the window." @@ -149,7 +149,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O << "\red [M] smashes against the window." - playsound(src.loc, 'Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) src.health -= M.melee_damage_upper if(src.health <= 0) M << "\green You smash through the window." @@ -173,7 +173,7 @@ for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) O << "\red [usr] smashes against the window." - playsound(src.loc, 'Glasshit.ogg', 100, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) src.health -= rand(10,15) if(src.health <= 0) usr << "\green You smash through the window." @@ -194,21 +194,21 @@ if (istype(W, /obj/item/weapon/screwdriver)) if(reinf && state >= 1) state = 3 - state - playsound(src.loc, 'Screwdriver.ogg', 75, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1) usr << ( state==1? "You have unfastened the window from the frame." : "You have fastened the window to the frame." ) else if(reinf && state == 0) anchored = !anchored update_nearby_icons() - playsound(src.loc, 'Screwdriver.ogg', 75, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1) user << (src.anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.") else if(!reinf) src.anchored = !( src.anchored ) update_nearby_icons() - playsound(src.loc, 'Screwdriver.ogg', 75, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1) user << (src.anchored ? "You have fastened the window to the floor." : "You have unfastened the window.") else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <=1) state = 1-state; - playsound(src.loc, 'Crowbar.ogg', 75, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1) user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.") else @@ -216,7 +216,7 @@ if(reinf) aforce /= 2.0 if(W.damtype == BRUTE || W.damtype == BURN) src.health = max(0, src.health - aforce) - playsound(src.loc, 'Glasshit.ogg', 75, 1) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) if (src.health <= 7) src.anchored = 0 update_nearby_icons() diff --git a/code/game/prisonshuttle.dm b/code/game/prisonshuttle.dm index 2b0ea62ccf..e6e74610e8 100644 --- a/code/game/prisonshuttle.dm +++ b/code/game/prisonshuttle.dm @@ -36,7 +36,7 @@ var/prison_shuttle_timeleft = 0 attackby(I as obj, user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/prison_shuttle/M = new /obj/item/weapon/circuitboard/prison_shuttle( A ) diff --git a/code/game/sound.dm b/code/game/sound.dm index b29a96c7d9..fb1ea17116 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -2,15 +2,15 @@ //Frequency stuff only works with 45kbps oggs. switch(soundin) - if ("shatter") soundin = pick('Glassbr1.ogg','Glassbr2.ogg','Glassbr3.ogg') - if ("explosion") soundin = pick('Explosion1.ogg','Explosion2.ogg') - if ("sparks") soundin = pick('sparks1.ogg','sparks2.ogg','sparks3.ogg','sparks4.ogg') - if ("rustle") soundin = pick('rustle1.ogg','rustle2.ogg','rustle3.ogg','rustle4.ogg','rustle5.ogg') - if ("punch") soundin = pick('punch1.ogg','punch2.ogg','punch3.ogg','punch4.ogg') - if ("clownstep") soundin = pick('clownstep1.ogg','clownstep2.ogg') - if ("swing_hit") soundin = pick('genhit1.ogg', 'genhit2.ogg', 'genhit3.ogg') - if ("hiss") soundin = pick('hiss1.ogg','hiss2.ogg','hiss3.ogg','hiss4.ogg') - if ("pageturn") soundin = pick('pageturn1.ogg', 'pageturn2.ogg','pageturn3.ogg') + if ("shatter") soundin = pick('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg') + if ("explosion") soundin = pick('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg') + if ("sparks") soundin = pick('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg') + if ("rustle") soundin = pick('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg') + if ("punch") soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') + if ("clownstep") soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') + if ("swing_hit") soundin = pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg') + if ("hiss") soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg') + if ("pageturn") soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg') var/sound/S = sound(soundin) S.wait = 0 //No queue @@ -53,14 +53,14 @@ /mob/proc/playsound_local(var/atom/source, soundin, vol as num, vary, extrarange as num) if(!src.client || ear_deaf > 0) return switch(soundin) - if ("shatter") soundin = pick('Glassbr1.ogg','Glassbr2.ogg','Glassbr3.ogg') - if ("explosion") soundin = pick('Explosion1.ogg','Explosion2.ogg') - if ("sparks") soundin = pick('sparks1.ogg','sparks2.ogg','sparks3.ogg','sparks4.ogg') - if ("rustle") soundin = pick('rustle1.ogg','rustle2.ogg','rustle3.ogg','rustle4.ogg','rustle5.ogg') - if ("punch") soundin = pick('punch1.ogg','punch2.ogg','punch3.ogg','punch4.ogg') - if ("clownstep") soundin = pick('clownstep1.ogg','clownstep2.ogg') - if ("swing_hit") soundin = pick('genhit1.ogg', 'genhit2.ogg', 'genhit3.ogg') - if ("hiss") soundin = pick('hiss1.ogg','hiss2.ogg','hiss3.ogg','hiss4.ogg') + if ("shatter") soundin = pick('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg') + if ("explosion") soundin = pick('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg') + if ("sparks") soundin = pick('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg') + if ("rustle") soundin = pick('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg') + if ("punch") soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') + if ("clownstep") soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') + if ("swing_hit") soundin = pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg') + if ("hiss") soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg') var/sound/S = sound(soundin) S.wait = 0 //No queue @@ -80,9 +80,9 @@ client/verb/Toggle_Soundscape() //All new ambience should be added here so it wo set name = "Toggle Ambience" usr:client:no_ambi = !usr:client:no_ambi if(usr:client:no_ambi) - usr << sound(pick('shipambience.ogg','ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg','ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg','ambimalf.ogg','ambispace.ogg','ambimine.ogg','title2.ogg'), repeat = 0, wait = 0, volume = 0, channel = 2) + usr << sound(pick('sound/ambience/shipambience.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/ambience/ambimalf.ogg','sound/ambience/ambispace.ogg','sound/ambience/ambimine.ogg','sound/ambience/title2.ogg'), repeat = 0, wait = 0, volume = 0, channel = 2) else - usr << sound(pick('shipambience.ogg','ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg','ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg','ambimalf.ogg','ambispace.ogg','ambimine.ogg','title2.ogg'), repeat = 1, wait = 0, volume = 35, channel = 2) + usr << sound(pick('sound/ambience/shipambience.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/ambience/ambimalf.ogg','sound/ambience/ambispace.ogg','sound/ambience/ambimine.ogg','sound/ambience/title2.ogg'), repeat = 1, wait = 0, volume = 35, channel = 2) usr << "Toggled ambience sound." return diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 8851ee5be5..c75a13022c 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -484,7 +484,7 @@ This method wont take into account storage items developed in the future and doe src.hacked = 1 return if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." diff --git a/code/game/turf.dm b/code/game/turf.dm index adc3efb03a..343fd5ada0 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -260,7 +260,7 @@ M.stop_pulling() step(M, M.dir) M << "\blue You slipped on the wet floor!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) else @@ -271,7 +271,7 @@ M.stop_pulling() step(M, M.dir) M << "\blue You slipped on the wet floor!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) else @@ -288,7 +288,7 @@ spawn(4) step(M, M.dir) M.take_organ_damage(2) // Was 5 -- TLE M << "\blue You slipped on the floor!" - playsound(src.loc, 'slip.ogg', 50, 1, -3) + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Weaken(10) ..() @@ -347,7 +347,7 @@ /turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0) if(istype(src,/turf/simulated/wall/r_wall)) if(!devastated) - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) new /obj/structure/girder/reinforced(src) new /obj/item/stack/sheet/plasteel( src ) else @@ -356,7 +356,7 @@ new /obj/item/stack/sheet/plasteel( src ) else if(istype(src,/turf/simulated/wall/cult)) if(!devastated) - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) new /obj/effect/decal/cleanable/blood(src) new /obj/structure/cultgirder(src) else @@ -365,7 +365,7 @@ else if(!devastated) - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) switch(mineral) if("metal") new /obj/structure/girder(src) @@ -525,7 +525,7 @@ return user << "\blue You push the wall but nothing happens!" - playsound(src.loc, 'Genhit.ogg', 25, 1) + playsound(src.loc, 'sound/weapons/Genhit.ogg', 25, 1) src.add_fingerprint(user) return @@ -556,7 +556,7 @@ EB.spark_system.start() user << "You slash \the [src] with \the [EB]; the thermite ignites!" playsound(src.loc, "sparks", 50, 1) - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) thermitemelt(user) return @@ -568,7 +568,7 @@ var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) user << "You begin slicing through the outer plating." - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall) || !user || !WT || !WT.isOn() || !T ) return @@ -583,7 +583,7 @@ else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) ) user << "You begin slicing through the outer plating." - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) sleep(60) if(mineral == "diamond")//Oh look, it's tougher @@ -629,7 +629,7 @@ if( user.loc == T && user.get_active_hand() == W ) EB.spark_system.start() playsound(src.loc, "sparks", 50, 1) - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) dismantle_wall(1) for(var/mob/O in viewers(user, 5)) O.show_message("The wall was sliced apart by [user]!", 1, "You hear metal being sliced apart and sparks flying.", 2) @@ -670,7 +670,7 @@ return user << "\blue You push the wall but nothing happens!" - playsound(src.loc, 'Genhit.ogg', 25, 1) + playsound(src.loc, 'sound/weapons/Genhit.ogg', 25, 1) src.add_fingerprint(user) return @@ -702,7 +702,7 @@ EB.spark_system.start() user << "You slash \the [src] with \the [EB]; the thermite ignites!" playsound(src.loc, "sparks", 50, 1) - playsound(src.loc, 'blade1.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) thermitemelt(user) return @@ -717,7 +717,7 @@ switch(d_state) if(0) if (istype(W, /obj/item/weapon/wirecutters)) - playsound(src.loc, 'Wirecutter.ogg', 100, 1) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) src.d_state = 1 src.icon_state = "r_wall-1" new /obj/item/stack/rods( src ) @@ -727,7 +727,7 @@ if(1) if (istype(W, /obj/item/weapon/screwdriver)) user << "You begin removing the support lines." - playsound(src.loc, 'Screwdriver.ogg', 100, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) sleep(40) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -757,7 +757,7 @@ if( WT.remove_fuel(0,user) ) user << "You begin slicing through the metal cover." - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) sleep(60) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T ) return @@ -773,7 +773,7 @@ if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) ) user << "You begin slicing through the metal cover." - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) sleep(40) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -788,7 +788,7 @@ if (istype(W, /obj/item/weapon/crowbar)) user << "You struggle to pry off the cover." - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -803,7 +803,7 @@ if (istype(W, /obj/item/weapon/wrench)) user << "You start loosening the anchoring bolts which secure the support rods to their frame." - playsound(src.loc, 'Ratchet.ogg', 100, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) sleep(40) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -820,7 +820,7 @@ if( WT.remove_fuel(0,user) ) user << "You begin slicing through the support rods." - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T ) return @@ -837,7 +837,7 @@ if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) ) user << "You begin slicing through the support rods." - playsound(src.loc, 'Welder.ogg', 100, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 100, 1) sleep(70) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -853,7 +853,7 @@ if( istype(W, /obj/item/weapon/crowbar) ) user << "You struggle to pry off the outer sheath." - playsound(src.loc, 'Crowbar.ogg', 100, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) sleep(100) if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return @@ -1294,7 +1294,7 @@ turf/simulated/floor/proc/update_icon() return if(istype(C, /obj/item/weapon/wrench)) user << "\blue Removing rods..." - playsound(src.loc, 'Ratchet.ogg', 80, 1) + playsound(src.loc, 'sound/items/Ratchet.ogg', 80, 1) if(do_after(user, 30)) new /obj/item/stack/rods(src, 2) ReplaceWithFloor() @@ -1513,7 +1513,7 @@ turf/simulated/floor/proc/update_icon() new floor_tile.type(src) make_plating() - playsound(src.loc, 'Crowbar.ogg', 80, 1) + playsound(src.loc, 'sound/items/Crowbar.ogg', 80, 1) return @@ -1526,7 +1526,7 @@ turf/simulated/floor/proc/update_icon() new floor_tile.type(src) make_plating() - playsound(src.loc, 'Screwdriver.ogg', 80, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 80, 1) return @@ -1537,7 +1537,7 @@ turf/simulated/floor/proc/update_icon() user << "\blue Reinforcing the floor..." if(do_after(user, 30) && R && R.amount >= 2 && is_plating()) ReplaceWithEngineFloor() - playsound(src.loc, 'Deconstruct.ogg', 80, 1) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 80, 1) R.use(2) return else @@ -1565,7 +1565,7 @@ turf/simulated/floor/proc/update_icon() T.use(1) update_icon() levelupdate() - playsound(src.loc, 'Genhit.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) else user << "\blue This section is too damaged to support a tile. Use a welder to fix the damage." @@ -1592,7 +1592,7 @@ turf/simulated/floor/proc/update_icon() if(broken || burnt) if(welder.remove_fuel(0,user)) user << "\red You fix some dents on the broken plating." - playsound(src.loc, 'Welder.ogg', 80, 1) + playsound(src.loc, 'sound/items/Welder.ogg', 80, 1) icon_state = "plating" burnt = 0 broken = 0 @@ -1649,7 +1649,7 @@ turf/simulated/floor/proc/update_icon() return var/obj/item/stack/rods/R = C user << "\blue Constructing support lattice ..." - playsound(src.loc, 'Genhit.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() R.use(1) return @@ -1659,7 +1659,7 @@ turf/simulated/floor/proc/update_icon() if(L) var/obj/item/stack/tile/plasteel/S = C del(L) - playsound(src.loc, 'Genhit.ogg', 50, 1) + playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) S.build(src) S.use(1) return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 4f8a88ef7c..5799aae991 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1929,7 +1929,7 @@ var/global/BSACooldown = 0 meteor_wave() message_admins("[key_name_admin(usr)] has spawned meteors", 1) command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") - world << sound('meteors.ogg') + world << sound('sound/AI/meteors.ogg') else alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null) return @@ -1937,7 +1937,7 @@ var/global/BSACooldown = 0 feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","GA") command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('granomalies.ogg') + world << sound('sound/AI/granomalies.ogg') var/turf/T = pick(blobstart) var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) spawn(rand(100, 600)) @@ -2057,7 +2057,7 @@ var/global/BSACooldown = 0 W.item_state = "w_suit" W.color = "schoolgirl" message_admins("[key_name_admin(usr)] activated Japanese Animes mode") - world << sound('animes.ogg') + world << sound('sound/AI/animes.ogg') else alert("You cannot perform this action. You must be of a higher administrative rank!") return @@ -2081,7 +2081,7 @@ var/global/BSACooldown = 0 var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No") if(show_log == "Yes") command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert") - world << sound('ionstorm.ogg') + world << sound('sound/AI/ionstorm.ogg') else alert("You cannot perform this action. You must be of a higher administrative rank!") return diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index c15d9a7e99..b815eb5923 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -3,7 +3,7 @@ if (!create_mob_html) var/mobjs = null mobjs = dd_list2text(typesof(/mob), ";") - create_mob_html = file2text('create_object.html') + create_mob_html = file2text('html/create_object.html') create_mob_html = dd_replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"") user << browse(dd_replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "window=create_mob;size=425x475") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 0e74f2cab5..008dc38256 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -4,7 +4,7 @@ if (!create_object_html) var/objectjs = null objectjs = dd_list2text(typesof(/obj), ";") - create_object_html = file2text('create_object.html') + create_object_html = file2text('html/create_object.html') create_object_html = dd_replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"") user << browse(dd_replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475") @@ -22,7 +22,7 @@ if (!quick_create_object_html) var/objectjs = null objectjs = dd_list2text(typesof(path), ";") - quick_create_object_html = file2text('create_object.html') + quick_create_object_html = file2text('html/create_object.html') quick_create_object_html = dd_replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"") user << browse(dd_replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=425x475") \ No newline at end of file diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index be5fdd1e0b..953f0c78a5 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -3,7 +3,7 @@ if (!create_turf_html) var/turfjs = null turfjs = dd_list2text(typesof(/turf), ";") - create_turf_html = file2text('create_object.html') + create_turf_html = file2text('html/create_object.html') create_turf_html = dd_replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") user << browse(dd_replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=425x475") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 5b5abd9ac2..8d73bec343 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -98,7 +98,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one. admin_number_afk++ if(X.sound_adminhelp) - X << 'adminhelp.ogg' + X << 'sound/effects/adminhelp.ogg' var/check_laws_text = "" if(ai_found) check_laws_text = (" (CL)") @@ -115,7 +115,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an", "monkey", "ali if( X.inactivity > AFK_THRESHOLD ) //When I made this, the AFK_THRESHOLD was 3000ds = 300s = 5m, see setup.dm for the new one. admin_number_afk++ if(X.sound_adminhelp) - X << 'adminhelp.ogg' + X << 'sound/effects/adminhelp.ogg' var/msg_to_send = "\blue HELP: [key_name(src, X)] (VV) (CA): [msg]" msg_to_send = dd_replacetext(msg_to_send, "HOLDERREF", "\ref[X.holder]") msg_to_send = dd_replacetext(msg_to_send, "ADMINREF", "\ref[X]") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 09ca719093..ba677c91b7 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -74,7 +74,7 @@ //play the recieving admin the adminhelp sound (if they have them enabled) if(C.sound_adminhelp) - C << 'adminhelp.ogg' + C << 'sound/effects/adminhelp.ogg' else if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT @@ -84,7 +84,7 @@ src << "Admin PM to-[key_name(C, src, 1)]: [msg]" //always play non-admin recipients the adminhelp sound - C << 'adminhelp.ogg' + C << 'sound/effects/adminhelp.ogg' //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn if(config.popup_admin_pm) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d2cdfbd9d6..733e6728fa 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -204,7 +204,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No") if(show_log == "Yes") command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert") - world << sound('ionstorm.ogg') + world << sound('sound/AI/ionstorm.ogg') IonStorm(0) feedback_add_details("admin_verb","ION") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -476,7 +476,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No") if(show_log == "Yes") command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert") - world << sound('ionstorm.ogg') + world << sound('sound/AI/ionstorm.ogg') feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list) @@ -529,7 +529,7 @@ Traitors and the like can also be revived with the previous role mostly intact. C.messagetitle.Add("Classified [command_name()] Update") C.messagetext.Add(P.info) - world << sound('commandreport.ogg') + world << sound('sound/AI/commandreport.ogg') log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report", 1) feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -792,7 +792,7 @@ Traitors and the like can also be revived with the previous role mostly intact. emergency_shuttle.incall() captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") - world << sound('shuttlecalled.ogg') + world << sound('sound/AI/shuttlecalled.ogg') feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-called the emergency shuttle.") message_admins("\blue [key_name_admin(usr)] admin-called the emergency shuttle.", 1) diff --git a/code/modules/chemical/Chemistry-Holder.dm b/code/modules/chemical/Chemistry-Holder.dm index bb2cd3ec93..42e3d21501 100644 --- a/code/modules/chemical/Chemistry-Holder.dm +++ b/code/modules/chemical/Chemistry-Holder.dm @@ -256,7 +256,7 @@ datum for(var/mob/M in viewers(4, get_turf(my_atom)) ) M << "\blue \icon[my_atom] The innards begin to boil!" - playsound(get_turf(my_atom), 'bubbles.ogg', 80, 1) + playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1) C.on_reaction(src, created_volume) reaction_occured = 1 diff --git a/code/modules/chemical/Chemistry-Machinery.dm b/code/modules/chemical/Chemistry-Machinery.dm index 52b7c7f723..c9f58c00a5 100644 --- a/code/modules/chemical/Chemistry-Machinery.dm +++ b/code/modules/chemical/Chemistry-Machinery.dm @@ -624,7 +624,7 @@ /obj/machinery/computer/pandemic/attackby(var/obj/I as obj, var/mob/user as mob) if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) user << "\blue The broken glass falls out." @@ -921,7 +921,7 @@ return if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume)) return - playsound(src.loc, 'juicer.ogg', 20, 1) + playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1) inuse = 1 spawn(50) inuse = 0 @@ -954,7 +954,7 @@ return if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume)) return - playsound(src.loc, 'blender.ogg', 50, 1) + playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) inuse = 1 spawn(60) inuse = 0 diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index b60085f7fc..770ae26640 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -362,7 +362,7 @@ datum var/datum/effect/system/bad_smoke_spread/S = new /datum/effect/system/bad_smoke_spread S.attach(location) S.set_up(10, 0, location) - playsound(location, 'smoke.ogg', 50, 1, -3) + playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) S.start() sleep(10) @@ -388,7 +388,7 @@ datum var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread S.attach(location) S.set_up(holder, 10, 0, location) - playsound(location, 'smoke.ogg', 50, 1, -3) + playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) spawn(0) S.start() sleep(10) @@ -685,7 +685,7 @@ datum var/turf/FROM = get_turf_loc(holder.my_atom) // the turf of origin we're travelling FROM var/turf/TO = get_turf_loc(chosen) // the turf of origin we're travelling TO - playsound(TO, 'phasein.ogg', 100, 1) + playsound(TO, 'sound/effects/phasein.ogg', 100, 1) var/list/flashers = list() for(var/mob/living/carbon/human/M in viewers(TO, null)) @@ -731,7 +731,7 @@ datum var/list/critters = typesof(/obj/effect/critter) - /obj/effect/critter // list of possible critters - playsound(get_turf_loc(holder.my_atom), 'phasein.ogg', 100, 1) + playsound(get_turf_loc(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/carbon/human/M in viewers(get_turf_loc(holder.my_atom), null)) if(M:eyecheck() <= 0) @@ -757,7 +757,7 @@ datum var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks // BORK BORK BORK - playsound(get_turf_loc(holder.my_atom), 'phasein.ogg', 100, 1) + playsound(get_turf_loc(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/carbon/human/M in viewers(get_turf_loc(holder.my_atom), null)) if(M:eyecheck() <= 0) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 57eb9daa99..48bfa32089 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -73,7 +73,7 @@ log_game("[key_name_admin(user)] used a grenade ([src.name]).") F.active = 1 F.icon_state = initial(icon_state) + "_active" - playsound(user.loc, 'armbomb.ogg', 75, 1, -3) + playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) spawn(15) F.prime() @@ -133,7 +133,7 @@ del(S) D.icon_state = "syringeproj" D.name = "syringe" - playsound(user.loc, 'syringeproj.ogg', 50, 1) + playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1) for(var/i=0, i<6, i++) if(!D) break @@ -899,7 +899,7 @@ return /obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob) - playsound(src.loc, 'pop.ogg', 50, 0) //Change the mode + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) //Change the mode if(mode == 1) mode = 2 charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes. @@ -1020,7 +1020,7 @@ return if(reagents) //Handle ingestion of the reagent. - playsound(M.loc,'eatfood.ogg', rand(10,50), 1) + playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1) if(reagents.total_volume) reagents.reaction(M, INGEST) spawn(5) @@ -1166,7 +1166,7 @@ spawn(5) reagents.trans_to(M, gulp_size) - playsound(M.loc,'drink.ogg', rand(10,50), 1) + playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) return 1 else if( istype(M, /mob/living/carbon/human) ) @@ -1194,7 +1194,7 @@ spawn(600) R.add_reagent(refill, fillevel) - playsound(M.loc,'drink.ogg', rand(10,50), 1) + playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) return 1 return 0 @@ -1863,7 +1863,7 @@ spawn(5) reagents.trans_to(M, 10) - playsound(M.loc,'drink.ogg', rand(10,50), 1) + playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) return 1 else if( istype(M, /mob/living/carbon/human) ) @@ -1884,7 +1884,7 @@ spawn(5) reagents.trans_to(M, 10) - playsound(M.loc,'drink.ogg', rand(10,50), 1) + playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) return 1 return 0 diff --git a/code/modules/critters/critter_defenses.dm b/code/modules/critters/critter_defenses.dm index 9175df53ff..5dcef77903 100644 --- a/code/modules/critters/critter_defenses.dm +++ b/code/modules/critters/critter_defenses.dm @@ -25,12 +25,12 @@ Contains the procs that control attacking critters if(istype(user, /mob/living/carbon/human)) for(var/mob/O in viewers(src, null)) O.show_message("\red [user] has punched [src]!", 1) - playsound(src.loc, pick('punch1.ogg','punch2.ogg','punch3.ogg','punch4.ogg'), 100, 1) + playsound(src.loc, pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'), 100, 1) else if(istype(user, /mob/living/carbon/alien/humanoid)) for(var/mob/O in viewers(src, null)) O.show_message("\red [user] has slashed at [src]!", 1) - playsound(src.loc, 'slice.ogg', 25, 1, -1) + playsound(src.loc, 'sound/weapons/slice.ogg', 25, 1, -1) else for(var/mob/O in viewers(src, null)) diff --git a/code/modules/critters/critters.dm b/code/modules/critters/critters.dm index 87d7d97f7e..a518b4729e 100644 --- a/code/modules/critters/critters.dm +++ b/code/modules/critters/critters.dm @@ -19,7 +19,7 @@ melee_damage_upper = 50 angertext = "runs" attacktext = "chomps" - attack_sound = 'bite.ogg' + attack_sound = 'sound/weapons/bite.ogg' /obj/effect/critter/roach @@ -93,7 +93,7 @@ melee_damage_upper = 8 angertext = "charges" attacktext = "hits" - attack_sound = 'genhit1.ogg' + attack_sound = 'sound/weapons/genhit1.ogg' var/obj/effect/blob/factory/factory = null New(loc, var/obj/effect/blob/factory/linked_node) @@ -148,7 +148,7 @@ melee_damage_lower = 10 melee_damage_upper = 15 attacktext = "cuts" - attack_sound = 'bladeslice.ogg' + attack_sound = 'sound/weapons/bladeslice.ogg' chasestate = "viscerator_attack" deathtext = "is smashed into pieces!" diff --git a/code/modules/critters/hivebots/hivebot.dm b/code/modules/critters/hivebots/hivebot.dm index c836755d62..91c07264b3 100644 --- a/code/modules/critters/hivebots/hivebot.dm +++ b/code/modules/critters/hivebots/hivebot.dm @@ -127,7 +127,7 @@ return var/obj/item/projectile/hivebotbullet/A = new /obj/item/projectile/hivebotbullet(user:loc) - playsound(user, 'Gunshot.ogg', 100, 1) + playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1) if(!A) return @@ -203,7 +203,7 @@ smoke.start() for(var/mob/O in viewers(src, null)) O.show_message("\red The [src] warps in!", 1) - playsound(src.loc, 'EMPulse.ogg', 25, 1) + playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1) if(auto_spawn) spawn(spawn_delay) turn_on = 1 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index a99a3b5c6e..00423435b7 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -110,35 +110,35 @@ mob/living/carbon/proc/handle_hallucinations() //Strange audio //src << "Strange Audio" switch(rand(1,12)) - if(1) src << 'airlock.ogg' + if(1) src << 'sound/machines/airlock.ogg' if(2) - if(prob(50))src << 'Explosion1.ogg' - else src << 'Explosion2.ogg' - if(3) src << 'explosionfar.ogg' - if(4) src << 'Glassbr1.ogg' - if(5) src << 'Glassbr2.ogg' - if(6) src << 'Glassbr3.ogg' - if(7) src << 'twobeep.ogg' - if(8) src << 'windowdoor.ogg' + if(prob(50))src << 'sound/effects/Explosion1.ogg' + else src << 'sound/effects/Explosion2.ogg' + if(3) src << 'sound/effects/explosionfar.ogg' + if(4) src << 'sound/effects/Glassbr1.ogg' + if(5) src << 'sound/effects/Glassbr2.ogg' + if(6) src << 'sound/effects/Glassbr3.ogg' + if(7) src << 'sound/machines/twobeep.ogg' + if(8) src << 'sound/machines/windowdoor.ogg' if(9) //To make it more realistic, I added two gunshots (enough to kill) - src << 'Gunshot.ogg' + src << 'sound/weapons/Gunshot.ogg' spawn(rand(10,30)) - src << 'Gunshot.ogg' - if(10) src << 'smash.ogg' + src << 'sound/weapons/Gunshot.ogg' + if(10) src << 'sound/weapons/smash.ogg' if(11) //Same as above, but with tasers. - src << 'Taser.ogg' + src << 'sound/weapons/Taser.ogg' spawn(rand(10,30)) - src << 'Taser.ogg' + src << 'sound/weapons/Taser.ogg' //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source - var/list/creepyasssounds = list('ghost.ogg', 'ghost2.ogg', 'Heart Beat.ogg', 'screech.ogg',\ - 'behind_you1.ogg', 'behind_you2.ogg', 'far_noise.ogg', 'growl1.ogg', 'growl2.ogg',\ - 'growl3.ogg', 'im_here1.ogg', 'im_here2.ogg', 'i_see_you1.ogg', 'i_see_you2.ogg',\ - 'look_up1.ogg', 'look_up2.ogg', 'over_here1.ogg', 'over_here2.ogg', 'over_here3.ogg',\ - 'turn_around1.ogg', 'turn_around2.ogg', 'veryfar_noise.ogg', 'wail.ogg') + var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/Heart Beat.ogg', 'sound/effects/screech.ogg',\ + 'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg',\ + 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ + 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ + 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') src << pick(creepyasssounds) if(66 to 70) //Flashes of danger @@ -299,7 +299,7 @@ proc/check_panel(mob/M) else if(prob(15)) if(weapon_name) - my_target << sound(pick('genhit1.ogg', 'genhit2.ogg', 'genhit3.ogg')) + my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')) my_target.show_message("\red [my_target] has been attacked with [weapon_name] by [src.name] ", 1) my_target.halloss += 8 if(prob(20)) my_target.eye_blurry += 3 @@ -307,7 +307,7 @@ proc/check_panel(mob/M) if(!locate(/obj/effect/overlay) in my_target.loc) fake_blood(my_target) else - my_target << sound(pick('punch1.ogg','punch2.ogg','punch3.ogg','punch4.ogg')) + my_target << sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')) my_target.show_message("\red [src.name] has punched [my_target]!", 1) my_target.halloss += 4 if(prob(33)) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index a30f41265d..4d59f34a49 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -134,7 +134,7 @@ proc/move_mining_shuttle() usr << "You fried the consoles ID checking system. It's now available to everyone!" else if(istype(W, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'Screwdriver.ogg', 50, 1) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/mining_shuttle/M = new /obj/item/weapon/circuitboard/mining_shuttle( A ) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 7f498d8b39..cd12abab01 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -221,7 +221,7 @@ return last_act = world.time user << "\red You start picking." - playsound(user, 'Genhit.ogg', 20, 1) + playsound(user, 'sound/weapons/Genhit.ogg', 20, 1) if(do_after(user,W:digspeed)) user << "\blue You finish cutting into the rock." @@ -339,7 +339,7 @@ return user << "\red You start digging." - playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better + playsound(src.loc, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better sleep(40) if ((user.loc == T && user.get_active_hand() == W)) @@ -356,7 +356,7 @@ return user << "\red You start digging." - playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better + playsound(src.loc, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better sleep(30) if ((user.loc == T && user.get_active_hand() == W)) @@ -373,7 +373,7 @@ return user << "\red You start digging." - playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better + playsound(src.loc, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better sleep(0) if ((user.loc == T && user.get_active_hand() == W)) diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 4a39d8f0fb..7f7f86d3a4 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -25,20 +25,20 @@ if (prob (49)) M.show_message("You hear muffled speech... but nothing is there...", 2) if(prob(20)) - playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) else M.show_message("You hear muffled speech... you can almost make out some words...", 2) // M.show_message("[stutter(message)]", 2) if(prob(30)) - playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) else if (prob(50)) return else if (prob (95)) M.show_message("You hear muffled speech... but nothing is there...", 2) if(prob(20)) - playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) else M.show_message("You hear muffled speech... you can almost make out some words...", 2) // M.show_message("[stutter(message)]", 2) - playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) \ No newline at end of file + playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/death.dm b/code/modules/mob/living/carbon/alien/humanoid/death.dm index 81f50f19f9..62324f7533 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/death.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/death.dm @@ -4,7 +4,7 @@ stat = DEAD if(!gibbed) - playsound(loc, 'hiss6.ogg', 80, 1, 1) + playsound(loc, 'sound/voice/hiss6.ogg', 80, 1, 1) for(var/mob/O in viewers(src, null)) O.show_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...", 1) update_canmove() diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index ece60729bf..99dcdcc701 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -103,9 +103,9 @@ if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") if (act == "roar") - playsound(src.loc, 'hiss5.ogg', 40, 1, 1) + playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1) if (act == "deathgasp") - playsound(src.loc, 'hiss6.ogg', 80, 1, 1) + playsound(src.loc, 'sound/voice/hiss6.ogg', 80, 1, 1) if (m_type & 1) for(var/mob/O in viewers(src, null)) O.show_message(message, m_type) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index da379ee047..368d3c5fbe 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -259,7 +259,7 @@ if (istype(wear_mask, /obj/item/clothing/mask/muzzle)) return if (health > 0) - playsound(loc, 'bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [M.name] has bit [src]!"), 1) @@ -406,7 +406,7 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) @@ -433,7 +433,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to punch []!", M, src), 1) @@ -442,19 +442,19 @@ if (!lying) if (prob(5))//Very small chance to push an alien down. Weaken(2) - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has pushed down []!", M, src), 1) else if (prob(50)) drop_item() - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has disarmed []!", M, src), 1) else - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to disarm []!", M, src), 1) @@ -490,7 +490,7 @@ In all, this is a lot like the monkey code. /N else if (health > 0) - playsound(loc, 'bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) var/damage = rand(1, 3) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 0965271961..2ed51a4148 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -268,7 +268,7 @@ if (istype(wear_mask, /obj/item/clothing/mask/muzzle)) return if (health > 0) - playsound(loc, 'bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [M.name] has bit [src]!"), 1) @@ -370,7 +370,7 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) @@ -397,7 +397,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to punch []!", M, src), 1) @@ -428,7 +428,7 @@ else if (health > 0) - playsound(loc, 'bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) var/damage = rand(1, 3) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 795b730481..4c5728d2fe 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -30,7 +30,7 @@ for(var/mob/M in viewers(user, null)) if(M.client) M.show_message(text("\red [user] attacks [src]'s stomach wall with the [I.name]!"), 2) - playsound(user.loc, 'attackblob.ogg', 50, 1) + playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1) if(prob(src.getBruteLoss() - 50)) for(var/atom/movable/A in stomach_contents) @@ -229,7 +229,7 @@ AdjustParalysis(-3) AdjustStunned(-3) AdjustWeakened(-3) - playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) M.visible_message( \ "\blue [M] shakes [src] trying to wake [t_him] up!", \ "\blue You shake [src] trying to wake [t_him] up!", \ diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm index a3ae787976..9a7c185e0d 100644 --- a/code/modules/mob/living/carbon/human/human_attackalien.dm +++ b/code/modules/mob/living/carbon/human/human_attackalien.dm @@ -22,7 +22,7 @@ G.synch() LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) @@ -32,13 +32,13 @@ w_uniform.add_fingerprint(M) var/damage = rand(15, 30) if(!damage) - playsound(loc, 'slashmiss.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1) visible_message("\red [M] has lunged at [src]!") return 0 var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting)) var/armor_block = run_armor_check(affecting, "melee") - playsound(loc, 'slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) visible_message("\red [M] has slashed at [src]!") apply_damage(damage, BRUTE, affecting, armor_block) @@ -50,20 +50,20 @@ if("disarm") var/randn = rand(1, 100) if (randn <= 90) - playsound(loc, 'pierce.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) Weaken(rand(10,15)) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has tackled down []!", M, src), 1) else if (randn <= 99) - playsound(loc, 'slash.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) drop_item() for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] disarmed []!", M, src), 1) else - playsound(loc, 'slashmiss.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has tried to disarm []!", M, src), 1) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 26c17b993a..631dec544c 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -36,7 +36,7 @@ var/damage = rand(0, 9) if(!damage) - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message("\red [M] has attempted to punch [src]!") return 0 var/datum/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting)) @@ -95,7 +95,7 @@ G.synch() LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) visible_message("\red [M] has grabbed [src] passively!") return 1 @@ -141,9 +141,9 @@ if(!damage) switch(attack_verb) if("slash") - playsound(loc, 'slashmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) else - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message("\red [M] has attempted to [attack_verb] [src]!") return 0 @@ -157,7 +157,7 @@ switch(attack_verb) if("slash") - playsound(loc, 'slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) else playsound(loc, "punch", 25, 1, -1) @@ -182,7 +182,7 @@ var/randn = rand(1, 100) if (randn <= 25) apply_effect(2, WEAKEN, run_armor_check(affecting, "melee")) - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) visible_message("\red [M] has pushed [src]!") return @@ -215,11 +215,11 @@ if(!talked) //BubbleWrap drop_item() visible_message("\red [M] has disarmed [src]!") - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) visible_message("\red [M] attempted to disarm [src]!") return diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index aaf4c1ba9f..7b8d43d392 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1118,7 +1118,7 @@ for(var/mob/O in viewers(world.view, src)) O.show_message(text("\red [] throws up!", src), 1) - playsound(loc, 'splat.ogg', 50, 1) + playsound(loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = loc if (istype(location, /turf/simulated)) diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 214d756862..655acae352 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -343,7 +343,7 @@ return if (health > 0) attacked += 10 - playsound(loc, 'bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [M.name] has bit [src]!"), 1) @@ -369,13 +369,13 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message("\red [M] attempts to wrestle \the [name] off!", 1) - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message("\red [M] manages to wrestle \the [name] off!", 1) - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(prob(90) && !client) Discipline++ @@ -397,13 +397,13 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message("\red [M] attempts to wrestle \the [name] off of [Victim]!", 1) - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message("\red [M] manages to wrestle \the [name] off of [Victim]!", 1) - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(prob(80) && !client) Discipline++ @@ -460,7 +460,7 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) @@ -502,7 +502,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to punch []!", M, src), 1) @@ -529,7 +529,7 @@ if ((prob(95) && health > 0)) attacked += 10 - playsound(loc, 'slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) var/damage = rand(15, 30) if (damage >= 25) damage = rand(20, 40) @@ -543,7 +543,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'slashmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to lunge at [name]!", M), 1) @@ -562,12 +562,12 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has grabbed [name] passively!", M), 1) if ("disarm") - playsound(loc, 'pierce.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) var/damage = 5 attacked += 10 diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 53e681497b..7267826122 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -136,7 +136,7 @@ else if ((M.a_intent == "hurt" && !( istype(wear_mask, /obj/item/clothing/mask/muzzle) ))) if ((prob(75) && health > 0)) - playsound(loc, 'bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) O.show_message("\red [M.name] has bit [name]!", 1) var/damage = rand(1, 5) @@ -201,7 +201,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to punch [name]!", M), 1) @@ -221,20 +221,20 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has grabbed [name] passively!", M), 1) else if (!( paralysis )) if (prob(25)) Paralyse(2) - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has pushed down [name]!", M), 1) else drop_item() - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has disarmed [name]!", M), 1) @@ -257,7 +257,7 @@ if ("hurt") if ((prob(95) && health > 0)) - playsound(loc, 'slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) var/damage = rand(15, 30) if (damage >= 25) damage = rand(20, 40) @@ -273,7 +273,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'slashmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has attempted to lunge at [name]!", M), 1) @@ -292,12 +292,12 @@ LAssailant = M - playsound(loc, 'thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has grabbed [name] passively!", M), 1) if ("disarm") - playsound(loc, 'pierce.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) var/damage = 5 if(prob(95)) Weaken(rand(10,15)) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index d77c8d4fac..1d27a12865 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -320,7 +320,7 @@ else //harm var/damage = rand(10, 20) if (prob(90)) - playsound(loc, 'slash.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has slashed at []!", M, src), 1) @@ -329,7 +329,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'slashmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] took a swipe at []!", M, src), 1) diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index 6cac153e2c..d0dd0f6d3d 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -40,7 +40,7 @@ log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.") message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1) captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") - world << sound('shuttlecalled.ogg') + world << sound('sound/AI/shuttlecalled.ogg') if(explosive) spawn(10) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index c864d24a29..9d09e48fcf 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -19,7 +19,7 @@ /mob/living/silicon/pai/Login() ..() - usr << browse_rsc('paigrid.png') // Go ahead and cache the interface resources as early as possible + usr << browse_rsc('html/paigrid.png') // Go ahead and cache the interface resources as early as possible /mob/living/silicon/pai/Stat() @@ -142,7 +142,7 @@ else //harm var/damage = rand(10, 20) if (prob(90)) - playsound(src.loc, 'slash.ogg', 25, 1, -1) + playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] has slashed at []!", M, src), 1) @@ -151,7 +151,7 @@ src.adjustBruteLoss(damage) src.updatehealth() else - playsound(src.loc, 'slashmiss.ogg', 25, 1, -1) + playsound(src.loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("\red [] took a swipe at []!", M, src), 1) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index a0ea74386e..8f15787262 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -75,7 +75,7 @@