More Handling Sounds (#22528)

Just ports more pickup, drop and handling sounds from /tg/ to keep pace.

Attributions in their own .txt files.

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

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"

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()

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

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")
 

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()
 	. = ..()

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

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

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)
 	. += ..()

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()
 	..()

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"

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'),

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'),

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

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()
 	..()

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()
 	..()

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"

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)
 	. += ..()

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
 

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)
 	. += ..()