Merge pull request #6804 from Cerebulon/bigsounds

Big Bastard Incidental Sound Port
2025-12-21 15:42:53 +00:00 · 2020-03-15 11:38:44 -07:00
parent 920e495fdf 9fbd9b2caf
commit 22e28f29fe
179 changed files with 363 additions and 31 deletions
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -222,6 +222,7 @@ var/global/list/PDA_Manifest = list()
 	throwforce = 0.0
 	throw_speed = 1
 	throw_range = 20
+	drop_sound = 'sound/items/drop/rubber.ogg'

 	afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
 		user.drop_item()
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -35,6 +35,7 @@
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
+	drop_sound = 'sound/misc/slip.ogg'

 /obj/item/weapon/soap/nanotrasen
 	desc = "A NanoTrasen-brand bar of soap. Smells of phoron."
@@ -105,7 +106,7 @@
 	if(concealed_blade)
 		user.visible_message("<span class='warning'>[user] has unsheathed \a [concealed_blade] from [T.his] [src]!</span>", "You unsheathe \the [concealed_blade] from \the [src].")
 		// Calling drop/put in hands to properly call item drop/pickup procs
-		playsound(user.loc, 'sound/weapons/flipblade.ogg', 50, 1)
+		playsound(user.loc, 'sound/weapons/holster/sheathout.ogg', 50, 1)
 		user.drop_from_inventory(src)
 		user.put_in_hands(concealed_blade)
 		user.put_in_hands(src)
@@ -119,6 +120,7 @@
 	if(!src.concealed_blade && istype(W))
 		var/datum/gender/T = gender_datums[user.get_visible_gender()]
 		user.visible_message("<span class='warning'>[user] has sheathed \a [W] into [T.his] [src]!</span>", "You sheathe \the [W] into \the [src].")
+		playsound(user.loc, 'sound/weapons/holster/sheathin.ogg', 50, 1)
 		user.drop_from_inventory(W)
 		W.loc = src
 		src.concealed_blade = W
@@ -487,6 +489,7 @@
 	icon = 'icons/obj/stock_parts.dmi'
 	w_class = ITEMSIZE_SMALL
 	var/rating = 1
+	drop_sound = 'sound/items/drop/glass.ogg'

 /obj/item/weapon/stock_parts/New()
 	src.pixel_x = rand(-5.0, 5)
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -130,5 +130,6 @@ datum/announcement/proc/Log(message as text, message_title as text)
 			rank = character.mind.role_alt_title
 		AnnounceArrivalSimple(character.real_name, rank, join_message)

-/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle")
+
+/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle", new_sound = 'sound/misc/notice3.ogg')
 	global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer")
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -807,6 +807,7 @@ 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'

 obj/item/weapon/newspaper/attack_self(mob/user as mob)
 	if(ishuman(user))
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -26,6 +26,7 @@
 	var/datum/stored_item/vending_product/currently_vending = null // What we're requesting payment for right now
 	var/status_message = "" // Status screen messages like "insufficient funds", displayed in NanoUI
 	var/status_error = 0 // Set to 1 if status_message is an error
+	var/vending_sound = "machines/vending/vending_drop.ogg"

 	/*
 		Variables used to initialize the product list
@@ -508,8 +509,7 @@
 			sleep(3)
 			if(R.get_product(get_turf(src)))
 				visible_message("<span class='notice'>\The [src] clunks as it vends an additional item.</span>")
-
-		playsound(src, 'sound/items/vending.ogg', 50, 1, 1)
+		playsound(src.loc, "sound/[vending_sound]", 100, 1, 1)

 		status_message = ""
 		status_error = 0
@@ -739,6 +739,7 @@
 	req_access = list(access_bar)
 	req_log_access = access_bar
 	has_logs = 1
+	vending_sound = "machines/vending/vending_cans.ogg"

 /obj/machinery/vending/assist
 	products = list(	/obj/item/device/assembly/prox_sensor = 5,/obj/item/device/assembly/igniter = 3,/obj/item/device/assembly/signaler = 4,
@@ -758,6 +759,7 @@
 	products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25)
 	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10)
 	prices = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 3, /obj/item/weapon/reagent_containers/food/drinks/tea = 3, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 3)
+	vending_sound = "machines/vending/vending_coffee.ogg"

 /obj/machinery/vending/snack
 	name = "Getmore Chocolate Corp"
@@ -791,6 +793,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 1,/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 1,
 					/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
+	vending_sound = "machines/vending/vending_cans.ogg"

 /obj/machinery/vending/fitness
 	name = "SweatMAX"
@@ -1053,6 +1056,7 @@
 	products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 30) // TODO Russian soda can
 	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 20) // TODO Russian cola can
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
+	vending_sound = "machines/vending/vending_cans.ogg"

 /obj/machinery/vending/tool
 	name = "YouTool"
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -92,6 +92,8 @@
 	var/icon/default_worn_icon	//Default on-mob icon
 	var/worn_layer				//Default on-mob layer

+	var/drop_sound = 'sound/items/drop/device.ogg' // drop sound - this is the default
+
 /obj/item/New()
 	..()
 	if(embed_chance < 0)
@@ -274,6 +276,11 @@
 /obj/item/proc/moved(mob/user as mob, old_loc as turf)
 	return

+/obj/item/throw_impact(atom/hit_atom)
+	..()
+	if(drop_sound)
+		playsound(src, drop_sound, 50, 0, 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)
 	..()
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1053,6 +1053,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			var/mob/M = loc
 			M.put_in_hands(id)
 			to_chat(usr, "<span class='notice'>You remove the ID from the [name].</span>")
+			playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
 		else
 			id.loc = get_turf(src)
 		id = null
@@ -1259,6 +1260,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if (cartridge.radio)
 		cartridge.radio.hostpda = null
 	to_chat(usr, "<span class='notice'>You remove \the [cartridge] from the [name].</span>")
+	playsound(loc, 'sound/machines/id_swipe.ogg', 100, 1)
 	cartridge = null

 /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -10,6 +10,7 @@
 	var/heal_brute = 0
 	var/heal_burn = 0
 	var/apply_sounds
+	drop_sound = 'sound/items/drop/box.ogg'

 	var/upgrade_to	// The type path this stack can be upgraded to.

@@ -143,6 +144,7 @@
 	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'

 	upgrade_to = /obj/item/stack/medical/advanced/bruise_pack

@@ -212,6 +214,7 @@
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
 	apply_sounds = list('sound/effects/ointment.ogg')
+	drop_sound = 'sound/items/drop/herb.ogg'

 /obj/item/stack/medical/ointment/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if(..())
@@ -352,6 +355,7 @@
 	icon_state = "splint"
 	amount = 5
 	max_amount = 5
+	drop_sound = 'sound/items/drop/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.

--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -16,6 +16,7 @@
 	icon_state = "sheet-glass"
 	var/is_reinforced = 0
 	default_type = "glass"
+	drop_sound = 'sound/items/drop/glass.ogg'

 /obj/item/stack/material/glass/attack_self(mob/user as mob)
 	construct_window(user)
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -4,6 +4,7 @@
 	singular_name = "human skin piece"
 	icon_state = "sheet-hide"
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/stack/material/animalhide/human
 	amount = 50
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -17,6 +17,7 @@
 	randpixel = 7
 	w_class = ITEMSIZE_NORMAL
 	max_amount = 60
+	drop_sound = 'sound/items/drop/axe.ogg'

 /obj/item/stack/tile/New()
 	..()
@@ -37,6 +38,7 @@
 	flags = 0
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/herb.ogg'
 /*
 * Wood
 */
@@ -51,6 +53,7 @@
 	throw_range = 20
 	flags = 0
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/wooden.ogg'

 /obj/item/stack/tile/wood/sif
 	name = "alien wood tile"
@@ -80,6 +83,7 @@
 	throw_range = 20
 	flags = 0
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/stack/tile/carpet/teal
 	name = "teal carpet"
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -26,6 +26,7 @@
 	throw_speed = 4
 	throw_range = 20
 	force = 0
+	drop_sound = 'sound/items/drop/gloves.ogg'


 /*
@@ -36,6 +37,7 @@
 	desc = "A translucent balloon. There's nothing in it."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "waterballoon-e"
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /obj/item/toy/balloon/New()
 	var/datum/reagents/R = new/datum/reagents(10)
@@ -99,6 +101,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "syndballoon"
 	w_class = ITEMSIZE_LARGE
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /obj/item/toy/nanotrasenballoon
 	name = "criminal balloon"
@@ -110,6 +113,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "ntballoon"
 	w_class = ITEMSIZE_LARGE
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /*
 * Fake telebeacon
@@ -147,6 +151,7 @@
 	w_class = ITEMSIZE_SMALL
 	attack_verb = list("attacked", "struck", "hit")
 	var/bullets = 5
+	drop_sound = 'sound/items/drop/gun.ogg'

 	examine(mob/user)
 		if(..(user, 2) && bullets)
@@ -239,6 +244,7 @@
 	icon_state = "foamdart"
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
+	drop_sound = 'sound/items/drop/food.ogg'

 /obj/effect/foam_dart_dummy
 	name = ""
@@ -256,6 +262,7 @@
 	desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "esword"
+	drop_sound = 'sound/items/drop/gun.ogg'
 	var/lcolor
 	var/rainbow = FALSE
 	item_icons = list(
@@ -344,6 +351,7 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "snappop"
 	w_class = ITEMSIZE_TINY
+	drop_sound = null

 	throw_impact(atom/hit_atom)
 		..()
@@ -378,6 +386,7 @@
 	name = "water flower"
 	desc = "A seemingly innocent sunflower...with a twist."
 	icon = 'icons/obj/device.dmi'
+	drop_sound = 'sound/items/drop/food.ogg'
 	icon_state = "sunflower"
 	item_state = "sunflower"
 	var/empty = 0
@@ -448,6 +457,7 @@
 	desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "bosunwhistle"
+	drop_sound = 'sound/items/drop/card.ogg'
 	var/cooldown = 0
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS | SLOT_HOLSTER
@@ -465,6 +475,7 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "ripleytoy"
 	var/cooldown = 0
+	drop_sound = 'sound/mecha/mechstep.ogg'

 //all credit to skasi for toy mech fun ideas
 /obj/item/toy/prize/attack_self(mob/user as mob)
@@ -546,6 +557,7 @@
 	icon_state = "nuketoy"
 	var/cooldown = 0
 	var/toysay = "What the fuck did you do?"
+	drop_sound = 'sound/items/drop/accessory.ogg'

 /obj/item/toy/figure/New()
 	..()
@@ -970,6 +982,7 @@
 	desc = "A small toy plushie. It's very cute."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "nymphplushie"
+	drop_sound = 'sound/items/drop/plushie.ogg'
 	w_class = ITEMSIZE_TINY
 	var/last_message = 0
 	var/pokephrase = "Uww!"
@@ -1007,6 +1020,7 @@
 		user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
 	else
 		user.visible_message("<span class='notice'><b>\The [user]</b> pokes [src].</span>","<span class='notice'>You poke [src].</span>")
+		playsound(src, 'sound/items/drop/plushie.ogg', 25, 0)
 		visible_message("[src] says, \"[pokephrase]\"")
 	last_message = world.time

@@ -1488,6 +1502,7 @@
 	icon_state = "inflatable"
 	icon = 'icons/obj/clothing/belts.dmi'
 	slot_flags = SLOT_BELT
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /obj/item/toy/xmastree
 	name = "Miniature Christmas tree"
@@ -1497,3 +1512,4 @@
 	w_class = ITEMSIZE_TINY
 	force = 1
 	throwforce = 1
+	drop_sound = 'sound/items/drop/box.ogg'
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -6,6 +6,7 @@
 	icon = 'icons/obj/trash.dmi'
 	w_class = ITEMSIZE_SMALL
 	desc = "This is rubbish."
+	drop_sound = 'sound/items/drop/wrapper.ogg'

 /obj/item/trash/raisins
 	name = "\improper 4no raisins"
@@ -38,6 +39,7 @@
 /obj/item/trash/unajerky
 	name = "Moghes Imported Sissalik Jerky"
 	icon_state = "unathitinred"
+	drop_sound = 'sound/items/drop/soda.ogg'

 /obj/item/trash/syndi_cakes
 	name = "syndi cakes"
@@ -66,6 +68,7 @@
 /obj/item/trash/tray
 	name = "tray"
 	icon_state = "tray"
+	drop_sound = 'sound/items/trayhit1.ogg'

 /obj/item/trash/candle
 	name = "candle"
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -34,6 +34,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	origin_tech = list(TECH_MATERIAL = 1)
 	slot_flags = SLOT_EARS
 	attack_verb = list("burnt", "singed")
+	drop_sound = null

 /obj/item/weapon/flame/match/process()
 	if(isliving(loc))
@@ -90,6 +91,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/ignitermes = "USER lights NAME with FLAME"
 	var/brand
 	blood_sprite_state = null //Can't bloody these
+	drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg'

 /obj/item/clothing/mask/smokable/Initialize()
 	. = ..()
@@ -158,6 +160,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].")
 	if(!src.lit)
 		src.lit = 1
+		playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1)
 		damtype = "fire"
 		if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
 			var/datum/effect/effect/system/reagents_explosion/e = new()
@@ -182,6 +185,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0)
 	var/turf/T = get_turf(src)
 	set_light(0)
+	playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 	STOP_PROCESSING(SSobj, src)
 	if (type_butt)
 		var/obj/item/butt = new type_butt(T)
@@ -203,6 +207,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			var/mob/living/M = loc
 			if (!nomessage)
 				to_chat(M, "<span class='notice'>Your [name] goes out, and you empty the ash.</span>")
+				playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 			lit = 0
 			icon_state = initial(icon_state)
 			item_state = initial(item_state)
@@ -225,6 +230,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			to_chat(H, "<span class='warning'>\The [blocked] is in the way!</span>")
 			return 1
 		to_chat(H, "<span class='notice'>You take a drag on your [name].</span>")
+		playsound(src, 'sound/items/cigs_lighters/inhale.ogg', 50, 0, -1)
 		smoke(5)
 		return 1
 	return ..()
@@ -319,6 +325,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(lit == 1)
 		if(user.a_intent == I_HURT)
 			user.visible_message("<span class='notice'>[user] drops and treads on the lit [src], putting it out instantly.</span>")
+			playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 			die(1)
 		else
 			user.visible_message("<span class='notice'>[user] puts out \the [src].</span>")
@@ -412,6 +419,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(lit == 1)
 		if(user.a_intent == I_HURT)
 			user.visible_message("<span class='notice'>[user] empties the lit [src] on the floor!.</span>")
+			playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 			die(1)
 		else
 			user.visible_message("<span class='notice'>[user] puts out \the [src].</span>")
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -8,6 +8,7 @@
 	slot_flags = SLOT_EARS
 	var/colour = "red"
 	var/open = 0
+	drop_sound = 'sound/items/drop/glass.ogg'

 /obj/item/weapon/lipstick/purple
 	name = "purple lipstick"
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -12,6 +12,7 @@
 	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'

 	var/spray_particles = 3
 	var/spray_amount = 10	//units of liquid per particle
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -13,6 +13,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
+	drop_sound = 'sound/items/drop/box.ogg'

 /obj/item/weapon/a_gift/New()
 	..()
@@ -26,6 +27,7 @@

 /obj/item/weapon/gift/attack_self(mob/user as mob)
 	user.drop_item()
+	playsound(src.loc, 'sound/items/package_unwrap.ogg', 50,1)
 	if(src.gift)
 		user.put_in_active_hand(gift)
 		src.gift.add_fingerprint(user)
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -11,6 +11,7 @@
 	throw_range = 5
 	origin_tech = list(TECH_MATERIAL = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 500)
+	drop_sound = 'sound/items/drop/accessory.ogg'
 	var/elastic
 	var/dispenser = 0
 	var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
--- a/code/game/objects/items/weapons/id
+++ b/code/game/objects/items/weapons/id
@@ -20,6 +20,7 @@
 	var/associated_account_number = 0

 	var/list/files = list(  )
+	drop_sound = 'sound/items/drop/card.ogg'

 /obj/item/weapon/card/data
 	name = "data disk"
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -103,6 +103,7 @@
 	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'

 /obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -9,6 +9,7 @@
 	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'

 /obj/item/weapon/material/butterfly/update_force()
 	if(active)
@@ -65,6 +66,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 12000)
 	origin_tech = list(TECH_MATERIAL = 1)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	drop_sound = 'sound/items/drop/knife.ogg'

 /obj/item/weapon/material/knife/suicide_act(mob/user)
 	var/datum/gender/TU = gender_datums[user.get_visible_gender()]
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -21,6 +21,7 @@
 	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'

 /obj/item/weapon/material/knife/machete/hatchet/unathiknife
 	name = "duelling knife"
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -9,6 +9,7 @@
 	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'

 /obj/item/weapon/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))
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -95,6 +95,7 @@
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	applies_material_colour = 0
 	can_cleave = TRUE
+	drop_sound = 'sound/items/drop/axe.ogg'

 /obj/item/weapon/material/twohanded/fireaxe/update_held_icon()
 	var/mob/living/M = loc
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -16,11 +16,8 @@
 	max_storage_space = INVENTORY_STANDARD_SPACE
 	var/flippable = 0
 	var/side = 0 //0 = right, 1 = left
+	drop_sound = 'sound/items/drop/backpack.ogg'

-/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (src.use_sound)
-		playsound(src.loc, src.use_sound, 50, 1, -5)
-	..()

 /obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot)
 	if (slot == slot_back && src.use_sound)
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -23,6 +23,7 @@
 	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'

 // -----------------------------
 //          Trash bag
@@ -33,6 +34,7 @@
 	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'

 	w_class = ITEMSIZE_LARGE
 	max_w_class = ITEMSIZE_SMALL
@@ -59,6 +61,7 @@
 	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'

 	w_class = ITEMSIZE_LARGE
 	max_w_class = ITEMSIZE_SMALL
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -9,6 +9,7 @@
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
 	sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi')
+	drop_sound = 'sound/items/drop/leather.ogg'

 	var/show_above_suit = 0

--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -7,6 +7,8 @@
 	w_class = ITEMSIZE_NORMAL
 	var/mob/affecting = null
 	var/deity_name = "Christ"
+	use_sound = 'sound/bureaucracy/bookopen.ogg'
+	drop_sound = 'sound/bureaucracy/bookclose.ogg'

 /obj/item/weapon/storage/bible/booze
 	name = "bible"
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -28,6 +28,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
+	use_sound = 'sound/items/storage/box.ogg'
+	drop_sound = 'sound/items/drop/box.ogg'

 // BubbleWrap - A box can be folded up to make card
 /obj/item/weapon/storage/box/attack_self(mob/user as mob)
@@ -50,6 +52,7 @@
 		return
 	// Now make the cardboard
 	to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
+	playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1)
 	new foldable(get_turf(src))
 	qdel(src)

@@ -406,10 +409,15 @@

 /obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
 	if(istype(W) && !W.lit && !W.burnt)
+		if(prob(25))
+			playsound(src.loc, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
+			user.visible_message("<span class='notice'>[user] manages to light the match on the matchbox.</span>")
 			W.lit = 1
 			W.damtype = "burn"
 			W.icon_state = "match_lit"
-		START_PROCESSING(SSobj, W)
+			START_PROCESSING(SSprocessing, W)
+		else
+			playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
 	W.update_icon()
 	return

--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -8,6 +8,8 @@
 	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'

 /obj/item/weapon/storage/briefcase/clutch
 	name = "clutch purse"
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -15,6 +15,7 @@
 	throw_range = 8
 	max_storage_space = ITEMSIZE_COST_SMALL * 7 // 14
 	var/list/icon_variety
+	drop_sound = 'sound/items/drop/box.ogg'

 /obj/item/weapon/storage/firstaid/Initialize()
 	. = ..()
@@ -171,13 +172,14 @@
 	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'
 	item_state_slots = list(slot_r_hand_str = "contsolid", slot_l_hand_str = "contsolid")
 	w_class = ITEMSIZE_SMALL
 	can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper)
 	allow_quick_gather = 1
 	allow_quick_empty = 1
 	use_to_pickup = 1
-	use_sound = null
+	use_sound = 'sound/items/storage/pillbottle.ogg'
 	max_storage_space = ITEMSIZE_COST_TINY * 14
 	max_w_class = ITEMSIZE_TINY
 	var/wrapper_color
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -26,6 +26,7 @@
 	w_class = ITEMSIZE_NORMAL
 	max_w_class = ITEMSIZE_SMALL
 	max_storage_space = ITEMSIZE_SMALL * 7
+	use_sound = 'sound/items/storage/briefcase.ogg'

 	examine(mob/user)
 		if(..(user, 1))
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -141,8 +141,8 @@
 	is_seeing -= user

 /obj/item/weapon/storage/proc/open(mob/user as mob)
-	if (src.use_sound && !isobserver(user))
-		playsound(src.loc, src.use_sound, 50, 1, -5)
+	if (use_sound)
+		playsound(src.loc, src.use_sound, 50, 0, -5)

 	orient2hud(user)
 	if (user.s_active)
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -14,6 +14,8 @@
 	max_storage_space = ITEMSIZE_COST_SMALL * 7 //enough to hold all starting contents
 	origin_tech = list(TECH_COMBAT = 1)
 	attack_verb = list("robusted")
+	use_sound = 'sound/items/storage/toolbox.ogg'
+	drop_sound = 'sound/items/drop/metalboots.ogg'

 /obj/item/weapon/storage/toolbox/emergency
 	name = "emergency toolbox"
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -30,6 +30,7 @@
 	icon_state = "retractor"
 	matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /*
 * Hemostat
@@ -41,6 +42,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("attacked", "pinched")
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /*
 * Cautery
@@ -52,6 +54,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 2500)
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("burnt")
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /*
 * Surgical Drill
@@ -66,6 +69,7 @@
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("drilled")
+	drop_sound = 'sound/items/drop/accessory.ogg'

 	suicide_act(mob/user)
 		var/datum/gender/TU = gender_datums[user.get_visible_gender()]
@@ -91,6 +95,7 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000)
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	drop_sound = 'sound/items/drop/knife.ogg'

 	suicide_act(mob/user)
 		var/datum/gender/TU = gender_datums[user.get_visible_gender()]
@@ -145,6 +150,7 @@
 	desc = "For heavy duty cutting."
 	icon_state = "saw3"
 	hitsound = 'sound/weapons/circsawhit.ogg'
+	drop_sound = 'sound/items/drop/accessory.ogg'
 	force = 15.0
 	w_class = ITEMSIZE_NORMAL
 	throwforce = 9.0
@@ -176,6 +182,7 @@
 	icon_state = "bone-gel"
 	force = 0
 	throwforce = 1.0
+	drop_sound = 'sound/items/drop/bottle.ogg'

 /obj/item/weapon/surgical/FixOVein
 	name = "FixOVein"
@@ -185,6 +192,7 @@
 	throwforce = 1.0
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
 	var/usage_amount = 10
+	drop_sound = 'sound/items/drop/accessory.ogg'

 /obj/item/weapon/surgical/bonesetter
 	name = "bone setter"
@@ -195,6 +203,7 @@
 	throw_speed = 3
 	throw_range = 5
 	attack_verb = list("attacked", "hit", "bludgeoned")
+	drop_sound = 'sound/items/drop/scrap.ogg'

 /obj/item/weapon/surgical/bone_clamp
 	name = "bone clamp"
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -8,6 +8,17 @@
 /*
 * Classic Baton
 */
+
+/obj/item/weapon/melee
+	name = "weapon"
+	desc = "Murder device."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "baton"
+	item_state = "classic_baton"
+	slot_flags = SLOT_BELT
+	force = 10
+	drop_sound = 'sound/items/drop/metalweapon.ogg'
+
 /obj/item/weapon/melee/classic_baton
 	name = "police baton"
 	desc = "A wooden truncheon for beating criminal scum."
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -10,6 +10,7 @@ var/list/global/tank_gauge_cache = list()
 	sprite_sheets = list(
 		SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi'
 		)
+	drop_sound = 'sound/items/drop/gascan.ogg'

 	var/gauge_icon = "indicator_tank"
 	var/last_gauge_pressure
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "taperoll"
 	w_class = ITEMSIZE_TINY
+	drop_sound = 'sound/items/drop/box.ogg'

 	toolspeed = 2 //It is now used in surgery as a not awful, but probably dangerous option, due to speed.

@@ -141,6 +142,7 @@
 	w_class = ITEMSIZE_TINY
 	plane = MOB_PLANE
 	anchored = FALSE
+	drop_sound = null

 	var/obj/item/weapon/stuck = null

--- a/code/game/objects/items/weapons/tools/crowbar.dm
+++ b/code/game/objects/items/weapons/tools/crowbar.dm
@@ -17,6 +17,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 	usesound = 'sound/items/crowbar.ogg'
+	drop_sound = 'sound/items/drop/sword.ogg'
 	toolspeed = 1

 /obj/item/weapon/tool/crowbar/is_crowbar()
--- a/code/game/objects/items/weapons/tools/screwdriver.dm
+++ b/code/game/objects/items/weapons/tools/screwdriver.dm
@@ -15,6 +15,7 @@
 	throw_range = 5
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	usesound = 'sound/items/screwdriver.ogg'
+	drop_sound = 'sound/items/drop/scrap.ogg'
 	matter = list(DEFAULT_WALL_MATERIAL = 75)
 	attack_verb = list("stabbed")
 	sharp  = 1
--- a/code/game/objects/items/weapons/tools/weldingtool.dm
+++ b/code/game/objects/items/weapons/tools/weldingtool.dm
@@ -37,6 +37,7 @@
 	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/scrap.ogg'

 /obj/item/weapon/weldingtool/Initialize()
 	. = ..()
--- a/code/game/objects/items/weapons/tools/wirecutters.dm
+++ b/code/game/objects/items/weapons/tools/wirecutters.dm
@@ -17,6 +17,7 @@
 	attack_verb = list("pinched", "nipped")
 	hitsound = 'sound/items/wirecutter.ogg'
 	usesound = 'sound/items/wirecutter.ogg'
+	drop_sound = 'sound/items/drop/knife.ogg'
 	sharp = 1
 	edge = 1
 	toolspeed = 1
--- a/code/game/objects/items/weapons/tools/wrench.dm
+++ b/code/game/objects/items/weapons/tools/wrench.dm
@@ -15,6 +15,7 @@
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 	usesound = 'sound/items/ratchet.ogg'
 	toolspeed = 1
+	drop_sound = 'sound/items/drop/sword.ogg'

 /obj/item/weapon/tool/wrench/is_wrench()
 	return TRUE
--- a/code/game/objects/items/weapons/towels.dm
+++ b/code/game/objects/items/weapons/towels.dm
@@ -8,6 +8,7 @@
 	attack_verb = list("whipped")
 	hitsound = 'sound/weapons/towelwhip.ogg'
 	desc = "A soft cotton towel."
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/weapon/towel/attack_self(mob/living/user as mob)
 	user.visible_message(text("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src))
--- a/code/game/objects/items/weapons/trays.dm
+++ b/code/game/objects/items/weapons/trays.dm
@@ -14,6 +14,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 3000)
 	var/list/carrying = list() // List of things on the tray. - Doohl
 	var/max_carry = 10
+	drop_sound = 'sound/items/trayhit1.ogg'

 /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	user.setClickCooldown(user.get_attack_speed(src))
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -9,6 +9,7 @@
 	throw_range = 4
 	throwforce = 10
 	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/sword.ogg'

 	suicide_act(mob/user)
 		var/datum/gender/T = gender_datums[user.get_visible_gender()]
--- a/code/game/objects/items/weapons/weldbackpack.dm
+++ b/code/game/objects/items/weapons/weldbackpack.dm
@@ -9,6 +9,7 @@
 	var/obj/item/weapon/nozzle = null //Attached welder, or other spray device.
 	var/nozzle_type = /obj/item/weapon/weldingtool/tubefed
 	var/nozzle_attached = 0
+	drop_sound = 'sound/items/drop/backpack.ogg'

 /obj/item/weapon/weldpack/Initialize()
 	. = ..()
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -16,6 +16,7 @@ LINEN BINS
 	throw_speed = 1
 	throw_range = 2
 	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/weapon/bedsheet/attack_self(mob/user as mob)
 	user.drop_item()
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -3,6 +3,7 @@
 	desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
 	icon = 'icons/obj/inflatable.dmi'
 	icon_state = "folded_wall"
+	drop_sound = 'sound/items/drop/rubber.ogg'
 	w_class = ITEMSIZE_NORMAL
 	var/deploy_path = /obj/structure/inflatable

--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -288,6 +288,7 @@

 /obj/structure/bed/roller/Move()
 	..()
+	playsound(src, 'sound/effects/roll.ogg', 100, 1)
 	if(has_buckled_mobs())
 		for(var/A in buckled_mobs)
 			var/mob/living/L = A
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -143,6 +143,7 @@

 /obj/structure/bed/chair/office/Move()
 	..()
+	playsound(src, 'sound/effects/roll.ogg', 100, 1)
 	if(has_buckled_mobs())
 		for(var/A in buckled_mobs)
 			var/mob/living/occupant = A
--- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
@@ -93,6 +93,8 @@

 /obj/structure/bed/chair/wheelchair/Move()
 	..()
+	cut_overlays()
+	playsound(src, 'sound/effects/roll.ogg', 75, 1)
 	if(has_buckled_mobs())
 		for(var/A in buckled_mobs)
 			var/mob/living/occupant = A
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -384,6 +384,7 @@
 		return

 	to_chat(usr, "<span class='notice'>You start washing your hands.</span>")
+	playsound(loc, 'sound/effects/sink_long.ogg', 75, 1)

 	busy = 1
 	sleep(40)
@@ -406,6 +407,7 @@
 	if (istype(RG) && RG.is_open_container())
 		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		user.visible_message("<span class='notice'>[user] fills \the [RG] using \the [src].</span>","<span class='notice'>You fill \the [RG] using \the [src].</span>")
+		playsound(loc, 'sound/effects/sink.ogg', 75, 1)
 		return 1

 	else if (istype(O, /obj/item/weapon/melee/baton))
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -135,6 +135,7 @@
 			if ("button") soundin = pick('sound/machines/button1.ogg','sound/machines/button2.ogg','sound/machines/button3.ogg','sound/machines/button4.ogg')
 			if ("switch") soundin = pick('sound/machines/switch1.ogg','sound/machines/switch2.ogg','sound/machines/switch3.ogg','sound/machines/switch4.ogg')
 			if ("casing_sound") soundin = pick('sound/weapons/casingfall1.ogg','sound/weapons/casingfall2.ogg','sound/weapons/casingfall3.ogg')
+			if ("pickaxe") soundin = pick('sound/weapons/mine/pickaxe1.ogg', 'sound/weapons/mine/pickaxe2.ogg','sound/weapons/mine/pickaxe3.ogg','sound/weapons/mine/pickaxe4.ogg')
 	return soundin

 //Are these even used?
--- a/code/modules/client/preference_setup/global/setting_datums.dm
+++ b/code/modules/client/preference_setup/global/setting_datums.dm
@@ -116,6 +116,12 @@ var/list/_client_preferences_by_type
 	enabled_description = "Audible"
 	disabled_description = "Silent"

+/datum/client_preference/drop_sounds
+	description = "Dropped Item Sounds"
+	key = "SOUND_DROPPED"
+	enabled_description = "Enabled"
+	disabled_description = "Disabled"
+
 /datum/client_preference/mob_tooltips
 	description ="Mob tooltips"
 	key = "MOB_TOOLTIPS"
--- a/code/modules/client/preferences_toggle_procs.dm
+++ b/code/modules/client/preferences_toggle_procs.dm
@@ -239,6 +239,21 @@

 	feedback_add_details("admin_verb","TAirPumpNoise")

+/client/verb/toggle_drop_sounds()
+	set name = "Toggle Dropped Item Sounds"
+	set category = "Preferences"
+	set desc = "Toggles sounds when items are dropped or thrown."
+
+	var/pref_path = /datum/client_preference/drop_sounds
+
+	toggle_preference(pref_path)
+
+	to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear sounds when items are dropped or thrown.")
+
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	feedback_add_details("admin_verb", "TDropSounds")
+
 /client/verb/toggle_safe_firing()
 	set name = "Toggle Gun Firing Intent Requirement"
 	set category = "Preferences"
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -1,6 +1,7 @@
 /obj/item/clothing
 	name = "clothing"
 	siemens_coefficient = 0.9
+	drop_sound = 'sound/items/drop/clothing.ogg'
 	var/list/species_restricted = null //Only these species can wear this kit.
 	var/gunshot_residue //Used by forensics.

@@ -530,6 +531,7 @@

 	if(usr.put_in_hands(holding))
 		usr.visible_message("<span class='danger'>\The [usr] pulls a knife out of their boot!</span>")
+		playsound(get_turf(src), 'sound/weapons/holster/sheathout.ogg', 25)
 		holding = null
 		overlays -= image(icon, "[icon_state]_knife")
 	else
--- a/code/modules/clothing/ears/ears.dm
+++ b/code/modules/clothing/ears/ears.dm
@@ -53,6 +53,7 @@
 	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'

 /obj/item/clothing/ears/skrell/chain/silver
 	name = "Silver headtail chains"
@@ -83,6 +84,7 @@
 	desc = "Golden metallic bands worn by male skrell to adorn their head tails."
 	icon_state = "skrell_band"
 	item_state_slots = list(slot_r_hand_str = "egg5", slot_l_hand_str = "egg5")
+	drop_sound = 'sound/items/drop/accessory.ogg'

 /obj/item/clothing/ears/skrell/band/silver
 	name = "Silver headtail bands"
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -27,6 +27,7 @@ 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'

 	sprite_sheets = list(
 		"Teshari" = 'icons/mob/species/seromi/eyes.dmi',
@@ -159,6 +160,7 @@ 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'

 /obj/item/clothing/glasses/eyepatch/verb/switcheye()
 	set name = "Switch Eyepatch"
@@ -340,6 +342,7 @@ 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'

 /obj/item/clothing/glasses/sunglasses/blindfold/tape
 	name = "length of tape"
--- a/code/modules/clothing/gloves/arm_guards.dm
+++ b/code/modules/clothing/gloves/arm_guards.dm
@@ -5,6 +5,7 @@
 	overgloves = 1
 	punch_force = 3
 	w_class = ITEMSIZE_NORMAL
+	drop_sound = 'sound/items/drop/metalshield.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.
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -1,9 +1,17 @@
+/obj/item/clothing/gloves
+	desc = "you aren't supposed to see this."
+	name = "strange gloves"
+	icon_state = "black"
+	item_state = "bgloves"
+	drop_sound = 'sound/items/drop/gloves.ogg'
+
 /obj/item/clothing/gloves/yellow
 	desc = "These gloves will protect the wearer from electric shock."
 	name = "insulated gloves"
 	icon_state = "yellow"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
+	drop_sound = 'sound/items/drop/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 +19,7 @@
 	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'

 /obj/item/clothing/gloves/fyellow/Initialize()
 	. = ..()
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -56,6 +56,7 @@
 	permeability_coefficient = 0.01
 	germ_level = 0
 	fingerprint_chance = 25
+	drop_sound = 'sound/items/drop/rubber.ogg'
 //	var/balloonPath = /obj/item/latexballon

 //TODO: Make inflating gloves a thing
@@ -81,6 +82,7 @@
 	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'

 /obj/item/clothing/gloves/duty
 	desc = "These brown duty gloves are made from a durable synthetic."
@@ -109,6 +111,7 @@
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	species_restricted = list("Vox")
+	drop_sound = 'sound/items/drop/metalboots.ogg'

 	cold_protection = HANDS
 	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
@@ -127,6 +130,7 @@
 	overgloves = 1
 	force = 5
 	punch_force = 5
+	drop_sound = 'sound/items/drop/metalboots.ogg'

 /obj/item/clothing/gloves/ranger
 	var/glovecolor = "white"
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -1,6 +1,11 @@

 //Hat Station 13

+/obj/item/clothing/head/
+	name = "hat"
+	desc = "Apply on head."
+	drop_sound = 'sound/items/drop/hat.ogg'
+
 /obj/item/clothing/head/collectable
 	name = "collectable hat"
 	desc = "A rare collectable hat."
@@ -37,6 +42,7 @@
 	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'

 /obj/item/clothing/head/collectable/tophat
 	name = "collectable top hat"
--- a/code/modules/clothing/head/flowercrowns.dm
+++ b/code/modules/clothing/head/flowercrowns.dm
@@ -36,21 +36,25 @@
 	desc = "A flower crown weaved with sunflowers."
 	icon_state = "sunflower_crown"
 	body_parts_covered = 0
+	drop_sound = 'sound/items/drop/herb.ogg'

 /obj/item/clothing/head/lavender_crown
 	name = "lavender crown"
 	desc = "A flower crown weaved with lavender."
 	icon_state = "lavender_crown"
 	body_parts_covered = 0
+	drop_sound = 'sound/items/drop/herb.ogg'

 /obj/item/clothing/head/poppy_crown
 	name = "poppy crown"
 	desc = "A flower crown weaved with poppies."
 	icon_state = "poppy_crown"
 	body_parts_covered = 0
+	drop_sound = 'sound/items/drop/herb.ogg'

 /obj/item/clothing/head/rose_crown
 	name = "rose crown"
 	desc = "A flower crown weaved with roses."
 	icon_state = "poppy_crown"
 	body_parts_covered = 0
+	drop_sound = 'sound/items/drop/herb.ogg'
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -10,6 +10,7 @@
 	action_button_name = "Toggle Head-light"
 	w_class = ITEMSIZE_NORMAL
 	ear_protection = 1
+	drop_sound = 'sound/items/drop/helm.ogg'

 /obj/item/clothing/head/hardhat/orange
 	icon_state = "hardhat0_orange"
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -14,6 +14,7 @@
 	siemens_coefficient = 0.7
 	w_class = ITEMSIZE_NORMAL
 	ear_protection = 1
+	drop_sound = 'sound/items/drop/helm.ogg'

 /obj/item/clothing/head/helmet/solgov
 	name = "\improper Solar Confederate Government helmet"
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -17,6 +17,7 @@
 	desc = "A nice hair pin."
 	slot_flags = SLOT_HEAD | SLOT_EARS
 	body_parts_covered = 0
+	drop_sound = 'sound/items/drop/ring.ogg'

 /obj/item/clothing/head/pin/pink
 	icon_state = "pinkpin"
@@ -168,6 +169,7 @@
 	icon_state = "cardborg_h"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	body_parts_covered = HEAD|FACE|EYES
+	drop_sound = 'sound/items/drop/box.ogg'

 /obj/item/clothing/head/justice
 	name = "justice hat"
@@ -420,6 +422,7 @@
 	desc = "A jeweled headpiece originating in India."
 	icon_state = "maangtikka"
 	body_parts_covered = 0
+	drop_sound = 'sound/items/drop/accessory.ogg'

 /obj/item/clothing/head/jingasa
 	name = "jingasa"
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -28,6 +28,7 @@
 	var/base_state
 	flash_protection = FLASH_PROTECTION_MAJOR
 	tint = TINT_HEAVY
+	drop_sound = 'sound/items/drop/helm.ogg'

 /obj/item/clothing/head/welding/attack_self()
 	toggle()
@@ -167,6 +168,7 @@
 	brightness_on = 2
 	light_overlay = "helmet_light"
 	w_class = ITEMSIZE_NORMAL
+	drop_sound = 'sound/items/drop/herb.ogg'

 /*
 * Kitty ears
--- a/code/modules/clothing/rings/rings.dm
+++ b/code/modules/clothing/rings/rings.dm
@@ -1,3 +1,11 @@
+//Generic Ring
+
+/obj/item/clothing/ring
+	name = "generic ring"
+	desc = "Torus shaped finger decoration."
+	icon_state = "material"
+	drop_sound = 'sound/items/drop/ring.ogg'
+
 /////////////////////////////////////////
 //Standard Rings
 /obj/item/clothing/gloves/ring/engagement
--- a/code/modules/clothing/shoes/boots.dm
+++ b/code/modules/clothing/shoes/boots.dm
@@ -5,11 +5,13 @@
 	force = 3
 	can_hold_knife = 1
 	step_volume_mod = 1.2
+	drop_sound = 'sound/items/drop/boots.ogg'

 /obj/item/clothing/shoes/boots/cowboy
 	name = "cowboy boots"
 	desc = "Lacking a durasteel horse to ride."
 	icon_state = "cowboy"
+	drop_sound = 'sound/items/drop/leather.ogg'

 /obj/item/clothing/shoes/boots/cowboy/classic
 	name = "classic cowboy boots"
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -1,3 +1,9 @@
+/obj/item/clothing/shoes
+	name = "shoes"
+	icon_state = "white"
+	desc = "A pair of shoes."
+	drop_sound = 'sound/items/drop/shoes.ogg'
+
 /obj/item/clothing/shoes/black
 	name = "black shoes"
 	icon_state = "black"
@@ -38,6 +44,7 @@
 	name = "leather shoes"
 	desc = "A sturdy pair of leather shoes."
 	icon_state = "leather"
+	drop_sound = 'sound/items/drop/leather.ogg'

 /obj/item/clothing/shoes/rainbow
 	name = "rainbow shoes"
--- a/code/modules/clothing/shoes/leg_guards.dm
+++ b/code/modules/clothing/shoes/leg_guards.dm
@@ -7,6 +7,7 @@
 	w_class = ITEMSIZE_NORMAL
 	step_volume_mod = 1.3
 	can_hold_knife = TRUE
+	drop_sound = 'sound/items/drop/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.
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -16,6 +16,7 @@
 	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'

 /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.
@@ -36,6 +37,7 @@
 		set_slowdown()
 		force = 5
 		if(icon_base) icon_state = "[icon_base]1"
+		playsound(get_turf(src), 'sound/effects/magnetclamp.ogg', 20)
 		to_chat(user, "You enable the mag-pulse traction system.")
 	user.update_inv_shoes()	//so our mob-overlays update
 	user.update_action_buttons()
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -24,6 +24,7 @@
 	item_flags = NOSLIP
 	slowdown = SHOES_SLOWDOWN+1
 	species_restricted = null
+	drop_sound = 'sound/items/drop/rubber.ogg'

 /obj/item/clothing/shoes/dress
 	name = "dress shoes"
@@ -98,6 +99,7 @@
 	force = 0
 	species_restricted = null
 	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/clothing/shoes/slippers_worn
 	name = "worn bunny slippers"
@@ -155,6 +157,7 @@
 	force = 0
 	w_class = ITEMSIZE_SMALL
 	species_restricted = null
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/clothing/shoes/boots/ranger
 	var/bootcolor = "white"
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -25,6 +25,7 @@
 	can_be_placed_into = null
 	flags = OPENCONTAINER | NOBLUDGEON
 	unacidable = 0
+	drop_sound = 'sound/items/drop/clothing.ogg'

 	var/on_fire = 0
 	var/burn_time = 20 //if the rag burns for too long it turns to ashes
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -15,6 +15,7 @@
 	var/access = list()
 	access = access_crate_cash
 	var/worth = 0
+	drop_sound = 'sound/items/drop/paper.ogg'

 /obj/item/weapon/spacecash/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/spacecash))
@@ -150,6 +151,7 @@ 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'
 	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
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -8,6 +8,7 @@
 	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'

 /obj/item/weapon/reagent_containers/food/Initialize()
 	. = ..()
--- a/code/modules/food/food/cans.dm
+++ b/code/modules/food/food/cans.dm
@@ -2,6 +2,7 @@
 	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'

 //DRINKS

@@ -20,6 +21,7 @@
 	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"=16, "y"=8)
+	drop_sound = 'sound/items/drop/food.ogg'

 /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle/Initialize()
 	. = ..()
--- a/code/modules/food/food/drinks.dm
+++ b/code/modules/food/food/drinks.dm
@@ -5,6 +5,7 @@
 	name = "drink"
 	desc = "yummy"
 	icon = 'icons/obj/drinks.dmi'
+	drop_sound = 'sound/items/drop/bottle.ogg'
 	icon_state = null
 	flags = OPENCONTAINER
 	amount_per_transfer_from_this = 5
@@ -116,6 +117,7 @@
 	icon_state = "milk"
 	item_state = "carton"
 	center_of_mass = list("x"=16, "y"=9)
+	drop_sound = 'sound/items/drop/box.ogg'

 /obj/item/weapon/reagent_containers/food/drinks/milk/Initialize()
 	. = ..()
@@ -127,6 +129,8 @@
 	icon_state = "soymilk"
 	item_state = "carton"
 	center_of_mass = list("x"=16, "y"=9)
+	drop_sound = 'sound/items/drop/box.ogg'
+
 /obj/item/weapon/reagent_containers/food/drinks/soymilk/Initialize()
 	. = ..()
 	reagents.add_reagent("soymilk", 50)
@@ -138,6 +142,8 @@
 	icon_state = "mini-milk"
 	item_state = "carton"
 	center_of_mass = list("x"=16, "y"=9)
+	drop_sound = 'sound/items/drop/box.ogg'
+
 /obj/item/weapon/reagent_containers/food/drinks/smallmilk/Initialize()
 	. = ..()
 	reagents.add_reagent("milk", 30)
@@ -149,6 +155,8 @@
 	icon_state = "mini-milk_choco"
 	item_state = "carton"
 	center_of_mass = list("x"=16, "y"=9)
+	drop_sound = 'sound/items/drop/box.ogg'
+
 /obj/item/weapon/reagent_containers/food/drinks/smallchocmilk/Initialize()
 	. = ..()
 	reagents.add_reagent("chocolate_milk", 30)
@@ -158,6 +166,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/box.ogg'
+
 /obj/item/weapon/reagent_containers/food/drinks/coffee/Initialize()
 	. = ..()
 	reagents.add_reagent("coffee", 30)
@@ -209,6 +219,7 @@
 	possible_transfer_amounts = null
 	volume = 10
 	center_of_mass = list("x"=16, "y"=12)
+	drop_sound = 'sound/items/drop/paper.ogg'

 /obj/item/weapon/reagent_containers/food/drinks/sillycup/Initialize()
 	. = ..()
--- a/code/modules/food/food/drinks/bottle.dm
+++ b/code/modules/food/food/drinks/bottle.dm
@@ -16,7 +16,9 @@

 /obj/item/weapon/reagent_containers/food/drinks/bottle/Initialize()
 	. = ..()
-	if(isGlass) unacidable = 1
+	if(isGlass)
+		unacidable = 1
+		drop_sound = 'sound/items/drop/bottle.ogg'

 /obj/item/weapon/reagent_containers/food/drinks/bottle/Destroy()
 	if(rag)
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -340,6 +340,7 @@ 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'

 /obj/structure/holohoop
 	name = "basketball hoop"
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -7,6 +7,7 @@
 	desc = "Nutritious! Probably."
 	flags = NOCONDUCT
 	slot_flags = SLOT_HOLSTER
+	drop_sound = 'sound/items/drop/herb.ogg'

 	var/plantname
 	var/datum/seed/seed
@@ -361,6 +362,7 @@ var/list/fruit_icon_cache = list()

 	name = "[S.seed_name] slice"
 	desc = "A slice of \a [S.seed_name]. Tasty, probably."
+	drop_sound = 'sound/items/drop/herb.ogg'

 	var/rind_colour = S.get_trait(TRAIT_PRODUCT_COLOUR)
 	var/flesh_colour = S.get_trait(TRAIT_FLESH_COLOUR)
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -180,6 +180,7 @@ Book Cart End
 	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/bureaucracy/bookclose.ogg'

 /obj/item/weapon/book/attack_self(var/mob/user as mob)
 	if(carved)
@@ -194,7 +195,9 @@ Book Cart End
 	if(src.dat)
 		user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book")
 		user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.")
+		playsound(loc, 'sound/bureaucracy/bookopen.ogg', 50, 1)
 		onclose(user, "book")
+		playsound(loc, 'sound/bureaucracy/bookclose.ogg', 50, 1)
 	else
 		to_chat(user, "This book is completely blank!")

@@ -277,6 +280,8 @@ Book Cart End
 		to_chat(user, "<span class='notice'>You begin to carve out [title].</span>")
 		if(do_after(user, 30))
 			to_chat(user, "<span class='notice'>You carve out the pages from [title]! You didn't want to read it anyway.</span>")
+			playsound(loc, 'sound/bureaucracy/papercrumple.ogg', 50, 1)
+			new /obj/item/weapon/shreddedp(get_turf(src))
 			carved = 1
 			return
 	else
--- a/code/modules/lore_codex/codex.dm
+++ b/code/modules/lore_codex/codex.dm
@@ -39,7 +39,7 @@
 	w_class = ITEMSIZE_SMALL
 	root_type = /datum/lore/codex/category/main_news
 	libcategory = "Reference"
-
+	drop_sound = 'sound/items/drop/device.ogg'
 // Combines SOP/Regs/Law
 /obj/item/weapon/book/codex/corp_regs
 	name = "NanoTrasen Regulatory Compendium"
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -17,6 +17,7 @@
 	var/material/material
 	var/perunit = SHEET_MATERIAL_AMOUNT
 	var/apply_colour //temp pending icon rewrite
+	drop_sound = 'sound/items/drop/axe.ogg'

 /obj/item/stack/material/New()
 	..()
@@ -106,17 +107,20 @@
 	icon_state = "sheet-sandstone"
 	default_type = "sandstone"
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/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'

 /obj/item/stack/material/diamond
 	name = "diamond"
 	icon_state = "sheet-diamond"
 	default_type = "diamond"
+	drop_sound = 'sound/items/drop/glass.ogg'

 /obj/item/stack/material/uranium
 	name = "uranium"
@@ -129,6 +133,7 @@
 	icon_state = "sheet-phoron"
 	default_type = "phoron"
 	no_variants = FALSE
+	drop_sound = 'sound/items/drop/glass.ogg'

 /obj/item/stack/material/plastic
 	name = "plastic"
@@ -324,6 +329,7 @@
 	icon_state = "sheet-wood"
 	default_type = MAT_WOOD
 	strict_color_stacking = TRUE
+	drop_sound = 'sound/items/drop/wooden.ogg'

 /obj/item/stack/material/wood/sif
 	name = "alien wooden plank"
@@ -340,6 +346,7 @@
 	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'

 /obj/item/stack/material/log/sif
 	name = "alien log"
@@ -377,6 +384,7 @@
 	no_variants = FALSE
 	pass_color = TRUE
 	strict_color_stacking = TRUE
+	drop_sound = 'sound/items/drop/clothing.ogg'

 /obj/item/stack/material/resin
 	name = "resin"
@@ -394,6 +402,7 @@
 	no_variants = FALSE
 	pass_color = TRUE
 	strict_color_stacking = TRUE
+	drop_sound = 'sound/items/drop/box.ogg'

 /obj/item/stack/material/snow
 	name = "snow"
@@ -415,12 +424,14 @@
 	no_variants = FALSE
 	pass_color = TRUE
 	strict_color_stacking = TRUE
+	drop_sound = 'sound/items/drop/clothing.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'

 /obj/item/stack/material/glass/reinforced
 	name = "reinforced glass"
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -12,6 +12,7 @@
 	slot_flags = SLOT_EARS
 	var/string_attached
 	var/sides = 2
+	drop_sound = 'sound/items/drop/ring.ogg'

 /obj/item/weapon/coin/New()
 	randpixel_xy()
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -23,7 +23,7 @@
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
-	var/drill_sound = 'sound/weapons/Genhit.ogg'
+	var/drill_sound = "pickaxe"
 	var/drill_verb = "drilling"
 	sharp = 1

--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -156,7 +156,6 @@ var/list/slot_equipment_priority = list( \
 //Drops the item in our active hand. TODO: rename this to drop_active_hand or something
 /mob/proc/drop_item(var/atom/Target)
 	return
-
 /*
 	Removes the object from any slots the mob might have, calling the appropriate icon update proc.
 	Does nothing else.
--- a/code/modules/mob/living/inventory.dm
+++ b/code/modules/mob/living/inventory.dm
@@ -33,8 +33,25 @@

 //Drops the item in our active hand. TODO: rename this to drop_active_hand or something
 /mob/living/drop_item(var/atom/Target)
-	if(hand)	return drop_l_hand(Target)
-	else		return drop_r_hand(Target)
+	var/obj/item/item_dropped = null
+
+	if (hand)
+		item_dropped = l_hand
+		. = drop_l_hand(Target)
+	else
+		item_dropped = r_hand
+		. = drop_r_hand(Target)
+
+	if (istype(item_dropped) && !QDELETED(item_dropped) && is_preference_enabled(/datum/client_preference/drop_sounds))
+		addtimer(CALLBACK(src, .proc/make_item_drop_sound, item_dropped), 1)
+
+/mob/proc/make_item_drop_sound(obj/item/I)
+	if(QDELETED(I))
+		return
+
+	if(I.drop_sound)
+		playsound(I, I.drop_sound, 25, 0, preference = /datum/client_preference/drop_sounds)
+

 //Drops the item in our left hand
 /mob/living/drop_l_hand(var/atom/Target)
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -4,6 +4,7 @@ var/list/organ_cache = list()
 	name = "organ"
 	icon = 'icons/obj/surgery.dmi'
 	germ_level = 0
+	drop_sound = 'sound/items/drop/flesh.ogg'

 	// Strings.
 	var/organ_tag = "organ"				// Unique identifier.
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -37,7 +37,9 @@
 		user.drop_item()
 		P.loc = src
 		icon_state = "[initial(icon_state)]-open"
-		sleep(5)
+		flick("[initial(icon_state)]-open",src)
+		playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1)
+		sleep(40)
 		icon_state = initial(icon_state)
 		updateUsrDialog()
 	else if(P.is_wrench())
@@ -98,9 +100,10 @@
 		if(istype(P) && (P.loc == src) && src.Adjacent(usr))
 			usr.put_in_hands(P)
 			updateUsrDialog()
-			icon_state = "[initial(icon_state)]-open"
+			flick("[initial(icon_state)]-open",src)
+			playsound(loc, 'sound/bureaucracy/filingcabinet.ogg', 50, 1)
 			spawn(0)
-				sleep(5)
+				sleep(20)
 				icon_state = initial(icon_state)

 /*
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -5,6 +5,7 @@
 	icon_state = "folder"
 	w_class = ITEMSIZE_SMALL
 	pressure_resistance = 2
+	drop_sound = 'sound/items/drop/paper.ogg'

 /obj/item/weapon/folder/blue
 	desc = "A blue folder."
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -19,6 +19,7 @@
 	slot_flags = SLOT_HEAD
 	body_parts_covered = HEAD
 	attack_verb = list("bapped")
+	drop_sound = 'sound/items/drop/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
@@ -177,6 +178,7 @@
 		//crumple dat paper
 		info = stars(info,85)
 		user.visible_message("\The [user] crumples \the [src] into a ball!")
+		playsound(src, 'sound/bureaucracy/papercrumple.ogg', 50, 1)
 		icon_state = "scrap"
 		return
 	user.examinate(src)
@@ -368,6 +370,7 @@

 		user.visible_message("<span class='[class]'>[user] holds \the [P] up to \the [src], it looks like [TU.hes] trying to burn it!</span>", \
 		"<span class='[class]'>You hold \the [P] up to \the [src], burning it slowly.</span>")
+		playsound(src.loc, 'sound/bureaucracy/paperburn.ogg', 50, 1)

 		spawn(20)
 			if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
@@ -461,6 +464,8 @@

 		usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]") // Update the window

+		playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 10)
+
 		update_icon()

 /obj/item/weapon/paper/get_worn_icon_state(var/slot_name)
@@ -573,6 +578,7 @@
 		stamped += P.type
 		overlays += stampoverlay

+		playsound(src, 'sound/bureaucracy/stamp.ogg', 50, 1)
 		to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>")

 	else if(istype(P, /obj/item/weapon/flame))
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -12,6 +12,7 @@
 	layer = MOB_LAYER
 	pressure_resistance = 1
 	attack_verb = list("bapped")
+	drop_sound = 'sound/items/drop/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.

--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -23,6 +23,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 10)
 	var/colour = "black"	//what colour the ink is!
 	pressure_resistance = 2
+	drop_sound = 'sound/items/drop/accessory.ogg'

 /obj/item/weapon/pen/attack_self(var/mob/user)
 	to_chat(user, "<span class='notice'>Click.</span>")
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -515,6 +515,7 @@ 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'

 /obj/item/stack/cable_coil/cyborg
 	name = "cable coil synthesizer"
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -8,6 +8,7 @@
 	throwforce = 1
 	w_class = ITEMSIZE_TINY
 	preserve_item = 1
+	drop_sound = 'sound/items/drop/ring.ogg'

 	var/leaves_residue = 1
 	var/caliber = ""					//Which kind of guns it can be loaded into
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -49,6 +49,7 @@
 	origin_tech = list(TECH_COMBAT = 1)
 	attack_verb = list("struck", "hit", "bashed")
 	zoomdevicename = "scope"
+	drop_sound = 'sound/items/drop/gun.ogg'

 	var/automatic = 0
 	var/burst = 1
--- a/code/modules/reagents/dispenser/dispenser2.dm
+++ b/code/modules/reagents/dispenser/dispenser2.dm
@@ -160,6 +160,7 @@
 		var/label = href_list["dispense"]
 		if(cartridges[label] && container && container.is_open_container())
 			var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label]
+			playsound(src.loc, 'sound/machines/reagent_dispense.ogg', 25, 1)
 			C.reagents.trans_to(container, amount)

 	else if(href_list["ejectBeaker"])
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -21,6 +21,7 @@
 	icon = 'icons/obj/bloodpack.dmi'
 	icon_state = "empty"
 	item_state = "bloodpack_empty"
+	drop_sound = 'sound/items/drop/food.ogg'
 	volume = 200
 	var/label_text = ""

--- a/Show More
+++ b/Show More