diff --git a/_maps/map_files/triumph/triumph-02-deck2.dmm b/_maps/map_files/triumph/triumph-02-deck2.dmm index cf59022e6f8..63d9c03e6d1 100644 --- a/_maps/map_files/triumph/triumph-02-deck2.dmm +++ b/_maps/map_files/triumph/triumph-02-deck2.dmm @@ -3640,7 +3640,7 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "kj" = ( -/obj/machinery/appliance/grill, +/obj/machinery/appliance/cooker/grill, /obj/machinery/light{ dir = 1 }, diff --git a/_maps/map_files/triumph/triumph-05-flagship.dmm b/_maps/map_files/triumph/triumph-05-flagship.dmm index 7033a647dd9..0828980a053 100644 --- a/_maps/map_files/triumph/triumph-05-flagship.dmm +++ b/_maps/map_files/triumph/triumph-05-flagship.dmm @@ -4103,7 +4103,7 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/machinery/appliance/grill, +/obj/machinery/appliance/cooker/grill, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -15233,7 +15233,7 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/machinery/appliance/grill, +/obj/machinery/appliance/cooker/grill, /turf/unsimulated/floor/steel{ icon_state = "white" }, diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index d86cf42f975..aab1ee585c9 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -72,7 +72,9 @@ // Restricted, military, or mercenary aligned locations like the armory, the merc ship/base, BSD, etc. #define AMBIENCE_HIGHSEC list(\ 'sound/ambience/highsec/highsec1.ogg',\ - 'sound/ambience/highsec/highsec2.ogg'\ + 'sound/ambience/highsec/highsec2.ogg',\ + 'sound/ambience/highsec/highsec3.ogg',\ + 'sound/ambience/highsec/highsec4.ogg'\ ) // Ruined structures found on the surface or in the caves. @@ -111,13 +113,20 @@ 'sound/ambience/generic/generic1.ogg',\ 'sound/ambience/generic/generic2.ogg',\ 'sound/ambience/generic/generic3.ogg',\ - 'sound/ambience/generic/generic4.ogg'\ + 'sound/ambience/generic/generic3.ogg'\ ) +// 'sound/ambience/generic/generic4.ogg'\ // VOREStation Edit: Comment out entry 4 as this doesn't fit on Virgo, and we have our own weather system. + // Sounds of PA announcements, presumably involving shuttles? #define AMBIENCE_ARRIVALS list(\ 'sound/ambience/arrivals/arrivals1.ogg',\ - 'sound/ambience/arrivals/arrivals2.ogg'\ + 'sound/ambience/arrivals/arrivals2.ogg',\ + 'sound/ambience/arrivals/arrivals3.ogg',\ + 'sound/ambience/arrivals/arrivals4.ogg',\ + 'sound/ambience/arrivals/arrivals5.ogg',\ + 'sound/ambience/arrivals/arrivals6.ogg',\ + 'sound/ambience/arrivals/arrivals7.ogg'\ ) // Sounds suitable for being inside dark, tight corridors in the underbelly of the station. @@ -127,7 +136,10 @@ 'sound/ambience/maintenance/maintenance3.ogg',\ 'sound/ambience/maintenance/maintenance4.ogg',\ 'sound/ambience/maintenance/maintenance5.ogg',\ - 'sound/ambience/maintenance/maintenance6.ogg'\ + 'sound/ambience/maintenance/maintenance6.ogg',\ + 'sound/ambience/maintenance/maintenance7.ogg',\ + 'sound/ambience/maintenance/maintenance8.ogg',\ + 'sound/ambience/maintenance/maintenance9.ogg'\ ) // Life support machinery at work, keeping everyone breathing. @@ -139,7 +151,9 @@ // Creepy AI/borg stuff. #define AMBIENCE_AI list(\ - 'sound/ambience/ai/ai1.ogg'\ + 'sound/ambience/ai/ai1.ogg',\ + 'sound/ambience/ai/ai2.ogg',\ + 'sound/ambience/ai/ai3.ogg'\ ) // Peaceful sounds when floating in the void. @@ -175,11 +189,6 @@ 'sound/ambience/unholy/unholy1.ogg'\ ) -// For the memes. -#define AMBIENCE_AESTHETIC list(\ - 'sound/ambience/vaporwave.ogg'\ - ) - // Explosion sounds #define EXPLOSION_CREAKING list(\ 'sound/effects/explosioncreak1.ogg',\ @@ -190,4 +199,37 @@ 'sound/effects/creak1.ogg',\ 'sound/effects/creak2.ogg',\ 'sound/effects/creak3.ogg'\ - ) \ No newline at end of file + ) + +// For the memes. +#define AMBIENCE_AESTHETIC list(\ + 'sound/ambience/vaporwave.ogg'\ + ) + +#define AMBIENCE_OUTPOST list(\ + 'sound/ambience/expoutpost/expoutpost1.ogg',\ + 'sound/ambience/expoutpost/expoutpost2.ogg',\ + 'sound/ambience/expoutpost/expoutpost3.ogg',\ + 'sound/ambience/expoutpost/expoutpost4.ogg'\ + ) + +#define AMBIENCE_SUBSTATION list(\ + 'sound/ambience/substation/substation1.ogg',\ + 'sound/ambience/substation/substation2.ogg'\ + ) + +#define AMBIENCE_HANGAR list(\ + 'sound/ambience/hangar/hangar1.ogg',\ + 'sound/ambience/hangar/hangar2.ogg',\ + 'sound/ambience/hangar/hangar3.ogg',\ + 'sound/ambience/hangar/hangar4.ogg',\ + 'sound/ambience/hangar/hangar5.ogg',\ + 'sound/ambience/hangar/hangar6.ogg'\ + ) + +#define AMBIENCE_ATMOS list(\ + 'sound/ambience/engineering/engineering1.ogg',\ + 'sound/ambience/engineering/engineering2.ogg',\ + 'sound/ambience/engineering/engineering3.ogg',\ + 'sound/ambience/atmospherics/atmospherics1.ogg'\ + diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 1e40b5e9c75..62cbf31faae 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -86,6 +86,7 @@ SUBSYSTEM_DEF(ticker) send2irc("Server lobby is loaded and open at byond://[config_legacy.serverurl ? config_legacy.serverurl : (config_legacy.server ? config_legacy.server : "[world.address]:[world.port]")]") to_chat(world, "Welcome to the pregame lobby!") to_chat(world, "Please set up your character and select ready. The round will start in [CONFIG_GET(number/lobby_countdown)] seconds.") + world << sound('sound/misc/server-ready.ogg', volume = 100) current_state = GAME_STATE_PREGAME if(Master.initializations_finished_with_no_players_logged_in) start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 411cf2b7bae..f57eab32059 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -28,6 +28,8 @@ var/volume = 100 var/max_loops var/direct + var/vary + var/extra_range var/opacity_check var/pref_check var/soundenvdry @@ -91,7 +93,7 @@ continue SEND_SOUND(thing, S) else - playsound(thing, S, volume, ignore_walls = !opacity_check, preference = pref_check, soundenvdry = soundenvdry, soundenvwet = soundenvwet) + playsound(thing, S, volume, vary, extra_range, ignore_walls = !opacity_check, preference = pref_check) /datum/looping_sound/proc/get_sound(starttime, _mid_sounds) if(!_mid_sounds) @@ -110,4 +112,4 @@ /datum/looping_sound/proc/on_stop() if(end_sound) - play(end_sound) \ No newline at end of file + play(end_sound) diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index 27a60121747..aee8a07408d 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -9,9 +9,10 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /datum/looping_sound/supermatter - mid_sounds = list('sound/machines/sm/supermatter1.ogg'=1,'sound/machines/sm/supermatter2.ogg'=1,'sound/machines/sm/supermatter3.ogg'=1) - mid_length = 10 - volume = 1 + mid_sounds = list('sound/machines/sm/loops/calm.ogg'=1) + mid_length = 60 + volume = 40 + extra_range = 10 pref_check = /datum/client_preference/supermatter_hum /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -28,25 +29,72 @@ /datum/looping_sound/deep_fryer - start_sound = 'sound/machines/fryer/deep_fryer_immerse.ogg' //my immersions + start_sound = 'sound/machines/kitchen/fryer/deep_fryer_immerse.ogg' //my immersions start_length = 10 - mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1) + mid_sounds = list('sound/machines/kitchen/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1) mid_length = 2 - end_sound = 'sound/machines/fryer/deep_fryer_emerge.ogg' + end_sound = 'sound/machines/kitchen/fryer/deep_fryer_emerge.ogg' volume = 15 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /datum/looping_sound/microwave - start_sound = 'sound/machines/microwave/microwave-start.ogg' + start_sound = 'sound/machines/kitchen/microwave/microwave-start.ogg' start_length = 10 - mid_sounds = list('sound/machines/microwave/microwave-mid1.ogg'=10, 'sound/machines/microwave/microwave-mid2.ogg'=1) + mid_sounds = list('sound/machines/kitchen/microwave/microwave-mid1.ogg'=10, 'sound/machines/kitchen/microwave/microwave-mid2.ogg'=1) mid_length = 10 - end_sound = 'sound/machines/microwave/microwave-end.ogg' + end_sound = 'sound/machines/kitchen/microwave/microwave-end.ogg' volume = 90 +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/datum/looping_sound/oven + start_sound = 'sound/machines/kitchen/oven/oven-start.ogg' + start_length = 10 + mid_sounds = list('sound/machines/kitchen/oven/oven-mid1.ogg'=10) + mid_length = 40 + end_sound = 'sound/machines/kitchen/oven/oven-stop.ogg' + volume = 50 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/datum/looping_sound/grill + start_sound = 'sound/machines/kitchen/grill/grill-start.ogg' + start_length = 10 + mid_sounds = list('sound/machines/kitchen/grill/grill-mid1.ogg'=10) + mid_length = 40 + end_sound = 'sound/machines/kitchen/grill/grill-stop.ogg' + volume = 50 + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/looping_sound/mixer + start_sound = 'sound/machines/kitchen/mixer/mixer-start.ogg' + start_length = 10 + mid_sounds = list('sound/machines/kitchen/mixer/mixer-mid1.ogg'=10) + mid_length = 10 + end_sound = 'sound/machines/kitchen/mixer/mixer-stop.ogg' + volume = 50 + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/looping_sound/cerealmaker + start_sound = 'sound/machines/kitchen/cerealmaker/cerealmaker-start.ogg' + start_length = 10 + mid_sounds = list('sound/machines/kitchen/cerealmaker/cerealmaker-mid1.ogg'=10) + mid_length = 60 + end_sound = 'sound/machines/kitchen/cerealmaker/cerealmaker-stop.ogg' + volume = 50 + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/looping_sound/candymaker + start_sound = 'sound/machines/kitchen/candymaker/candymaker-start.ogg' + start_length = 10 + mid_sounds = list('sound/machines/kitchen/candymaker/candymaker-mid1.ogg'=10) + mid_length = 40 + end_sound = 'sound/machines/kitchen/candymaker/candymaker-stop.ogg' + volume = 20 + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /datum/looping_sound/air_pump start_sound = 'sound/machines/air_pump/airpumpstart.ogg' start_length = 10 @@ -54,4 +102,4 @@ mid_length = 4 end_sound = 'sound/machines/air_pump/airpumpshutdown.ogg' volume = 15 - pref_check = /datum/client_preference/air_pump_noise \ No newline at end of file + pref_check = /datum/client_preference/air_pump_noise diff --git a/code/defines/obj.dm b/code/defines/obj.dm index d5ed5c5bb21..b8f750c2028 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -222,6 +222,8 @@ var/global/list/PDA_Manifest = list() throwforce = 0.0 throw_speed = 1 throw_range = 20 + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' afterattack(atom/target as mob|obj|turf|area, mob/user as mob) user.drop_item() diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 12230c6fcae..ae15adec3f0 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -203,6 +203,8 @@ /obj/item/disk name = "disk" icon = 'icons/obj/items.dmi' + drop_sound = 'sound/items/drop/disk.ogg' + pickup_sound = 'sound/items/pickup/disk.ogg' /obj/item/disk/nuclear name = "nuclear authentication disk" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index e9b5560a940..5f631a4e003 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -275,6 +275,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/centcom/bathroom name = "\improper CentCom Bathroom" icon_state = "centcom_crew" + sound_env = SMALL_ENCLOSED //SYNDICATES @@ -723,6 +724,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Substation" icon_state = "substation" sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_SUBSTATION /area/maintenance/substation/engineering // Probably will be connected to engineering SMES room, as wires cannot be crossed properly without them sharing powernets. name = "Engineering Substation" @@ -1211,6 +1213,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/recreation_area_restroom name = "\improper Recreation Area Restroom" icon_state = "recreation_area_restroom" + sound_env = SMALL_ENCLOSED /area/crew_quarters/pool name = "\improper Pool" @@ -1236,6 +1239,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/barrestroom name = "\improper Cafeteria Restroom" icon_state = "bar" + sound_env = SMALL_ENCLOSED /area/crew_quarters/theatre name = "\improper Theatre" @@ -1389,9 +1393,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station ambience = AMBIENCE_ENGINEERING /area/engineering/atmos - name = "\improper Atmospherics" - icon_state = "atmos" - sound_env = LARGE_ENCLOSED + name = "\improper Atmospherics" + icon_state = "atmos" + sound_env = LARGE_ENCLOSED + ambience = AMBIENCE_ATMOS + ) /area/engineering/atmos/monitoring name = "\improper Atmospherics Monitoring Room" @@ -1613,6 +1619,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/medical_restroom name = "\improper Medbay Restroom" icon_state = "medbay_restroom" + ambience = AMBIENCE_ATMOS + ) /area/medical/patients_rooms name = "\improper Patient's Rooms" @@ -1803,6 +1811,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/security_bathroom name = "\improper Security - Restroom" icon_state = "security_bathroom" + sound_env = SMALL_ENCLOSED /area/security/security_cell_hallway name = "\improper Security - Cell Hallway" @@ -1949,6 +1958,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/research_restroom name = "\improper Research Restroom" icon_state = "research_restroom" + sound_env = SMALL_ENCLOSED /area/rnd/research_storage name = "\improper Research Storage" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index bb922aa5079..7491a093ff1 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -7,6 +7,8 @@ force = 30 throwforce = 10 hitsound = 'sound/weapons/bladeslice.ogg' + drop_sound = 'sound/items/drop/sword.ogg' + pickup_sound = 'sound/items/pickup/sword.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") edge = 1 sharp = 1 diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 9579dd45500..5bd8b9565b9 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -60,6 +60,7 @@ M.forceMove(src) occupant = M update_icon() //icon_state = "body_scanner_1" //VOREStation Edit - Health display for consoles with light and such. + playsound(src, 'sound/machines/medbayscanner1.ogg', 50) // Beepboop you're being scanned. <3 add_fingerprint(user) qdel(G) if(!occupant) @@ -103,6 +104,7 @@ O.forceMove(src) occupant = O update_icon() //icon_state = "body_scanner_1" //VOREStation Edit - Health display for consoles with light and such. + playsound(src, 'sound/machines/medbayscanner1.ogg', 50) // Beepboop you're being scanned. <3 add_fingerprint(user) /obj/machinery/bodyscanner/relaymove(mob/user as mob) @@ -418,6 +420,7 @@ if (!(printing) && printing_text) printing = 1 visible_message("\The [src] rattles and prints out a sheet of paper.") + playsound(src, 'sound/machines/printer.ogg', 50, 1) var/obj/item/paper/P = new /obj/item/paper(loc) P.info = "
Body Scan - [href_list["name"]]

" P.info += "Time of scan: [worldtime2stationtime(world.time)]

" diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index a4d7e601df5..60ef87816d1 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -361,7 +361,7 @@ state("Invalid parameters.") else ping("Simulation complete!") - playsound(loc, "sound/effects/printer.ogg", 50, 1) + playsound(src, "sound/machines/printer.ogg", 50, 1) var/obj/item/paper/P = new(get_turf(src)) P.name = "Explosive Simulator printout" P.info = simulation_results diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index e7839e6b9eb..a88d9c8f4c3 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -209,7 +209,7 @@ return else if((occupant.health >= heal_level || occupant.health == occupant.getMaxHealth()) && (!eject_wait)) - playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + playsound(src, 'sound/machines/medbayscanner1.ogg', 50, 1) audible_message("\The [src] signals that the cloning process is complete.") connected_message("Cloning Process Complete.") locked = 0 diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6624d86e615..5b08eb949ae 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -260,6 +260,7 @@ temp = "Error: Unable to initiate cloning cycle." else if(pod.growclone(C)) temp = "Initiating cloning cycle..." + playsound(src, 'sound/machines/medbayscanner1.ogg', 100, 1) records.Remove(C) qdel(C) menu = 1 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 5ae3f03767c..42cabf8161f 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -39,9 +39,9 @@ var/secured_wires = 0 var/datum/wires/airlock/wires = null - var/open_sound_powered = 'sound/machines/airlock.ogg' + var/open_sound_powered = 'sound/machines/door/covert1o.ogg' var/open_sound_unpowered = 'sound/machines/airlockforced.ogg' - var/close_sound_powered = 'sound/machines/airlockclose.ogg' + var/close_sound_powered = 'sound/machines/door/covert1c.ogg' var/denied_sound = 'sound/machines/deniedbeep.ogg' var/bolt_up_sound = 'sound/machines/boltsup.ogg' var/bolt_down_sound = 'sound/machines/boltsdown.ogg' @@ -115,40 +115,54 @@ icon = 'icons/obj/doors/Doorcom.dmi' req_one_access = list(access_heads) assembly_type = /obj/structure/door_assembly/door_assembly_com + open_sound_powered = 'sound/machines/door/cmd3o.ogg' + close_sound_powered = 'sound/machines/door/cmd3c.ogg' /obj/machinery/door/airlock/security name = "Security Airlock" icon = 'icons/obj/doors/Doorsec.dmi' req_one_access = list(access_security) assembly_type = /obj/structure/door_assembly/door_assembly_sec + open_sound_powered = 'sound/machines/door/sec1o.ogg' + close_sound_powered = 'sound/machines/door/sec1c.ogg' /obj/machinery/door/airlock/engineering name = "Engineering Airlock" icon = 'icons/obj/doors/Dooreng.dmi' req_one_access = list(access_engine) assembly_type = /obj/structure/door_assembly/door_assembly_eng + open_sound_powered = 'sound/machines/door/eng1o.ogg' + close_sound_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/engineeringatmos name = "Atmospherics Airlock" icon = 'icons/obj/doors/Doorengatmos.dmi' req_one_access = list(access_atmospherics) assembly_type = /obj/structure/door_assembly/door_assembly_eat + open_sound_powered = 'sound/machines/door/eng1o.ogg' + close_sound_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/medical name = "Medical Airlock" icon = 'icons/obj/doors/Doormed.dmi' req_one_access = list(access_medical) assembly_type = /obj/structure/door_assembly/door_assembly_med + open_sound_powered = 'sound/machines/door/med1o.ogg' + close_sound_powered = 'sound/machines/door/med1c.ogg' /obj/machinery/door/airlock/maintenance name = "Maintenance Access" icon = 'icons/obj/doors/Doormaint.dmi' //req_one_access = list(access_maint_tunnels) //VOREStation Edit - Maintenance is open access assembly_type = /obj/structure/door_assembly/door_assembly_mai + open_sound_powered = 'sound/machines/door/door2o.ogg' + close_sound_powered = 'sound/machines/door/door2c.ogg' /obj/machinery/door/airlock/maintenance/cargo icon = 'icons/obj/doors/Doormaint_cargo.dmi' req_one_access = list(access_cargo) + open_sound_powered = 'sound/machines/door/door2o.ogg' + close_sound_powered = 'sound/machines/door/door2c.ogg' /obj/machinery/door/airlock/maintenance/command icon = 'icons/obj/doors/Doormaint_command.dmi' @@ -156,6 +170,8 @@ /obj/machinery/door/airlock/maintenance/common icon = 'icons/obj/doors/Doormaint_common.dmi' + open_sound_powered = 'sound/machines/door/hall3o.ogg' + close_sound_powered = 'sound/machines/door/hall3c.ogg' /obj/machinery/door/airlock/maintenance/engi icon = 'icons/obj/doors/Doormaint_engi.dmi' @@ -180,6 +196,8 @@ name = "External Airlock" icon = 'icons/obj/doors/Doorext.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_ext + open_sound_powered = 'sound/machines/door/space1o.ogg' + close_sound_powered = 'sound/machines/door/space1c.ogg' /obj/machinery/door/airlock/external/glass/bolted icon_state = "door_locked" // So it looks visibly bolted in map editor @@ -196,12 +214,15 @@ opacity = 0 glass = 1 req_one_access = list(access_external_airlocks) + open_sound_powered = 'sound/machines/door/space1o.ogg' + close_sound_powered = 'sound/machines/door/space1c.ogg' /obj/machinery/door/airlock/glass name = "Glass Airlock" icon = 'icons/obj/doors/Doorglass.dmi' hitsound = 'sound/effects/Glasshit.ogg' - open_sound_powered = 'sound/machines/windowdoor.ogg' + open_sound_powered = 'sound/machines/door/hall1o.ogg' + close_sound_powered = 'sound/machines/door/hall1c.ogg' maxhealth = 300 explosion_resistance = 5 opacity = 0 @@ -212,12 +233,16 @@ icon = 'icons/obj/doors/Doorele.dmi' req_one_access = list(access_cent_general) opacity = 1 + open_sound_powered = 'sound/machines/door/cmd3o.ogg' + close_sound_powered = 'sound/machines/door/cmd3c.ogg' /obj/machinery/door/airlock/glass_centcom name = "Airlock" icon = 'icons/obj/doors/Dooreleglass.dmi' opacity = 0 glass = 1 + open_sound_powered = 'sound/machines/door/cmd3o.ogg' + close_sound_powered = 'sound/machines/door/cmd3c.ogg' /obj/machinery/door/airlock/vault name = "Vault" @@ -227,6 +252,8 @@ secured_wires = 1 assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites. req_one_access = list(access_heads_vault) + open_sound_powered = 'sound/machines/door/vault1o.ogg' + close_sound_powered = 'sound/machines/door/vault1c.ogg' /obj/machinery/door/airlock/vault/bolted icon_state = "door_locked" @@ -245,6 +272,9 @@ opacity = 1 assembly_type = /obj/structure/door_assembly/door_assembly_hatch req_one_access = list(access_maint_tunnels) + open_sound_powered = 'sound/machines/door/hatchopen.ogg' + close_sound_powered = 'sound/machines/door/hatchclose.ogg' + open_sound_unpowered = 'sound/machines/door/hatchforced.ogg' /obj/machinery/door/airlock/maintenance_hatch name = "Maintenance Hatch" @@ -253,6 +283,9 @@ opacity = 1 assembly_type = /obj/structure/door_assembly/door_assembly_mhatch req_one_access = list(access_maint_tunnels) + open_sound_powered = 'sound/machines/door/hatchopen.ogg' + close_sound_powered = 'sound/machines/door/hatchclose.ogg' + open_sound_unpowered = 'sound/machines/door/hatchforced.ogg' /obj/machinery/door/airlock/glass_command name = "Command Airlock" @@ -264,6 +297,9 @@ assembly_type = /obj/structure/door_assembly/door_assembly_com glass = 1 req_one_access = list(access_heads) + open_sound_powered = 'sound/machines/door/cmd1o.ogg' + close_sound_powered = 'sound/machines/door/cmd1c.ogg' + /obj/machinery/door/airlock/glass_engineering name = "Engineering Airlock" @@ -275,6 +311,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_eng glass = 1 req_one_access = list(access_engine) + open_sound_powered = 'sound/machines/door/eng1o.ogg' + close_sound_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/glass_engineeringatmos name = "Atmospherics Airlock" @@ -286,6 +324,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_eat glass = 1 req_one_access = list(access_atmospherics) + open_sound_powered = 'sound/machines/door/eng1o.ogg' + close_sound_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/glass_security name = "Security Airlock" @@ -297,6 +337,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_sec glass = 1 req_one_access = list(access_security) + open_sound_powered = 'sound/machines/door/sec1o.ogg' + close_sound_powered = 'sound/machines/door/sec1c.ogg' /obj/machinery/door/airlock/glass_medical name = "Medical Airlock" @@ -308,23 +350,31 @@ assembly_type = /obj/structure/door_assembly/door_assembly_med glass = 1 req_one_access = list(access_medical) + open_sound_powered = 'sound/machines/door/med1o.ogg' + close_sound_powered = 'sound/machines/door/med1c.ogg' /obj/machinery/door/airlock/mining name = "Mining Airlock" icon = 'icons/obj/doors/Doormining.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_min req_one_access = list(access_mining) + open_sound_powered = 'sound/machines/door/eng1o.ogg' + close_sound_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/atmos name = "Atmospherics Airlock" icon = 'icons/obj/doors/Dooratmo.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_atmo req_one_access = list(access_atmospherics) + open_sound_powered = 'sound/machines/door/eng1o.ogg' + close_sound_powered = 'sound/machines/door/eng1c.ogg' /obj/machinery/door/airlock/research name = "Research Airlock" icon = 'icons/obj/doors/Doorresearch.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_research + open_sound_powered = 'sound/machines/door/sci1o.ogg' + close_sound_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_research name = "Research Airlock" @@ -336,6 +386,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_research glass = 1 req_one_access = list(access_research) + open_sound_powered = 'sound/machines/door/sci1o.ogg' + close_sound_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_mining name = "Mining Airlock" @@ -347,6 +399,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_min glass = 1 req_one_access = list(access_mining) + open_sound_powered = 'sound/machines/door/cgo1o.ogg' + close_sound_powered = 'sound/machines/door/cgo1c.ogg' /obj/machinery/door/airlock/glass_atmos name = "Atmospherics Airlock" @@ -358,6 +412,9 @@ assembly_type = /obj/structure/door_assembly/door_assembly_atmo glass = 1 req_one_access = list(access_atmospherics) + open_sound_powered = 'sound/machines/door/eng1o.ogg' + close_sound_powered = 'sound/machines/door/eng1c.ogg' + /obj/machinery/door/airlock/gold name = "Gold Airlock" @@ -438,6 +495,8 @@ icon = 'icons/obj/doors/Doorsci.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_science req_one_access = list(access_research) + open_sound_powered = 'sound/machines/door/sci1o.ogg' + close_sound_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/glass_science name = "Glass Airlocks" @@ -446,6 +505,8 @@ assembly_type = /obj/structure/door_assembly/door_assembly_science glass = 1 req_one_access = list(access_research) + open_sound_powered = 'sound/machines/door/sci1o.ogg' + close_sound_powered = 'sound/machines/door/sci1c.ogg' /obj/machinery/door/airlock/highsecurity name = "Secure Airlock" @@ -454,6 +515,8 @@ secured_wires = 1 assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity req_one_access = list(access_heads_vault) + open_sound_powered = 'sound/machines/door/secure1o.ogg' + close_sound_powered = 'sound/machines/door/secure1c.ogg' /obj/machinery/door/airlock/voidcraft name = "voidcraft hatch" @@ -463,12 +526,15 @@ opacity = 0 glass = 1 assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft + open_sound_powered = 'sound/machines/door/shuttle1o.ogg' + close_sound_powered = 'sound/machines/door/shuttle1c.ogg' // Airlock opens from top-bottom instead of left-right. /obj/machinery/door/airlock/voidcraft/vertical icon = 'icons/obj/doors/shuttledoors_vertical.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft/vertical - + open_sound_powered = 'sound/machines/door/shuttle1o.ogg' + close_sound_powered = 'sound/machines/door/shuttle1c.ogg' /datum/category_item/catalogue/anomalous/precursor_a/alien_airlock name = "Precursor Alpha Object - Doors" diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 608e02b9a08..6a61b6dce15 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -4,6 +4,8 @@ appearance_flags = 0 var/obj/machinery/filler_object/filler1 var/obj/machinery/filler_object/filler2 + open_sound_powered = 'sound/machines/door/WideOpen.ogg' + close_sound_powered = 'sound/machines/door/WideClose.ogg' /obj/machinery/door/airlock/multi_tile/New() ..() diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index d8e124b2bd3..f283862d51a 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -803,6 +803,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/datum/feed_message/important_message = null var/scribble="" var/scribble_page = null + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' obj/item/newspaper/attack_self(mob/user as mob) if(ishuman(user)) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 4768f51da6e..605ec182b0a 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -12,6 +12,8 @@ name = "rolled-up poster" desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface." icon_state = "rolled_poster" + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' var/serial_number = null var/poster_type = /obj/structure/sign/poster diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b2bee0fe7c5..5108d9d5a68 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -93,6 +93,16 @@ var/icon/default_worn_icon //Default on-mob icon var/worn_layer //Default on-mob layer + // Pickup/Drop/Equip/Throw Sounds + ///Used when thrown into a mob + var/mob_throw_hit_sound + // Sound used when equipping the items into a valid slot. + var/equip_sound + // pickup sound - this is the default + var/pickup_sound = 'sound/items/pickup/device.ogg' + // drop sound - this is the default + var/drop_sound = 'sound/items/drop/device.ogg' + var/deploytype = null //Deploytype for switchtools. Only really used on switchtool subtype items, but this is on a general item level in case admins want to do some wierd fucky shit with custom switchtools. /obj/item/Initialize(mapload) . = ..() @@ -284,6 +294,30 @@ /obj/item/proc/moved(mob/user as mob, old_loc as turf) return +/obj/item/proc/get_volume_by_throwforce_and_or_w_class() // This is used for figuring out how loud our sounds are for throwing. + if(throwforce && w_class) + return CLAMP((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100 + else if(w_class) + return CLAMP(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100 + else + return 0 + +/obj/item/throw_impact(atom/hit_atom) + ..() + if(isliving(hit_atom)) //Living mobs handle hit sounds differently. + var/volume = get_volume_by_throwforce_and_or_w_class() + if (throwforce > 0) + if (mob_throw_hit_sound) + playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1) + else if(hitsound) + playsound(hit_atom, hitsound, volume, TRUE, -1) + else + playsound(hit_atom, 'sound/weapons/genhit.ogg', volume, TRUE, -1) + else + playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1) + else + playsound(src, drop_sound, 30, preference = /datum/client_preference/drop_sounds) + // apparently called whenever an item is removed from a slot, container, or anything else. /obj/item/proc/dropped(mob/user as mob) ..() @@ -317,6 +351,13 @@ user.position_hud_item(src,slot) if(user.client) user.client.screen |= src if(user.pulling == src) user.stop_pulling() + if((slot_flags & slot)) + if(equip_sound) + playsound(src, equip_sound, 30) + else + playsound(src, drop_sound, 30) + else if(slot == slot_l_hand || slot == slot_r_hand) + playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds) return //Defines which slots correspond to which slot flags diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index bfab65e15ba..4da2c6c70d8 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -51,6 +51,8 @@ var/list/civilian_cartridges = list( icon_state = "cart" item_state = "electronic" w_class = ITEMSIZE_TINY + drop_sound = 'sound/items/drop/component.ogg' + pickup_sound = 'sound/items/pickup/component.ogg' var/obj/item/integated_radio/radio = null var/access_security = 0 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 2a28a217f1c..8e2fb090267 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -242,6 +242,8 @@ desc = "A pen-sized light, used by medical staff." icon_state = "penlight" item_state = "pen" + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' slot_flags = SLOT_EARS brightness_on = 2 w_class = ITEMSIZE_TINY @@ -331,6 +333,8 @@ var/on_damage = 7 var/produce_heat = 1500 power_use = 0 + drop_sound = 'sound/items/drop/gloves.ogg' + pickup_sound = 'sound/items/pickup/gloves.ogg' /obj/item/flashlight/flare/New() fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds. diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index a39d23008b2..9a61be9c6d2 100755 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -7,6 +7,7 @@ /obj/item/multitool name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." + description_info = "You can use this on airlocks or APCs to try to hack them without cutting wires." icon = 'icons/obj/device.dmi' icon_state = "multitool" force = 5.0 @@ -14,7 +15,8 @@ throwforce = 5.0 throw_range = 15 throw_speed = 3 - desc = "You can use this on airlocks or APCs to try to hack them without cutting wires." + drop_sound = 'sound/items/drop/multitool.ogg' + pickup_sound = 'sound/items/pickup/multitool.ogg' matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 28e109a465c..e58e1991d55 100755 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -20,6 +20,9 @@ var/ks1type = null var/ks2type = null + drop_sound = 'sound/items/drop/component.ogg' + pickup_sound = 'sound/items/pickup/component.ogg' + /obj/item/radio/headset/Initialize(mapload) . = ..() internal_channels.Cut() diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 9348929ddc9..2664f308d30 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -8,6 +8,8 @@ flags = NOBLUDGEON var/list/accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly) var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/glass_jar/New() ..() @@ -111,4 +113,4 @@ underlays += victim name = "glass jar with [S]" desc = "A small jar with [S] inside." - return \ No newline at end of file + return diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index e044e19311f..2513ea0d7a4 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -10,6 +10,8 @@ var/heal_brute = 0 var/heal_burn = 0 var/apply_sounds + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' var/upgrade_to // The type path this stack can be upgraded to. @@ -81,6 +83,8 @@ origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg') + drop_sound = 'sound/items/drop/gloves.ogg' + pickup_sound = 'sound/items/pickup/gloves.ogg' upgrade_to = /obj/item/stack/medical/bruise_pack @@ -213,6 +217,8 @@ origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/ointment.ogg') + drop_sound = 'sound/items/drop/herb.ogg' + pickup_sound = 'sound/items/pickup/herb.ogg' /obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob) if(..()) @@ -355,6 +361,8 @@ icon_state = "splint" amount = 5 max_amount = 5 + drop_sound = 'sound/items/drop/hat.ogg' + pickup_sound = 'sound/items/pickup/hat.ogg' var/list/splintable_organs = list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO) //List of organs you can splint, natch. @@ -437,4 +445,4 @@ icon_state = "[initial(icon_state)]_9" else icon_state = "[initial(icon_state)]_10" -// End Citadel Changes \ No newline at end of file +// End Citadel Changes diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 6e9f975ef2c..8e073dc81da 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -8,6 +8,8 @@ throwforce = 15.0 throw_speed = 5 throw_range = 20 + drop_sound = 'sound/items/drop/metalweapon.ogg' + pickup_sound = 'sound/items/pickup/metalweapon.ogg' matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2) max_amount = 60 attack_verb = list("hit", "bludgeoned", "whacked") @@ -102,4 +104,4 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \ F.add_fingerprint(usr) use(2) return -*/ \ No newline at end of file +*/ diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index a6f8218abea..f9ba55b6566 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -16,6 +16,8 @@ icon_state = "sheet-glass" var/is_reinforced = 0 default_type = "glass" + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/stack/material/glass/attack_self(mob/user as mob) construct_window(user) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 23f4a86da12..c5a9ec1bdd6 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -4,6 +4,8 @@ singular_name = "human skin piece" icon_state = "sheet-hide" no_variants = FALSE + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' /obj/item/stack/material/animalhide/human amount = 50 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index d828ba08115..99d14044a5d 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -16,6 +16,8 @@ desc = "A non-descript floor tile" w_class = ITEMSIZE_NORMAL max_amount = 60 + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' /obj/item/stack/tile/New() ..() @@ -37,6 +39,8 @@ flags = 0 origin_tech = list(TECH_BIO = 1) no_variants = FALSE + drop_sound = 'sound/items/drop/herb.ogg' + pickup_sound = 'sound/items/pickup/herb.ogg' /* * Wood */ @@ -51,6 +55,8 @@ throw_range = 20 flags = 0 no_variants = FALSE + drop_sound = 'sound/items/drop/wooden.ogg' + pickup_sound = 'sound/items/pickup/wooden.ogg' /obj/item/stack/tile/wood/sif name = "alien wood tile" @@ -80,6 +86,8 @@ throw_range = 20 flags = 0 no_variants = FALSE + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' /obj/item/stack/tile/carpet/teal name = "teal carpet" @@ -234,4 +242,4 @@ uses_charge = 1 charge_costs = list(250) stacktype = /obj/item/stack/tile/roofing - build_type = /obj/item/stack/tile/roofing \ No newline at end of file + build_type = /obj/item/stack/tile/roofing diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 1aa27c818a1..e33fef75f05 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -6,6 +6,8 @@ icon = 'icons/obj/trash.dmi' w_class = ITEMSIZE_SMALL desc = "This is rubbish." + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' /obj/item/trash/raisins name = "\improper 4no raisins" @@ -36,8 +38,10 @@ icon_state = "sosjerky" /obj/item/trash/unajerky - name = "Moghes Imported Sissalik Jerky" + name = "Moghes Imported Sissalik Jerky tin" icon_state = "unathitinred" + drop_sound = 'sound/items/drop/soda.ogg' + pickup_sound = 'sound/items/pickup/soda.ogg' /obj/item/trash/syndi_cakes name = "syndi cakes" diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 08a0046254f..7bd69c1ecfe 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -5,6 +5,8 @@ icon = 'icons/obj/tools.dmi' icon_state = "rcd" item_state = "rcd" + drop_sound = 'sound/items/drop/gun.ogg' + pickup_sound = 'sound/items/pickup/gun.ogg' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand.dmi', slot_r_hand_str = 'icons/mob/items/righthand.dmi', diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index ff2e915583b..733fb513fa9 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -3,6 +3,8 @@ desc = "a red pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments." icon = 'icons/obj/candle.dmi' icon_state = "candle1" + drop_sound = 'sound/items/drop/gloves.ogg' + pickup_sound = 'sound/items/pickup/gloves.ogg' w_class = ITEMSIZE_TINY light_color = "#E09D37" var/wax = 2000 diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 9d1f6c8576d..b10b6d656a1 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -34,6 +34,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM origin_tech = list(TECH_MATERIAL = 1) slot_flags = SLOT_EARS attack_verb = list("burnt", "singed") + drop_sound = 'sound/items/drop/food.ogg' + pickup_sound = 'sound/items/pickup/food.ogg' /obj/item/flame/match/process() if(isliving(loc)) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 711130ace5f..78bc8933c15 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -8,6 +8,9 @@ slot_flags = SLOT_EARS var/colour = "red" var/open = 0 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + /obj/item/lipstick/orange name = "orange lipstick" @@ -134,4 +137,4 @@ var/mob/living/carbon/human/H = user var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if(istype(E)) - E.change_eye_color() \ No newline at end of file + E.change_eye_color() diff --git a/code/game/objects/items/weapons/duct_tape.dm b/code/game/objects/items/weapons/duct_tape.dm index e4c66c34138..308b0faa76e 100644 --- a/code/game/objects/items/weapons/duct_tape.dm +++ b/code/game/objects/items/weapons/duct_tape.dm @@ -4,6 +4,8 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "taperoll" w_class = ITEMSIZE_TINY + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' toolspeed = 2 //It is now used in surgery as a not awful, but probably dangerous option, due to speed. diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 470511d5572..9da09062b88 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -12,6 +12,8 @@ force = 10 matter = list(DEFAULT_WALL_MATERIAL = 90) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") + drop_sound = 'sound/items/drop/gascan.ogg' + pickup_sound = 'sound/items/pickup/gascan.ogg' var/spray_particles = 3 var/spray_amount = 10 //units of liquid per particle diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index f402fd3929c..b411cf779c5 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -13,6 +13,8 @@ icon = 'icons/obj/items.dmi' icon_state = "gift1" item_state = "gift1" + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/a_gift/New() ..() @@ -123,6 +125,8 @@ icon = 'icons/obj/items.dmi' icon_state = "wrap_paper" var/amount = 20.0 + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' /obj/item/wrapping_paper/attackby(obj/item/W as obj, mob/living/user as mob) ..() diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 2d94c73b36e..718ce544da4 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -11,6 +11,8 @@ throw_range = 5 origin_tech = list(TECH_MATERIAL = 1) matter = list(DEFAULT_WALL_MATERIAL = 500) + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' var/elastic var/dispenser = 0 var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 818c1cee05a..cf8f0e834a5 100755 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -25,6 +25,7 @@ var/list/sprite_stack var/list/files = list( ) + pickup_sound = 'sound/items/pickup/card.ogg' /obj/item/card/New() . = ..() @@ -59,6 +60,8 @@ var/data = "null" var/special = null item_state = "card-id" + drop_sound = 'sound/items/drop/disk.ogg' + pickup_sound = 'sound/items/pickup/disk.ogg' /obj/item/card/data/verb/label(t as text) set name = "Label Disk" diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index cafeeb9bf60..7a040cab503 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -5,6 +5,8 @@ * Utensils */ /obj/item/material/kitchen/utensil + drop_sound = 'sound/items/drop/knife.ogg' + pickup_sound = 'sound/items/pickup/knife.ogg' w_class = ITEMSIZE_TINY thrown_force_divisor = 1 origin_tech = list(TECH_MATERIAL = 1) @@ -102,6 +104,8 @@ force_divisor = 0.7 // 10 when wielded with weight 15 (wood) dulled_divisor = 0.75 // Still a club thrown_force_divisor = 1 // as above + drop_sound = 'sound/items/drop/wooden.ogg' + pickup_sound = 'sound/items/pickup/wooden.ogg' /obj/item/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index baa8d4b265e..7eafd213ec0 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -9,6 +9,8 @@ attack_verb = list("patted", "tapped") force_divisor = 0.25 // 15 when wielded with hardness 60 (steel) thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel) + drop_sound = 'sound/items/drop/knife.ogg' + pickup_sound = 'sound/items/pickup/knife.ogg' /obj/item/material/butterfly/update_force() if(active) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 7fc99c52926..16ed676def4 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -21,6 +21,8 @@ origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) attack_verb = list("chopped", "torn", "cut") applies_material_colour = 0 + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' /obj/item/material/knife/machete/hatchet/unathiknife name = "duelling knife" @@ -89,7 +91,7 @@ //icon_state = "reinf-snowball" force_divisor = 0.20 thrown_force_divisor = 0.25 - + /obj/item/material/butterfly/saw //This Saw Cleaver is in here since I do not know where else to put it name = "Saw Cleaver" desc = "A weapon consisting of a long handle and a heavy serrated blade. Using centrifrical force the blade extends outword allowing it to slice it long cleaves. The smell of blood hangs in the air around it." diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index 7e0749b68d5..e6232f84c04 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -9,6 +9,8 @@ edge = 1 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' + drop_sound = 'sound/items/drop/sword.ogg' + pickup_sound = 'sound/items/pickup/sword.ogg' /obj/item/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(50)) diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index f5a9b781365..04489ec5038 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -26,6 +26,9 @@ var/base_icon var/base_name var/unwielded_force_divisor = 0.25 + hitsound = "swing_hit" + drop_sound = 'sound/items/drop/sword.ogg' + pickup_sound = 'sound/items/pickup/sword.ogg' /obj/item/material/twohanded/update_held_icon() var/mob/living/M = loc @@ -103,6 +106,8 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") applies_material_colour = 0 can_cleave = TRUE + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' /obj/item/material/twohanded/fireaxe/update_held_icon() var/mob/living/M = loc @@ -180,6 +185,7 @@ edge = 0 sharp = 1 hitsound = 'sound/weapons/bladeslice.ogg' + mob_throw_hit_sound = 'sound/weapons/pierce.ogg' attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") default_material = "glass" applies_material_colour = 0 diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 594d2525a2f..77fef2b9bad 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -256,6 +256,8 @@ sharp = 1 edge = 1 colorable = TRUE + drop_sound = 'sound/items/drop/sword.ogg' + pickup_sound = 'sound/items/pickup/sword.ogg' projectile_parry_chance = 65 diff --git a/code/game/objects/items/weapons/nullrod.dm b/code/game/objects/items/weapons/nullrod.dm index 7f85db2f277..a2f31de2091 100644 --- a/code/game/objects/items/weapons/nullrod.dm +++ b/code/game/objects/items/weapons/nullrod.dm @@ -10,6 +10,8 @@ throw_range = 4 throwforce = 10 w_class = ITEMSIZE_SMALL + drop_sound = 'sound/items/drop/sword.ogg' + pickup_sound = 'sound/items/pickup/sword.ogg' var/reskinned = FALSE var/defend_chance = 0 // The base chance for the weapon to parry. diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index e23ff7204a0..c1c667a501b 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -17,6 +17,8 @@ max_storage_space = INVENTORY_STANDARD_SPACE var/flippable = 0 var/side = 0 //0 = right, 1 = left + drop_sound = 'sound/items/drop/backpack.ogg' + pickup_sound = 'sound/items/pickup/backpack.ogg' /obj/item/storage/backpack/attackby(obj/item/W as obj, mob/user as mob) if (src.use_sound) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 05eff2323cd..f74fcbf861d 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -23,6 +23,8 @@ display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients use_to_pickup = 1 slot_flags = SLOT_BELT + drop_sound = 'sound/items/drop/backpack.ogg' + pickup_sound = 'sound/items/pickup/backpack.ogg' // ----------------------------- // Trash bag @@ -33,6 +35,8 @@ icon = 'icons/obj/janitor.dmi' icon_state = "trashbag0" item_state_slots = list(slot_r_hand_str = "trashbag", slot_l_hand_str = "trashbag") + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' w_class = ITEMSIZE_LARGE max_w_class = ITEMSIZE_SMALL @@ -59,6 +63,8 @@ desc = "It's a very flimsy, very noisy alternative to a bag." icon = 'icons/obj/trash.dmi' icon_state = "plasticbag" + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' w_class = ITEMSIZE_LARGE max_w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 02489222764..c9173d6d4ab 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -8,6 +8,9 @@ max_w_class = ITEMSIZE_NORMAL slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined") + equip_sound = 'sound/items/toolbelt_equip.ogg' + drop_sound = 'sound/items/drop/toolbelt.ogg' + pickup_sound = 'sound/items/pickup/toolbelt.ogg' sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/belt.dmi' diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 41fd0031f78..31d8a1850b3 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -27,6 +27,8 @@ var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard max_w_class = ITEMSIZE_SMALL max_storage_space = INVENTORY_BOX_SPACE + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' // BubbleWrap - A box can be folded up to make card /obj/item/storage/box/attack_self(mob/user as mob) @@ -120,6 +122,8 @@ icon_state = "blankshot_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list(/obj/item/ammo_casing/a12g/blank = 8) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/blanks/large starts_with = list(/obj/item/ammo_casing/a12g/blank = 16) @@ -130,16 +134,20 @@ icon_state = "beanshot_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 8) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' + /obj/item/storage/box/beanbags/large/New() starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 16) - /obj/item/storage/box/shotgunammo name = "box of shotgun slugs" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." icon_state = "lethalshellshot_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list(/obj/item/ammo_casing/a12g = 8) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/shotgunammo/large starts_with = list(/obj/item/ammo_casing/a12g = 16) @@ -150,6 +158,8 @@ icon_state = "lethalslug_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list(/obj/item/ammo_casing/a12g/pellet = 8) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/shotgunshells/large starts_with = list(/obj/item/ammo_casing/a12g/pellet = 16) @@ -159,6 +169,9 @@ desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." icon_state = "illumshot_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' + starts_with = list(/obj/item/ammo_casing/a12g/flare = 8) /obj/item/storage/box/flashshells/large @@ -170,6 +183,8 @@ icon_state = "stunshot_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list(/obj/item/ammo_casing/a12g/stunshell = 8) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/stunshells/large starts_with = list(/obj/item/ammo_casing/a12g/stunshell = 16) @@ -180,6 +195,8 @@ icon_state = "blankshot_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list(/obj/item/ammo_casing/a12g/practice = 8) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/practiceshells/large starts_with = list(/obj/item/ammo_casing/a12g/practice = 16) @@ -190,6 +207,8 @@ icon_state = "empshot_box" item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") starts_with = list(/obj/item/ammo_casing/a12g/emp = 8) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/empshells/large starts_with = list(/obj/item/ammo_casing/a12g/emp = 16) @@ -198,48 +217,64 @@ name = "box of 14.5mm shells" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." starts_with = list(/obj/item/ammo_casing/a145 = 7) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/flashbangs name = "box of flashbangs (WARNING)" desc = "WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use." icon_state = "flashbang" starts_with = list(/obj/item/grenade/flashbang = 7) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/emps name = "box of emp grenades" desc = "A box containing 5 military grade EMP grenades.
WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur." icon_state = "emp" starts_with = list(/obj/item/grenade/empgrenade = 7) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/empslite name = "box of low yield emp grenades" desc = "A box containing 5 low yield EMP grenades.
WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur." icon_state = "emp" starts_with = list(/obj/item/grenade/empgrenade/low_yield = 7) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/smokes name = "box of smoke bombs" desc = "A box containing 7 smoke bombs." icon_state = "flashbang" starts_with = list(/obj/item/grenade/smokebomb = 7) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/anti_photons name = "box of anti-photon grenades" desc = "A box containing 7 experimental photon disruption grenades." icon_state = "flashbang" starts_with = list(/obj/item/grenade/anti_photon = 7) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/frags name = "box of fragmentation grenades (WARNING)" desc = "A box containing 7 military grade fragmentation grenades.
WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use." icon_state = "frag" starts_with = list(/obj/item/grenade/explosive = 7) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/frags_half_box name = "box of fragmentation grenades (WARNING)" desc = "A box containing 4 military grade fragmentation grenades.
WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use." icon_state = "frag" starts_with = list(/obj/item/grenade/explosive = 4) + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' /obj/item/storage/box/metalfoam name = "box of metal foam grenades." @@ -395,6 +430,8 @@ slot_flags = SLOT_BELT can_hold = list(/obj/item/flame/match) starts_with = list(/obj/item/flame/match = 10) + drop_sound = 'sound/items/drop/matchbox.ogg' + pickup_sound = 'sound/items/pickup/matchbox.ogg' /obj/item/storage/box/matches/attackby(obj/item/flame/match/W as obj, mob/user as mob) if(istype(W) && !W.lit && !W.burnt) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 04c6a1800ab..6843e9b5dae 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -8,6 +8,9 @@ w_class = ITEMSIZE_LARGE max_w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_NORMAL * 4 + use_sound = 'sound/items/storage/briefcase.ogg' + drop_sound = 'sound/items/drop/backpack.ogg' + pickup_sound = 'sound/items/pickup/backpack.ogg' /obj/item/storage/briefcase/clutch name = "clutch purse" @@ -18,4 +21,4 @@ force = 0 w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_SMALL - max_storage_space = ITEMSIZE_COST_SMALL * 4 \ No newline at end of file + max_storage_space = ITEMSIZE_COST_SMALL * 4 diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index ec27d4a5d0e..3428d83882f 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -19,6 +19,8 @@ icon_state = "donutbox6" name = "donut box" var/icon_type = "donut" + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/storage/fancy/update_icon(var/itemremoved = 0) var/total_contents = contents.len - itemremoved diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 57317e02951..296fb14f70a 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -16,6 +16,8 @@ throw_range = 8 max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14 // var/list/icon_variety // VOREStation edit + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/storage/firstaid/Initialize() . = ..() @@ -167,6 +169,8 @@ desc = "It's an airtight container for storing medication." icon_state = "pill_canister" icon = 'icons/obj/chemical.dmi' + drop_sound = 'sound/items/drop/pillbottle.ogg' + pickup_sound = 'sound/items/pickup/pillbottle.ogg' item_state_slots = list(slot_r_hand_str = "contsolid", slot_l_hand_str = "contsolid") w_class = ITEMSIZE_SMALL can_hold = list(/obj/item/reagent_containers/pill,/obj/item/dice,/obj/item/paper) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 24558f8e71f..e41fb9653b4 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -13,6 +13,8 @@ max_storage_space = ITEMSIZE_COST_SMALL * 7 //enough to hold all starting contents origin_tech = list(TECH_COMBAT = 1) attack_verb = list("robusted") + drop_sound = 'sound/items/drop/toolbox.ogg' + pickup_sound = 'sound/items/pickup/toolbox.ogg' /obj/item/storage/toolbox/emergency name = "emergency toolbox" diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 33baac67389..c252b9fed30 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -43,6 +43,9 @@ var/obj/item/card/id/front_id = null + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' + /obj/item/storage/wallet/remove_from_storage(obj/item/W as obj, atom/new_location) . = ..(W, new_location) if(.) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 5b914cccc11..9f50b7b58e2 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -12,6 +12,8 @@ throwforce = 7 flags = NOCONDUCT w_class = ITEMSIZE_NORMAL + drop_sound = 'sound/items/drop/metalweapon.ogg' + pickup_sound = 'sound/items/pickup/metalweapon.ogg' origin_tech = list(TECH_COMBAT = 2) attack_verb = list("beaten") var/lightcolor = "#FF6A00" diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 5b2b34cbe38..57c4942df7c 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -14,6 +14,8 @@ icon = 'icons/obj/surgery.dmi' w_class = ITEMSIZE_SMALL var/helpforce = 0 //For help intent things + drop_sound = 'sound/items/drop/weldingtool.ogg' + pickup_sound = 'sound/items/pickup/weldingtool.ogg' /obj/item/surgical/attack(mob/M, mob/user) if(user.a_intent == INTENT_HELP) //A tad messy, but this should stop people from smacking their patients in surgery diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index e75bec6bc14..2c8977db025 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -16,6 +16,8 @@ item_state = "classic_baton" slot_flags = SLOT_BELT force = 10 + drop_sound = 'sound/items/drop/crowbar.ogg' + pickup_sound = 'sound/items/pickup/crowbar.ogg' /obj/item/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) @@ -42,6 +44,8 @@ var/off_force = 3 var/on_force = 15 var/on_pain_force = 30 + drop_sound = 'sound/items/drop/crowbar.ogg' + pickup_sound = 'sound/items/pickup/crowbar.ogg' /obj/item/melee/telebaton/attack_self(mob/user as mob) on = !on diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index ed002e0c752..a778b0d73ee 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -7,6 +7,8 @@ var/list/global/tank_gauge_cache = list() sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' ) + drop_sound = 'sound/items/drop/gascan.ogg' + pickup_sound = 'sound/items/pickup/gascan.ogg' var/gauge_icon = "indicator_tank" var/last_gauge_pressure diff --git a/code/game/objects/items/weapons/tools/combitool.dm b/code/game/objects/items/weapons/tools/combitool.dm index 467d876080b..9e914f6dd3f 100644 --- a/code/game/objects/items/weapons/tools/combitool.dm +++ b/code/game/objects/items/weapons/tools/combitool.dm @@ -10,6 +10,8 @@ icon = 'icons/obj/items.dmi' icon_state = "combitool" w_class = ITEMSIZE_SMALL + drop_sound = 'sound/items/drop/multitool.ogg' + pickup_sound = 'sound/items/pickup/multitool.ogg' var/list/spawn_tools = list( /obj/item/tool/screwdriver, diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm index 2544b94a57a..abe72fe9379 100644 --- a/code/game/objects/items/weapons/tools/crowbar.dm +++ b/code/game/objects/items/weapons/tools/crowbar.dm @@ -17,8 +17,11 @@ matter = list(DEFAULT_WALL_MATERIAL = 50) attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") usesound = 'sound/items/crowbar.ogg' + drop_sound = 'sound/items/drop/crowbar.ogg' + pickup_sound = 'sound/items/pickup/crowbar.ogg' toolspeed = 1 + /obj/item/tool/crowbar/is_crowbar() return TRUE diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index 7ecb8f10009..83d88a0653e 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -14,6 +14,8 @@ throw_range = 5 hitsound = 'sound/weapons/bladeslice.ogg' usesound = 'sound/items/screwdriver.ogg' + drop_sound = 'sound/items/drop/screwdriver.ogg' + pickup_sound = 'sound/items/pickup/screwdriver.ogg' matter = list(DEFAULT_WALL_MATERIAL = 75) attack_verb = list("stabbed") sharp = 1 diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 12ddf7c9fa5..a0fa7270e3c 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -37,6 +37,8 @@ var/burned_fuel_for = 0 // Keeps track of how long the welder's been on, used to gradually empty the welder if left one, without RNG. var/always_process = FALSE // If true, keeps the welder on the process list even if it's off. Used for when it needs to regenerate fuel. toolspeed = 1 + drop_sound = 'sound/items/drop/weldingtool.ogg' + pickup_sound = 'sound/items/pickup/weldingtool.ogg' /obj/item/weldingtool/Initialize() . = ..() diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index ad7fa897758..e5f27eec38d 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -16,6 +16,8 @@ attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' usesound = 'sound/items/wirecutter.ogg' + drop_sound = 'sound/items/drop/wirecutter.ogg' + pickup_sound = 'sound/items/pickup/wirecutter.ogg' sharp = 1 edge = 1 toolspeed = 1 diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm index 7dbbd49a378..c42915391b5 100644 --- a/code/game/objects/items/weapons/tools/wrench.dm +++ b/code/game/objects/items/weapons/tools/wrench.dm @@ -15,6 +15,8 @@ attack_verb = list("bashed", "battered", "bludgeoned", "whacked") usesound = 'sound/items/ratchet.ogg' toolspeed = 1 + drop_sound = 'sound/items/drop/wrench.ogg' + pickup_sound = 'sound/items/pickup/wrench.ogg' /obj/item/tool/wrench/is_wrench() return TRUE diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index b0b3b3b6220..c79f078dc67 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -8,6 +8,8 @@ attack_verb = list("whipped") hitsound = 'sound/weapons/towelwhip.ogg' desc = "A soft cotton towel." + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' /obj/item/weapon/towel/equipped(var/M, var/slot) ..() diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 76f9ecd8c08..b4720ec1e13 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -9,6 +9,8 @@ var/obj/item/nozzle = null //Attached welder, or other spray device. var/nozzle_type = /obj/item/weldingtool/tubefed var/nozzle_attached = 0 + drop_sound = 'sound/items/drop/backpack.ogg' + pickup_sound = 'sound/items/pickup/backpack.ogg' /obj/item/weldpack/Initialize() . = ..() diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index dca846b2346..f3b0ab15630 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -16,6 +16,8 @@ LINEN BINS throw_speed = 1 throw_range = 2 w_class = ITEMSIZE_SMALL + drop_sound = 'sound/items/drop/backpack.ogg' + pickup_sound = 'sound/items/pickup/backpack.ogg' /obj/item/bedsheet/attack_self(mob/user as mob) user.drop_item() diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 1da16c68f63..d02c93b1de2 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -243,6 +243,8 @@ w_class = ITEMSIZE_LARGE var/rollertype = /obj/item/roller var/bedtype = /obj/structure/bed/roller + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' /obj/item/roller/attack_self(mob/user) var/obj/structure/bed/roller/R = new bedtype(user.loc) @@ -354,4 +356,4 @@ return // Doesn't care about material or anything else. /obj/structure/bed/alien/attackby(obj/item/W, mob/user) - return // No deconning. \ No newline at end of file + return // No deconning. diff --git a/code/game/sound.dm b/code/game/sound.dm index e9270b80990..03153dacd26 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -253,6 +253,12 @@ GLOBAL_VAR_INIT(sound_distance_offscreen, 7) 'sound/vore/sunesound/prey/death_04.ogg','sound/vore/sunesound/prey/death_05.ogg','sound/vore/sunesound/prey/death_06.ogg', 'sound/vore/sunesound/prey/death_07.ogg','sound/vore/sunesound/prey/death_08.ogg','sound/vore/sunesound/prey/death_09.ogg', 'sound/vore/sunesound/prey/death_10.ogg') + + if("smcalm") + soundin = pick('sound/machines/sm/accent/normal/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg', 'sound/machines/sm/supermatter1.ogg', 'sound/machines/sm/supermatter2.ogg', 'sound/machines/sm/supermatter3.ogg') + if("smdelam") + soundin = pick('sound/machines/sm/accent/delam/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg', 'sound/machines/sm/supermatter1.ogg', 'sound/machines/sm/supermatter2.ogg', 'sound/machines/sm/supermatter3.ogg') + //END VORESTATION EDIT return soundin diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 962bec1307a..50136156689 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -8,6 +8,8 @@ throwforce = 2 throw_speed = 3 throw_range = 10 + drop_sound = 'sound/items/drop/component.ogg' + pickup_sound = 'sound/items/pickup/component.ogg' origin_tech = list(TECH_MAGNET = 1) var/secured = 1 diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index 6ffbb4d98bf..60233432f4d 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -153,6 +153,18 @@ var/list/_client_preferences_by_type enabled_description = "Show" disabled_description = "Hide" +/datum/client_preference/pickup_sounds + description = "Picked Up Item Sounds" + key = "SOUND_PICKED" + enabled_description = "Enabled" + disabled_description = "Disabled" + +/datum/client_preference/drop_sounds + description = "Dropped Item Sounds" + key = "SOUND_DROPPED" + enabled_description = "Enabled" + disabled_description = "Disabled" + /datum/client_preference/hotkeys_default description ="Hotkeys Default" key = "HUD_HOTKEYS" diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index bbd7d351693..0c57b0e11dd 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -239,6 +239,22 @@ feedback_add_details("admin_verb","TAirPumpNoise") +/client/verb/toggle_pickup_sounds() + set name = "Toggle Picked Up Item Sounds" + set category = "Preferences" + set desc = "Toggles sounds when items are picked up or thrown." + + var/pref_path = /datum/client_preference/pickup_sounds + + toggle_preference(pref_path) + + to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear sounds when items are picked up or thrown.") + + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb", "TPickupSounds") + + /client/verb/toggle_safe_firing() set name = "Toggle Gun Firing Intent Requirement" set category = "Preferences" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index cce1ffbe446..953d2091cab 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1,6 +1,8 @@ /obj/item/clothing name = "clothing" siemens_coefficient = 0.9 + drop_sound = 'sound/items/drop/clothing.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' var/list/species_restricted = null //Only these species can wear this kit. var/gunshot_residue //Used by forensics. @@ -246,7 +248,10 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi', SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/hands.dmi') + SPECIES_WEREBEAST = 'icons/mob/species/werebeast/hands.dmi' + ) + drop_sound = 'sound/items/drop/gloves.ogg' + pickup_sound = 'sound/items/pickup/gloves.ogg' /obj/item/clothing/gloves/update_clothing_icon() if (ismob(src.loc)) @@ -376,7 +381,11 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi') + SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi' + ) + + drop_sound = 'sound/items/drop/hat.ogg' + pickup_sound = 'sound/items/pickup/hat.ogg' /obj/item/clothing/head/attack_self(mob/user) if(brightness_on) @@ -542,7 +551,10 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi', SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi', - SPECIES_WEREBEAST = 'icons/mob/species/werebeast/feet.dmi') + SPECIES_WEREBEAST = 'icons/mob/species/werebeast/feet.dmi' + ) + drop_sound = 'sound/items/drop/shoes.ogg' + pickup_sound = 'sound/items/pickup/shoes.ogg' //there's a snake in my boot var/list/inside_emotes = list() @@ -751,6 +763,7 @@ permeability_coefficient = 0.90 slot_flags = SLOT_ICLOTHING armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + equip_sound = 'sound/items/jumpsuit_equip.ogg' w_class = ITEMSIZE_NORMAL show_messages = 1 blood_sprite_state = "uniformblood" diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm index 193ce362325..6b53a1d6eca 100644 --- a/code/modules/clothing/ears/ears.dm +++ b/code/modules/clothing/ears/ears.dm @@ -53,12 +53,16 @@ desc = "A delicate golden chain worn by female skrell to decorate their head tails." icon_state = "skrell_chain" item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5") + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' /obj/item/clothing/ears/skrell/chain/silver name = "Silver headtail chains" desc = "A delicate silver chain worn by female skrell to decorate their head tails." icon_state = "skrell_chain_sil" item_state_slots = list(slot_r_hand_str = "egg", slot_l_hand_str = "egg") + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' /obj/item/clothing/ears/skrell/chain/bluejewels name = "Blue jeweled golden headtail chains" @@ -180,4 +184,4 @@ /obj/item/clothing/ears/skrell/cloth_male/lightblue name = "light blue headtail cloth" icon_state = "skrell_cloth_lblue_male" - item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2") \ No newline at end of file + item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2") diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 87f83643761..bbf42ffb1b4 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -27,6 +27,8 @@ BLIND // can't see anything var/activation_sound = 'sound/items/goggles_charge.ogg' var/obj/screen/overlay = null var/list/away_planes //Holder for disabled planes + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' sprite_sheets = list( "Teshari" = 'icons/mob/species/teshari/eyes.dmi', @@ -164,6 +166,9 @@ BLIND // can't see anything item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") body_parts_covered = 0 var/eye = null + drop_sound = 'sound/items/drop/gloves.ogg' + pickup_sound = 'sound/items/pickup/gloves.ogg' + /obj/item/clothing/glasses/eyepatchwhite name = "eyepatch" @@ -406,6 +411,8 @@ BLIND // can't see anything item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") flash_protection = FLASH_PROTECTION_MAJOR tint = BLIND + drop_sound = 'sound/items/drop/gloves.ogg' + pickup_sound = 'sound/items/pickup/gloves.ogg' /obj/item/clothing/glasses/sunglasses/blindfold/tape name = "length of tape" @@ -632,4 +639,4 @@ BLIND // can't see anything name = "orange glasses" desc = "A pair of orange glasses." icon_state = "orangeglasses" - item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") \ No newline at end of file + item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") diff --git a/code/modules/clothing/gloves/arm_guards.dm b/code/modules/clothing/gloves/arm_guards.dm index 84ebecdc1e6..67be9f19941 100644 --- a/code/modules/clothing/gloves/arm_guards.dm +++ b/code/modules/clothing/gloves/arm_guards.dm @@ -5,6 +5,8 @@ overgloves = 1 punch_force = 3 w_class = ITEMSIZE_NORMAL + drop_sound = 'sound/items/drop/metalshield.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' /obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot) if(..()) //This will only run if no other problems occured when equiping. @@ -58,4 +60,4 @@ siemens_coefficient = 0.6 armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0) min_cold_protection_temperature = T0C - 20 - cold_protection = ARMS \ No newline at end of file + cold_protection = ARMS diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 76d5a709d89..05db89abf73 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -4,6 +4,8 @@ icon_state = "yellow" siemens_coefficient = 0 permeability_coefficient = 0.05 + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' /obj/item/clothing/gloves/fyellow //Cheap Chinese Crap desc = "These gloves are cheap copies of proper insulated gloves. No way this can end badly." @@ -11,6 +13,8 @@ icon_state = "yellow" siemens_coefficient = 1 //Set to a default of 1, gets overridden in initialize() permeability_coefficient = 0.05 + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' /obj/item/clothing/gloves/fyellow/Initialize() . = ..() @@ -89,4 +93,4 @@ obj/item/clothing/gloves/fingerless desc = "A pair of gloves that don't actually cover the fingers." name = "fingerless gloves" icon_state = "fingerlessgloves" - fingerprint_chance = 100 \ No newline at end of file + fingerprint_chance = 100 diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index cebd615585f..5b0c7b015db 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -63,6 +63,8 @@ permeability_coefficient = 0.01 germ_level = 0 fingerprint_chance = 25 + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' // var/balloonPath = /obj/item/latexballon //TODO: Make inflating gloves a thing @@ -88,6 +90,8 @@ item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown") permeability_coefficient = 0.05 siemens_coefficient = 0.75 //thick work gloves + drop_sound = 'sound/items/drop/leather.ogg' + pickup_sound = 'sound/items/pickup/leather.ogg' /obj/item/clothing/gloves/duty desc = "These brown duty gloves are made from a durable synthetic." @@ -116,6 +120,8 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 species_restricted = list("Vox") + drop_sound = 'sound/items/drop/metalboots.ogg' + pickup_sound = 'sound/items/pickup/toolbox.ogg' cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE @@ -134,6 +140,8 @@ overgloves = 1 force = 5 punch_force = 5 + drop_sound = 'sound/items/drop/metalboots.ogg' + pickup_sound = 'sound/items/pickup/toolbox.ogg' /obj/item/clothing/gloves/ranger var/glovecolor = "white" diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index ab02217f5cb..2c13eda488d 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -37,6 +37,9 @@ desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians." icon_state = "paper" body_parts_covered = 0 + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + /obj/item/clothing/head/collectable/tophat name = "collectable top hat" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index e7d7cee13dd..4a03a28c106 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -10,6 +10,8 @@ action_button_name = "Toggle Head-light" w_class = ITEMSIZE_NORMAL ear_protection = 1 + drop_sound = 'sound/items/drop/helm.ogg' + pickup_sound = 'sound/items/pickup/helm.ogg' /obj/item/clothing/head/hardhat/orange icon_state = "hardhat0_orange" @@ -68,4 +70,4 @@ hatcolor = "orange" /obj/item/clothing/head/hardhat/ranger/yellow - hatcolor = "yellow" \ No newline at end of file + hatcolor = "yellow" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 1017efe1c1b..cdd96ce128b 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -14,6 +14,8 @@ siemens_coefficient = 0.7 w_class = ITEMSIZE_NORMAL ear_protection = 1 + drop_sound = 'sound/items/drop/helm.ogg' + pickup_sound = 'sound/items/pickup/helm.ogg' /obj/item/clothing/head/helmet/solgov name = "\improper Solar Confederate Government helmet" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index f2455759e0d..4e1ac8056d5 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -17,6 +17,8 @@ desc = "A nice hair pin." slot_flags = SLOT_HEAD | SLOT_EARS body_parts_covered = 0 + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' /obj/item/clothing/head/pin/pink icon_state = "pinkpin" @@ -169,6 +171,8 @@ icon_state = "cardborg_h" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE body_parts_covered = HEAD|FACE|EYES + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/clothing/head/justice name = "justice hat" @@ -474,4 +478,4 @@ /obj/item/clothing/head/operations/security name = "Operations Security Staff Cap" desc = "A red cap distributed to Security staff aboard NT vessels." - icon_state = "operations_cap_sec" \ No newline at end of file + icon_state = "operations_cap_sec" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 040ca6dac6a..d170dd90767 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -28,6 +28,8 @@ var/base_state flash_protection = FLASH_PROTECTION_MAJOR tint = TINT_HEAVY + drop_sound = 'sound/items/drop/helm.ogg' + pickup_sound = 'sound/items/pickup/helm.ogg' /obj/item/clothing/head/welding/attack_self() toggle() @@ -168,6 +170,8 @@ brightness_on = 2 light_overlay = "helmet_light" w_class = ITEMSIZE_NORMAL + drop_sound = 'sound/items/drop/herb.ogg' + pickup_sound = 'sound/items/pickup/herb.ogg' /* * Kitty ears diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 06af7d96504..38293c367e8 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -27,6 +27,9 @@ icon_state = "jackboots" armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) siemens_coefficient = 0.7 + drop_sound = 'sound/items/drop/boots.ogg' + pickup_sound = 'sound/items/pickup/boots.ogg' + /obj/item/clothing/shoes/boots/jackboots/toeless name = "toe-less jackboots" diff --git a/code/modules/clothing/shoes/leg_guards.dm b/code/modules/clothing/shoes/leg_guards.dm index f90eebdc29f..75e17737125 100644 --- a/code/modules/clothing/shoes/leg_guards.dm +++ b/code/modules/clothing/shoes/leg_guards.dm @@ -7,6 +7,8 @@ w_class = ITEMSIZE_NORMAL step_volume_mod = 1.3 can_hold_knife = TRUE + drop_sound = 'sound/items/drop/boots.ogg' + pickup_sound = 'sound/items/pickup/boots.ogg' /obj/item/clothing/shoes/leg_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) //This will only run if no other problems occured when equiping. @@ -61,4 +63,4 @@ slowdown = SHOES_SLOWDOWN+0.2 armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0) min_cold_protection_temperature = T0C - 20 - cold_protection = LEGS \ No newline at end of file + cold_protection = LEGS diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 353e45133db..84a6b91b9b8 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -15,6 +15,8 @@ var/obj/item/clothing/shoes/shoes = null //Undershoes var/mob/living/carbon/human/wearer = null //For shoe procs step_volume_mod = 1.3 + drop_sound = 'sound/items/drop/metalboots.ogg' + pickup_sound = 'sound/items/pickup/toolbox.ogg' /obj/item/clothing/shoes/magboots/proc/set_slowdown() slowdown = shoes? max(SHOES_SLOWDOWN, shoes.slowdown): SHOES_SLOWDOWN //So you can't put on magboots to make you walk faster. @@ -125,4 +127,4 @@ /obj/item/clothing/shoes/magboots/vox/examine(mob/user) ..(user) if (magpulse) - to_chat(user, "It would be hard to take these off without relaxing your grip first.")//theoretically this message should only be seen by the wearer when the claws are equipped. \ No newline at end of file + to_chat(user, "It would be hard to take these off without relaxing your grip first.")//theoretically this message should only be seen by the wearer when the claws are equipped. diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 7dab51a94c6..28726d6b9d8 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -9,6 +9,8 @@ siemens_coefficient = 0.8 species_restricted = null step_volume_mod = 0.5 + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' /obj/item/clothing/shoes/mime name = "mime shoes" @@ -24,6 +26,9 @@ item_flags = NOSLIP slowdown = SHOES_SLOWDOWN+1 species_restricted = null + drop_sound = 'sound/items/drop/rubber.ogg' + pickup_sound = 'sound/items/pickup/rubber.ogg' + /obj/item/clothing/shoes/dress name = "dress shoes" @@ -103,6 +108,8 @@ obj/item/clothing/shoes/sandal/clogs desc = "Fluffy!" icon_state = "slippers" species_restricted = null + drop_sound = 'sound/items/drop/clothing.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' /obj/item/clothing/shoes/slippers_worn name = "worn bunny slippers" @@ -167,6 +174,8 @@ obj/item/clothing/shoes/sandal/clogs force = 0 w_class = ITEMSIZE_SMALL species_restricted = null + drop_sound = 'sound/items/drop/clothing.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' /obj/item/clothing/shoes/boots/ranger var/bootcolor = "white" diff --git a/code/modules/clothing/suits/aliens/tajara.dm b/code/modules/clothing/suits/aliens/tajara.dm index 3c3b0bb55d2..36212384667 100644 --- a/code/modules/clothing/suits/aliens/tajara.dm +++ b/code/modules/clothing/suits/aliens/tajara.dm @@ -4,10 +4,15 @@ icon_state = "zhan_furs" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER + drop_sound = 'sound/items/drop/leather.ogg' + pickup_sound = 'sound/items/pickup/leather.ogg' /obj/item/clothing/head/tajaran/scarf //This stays in /suits because it goes with the furs above name = "headscarf" desc = "A scarf of coarse fabric. Seems to have ear-holes." icon_state = "zhan_scarf" item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white") - body_parts_covered = HEAD|FACE \ No newline at end of file + body_parts_covered = HEAD|FACE + body_parts_covered = HEAD|FACE + drop_sound = 'sound/items/drop/leather.ogg' + pickup_sound = 'sound/items/pickup/leather.ogg' diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 16b919b5469..61301cffa6b 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -18,6 +18,8 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi', //Teshari can into webbing, too! SPECIES_VOX = 'icons/mob/species/vox/ties.dmi') + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' /obj/item/clothing/accessory/Destroy() on_removed() @@ -224,6 +226,8 @@ desc = "A bronze medal." icon_state = "bronze" slot = ACCESSORY_SLOT_MEDAL + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' /obj/item/clothing/accessory/medal/conduct name = "distinguished conduct medal" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 2a61fe58080..044218dcb29 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -14,6 +14,9 @@ var/stored_name var/badge_string = "Corporate Security" + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + /obj/item/clothing/accessory/badge/old name = "faded badge" desc = "A faded badge, backed with leather. It bears the emblem of the Forensic division." diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/under/accessories/lockets.dm index e4e17a3d1aa..f7c567873c5 100644 --- a/code/modules/clothing/under/accessories/lockets.dm +++ b/code/modules/clothing/under/accessories/lockets.dm @@ -2,6 +2,8 @@ name = "silver locket" desc = "A small locket of high-quality metal." icon_state = "locket" + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' w_class = ITEMSIZE_SMALL slot_flags = SLOT_MASK | SLOT_TIE slot = ACCESSORY_SLOT_DECOR diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 02054d2600a..0f4afce7814 100755 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/card_cit.dmi' icon_state = "permit-civilian" body_parts_covered = 0 + equip_sound = null sprite_sheets = list() diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm index 767c041c833..6b1d828d023 100644 --- a/code/modules/detectivework/tools/crimekit.dm +++ b/code/modules/detectivework/tools/crimekit.dm @@ -5,6 +5,8 @@ icon = 'icons/obj/forensics.dmi' icon_state = "case" storage_slots = 14 + drop_sound = 'sound/items/drop/toolbox.ogg' + pickup_sound = 'sound/items/pickup/toolbox.ogg' /obj/item/storage/briefcase/crimekit/New() ..() @@ -13,4 +15,4 @@ new /obj/item/reagent_containers/spray/luminol(src) new /obj/item/uv_light(src) new /obj/item/forensics/sample_kit(src) - new /obj/item/forensics/sample_kit/powder(src) \ No newline at end of file + new /obj/item/forensics/sample_kit/powder(src) diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 8c3e1aee120..14c6cd7ff4d 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -25,6 +25,9 @@ can_be_placed_into = null flags = OPENCONTAINER | NOBLUDGEON unacidable = 0 + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' + var/on_fire = 0 var/burn_time = 20 //if the rag burns for too long it turns to ashes diff --git a/code/modules/detectivework/tools/swabs.dm b/code/modules/detectivework/tools/swabs.dm index 679e34a618d..b173483df6c 100644 --- a/code/modules/detectivework/tools/swabs.dm +++ b/code/modules/detectivework/tools/swabs.dm @@ -5,6 +5,8 @@ var/gsr = 0 var/list/dna var/used + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/forensics/swab/proc/is_used() return used diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 956bbb69d31..529926b991c 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -15,6 +15,8 @@ var/access = list() access = access_crate_cash var/worth = 0 + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' /obj/item/spacecash/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/spacecash)) @@ -150,6 +152,8 @@ proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) name = "charge card" icon_state = "efundcard" desc = "A card that holds an amount of money." + drop_sound = 'sound/items/drop/card.ogg' + pickup_sound = 'sound/items/pickup/card.ogg' var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions. attack_self() return //Don't act attackby() return //like actual diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index ea1fb96b846..0881ca7c226 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -8,6 +8,8 @@ possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. var/filling_color = "#FFFFFF" //Used by sandwiches. + drop_sound = 'sound/items/drop/food.ogg' + pickup_sound = 'sound/items/pickup/food.ogg' var/list/center_of_mass = list() // Used for table placement diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 18b2cd77c53..87b33006790 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -2,6 +2,8 @@ volume = 40 //just over one and a half cups amount_per_transfer_from_this = 5 flags = 0 //starts closed + drop_sound = 'sound/items/drop/soda.ogg' + pickup_sound = 'sound/items/pickup/soda.ogg' //DRINKS @@ -20,6 +22,8 @@ desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles." icon_state = "waterbottle" center_of_mass = list("x"=15, "y"=8) + drop_sound = 'sound/items/drop/disk.ogg' + pickup_sound = 'sound/items/pickup/disk.ogg' /obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize() . = ..() @@ -133,4 +137,4 @@ /obj/item/reagent_containers/food/drinks/cans/gingerale/Initialize() . = ..() - reagents.add_reagent("gingerale", 30) \ No newline at end of file + reagents.add_reagent("gingerale", 30) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index a8abffc8324..632c09bcd01 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -5,6 +5,8 @@ name = "drink" desc = "yummy" icon = 'icons/obj/drinks.dmi' + drop_sound = 'sound/items/drop/bottle.ogg' + pickup_sound = 'sound/items/pickup/bottle.ogg' icon_state = null flags = OPENCONTAINER amount_per_transfer_from_this = 5 @@ -116,6 +118,9 @@ icon_state = "milk" item_state = "carton" center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + /obj/item/reagent_containers/food/drinks/milk/Initialize() . = ..() @@ -127,6 +132,9 @@ icon_state = "soymilk" item_state = "carton" center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + /obj/item/reagent_containers/food/drinks/soymilk/Initialize() . = ..() reagents.add_reagent("soymilk", 50) @@ -138,6 +146,8 @@ icon_state = "mini-milk" item_state = "carton" center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/reagent_containers/food/drinks/smallmilk/Initialize() . = ..() reagents.add_reagent("milk", 30) @@ -149,6 +159,8 @@ icon_state = "mini-milk_choco" item_state = "carton" center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/reagent_containers/food/drinks/smallchocmilk/Initialize() . = ..() reagents.add_reagent("chocolate_milk", 30) @@ -158,6 +170,8 @@ desc = "Careful, the beverage you're about to enjoy is extremely hot." icon_state = "coffee" center_of_mass = list("x"=15, "y"=10) + drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/reagent_containers/food/drinks/coffee/Initialize() . = ..() reagents.add_reagent("coffee", 30) @@ -168,6 +182,8 @@ icon_state = "teacup" item_state = "coffee" center_of_mass = list("x"=16, "y"=14) + drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/reagent_containers/food/drinks/tea/Initialize() . = ..() diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index de5063eef0c..d005cddd809 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -8,6 +8,8 @@ volume = 30 unacidable = 1 //glass center_of_mass = list("x"=16, "y"=10) + drop_sound = 'sound/items/drop/drinkglass.ogg' + pickup_sound = 'sound/items/pickup/drinkglass.ogg' matter = list("glass" = 500) on_reagent_change() @@ -173,4 +175,4 @@ reagents.add_reagent("iron", 10) reagents.add_reagent("protein", 15) reagents.add_reagent("water", 45) - on_reagent_change() \ No newline at end of file + on_reagent_change() diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 38458c352c1..3ad4b3530c6 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -2006,6 +2006,8 @@ filling_color = "#9E673A" nutriment_amt = 6 nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2) + drop_sound = 'sound/items/drop/shovel.ogg' + pickup_sound = 'sound/items/pickup/shovel.ogg' /obj/item/reagent_containers/food/snacks/stew/Initialize() . = ..() diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index 7130d9a8b6c..7daf3f62d72 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -11,6 +11,8 @@ possible_transfer_amounts = list(5,10,15,25,30,60) flags = 0 volume = 60 + drop_sound = 'sound/items/drop/bottle.ogg' + pickup_sound = 'sound/items/pickup/bottle.ogg' /obj/item/reagent_containers/glass/bottle/on_reagent_change() update_icon() @@ -172,4 +174,4 @@ desc = "A bottle of raw biomass! Gross!" icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("biomass" = 60) \ No newline at end of file + prefill = list("biomass" = 60) diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/kitchen/cooking_machines/_mixer.dm index 4b84a2dbc70..e22e075e29f 100644 --- a/code/modules/food/kitchen/cooking_machines/_mixer.dm +++ b/code/modules/food/kitchen/cooking_machines/_mixer.dm @@ -15,6 +15,7 @@ fundamental differences cooking_power = 0.4 active_power_usage = 3000 idle_power_usage = 50 + var/datum/looping_sound/mixer/mixer_loop /obj/machinery/appliance/mixer/examine(var/mob/user) ..() @@ -26,6 +27,13 @@ fundamental differences cooking = 0 selected_option = pick(output_options) + mixer_loop = new(list(src), FALSE) + +/obj/machinery/appliance/mixer/Destroy() + . = ..() + + QDEL_NULL(mixer_loop) + //Mixers cannot-not do combining mode. So the default option is removed from this. A combine target must be chosen /obj/machinery/appliance/mixer/choose_output() set src in oview(1) @@ -133,8 +141,12 @@ fundamental differences /obj/machinery/appliance/mixer/update_icon() if (!stat) icon_state = on_icon + if(mixer_loop) + mixer_loop.start(src) else icon_state = off_icon + if(mixer_loop) + mixer_loop.stop(src) /obj/machinery/appliance/mixer/process() diff --git a/code/modules/food/kitchen/cooking_machines/candy.dm b/code/modules/food/kitchen/cooking_machines/candy.dm index 2010f1b6498..ea38dac45b8 100644 --- a/code/modules/food/kitchen/cooking_machines/candy.dm +++ b/code/modules/food/kitchen/cooking_machines/candy.dm @@ -6,6 +6,7 @@ on_icon = "mixer_on" cook_type = "candied" appliancetype = CANDYMAKER + var/datum/looping_sound/candymaker/candymaker_loop cooking_power = 0.6 output_options = list( @@ -15,6 +16,28 @@ "Jelly" = /obj/item/reagent_containers/food/snacks/variable/jelly ) +/obj/machinery/appliance/mixer/candy/Initialize() + . = ..() + + candymaker_loop = new(list(src), FALSE) + +/obj/machinery/appliance/mixer/candy/Destroy() + . = ..() + + QDEL_NULL(candymaker_loop) + +/obj/machinery/appliance/mixer/candy/update_icon() + . = ..() + + if(!stat) + icon_state = on_icon + if(candymaker_loop) + candymaker_loop.start(src) + else + icon_state = off_icon + if(candymaker_loop) + candymaker_loop.stop(src) + /obj/machinery/appliance/mixer/candy/change_product_appearance(obj/item/reagent_containers/food/snacks/product) food_color = get_random_colour(1) . = ..() diff --git a/code/modules/food/kitchen/cooking_machines/cereal.dm b/code/modules/food/kitchen/cooking_machines/cereal.dm index 84c132e27b9..09139f4714a 100644 --- a/code/modules/food/kitchen/cooking_machines/cereal.dm +++ b/code/modules/food/kitchen/cooking_machines/cereal.dm @@ -7,11 +7,22 @@ on_icon = "cereal_on" off_icon = "cereal_off" appliancetype = CEREALMAKER + var/datum/looping_sound/cerealmaker/cerealmaker_loop output_options = list( "Cereal" = /obj/item/reagent_containers/food/snacks/variable/cereal ) +/obj/machinery/appliance/mixer/cereal/Initialize() + . = ..() + + cerealmaker_loop = new(list(src), FALSE) + +/obj/machinery/appliance/mixer/cereal/Destroy() + . = ..() + + QDEL_NULL(cerealmaker_loop) + /* /obj/machinery/appliance/cereal/change_product_strings(var/obj/item/reagent_containers/food/snacks/product, var/datum/cooking_item/CI) . = ..() @@ -30,6 +41,18 @@ product.overlays += food_image */ +/obj/machinery/appliance/mixer/cereal/update_icon() + . = ..() + + if(!stat) + icon_state = on_icon + if(cerealmaker_loop) + cerealmaker_loop.start(src) + else + icon_state = off_icon + if(cerealmaker_loop) + cerealmaker_loop.stop(src) + /obj/machinery/appliance/mixer/cereal/combination_cook(var/datum/cooking_item/CI) var/list/images = list() diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 1b3a0d12803..9b70287e83a 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -155,3 +155,9 @@ shortname = "basket" desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used." icon_state = "basket" + +/obj/item/reagent_containers/cooking_container/grill + name = "grill rack" + shortname = "rack" + desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly. Alt click to remove contents." + icon_state = "grillrack" diff --git a/code/modules/food/kitchen/cooking_machines/grill.dm b/code/modules/food/kitchen/cooking_machines/grill.dm index 509f236725c..328e85d7560 100644 --- a/code/modules/food/kitchen/cooking_machines/grill.dm +++ b/code/modules/food/kitchen/cooking_machines/grill.dm @@ -1,4 +1,4 @@ -/obj/machinery/appliance/grill +/obj/machinery/appliance/cooker/grill name = "grill" desc = "Backyard grilling, IN SPACE." icon_state = "grill_off" @@ -6,16 +6,52 @@ food_color = "#A34719" on_icon = "grill_on" off_icon = "grill_off" - can_burn_food = 0 - stat = POWEROFF + can_burn_food = TRUE + var/datum/looping_sound/grill/grill_loop + active_power_usage = 4 KILOWATTS + idle_power_usage = 2 KILOWATTS + + optimal_power = 1.2 // Things on the grill cook .6 faster - this is now the fastest appliance to heat and to cook on. BURGERS GO SIZZLE. + + stat = POWEROFF // Starts turned off. + + // Grill is faster to heat and setup than the rest. + optimal_temp = 120 + T0C + min_temp = 60 + T0C + resistance = 8 KILOWATTS // Very fast to heat up. + + max_contents = 3 // Arbitrary number, 3 grill 'racks' + container_type = /obj/item/reagent_containers/cooking_container/grill + +/obj/machinery/appliance/cooker/grill/Initialize() + . = ..() + grill_loop = new(list(src), FALSE) + +/obj/machinery/appliance/cooker/grill/Destroy() + QDEL_NULL(grill_loop) + return ..() + +/obj/machinery/appliance/cooker/grill/update_icon() // TODO: Cooking icon + if(!stat) + icon_state = on_icon + if(cooking == TRUE) + if(grill_loop) + grill_loop.start(src) + else + if(grill_loop) + grill_loop.stop(src) + else + icon_state = off_icon + if(grill_loop) + grill_loop.stop(src) + +/* // Test Comment this out too, /cooker does this for us, and this path '/obj/machinery/appliance/grill' is invalid anyways, meaning it does jack shit. - Updated the paths, but I'm basically commenting all this shit out and if the grill works as-normal, none of this stuff is needed. /obj/machinery/appliance/grill/toggle_power() set src in view() set name = "Toggle Power" set category = "Object" - var/datum/cooking_item/CI = cooking_objs[1] - if (stat & POWEROFF)//Its turned off stat &= ~POWEROFF if (usr) @@ -29,53 +65,44 @@ usr.visible_message("[usr] turns \the [src] off", "You turn off \the [src].") playsound(src, 'sound/machines/click.ogg', 40, 1) update_icon() - -/obj/machinery/appliance/grill/Initialize() +/obj/machinery/appliance/cooker/grill/Initialize() . = ..() - cooking_objs += new /datum/cooking_item(new /obj/item/reagent_containers/cooking_container(src)) - cooking = 0 - -/obj/machinery/appliance/grill/has_space(var/obj/item/I) + // cooking_objs += new /datum/cooking_item(new /obj/item/weapon/reagent_containers/cooking_container(src)) + cooking = FALSE +/obj/machinery/appliance/cooker/grill/has_space(var/obj/item/I) var/datum/cooking_item/CI = cooking_objs[1] if (!CI || !CI.container) return 0 - if (CI.container.can_fit(I)) return CI - return 0 - +*/ +/* // Test comment this out, I don't think this is doing shit anyways. //Container is not removable /obj/machinery/appliance/grill/removal_menu(var/mob/user) - if (!can_remove_items(user)) return 0 - - var/datum/cooking_item/CI = cooking_objs[1] - - var/list/menuoptions = list() - if (CI.container) - if (!CI.container.check_contents()) - to_chat(user, "There's nothing in the [src] you can remove!") - return - - for (var/obj/item/I in CI.container) - menuoptions[I.name] = I - - var/selection = input(user, "Which item would you like to remove? If you want to remove chemicals, use an empty beaker.", "Remove ingredients") as null|anything in menuoptions - if (selection) - var/obj/item/I = menuoptions[selection] - if (!user || !user.put_in_hands(I)) - I.forceMove(get_turf(src)) - if (cooking_objs[1].container.check_contents() == 0) //Are we empty now? Can we stop doing cooking ticks? - cooking_objs[1].reset() //Great, we are. Let's reset the container. - return 1 - -/obj/machinery/appliance/grill/update_icon() - if (!stat) - icon_state = on_icon - else - icon_state = off_icon + if (can_remove_items(user)) + var/list/menuoptions = list() + for (var/a in cooking_objs) + var/datum/cooking_item/CI = a + if (CI.container) + if (!CI.container.check_contents()) + to_chat(user, "There's nothing in the [src] you can remove!") + return + for (var/obj/item/I in CI.container) + menuoptions[I.name] = I + var/selection = input(user, "Which item would you like to remove? If you want to remove chemicals, use an empty beaker.", "Remove ingredients") as null|anything in menuoptions + if (selection) + var/obj/item/I = menuoptions[selection] + if (!user || !user.put_in_hands(I)) + I.forceMove(get_turf(src)) + update_icon() + return 1 + return 0 +*/ +/* // Test remove this too. /obj/machinery/appliance/grill/process() if (!stat) for (var/i in cooking_objs) do_cooking_tick(i) +*/ diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm index 6abc68b54b7..b2ab6aec24f 100644 --- a/code/modules/food/kitchen/cooking_machines/oven.dm +++ b/code/modules/food/kitchen/cooking_machines/oven.dm @@ -7,6 +7,7 @@ appliancetype = OVEN food_color = "#A34719" can_burn_food = 1 + var/datum/looping_sound/oven/oven_loop active_power_usage = 6 KILOWATTS //Based on a double deck electric convection oven @@ -35,15 +36,29 @@ "Donut" = /obj/item/reagent_containers/food/snacks/variable/donut ) +/obj/machinery/appliance/cooker/oven/Initialize() + . = ..() + + oven_loop = new(list(src), FALSE) + +/obj/machinery/appliance/cooker/oven/Destroy() + QDEL_NULL(oven_loop) + return ..() /obj/machinery/appliance/cooker/oven/update_icon() if (!open) if (!stat) icon_state = "ovenclosed_on" + if(oven_loop) + oven_loop.stop(src) else icon_state = "ovenclosed_off" + if(oven_loop) + oven_loop.stop(src) else icon_state = "ovenopen" + if(oven_loop) + oven_loop.stop(src) ..() /obj/machinery/appliance/cooker/oven/AltClick(var/mob/user) diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 07bcd9a6e44..75f4706d9dc 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -18,6 +18,9 @@ name = "deck of cards" desc = "A simple deck of playing cards." icon_state = "deck" + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + /obj/item/deck/cards/New() ..() @@ -280,6 +283,8 @@ w_class = ITEMSIZE_TINY var/list/cards = list() var/parentdeck = null // This variable is added here so that card pack dependent card can be mixed together by defining a "parentdeck" for them + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' /obj/item/pack/attack_self(var/mob/user as mob) @@ -300,6 +305,8 @@ desc = "Some playing cards." icon = 'icons/obj/playing_cards.dmi' icon_state = "empty" + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' w_class = ITEMSIZE_TINY var/concealed = 0 diff --git a/code/modules/games/dice.dm b/code/modules/games/dice.dm index 1018689ab73..7c85e49b464 100644 --- a/code/modules/games/dice.dm +++ b/code/modules/games/dice.dm @@ -81,6 +81,8 @@ icon = 'icons/obj/dice.dmi' icon_state = "dicebag" base_icon = "dicebag" + drop_sound = 'sound/items/drop/hat.ogg' + pickup_sound = 'sound/items/pickup/hat.ogg' /obj/item/storage/pill_bottle/dice/New() ..() @@ -93,6 +95,8 @@ icon = 'icons/obj/dice.dmi' icon_state = "magicdicebag" base_icon = "magicdicebag" + drop_sound = 'sound/items/drop/hat.ogg' + pickup_sound = 'sound/items/pickup/hat.ogg' /obj/item/storage/pill_bottle/dice_nerd/New() ..() @@ -156,4 +160,4 @@ /obj/item/storage/dicecup/loaded/New() ..() for(var/i = 1 to 5) - new /obj/item/dice( src ) \ No newline at end of file + new /obj/item/dice( src ) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 19c8d2433b0..a908cb5002c 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -348,6 +348,8 @@ datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/u name = "basketball" desc = "Here's your chance, do your dance at the Space Jam." w_class = ITEMSIZE_LARGE //Stops people from hiding it in their bags/pockets + drop_sound = 'sound/items/drop/basketball.ogg' + pickup_sound = 'sound/items/pickup/basketball.ogg' /obj/structure/holohoop name = "basketball hoop" diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index db32602d200..032ca1d4c86 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -7,6 +7,8 @@ desc = "Nutritious! Probably." flags = NOCONDUCT slot_flags = SLOT_HOLSTER + drop_sound = 'sound/items/drop/herb.ogg' + pickup_sound = 'sound/items/pickup/herb.ogg' var/plantname var/datum/seed/seed diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index fcb5f2dd291..e2522871787 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -213,6 +213,9 @@ var/title // The real name of the book. var/carved = 0 // Has the book been hollowed out for use as a secret storage item? var/obj/item/store //What's in the book? + drop_sound = 'sound/items/drop/book.ogg' + pickup_sound = 'sound/items/pickup/book.ogg' + /obj/item/book/attack_self(var/mob/user as mob) if(carved) @@ -427,4 +430,4 @@ to_chat(user, "Computer has been associated with this unit.") else to_chat(user, "No associated computer found. Only local scans will function properly.") - to_chat(user, "\n") \ No newline at end of file + to_chat(user, "\n") diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 05706b85328..77b0e64a6c6 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -17,6 +17,8 @@ var/perunit = SHEET_MATERIAL_AMOUNT var/apply_colour //temp pending icon rewrite var/allow_window_autobuild = TRUE + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' /obj/item/stack/material/Initialize(mapload, new_amount, merge = TRUE) if(!default_type) @@ -107,17 +109,23 @@ icon_state = "sheet-sandstone" default_type = "sandstone" no_variants = FALSE + drop_sound = 'sound/items/drop/boots.ogg' + pickup_sound = 'sound/items/pickup/boots.ogg' /obj/item/stack/material/marble name = "marble brick" icon_state = "sheet-marble" default_type = "marble" no_variants = FALSE + drop_sound = 'sound/items/drop/boots.ogg' + pickup_sound = 'sound/items/pickup/boots.ogg' /obj/item/stack/material/diamond name = "diamond" icon_state = "sheet-diamond" default_type = "diamond" + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/stack/material/uranium name = "uranium" @@ -318,6 +326,8 @@ icon_state = "sheet-wood" default_type = MAT_WOOD strict_color_stacking = TRUE + drop_sound = 'sound/items/drop/wooden.ogg' + pickup_sound = 'sound/items/pickup/wooden.ogg' /obj/item/stack/material/wood/sif name = "alien wooden plank" @@ -334,6 +344,8 @@ w_class = ITEMSIZE_HUGE description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks." var/plank_type = /obj/item/stack/material/wood + drop_sound = 'sound/items/drop/wooden.ogg' + pickup_sound = 'sound/items/pickup/wooden.ogg' /obj/item/stack/material/log/sif name = "alien log" @@ -371,6 +383,8 @@ no_variants = FALSE pass_color = TRUE strict_color_stacking = TRUE + drop_sound = 'sound/items/drop/cloth.ogg' + pickup_sound = 'sound/items/pickup/cloth.ogg' /obj/item/stack/material/resin name = "resin" @@ -388,6 +402,8 @@ no_variants = FALSE pass_color = TRUE strict_color_stacking = TRUE + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' /obj/item/stack/material/snow name = "snow" @@ -409,12 +425,16 @@ no_variants = FALSE pass_color = TRUE strict_color_stacking = TRUE + drop_sound = 'sound/items/drop/leather.ogg' + pickup_sound = 'sound/items/pickup/leather.ogg' /obj/item/stack/material/glass name = "glass" icon_state = "sheet-glass" default_type = "glass" no_variants = FALSE + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/stack/material/glass/reinforced name = "reinforced glass" diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 6d44cad56e0..d077b9d0b90 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -10,6 +10,8 @@ slot_flags = SLOT_EARS var/string_attached var/sides = 2 + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' /obj/item/coin/New() pixel_x = rand(0,16)-8 diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index f38d57ca241..08180d903f4 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -485,6 +485,12 @@ else m_type = 1 + if("crack") + if(!restrained()) + message = "cracks [T.his] knuckles." + playsound(src, 'sound/voice/knuckles.ogg', 50, 1,) + m_type = 1 + if ("raise") if (!src.restrained()) message = "raises a hand." diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index f798010b76d..815e505449d 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -4,6 +4,8 @@ var/list/organ_cache = list() name = "organ" icon = 'icons/obj/surgery.dmi' germ_level = 0 + drop_sound = 'sound/items/drop/flesh.ogg' + pickup_sound = 'sound/items/pickup/flesh.ogg' // Strings. var/organ_tag = "organ" // Unique identifier. diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 8ab593b9b79..5df31435c11 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -100,6 +100,7 @@ if(istype(O) && !QDELETED(O) && (O in view(7,linked))) playsound(loc, "sound/machines/dotprinter.ogg", 30, 1) new/obj/item/paper/(get_turf(src), O.get_scan_data(user), "paper (Sensor Scan - [O])") + playsound(src, "sound/machines/printer.ogg", 30, 1) return TOPIC_HANDLED /obj/machinery/computer/ship/sensors/process() diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 3de8cc4bcdc..9b104706a0a 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -144,7 +144,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins return 0 //You can't send faxes to "Unknown" flick("faxreceive", src) - playsound(loc, "sound/effects/printer.ogg", 50, 1) + playsound(src, "sound/machines/printer.ogg", 50, 1) // give the sprite some time to flick @@ -207,7 +207,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins for(var/client/C in admins) if(check_rights((R_ADMIN|R_MOD),0,C)) C << msg - C << 'sound/effects/printer.ogg' + C << 'sound/machines/printer.ogg' // VoreStation Edit Start var/faxid = export_fax(sent) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index d41e910c06f..74c2479f366 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -5,6 +5,8 @@ icon_state = "folder" w_class = ITEMSIZE_SMALL pressure_resistance = 2 + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' /obj/item/folder/blue desc = "A blue folder." diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index ab6b853254e..d2c6dc35930 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -19,6 +19,8 @@ slot_flags = SLOT_HEAD body_parts_covered = HEAD attack_verb = list("bapped") + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' var/info //What's actually written on the paper. var/info_links //A different version of the paper which includes html links at fields and EOF diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 509465637df..61d71044eea 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -12,6 +12,8 @@ layer = MOB_LAYER pressure_resistance = 1 attack_verb = list("bapped") + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' var/page = 1 // current page var/list/pages = list() // Ordered list of pages as they are to be displayed. Can be different order than src.contents. diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 4ba3e4dc93e..1481fbb0413 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -15,6 +15,9 @@ layer = OBJ_LAYER - 0.1 var/amount = 30 //How much paper is in the bin. var/list/papers = new/list() //List of papers put in the bin for reference. + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + /obj/item/paper_bin/MouseDrop(mob/user as mob) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 45f96b1a8b6..ca29d2ede72 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -23,7 +23,8 @@ matter = list(DEFAULT_WALL_MATERIAL = 10) var/colour = "black" //what colour the ink is! pressure_resistance = 2 - + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' /obj/item/pen/blue desc = "It's a normal blue ink pen." @@ -199,6 +200,8 @@ var/uses = 30 //0 for unlimited uses var/instant = 0 var/colourName = "red" //for updateIcon purposes + drop_sound = 'sound/items/drop/gloves.ogg' + pickup_sound = 'sound/items/pickup/gloves.ogg' /obj/item/pen/crayon/suicide_act(mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index f0d0bd43eea..315903714d0 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -29,6 +29,8 @@ var/global/photo_count = 0 icon_state = "photo" item_state = "paper" w_class = ITEMSIZE_SMALL + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' var/id var/icon/img //Big photo image var/scribble //Scribble on the back. diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index c42729b9159..5ef78f450d0 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -517,6 +517,8 @@ obj/structure/cable/proc/cableColor(var/colorC) item_state = "coil" attack_verb = list("whipped", "lashed", "disciplined", "flogged") stacktype = /obj/item/stack/cable_coil + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' /obj/item/stack/cable_coil/cyborg name = "cable coil synthesizer" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 0e3015d61d0..95be0e32312 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -743,6 +743,8 @@ var/global/list/light_type_cache = list() var/brightness_range = 2 //how much light it gives off var/brightness_power = 1 var/brightness_color = LIGHT_COLOR_INCANDESCENT_TUBE + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/light/tube name = "light tube" diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index f95a58afd96..ea0cca828b6 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -33,6 +33,10 @@ #define WARNING_DELAY 20 //seconds between warnings. +// Keeps Accent sounds from layering, increase or decrease as preferred. +#define SUPERMATTER_ACCENT_SOUND_COOLDOWN 2 SECONDS + + /obj/machinery/power/supermatter name = "Supermatter" desc = "A strangely translucent and iridescent crystal. You get headaches just from looking at it." @@ -88,6 +92,9 @@ var/debug = 0 + /// Cooldown tracker for accent sounds, + var/last_accent_sound = 0 + var/datum/looping_sound/supermatter/soundloop /obj/machinery/power/supermatter/New() @@ -256,12 +263,28 @@ shift_light(4,initial(light_color)) if(grav_pulling) supermatter_pull(src) - + // Vary volume by power produced. if(power) // Volume will be 1 at no power, ~12.5 at ENERGY_NITROGEN, and 20+ at ENERGY_PHORON. // Capped to 20 volume since higher volumes get annoying and it sounds worse. - soundloop.volume = min(round(power/10)+1, 20) + // Formula previously was min(round(power/10)+1, 20) + soundloop.volume = CLAMP((50 + (power / 50)), 50, 100) + // Swap loops between calm and delamming. + if(damage >= 300) + soundloop.mid_sounds = list('sound/machines/sm/loops/delamming.ogg' = 1) + else + soundloop.mid_sounds = list('sound/machines/sm/loops/calm.ogg' = 1) + + // Play Delam/Neutral sounds at rate determined by power and damage. + if(last_accent_sound < world.time && prob(20)) + var/aggression = min(((damage / 800) * (power / 2500)), 1.0) * 100 + if(damage >= 300) + playsound(src, "smdelam", max(50, aggression), FALSE, 10) + else + playsound(src, "smcalm", max(50, aggression), FALSE, 10) + var/next_sound = round((100 - aggression) * 5) + last_accent_sound = world.time + max(SUPERMATTER_ACCENT_SOUND_COOLDOWN, next_sound) //Ok, get the air from the turf var/datum/gas_mixture/removed = null var/datum/gas_mixture/env = null diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index d7f625eb70b..cea8a4bac38 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -7,6 +7,8 @@ throwforce = 1 w_class = ITEMSIZE_TINY preserve_item = 1 + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' var/leaves_residue = 1 var/caliber = "" //Which kind of guns it can be loaded into diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index ed1fb42cd1d..9f0a6784804 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -6,6 +6,8 @@ icon = 'icons/obj/weapons.dmi' icon_state = "bolt" item_state = "bolt" + drop_sound = 'sound/items/drop/sword.ogg' + pickup_sound = 'sound/items/pickup/sword.ogg' throwforce = 8 w_class = ITEMSIZE_NORMAL sharp = 1 @@ -24,6 +26,8 @@ icon = 'icons/obj/weapons.dmi' icon_state = "metal-rod" item_state = "bolt" + drop_sound = 'sound/items/drop/sword.ogg' + pickup_sound = 'sound/items/pickup/sword.ogg' /obj/item/arrow/quill name = "alien quill" diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 5527914d163..869e23ab0f0 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -21,6 +21,8 @@ icon = 'icons/obj/bloodpack.dmi' icon_state = "empty" item_state = "bloodpack_empty" + drop_sound = 'sound/items/drop/food.ogg' + pickup_sound = 'sound/items/pickup/food.ogg' volume = 200 var/label_text = "" @@ -86,7 +88,7 @@ /obj/item/reagent_containers/blood/BMinus blood_type = "B-" - + /obj/item/reagent_containers/blood/ABPlus blood_type = "AB+" diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index f66ed42e2a0..3d9a2dc5436 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -11,6 +11,9 @@ w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS volume = 5 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + /obj/item/reagent_containers/dropper/examine(var/mob/user) if(!..(user, 2)) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 62b96355f78..9690ffccf78 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -16,6 +16,8 @@ w_class = ITEMSIZE_SMALL flags = OPENCONTAINER | NOCONDUCT unacidable = 1 //glass doesn't dissolve in acid + drop_sound = 'sound/items/drop/bottle.ogg' + pickup_sound = 'sound/items/pickup/bottle.ogg' var/label_text = "" @@ -155,6 +157,8 @@ icon_state = "beaker" item_state = "beaker" matter = list("glass" = 500) + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/reagent_containers/glass/beaker/Initialize() . = ..() @@ -257,6 +261,9 @@ volume = 120 flags = OPENCONTAINER unacidable = 0 + drop_sound = 'sound/items/drop/helm.ogg' + pickup_sound = 'sound/items/pickup/helm.ogg' + /obj/item/reagent_containers/glass/bucket/attackby(var/obj/item/D, mob/user as mob) if(isprox(D)) @@ -313,6 +320,8 @@ obj/item/reagent_containers/glass/bucket/wood volume = 120 flags = OPENCONTAINER unacidable = 0 + drop_sound = 'sound/items/drop/wooden.ogg' + pickup_sound = 'sound/items/pickup/wooden.ogg' /obj/item/reagent_containers/glass/bucket/wood/attackby(var/obj/D, mob/user as mob) if(isprox(D)) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index fe54b3c96ab..fa9005ab753 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -14,6 +14,8 @@ possible_transfer_amounts = null flags = OPENCONTAINER slot_flags = SLOT_BELT + drop_sound = 'sound/items/drop/gun.ogg' + pickup_sound = 'sound/items/pickup/gun.ogg' preserve_item = 1 var/filled = 0 var/list/filled_reagents = list() diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 68c42ba6730..f2ddf03f56e 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -7,6 +7,8 @@ icon = 'icons/obj/chemical.dmi' icon_state = null item_state = "pill" + drop_sound = 'sound/items/drop/food.ogg' + pickup_sound = 'sound/items/pickup/food.ogg' var/base_state = "pill" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 7f785a415be..231ad0cacfa 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -151,6 +151,8 @@ amount_per_transfer_from_this = 1 possible_transfer_amounts = null volume = 10 + drop_sound = 'sound/items/drop/herb.ogg' + pickup_sound = 'sound/items/pickup/herb.ogg' /obj/item/reagent_containers/spray/waterflower/Initialize() . = ..() @@ -198,4 +200,4 @@ /obj/item/reagent_containers/spray/plantbgone/Initialize() . = ..() - reagents.add_reagent("plantbgone", 100) \ No newline at end of file + reagents.add_reagent("plantbgone", 100) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 9c2b5786164..1ac44ec79ac 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -24,6 +24,8 @@ var/visible_name = "a syringe" var/time = 30 var/drawing = 0 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/reagent_containers/syringe/on_reagent_change() update_icon() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 329daacdaf4..19f56fdc6c2 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -111,6 +111,8 @@ name = "small parcel" icon = 'icons/obj/storage.dmi' //VOREStation Edit icon_state = "deliverycrate3" + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' var/obj/item/wrapped = null var/sortTag = null var/examtext = null diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 154ba1bd720..153a5ab4700 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -594,6 +594,7 @@ if(original_occupant) occupant = original_occupant + playsound(src, 'sound/machines/medbayscanner1.ogg', 100, 1) // Play our sound at the end of the mind injection! return 1 /obj/machinery/transhuman/resleever/proc/go_out(var/mob/M) diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index 7f8cfea0d81..c0c17c15203 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -8,7 +8,7 @@ //6 = code delta //config_legacy.alert_desc_blue_downto -/var/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/misc/notice1.ogg')) +/var/datum/announcement/priority/security/security_announcement_up = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/effects/alert_levels/alert_raise.ogg')) /var/datum/announcement/priority/security/security_announcement_down = new(do_log = 0, do_newscast = 1) /proc/set_security_level(var/level) @@ -60,7 +60,7 @@ security_level = SEC_LEVEL_BLUE if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) - security_announcement_up.Announce("[config_legacy.alert_desc_red_upto]", "Attention! Code red!", new_sound = 'sound/misc/voyalert.ogg') + security_announcement_up.Announce("[config_legacy.alert_desc_red_upto]", "Attention! Code red!", new_sound = 'sound/effects/alert_levels/red_alert.ogg') else security_announcement_down.Announce("[config_legacy.alert_desc_red_downto]", "Attention! Code red!", new_sound = 'sound/misc/voyalert.ogg') security_level = SEC_LEVEL_RED @@ -69,7 +69,7 @@ if(CC) CC.post_status("alert", "redalert")*/ if(SEC_LEVEL_DELTA) - security_announcement_up.Announce("[config_legacy.alert_desc_delta]", "Attention! Delta alert level reached!", new_sound = 'sound/misc/deltakalaxon.ogg',volume=5) + security_announcement_up.Announce("[config_legacy.alert_desc_delta]", "Attention! Delta alert level reached!", new_sound = 'sound/effects/alert_levels/deltaklaxon.ogg') security_level = SEC_LEVEL_DELTA var/newlevel = get_security_level() @@ -154,4 +154,4 @@ set_security_level(5) /mob/verb/set_thing6() set_security_level(6) -*/ \ No newline at end of file +*/ diff --git a/sound/ambience/ai/ai2.ogg b/sound/ambience/ai/ai2.ogg new file mode 100644 index 00000000000..691b437f496 Binary files /dev/null and b/sound/ambience/ai/ai2.ogg differ diff --git a/sound/ambience/ai/ai3.ogg b/sound/ambience/ai/ai3.ogg new file mode 100644 index 00000000000..b20e79fdde6 Binary files /dev/null and b/sound/ambience/ai/ai3.ogg differ diff --git a/sound/ambience/arrivals/arrivals3.ogg b/sound/ambience/arrivals/arrivals3.ogg new file mode 100644 index 00000000000..d396599d2da Binary files /dev/null and b/sound/ambience/arrivals/arrivals3.ogg differ diff --git a/sound/ambience/arrivals/arrivals4.ogg b/sound/ambience/arrivals/arrivals4.ogg new file mode 100644 index 00000000000..d82763c0e59 Binary files /dev/null and b/sound/ambience/arrivals/arrivals4.ogg differ diff --git a/sound/ambience/arrivals/arrivals5.ogg b/sound/ambience/arrivals/arrivals5.ogg new file mode 100644 index 00000000000..0e56fa439ed Binary files /dev/null and b/sound/ambience/arrivals/arrivals5.ogg differ diff --git a/sound/ambience/arrivals/arrivals6.ogg b/sound/ambience/arrivals/arrivals6.ogg new file mode 100644 index 00000000000..d0241cc0e2d Binary files /dev/null and b/sound/ambience/arrivals/arrivals6.ogg differ diff --git a/sound/ambience/arrivals/arrivals7.ogg b/sound/ambience/arrivals/arrivals7.ogg new file mode 100644 index 00000000000..3a609012d97 Binary files /dev/null and b/sound/ambience/arrivals/arrivals7.ogg differ diff --git a/sound/ambience/atmospherics/atmospherics1.ogg b/sound/ambience/atmospherics/atmospherics1.ogg new file mode 100644 index 00000000000..006de1c9cc6 Binary files /dev/null and b/sound/ambience/atmospherics/atmospherics1.ogg differ diff --git a/sound/ambience/expoutpost/expoutpost1.ogg b/sound/ambience/expoutpost/expoutpost1.ogg new file mode 100644 index 00000000000..04b393816fb Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost1.ogg differ diff --git a/sound/ambience/expoutpost/expoutpost2.ogg b/sound/ambience/expoutpost/expoutpost2.ogg new file mode 100644 index 00000000000..6c40d0a32b0 Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost2.ogg differ diff --git a/sound/ambience/expoutpost/expoutpost3.ogg b/sound/ambience/expoutpost/expoutpost3.ogg new file mode 100644 index 00000000000..ef9cfba72e2 Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost3.ogg differ diff --git a/sound/ambience/expoutpost/expoutpost4.ogg b/sound/ambience/expoutpost/expoutpost4.ogg new file mode 100644 index 00000000000..ad95b9d4750 Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost4.ogg differ diff --git a/sound/ambience/foreboding/foreboding3.ogg b/sound/ambience/foreboding/foreboding3.ogg new file mode 100644 index 00000000000..4214afd9b8b Binary files /dev/null and b/sound/ambience/foreboding/foreboding3.ogg differ diff --git a/sound/ambience/foreboding/foreboding4.ogg b/sound/ambience/foreboding/foreboding4.ogg new file mode 100644 index 00000000000..2a8177f274d Binary files /dev/null and b/sound/ambience/foreboding/foreboding4.ogg differ diff --git a/sound/ambience/foreboding/foreboding5.ogg b/sound/ambience/foreboding/foreboding5.ogg new file mode 100644 index 00000000000..604a013a5e2 Binary files /dev/null and b/sound/ambience/foreboding/foreboding5.ogg differ diff --git a/sound/ambience/foreboding/foreboding6.ogg b/sound/ambience/foreboding/foreboding6.ogg new file mode 100644 index 00000000000..522aec4afe4 Binary files /dev/null and b/sound/ambience/foreboding/foreboding6.ogg differ diff --git a/sound/ambience/foreboding/foreboding7.ogg b/sound/ambience/foreboding/foreboding7.ogg new file mode 100644 index 00000000000..b27c03d7365 Binary files /dev/null and b/sound/ambience/foreboding/foreboding7.ogg differ diff --git a/sound/ambience/hangar/hangar1.ogg b/sound/ambience/hangar/hangar1.ogg new file mode 100644 index 00000000000..6fea9fc0f5b Binary files /dev/null and b/sound/ambience/hangar/hangar1.ogg differ diff --git a/sound/ambience/hangar/hangar2.ogg b/sound/ambience/hangar/hangar2.ogg new file mode 100644 index 00000000000..1c8a63424c8 Binary files /dev/null and b/sound/ambience/hangar/hangar2.ogg differ diff --git a/sound/ambience/hangar/hangar3.ogg b/sound/ambience/hangar/hangar3.ogg new file mode 100644 index 00000000000..4518a70a943 Binary files /dev/null and b/sound/ambience/hangar/hangar3.ogg differ diff --git a/sound/ambience/hangar/hangar4.ogg b/sound/ambience/hangar/hangar4.ogg new file mode 100644 index 00000000000..a28c914c9ed Binary files /dev/null and b/sound/ambience/hangar/hangar4.ogg differ diff --git a/sound/ambience/hangar/hangar5.ogg b/sound/ambience/hangar/hangar5.ogg new file mode 100644 index 00000000000..cef20f5628b Binary files /dev/null and b/sound/ambience/hangar/hangar5.ogg differ diff --git a/sound/ambience/hangar/hangar6.ogg b/sound/ambience/hangar/hangar6.ogg new file mode 100644 index 00000000000..938cb83f195 Binary files /dev/null and b/sound/ambience/hangar/hangar6.ogg differ diff --git a/sound/ambience/highsec/highsec3.ogg b/sound/ambience/highsec/highsec3.ogg new file mode 100644 index 00000000000..87318e62039 Binary files /dev/null and b/sound/ambience/highsec/highsec3.ogg differ diff --git a/sound/ambience/highsec/highsec4.ogg b/sound/ambience/highsec/highsec4.ogg new file mode 100644 index 00000000000..9fb613e031b Binary files /dev/null and b/sound/ambience/highsec/highsec4.ogg differ diff --git a/sound/ambience/maintenance/maintenance6.ogg b/sound/ambience/maintenance/maintenance6.ogg index 522aec4afe4..4a8078b344c 100644 Binary files a/sound/ambience/maintenance/maintenance6.ogg and b/sound/ambience/maintenance/maintenance6.ogg differ diff --git a/sound/ambience/maintenance/maintenance7.ogg b/sound/ambience/maintenance/maintenance7.ogg new file mode 100644 index 00000000000..13b07ee8030 Binary files /dev/null and b/sound/ambience/maintenance/maintenance7.ogg differ diff --git a/sound/ambience/maintenance/maintenance8.ogg b/sound/ambience/maintenance/maintenance8.ogg new file mode 100644 index 00000000000..dc3cd9a5897 Binary files /dev/null and b/sound/ambience/maintenance/maintenance8.ogg differ diff --git a/sound/ambience/maintenance/maintenance9.ogg b/sound/ambience/maintenance/maintenance9.ogg new file mode 100644 index 00000000000..728049f3ede Binary files /dev/null and b/sound/ambience/maintenance/maintenance9.ogg differ diff --git a/sound/ambience/substation/substation1.ogg b/sound/ambience/substation/substation1.ogg new file mode 100644 index 00000000000..cee14fcd13d Binary files /dev/null and b/sound/ambience/substation/substation1.ogg differ diff --git a/sound/ambience/substation/substation2.ogg b/sound/ambience/substation/substation2.ogg new file mode 100644 index 00000000000..7d79f0e3c4a Binary files /dev/null and b/sound/ambience/substation/substation2.ogg differ diff --git a/sound/effects/alert_levels/alert_raise.ogg b/sound/effects/alert_levels/alert_raise.ogg new file mode 100644 index 00000000000..da6454ce3cf Binary files /dev/null and b/sound/effects/alert_levels/alert_raise.ogg differ diff --git a/sound/effects/alert_levels/deltaklaxon.ogg b/sound/effects/alert_levels/deltaklaxon.ogg new file mode 100644 index 00000000000..7a9522c1ff6 Binary files /dev/null and b/sound/effects/alert_levels/deltaklaxon.ogg differ diff --git a/sound/effects/alert_levels/red_alert.ogg b/sound/effects/alert_levels/red_alert.ogg new file mode 100644 index 00000000000..6eed302098e Binary files /dev/null and b/sound/effects/alert_levels/red_alert.ogg differ diff --git a/sound/effects/pai_boot.ogg b/sound/effects/pai_boot.ogg new file mode 100644 index 00000000000..3d6783fe703 Binary files /dev/null and b/sound/effects/pai_boot.ogg differ diff --git a/sound/items/drop/accessory.ogg b/sound/items/drop/accessory.ogg new file mode 100644 index 00000000000..92ff70346dd Binary files /dev/null and b/sound/items/drop/accessory.ogg differ diff --git a/sound/items/drop/ammobox.ogg b/sound/items/drop/ammobox.ogg new file mode 100644 index 00000000000..13fce70fe3d Binary files /dev/null and b/sound/items/drop/ammobox.ogg differ diff --git a/sound/items/drop/axe.ogg b/sound/items/drop/axe.ogg new file mode 100644 index 00000000000..eae55a6fd50 Binary files /dev/null and b/sound/items/drop/axe.ogg differ diff --git a/sound/items/drop/backpack.ogg b/sound/items/drop/backpack.ogg new file mode 100644 index 00000000000..a28f4d68380 Binary files /dev/null and b/sound/items/drop/backpack.ogg differ diff --git a/sound/items/drop/basketball.ogg b/sound/items/drop/basketball.ogg new file mode 100644 index 00000000000..6520c7a9066 Binary files /dev/null and b/sound/items/drop/basketball.ogg differ diff --git a/sound/items/drop/book.ogg b/sound/items/drop/book.ogg new file mode 100644 index 00000000000..b492b665f59 Binary files /dev/null and b/sound/items/drop/book.ogg differ diff --git a/sound/items/drop/boots.ogg b/sound/items/drop/boots.ogg new file mode 100644 index 00000000000..87176cdca23 Binary files /dev/null and b/sound/items/drop/boots.ogg differ diff --git a/sound/items/drop/bottle.ogg b/sound/items/drop/bottle.ogg new file mode 100644 index 00000000000..8df93e32b70 Binary files /dev/null and b/sound/items/drop/bottle.ogg differ diff --git a/sound/items/drop/box.ogg b/sound/items/drop/box.ogg new file mode 100644 index 00000000000..52439c6705f Binary files /dev/null and b/sound/items/drop/box.ogg differ diff --git a/sound/items/drop/card.ogg b/sound/items/drop/card.ogg new file mode 100644 index 00000000000..7e2620d2b0b Binary files /dev/null and b/sound/items/drop/card.ogg differ diff --git a/sound/items/drop/cardboardbox.ogg b/sound/items/drop/cardboardbox.ogg new file mode 100644 index 00000000000..7070ba1c342 Binary files /dev/null and b/sound/items/drop/cardboardbox.ogg differ diff --git a/sound/items/drop/cloth.ogg b/sound/items/drop/cloth.ogg new file mode 100644 index 00000000000..5bf734caba0 Binary files /dev/null and b/sound/items/drop/cloth.ogg differ diff --git a/sound/items/drop/clothing.ogg b/sound/items/drop/clothing.ogg new file mode 100644 index 00000000000..8d93a3c9f59 Binary files /dev/null and b/sound/items/drop/clothing.ogg differ diff --git a/sound/items/drop/component.ogg b/sound/items/drop/component.ogg new file mode 100644 index 00000000000..093fde7c90c Binary files /dev/null and b/sound/items/drop/component.ogg differ diff --git a/sound/items/drop/crowbar.ogg b/sound/items/drop/crowbar.ogg new file mode 100644 index 00000000000..77464110661 Binary files /dev/null and b/sound/items/drop/crowbar.ogg differ diff --git a/sound/items/drop/device.ogg b/sound/items/drop/device.ogg new file mode 100644 index 00000000000..8382db94b8a Binary files /dev/null and b/sound/items/drop/device.ogg differ diff --git a/sound/items/drop/disk.ogg b/sound/items/drop/disk.ogg new file mode 100644 index 00000000000..3174b88117f Binary files /dev/null and b/sound/items/drop/disk.ogg differ diff --git a/sound/items/drop/drinkglass.ogg b/sound/items/drop/drinkglass.ogg new file mode 100644 index 00000000000..43bb732db3d Binary files /dev/null and b/sound/items/drop/drinkglass.ogg differ diff --git a/sound/items/drop/flesh.ogg b/sound/items/drop/flesh.ogg new file mode 100644 index 00000000000..818ca54500f Binary files /dev/null and b/sound/items/drop/flesh.ogg differ diff --git a/sound/items/drop/food.ogg b/sound/items/drop/food.ogg new file mode 100644 index 00000000000..ace68d4e997 Binary files /dev/null and b/sound/items/drop/food.ogg differ diff --git a/sound/items/drop/gascan.ogg b/sound/items/drop/gascan.ogg new file mode 100644 index 00000000000..29d8b5230d7 Binary files /dev/null and b/sound/items/drop/gascan.ogg differ diff --git a/sound/items/drop/generic1.ogg b/sound/items/drop/generic1.ogg new file mode 100644 index 00000000000..c2195b1e24a Binary files /dev/null and b/sound/items/drop/generic1.ogg differ diff --git a/sound/items/drop/generic2.ogg b/sound/items/drop/generic2.ogg new file mode 100644 index 00000000000..ac0bd3710fe Binary files /dev/null and b/sound/items/drop/generic2.ogg differ diff --git a/sound/items/drop/glass.ogg b/sound/items/drop/glass.ogg new file mode 100644 index 00000000000..d6b03e1720d Binary files /dev/null and b/sound/items/drop/glass.ogg differ diff --git a/sound/items/drop/gloves.ogg b/sound/items/drop/gloves.ogg new file mode 100644 index 00000000000..dafc68f0746 Binary files /dev/null and b/sound/items/drop/gloves.ogg differ diff --git a/sound/items/drop/gun.ogg b/sound/items/drop/gun.ogg new file mode 100644 index 00000000000..3a489c72c0f Binary files /dev/null and b/sound/items/drop/gun.ogg differ diff --git a/sound/items/drop/hat.ogg b/sound/items/drop/hat.ogg new file mode 100644 index 00000000000..f13c656c031 Binary files /dev/null and b/sound/items/drop/hat.ogg differ diff --git a/sound/items/drop/helm.ogg b/sound/items/drop/helm.ogg new file mode 100644 index 00000000000..2d33f62a5dd Binary files /dev/null and b/sound/items/drop/helm.ogg differ diff --git a/sound/items/drop/herb.ogg b/sound/items/drop/herb.ogg new file mode 100644 index 00000000000..54eda795c82 Binary files /dev/null and b/sound/items/drop/herb.ogg differ diff --git a/sound/items/drop/knife.ogg b/sound/items/drop/knife.ogg new file mode 100644 index 00000000000..954b611a97f Binary files /dev/null and b/sound/items/drop/knife.ogg differ diff --git a/sound/items/drop/leather.ogg b/sound/items/drop/leather.ogg new file mode 100644 index 00000000000..33872748823 Binary files /dev/null and b/sound/items/drop/leather.ogg differ diff --git a/sound/items/drop/matchbox.ogg b/sound/items/drop/matchbox.ogg new file mode 100644 index 00000000000..8e4e276c9e1 Binary files /dev/null and b/sound/items/drop/matchbox.ogg differ diff --git a/sound/items/drop/metalboots.ogg b/sound/items/drop/metalboots.ogg new file mode 100644 index 00000000000..6172b0a6c65 Binary files /dev/null and b/sound/items/drop/metalboots.ogg differ diff --git a/sound/items/drop/metalshield.ogg b/sound/items/drop/metalshield.ogg new file mode 100644 index 00000000000..ca264eaaa4e Binary files /dev/null and b/sound/items/drop/metalshield.ogg differ diff --git a/sound/items/drop/metalweapon.ogg b/sound/items/drop/metalweapon.ogg new file mode 100644 index 00000000000..9bd47c5f102 Binary files /dev/null and b/sound/items/drop/metalweapon.ogg differ diff --git a/sound/items/drop/multitool.ogg b/sound/items/drop/multitool.ogg new file mode 100644 index 00000000000..67e0a41042c Binary files /dev/null and b/sound/items/drop/multitool.ogg differ diff --git a/sound/items/drop/paper.ogg b/sound/items/drop/paper.ogg new file mode 100644 index 00000000000..46858ac03a0 Binary files /dev/null and b/sound/items/drop/paper.ogg differ diff --git a/sound/items/drop/papercup.ogg b/sound/items/drop/papercup.ogg new file mode 100644 index 00000000000..6bea17488f5 Binary files /dev/null and b/sound/items/drop/papercup.ogg differ diff --git a/sound/items/drop/pillbottle.ogg b/sound/items/drop/pillbottle.ogg new file mode 100644 index 00000000000..b62ec0016e5 Binary files /dev/null and b/sound/items/drop/pillbottle.ogg differ diff --git a/sound/items/drop/plushie.ogg b/sound/items/drop/plushie.ogg new file mode 100644 index 00000000000..a6d0f290b69 Binary files /dev/null and b/sound/items/drop/plushie.ogg differ diff --git a/sound/items/drop/ring.ogg b/sound/items/drop/ring.ogg new file mode 100644 index 00000000000..0ebb2e29e37 Binary files /dev/null and b/sound/items/drop/ring.ogg differ diff --git a/sound/items/drop/rubber.ogg b/sound/items/drop/rubber.ogg new file mode 100644 index 00000000000..a0b365020d2 Binary files /dev/null and b/sound/items/drop/rubber.ogg differ diff --git a/sound/items/drop/scrap.ogg b/sound/items/drop/scrap.ogg new file mode 100644 index 00000000000..b704d91ea31 Binary files /dev/null and b/sound/items/drop/scrap.ogg differ diff --git a/sound/items/drop/screwdriver.ogg b/sound/items/drop/screwdriver.ogg new file mode 100644 index 00000000000..d460fd0aeda Binary files /dev/null and b/sound/items/drop/screwdriver.ogg differ diff --git a/sound/items/drop/shoes.ogg b/sound/items/drop/shoes.ogg new file mode 100644 index 00000000000..5dbf0c41447 Binary files /dev/null and b/sound/items/drop/shoes.ogg differ diff --git a/sound/items/drop/shovel.ogg b/sound/items/drop/shovel.ogg new file mode 100644 index 00000000000..72ceefffa12 Binary files /dev/null and b/sound/items/drop/shovel.ogg differ diff --git a/sound/items/drop/soda.ogg b/sound/items/drop/soda.ogg new file mode 100644 index 00000000000..5bd22c5d1f8 Binary files /dev/null and b/sound/items/drop/soda.ogg differ diff --git a/sound/items/drop/sword.ogg b/sound/items/drop/sword.ogg new file mode 100644 index 00000000000..1287c171cb8 Binary files /dev/null and b/sound/items/drop/sword.ogg differ diff --git a/sound/items/drop/toolbelt.ogg b/sound/items/drop/toolbelt.ogg new file mode 100644 index 00000000000..2a3c4655c49 Binary files /dev/null and b/sound/items/drop/toolbelt.ogg differ diff --git a/sound/items/drop/toolbox.ogg b/sound/items/drop/toolbox.ogg new file mode 100644 index 00000000000..abf56946278 Binary files /dev/null and b/sound/items/drop/toolbox.ogg differ diff --git a/sound/items/drop/weldingtool.ogg b/sound/items/drop/weldingtool.ogg new file mode 100644 index 00000000000..58b722ad7a7 Binary files /dev/null and b/sound/items/drop/weldingtool.ogg differ diff --git a/sound/items/drop/wirecutter.ogg b/sound/items/drop/wirecutter.ogg new file mode 100644 index 00000000000..e099870fc7d Binary files /dev/null and b/sound/items/drop/wirecutter.ogg differ diff --git a/sound/items/drop/wooden.ogg b/sound/items/drop/wooden.ogg new file mode 100644 index 00000000000..dd6c4e7c530 Binary files /dev/null and b/sound/items/drop/wooden.ogg differ diff --git a/sound/items/drop/woodweapon.ogg b/sound/items/drop/woodweapon.ogg new file mode 100644 index 00000000000..517f9c015ac Binary files /dev/null and b/sound/items/drop/woodweapon.ogg differ diff --git a/sound/items/drop/wrapper.ogg b/sound/items/drop/wrapper.ogg new file mode 100644 index 00000000000..9f7927e6db3 Binary files /dev/null and b/sound/items/drop/wrapper.ogg differ diff --git a/sound/items/drop/wrench.ogg b/sound/items/drop/wrench.ogg new file mode 100644 index 00000000000..86020bf822c Binary files /dev/null and b/sound/items/drop/wrench.ogg differ diff --git a/sound/items/jumpsuit_equip.ogg b/sound/items/jumpsuit_equip.ogg new file mode 100644 index 00000000000..bdcc2bb3a65 Binary files /dev/null and b/sound/items/jumpsuit_equip.ogg differ diff --git a/sound/items/pickup/accessory.ogg b/sound/items/pickup/accessory.ogg new file mode 100644 index 00000000000..b532e2d4026 Binary files /dev/null and b/sound/items/pickup/accessory.ogg differ diff --git a/sound/items/pickup/ammobox.ogg b/sound/items/pickup/ammobox.ogg new file mode 100644 index 00000000000..9532a7697b9 Binary files /dev/null and b/sound/items/pickup/ammobox.ogg differ diff --git a/sound/items/pickup/axe.ogg b/sound/items/pickup/axe.ogg new file mode 100644 index 00000000000..a77809ab577 Binary files /dev/null and b/sound/items/pickup/axe.ogg differ diff --git a/sound/items/pickup/backpack.ogg b/sound/items/pickup/backpack.ogg new file mode 100644 index 00000000000..50965d71344 Binary files /dev/null and b/sound/items/pickup/backpack.ogg differ diff --git a/sound/items/pickup/basketball.ogg b/sound/items/pickup/basketball.ogg new file mode 100644 index 00000000000..cae604b1fd9 Binary files /dev/null and b/sound/items/pickup/basketball.ogg differ diff --git a/sound/items/pickup/book.ogg b/sound/items/pickup/book.ogg new file mode 100644 index 00000000000..120a4e4721a Binary files /dev/null and b/sound/items/pickup/book.ogg differ diff --git a/sound/items/pickup/boots.ogg b/sound/items/pickup/boots.ogg new file mode 100644 index 00000000000..077801f6f53 Binary files /dev/null and b/sound/items/pickup/boots.ogg differ diff --git a/sound/items/pickup/bottle.ogg b/sound/items/pickup/bottle.ogg new file mode 100644 index 00000000000..77e0b22187f Binary files /dev/null and b/sound/items/pickup/bottle.ogg differ diff --git a/sound/items/pickup/card.ogg b/sound/items/pickup/card.ogg new file mode 100644 index 00000000000..ba5b0451c60 Binary files /dev/null and b/sound/items/pickup/card.ogg differ diff --git a/sound/items/pickup/cardboardbox.ogg b/sound/items/pickup/cardboardbox.ogg new file mode 100644 index 00000000000..aa4e72129b0 Binary files /dev/null and b/sound/items/pickup/cardboardbox.ogg differ diff --git a/sound/items/pickup/cloth.ogg b/sound/items/pickup/cloth.ogg new file mode 100644 index 00000000000..f46988887d1 Binary files /dev/null and b/sound/items/pickup/cloth.ogg differ diff --git a/sound/items/pickup/clothing.ogg b/sound/items/pickup/clothing.ogg new file mode 100644 index 00000000000..568fe733416 Binary files /dev/null and b/sound/items/pickup/clothing.ogg differ diff --git a/sound/items/pickup/component.ogg b/sound/items/pickup/component.ogg new file mode 100644 index 00000000000..cfaba1dd193 Binary files /dev/null and b/sound/items/pickup/component.ogg differ diff --git a/sound/items/pickup/crowbar.ogg b/sound/items/pickup/crowbar.ogg new file mode 100644 index 00000000000..79b276f8451 Binary files /dev/null and b/sound/items/pickup/crowbar.ogg differ diff --git a/sound/items/pickup/device.ogg b/sound/items/pickup/device.ogg new file mode 100644 index 00000000000..ca2c4f1ab12 Binary files /dev/null and b/sound/items/pickup/device.ogg differ diff --git a/sound/items/pickup/disk.ogg b/sound/items/pickup/disk.ogg new file mode 100644 index 00000000000..8f67406a5fb Binary files /dev/null and b/sound/items/pickup/disk.ogg differ diff --git a/sound/items/pickup/drinkglass.ogg b/sound/items/pickup/drinkglass.ogg new file mode 100644 index 00000000000..fcd1c7d3126 Binary files /dev/null and b/sound/items/pickup/drinkglass.ogg differ diff --git a/sound/items/pickup/flesh.ogg b/sound/items/pickup/flesh.ogg new file mode 100644 index 00000000000..818ca54500f Binary files /dev/null and b/sound/items/pickup/flesh.ogg differ diff --git a/sound/items/pickup/food.ogg b/sound/items/pickup/food.ogg new file mode 100644 index 00000000000..1113a16a368 Binary files /dev/null and b/sound/items/pickup/food.ogg differ diff --git a/sound/items/pickup/gascan.ogg b/sound/items/pickup/gascan.ogg new file mode 100644 index 00000000000..c2a51c39721 Binary files /dev/null and b/sound/items/pickup/gascan.ogg differ diff --git a/sound/items/pickup/generic1.ogg b/sound/items/pickup/generic1.ogg new file mode 100644 index 00000000000..64f37c6dd9c Binary files /dev/null and b/sound/items/pickup/generic1.ogg differ diff --git a/sound/items/pickup/generic2.ogg b/sound/items/pickup/generic2.ogg new file mode 100644 index 00000000000..57092778f28 Binary files /dev/null and b/sound/items/pickup/generic2.ogg differ diff --git a/sound/items/pickup/generic3.ogg b/sound/items/pickup/generic3.ogg new file mode 100644 index 00000000000..be46e772422 Binary files /dev/null and b/sound/items/pickup/generic3.ogg differ diff --git a/sound/items/pickup/glass.ogg b/sound/items/pickup/glass.ogg new file mode 100644 index 00000000000..67e53309e6b Binary files /dev/null and b/sound/items/pickup/glass.ogg differ diff --git a/sound/items/pickup/gloves.ogg b/sound/items/pickup/gloves.ogg new file mode 100644 index 00000000000..1a7d263426c Binary files /dev/null and b/sound/items/pickup/gloves.ogg differ diff --git a/sound/items/pickup/gun.ogg b/sound/items/pickup/gun.ogg new file mode 100644 index 00000000000..4eeda50ca50 Binary files /dev/null and b/sound/items/pickup/gun.ogg differ diff --git a/sound/items/pickup/hat.ogg b/sound/items/pickup/hat.ogg new file mode 100644 index 00000000000..d80b46f7f2d Binary files /dev/null and b/sound/items/pickup/hat.ogg differ diff --git a/sound/items/pickup/helm.ogg b/sound/items/pickup/helm.ogg new file mode 100644 index 00000000000..2d33f62a5dd Binary files /dev/null and b/sound/items/pickup/helm.ogg differ diff --git a/sound/items/pickup/herb.ogg b/sound/items/pickup/herb.ogg new file mode 100644 index 00000000000..bd250b5a137 Binary files /dev/null and b/sound/items/pickup/herb.ogg differ diff --git a/sound/items/pickup/knife.ogg b/sound/items/pickup/knife.ogg new file mode 100644 index 00000000000..6f5ca73c246 Binary files /dev/null and b/sound/items/pickup/knife.ogg differ diff --git a/sound/items/pickup/leather.ogg b/sound/items/pickup/leather.ogg new file mode 100644 index 00000000000..5895cd8f9f8 Binary files /dev/null and b/sound/items/pickup/leather.ogg differ diff --git a/sound/items/pickup/matchbox.ogg b/sound/items/pickup/matchbox.ogg new file mode 100644 index 00000000000..82c23410e11 Binary files /dev/null and b/sound/items/pickup/matchbox.ogg differ diff --git a/sound/items/pickup/metalweapon.ogg b/sound/items/pickup/metalweapon.ogg new file mode 100644 index 00000000000..ac6e7387119 Binary files /dev/null and b/sound/items/pickup/metalweapon.ogg differ diff --git a/sound/items/pickup/multitool.ogg b/sound/items/pickup/multitool.ogg new file mode 100644 index 00000000000..cbd598ce896 Binary files /dev/null and b/sound/items/pickup/multitool.ogg differ diff --git a/sound/items/pickup/paper.ogg b/sound/items/pickup/paper.ogg new file mode 100644 index 00000000000..55ae2b3d2db Binary files /dev/null and b/sound/items/pickup/paper.ogg differ diff --git a/sound/items/pickup/papercup.ogg b/sound/items/pickup/papercup.ogg new file mode 100644 index 00000000000..f0c459a3536 Binary files /dev/null and b/sound/items/pickup/papercup.ogg differ diff --git a/sound/items/pickup/pillbottle.ogg b/sound/items/pickup/pillbottle.ogg new file mode 100644 index 00000000000..b62ec0016e5 Binary files /dev/null and b/sound/items/pickup/pillbottle.ogg differ diff --git a/sound/items/pickup/plushie.ogg b/sound/items/pickup/plushie.ogg new file mode 100644 index 00000000000..91299b09758 Binary files /dev/null and b/sound/items/pickup/plushie.ogg differ diff --git a/sound/items/pickup/ring.ogg b/sound/items/pickup/ring.ogg new file mode 100644 index 00000000000..41c57a3175a Binary files /dev/null and b/sound/items/pickup/ring.ogg differ diff --git a/sound/items/pickup/rubber.ogg b/sound/items/pickup/rubber.ogg new file mode 100644 index 00000000000..874934ae459 Binary files /dev/null and b/sound/items/pickup/rubber.ogg differ diff --git a/sound/items/pickup/screwdriver.ogg b/sound/items/pickup/screwdriver.ogg new file mode 100644 index 00000000000..987d9af7081 Binary files /dev/null and b/sound/items/pickup/screwdriver.ogg differ diff --git a/sound/items/pickup/shoes.ogg b/sound/items/pickup/shoes.ogg new file mode 100644 index 00000000000..9200f325010 Binary files /dev/null and b/sound/items/pickup/shoes.ogg differ diff --git a/sound/items/pickup/shovel.ogg b/sound/items/pickup/shovel.ogg new file mode 100644 index 00000000000..0d146824119 Binary files /dev/null and b/sound/items/pickup/shovel.ogg differ diff --git a/sound/items/pickup/soda.ogg b/sound/items/pickup/soda.ogg new file mode 100644 index 00000000000..5a342af320e Binary files /dev/null and b/sound/items/pickup/soda.ogg differ diff --git a/sound/items/pickup/sword.ogg b/sound/items/pickup/sword.ogg new file mode 100644 index 00000000000..96d8d00cf50 Binary files /dev/null and b/sound/items/pickup/sword.ogg differ diff --git a/sound/items/pickup/toolbelt.ogg b/sound/items/pickup/toolbelt.ogg new file mode 100644 index 00000000000..58e5d25979a Binary files /dev/null and b/sound/items/pickup/toolbelt.ogg differ diff --git a/sound/items/pickup/toolbox.ogg b/sound/items/pickup/toolbox.ogg new file mode 100644 index 00000000000..01a4ab4b3fa Binary files /dev/null and b/sound/items/pickup/toolbox.ogg differ diff --git a/sound/items/pickup/weldingtool.ogg b/sound/items/pickup/weldingtool.ogg new file mode 100644 index 00000000000..da78b06b848 Binary files /dev/null and b/sound/items/pickup/weldingtool.ogg differ diff --git a/sound/items/pickup/wirecutter.ogg b/sound/items/pickup/wirecutter.ogg new file mode 100644 index 00000000000..078faaf4324 Binary files /dev/null and b/sound/items/pickup/wirecutter.ogg differ diff --git a/sound/items/pickup/wooden.ogg b/sound/items/pickup/wooden.ogg new file mode 100644 index 00000000000..1a778074e9c Binary files /dev/null and b/sound/items/pickup/wooden.ogg differ diff --git a/sound/items/pickup/woodweapon.ogg b/sound/items/pickup/woodweapon.ogg new file mode 100644 index 00000000000..34e9c238eac Binary files /dev/null and b/sound/items/pickup/woodweapon.ogg differ diff --git a/sound/items/pickup/wrapper.ogg b/sound/items/pickup/wrapper.ogg new file mode 100644 index 00000000000..9270ade8db1 Binary files /dev/null and b/sound/items/pickup/wrapper.ogg differ diff --git a/sound/items/pickup/wrench.ogg b/sound/items/pickup/wrench.ogg new file mode 100644 index 00000000000..860e0d70879 Binary files /dev/null and b/sound/items/pickup/wrench.ogg differ diff --git a/sound/items/storage/box.ogg b/sound/items/storage/box.ogg new file mode 100644 index 00000000000..3f8fa8afb11 Binary files /dev/null and b/sound/items/storage/box.ogg differ diff --git a/sound/items/storage/boxfold.ogg b/sound/items/storage/boxfold.ogg new file mode 100644 index 00000000000..120eaf53292 Binary files /dev/null and b/sound/items/storage/boxfold.ogg differ diff --git a/sound/items/storage/briefcase.ogg b/sound/items/storage/briefcase.ogg new file mode 100644 index 00000000000..e841e03747c Binary files /dev/null and b/sound/items/storage/briefcase.ogg differ diff --git a/sound/items/storage/pillbottle.ogg b/sound/items/storage/pillbottle.ogg new file mode 100644 index 00000000000..1c47fbeb73f Binary files /dev/null and b/sound/items/storage/pillbottle.ogg differ diff --git a/sound/items/storage/toolbox.ogg b/sound/items/storage/toolbox.ogg new file mode 100644 index 00000000000..ec1ff0cde56 Binary files /dev/null and b/sound/items/storage/toolbox.ogg differ diff --git a/sound/items/toolbelt_equip.ogg b/sound/items/toolbelt_equip.ogg new file mode 100644 index 00000000000..0ef67a3fd6c Binary files /dev/null and b/sound/items/toolbelt_equip.ogg differ diff --git a/sound/machines/destructive_analyzer.ogg b/sound/machines/destructive_analyzer.ogg new file mode 100644 index 00000000000..d5e9123668e Binary files /dev/null and b/sound/machines/destructive_analyzer.ogg differ diff --git a/sound/machines/door/WideClose.ogg b/sound/machines/door/WideClose.ogg new file mode 100644 index 00000000000..69c85a84b12 Binary files /dev/null and b/sound/machines/door/WideClose.ogg differ diff --git a/sound/machines/door/WideOpen.ogg b/sound/machines/door/WideOpen.ogg new file mode 100644 index 00000000000..d7ae7f171fa Binary files /dev/null and b/sound/machines/door/WideOpen.ogg differ diff --git a/sound/machines/door/airlock_creaking.ogg b/sound/machines/door/airlock_creaking.ogg new file mode 100644 index 00000000000..e69ebc275fc Binary files /dev/null and b/sound/machines/door/airlock_creaking.ogg differ diff --git a/sound/machines/door/airlockcycle.ogg b/sound/machines/door/airlockcycle.ogg new file mode 100644 index 00000000000..8fc01975477 Binary files /dev/null and b/sound/machines/door/airlockcycle.ogg differ diff --git a/sound/machines/door/airlockforced.ogg b/sound/machines/door/airlockforced.ogg new file mode 100644 index 00000000000..8f46a89fe32 Binary files /dev/null and b/sound/machines/door/airlockforced.ogg differ diff --git a/sound/machines/door/blastdoorclose.ogg b/sound/machines/door/blastdoorclose.ogg new file mode 100644 index 00000000000..c48a0bd7d6f Binary files /dev/null and b/sound/machines/door/blastdoorclose.ogg differ diff --git a/sound/machines/door/blastdooropen.ogg b/sound/machines/door/blastdooropen.ogg new file mode 100644 index 00000000000..4f61ea2302a Binary files /dev/null and b/sound/machines/door/blastdooropen.ogg differ diff --git a/sound/machines/door/boltsdown.ogg b/sound/machines/door/boltsdown.ogg new file mode 100644 index 00000000000..c7320a04dfe Binary files /dev/null and b/sound/machines/door/boltsdown.ogg differ diff --git a/sound/machines/door/boltsup.ogg b/sound/machines/door/boltsup.ogg new file mode 100644 index 00000000000..bc422e28726 Binary files /dev/null and b/sound/machines/door/boltsup.ogg differ diff --git a/sound/machines/door/cgo1c.ogg b/sound/machines/door/cgo1c.ogg new file mode 100644 index 00000000000..86dddb1d818 Binary files /dev/null and b/sound/machines/door/cgo1c.ogg differ diff --git a/sound/machines/door/cgo1o.ogg b/sound/machines/door/cgo1o.ogg new file mode 100644 index 00000000000..9a16e67538b Binary files /dev/null and b/sound/machines/door/cgo1o.ogg differ diff --git a/sound/machines/door/cmd1c.ogg b/sound/machines/door/cmd1c.ogg new file mode 100644 index 00000000000..22fa8e29cfc Binary files /dev/null and b/sound/machines/door/cmd1c.ogg differ diff --git a/sound/machines/door/cmd1o.ogg b/sound/machines/door/cmd1o.ogg new file mode 100644 index 00000000000..62470442874 Binary files /dev/null and b/sound/machines/door/cmd1o.ogg differ diff --git a/sound/machines/door/cmd3c.ogg b/sound/machines/door/cmd3c.ogg new file mode 100644 index 00000000000..dacb1867d18 Binary files /dev/null and b/sound/machines/door/cmd3c.ogg differ diff --git a/sound/machines/door/cmd3o.ogg b/sound/machines/door/cmd3o.ogg new file mode 100644 index 00000000000..a508ddcaf56 Binary files /dev/null and b/sound/machines/door/cmd3o.ogg differ diff --git a/sound/machines/door/covert1c.ogg b/sound/machines/door/covert1c.ogg new file mode 100644 index 00000000000..e38b4b4dafc Binary files /dev/null and b/sound/machines/door/covert1c.ogg differ diff --git a/sound/machines/door/covert1o.ogg b/sound/machines/door/covert1o.ogg new file mode 100644 index 00000000000..7ce424a4a13 Binary files /dev/null and b/sound/machines/door/covert1o.ogg differ diff --git a/sound/machines/door/door2c.ogg b/sound/machines/door/door2c.ogg new file mode 100644 index 00000000000..f68a23f5ec3 Binary files /dev/null and b/sound/machines/door/door2c.ogg differ diff --git a/sound/machines/door/door2o.ogg b/sound/machines/door/door2o.ogg new file mode 100644 index 00000000000..e1499e82a0a Binary files /dev/null and b/sound/machines/door/door2o.ogg differ diff --git a/sound/machines/door/eng1c.ogg b/sound/machines/door/eng1c.ogg new file mode 100644 index 00000000000..6fc5b74e8e6 Binary files /dev/null and b/sound/machines/door/eng1c.ogg differ diff --git a/sound/machines/door/eng1o.ogg b/sound/machines/door/eng1o.ogg new file mode 100644 index 00000000000..86c2724d20c Binary files /dev/null and b/sound/machines/door/eng1o.ogg differ diff --git a/sound/machines/door/hall1c.ogg b/sound/machines/door/hall1c.ogg new file mode 100644 index 00000000000..ae497fe764c Binary files /dev/null and b/sound/machines/door/hall1c.ogg differ diff --git a/sound/machines/door/hall1o.ogg b/sound/machines/door/hall1o.ogg new file mode 100644 index 00000000000..2386a0c39fd Binary files /dev/null and b/sound/machines/door/hall1o.ogg differ diff --git a/sound/machines/door/hall3c.ogg b/sound/machines/door/hall3c.ogg new file mode 100644 index 00000000000..2dba50dee01 Binary files /dev/null and b/sound/machines/door/hall3c.ogg differ diff --git a/sound/machines/door/hall3o.ogg b/sound/machines/door/hall3o.ogg new file mode 100644 index 00000000000..47a7102ec04 Binary files /dev/null and b/sound/machines/door/hall3o.ogg differ diff --git a/sound/machines/door/hatchclose.ogg b/sound/machines/door/hatchclose.ogg new file mode 100644 index 00000000000..e828230d034 Binary files /dev/null and b/sound/machines/door/hatchclose.ogg differ diff --git a/sound/machines/door/hatchforced.ogg b/sound/machines/door/hatchforced.ogg new file mode 100644 index 00000000000..4caefc0b9e4 Binary files /dev/null and b/sound/machines/door/hatchforced.ogg differ diff --git a/sound/machines/door/hatchopen.ogg b/sound/machines/door/hatchopen.ogg new file mode 100644 index 00000000000..4fda10ec5de Binary files /dev/null and b/sound/machines/door/hatchopen.ogg differ diff --git a/sound/machines/door/med1c.ogg b/sound/machines/door/med1c.ogg new file mode 100644 index 00000000000..9fd7b95a850 Binary files /dev/null and b/sound/machines/door/med1c.ogg differ diff --git a/sound/machines/door/med1o.ogg b/sound/machines/door/med1o.ogg new file mode 100644 index 00000000000..e3edec35f9b Binary files /dev/null and b/sound/machines/door/med1o.ogg differ diff --git a/sound/machines/door/old_airlock.ogg b/sound/machines/door/old_airlock.ogg new file mode 100644 index 00000000000..c0a4cfdcba6 Binary files /dev/null and b/sound/machines/door/old_airlock.ogg differ diff --git a/sound/machines/door/old_airlockclose.ogg b/sound/machines/door/old_airlockclose.ogg new file mode 100644 index 00000000000..58a06817f00 Binary files /dev/null and b/sound/machines/door/old_airlockclose.ogg differ diff --git a/sound/machines/door/sci1c.ogg b/sound/machines/door/sci1c.ogg new file mode 100644 index 00000000000..ef5e767b368 Binary files /dev/null and b/sound/machines/door/sci1c.ogg differ diff --git a/sound/machines/door/sci1o.ogg b/sound/machines/door/sci1o.ogg new file mode 100644 index 00000000000..b9c5877abd5 Binary files /dev/null and b/sound/machines/door/sci1o.ogg differ diff --git a/sound/machines/door/scp1c.ogg b/sound/machines/door/scp1c.ogg new file mode 100644 index 00000000000..9e0e224b174 Binary files /dev/null and b/sound/machines/door/scp1c.ogg differ diff --git a/sound/machines/door/scp1o.ogg b/sound/machines/door/scp1o.ogg new file mode 100644 index 00000000000..996e3f12b9e Binary files /dev/null and b/sound/machines/door/scp1o.ogg differ diff --git a/sound/machines/door/sec1c.ogg b/sound/machines/door/sec1c.ogg new file mode 100644 index 00000000000..c79ab5cd394 Binary files /dev/null and b/sound/machines/door/sec1c.ogg differ diff --git a/sound/machines/door/sec1o.ogg b/sound/machines/door/sec1o.ogg new file mode 100644 index 00000000000..fb4d5697009 Binary files /dev/null and b/sound/machines/door/sec1o.ogg differ diff --git a/sound/machines/door/secure1c.ogg b/sound/machines/door/secure1c.ogg new file mode 100644 index 00000000000..35bd11ddfed Binary files /dev/null and b/sound/machines/door/secure1c.ogg differ diff --git a/sound/machines/door/secure1o.ogg b/sound/machines/door/secure1o.ogg new file mode 100644 index 00000000000..b18643d606d Binary files /dev/null and b/sound/machines/door/secure1o.ogg differ diff --git a/sound/machines/door/shuttle1c.ogg b/sound/machines/door/shuttle1c.ogg new file mode 100644 index 00000000000..835e898d8ff Binary files /dev/null and b/sound/machines/door/shuttle1c.ogg differ diff --git a/sound/machines/door/shuttle1o.ogg b/sound/machines/door/shuttle1o.ogg new file mode 100644 index 00000000000..801582b45ce Binary files /dev/null and b/sound/machines/door/shuttle1o.ogg differ diff --git a/sound/machines/door/space1c.ogg b/sound/machines/door/space1c.ogg new file mode 100644 index 00000000000..d4e4f6da6bb Binary files /dev/null and b/sound/machines/door/space1c.ogg differ diff --git a/sound/machines/door/space1o.ogg b/sound/machines/door/space1o.ogg new file mode 100644 index 00000000000..f1a28a266ec Binary files /dev/null and b/sound/machines/door/space1o.ogg differ diff --git a/sound/machines/door/vault1c.ogg b/sound/machines/door/vault1c.ogg new file mode 100644 index 00000000000..b3b83e1f92d Binary files /dev/null and b/sound/machines/door/vault1c.ogg differ diff --git a/sound/machines/door/vault1o.ogg b/sound/machines/door/vault1o.ogg new file mode 100644 index 00000000000..de746d34d1c Binary files /dev/null and b/sound/machines/door/vault1o.ogg differ diff --git a/sound/machines/door/windowdoor.ogg b/sound/machines/door/windowdoor.ogg new file mode 100644 index 00000000000..bc753a3d7d7 Binary files /dev/null and b/sound/machines/door/windowdoor.ogg differ diff --git a/sound/machines/kitchen/candymaker/candymaker-mid1.ogg b/sound/machines/kitchen/candymaker/candymaker-mid1.ogg new file mode 100644 index 00000000000..bca0c3a62b9 Binary files /dev/null and b/sound/machines/kitchen/candymaker/candymaker-mid1.ogg differ diff --git a/sound/machines/kitchen/candymaker/candymaker-start.ogg b/sound/machines/kitchen/candymaker/candymaker-start.ogg new file mode 100644 index 00000000000..54f38165f86 Binary files /dev/null and b/sound/machines/kitchen/candymaker/candymaker-start.ogg differ diff --git a/sound/machines/kitchen/candymaker/candymaker-stop.ogg b/sound/machines/kitchen/candymaker/candymaker-stop.ogg new file mode 100644 index 00000000000..dbe11822f10 Binary files /dev/null and b/sound/machines/kitchen/candymaker/candymaker-stop.ogg differ diff --git a/sound/machines/kitchen/cerealmaker/cerealmaker-mid1.ogg b/sound/machines/kitchen/cerealmaker/cerealmaker-mid1.ogg new file mode 100644 index 00000000000..eaccf8e5c0f Binary files /dev/null and b/sound/machines/kitchen/cerealmaker/cerealmaker-mid1.ogg differ diff --git a/sound/machines/kitchen/cerealmaker/cerealmaker-start.ogg b/sound/machines/kitchen/cerealmaker/cerealmaker-start.ogg new file mode 100644 index 00000000000..3080d9e6530 Binary files /dev/null and b/sound/machines/kitchen/cerealmaker/cerealmaker-start.ogg differ diff --git a/sound/machines/kitchen/cerealmaker/cerealmaker-stop.ogg b/sound/machines/kitchen/cerealmaker/cerealmaker-stop.ogg new file mode 100644 index 00000000000..2a81b0bbbe6 Binary files /dev/null and b/sound/machines/kitchen/cerealmaker/cerealmaker-stop.ogg differ diff --git a/sound/machines/kitchen/fryer/deep_fryer_1.ogg b/sound/machines/kitchen/fryer/deep_fryer_1.ogg new file mode 100644 index 00000000000..ee7a748667f Binary files /dev/null and b/sound/machines/kitchen/fryer/deep_fryer_1.ogg differ diff --git a/sound/machines/kitchen/fryer/deep_fryer_2.ogg b/sound/machines/kitchen/fryer/deep_fryer_2.ogg new file mode 100644 index 00000000000..b423f44229c Binary files /dev/null and b/sound/machines/kitchen/fryer/deep_fryer_2.ogg differ diff --git a/sound/machines/kitchen/fryer/deep_fryer_emerge.ogg b/sound/machines/kitchen/fryer/deep_fryer_emerge.ogg new file mode 100644 index 00000000000..4fb29de1c10 Binary files /dev/null and b/sound/machines/kitchen/fryer/deep_fryer_emerge.ogg differ diff --git a/sound/machines/kitchen/fryer/deep_fryer_immerse.ogg b/sound/machines/kitchen/fryer/deep_fryer_immerse.ogg new file mode 100644 index 00000000000..76960ec664c Binary files /dev/null and b/sound/machines/kitchen/fryer/deep_fryer_immerse.ogg differ diff --git a/sound/machines/kitchen/grill/grill-mid1.ogg b/sound/machines/kitchen/grill/grill-mid1.ogg new file mode 100644 index 00000000000..0733899a763 Binary files /dev/null and b/sound/machines/kitchen/grill/grill-mid1.ogg differ diff --git a/sound/machines/kitchen/grill/grill-start.ogg b/sound/machines/kitchen/grill/grill-start.ogg new file mode 100644 index 00000000000..2c99396cb71 Binary files /dev/null and b/sound/machines/kitchen/grill/grill-start.ogg differ diff --git a/sound/machines/kitchen/grill/grill-stop.ogg b/sound/machines/kitchen/grill/grill-stop.ogg new file mode 100644 index 00000000000..2ec3f92a1c0 Binary files /dev/null and b/sound/machines/kitchen/grill/grill-stop.ogg differ diff --git a/sound/machines/microwave/microwave-end.ogg b/sound/machines/kitchen/microwave/microwave-end.ogg similarity index 100% rename from sound/machines/microwave/microwave-end.ogg rename to sound/machines/kitchen/microwave/microwave-end.ogg diff --git a/sound/machines/microwave/microwave-mid1.ogg b/sound/machines/kitchen/microwave/microwave-mid1.ogg similarity index 100% rename from sound/machines/microwave/microwave-mid1.ogg rename to sound/machines/kitchen/microwave/microwave-mid1.ogg diff --git a/sound/machines/microwave/microwave-mid2.ogg b/sound/machines/kitchen/microwave/microwave-mid2.ogg similarity index 100% rename from sound/machines/microwave/microwave-mid2.ogg rename to sound/machines/kitchen/microwave/microwave-mid2.ogg diff --git a/sound/machines/microwave/microwave-start.ogg b/sound/machines/kitchen/microwave/microwave-start.ogg similarity index 100% rename from sound/machines/microwave/microwave-start.ogg rename to sound/machines/kitchen/microwave/microwave-start.ogg diff --git a/sound/machines/kitchen/mixer/mixer-mid1.ogg b/sound/machines/kitchen/mixer/mixer-mid1.ogg new file mode 100644 index 00000000000..456f55bb2d6 Binary files /dev/null and b/sound/machines/kitchen/mixer/mixer-mid1.ogg differ diff --git a/sound/machines/kitchen/mixer/mixer-start.ogg b/sound/machines/kitchen/mixer/mixer-start.ogg new file mode 100644 index 00000000000..f6ef3ea7e49 Binary files /dev/null and b/sound/machines/kitchen/mixer/mixer-start.ogg differ diff --git a/sound/machines/kitchen/mixer/mixer-stop.ogg b/sound/machines/kitchen/mixer/mixer-stop.ogg new file mode 100644 index 00000000000..2d7bf6ad161 Binary files /dev/null and b/sound/machines/kitchen/mixer/mixer-stop.ogg differ diff --git a/sound/machines/kitchen/oven/oven-mid1.ogg b/sound/machines/kitchen/oven/oven-mid1.ogg new file mode 100644 index 00000000000..03d52641b99 Binary files /dev/null and b/sound/machines/kitchen/oven/oven-mid1.ogg differ diff --git a/sound/machines/kitchen/oven/oven-start.ogg b/sound/machines/kitchen/oven/oven-start.ogg new file mode 100644 index 00000000000..2792d76d3c9 Binary files /dev/null and b/sound/machines/kitchen/oven/oven-start.ogg differ diff --git a/sound/machines/kitchen/oven/oven-stop.ogg b/sound/machines/kitchen/oven/oven-stop.ogg new file mode 100644 index 00000000000..19151413d43 Binary files /dev/null and b/sound/machines/kitchen/oven/oven-stop.ogg differ diff --git a/sound/machines/medbayscanner1.ogg b/sound/machines/medbayscanner1.ogg new file mode 100644 index 00000000000..a3402e33046 Binary files /dev/null and b/sound/machines/medbayscanner1.ogg differ diff --git a/sound/effects/printer.ogg b/sound/machines/printer.ogg similarity index 100% rename from sound/effects/printer.ogg rename to sound/machines/printer.ogg diff --git a/sound/machines/scanbuzz.ogg b/sound/machines/scanbuzz.ogg new file mode 100644 index 00000000000..d3422bc8f4d Binary files /dev/null and b/sound/machines/scanbuzz.ogg differ diff --git a/sound/machines/sm/accent/delam/1.ogg b/sound/machines/sm/accent/delam/1.ogg new file mode 100644 index 00000000000..75c79f89ab2 Binary files /dev/null and b/sound/machines/sm/accent/delam/1.ogg differ diff --git a/sound/machines/sm/accent/delam/10.ogg b/sound/machines/sm/accent/delam/10.ogg new file mode 100644 index 00000000000..c87b63b526b Binary files /dev/null and b/sound/machines/sm/accent/delam/10.ogg differ diff --git a/sound/machines/sm/accent/delam/11.ogg b/sound/machines/sm/accent/delam/11.ogg new file mode 100644 index 00000000000..c7f678245b1 Binary files /dev/null and b/sound/machines/sm/accent/delam/11.ogg differ diff --git a/sound/machines/sm/accent/delam/12.ogg b/sound/machines/sm/accent/delam/12.ogg new file mode 100644 index 00000000000..a3959421830 Binary files /dev/null and b/sound/machines/sm/accent/delam/12.ogg differ diff --git a/sound/machines/sm/accent/delam/13.ogg b/sound/machines/sm/accent/delam/13.ogg new file mode 100644 index 00000000000..934f17947de Binary files /dev/null and b/sound/machines/sm/accent/delam/13.ogg differ diff --git a/sound/machines/sm/accent/delam/14.ogg b/sound/machines/sm/accent/delam/14.ogg new file mode 100644 index 00000000000..4175e5b9474 Binary files /dev/null and b/sound/machines/sm/accent/delam/14.ogg differ diff --git a/sound/machines/sm/accent/delam/15.ogg b/sound/machines/sm/accent/delam/15.ogg new file mode 100644 index 00000000000..dcf73deb84c Binary files /dev/null and b/sound/machines/sm/accent/delam/15.ogg differ diff --git a/sound/machines/sm/accent/delam/16.ogg b/sound/machines/sm/accent/delam/16.ogg new file mode 100644 index 00000000000..20bc19399be Binary files /dev/null and b/sound/machines/sm/accent/delam/16.ogg differ diff --git a/sound/machines/sm/accent/delam/17.ogg b/sound/machines/sm/accent/delam/17.ogg new file mode 100644 index 00000000000..b517fb3d3db Binary files /dev/null and b/sound/machines/sm/accent/delam/17.ogg differ diff --git a/sound/machines/sm/accent/delam/18.ogg b/sound/machines/sm/accent/delam/18.ogg new file mode 100644 index 00000000000..4ef138d27a5 Binary files /dev/null and b/sound/machines/sm/accent/delam/18.ogg differ diff --git a/sound/machines/sm/accent/delam/19.ogg b/sound/machines/sm/accent/delam/19.ogg new file mode 100644 index 00000000000..f638a6971bb Binary files /dev/null and b/sound/machines/sm/accent/delam/19.ogg differ diff --git a/sound/machines/sm/accent/delam/2.ogg b/sound/machines/sm/accent/delam/2.ogg new file mode 100644 index 00000000000..5b480daa2e1 Binary files /dev/null and b/sound/machines/sm/accent/delam/2.ogg differ diff --git a/sound/machines/sm/accent/delam/20.ogg b/sound/machines/sm/accent/delam/20.ogg new file mode 100644 index 00000000000..6072bc62276 Binary files /dev/null and b/sound/machines/sm/accent/delam/20.ogg differ diff --git a/sound/machines/sm/accent/delam/21.ogg b/sound/machines/sm/accent/delam/21.ogg new file mode 100644 index 00000000000..1223dd946de Binary files /dev/null and b/sound/machines/sm/accent/delam/21.ogg differ diff --git a/sound/machines/sm/accent/delam/22.ogg b/sound/machines/sm/accent/delam/22.ogg new file mode 100644 index 00000000000..9ccfb9b55af Binary files /dev/null and b/sound/machines/sm/accent/delam/22.ogg differ diff --git a/sound/machines/sm/accent/delam/23.ogg b/sound/machines/sm/accent/delam/23.ogg new file mode 100644 index 00000000000..6399a8376ae Binary files /dev/null and b/sound/machines/sm/accent/delam/23.ogg differ diff --git a/sound/machines/sm/accent/delam/24.ogg b/sound/machines/sm/accent/delam/24.ogg new file mode 100644 index 00000000000..b51d3598071 Binary files /dev/null and b/sound/machines/sm/accent/delam/24.ogg differ diff --git a/sound/machines/sm/accent/delam/25.ogg b/sound/machines/sm/accent/delam/25.ogg new file mode 100644 index 00000000000..823f22f1363 Binary files /dev/null and b/sound/machines/sm/accent/delam/25.ogg differ diff --git a/sound/machines/sm/accent/delam/26.ogg b/sound/machines/sm/accent/delam/26.ogg new file mode 100644 index 00000000000..24b2a2f040c Binary files /dev/null and b/sound/machines/sm/accent/delam/26.ogg differ diff --git a/sound/machines/sm/accent/delam/27.ogg b/sound/machines/sm/accent/delam/27.ogg new file mode 100644 index 00000000000..4b4b145b7bf Binary files /dev/null and b/sound/machines/sm/accent/delam/27.ogg differ diff --git a/sound/machines/sm/accent/delam/28.ogg b/sound/machines/sm/accent/delam/28.ogg new file mode 100644 index 00000000000..7bc71bf0e63 Binary files /dev/null and b/sound/machines/sm/accent/delam/28.ogg differ diff --git a/sound/machines/sm/accent/delam/29.ogg b/sound/machines/sm/accent/delam/29.ogg new file mode 100644 index 00000000000..7fec2f271c6 Binary files /dev/null and b/sound/machines/sm/accent/delam/29.ogg differ diff --git a/sound/machines/sm/accent/delam/3.ogg b/sound/machines/sm/accent/delam/3.ogg new file mode 100644 index 00000000000..5b57cc27070 Binary files /dev/null and b/sound/machines/sm/accent/delam/3.ogg differ diff --git a/sound/machines/sm/accent/delam/30.ogg b/sound/machines/sm/accent/delam/30.ogg new file mode 100644 index 00000000000..ed1ec7d89fc Binary files /dev/null and b/sound/machines/sm/accent/delam/30.ogg differ diff --git a/sound/machines/sm/accent/delam/31.ogg b/sound/machines/sm/accent/delam/31.ogg new file mode 100644 index 00000000000..0baa82e246e Binary files /dev/null and b/sound/machines/sm/accent/delam/31.ogg differ diff --git a/sound/machines/sm/accent/delam/32.ogg b/sound/machines/sm/accent/delam/32.ogg new file mode 100644 index 00000000000..e925b32d677 Binary files /dev/null and b/sound/machines/sm/accent/delam/32.ogg differ diff --git a/sound/machines/sm/accent/delam/33.ogg b/sound/machines/sm/accent/delam/33.ogg new file mode 100644 index 00000000000..9ddec0e84a4 Binary files /dev/null and b/sound/machines/sm/accent/delam/33.ogg differ diff --git a/sound/machines/sm/accent/delam/4.ogg b/sound/machines/sm/accent/delam/4.ogg new file mode 100644 index 00000000000..aa4f4da0714 Binary files /dev/null and b/sound/machines/sm/accent/delam/4.ogg differ diff --git a/sound/machines/sm/accent/delam/5.ogg b/sound/machines/sm/accent/delam/5.ogg new file mode 100644 index 00000000000..be438f6f151 Binary files /dev/null and b/sound/machines/sm/accent/delam/5.ogg differ diff --git a/sound/machines/sm/accent/delam/6.ogg b/sound/machines/sm/accent/delam/6.ogg new file mode 100644 index 00000000000..b89d52a564a Binary files /dev/null and b/sound/machines/sm/accent/delam/6.ogg differ diff --git a/sound/machines/sm/accent/delam/7.ogg b/sound/machines/sm/accent/delam/7.ogg new file mode 100644 index 00000000000..3a9cfc62cae Binary files /dev/null and b/sound/machines/sm/accent/delam/7.ogg differ diff --git a/sound/machines/sm/accent/delam/8.ogg b/sound/machines/sm/accent/delam/8.ogg new file mode 100644 index 00000000000..7bc0a727fae Binary files /dev/null and b/sound/machines/sm/accent/delam/8.ogg differ diff --git a/sound/machines/sm/accent/delam/9.ogg b/sound/machines/sm/accent/delam/9.ogg new file mode 100644 index 00000000000..5c1bd374055 Binary files /dev/null and b/sound/machines/sm/accent/delam/9.ogg differ diff --git a/sound/machines/sm/accent/normal/1.ogg b/sound/machines/sm/accent/normal/1.ogg new file mode 100644 index 00000000000..e92beed7fe6 Binary files /dev/null and b/sound/machines/sm/accent/normal/1.ogg differ diff --git a/sound/machines/sm/accent/normal/10.ogg b/sound/machines/sm/accent/normal/10.ogg new file mode 100644 index 00000000000..9efb616f0b3 Binary files /dev/null and b/sound/machines/sm/accent/normal/10.ogg differ diff --git a/sound/machines/sm/accent/normal/11.ogg b/sound/machines/sm/accent/normal/11.ogg new file mode 100644 index 00000000000..2af0981ef16 Binary files /dev/null and b/sound/machines/sm/accent/normal/11.ogg differ diff --git a/sound/machines/sm/accent/normal/12.ogg b/sound/machines/sm/accent/normal/12.ogg new file mode 100644 index 00000000000..2fab78b02da Binary files /dev/null and b/sound/machines/sm/accent/normal/12.ogg differ diff --git a/sound/machines/sm/accent/normal/13.ogg b/sound/machines/sm/accent/normal/13.ogg new file mode 100644 index 00000000000..784e84e4a82 Binary files /dev/null and b/sound/machines/sm/accent/normal/13.ogg differ diff --git a/sound/machines/sm/accent/normal/14.ogg b/sound/machines/sm/accent/normal/14.ogg new file mode 100644 index 00000000000..af170394ddd Binary files /dev/null and b/sound/machines/sm/accent/normal/14.ogg differ diff --git a/sound/machines/sm/accent/normal/15.ogg b/sound/machines/sm/accent/normal/15.ogg new file mode 100644 index 00000000000..05c88c6b291 Binary files /dev/null and b/sound/machines/sm/accent/normal/15.ogg differ diff --git a/sound/machines/sm/accent/normal/16.ogg b/sound/machines/sm/accent/normal/16.ogg new file mode 100644 index 00000000000..46b0e339802 Binary files /dev/null and b/sound/machines/sm/accent/normal/16.ogg differ diff --git a/sound/machines/sm/accent/normal/17.ogg b/sound/machines/sm/accent/normal/17.ogg new file mode 100644 index 00000000000..e432b2ee025 Binary files /dev/null and b/sound/machines/sm/accent/normal/17.ogg differ diff --git a/sound/machines/sm/accent/normal/18.ogg b/sound/machines/sm/accent/normal/18.ogg new file mode 100644 index 00000000000..1e0e91abc85 Binary files /dev/null and b/sound/machines/sm/accent/normal/18.ogg differ diff --git a/sound/machines/sm/accent/normal/19.ogg b/sound/machines/sm/accent/normal/19.ogg new file mode 100644 index 00000000000..31de063e022 Binary files /dev/null and b/sound/machines/sm/accent/normal/19.ogg differ diff --git a/sound/machines/sm/accent/normal/2.ogg b/sound/machines/sm/accent/normal/2.ogg new file mode 100644 index 00000000000..05e3c9ff17f Binary files /dev/null and b/sound/machines/sm/accent/normal/2.ogg differ diff --git a/sound/machines/sm/accent/normal/20.ogg b/sound/machines/sm/accent/normal/20.ogg new file mode 100644 index 00000000000..36810bd8f10 Binary files /dev/null and b/sound/machines/sm/accent/normal/20.ogg differ diff --git a/sound/machines/sm/accent/normal/21.ogg b/sound/machines/sm/accent/normal/21.ogg new file mode 100644 index 00000000000..306e8856e50 Binary files /dev/null and b/sound/machines/sm/accent/normal/21.ogg differ diff --git a/sound/machines/sm/accent/normal/22.ogg b/sound/machines/sm/accent/normal/22.ogg new file mode 100644 index 00000000000..38286aa98b2 Binary files /dev/null and b/sound/machines/sm/accent/normal/22.ogg differ diff --git a/sound/machines/sm/accent/normal/23.ogg b/sound/machines/sm/accent/normal/23.ogg new file mode 100644 index 00000000000..89f85fed911 Binary files /dev/null and b/sound/machines/sm/accent/normal/23.ogg differ diff --git a/sound/machines/sm/accent/normal/24.ogg b/sound/machines/sm/accent/normal/24.ogg new file mode 100644 index 00000000000..7c12a3e768e Binary files /dev/null and b/sound/machines/sm/accent/normal/24.ogg differ diff --git a/sound/machines/sm/accent/normal/25.ogg b/sound/machines/sm/accent/normal/25.ogg new file mode 100644 index 00000000000..f89175ceb19 Binary files /dev/null and b/sound/machines/sm/accent/normal/25.ogg differ diff --git a/sound/machines/sm/accent/normal/26.ogg b/sound/machines/sm/accent/normal/26.ogg new file mode 100644 index 00000000000..9efd1d8ef39 Binary files /dev/null and b/sound/machines/sm/accent/normal/26.ogg differ diff --git a/sound/machines/sm/accent/normal/27.ogg b/sound/machines/sm/accent/normal/27.ogg new file mode 100644 index 00000000000..1fb1edbb5a8 Binary files /dev/null and b/sound/machines/sm/accent/normal/27.ogg differ diff --git a/sound/machines/sm/accent/normal/28.ogg b/sound/machines/sm/accent/normal/28.ogg new file mode 100644 index 00000000000..890c5ea4294 Binary files /dev/null and b/sound/machines/sm/accent/normal/28.ogg differ diff --git a/sound/machines/sm/accent/normal/29.ogg b/sound/machines/sm/accent/normal/29.ogg new file mode 100644 index 00000000000..cd2aa40714c Binary files /dev/null and b/sound/machines/sm/accent/normal/29.ogg differ diff --git a/sound/machines/sm/accent/normal/3.ogg b/sound/machines/sm/accent/normal/3.ogg new file mode 100644 index 00000000000..38de5571a4a Binary files /dev/null and b/sound/machines/sm/accent/normal/3.ogg differ diff --git a/sound/machines/sm/accent/normal/30.ogg b/sound/machines/sm/accent/normal/30.ogg new file mode 100644 index 00000000000..87d1782768a Binary files /dev/null and b/sound/machines/sm/accent/normal/30.ogg differ diff --git a/sound/machines/sm/accent/normal/31.ogg b/sound/machines/sm/accent/normal/31.ogg new file mode 100644 index 00000000000..9ce3eeb72ee Binary files /dev/null and b/sound/machines/sm/accent/normal/31.ogg differ diff --git a/sound/machines/sm/accent/normal/32.ogg b/sound/machines/sm/accent/normal/32.ogg new file mode 100644 index 00000000000..26ca0561428 Binary files /dev/null and b/sound/machines/sm/accent/normal/32.ogg differ diff --git a/sound/machines/sm/accent/normal/33.ogg b/sound/machines/sm/accent/normal/33.ogg new file mode 100644 index 00000000000..24964c1ce96 Binary files /dev/null and b/sound/machines/sm/accent/normal/33.ogg differ diff --git a/sound/machines/sm/accent/normal/4.ogg b/sound/machines/sm/accent/normal/4.ogg new file mode 100644 index 00000000000..2e71e976e86 Binary files /dev/null and b/sound/machines/sm/accent/normal/4.ogg differ diff --git a/sound/machines/sm/accent/normal/5.ogg b/sound/machines/sm/accent/normal/5.ogg new file mode 100644 index 00000000000..04852e10f2b Binary files /dev/null and b/sound/machines/sm/accent/normal/5.ogg differ diff --git a/sound/machines/sm/accent/normal/6.ogg b/sound/machines/sm/accent/normal/6.ogg new file mode 100644 index 00000000000..bf06c06bbe0 Binary files /dev/null and b/sound/machines/sm/accent/normal/6.ogg differ diff --git a/sound/machines/sm/accent/normal/7.ogg b/sound/machines/sm/accent/normal/7.ogg new file mode 100644 index 00000000000..d29821701f4 Binary files /dev/null and b/sound/machines/sm/accent/normal/7.ogg differ diff --git a/sound/machines/sm/accent/normal/8.ogg b/sound/machines/sm/accent/normal/8.ogg new file mode 100644 index 00000000000..0b94b9dbe04 Binary files /dev/null and b/sound/machines/sm/accent/normal/8.ogg differ diff --git a/sound/machines/sm/accent/normal/9.ogg b/sound/machines/sm/accent/normal/9.ogg new file mode 100644 index 00000000000..545b038be11 Binary files /dev/null and b/sound/machines/sm/accent/normal/9.ogg differ diff --git a/sound/machines/sm/loops/calm.ogg b/sound/machines/sm/loops/calm.ogg new file mode 100644 index 00000000000..cee14fcd13d Binary files /dev/null and b/sound/machines/sm/loops/calm.ogg differ diff --git a/sound/machines/sm/loops/delamming.ogg b/sound/machines/sm/loops/delamming.ogg new file mode 100644 index 00000000000..7d79f0e3c4a Binary files /dev/null and b/sound/machines/sm/loops/delamming.ogg differ diff --git a/sound/misc/notice3.ogg b/sound/misc/notice3.ogg new file mode 100644 index 00000000000..ad02a523542 Binary files /dev/null and b/sound/misc/notice3.ogg differ diff --git a/sound/misc/server-ready.ogg b/sound/misc/server-ready.ogg new file mode 100644 index 00000000000..216533b6f32 Binary files /dev/null and b/sound/misc/server-ready.ogg differ diff --git a/sound/voice/YeenCackle.ogg b/sound/voice/YeenCackle.ogg new file mode 100644 index 00000000000..56eb52ebe09 Binary files /dev/null and b/sound/voice/YeenCackle.ogg differ diff --git a/sound/voice/baa.ogg b/sound/voice/baa.ogg new file mode 100644 index 00000000000..ea15f6fa2a5 Binary files /dev/null and b/sound/voice/baa.ogg differ diff --git a/sound/voice/baa2.ogg b/sound/voice/baa2.ogg new file mode 100644 index 00000000000..5e0496044b7 Binary files /dev/null and b/sound/voice/baa2.ogg differ diff --git a/sound/voice/knuckles.ogg b/sound/voice/knuckles.ogg new file mode 100644 index 00000000000..b61a50fb613 Binary files /dev/null and b/sound/voice/knuckles.ogg differ