Pickup, Drop and Equip sounds (#8861)

code/game/objects/effects/decals/contraband.dm

@@ -13,6 +13,7 @@
 	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 = 0
 
 

code/game/objects/items.dm

@@ -47,6 +47,14 @@
 	var/zoomdevicename //name used for message when binoculars/scope is used
 	var/zoom = 0 //1 if item is actively being used to zoom. For scoped guns and binoculars.
 	var/contained_sprite = 0 //1 if item_state, lefthand, righthand, and worn sprite are all in one dmi
+
+	///Used when thrown into a mob
+	var/mob_throw_hit_sound
+	///Sound used when equipping the item into a valid slot
+	var/equip_sound
+	///Sound uses when picking the item up (into your hands)
+	var/pickup_sound = 'sound/items/pickup/device.ogg'
+	///Sound uses when dropping the item, or when its thrown.
 	var/drop_sound = 'sound/items/drop/device.ogg' // drop sound - this is the default
 
 	//Item_state definition moved to /obj
@@ -258,10 +266,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()
+		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(drop_sound)
-		playsound(src, drop_sound, 50, 0, required_asfx_toggles = ASFX_DROPSOUND)
+	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, THROW_SOUND_VOLUME)
+
 
 //Apparently called whenever an item is dropped on the floor, thrown, or placed into a container.
 //It is called after loc is set, so if placed in a container its loc will be that container.
@@ -303,6 +331,13 @@
 	equip_slot = 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, EQUIP_SOUND_VOLUME)
+		else
+			playsound(src, drop_sound, EQUIP_SOUND_VOLUME)
+	else if(slot == slot_l_hand || slot == slot_r_hand)
+		playsound(src, pickup_sound, PICKUP_SOUND_VOLUME)
 	return
 
 //Defines which slots correspond to which slot flags

code/game/objects/items/devices/PDA/PDA.dm

@@ -13,6 +13,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	w_class = 2.0
 	slot_flags = SLOT_ID | SLOT_BELT
 	uv_intensity = 15
+	drop_sound = 'sound/items/drop/disk.ogg'
+	pickup_sound = 'sound/items/pickup/disk.ogg'
 
 	//Main variables
 	var/owner = null
@@ -1321,7 +1323,6 @@ 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/click.ogg', 50, 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.
@@ -1352,7 +1353,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		cartridge = C
 		user.drop_from_inventory(cartridge,src)
 		to_chat(user, "<span class='notice'>You insert [cartridge] into [src].</span>")
-		playsound(loc, 'sound/machines/click.ogg', 50, 1)
 		SSnanoui.update_uis(src) // update all UIs attached to src
 		if(cartridge.radio)
 			cartridge.radio.hostpda = src

code/game/objects/items/devices/PDA/cart.dm

@@ -5,6 +5,8 @@
 	icon_state = "cart"
 	item_state = "electronic"
 	w_class = 1
+	drop_sound = 'sound/items/drop/component.ogg'
+	pickup_sound = 'sound/items/pickup/component.ogg'
 
 	var/obj/item/radio/integrated/radio = null
 	var/access_security = 0

code/game/objects/items/devices/lighting/flare.dm

@@ -15,6 +15,7 @@
 	light_wedge = LIGHT_OMNI
 	activation_sound = 'sound/items/flare.ogg'
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
 /obj/item/device/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.
@@ -55,4 +56,4 @@
 		)
 		src.force = on_damage
 		src.damtype = "fire"
-		START_PROCESSING(SSprocessing, src)
+		START_PROCESSING(SSprocessing, src)

code/game/objects/items/devices/lighting/flashlight.dm

@@ -107,6 +107,7 @@
 	icon_state = "penlight"
 	item_state = "pen"
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 	flags = CONDUCT
 	slot_flags = SLOT_EARS
 	brightness_on = 2

code/game/objects/items/devices/multitool.dm

@@ -7,6 +7,7 @@
 /obj/item/device/multitool
 	name = "multitool"
 	desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
+	desc_info = "You can use this on airlocks or APCs to try to hack them without cutting wires."
 	icon_state = "multitool"
 	item_state = "multitool"
 	item_icons = list(
@@ -19,7 +20,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, MATERIAL_GLASS = 20)
 

code/game/objects/items/devices/radio/headset.dm

@@ -19,6 +19,9 @@
 	var/ks2type = null
 	var/radio_sound = null
 
+	drop_sound = 'sound/items/drop/component.ogg'
+	pickup_sound = 'sound/items/pickup/component.ogg'
+
 /obj/item/device/radio/headset/Initialize()
 	. = ..()
 	internal_channels.Cut()

code/game/objects/items/glassjar.dm

@@ -9,6 +9,7 @@
 	var/list/accept_mobs = list(/mob/living/simple_animal/lizard, /mob/living/simple_animal/rat)
 	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()
 	..()
@@ -129,4 +130,4 @@
 	S.forceMove(src)
 	contains = 3
 	STOP_PROCESSING(SSprocessing, S)
-	update_icon()
+	update_icon()

code/game/objects/items/skrell.dm

@@ -6,6 +6,7 @@
 	w_class = 1
 	matter = list(MATERIAL_GLASS = 200)
 	drop_sound = 'sound/items/drop/glass.ogg'
+	pickup_sound = 'sound/items/pickup/glass.ogg'
 	var/list/constellations = list("Island", "Hatching Egg", "Star Chanter", "Jiu'x'klua", "Stormcloud", "Gnarled Tree", "Poet", "Bloated Toad", "Qu'Poxiii", "Fisher")
 	var/selected_constellation
 	var/projection_ready = TRUE
@@ -78,6 +79,7 @@
 	w_class = 1
 	matter = list(MATERIAL_GLASS = 200)
 	drop_sound = 'sound/items/drop/glass.ogg'
+	pickup_sound = 'sound/items/pickup/glass.ogg'
 	var/list/worlds_selection = list("Xrim", "Kal'lo", "Nralakk")
 	var/selected_world
 	var/working = FALSE

code/game/objects/items/stacks/medical.dm

@@ -15,7 +15,8 @@ Contains:
 		slot_l_hand_str = 'icons/mob/items/stacks/lefthand_medical.dmi',
 		slot_r_hand_str = 'icons/mob/items/stacks/righthand_medical.dmi',
 		)
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	amount = 5
 	max_amount = 5
 	w_class = 2
@@ -84,6 +85,7 @@ Contains:
 	icon_has_variants = TRUE
 	apply_sounds = list('sound/items/rip1.ogg','sound/items/rip2.ogg')
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
 /obj/item/stack/medical/bruise_pack/full/Initialize()
 	. = ..()
@@ -157,6 +159,7 @@ Contains:
 	icon_has_variants = TRUE
 	apply_sounds = list('sound/items/ointment.ogg')
 	drop_sound = 'sound/items/drop/herb.ogg'
+	pickup_sound = 'sound/items/pickup/herb.ogg'
 
 /obj/item/stack/medical/ointment/full/Initialize()
 	. = ..()
@@ -377,6 +380,7 @@ Contains:
 	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_L_ARM,BP_R_ARM,BP_L_LEG,BP_R_LEG, BP_L_HAND, BP_R_HAND, BP_R_FOOT, BP_L_FOOT)
 
 /obj/item/stack/medical/splint/full/Initialize()

code/game/objects/items/stacks/rods.dm

@@ -25,11 +25,12 @@ var/global/list/datum/stack_recipe/rod_recipes = list(
 	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 = 1875)
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")
 	lock_picking_level = 3
-	drop_sound = 'sound/items/drop/sword.ogg'
 
 /obj/item/stack/rods/full/Initialize()
 	. = ..()

code/game/objects/items/stacks/sheets/glass.dm

@@ -21,6 +21,7 @@
 	default_type = "glass"
 	icon_has_variants = TRUE
 	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)

code/game/objects/items/stacks/sheets/leather.dm

@@ -5,7 +5,8 @@
 	icon_state = "sheet-hide"
 	default_type = "hide"
 	icon_has_variants = TRUE
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/stack/material/animalhide/human
 	name = "human skin"

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -19,6 +19,7 @@
 		)
 	randpixel = 7
 	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
 
 /obj/item/stack/tile/New()
 	..()
@@ -39,6 +40,7 @@
 	flags = 0
 	origin_tech = list(TECH_BIO = 1)
 	drop_sound = 'sound/items/drop/herb.ogg'
+	pickup_sound = 'sound/items/pickup/herb.ogg'
 
 /obj/item/stack/tile/grass_alt
 	name = "grass tile"
@@ -52,6 +54,7 @@
 	flags = 0
 	origin_tech = list(TECH_BIO = 1)
 	drop_sound = 'sound/items/drop/herb.ogg'
+	pickup_sound = 'sound/items/pickup/herb.ogg'
 
 /*
  * Wood
@@ -67,6 +70,7 @@
 	throw_range = 20
 	flags = 0
 	drop_sound = 'sound/items/drop/wooden.ogg'
+	pickup_sound = 'sound/items/pickup/wooden.ogg'
 
 /*
  * Carpets
@@ -81,7 +85,8 @@
 	throw_speed = 5
 	throw_range = 20
 	flags = 0
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/stack/tile/carpet_blue
 	name = "blue carpet"
@@ -93,7 +98,8 @@
 	throw_speed = 5
 	throw_range = 20
 	flags = 0
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/stack/tile/carpet_rubber
 	name = "rubber carpet"
@@ -105,7 +111,8 @@
 	throw_speed = 5
 	throw_range = 20
 	flags = 0
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/stack/tile/carpet_art
 	name = "adhomian carpet"
@@ -117,7 +124,8 @@
 	throw_speed = 5
 	throw_range = 20
 	flags = 0
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/stack/tile/lino
 	name = "old linoleum"
@@ -129,7 +137,8 @@
 	throw_speed = 5
 	throw_range = 20
 	flags = 0
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 	matter = list(MATERIAL_PLASTIC = 937.5)
 
 /obj/item/stack/tile/lino_grey
@@ -142,7 +151,8 @@
 	throw_speed = 5
 	throw_range = 20
 	flags = 0
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 	matter = list(MATERIAL_PLASTIC = 937.5)
 
 /*

code/game/objects/items/stacks/wrap.dm

@@ -10,6 +10,7 @@
 	singular_name = "square unit"
 	amount = 20.0
 	drop_sound = 'sound/items/drop/wrapper.ogg'
+	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 
 /obj/item/stack/wrapping_paper/attackby(obj/item/W, mob/user)
 	..()
@@ -84,6 +85,7 @@
 	amount = 25.0
 	var/wrapping_tag = "Sorting Office"
 	drop_sound = 'sound/items/drop/wrapper.ogg'
+	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 
 /obj/item/stack/packageWrap/afterattack(var/obj/target as obj, mob/user as mob, proximity)
 	if(!proximity) return
@@ -187,4 +189,4 @@
 	throwforce = 1
 	w_class = 2.0
 	throw_speed = 4
-	throw_range = 5
+	throw_range = 5

code/game/objects/items/toys.dm

@@ -30,6 +30,7 @@
 	throw_range = 20
 	force = 0
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
 /*
  * Balloons
@@ -40,6 +41,7 @@
 	icon_state = "waterballoon-e"
 	item_state = "balloon-empty"
 	drop_sound = 'sound/items/drop/rubber.ogg'
+	pickup_sound = 'sound/items/pickup/rubber.ogg'
 
 /obj/item/toy/balloon/New()
 	var/datum/reagents/R = new/datum/reagents(10)
@@ -99,6 +101,7 @@
 	icon_state = "syndballoon"
 	item_state = "syndballoon"
 	drop_sound = 'sound/items/drop/rubber.ogg'
+	pickup_sound = 'sound/items/pickup/rubber.ogg'
 	w_class = ITEMSIZE_LARGE
 
 /obj/item/toy/nanotrasenballoon
@@ -108,6 +111,7 @@
 	item_state = "ntballoon"
 	w_class = ITEMSIZE_LARGE
 	drop_sound = 'sound/items/drop/rubber.ogg'
+	pickup_sound = 'sound/items/pickup/rubber.ogg'
 
 /*
  * Fake telebeacon
@@ -139,6 +143,7 @@
 	icon_state = "crossbow"
 	item_state = "crossbow"
 	drop_sound = 'sound/items/drop/gun.ogg'
+	pickup_sound = 'sound/items/pickup/gun.ogg'
 	contained_sprite = TRUE
 	w_class = ITEMSIZE_SMALL
 	attack_verb = list("attacked", "struck", "hit")
@@ -236,6 +241,7 @@
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	drop_sound = 'sound/items/drop/food.ogg'
+	pickup_sound = 'sound/items/pickup/food.ogg'
 
 /obj/effect/foam_dart_dummy
 	name = ""
@@ -260,6 +266,7 @@
 		slot_r_hand_str = 'icons/mob/items/weapons/righthand_energy.dmi',
 		)
 	drop_sound = 'sound/items/drop/gun.ogg'
+	pickup_sound = 'sound/items/pickup/gun.ogg'
 	var/active = 0.0
 	var/colorvar = "blue"
 	w_class = ITEMSIZE_SMALL
@@ -299,6 +306,7 @@
 	icon_state = "katana"
 	item_state = "katana"
 	drop_sound = 'sound/items/drop/gun.ogg'
+	pickup_sound = 'sound/items/pickup/gun.ogg'
 	hitsound = "swing_hit"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT | SLOT_BACK
@@ -317,6 +325,7 @@
 	icon_state = "snappop"
 	w_class = ITEMSIZE_TINY
 	drop_sound = 'sound/items/drop/food.ogg'
+	pickup_sound = 'sound/items/pickup/food.ogg'
 
 	throw_impact(atom/hit_atom)
 		..()
@@ -353,6 +362,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_state = "bosunwhistle"
 	drop_sound = 'sound/items/drop/card.ogg'
+	pickup_sound = 'sound/items/pickup/card.ogg'
 	var/cooldown = 0
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
@@ -443,6 +453,7 @@
 	icon_state = "glitched"
 	w_class = ITEMSIZE_TINY
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 /obj/item/toy/figure/cmo
 	name = "chief medical officer action figure"
@@ -667,6 +678,7 @@
 	desc = "A very generic small plushie. It seems to not want to exist."
 	icon_state = "nymphplushie"
 	drop_sound = 'sound/items/drop/plushie.ogg'
+	pickup_sound = 'sound/items/pickup/plushie.ogg'
 	var/phrase = "Hewwo!"
 
 /obj/item/toy/plushie/attack_self(mob/user as mob)
@@ -808,6 +820,7 @@
 	icon = 'icons/obj/clothing/belts.dmi'
 	slot_flags = SLOT_BELT
 	drop_sound = 'sound/items/drop/rubber.ogg'
+	pickup_sound = 'sound/items/pickup/rubber.ogg'
 
 
 /obj/item/toy/xmastree
@@ -817,4 +830,5 @@
 	w_class = ITEMSIZE_TINY
 	force = 1
 	throwforce = 1
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'

code/game/objects/items/trash.dm

@@ -11,6 +11,7 @@
 		)
 	desc = "General waste material, refuse or litter. Dispose responsibly."
 	drop_sound = 'sound/items/drop/wrapper.ogg'
+	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
 	return
@@ -60,6 +61,7 @@
 	name = "plate"
 	icon_state = "plate"
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
 /obj/item/trash/plate/steak
 	icon_state = "steak"
@@ -68,6 +70,7 @@
 	name = "snack bowl"
 	icon_state	= "snack_bowl"
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
 /obj/item/trash/pistachios
 	name = "pistachios pack"
@@ -87,6 +90,7 @@
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle4"
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
 /obj/item/trash/liquidfood
 	name = "\improper \"LiquidFood\" ration"
@@ -104,11 +108,13 @@
 	name = "maps salty ham"
 	icon_state = "maps-used"
 	drop_sound = 'sound/items/drop/shovel.ogg'
+	pickup_sound = 'sound/items/pickup/shovel.ogg'
 
 /obj/item/trash/nathisnack
 	name = "razi-snack corned beef"
 	icon_state = "cbeef-used"
 	drop_sound = 'sound/items/drop/shovel.ogg'
+	pickup_sound = 'sound/items/pickup/shovel.ogg'
 
 /obj/item/trash/brownies
 	name = "square tray"
@@ -135,6 +141,7 @@
 	name = "used can"
 	icon_state = "can-used"
 	drop_sound = 'sound/items/drop/soda.ogg'
+	pickup_sound = 'sound/items/pickup/soda.ogg'
 
 /obj/item/trash/tuna
 	name = "\improper Tuna Snax"
@@ -162,18 +169,22 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "stew_empty"
 	drop_sound = 'sound/items/drop/shovel.ogg'
+	pickup_sound = 'sound/items/pickup/shovel.ogg'
 
 /obj/item/trash/coffee
 	name = "empty cup"
 	icon_state = "coffee_vended"
 	drop_sound = 'sound/items/drop/papercup.ogg'
+	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
 /obj/item/trash/ramen
 	name = "cup ramen"
 	icon_state = "ramen"
 	drop_sound = 'sound/items/drop/papercup.ogg'
+	pickup_sound = 'sound/items/pickup/papercup.ogg'
 
 /obj/item/trash/candybowl
 	name = "empty candy bowl"
 	icon_state = "candy_bowl"
 	drop_sound = 'sound/items/drop/bottle.ogg'
+	pickup_sound = 'sound/items/pickup/bottle.ogg'

code/game/objects/items/weapons/RFD.dm

@@ -21,6 +21,7 @@
 	origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2)
 	matter = list(DEFAULT_WALL_MATERIAL = 50000)
 	drop_sound = 'sound/items/drop/gun.ogg'
+	pickup_sound = 'sound/items/pickup/gun.ogg'
 	var/stored_matter = 30 // Starts off full.
 	var/working = 0
 	var/mode = 1

code/game/objects/items/weapons/candle.dm

@@ -5,6 +5,7 @@
 	icon_state = "candle1"
 	item_state = "candle1"
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 	w_class = 1
 	light_color = "#E09D37"
 	var/wax = 2000
@@ -72,4 +73,4 @@
 		to_chat(user, span("notice", "You snuff out the flame."))
 		playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
 		update_icon()
-		set_light(0)
+		set_light(0)

code/game/objects/items/weapons/cards_ids.dm

@@ -25,6 +25,7 @@
 
 	var/list/files = list(  )
 	drop_sound = 'sound/items/drop/card.ogg'
+	pickup_sound = 'sound/items/pickup/card.ogg'
 
 /obj/item/card/data
 	name = "data disk"

code/game/objects/items/weapons/chewables.dm

@@ -3,6 +3,7 @@
 	desc = "If you are seeing this, ahelp it."
 	icon = 'icons/obj/clothing/masks.dmi'
 	drop_sound = 'sound/items/drop/food.ogg'
+	pickup_sound = 'sound/items/pickup/food.ogg'
 	body_parts_covered = 0
 
 	var/type_butt = null
@@ -168,6 +169,7 @@ obj/item/clothing/mask/chewable/Destroy()
 					/obj/item/trash/spitgum)
 	use_sound = 'sound/items/drop/paper.ogg'
 	drop_sound = 'sound/items/drop/wrapper.ogg'
+	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 	max_storage_space = 5
 	foldable = null
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -51,6 +51,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	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))
@@ -111,6 +112,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	var/burn_rate = 0
 	var/last_drag = 0 //Spam limiter for audio/message when taking a drag of cigarette.
 	drop_sound = 'sound/items/drop/food.ogg'
+	pickup_sound = 'sound/items/pickup/food.ogg'
 
 /obj/item/clothing/mask/smokable/Initialize()
 	. = ..()
@@ -373,6 +375,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	weldermes = "<span class='notice'>USER insults NAME by lighting it with FLAME.</span>"
 	ignitermes = "<span class='notice'>USER fiddles with FLAME, and manages to light their NAME with the power of science.</span>"
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 
 /obj/item/clothing/mask/smokable/cigarette/cigar/Initialize()
 	. = ..()
@@ -480,6 +483,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	weldermes = "<span class='notice'>USER recklessly lights NAME with FLAME.</span>"
 	ignitermes = "<span class='notice'>USER fiddles with FLAME, and manages to light their NAME with the power of science.</span>"
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 /obj/item/clothing/mask/smokable/pipe/Initialize()
 	. = ..()
@@ -590,6 +594,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	)
 	var/deactivation_sound = 'sound/items/cigs_lighters/cheap_off.ogg'
 	drop_sound = 'sound/items/drop/card.ogg'
+	pickup_sound = 'sound/items/pickup/card.ogg'
 
 /obj/item/flame/lighter/zippo
 	name = "\improper Zippo lighter"
@@ -599,6 +604,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	activation_sound = 'sound/items/cigs_lighters/zippo_on.ogg'
 	deactivation_sound = 'sound/items/cigs_lighters/zippo_off.ogg'
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 /obj/item/flame/lighter/random
 	New()

code/game/objects/items/weapons/cosmetics.dm

@@ -9,6 +9,7 @@
 	var/colour = "red"
 	var/open = 0
 	drop_sound = 'sound/items/drop/glass.ogg'
+	pickup_sound = 'sound/items/pickup/glass.ogg'
 
 /obj/item/lipstick/purple
 	name = "purple lipstick"

code/game/objects/items/weapons/extinguisher.dm

@@ -17,6 +17,7 @@
 	possible_transfer_amounts = null
 	volume = 300
 	drop_sound = 'sound/items/drop/gascan.ogg'
+	pickup_sound = 'sound/items/pickup/gascan.ogg'
 
 /obj/item/reagent_containers/extinguisher_refill/attackby(var/obj/O as obj, var/mob/user as mob)
 
@@ -95,6 +96,7 @@
 	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

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -13,7 +13,8 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
 /obj/item/a_gift/New()
 	..()

code/game/objects/items/weapons/handcuffs.dm

@@ -18,6 +18,7 @@
 	var/cuff_sound = 'sound/weapons/handcuffs.ogg'
 	var/cuff_type = "handcuffs"
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 /obj/item/handcuffs/attack(var/mob/living/carbon/C, var/mob/living/user)
 

code/game/objects/items/weapons/material/kitchen.dm

@@ -10,6 +10,7 @@
  */
 /obj/item/material/kitchen/utensil
 	drop_sound = 'sound/items/drop/knife.ogg'
+	pickup_sound = 'sound/items/pickup/knife.ogg'
 	w_class = 1
 	thrown_force_divisor = 1
 	origin_tech = list(TECH_MATERIAL = 1)
@@ -134,6 +135,7 @@
 	force_divisor = 0.7 // 10 when wielded with weight 15 (wood)
 	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, mob/living/user, var/target_zone)
 	if ((user.is_clumsy()) && prob(50))

code/game/objects/items/weapons/material/knives.dm

@@ -20,6 +20,7 @@
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	unbreakable = 1
 	drop_sound = 'sound/items/drop/knife.ogg'
+	pickup_sound = 'sound/items/pickup/knife.ogg'
 
 /obj/item/material/knife/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone)
 	if(active == 1)

code/game/objects/items/weapons/material/misc.dm

@@ -43,6 +43,7 @@
 	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/hatchet/butch
 	name = "butcher's cleaver"

code/game/objects/items/weapons/material/swords.dm

@@ -16,6 +16,7 @@
 	can_embed = 0
 	var/parry_chance = 40
 	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")
 	var/parry_bonus = 1
@@ -105,6 +106,7 @@
 	applies_material_colour = 0
 	parry_chance = 10
 	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
 
 /obj/item/material/sword/axe/pre_attack(var/mob/living/target, var/mob/living/user)
 	if(istype(target))

code/game/objects/items/weapons/material/twohanded.dm

@@ -35,6 +35,7 @@
 		)
 	hitsound = "swing_hit"
 	drop_sound = 'sound/items/drop/sword.ogg'
+	pickup_sound = 'sound/items/pickup/sword.ogg'
 
 /obj/item/material/twohanded/proc/unwield()
 	wielded = 0
@@ -196,6 +197,7 @@
 	applies_material_colour = 0
 	can_embed = 0
 	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
 
 /obj/item/material/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity)
 	if(!proximity) return
@@ -231,6 +233,7 @@
 	edge = 1
 	sharp = 0
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	mob_throw_hit_sound =  'sound/weapons/pierce.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	default_material = "glass"
 	var/obj/item/grenade/explosive = null
@@ -347,7 +350,8 @@
 
 	var/cutting = 0 //Ignore
 	var/powered = 0 //Ignore
-	drop_sound = 'sound/items/drop/metalshield.ogg'
+	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
 
 /obj/item/material/twohanded/chainsaw/Initialize()
 	. = ..()
@@ -540,6 +544,7 @@
 	applies_material_colour = 0
 	can_embed = 0
 	drop_sound = 'sound/items/drop/woodweapon.ogg'
+	pickup_sound = 'sound/items/pickup/woodweapon.ogg'
 
 /obj/item/material/twohanded/pike/halberd
 	icon_state = "halberd0"

code/game/objects/items/weapons/melee/energy.dm

@@ -321,6 +321,7 @@
 	active_w_class = 3
 	w_class = 3
 	drop_sound = 'sound/items/drop/sword.ogg'
+	pickup_sound = 'sound/items/pickup/sword.ogg'
 
 /obj/item/melee/energy/sword/powersword/activate(mob/living/user)
 	..()

code/game/objects/items/weapons/storage/backpack.dm

@@ -24,6 +24,7 @@
 	max_storage_space = 28
 	var/species_restricted = list("exclude","Vaurca Breeder","Vaurca Warform")
 	drop_sound = 'sound/items/drop/backpack.ogg'
+	pickup_sound = 'sound/items/pickup/backpack.ogg'
 	allow_quick_empty = TRUE
 	empty_delay = 0.5 SECOND
 

code/game/objects/items/weapons/storage/bags.dm

@@ -25,6 +25,7 @@
 	slot_flags = SLOT_BELT
 	var/use_deferred = TRUE
 	drop_sound = 'sound/items/drop/backpack.ogg'
+	pickup_sound = 'sound/items/pickup/backpack.ogg'
 
 // -----------------------------
 //          Trash bag
@@ -46,6 +47,7 @@
 	can_hold = null // any
 	cant_hold = list(/obj/item/disk/nuclear)
 	drop_sound = 'sound/items/drop/wrapper.ogg'
+	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 
 /obj/item/storage/bag/trash/update_icon()
 	if(contents.len == 0)
@@ -114,6 +116,7 @@
 	can_hold = null // any
 	cant_hold = list(/obj/item/disk/nuclear)
 	drop_sound = 'sound/items/drop/wrapper.ogg'
+	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 
 // -----------------------------
 //          Plant bag

code/game/objects/items/weapons/storage/belt.dm

@@ -10,7 +10,8 @@
 	max_storage_space = 28
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
-	drop_sound = 'sound/items/drop/leather.ogg'
+	drop_sound = 'sound/items/drop/toolbelt.ogg'
+	pickup_sound = 'sound/items/pickup/toolbelt.ogg'
 
 	var/show_above_suit = 0
 
@@ -35,6 +36,7 @@
 	desc = "A sturdy belt for holding various tools."
 	icon_state = "utilitybelt"
 	item_state = "utility"
+	equip_sound = 'sound/items/equip/toolbelt.ogg'
 	can_hold = list(
 		///obj/item/combitool,
 		/obj/item/crowbar,

code/game/objects/items/weapons/storage/boxes.dm

@@ -30,7 +30,8 @@
 	var/foldable = /obj/item/stack/material/cardboard	// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
 	var/maxHealth = 20	//health is already defined
 	use_sound = 'sound/items/storage/box.ogg'
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	var/chewable = TRUE
 
 /obj/item/storage/box/Initialize()
@@ -187,64 +188,86 @@
 	name = "box of blank shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front."
 	icon_state = "blankshot_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/blank = 8)
 
 /obj/item/storage/box/beanbags
 	name = "box of beanbag shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "beanshot_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/beanbag = 8)
 
 /obj/item/storage/box/shotgunammo
 	name = "box of shotgun slugs"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "lethalslug_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun = 8)
 
 /obj/item/storage/box/shotgunshells
 	name = "box of shotgun shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "lethalshell_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/pellet = 8)
 
 /obj/item/storage/box/flashshells
 	name = "box of illumination shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "illumshot_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/flash = 8)
 
 /obj/item/storage/box/stunshells
 	name = "box of stun shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "stunshot_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/stunshell = 8)
 
 /obj/item/storage/box/practiceshells
 	name = "box of practice shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "blankshot_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/practice = 8)
 
 /obj/item/storage/box/haywireshells
 	name = "box of haywire shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "empshot_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/emp = 8)
 
 /obj/item/storage/box/incendiaryshells
 	name = "box of incendiary shells"
 	desc = "It has a picture of a shotgun shell and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 	icon_state = "incendiaryshot_box"
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/shotgun/incendiary = 8)
 
 /obj/item/storage/box/sniperammo
 	name = "box of 14.5mm shells"
 	desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/a145 = 7)
 
 /obj/item/storage/box/ammo10mm
 	name = "box of 10mm shells"
 	desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
+	drop_sound = 'sound/items/drop/ammobox.ogg'
+	pickup_sound = 'sound/items/pickup/ammobox.ogg'
 	starts_with = list(/obj/item/ammo_casing/c10mm = 10)
 
 /obj/item/storage/box/flashbangs
@@ -470,6 +493,8 @@
 	icon_state = "matchbox"
 	item_state = "zippo"
 	w_class = 1
+	drop_sound = 'sound/items/drop/matchbox.ogg'
+	pickup_sound =  'sound/items/pickup/matchbox.ogg'
 	slot_flags = SLOT_BELT
 	can_hold = list(/obj/item/flame/match)
 	starts_with = list(/obj/item/flame/match = 10)
@@ -823,6 +848,7 @@
 	foldable = null
 	use_sound = 'sound/effects/doorcreaky.ogg'
 	drop_sound = 'sound/items/drop/wooden.ogg'
+	pickup_sound = 'sound/items/pickup/wooden.ogg'
 	chewable = FALSE
 	w_class = ITEMSIZE_LARGE
 	starts_with = list(/obj/item/grenade/dynamite = 6)

code/game/objects/items/weapons/storage/briefcase.dm

@@ -16,6 +16,7 @@
 	max_storage_space = 16
 	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/black
 	name = "black briefcase"

code/game/objects/items/weapons/storage/cell_backpack.dm

@@ -7,7 +7,8 @@
 	item_state = "cell_rack"
 	contained_sprite = TRUE
 	use_sound = 'sound/items/storage/toolbox.ogg'
-	drop_sound = 'sound/items/drop/metalboots.ogg'
+	drop_sound = 'sound/items/drop/toolbox.ogg'
+	pickup_sound = 'sound/items/pickup/toolbox.ogg'
 	can_hold = list(/obj/item/cell)
 	max_storage_space = 40 // about 10 cells
 	storage_slots = 10

code/game/objects/items/weapons/storage/fancy.dm

@@ -18,7 +18,8 @@
 	item_state = "box" //placeholder, many of these don't have inhands
 	var/icon_type = null
 	var/storage_type = "box"
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	use_sound = 'sound/items/storage/box.ogg'
 
 /obj/item/storage/fancy/update_icon(var/itemremoved = 0)
@@ -162,6 +163,7 @@
 		slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
 		)
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 	use_sound = 'sound/items/drop/paper.ogg'
 	w_class = 1
 	throwforce = 2
@@ -244,6 +246,7 @@
 	item_state = "cigarcase"
 	icon = 'icons/obj/cigs_lighters.dmi'
 	drop_sound = 'sound/items/drop/shovel.ogg'
+	pickup_sound = 'sound/items/pickup/shovel.ogg'
 	use_sound = 'sound/items/storage/briefcase.ogg'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
@@ -329,7 +332,8 @@
 	icon_state = "vialbox6"
 	icon_type = "vial"
 	use_sound = 'sound/items/drop/glass.ogg'
-	drop_sound = 'sound/items/drop/metalboots.ogg'
+	drop_sound = 'sound/items/drop/toolbox.ogg'
+	pickup_sound = 'sound/items/pickup/toolbox.ogg'
 	storage_slots = 6
 	can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
 	starts_with = list(/obj/item/reagent_containers/glass/beaker/vial = 6)
@@ -341,7 +345,8 @@
 	icon_state = "vialbox0"
 	item_state = "box"
 	use_sound = 'sound/items/drop/glass.ogg'
-	drop_sound = 'sound/items/drop/metalboots.ogg'
+	drop_sound = 'sound/items/drop/toolbox.ogg'
+	pickup_sound = 'sound/items/pickup/toolbox.ogg'
 	max_w_class = 2
 	can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
 	max_storage_space = 12 //The sum of the w_classes of all the items in this storage item.

code/game/objects/items/weapons/storage/firstaid.dm

@@ -19,7 +19,8 @@
 	throw_speed = 2
 	throw_range = 8
 	var/empty = 0
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
 /obj/item/storage/firstaid/fill()
 	if (empty) return
@@ -158,6 +159,7 @@
 	use_to_pickup = 1
 	use_sound = 'sound/items/storage/pillbottle.ogg'
 	drop_sound = 'sound/items/drop/pillbottle.ogg'
+	pickup_sound = 'sound/items/pickup/pillbottle.ogg'
 	max_storage_space = 16
 
 /obj/item/storage/pill_bottle/attack_self(mob/living/user)

code/game/objects/items/weapons/storage/misc.dm

@@ -5,6 +5,7 @@
 	icon_state = "dicebag"
 	use_sound = "rustle"
 	drop_sound = 'sound/items/drop/hat.ogg'
+	pickup_sound = 'sound/items/pickup/hat.ogg'
 	starts_with = list(
 		/obj/item/dice = 1,
 		/obj/item/dice/d20 = 1
@@ -57,6 +58,7 @@
 	icon_state = "cigpaperbook_generic"
 	item_state = "cigpacket"
 	drop_sound = 'sound/items/drop/wrapper.ogg'
+	pickup_sound = 'sound/items/pickup/wrapper.ogg'
 	use_sound = 'sound/items/drop/paper.ogg'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
@@ -90,6 +92,7 @@
 	starts_with = list(/obj/item/paper/cig/filter = 10)
 	make_exact_fit()
 	drop_sound = 'sound/items/drop/gloves.ogg'
+	pickup_sound = 'sound/items/pickup/gloves.ogg'
 	use_sound = 'sound/items/drop/paper.ogg'
 
 /obj/item/storage/fancy/cigpaper/fine
@@ -112,6 +115,7 @@
 	icon_state = "cigpacket"
 	item_state = "cigpacket"
 	drop_sound = 'sound/items/drop/shovel.ogg'
+	pickup_sound = 'sound/items/pickup/shovel.ogg'
 	use_sound = 'sound/items/storage/pillbottle.ogg'
 	w_class = 2
 	throwforce = 2
@@ -157,7 +161,8 @@
 		)
 	starts_with = list(/obj/item/clothing/mask/chewable/tobacco/nico = 6)
 	storage_slots = 6
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	use_sound = 'sound/items/storage/box.ogg'
 
 /obj/item/storage/fancy/chewables/tobacco/update_icon()
@@ -183,7 +188,8 @@
 		slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
 		)
 	max_storage_space = 8
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	use_sound = 'sound/items/storage/box.ogg'
 
 /obj/item/storage/chewables/rollable/fine

code/game/objects/items/weapons/storage/toolbox.dm

@@ -20,8 +20,10 @@
 	origin_tech = list(TECH_COMBAT = 1)
 	attack_verb = list("robusted")
 	use_sound = 'sound/items/storage/toolbox.ogg'
+	drop_sound = 'sound/items/drop/toolbox.ogg'
+	pickup_sound = 'sound/items/pickup/toolbox.ogg'
+
 	var/stunhit = 0
-	drop_sound = 'sound/items/drop/metalboots.ogg'
 
 /obj/item/storage/toolbox/Initialize()
 	. = ..()

code/game/objects/items/weapons/storage/wallets.dm

@@ -186,7 +186,8 @@
 	var/plastic_film_overlay_state = "plasticfilm"
 	var/front_id_overlay_state
 
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/storage/wallet/lanyard/New()
 	..()

code/game/objects/items/weapons/stunbaton.dm

@@ -10,6 +10,8 @@
 	edge = 0
 	throwforce = 7
 	w_class = 3
+	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/stunforce = 0

code/game/objects/items/weapons/surgery_tools.dm

@@ -13,7 +13,8 @@
 	desc = "hey, you aren't supposed to have this"
 	icon = 'icons/obj/surgery.dmi'
 	w_class = 2.0
-	drop_sound = 'sound/items/drop/scrap.ogg'
+	drop_sound = 'sound/items/drop/weldingtool.ogg'
+	pickup_sound = 'sound/items/pickup/weldingtool.ogg'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
@@ -73,6 +74,7 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
 	attack_verb = list("drilled")
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 /*
  * Scalpel
@@ -95,6 +97,7 @@
 	matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 5000)
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	drop_sound = 'sound/items/drop/knife.ogg'
+	pickup_sound = 'sound/items/pickup/knife.ogg'
 
 /*
  * Researchable Scalpels
@@ -146,6 +149,7 @@
 	sharp = 1
 	edge = 1
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 //misc, formerly from code/defines/weapons.dm
 /obj/item/surgery/bonegel
@@ -155,6 +159,7 @@
 	force = 0
 	throwforce = 1.0
 	drop_sound = 'sound/items/drop/bottle.ogg'
+	pickup_sound = 'sound/items/pickup/bottle.ogg'
 
 /obj/item/surgery/FixOVein
 	name = "FixOVein"
@@ -165,6 +170,7 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3)
 	var/usage_amount = 10
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 
 /obj/item/surgery/bonesetter
 	name = "bone setter"
@@ -183,6 +189,7 @@
 	icon_state = "surgerytray"
 	use_sound = null
 	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
 	force = 2
 	w_class = 5.0
 	storage_slots = 10
@@ -280,4 +287,4 @@
 
 /obj/item/storage/fancy/tray/throw_impact(atom/hit_atom)
 	..()
-	spill(3, src.loc)
+	spill(3, src.loc)

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -17,6 +17,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, var/target_zone)
 	if ((user.is_clumsy()) && prob(50))
@@ -40,9 +42,10 @@
 	slot_flags = SLOT_BELT
 	w_class = 2
 	force = 3
+	drop_sound = 'sound/items/drop/crowbar.ogg'
+	pickup_sound = 'sound/items/pickup/crowbar.ogg'
 	var/on = 0
 
-
 /obj/item/melee/telebaton/attack_self(mob/user as mob)
 	on = !on
 	if(on)
@@ -104,4 +107,4 @@
 					T.apply_damage(40, PAIN, target_zone, armor)
 		return
 	else
-		return ..()
+		return ..()

code/game/objects/items/weapons/tanks/tanks.dm

@@ -6,6 +6,7 @@
 	name = "tank"
 	icon = 'icons/obj/tank.dmi'
 	drop_sound = 'sound/items/drop/gascan.ogg'
+	pickup_sound = 'sound/items/pickup/gascan.ogg'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_tank.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_tank.dmi',

code/game/objects/items/weapons/tape.dm

@@ -4,7 +4,8 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "taperoll"
 	w_class = 1
-	drop_sound = 'sound/items/drop/box.ogg'
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 
 /obj/item/tape_roll/attack(var/mob/living/carbon/human/H, var/mob/user, var/target_zone)
 	if(istype(H))

code/game/objects/items/weapons/tools.dm

@@ -33,8 +33,9 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 150)
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
-	drop_sound = 'sound/items/drop/sword.ogg'
 	usesound = 'sound/items/Ratchet.ogg'
+	drop_sound = 'sound/items/drop/wrench.ogg'
+	pickup_sound = 'sound/items/pickup/wrench.ogg'
 
 /obj/item/wrench/iswrench()
 	return TRUE
@@ -56,16 +57,17 @@
 	slot_flags = SLOT_BELT | SLOT_EARS
 	center_of_mass = list("x" = 13,"y" = 7)
 	force = 8
-	w_class = ITEMSIZE_TINY
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
+	w_class = ITEMSIZE_TINY
 	matter = list(DEFAULT_WALL_MATERIAL = 75)
 	attack_verb = list("stabbed")
+	usesound = 'sound/items/Screwdriver.ogg'
+	drop_sound = 'sound/items/drop/screwdriver.ogg'
+	pickup_sound = 'sound/items/pickup/screwdriver.ogg'
 	lock_picking_level = 5
 	var/random_icon = TRUE
-	drop_sound = 'sound/items/drop/scrap.ogg'
-	usesound = 'sound/items/Screwdriver.ogg'
 
 /obj/item/screwdriver/Initialize()
 	. = ..()
@@ -133,10 +135,11 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 80)
 	attack_verb = list("pinched", "nipped")
-	var/bomb_defusal_chance = 30 // 30% chance to safely defuse a bomb
 	sharp = TRUE
 	edge = TRUE
-	drop_sound = 'sound/items/drop/knife.ogg'
+	drop_sound = 'sound/items/drop/wirecutter.ogg'
+	pickup_sound = 'sound/items/pickup/wirecutter.ogg'
+	var/bomb_defusal_chance = 30 // 30% chance to safely defuse a bomb
 
 /obj/item/wirecutters/New()
 	if(prob(50))
@@ -186,11 +189,12 @@
 		)
 	icon_state = "welder_off"
 	item_state = "welder_off"
-	var/base_iconstate = "welder"//These are given an _on/_off suffix before being used
-	var/base_itemstate = "welder"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	drop_sound = 'sound/items/drop/scrap.ogg'
+	drop_sound = 'sound/items/drop/weldingtool.ogg'
+	pickup_sound = 'sound/items/pickup/weldingtool.ogg'
+	var/base_iconstate = "welder"//These are given an _on/_off suffix before being used
+	var/base_itemstate = "welder"
 
 	//Amount of OUCH when it's thrown
 	force = 3
@@ -240,7 +244,7 @@
 	max_fuel = 40
 	matter = list(DEFAULT_WALL_MATERIAL = 100, MATERIAL_GLASS = 120)
 	origin_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4)
-	
+
 
 	var/last_gen = 0
 	var/fuelgen_delay = 400 //The time, in deciseconds, required to regenerate one unit of fuel
@@ -582,12 +586,13 @@
 	slot_flags = SLOT_BELT
 	force = 8
 	throwforce = 7
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/crowbar.ogg'
+	pickup_sound = 'sound/items/pickup/crowbar.ogg'
+	usesound = 'sound/items/Crowbar.ogg'
 	origin_tech = list(TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
-	drop_sound = 'sound/items/drop/sword.ogg'
-	usesound = 'sound/items/Crowbar.ogg'
 
 /obj/item/crowbar/iscrowbar()
 	return TRUE
@@ -635,7 +640,8 @@
 		)
 	force = 3
 	w_class = ITEMSIZE_SMALL
-	drop_sound = 'sound/items/drop/scrap.ogg'
+	drop_sound = 'sound/items/drop/multitool.ogg'
+	pickup_sound = 'sound/items/pickup/multitool.ogg'
 
 	var/list/tools = list(
 		"crowbar",

code/game/objects/items/weapons/towel.dm

@@ -8,7 +8,8 @@
 	w_class = 3
 	attack_verb = list("whipped")
 	hitsound = 'sound/weapons/towelwhip.ogg'
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 
 /obj/item/towel/attack_self(mob/living/user as mob)
 	attack(user,user)

code/game/objects/items/weapons/weaponry.dm

@@ -163,6 +163,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/sword.ogg'
+	pickup_sound = 'sound/items/pickup/sword.ogg'
 
 /obj/item/sord
 	name = "\improper SORD"
@@ -180,6 +181,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/card.ogg'
+	pickup_sound = 'sound/items/pickup/card.ogg'
 
 /obj/item/banhammer
 	desc = "banhammer"

code/game/objects/items/weapons/weldbackpack.dm

@@ -7,6 +7,7 @@
 	w_class = 4.0
 	var/max_fuel = 350
 	drop_sound = 'sound/items/drop/backpack.ogg'
+	pickup_sound = 'sound/items/pickup/backpack.ogg'
 
 /obj/item/weldpack/New()
 	var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills

code/game/objects/structures/bedsheet_bin.dm

@@ -21,7 +21,8 @@ LINEN BINS
 	throw_speed = 1
 	throw_range = 2
 	w_class = 4.0
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/cloth.ogg'
+	pickup_sound = 'sound/items/pickup/cloth.ogg'
 	randpixel = 0
 	center_of_mass = null
 	var/roll = FALSE

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -235,6 +235,7 @@
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "standard_folded"
 	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
 	center_of_mass = list("x" = 17,"y" = 7)
 	var/bedpath = /obj/structure/bed/roller
 	w_class = 4.0 // Can't be put in backpacks. Oh well.

code/game/objects/structures/therapy.dm

@@ -79,6 +79,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "pocketwatch"
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 	matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
 	w_class = 1
 	var/closed = FALSE
@@ -125,6 +126,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "pocketwatch"
 	drop_sound = 'sound/items/drop/accessory.ogg'
+	pickup_sound = 'sound/items/pickup/accessory.ogg'
 	matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
 	w_class = 1
 	var/datum/weakref/thrall = null