diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
index 07eaff88630..33551745700 100644
--- a/code/__DEFINES/sound.dm
+++ b/code/__DEFINES/sound.dm
@@ -184,3 +184,9 @@
 #define SFX_WIELD "wield"
 #define SFX_PLASTIC_DRY_FIRE "plastic_dry_fire"
 #define SFX_WHITEBOARD_SCRIBBLE "whiteboard_scribble"
+#define SFX_HEADSET_EQUIP "headset_equip"
+#define SFX_HEADSET_PICKUP "headset_pickup"
+#define SFX_CLOTH_DROP "cloth_drop"
+#define SFX_CLOTH_PICKUP "cloth_pickup"
+#define SFX_VISOR_DOWN "visor_down"
+#define SFX_VISOR_UP "visor_up"
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index e52981ab3e2..d6c3b6fc421 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -6,8 +6,8 @@
 	icon = 'icons/obj/bodybag.dmi'
 	icon_state = "bodybag_folded"
 	w_class = WEIGHT_CLASS_SMALL
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 	var/deploy_type = /obj/structure/closet/body_bag
 
 /obj/structure/closet/body_bag/feedback_hints(mob/user, distance, is_adjacent)
@@ -42,7 +42,7 @@
 	var/obj/structure/closet/body_bag/R = new deploy_type(location)
 	R.add_fingerprint(user)
 	tweak_bag(R)
-	playsound(src, 'sound/items/drop/cloth.ogg', 30)
+	playsound(src, drop_sound, 30)
 	qdel(src)
 
 /obj/item/bodybag/proc/tweak_bag(var/obj/structure/closet/body_bag/BB)
diff --git a/code/game/objects/items/camping.dm b/code/game/objects/items/camping.dm
index 4dd3b8a52a4..73d3eb2590f 100644
--- a/code/game/objects/items/camping.dm
+++ b/code/game/objects/items/camping.dm
@@ -360,7 +360,7 @@
 	base_icon = "sleepingbag_floor"
 	density = FALSE
 	anchored = FALSE
-	buckling_sound = 'sound/items/drop/cloth.ogg'
+	buckling_sound = 'sound/items/drop/clothing.ogg'
 	held_item = /obj/item/sleeping_bag
 	can_dismantle = FALSE
 	can_pad = FALSE
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 3464c2d7012..c11a89c08ad 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -21,8 +21,9 @@
 
 	var/EarSound = TRUE
 
-	drop_sound = 'sound/items/drop/component.ogg'
-	pickup_sound = 'sound/items/pickup/component.ogg'
+	drop_sound = 'sound/items/drop/headset.ogg'
+	pickup_sound = SFX_HEADSET_PICKUP
+	equip_sound = SFX_HEADSET_EQUIP
 
 /obj/item/radio/headset/feedback_hints(mob/user, distance, is_adjacent)
 	. = list()
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 79c9f1cfa7d..3056f0cf18a 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -111,6 +111,8 @@ BREATH ANALYZER
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
+	drop_sound = 'sound/items/drop/gas_analyzer.ogg'
+	pickup_sound = 'sound/items/pickup/gas_analyzer.ogg'
 
 	matter = list(MATERIAL_ALUMINIUM = 30, MATERIAL_GLASS = 20)
 
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index cdc5b4585f0..a3afd35476c 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -120,8 +120,8 @@ Contains:
 	heal_brute = 4
 	icon_has_variants = TRUE
 	apply_sounds = SFX_RIP
-	drop_sound = 'sound/items/drop/gloves.ogg'
-	pickup_sound = 'sound/items/pickup/gloves.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 
 /obj/item/stack/medical/bruise_pack/full/Initialize()
 	. = ..()
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 1360eb639aa..174c6da2565 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -27,8 +27,8 @@ GLOBAL_LIST_INIT_TYPED(rod_recipes, /datum/stack_recipe, list(
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	drop_sound = 'sound/items/drop/metalweapon.ogg'
-	pickup_sound = 'sound/items/pickup/metalweapon.ogg'
+	drop_sound = 'sound/items/drop/metal_rod.ogg'
+	pickup_sound = 'sound/items/pickup/metal_rod.ogg'
 	matter = list(DEFAULT_WALL_MATERIAL = 937.5)
 	recyclable = TRUE
 	max_amount = 60
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 524e7783d0d..cb5c7ace11c 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -20,8 +20,8 @@
 	var/list/construction_options = list("One Direction", "Full Window")
 	default_type = "glass"
 	icon_has_variants = TRUE
-	drop_sound = 'sound/items/drop/glass.ogg'
-	pickup_sound = 'sound/items/pickup/glass.ogg'
+	drop_sound = 'sound/items/drop/glass_sheet.ogg'
+	pickup_sound = 'sound/items/pickup/glass_sheet.ogg'
 
 /obj/item/stack/material/glass/mechanics_hints(mob/user, distance, is_adjacent)
 	. += ..()
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index fbcc7b6f7b5..6ccc082879b 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -5,8 +5,8 @@
 	icon_state = "sheet-hide"
 	default_type = MATERIAL_HIDE
 	icon_has_variants = TRUE
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = 'sound/items/drop/clothing.ogg'
+	pickup_sound = 'sound/items/pickup/clothing.ogg'
 	var/bare = FALSE //is this hair devoid of fur, hair, scales, carapace? Prevents re-stripping. Can also apply it to a hide type if we don't want to tan, like, xeno hide.
 	var/hide_type = "hair" //type of skin this animal has; scales for lizard, carapace for xeno.
 
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index ff2f62c1b39..971a416dbc2 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -102,8 +102,8 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 
 /obj/item/stack/tile/carpet/cyan
 	name = "cyan carpet"
@@ -170,8 +170,8 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = 'sound/items/drop/clothing.ogg'
+	pickup_sound = 'sound/items/pickup/clothing.ogg'
 	matter = list(MATERIAL_PLASTIC = TILE_MATERIAL_AMOUNT)
 
 /obj/item/stack/tile/lino/diamond
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 9ddb20ceda6..47b8d2ab4bd 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -124,6 +124,8 @@
 	icon_state = "id"
 	item_state = "card-id"
 	overlay_state = "id"
+	drop_sound = 'sound/items/drop/id_card.ogg'
+	pickup_sound = 'sound/items/pickup/id_card.ogg'
 
 	var/list/access = list()
 	/// The name registered_name on the card.
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index ba293d44031..a28bf9f13c5 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -17,8 +17,8 @@
 	amount_per_transfer_from_this = 150
 	possible_transfer_amounts = null
 	volume = 150
-	drop_sound = 'sound/items/drop/gascan.ogg'
-	pickup_sound = 'sound/items/pickup/gascan.ogg'
+	drop_sound = 'sound/items/drop/gas_tank.ogg'
+	pickup_sound = 'sound/items/pickup/gas_tank.ogg'
 
 /obj/item/reagent_containers/extinguisher_refill/feedback_hints(mob/user, distance, is_adjacent)
 	. += ..()
@@ -98,8 +98,8 @@
 	force = 15
 	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'
+	drop_sound = 'sound/items/drop/gas_tank.ogg'
+	pickup_sound = 'sound/items/pickup/gas_tank.ogg'
 
 	var/spray_particles = 3
 	var/spray_amount = 10	//units of liquid per particle
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 1fa281f5709..92343121903 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -18,6 +18,8 @@
 	var/det_time = 30
 	var/fake = FALSE
 	var/activation_sound = 'sound/weapons/armbomb.ogg'
+	pickup_sound = 'sound/items/pickup/grenade.ogg'
+	drop_sound = 'sound/items/drop/grenade.ogg'
 
 /obj/item/grenade/Destroy()
 	// Stop all animations to prevent a hard delete.
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index ac1cbaafa07..0bded6a5ba4 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -22,8 +22,8 @@
 	var/breakouttime = 2 MINUTES
 	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'
+	drop_sound = 'sound/items/drop/handcuffs.ogg'
+	pickup_sound = 'sound/items/pickup/handcuffs.ogg'
 
 /obj/item/handcuffs/attack(mob/living/target_mob, mob/living/user, target_zone)
 	var/mob/living/carbon/C = target_mob
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
index 82f99bd51c5..ba4bfdf4b56 100644
--- a/code/game/objects/items/weapons/power_cells.dm
+++ b/code/game/objects/items/weapons/power_cells.dm
@@ -214,8 +214,8 @@
 	maxcharge = 10000
 	matter = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 70)
 	w_class = WEIGHT_CLASS_SMALL
-	drop_sound = 'sound/items/drop/gascan.ogg'
-	pickup_sound = 'sound/items/pickup/gascan.ogg'
+	drop_sound = 'sound/items/drop/gas_tank.ogg'
+	pickup_sound = 'sound/items/pickup/gas_tank.ogg'
 	origin_tech = list(TECH_POWER = 4)
 
 /obj/item/cell/mecha
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index ef30178ab94..dfa7fd41c5e 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -40,7 +40,9 @@
 	///Boolean, if set, can be crushed into a trash item when empty
 	var/trash = null
 
-	use_sound = 'sound/items/storage/box.ogg'
+	var/maxHealth = 20	//health is already defined
+	use_sound = 'sound/items/storage/cardboardbox.ogg'
+	rustle_sound = 'sound/items/rustle/cardboardbox.ogg'
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	var/chewable = TRUE
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 2e0bf950a2d..9e117606c3a 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -8,9 +8,10 @@
 	center_of_mass = list("x" = 13,"y" = 10)
 	throw_speed = 2
 	throw_range = 8
-	drop_sound = 'sound/items/drop/cardboardbox.ogg'
-	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
-	use_sound = 'sound/items/storage/briefcase.ogg'
+	drop_sound = 'sound/items/drop/medkit.ogg'
+	pickup_sound = 'sound/items/pickup/medkit.ogg'
+	use_sound = 'sound/items/storage/medkit.ogg'
+	rustle_sound = 'sound/items/rustle/medkit.ogg'
 	max_w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/storage/firstaid/empty
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index 27743773b1f..9eca95e32c1 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -172,7 +172,7 @@
 	storage_slots = 6
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
-	use_sound = 'sound/items/storage/box.ogg'
+	use_sound = 'sound/items/storage/cardboardbox.ogg'
 
 /obj/item/storage/box/fancy/chewables/tobacco/update_icon()
 	if(opened) //use the open icon.
@@ -195,7 +195,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	drop_sound = 'sound/items/drop/cardboardbox.ogg'
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
-	use_sound = 'sound/items/storage/box.ogg'
+	use_sound = 'sound/items/storage/cardboardbox.ogg'
 
 /obj/item/storage/chewables/rollable/unathi
 	name = "box of S'th Kasavakh tobacco leaves"
@@ -239,7 +239,7 @@
 	icon_state = "solar_salve"
 	drop_sound = 'sound/items/drop/metal_pot.ogg'
 	pickup_sound = 'sound/items/drop/metal_pot.ogg'
-	use_sound = 'sound/items/storage/box.ogg'
+	use_sound = 'sound/items/storage/cardboardbox.ogg'
 	w_class = WEIGHT_CLASS_NORMAL
 	throwforce = 2
 	starts_with = list(/obj/item/clothing/mask/chewable/solar_salve = 6)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 2c6602c6f55..9110ba8e10e 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -75,6 +75,9 @@
 	///Sound played when used. null for no sound.
 	var/use_sound = SFX_RUSTLE
 
+	///Sound played when item inserted. null for no sound.
+	var/rustle_sound = SFX_RUSTLE
+
 	/// List of pre-filled items
 	var/list/starts_with
 
@@ -588,8 +591,8 @@
 		user.prepare_for_slotmove(W)
 	W.forceMove(src)
 	W.on_enter_storage(src)
-	if(use_sound)
-		playsound(src.loc, src.use_sound, 50, 0, -5)
+	if(rustle_sound)
+		playsound(src.loc, src.rustle_sound, 50, 0, -5)
 	if(animated)
 		animate_parent()
 	if(user)
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 36b557963c1..6f91b1fae38 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -17,6 +17,7 @@
 	origin_tech = list(TECH_COMBAT = 1)
 	attack_verb = list("robusted")
 	use_sound = 'sound/items/storage/toolbox.ogg'
+	rustle_sound = 'sound/items/rustle/toolbox.ogg'
 	drop_sound = 'sound/items/drop/toolbox.ogg'
 	pickup_sound = 'sound/items/pickup/toolbox.ogg'
 
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index d7adde0a145..f880b003b45 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -150,8 +150,8 @@
 		/obj/item/paper_bundle,
 		/obj/item/pen,
 		/obj/item/photo)
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = 'sound/items/drop/clothing.ogg'
+	pickup_sound = 'sound/items/pickup/clothing.ogg'
 
 	var/front_id_overlay_state
 	var/image/plastic_film
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 97ddd53b2e3..0266b3b1e24 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -2,8 +2,8 @@
 	name = "tank"
 	icon = 'icons/obj/tank.dmi'
 	contained_sprite = TRUE
-	drop_sound = 'sound/items/drop/gascan.ogg'
-	pickup_sound = 'sound/items/pickup/gascan.ogg'
+	drop_sound = 'sound/items/drop/gas_tank.ogg'
+	pickup_sound = 'sound/items/pickup/gas_tank.ogg'
 
 	var/gauge_icon = "indicator_tank"
 	var/last_gauge_pressure
diff --git a/code/game/objects/items/weapons/towel.dm b/code/game/objects/items/weapons/towel.dm
index 0751c3c2efa..b9d5a0ddad6 100644
--- a/code/game/objects/items/weapons/towel.dm
+++ b/code/game/objects/items/weapons/towel.dm
@@ -11,8 +11,8 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("whipped")
 	hitsound = 'sound/weapons/towelwhip.ogg'
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 
 /obj/item/towel/attack_self(mob/living/user)
 	attack(user, user)
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 5b05fd68f2e..2fd1f2f3755 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -20,8 +20,8 @@ LINEN BINS
 	throw_speed = 1
 	throw_range = 2
 	w_class = WEIGHT_CLASS_BULKY
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 	randpixel = 0
 	center_of_mass = null
 	var/roll = FALSE
diff --git a/code/game/sound/sound_keys/sound_keys.dm b/code/game/sound/sound_keys/sound_keys.dm
index 4beb6dd225a..b221c29c0ec 100644
--- a/code/game/sound/sound_keys/sound_keys.dm
+++ b/code/game/sound/sound_keys/sound_keys.dm
@@ -903,3 +903,51 @@
 		'sound/effects/whiteboard_scribble_2.ogg',
 		'sound/effects/whiteboard_scribble_3.ogg'
 	)
+
+/datum/sound_effect/headset_equip
+	key = SFX_HEADSET_EQUIP
+	file_paths = list(
+		'sound/items/equip/headset1.ogg',
+		'sound/items/equip/headset2.ogg',
+	)
+
+/datum/sound_effect/headset_pickup
+	key = SFX_HEADSET_PICKUP
+	file_paths = list(
+		'sound/items/pickup/headset1.ogg',
+		'sound/items/pickup/headset2.ogg',
+		'sound/items/pickup/headset3.ogg',
+	)
+
+/datum/sound_effect/cloth_drop
+	key = SFX_CLOTH_DROP
+	file_paths = list(
+		'sound/items/drop/cloth1.ogg',
+		'sound/items/drop/cloth2.ogg',
+		'sound/items/drop/cloth3.ogg',
+		'sound/items/drop/cloth4.ogg',
+	)
+
+/datum/sound_effect/cloth_pickup
+	key = SFX_CLOTH_PICKUP
+	file_paths = list(
+		'sound/items/pickup/cloth1.ogg',
+		'sound/items/pickup/cloth2.ogg',
+		'sound/items/pickup/cloth3.ogg',
+		'sound/items/pickup/cloth4.ogg',
+	)
+
+/datum/sound_effect/visor_down
+	key = SFX_VISOR_DOWN
+	file_paths = list(
+		'sound/items/do_flip/visor_down1.ogg',
+		'sound/items/do_flip/visor_down2.ogg',
+		'sound/items/do_flip/visor_down3.ogg',
+	)
+
+/datum/sound_effect/visor_up
+	key = SFX_VISOR_UP
+	file_paths = list(
+		'sound/items/do_flip/visor_up1.ogg',
+		'sound/items/do_flip/visor_up2.ogg',
+	)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index b5287bc9398..1bdba12895a 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -1,8 +1,8 @@
 /obj/item/clothing
 	name = "clothing"
 	siemens_coefficient = 0.9
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = 'sound/items/drop/clothing.ogg'
+	pickup_sound = 'sound/items/pickup/clothing.ogg'
 	var/flash_protection = FLASH_PROTECTION_NONE	// Sets the item's level of flash protection.
 	var/tint = TINT_NONE							// Sets the item's level of visual impairment tint.
 	var/list/species_restricted = null 				//Only these species can wear this kit.
@@ -516,6 +516,7 @@
 	species_restricted = list("exclude",BODYTYPE_UNATHI,BODYTYPE_TAJARA,BODYTYPE_VAURCA, BODYTYPE_GOLEM,BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM,BODYTYPE_VAURCA_BULWARK,BODYTYPE_TESLA_BODY)
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
+	equip_sound = 'sound/items/equip/gloves.ogg'
 
 /obj/item/clothing/gloves/update_clothing_icon()
 	if (ismob(src.loc))
@@ -920,6 +921,7 @@
 	var/blood_overlay_type = "shoe"
 	drop_sound = 'sound/items/drop/shoes.ogg'
 	pickup_sound = 'sound/items/pickup/shoes.ogg'
+	equip_sound = 'sound/items/equip/sneakers.ogg'
 
 	var/can_hold_knife
 	var/footstep = 1
diff --git a/code/modules/clothing/gloves/xeno/unathi.dm b/code/modules/clothing/gloves/xeno/unathi.dm
index 419a4d45237..1c843bb024e 100644
--- a/code/modules/clothing/gloves/xeno/unathi.dm
+++ b/code/modules/clothing/gloves/xeno/unathi.dm
@@ -7,8 +7,8 @@
 	contained_sprite = TRUE
 	species_restricted = null
 	slot_flags = SLOT_GLOVES|SLOT_WRISTS
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 
 /obj/item/clothing/gloves/unathi/ancient
 	name = "ancient bronze gauntlets"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index c08f67d130c..ad47bfa986a 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -21,6 +21,7 @@
 	var/obj/structure/machinery/camera/camera
 	drop_sound = 'sound/items/drop/helm.ogg'
 	pickup_sound = 'sound/items/pickup/helm.ogg'
+	equip_sound = 'sound/items/equip/helm.ogg'
 	protects_against_weather = TRUE
 
 	var/has_storage = TRUE
@@ -172,11 +173,13 @@
 	if(icon_state == initial(icon_state))
 		icon_state = "[icon_state]-up"
 		item_state = icon_state
+		playsound(src, SFX_VISOR_UP, 20, TRUE, -1)
 		to_chat(user, SPAN_NOTICE("You raise the visor on \the [src]."))
 		body_parts_covered = HEAD
 	else
 		icon_state = initial(icon_state)
 		item_state = icon_state
+		playsound(src, SFX_VISOR_DOWN, 20, TRUE, -1)
 		to_chat(user, SPAN_NOTICE("You lower the visor on \the [src]."))
 		body_parts_covered = HEAD|FACE|EYES
 
@@ -266,10 +269,12 @@
 
 	if(src.icon_state == initial(icon_state))
 		src.icon_state = "[icon_state]-up"
+		playsound(src, SFX_VISOR_UP, 20, TRUE, -1)
 		to_chat(user, "You raise the visor on \the [src].")
 		body_parts_covered = HEAD
 	else
 		src.icon_state = initial(icon_state)
+		playsound(src, SFX_VISOR_DOWN, 20, TRUE, -1)
 		to_chat(user, "You lower the visor on \the [src].")
 		body_parts_covered = HEAD|FACE|EYES
 	update_clothing_icon()
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 75cefd82d01..306cb57b5bb 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -25,8 +25,8 @@
 	species_restricted = null
 	icon_auto_adapt = TRUE
 	silent = 1
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 	move_trail = null
 	sprite_sheets = list(
 		BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/shoes.dmi' //depreceated, only used for bulwarks due to their size
diff --git a/code/modules/clothing/shoes/slippers.dm b/code/modules/clothing/shoes/slippers.dm
index 2ad32bd2778..d29a2367c6b 100644
--- a/code/modules/clothing/shoes/slippers.dm
+++ b/code/modules/clothing/shoes/slippers.dm
@@ -11,8 +11,8 @@
 	cold_protection = FEET
 	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
 	w_class = WEIGHT_CLASS_SMALL
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 	icon_auto_adapt = TRUE
 	icon_supported_species_tags = list("una")
 
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm
index 03b0cebfda0..4935f9246ac 100644
--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -631,12 +631,9 @@
 	flippable = FALSE
 	v_flippable = FALSE
 	badge_string = null
-
 	var/open = CANT_OPEN
-
-	drop_sound = 'sound/items/drop/cloth.ogg'
-
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = 'sound/items/drop/clothing.ogg'
+	pickup_sound = 'sound/items/pickup/clothing.ogg'
 
 /obj/item/clothing/accessory/badge/passport/Initialize()
 	. = ..()
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
index 0e0adf5cdf5..c56c604b5d5 100644
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -27,8 +27,8 @@
 	item_flags = ITEM_FLAG_NO_BLUDGEON
 	unacidable = FALSE
 	fragile = FALSE
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 
 	var/on_fire = 0
 	var/burn_time = 20 //if the rag burns for too long it turns to ashes
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index 9534e605c92..313c4b5f775 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -105,8 +105,8 @@
 	var/golem = null
 
 	//automatic-ness for giving drop n' pickup sounds on init.
-	var/drop_sound = 'sound/items/drop/axe.ogg'
-	var/pickup_sound = 'sound/items/pickup/axe.ogg'
+	var/drop_sound = 'sound/items/drop/metal_sheet.ogg'
+	var/pickup_sound = 'sound/items/pickup/metal_sheet.ogg'
 
 	//for use in material weapons. because tiles and stacks sound different. since cardboard baseball bats sound different from wooden ones and et cetera.
 	var/weapon_drop_sound = 'sound/items/drop/metalweapon.ogg'
@@ -694,8 +694,8 @@
 	melting_point = T0C+371 //assuming heat resistant plastic
 	stack_origin_tech = list(TECH_MATERIAL = 3)
 	golem = SPECIES_GOLEM_PLASTIC
-	drop_sound = 'sound/items/drop/card.ogg'
-	pickup_sound = 'sound/items/pickup/card.ogg'
+	drop_sound = 'sound/items/drop/plastic_sheet.ogg'
+	pickup_sound = 'sound/items/pickup/plastic_sheet.ogg'
 
 /material/plastic/holographic
 	name = MATERIAL_PLASTIC_HOLO
@@ -807,8 +807,8 @@
 	sheet_plural_name = "planks"
 	golem = SPECIES_GOLEM_WOOD
 	hitsound = 'sound/effects/woodhit.ogg'
-	drop_sound = 'sound/items/drop/wooden.ogg'
-	pickup_sound = 'sound/items/pickup/wooden.ogg'
+	drop_sound = 'sound/items/drop/wood_sheet.ogg'
+	pickup_sound = 'sound/items/pickup/wood_sheet.ogg'
 	weapon_drop_sound = 'sound/items/drop/woodweapon.ogg'
 	weapon_pickup_sound = 'sound/items/pickup/woodweapon.ogg'
 	weapon_hitsound = 'sound/weapons/woodenhit.ogg'
@@ -913,8 +913,8 @@
 	destruction_desc = "crumples"
 	shatter_sound = SFX_BREAK_CARDBOARD
 	golem = SPECIES_GOLEM_CARDBOARD
-	drop_sound = 'sound/items/drop/cardboardbox.ogg'
-	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
+	drop_sound = 'sound/items/drop/cardboard_sheet.ogg'
+	pickup_sound = 'sound/items/pickup/cardboard_sheet.ogg'
 	weapon_hitsound = 'sound/weapons/cardboardhit.ogg'
 
 /material/cult
@@ -967,8 +967,8 @@
 	melting_point = T0C+300
 	protectiveness = 3 // 13%
 	golem = SPECIES_GOLEM_MEAT
-	drop_sound = 'sound/items/drop/leather.ogg'
-	pickup_sound = 'sound/items/pickup/leather.ogg'
+	drop_sound = 'sound/items/drop/skin_sheet.ogg'
+	pickup_sound = 'sound/items/pickup/skin_sheet.ogg'
 
 /material/leather/fine
 	name = MATERIAL_LEATHER_FINE
@@ -988,8 +988,8 @@
 	hardness = 1
 	weight = 1
 	golem = SPECIES_GOLEM_CLOTH
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 	weapon_hitsound = 'sound/weapons/towelwhip.ogg'
 
 /material/carpet
@@ -1009,8 +1009,8 @@
 	icon_base = "carpet"
 	table_icon = 'icons/obj/structure/tables/fancy_table.dmi'
 	golem = SPECIES_GOLEM_CLOTH
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 	weapon_hitsound = 'sound/weapons/towelwhip.ogg'
 
 /material/carpet/black
@@ -1080,8 +1080,8 @@
 	hardness = 1
 	weight = 1
 	golem = SPECIES_GOLEM_CLOTH
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
+	drop_sound = SFX_CLOTH_DROP
+	pickup_sound = SFX_CLOTH_PICKUP
 	weapon_hitsound = 'sound/weapons/towelwhip.ogg'
 
 /material/hide //TODO make different hides somewhat different among them
@@ -1097,8 +1097,8 @@
 	weight = 1
 	protectiveness = 3 // 13%
 	golem = SPECIES_GOLEM_MEAT
-	drop_sound = 'sound/items/drop/leather.ogg'
-	pickup_sound = 'sound/items/pickup/leather.ogg'
+	drop_sound = 'sound/items/drop/skin_sheet.ogg'
+	pickup_sound = 'sound/items/pickup/skin_sheet.ogg'
 	value = 5
 
 /material/hide/corgi
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 577d7463efb..da53ee3ac7a 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -121,6 +121,8 @@
 	var/insert_sound = SFX_RELOAD_METAL_SLIDE
 	/// sound item plays when it is ejected from a gun.
 	var/eject_sound = 'sound/weapons/magazine_eject.ogg'
+	drop_sound = 'sound/items/drop/ammo_magazine.ogg'
+	pickup_sound = 'sound/items/pickup/ammo_magazine.ogg'
 
 /obj/item/ammo_magazine/feedback_hints(mob/user, distance, is_adjacent)
 	. += ..()
diff --git a/code/modules/projectiles/guns/bang.dm b/code/modules/projectiles/guns/bang.dm
index b627ca54b0a..f5959960292 100644
--- a/code/modules/projectiles/guns/bang.dm
+++ b/code/modules/projectiles/guns/bang.dm
@@ -20,6 +20,8 @@ ABSTRACT_TYPE(/obj/item/gun/bang)
 	var/suppressor_x_offset
 	///Pixel offset for the suppressor overlay on the y axis.
 	var/suppressor_y_offset
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/bang/update_icon()
 	..()
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 20fc2309ae6..16e48ce868a 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -98,6 +98,8 @@
 	can_turret = TRUE
 	turret_is_lethal = TRUE
 	turret_sprite_set = "laser"
+	drop_sound = 'sound/items/drop/shotgun.ogg'
+	pickup_sound = 'sound/items/pickup/shotgun.ogg'
 
 /obj/item/gun/energy/laser/shotgun/research
 	name = "\improper QB-2E laser shotgun"
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 1cf6d0d9c58..e5e3052993e 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -139,6 +139,9 @@
 	can_switch_modes = TRUE
 	turret_sprite_set = "carbine"
 	turret_is_lethal = FALSE
+	turret_is_lethal = 0
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 	projectile_type = /obj/projectile/beam/stun
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
@@ -219,6 +222,8 @@
 
 	projectile_type = /obj/projectile/beam/pistol/scc
 	origin_tech = list(TECH_COMBAT = 5, TECH_MAGNET = 4)
+	drop_sound = 'sound/items/drop/smg.ogg'
+	pickup_sound = 'sound/items/pickup/smg.ogg'
 
 	firemodes = list(
 		list(mode_name="single", can_autofire = FALSE, burst = 1),
@@ -245,6 +250,8 @@
 	projectile_type = /obj/projectile/beam/stun
 	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3)
 	modifystate = "sccpistolstun"
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 	firemodes = list(
 		list(mode_name="stun", projectile_type=/obj/projectile/beam/stun, modifystate="sccpistolstun", fire_sound='sound/weapons/Taser.ogg'),
@@ -273,6 +280,8 @@ ABSTRACT_TYPE(/obj/item/gun/energy/gun/skrell)
 	force = 11
 	projectile_type = /obj/projectile/beam/stun/skrell
 	secondary_projectile_type = /obj/projectile/beam/pulse/skrell
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 	firemodes = list(
 		list(mode_name="disable", projectile_type=/obj/projectile/beam/stun/skrell, fire_sound='sound/weapons/Laser2.ogg'),
@@ -290,6 +299,8 @@ ABSTRACT_TYPE(/obj/item/gun/energy/gun/skrell)
 	force = 16
 	projectile_type = /obj/projectile/beam/stun/skrell
 	secondary_projectile_type = /obj/projectile/beam/pulse/skrell
+	drop_sound = 'sound/items/drop/smg.ogg'
+	pickup_sound = 'sound/items/pickup/smg.ogg'
 
 	firemodes = list(
 		list(mode_name="disable", projectile_type=/obj/projectile/beam/stun/skrell, fire_sound='sound/weapons/Laser2.ogg'),
@@ -346,6 +357,8 @@ ABSTRACT_TYPE(/obj/item/gun/energy/gun/skrell)
 	can_switch_modes = TRUE
 	projectile_type = /obj/projectile/energy/disruptorskrell
 	modifystate = "psipistolstun"
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 	firemodes = list(
 		list(mode_name="stun", projectile_type=/obj/projectile/energy/disruptorskrell, modifystate="psipistolstun", fire_sound='sound/weapons/Taser.ogg'),
diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm
index d18ca6f72c7..36845d7c103 100644
--- a/code/modules/projectiles/guns/energy/rifle.dm
+++ b/code/modules/projectiles/guns/energy/rifle.dm
@@ -31,6 +31,8 @@
 	modifystate = "eriflestun"
 
 	is_wieldable = TRUE
+	drop_sound = 'sound/items/drop/rifle.ogg'
+	pickup_sound = 'sound/items/pickup/rifle.ogg'
 
 	firemodes = list(
 		list(mode_name="stun", projectile_type=/obj/projectile/beam/stun, modifystate="eriflestun", fire_sound='sound/weapons/Taser.ogg'),
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index c2998f1260f..e04d383c512 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -18,6 +18,8 @@
 	fire_delay = ROF_SMG
 	can_suppress = TRUE
 	suppressor_x_offset = 8
+	drop_sound = 'sound/items/drop/smg.ogg'
+	pickup_sound = 'sound/items/pickup/smg.ogg'
 
 	firemodes = list(
 		list(mode_name="semiauto",       can_autofire=0, burst=1, fire_delay=ROF_SMG),
@@ -209,6 +211,8 @@ ABSTRACT_TYPE(/obj/item/gun/projectile/automatic/rifle)
 
 	is_wieldable = TRUE
 	can_suppress = FALSE
+	drop_sound = 'sound/items/drop/rifle.ogg'
+	pickup_sound = 'sound/items/pickup/rifle.ogg'
 
 	firemodes = list(
 		list(mode_name="semiauto",       burst=1, fire_delay=ROF_RIFLE),
@@ -934,6 +938,8 @@ ABSTRACT_TYPE(/obj/item/gun/projectile/automatic/rifle)
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 	recoil = 3
 	fire_sound = 'sound/weapons/gunshot/gunshot_shotgun.ogg'
+	drop_sound = 'sound/items/drop/shotgun.ogg'
+	pickup_sound = 'sound/items/pickup/shotgun.ogg'
 
 	accuracy = -2
 	recoil_wielded = 0
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 3985a3bc1a6..9f4ff749f00 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -15,6 +15,8 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot_light.ogg'
 	load_method = MAGAZINE
 	fire_delay = ROF_PISTOL
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/colt/update_icon()
 	..()
@@ -81,6 +83,8 @@
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	ammo_type = /obj/item/ammo_casing/c45
 	allowed_magazines = list(/obj/item/ammo_magazine/c45m)
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/automatic/lebman/update_icon()
 	..()
@@ -105,6 +109,8 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
 	load_method = MAGAZINE
 	fire_delay = ROF_PISTOL
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/sec/update_icon()
 	..()
@@ -164,6 +170,8 @@
 	multi_aim = 1
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/automatic/x9/update_icon()
 	..()
@@ -189,6 +197,8 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
 	load_method = MAGAZINE
 	sel_mode = 1
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=ROF_PISTOL, fire_delay_wielded=ROF_SMG),
@@ -224,6 +234,8 @@
 	magazine_type = /obj/item/ammo_magazine/c45m
 	allowed_magazines = list(/obj/item/ammo_magazine/c45m)
 	fire_delay = ROF_PISTOL
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/silenced/update_icon()
 	..()
@@ -247,6 +259,8 @@
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 	fire_delay = ROF_RIFLE
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/deagle/update_icon()
 	..()
@@ -283,6 +297,8 @@
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 	fire_delay = ROF_UNWIELDY
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/gyropistol/update_icon()
 	..()
@@ -311,6 +327,8 @@
 	allowed_magazines = list(/obj/item/ammo_magazine/mc9mm)
 	fire_delay = ROF_PISTOL
 	suppressor_x_offset = 3
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/pistol/flash
 	name = "9mm signal pistol"
@@ -362,6 +380,8 @@
 	handle_casings = CYCLE_CASINGS //player has to take the old casing out manually before reloading
 	load_method = SINGLE_CASING
 	max_shells = 1 //literally just a barrel
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 	var/global/list/ammo_types = list(
 		/obj/item/ammo_casing/a357              = ".357",
@@ -398,6 +418,8 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
 	load_method = SINGLE_CASING|SPEEDLOADER
 	fire_delay = ROF_PISTOL
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/leyon/update_icon()
 	..()
@@ -557,6 +579,8 @@
 	can_suppress = TRUE
 	suppressor_x_offset = 9
 	suppressor_y_offset = 2
+	drop_sound = 'sound/items/drop/pistol.ogg'
+	pickup_sound = 'sound/items/pickup/pistol.ogg'
 
 /obj/item/gun/projectile/xanupistol/update_icon()
 	..()
diff --git a/code/modules/projectiles/guns/projectile/plasma.dm b/code/modules/projectiles/guns/projectile/plasma.dm
index fba32a7aa45..be6a0360e3d 100644
--- a/code/modules/projectiles/guns/projectile/plasma.dm
+++ b/code/modules/projectiles/guns/projectile/plasma.dm
@@ -14,6 +14,8 @@
 	load_method = MAGAZINE
 	handle_casings = DELETE_CASINGS
 	fire_delay = ROF_HEAVY
+	drop_sound = 'sound/items/drop/shotgun.ogg'
+	pickup_sound = 'sound/items/pickup/shotgun.ogg'
 
 /obj/item/gun/projectile/plasma/update_icon()
 	..()
diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm
index 1c07238494f..54dbef739ab 100644
--- a/code/modules/projectiles/guns/projectile/rifle.dm
+++ b/code/modules/projectiles/guns/projectile/rifle.dm
@@ -20,6 +20,8 @@
 	knife_y_offset = 13
 	can_sawoff = TRUE
 	sawnoff_workmsg = "shorten the barrel and stock"
+	drop_sound = 'sound/items/drop/rifle.ogg'
+	pickup_sound = 'sound/items/pickup/rifle.ogg'
 
 /obj/item/gun/projectile/shotgun/pump/rifle/magazine_fed
 	name = "strange rifle"
@@ -173,6 +175,8 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot3.ogg'
 	var/retracted_bolt = 0
 	var/icon_retracted = "pockrifle-empty"
+	drop_sound = 'sound/items/drop/rifle.ogg'
+	pickup_sound = 'sound/items/pickup/rifle.ogg'
 
 /obj/item/gun/projectile/contender/special_check(mob/user)
 	if(retracted_bolt)
@@ -355,6 +359,8 @@
 	accuracy_wielded = 2
 
 	is_wieldable = TRUE
+	drop_sound = 'sound/items/drop/rifle.ogg'
+	pickup_sound = 'sound/items/pickup/rifle.ogg'
 
 /obj/item/gun/projectile/gauss/update_icon()
 	..()
@@ -435,6 +441,8 @@
 	rack_verb = "work the lever on"
 	can_bayonet = FALSE
 	can_sawoff = FALSE
+	drop_sound = 'sound/items/drop/rifle.ogg'
+	pickup_sound = 'sound/items/pickup/rifle.ogg'
 
 /obj/item/gun/projectile/shotgun/pump/rifle/magazine_fed/crackrifle
 	name = "\improper Azarak-96 crack rifle"
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 40e1bbafe99..f7e1f67b9a0 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -6,6 +6,8 @@ ABSTRACT_TYPE(/obj/item/gun/projectile/shotgun)
 	var/can_sawoff = FALSE
 	var/sawnoff_workmsg
 	var/sawing_in_progress = FALSE
+	drop_sound = 'sound/items/drop/shotgun.ogg'
+	pickup_sound = 'sound/items/pickup/shotgun.ogg'
 
 /obj/item/gun/projectile/shotgun/mechanics_hints(mob/user, distance, is_adjacent)
 	. += ..()
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 0bac7760aee..c85752de94d 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -105,8 +105,8 @@
 	filling_states = "20;40;60;80;100"
 	center_of_mass = list("x" = 16,"y" = 13)
 	matter = list(MATERIAL_GLASS = 500)
-	drop_sound = 'sound/items/drop/drinkglass.ogg'
-	pickup_sound = 'sound/items/pickup/drinkglass.ogg'
+	drop_sound = 'sound/items/drop/beaker.ogg'
+	pickup_sound = 'sound/items/pickup/beaker.ogg'
 	fragile = TRUE
 	storage_slot_sort_by_name = TRUE
 
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 5ffd9f589b8..842c322d15d 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -177,6 +177,8 @@
 	volume = 40
 	safety = 1
 	reagents_to_add = list(/singleton/reagent/capsaicin/condensed = 40)
+	drop_sound = 'sound/items/drop/pepper_spray.ogg'
+	pickup_sound = 'sound/items/pickup/pepper_spray.ogg'
 
 /obj/item/reagent_containers/spray/pepper/feedback_hints(mob/user, distance, is_adjacent)
 	. += ..()
diff --git a/html/changelogs/wezzy-sounds-joneses.yml b/html/changelogs/wezzy-sounds-joneses.yml
new file mode 100644
index 00000000000..310242698f6
--- /dev/null
+++ b/html/changelogs/wezzy-sounds-joneses.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - soundadd: "Adds a whole lot more of pick up, drop, and handling sounds."
diff --git a/sound/items/attribution.txt b/sound/items/attribution.txt
new file mode 100644
index 00000000000..2f09241c1ca
--- /dev/null
+++ b/sound/items/attribution.txt
@@ -0,0 +1,28 @@
+shotgun_pickup1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681692/ , License: CC BY-NC 4.0
+shotgun_drop1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681690/ , License: CC BY-NC 4.0
+pistol_pickup1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/682043/ , License: CC BY-NC 4.0
+pistol_drop1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/682043/ , License: CC BY-NC 4.0
+rifle_pickup.ogg - https://freesound.org/people/the_Carlos/sounds/706972/ , License: CC BY 4.0
+rifle_drop1.ogg - https://freesound.org/people/the_Carlos/sounds/706972/ , License: CC BY 4.0
+smg_drop1.ogg - https://freesound.org/people/hyperix6/sounds/676588/ , License: CC0
+smg_pickup1.ogg - https://freesound.org/people/hyperix6/sounds/676588/ , License: CC0
+magazine_pickup1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681511/ , License: CC BY-NC 4.0
+magazine_drop1.ogg - https://freesound.org/people/PNMCarrieRailfan/sounds/681511/ , License: CC BY-NC 4.0
+
+visor_up and visor_down are:
+Bike helmet visor.wav by Didi0508 -- https://freesound.org/s/541921/ -- License: Attribution NonCommercial 4.0
+
+helmet drop and equip:
+helmet motorbike put on a head by cupido-1 -- https://freesound.org/s/614199/ -- License: Creative Commons 0
+
+helmet pickup:
+helmet_grabbing_and_handling_sound by Artninja -- https://freesound.org/s/725314/ -- License: Attribution 4.0
+
+id_card handling sounds made by sadboysuss
+license: CC-BY-SA
+
+
+
+
+
+
diff --git a/sound/items/do_flip/visor_down1.ogg b/sound/items/do_flip/visor_down1.ogg
new file mode 100644
index 00000000000..df93db6b7cf
Binary files /dev/null and b/sound/items/do_flip/visor_down1.ogg differ
diff --git a/sound/items/do_flip/visor_down2.ogg b/sound/items/do_flip/visor_down2.ogg
new file mode 100644
index 00000000000..1662f7cfbfe
Binary files /dev/null and b/sound/items/do_flip/visor_down2.ogg differ
diff --git a/sound/items/do_flip/visor_down3.ogg b/sound/items/do_flip/visor_down3.ogg
new file mode 100644
index 00000000000..7d2d2b2a6ae
Binary files /dev/null and b/sound/items/do_flip/visor_down3.ogg differ
diff --git a/sound/items/do_flip/visor_up1.ogg b/sound/items/do_flip/visor_up1.ogg
new file mode 100644
index 00000000000..bb498d6d663
Binary files /dev/null and b/sound/items/do_flip/visor_up1.ogg differ
diff --git a/sound/items/do_flip/visor_up2.ogg b/sound/items/do_flip/visor_up2.ogg
new file mode 100644
index 00000000000..ffa485833e3
Binary files /dev/null and b/sound/items/do_flip/visor_up2.ogg differ
diff --git a/sound/items/drop/ammo_magazine.ogg b/sound/items/drop/ammo_magazine.ogg
new file mode 100644
index 00000000000..ffd1a5f9f3e
Binary files /dev/null and b/sound/items/drop/ammo_magazine.ogg differ
diff --git a/sound/items/drop/attribution.txt b/sound/items/drop/attribution.txt
new file mode 100644
index 00000000000..2e95b789a8a
--- /dev/null
+++ b/sound/items/drop/attribution.txt
@@ -0,0 +1,7 @@
+{
+headset.ogg
+cloth1.ogg
+cloth2.ogg
+cloth3.ogg
+cloth4.ogg
+} - made by sadboyssuss
\ No newline at end of file
diff --git a/sound/items/drop/beaker.ogg b/sound/items/drop/beaker.ogg
new file mode 100644
index 00000000000..ff6b93d9a4e
Binary files /dev/null and b/sound/items/drop/beaker.ogg differ
diff --git a/sound/items/drop/cardboard_sheet.ogg b/sound/items/drop/cardboard_sheet.ogg
new file mode 100644
index 00000000000..f0612e4c39b
Binary files /dev/null and b/sound/items/drop/cardboard_sheet.ogg differ
diff --git a/sound/items/drop/cloth1.ogg b/sound/items/drop/cloth1.ogg
new file mode 100644
index 00000000000..c7b169b073b
Binary files /dev/null and b/sound/items/drop/cloth1.ogg differ
diff --git a/sound/items/drop/cloth2.ogg b/sound/items/drop/cloth2.ogg
new file mode 100644
index 00000000000..ee71eb14c19
Binary files /dev/null and b/sound/items/drop/cloth2.ogg differ
diff --git a/sound/items/drop/cloth3.ogg b/sound/items/drop/cloth3.ogg
new file mode 100644
index 00000000000..28c22cf2499
Binary files /dev/null and b/sound/items/drop/cloth3.ogg differ
diff --git a/sound/items/drop/cloth4.ogg b/sound/items/drop/cloth4.ogg
new file mode 100644
index 00000000000..3727fb8a6ac
Binary files /dev/null and b/sound/items/drop/cloth4.ogg differ
diff --git a/sound/items/drop/cloth.ogg b/sound/items/drop/clothing.ogg
similarity index 100%
rename from sound/items/drop/cloth.ogg
rename to sound/items/drop/clothing.ogg
diff --git a/sound/items/drop/gas_analyzer.ogg b/sound/items/drop/gas_analyzer.ogg
new file mode 100644
index 00000000000..779a600dee9
Binary files /dev/null and b/sound/items/drop/gas_analyzer.ogg differ
diff --git a/sound/items/drop/gas_tank.ogg b/sound/items/drop/gas_tank.ogg
new file mode 100644
index 00000000000..4bdeecb7d6f
Binary files /dev/null and b/sound/items/drop/gas_tank.ogg differ
diff --git a/sound/items/drop/glass_sheet.ogg b/sound/items/drop/glass_sheet.ogg
new file mode 100644
index 00000000000..f7df806e60e
Binary files /dev/null and b/sound/items/drop/glass_sheet.ogg differ
diff --git a/sound/items/drop/gloves.ogg b/sound/items/drop/gloves.ogg
index b1cee65c52f..4fd2948cfa9 100644
Binary files a/sound/items/drop/gloves.ogg and b/sound/items/drop/gloves.ogg differ
diff --git a/sound/items/drop/grenade.ogg b/sound/items/drop/grenade.ogg
new file mode 100644
index 00000000000..a8eb675ff3d
Binary files /dev/null and b/sound/items/drop/grenade.ogg differ
diff --git a/sound/items/drop/gun.ogg b/sound/items/drop/gun.ogg
index 3a489c72c0f..88f541c0032 100644
Binary files a/sound/items/drop/gun.ogg and b/sound/items/drop/gun.ogg differ
diff --git a/sound/items/drop/handcuffs.ogg b/sound/items/drop/handcuffs.ogg
new file mode 100644
index 00000000000..53d33d92065
Binary files /dev/null and b/sound/items/drop/handcuffs.ogg differ
diff --git a/sound/items/drop/headset.ogg b/sound/items/drop/headset.ogg
new file mode 100644
index 00000000000..d2c4a82b55b
Binary files /dev/null and b/sound/items/drop/headset.ogg differ
diff --git a/sound/items/drop/helm.ogg b/sound/items/drop/helm.ogg
index bbca1b381e2..8892e120e03 100644
Binary files a/sound/items/drop/helm.ogg and b/sound/items/drop/helm.ogg differ
diff --git a/sound/items/drop/id_card.ogg b/sound/items/drop/id_card.ogg
new file mode 100644
index 00000000000..81cfbb50e43
Binary files /dev/null and b/sound/items/drop/id_card.ogg differ
diff --git a/sound/items/drop/medkit.ogg b/sound/items/drop/medkit.ogg
new file mode 100644
index 00000000000..042eb7a5ab9
Binary files /dev/null and b/sound/items/drop/medkit.ogg differ
diff --git a/sound/items/drop/metal_rod.ogg b/sound/items/drop/metal_rod.ogg
new file mode 100644
index 00000000000..ad97b9f6eb2
Binary files /dev/null and b/sound/items/drop/metal_rod.ogg differ
diff --git a/sound/items/drop/metal_sheet.ogg b/sound/items/drop/metal_sheet.ogg
new file mode 100644
index 00000000000..81fbdd0cc7d
Binary files /dev/null and b/sound/items/drop/metal_sheet.ogg differ
diff --git a/sound/items/drop/pepper_spray.ogg b/sound/items/drop/pepper_spray.ogg
new file mode 100644
index 00000000000..99c396e0530
Binary files /dev/null and b/sound/items/drop/pepper_spray.ogg differ
diff --git a/sound/items/drop/pistol.ogg b/sound/items/drop/pistol.ogg
new file mode 100644
index 00000000000..639dc3b4aaa
Binary files /dev/null and b/sound/items/drop/pistol.ogg differ
diff --git a/sound/items/drop/plastic_sheet.ogg b/sound/items/drop/plastic_sheet.ogg
new file mode 100644
index 00000000000..d3948c0ac04
Binary files /dev/null and b/sound/items/drop/plastic_sheet.ogg differ
diff --git a/sound/items/drop/rifle.ogg b/sound/items/drop/rifle.ogg
new file mode 100644
index 00000000000..fd2f277abe2
Binary files /dev/null and b/sound/items/drop/rifle.ogg differ
diff --git a/sound/items/drop/shotgun.ogg b/sound/items/drop/shotgun.ogg
new file mode 100644
index 00000000000..30b3fa5063e
Binary files /dev/null and b/sound/items/drop/shotgun.ogg differ
diff --git a/sound/items/drop/skin_sheet.ogg b/sound/items/drop/skin_sheet.ogg
new file mode 100644
index 00000000000..72510fd00ef
Binary files /dev/null and b/sound/items/drop/skin_sheet.ogg differ
diff --git a/sound/items/drop/smg.ogg b/sound/items/drop/smg.ogg
new file mode 100644
index 00000000000..c9d05c150a8
Binary files /dev/null and b/sound/items/drop/smg.ogg differ
diff --git a/sound/items/drop/snow_sheet.ogg b/sound/items/drop/snow_sheet.ogg
new file mode 100644
index 00000000000..33ffa736284
Binary files /dev/null and b/sound/items/drop/snow_sheet.ogg differ
diff --git a/sound/items/drop/wood_sheet.ogg b/sound/items/drop/wood_sheet.ogg
new file mode 100644
index 00000000000..58980df7d26
Binary files /dev/null and b/sound/items/drop/wood_sheet.ogg differ
diff --git a/sound/items/equip/attribution.txt b/sound/items/equip/attribution.txt
new file mode 100644
index 00000000000..35b0d0bf53f
--- /dev/null
+++ b/sound/items/equip/attribution.txt
@@ -0,0 +1,7 @@
+sneakers.ogg made by sadboysuss
+license: CC-BY-SA 3.0
+
+{
+headset1.ogg
+headset2.ogg
+} - made by sadboysuss
diff --git a/sound/items/equip/gloves.ogg b/sound/items/equip/gloves.ogg
new file mode 100644
index 00000000000..3a8734de476
Binary files /dev/null and b/sound/items/equip/gloves.ogg differ
diff --git a/sound/items/equip/headset1.ogg b/sound/items/equip/headset1.ogg
new file mode 100644
index 00000000000..297fbcab3cf
Binary files /dev/null and b/sound/items/equip/headset1.ogg differ
diff --git a/sound/items/equip/headset2.ogg b/sound/items/equip/headset2.ogg
new file mode 100644
index 00000000000..db7c87d21ad
Binary files /dev/null and b/sound/items/equip/headset2.ogg differ
diff --git a/sound/items/equip/helm.ogg b/sound/items/equip/helm.ogg
new file mode 100644
index 00000000000..379ad6ce866
Binary files /dev/null and b/sound/items/equip/helm.ogg differ
diff --git a/sound/items/equip/sneakers.ogg b/sound/items/equip/sneakers.ogg
new file mode 100644
index 00000000000..a9ca5bed9a8
Binary files /dev/null and b/sound/items/equip/sneakers.ogg differ
diff --git a/sound/items/pickup/ammo_magazine.ogg b/sound/items/pickup/ammo_magazine.ogg
new file mode 100644
index 00000000000..1038b5a8c47
Binary files /dev/null and b/sound/items/pickup/ammo_magazine.ogg differ
diff --git a/sound/items/pickup/attribution.txt b/sound/items/pickup/attribution.txt
new file mode 100644
index 00000000000..45f377e0ced
--- /dev/null
+++ b/sound/items/pickup/attribution.txt
@@ -0,0 +1,12 @@
+{
+cloth1.ogg
+cloth2.ogg
+cloth3.ogg
+cloth4.ogg
+headset1.ogg
+headset2.ogg
+headset3.ogg
+} - made by sadboyssuss
+
+gas_analyzer handling sounds made by sadboysuss
+license: CC-BY-SA
\ No newline at end of file
diff --git a/sound/items/pickup/beaker.ogg b/sound/items/pickup/beaker.ogg
new file mode 100644
index 00000000000..a58af35d224
Binary files /dev/null and b/sound/items/pickup/beaker.ogg differ
diff --git a/sound/items/pickup/cardboard_sheet.ogg b/sound/items/pickup/cardboard_sheet.ogg
new file mode 100644
index 00000000000..f4532c4e626
Binary files /dev/null and b/sound/items/pickup/cardboard_sheet.ogg differ
diff --git a/sound/items/pickup/cloth1.ogg b/sound/items/pickup/cloth1.ogg
new file mode 100644
index 00000000000..659bdc20557
Binary files /dev/null and b/sound/items/pickup/cloth1.ogg differ
diff --git a/sound/items/pickup/cloth2.ogg b/sound/items/pickup/cloth2.ogg
new file mode 100644
index 00000000000..4b5ef7fcf24
Binary files /dev/null and b/sound/items/pickup/cloth2.ogg differ
diff --git a/sound/items/pickup/cloth3.ogg b/sound/items/pickup/cloth3.ogg
new file mode 100644
index 00000000000..309b12863e4
Binary files /dev/null and b/sound/items/pickup/cloth3.ogg differ
diff --git a/sound/items/pickup/cloth4.ogg b/sound/items/pickup/cloth4.ogg
new file mode 100644
index 00000000000..22b50e45d0a
Binary files /dev/null and b/sound/items/pickup/cloth4.ogg differ
diff --git a/sound/items/pickup/cloth.ogg b/sound/items/pickup/clothing.ogg
similarity index 100%
rename from sound/items/pickup/cloth.ogg
rename to sound/items/pickup/clothing.ogg
diff --git a/sound/items/pickup/gas_analyzer.ogg b/sound/items/pickup/gas_analyzer.ogg
new file mode 100644
index 00000000000..dc3f5988ae8
Binary files /dev/null and b/sound/items/pickup/gas_analyzer.ogg differ
diff --git a/sound/items/pickup/gas_tank.ogg b/sound/items/pickup/gas_tank.ogg
new file mode 100644
index 00000000000..f7b162af0e2
Binary files /dev/null and b/sound/items/pickup/gas_tank.ogg differ
diff --git a/sound/items/pickup/gascan.ogg b/sound/items/pickup/gascan.ogg
deleted file mode 100644
index c2a51c39721..00000000000
Binary files a/sound/items/pickup/gascan.ogg and /dev/null differ
diff --git a/sound/items/pickup/glass_sheet.ogg b/sound/items/pickup/glass_sheet.ogg
new file mode 100644
index 00000000000..53abd497dc7
Binary files /dev/null and b/sound/items/pickup/glass_sheet.ogg differ
diff --git a/sound/items/pickup/gloves.ogg b/sound/items/pickup/gloves.ogg
index 1a7d263426c..daf60c2518f 100644
Binary files a/sound/items/pickup/gloves.ogg and b/sound/items/pickup/gloves.ogg differ
diff --git a/sound/items/pickup/grenade.ogg b/sound/items/pickup/grenade.ogg
new file mode 100644
index 00000000000..f01ff3bd2a7
Binary files /dev/null and b/sound/items/pickup/grenade.ogg differ
diff --git a/sound/items/pickup/gun.ogg b/sound/items/pickup/gun.ogg
index 4eeda50ca50..df0ca683bcd 100644
Binary files a/sound/items/pickup/gun.ogg and b/sound/items/pickup/gun.ogg differ
diff --git a/sound/items/pickup/handcuffs.ogg b/sound/items/pickup/handcuffs.ogg
new file mode 100644
index 00000000000..db9d7042580
Binary files /dev/null and b/sound/items/pickup/handcuffs.ogg differ
diff --git a/sound/items/pickup/headset1.ogg b/sound/items/pickup/headset1.ogg
new file mode 100644
index 00000000000..aea8150bd7f
Binary files /dev/null and b/sound/items/pickup/headset1.ogg differ
diff --git a/sound/items/pickup/headset2.ogg b/sound/items/pickup/headset2.ogg
new file mode 100644
index 00000000000..87df489086b
Binary files /dev/null and b/sound/items/pickup/headset2.ogg differ
diff --git a/sound/items/pickup/headset3.ogg b/sound/items/pickup/headset3.ogg
new file mode 100644
index 00000000000..e12c1539d66
Binary files /dev/null and b/sound/items/pickup/headset3.ogg differ
diff --git a/sound/items/pickup/helm.ogg b/sound/items/pickup/helm.ogg
index 2d33f62a5dd..b28def3a51e 100644
Binary files a/sound/items/pickup/helm.ogg and b/sound/items/pickup/helm.ogg differ
diff --git a/sound/items/pickup/id_card.ogg b/sound/items/pickup/id_card.ogg
new file mode 100644
index 00000000000..cbd01a1189f
Binary files /dev/null and b/sound/items/pickup/id_card.ogg differ
diff --git a/sound/items/pickup/medkit.ogg b/sound/items/pickup/medkit.ogg
new file mode 100644
index 00000000000..4b4de0e0a35
Binary files /dev/null and b/sound/items/pickup/medkit.ogg differ
diff --git a/sound/items/pickup/metal_rod.ogg b/sound/items/pickup/metal_rod.ogg
new file mode 100644
index 00000000000..e81a3f3af1f
Binary files /dev/null and b/sound/items/pickup/metal_rod.ogg differ
diff --git a/sound/items/pickup/metal_sheet.ogg b/sound/items/pickup/metal_sheet.ogg
new file mode 100644
index 00000000000..9cba563eae6
Binary files /dev/null and b/sound/items/pickup/metal_sheet.ogg differ
diff --git a/sound/items/pickup/pepper_spray.ogg b/sound/items/pickup/pepper_spray.ogg
new file mode 100644
index 00000000000..90997e8db1d
Binary files /dev/null and b/sound/items/pickup/pepper_spray.ogg differ
diff --git a/sound/items/pickup/pistol.ogg b/sound/items/pickup/pistol.ogg
new file mode 100644
index 00000000000..639dc3b4aaa
Binary files /dev/null and b/sound/items/pickup/pistol.ogg differ
diff --git a/sound/items/pickup/plastic_sheet.ogg b/sound/items/pickup/plastic_sheet.ogg
new file mode 100644
index 00000000000..9b52b87145d
Binary files /dev/null and b/sound/items/pickup/plastic_sheet.ogg differ
diff --git a/sound/items/pickup/rifle.ogg b/sound/items/pickup/rifle.ogg
new file mode 100644
index 00000000000..1f219775f09
Binary files /dev/null and b/sound/items/pickup/rifle.ogg differ
diff --git a/sound/items/pickup/shotgun.ogg b/sound/items/pickup/shotgun.ogg
new file mode 100644
index 00000000000..d12f1c9ba43
Binary files /dev/null and b/sound/items/pickup/shotgun.ogg differ
diff --git a/sound/items/pickup/skin_sheet.ogg b/sound/items/pickup/skin_sheet.ogg
new file mode 100644
index 00000000000..224e59f36e6
Binary files /dev/null and b/sound/items/pickup/skin_sheet.ogg differ
diff --git a/sound/items/pickup/smg.ogg b/sound/items/pickup/smg.ogg
new file mode 100644
index 00000000000..de24a788919
Binary files /dev/null and b/sound/items/pickup/smg.ogg differ
diff --git a/sound/items/pickup/snow_sheet.ogg b/sound/items/pickup/snow_sheet.ogg
new file mode 100644
index 00000000000..224e59f36e6
Binary files /dev/null and b/sound/items/pickup/snow_sheet.ogg differ
diff --git a/sound/items/pickup/wood_sheet.ogg b/sound/items/pickup/wood_sheet.ogg
new file mode 100644
index 00000000000..f469286380b
Binary files /dev/null and b/sound/items/pickup/wood_sheet.ogg differ
diff --git a/sound/items/rustle/cardboardbox.ogg b/sound/items/rustle/cardboardbox.ogg
new file mode 100644
index 00000000000..3394c172e44
Binary files /dev/null and b/sound/items/rustle/cardboardbox.ogg differ
diff --git a/sound/items/rustle/medkit.ogg b/sound/items/rustle/medkit.ogg
new file mode 100644
index 00000000000..86d9b3a545f
Binary files /dev/null and b/sound/items/rustle/medkit.ogg differ
diff --git a/sound/items/rustle/toolbox.ogg b/sound/items/rustle/toolbox.ogg
new file mode 100644
index 00000000000..2f93ac6bf3d
Binary files /dev/null and b/sound/items/rustle/toolbox.ogg differ
diff --git a/sound/items/storage/box.ogg b/sound/items/storage/box.ogg
deleted file mode 100644
index 3f8fa8afb11..00000000000
Binary files a/sound/items/storage/box.ogg and /dev/null differ
diff --git a/sound/items/storage/cardboardbox.ogg b/sound/items/storage/cardboardbox.ogg
new file mode 100644
index 00000000000..5a885ac6879
Binary files /dev/null and b/sound/items/storage/cardboardbox.ogg differ
diff --git a/sound/items/storage/medkit.ogg b/sound/items/storage/medkit.ogg
new file mode 100644
index 00000000000..2f727405932
Binary files /dev/null and b/sound/items/storage/medkit.ogg differ