More new sounds and fixes equip sounds (#9464)

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -353,11 +353,11 @@
 		else if (WT.remove_fuel(0,user))
 			to_chat(user, SPAN_NOTICE("Now welding the vent."))
 			if(do_after(user, 30/W.toolspeed))
-				if(!src || !WT.isOn()) 
+				if(!src || !WT.isOn())
 					return
 				welded = !welded
 				update_icon()
-				playsound(src, 'sound/items/Welder2.ogg', 50, 1)
+				playsound(src, 'sound/items/welder_pry.ogg', 50, 1)
 				user.visible_message(SPAN_NOTICE("\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \
 									 SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \
 									 "You hear welding.")

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -290,13 +290,13 @@
 			to_chat(user, SPAN_DANGER("\The [WT] must be turned on!"))
 		else if (WT.remove_fuel(0,user))
 			to_chat(user, SPAN_NOTICE("Now welding \the [src]."))
-			playsound(src, 'sound/items/Welder.ogg', 50, 1)
+			playsound(src, 'sound/items/welder.ogg', 50, 1)
 			if(do_after(user, 20/W.toolspeed, act_target = src))
-				if(!src || !WT.isOn()) 
+				if(!src || !WT.isOn())
 					return
 				welded = !welded
 				update_icon()
-				playsound(src, 'sound/items/Welder2.ogg', 50, 1)
+				playsound(src, 'sound/items/welder_pry.ogg', 50, 1)
 				user.visible_message(SPAN_NOTICE("\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \
 									 SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \
 									 "You hear welding.")

code/defines/obj/weapon.dm

@@ -156,11 +156,11 @@
 	if(!target_zone || get_dist(user,target) > 1) //Dodged
 		endmessage1st = "Your [name] was dodged by [target]"
 		endmessage3rd = "[target] dodged the [name]"
-		soundname = "sound/weapons/punchmiss.ogg"
+		soundname = "punchmiss"
 	else if(wasblocked) // Blocked by Shield
 		endmessage1st = "Your [name] was blocked by [target]"
 		endmessage3rd = "[target] blocks the [name]"
-		soundname = "sound/weapons/punchmiss.ogg"
+		soundname = "punchmiss"
 	else
 
 		washit = 1
@@ -407,7 +407,6 @@
 	icon_state = "power_mod"
 	desc = "Charging circuits for power cells."
 
-
 /obj/item/device/camera_bug
 	name = "camera bug"
 	icon = 'icons/obj/device.dmi'
@@ -442,19 +441,6 @@
 
 	usr.client.eye = target
 
-/*
-/obj/item/cigarpacket
-	name = "Pete's Cuban Cigars"
-	desc = "The most robust cigars on the planet."
-	icon = 'icons/obj/cigarettes.dmi'
-	icon_state = "cigarpacket"
-	item_state = "cigarpacket"
-	w_class = 1
-	throwforce = 2
-	var/cigarcount = 6
-	flags = ONBELT
-	*/
-
 /obj/item/pai_cable
 	desc = "A flexible coated cable with a universal jack on one end."
 	name = "data cable"

code/game/gamemodes/cult/items/sword.dm

@@ -14,7 +14,8 @@
 	sharp = TRUE
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	drop_sound = 'sound/items/drop/sword.ogg'
-	pickup_sound = 'sound/items/pickup/sword.ogg'
+	pickup_sound = "pickup_sword"
+	equip_sound = "equip_sword"
 
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	can_embed = FALSE //can't get stuck anymore, because blood magic

code/game/gamemodes/cult/structures/pylon.dm

@@ -429,7 +429,7 @@
 
 /obj/structure/cult/pylon/proc/shatter()
 	visible_message(SPAN_DANGER("The pylon shatters into shards of crystal!"), SPAN_WARNING("You hear a tinkle of crystal shards."))
-	playsound(get_turf(src), "shatter", 75, 1)
+	playsound(get_turf(src), "glass_break", 75, 1)
 	isbroken = TRUE
 	if(pylonmode == PYLON_TURRET)
 		//If the pylon had a soul in it then it plays a creepy evil sound as the soul is released

code/game/machinery/CableLayer.dm

@@ -42,7 +42,7 @@
 			m = min(m, cable.amount)
 			m = min(m, 30)
 			if(m)
-				playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
+				playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
 				use_cable(m)
 				var/obj/item/stack/cable_coil/CC = new (get_turf(src))
 				CC.amount = m

code/game/machinery/alarm.dm

@@ -44,7 +44,7 @@
 	req_one_access = list(access_atmospherics, access_engine_equip)
 	clicksound = "button"
 	clickvol = 30
-	
+
 	var/alarm_id = null
 	var/breach_detection = 1 // Whether to use automatic breach detection or not
 	var/frequency = 1439
@@ -762,7 +762,7 @@
 
 			if (wiresexposed && W.iswirecutter())
 				user.visible_message("<span class='warning'>[user] has cut the wires inside \the [src]!</span>", "You cut the wires inside \the [src].")
-				playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 				new/obj/item/stack/cable_coil(get_turf(src), 5)
 				buildstage = 1
 				update_icon()
@@ -796,7 +796,7 @@
 
 			else if(W.iscrowbar())
 				to_chat(user, "You start prying out the circuit.")
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(src.loc, W.usesound, 50, 1)
 				if(do_after(user,20/W.toolspeed))
 					to_chat(user, "You pry out the circuit!")
 					var/obj/item/airalarm_electronics/circuit = new /obj/item/airalarm_electronics()

code/game/machinery/camera/camera.dm

@@ -233,7 +233,7 @@
 				visible_message("<span class='notice'> [user] has deactivated [src]!</span>")
 			else
 				visible_message("<span class='notice'> [src] clicks and shuts down. </span>")
-			playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 			icon_state = "[initial(icon_state)]1"
 			add_hiddenprint(user)
 		else
@@ -241,7 +241,7 @@
 				visible_message("<span class='notice'> [user] has reactivated [src]!</span>")
 			else
 				visible_message("<span class='notice'> [src] clicks and reactivates itself. </span>")
-			playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 			icon_state = initial(icon_state)
 			add_hiddenprint(user)
 
@@ -368,7 +368,7 @@
 
 	// Do after stuff here
 	to_chat(user, "<span class='notice'>You start to weld the [src]..</span>")
-	playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+	playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
 	WT.eyecheck(user)
 	busy = 1
 	if(do_after(user, 100/WT.toolspeed))

code/game/machinery/camera/camera_assembly.dm

@@ -118,7 +118,7 @@
 			else if(W.iswirecutter())
 
 				new/obj/item/stack/cable_coil(get_turf(src), 2)
-				playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 				to_chat(user, "You cut the wires from the circuits.")
 				state = 2
 				return
@@ -136,7 +136,7 @@
 		var/obj/U = locate(/obj) in upgrades
 		if(U)
 			to_chat(user, "You unattach an upgrade from the assembly.")
-			playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+			playsound(src.loc, W.usesound, 50, 1)
 			U.forceMove(get_turf(src))
 			upgrades -= U
 		return
@@ -161,7 +161,7 @@
 		return 0
 
 	to_chat(user, "<span class='notice'>You start to weld the [src]..</span>")
-	playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+	playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
 	WT.eyecheck(user)
 	busy = 1
 	if(do_after(user, 20/WT.toolspeed))

code/game/machinery/computer/ai_core.dm

@@ -26,7 +26,7 @@
 				if(!WT.isOn())
 					to_chat(user, "The welder must be on for this task.")
 					return
-				playsound(loc, 'sound/items/Welder.ogg', 50, 1)
+				playsound(loc, 'sound/items/welder.ogg', 50, 1)
 				if(do_after(user, 20/P.toolspeed))
 					if(!src || !WT.remove_fuel(0, user)) return
 					to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
@@ -51,7 +51,7 @@
 				state = 2
 				icon_state = "2"
 			if(P.iscrowbar() && circuit)
-				playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
 				state = 1
 				icon_state = "0"
@@ -81,7 +81,7 @@
 				if (brain)
 					to_chat(user, "Get that brain out of there first")
 				else
-					playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
+					playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
 					to_chat(user, "<span class='notice'>You remove the cables.</span>")
 					state = 2
 					icon_state = "2"
@@ -145,7 +145,7 @@
 				icon_state = "3b"
 
 			if(P.iscrowbar() && brain)
-				playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the brain.</span>")
 				brain.forceMove(loc)
 				brain = null
@@ -153,7 +153,7 @@
 
 		if(4)
 			if(P.iscrowbar())
-				playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
 				state = 3
 				if (brain)

code/game/machinery/computer/buildandrepair.dm

@@ -24,7 +24,7 @@
 				if(!WT.remove_fuel(0, user))
 					to_chat(user, "The welding tool must be on to complete this task.")
 					return
-				playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
 				if(do_after(user, 20/P.toolspeed))
 					if(!src || !WT.isOn()) return
 					to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
@@ -53,7 +53,7 @@
 				src.state = 2
 				src.icon_state = "2"
 			if(P.iscrowbar() && circuit)
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
 				src.state = 1
 				src.icon_state = "0"
@@ -79,7 +79,7 @@
 						icon_state = "3"
 		if(3)
 			if(P.iswirecutter())
-				playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 				to_chat(user, "<span class='notice'>You remove the cables.</span>")
 				src.state = 2
 				src.icon_state = "2"
@@ -100,7 +100,7 @@
 						src.icon_state = "4"
 		if(4)
 			if(P.iscrowbar())
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(src.loc, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the glass keyboard.</span>")
 				src.state = 3
 				src.icon_state = "3"

code/game/machinery/constructable_frame.dm

@@ -141,7 +141,7 @@
 
 		if(COMPONENT_STATE)
 			if(P.iscrowbar())
-				playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, TRUE)
+				playsound(get_turf(src), P.usesound, 50, TRUE)
 				state = CIRCUITBOARD_STATE
 				circuit.forceMove(get_turf(src))
 				circuit = null

code/game/machinery/deployable.dm

@@ -285,7 +285,7 @@ for reference:
 		qdel(src)
 
 /obj/item/deployable_kit/proc/assemble_kit(mob/user)
-	playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1)
+	playsound(src.loc, 'sound/items/screwdriver.ogg', 25, 1)
 	var/atom/A = new kit_product(user.loc)
 	user.visible_message(SPAN_NOTICE("[user] assembles \a [A]."), SPAN_NOTICE("You assemble \a [A]."))
 	A.add_fingerprint(user)
@@ -354,4 +354,4 @@ for reference:
 /obj/item/deployable_kit/remote_mech/brig
 	name = "brig mech control centre assembly kit"
 	desc = "A quick assembly kit to put together a brig mech control centre."
-	kit_product = /obj/structure/bed/chair/remote/mech/prison/portable
+	kit_product = /obj/structure/bed/chair/remote/mech/prison/portable

code/game/machinery/doors/airlock.dm

@@ -857,12 +857,12 @@ About the new airlock wires panel:
 			to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
 			return
 		cut_verb = "cutting"
-		cut_sound = 'sound/items/Welder.ogg'
+		cut_sound = 'sound/items/welder.ogg'
 		cut_delay *= 1.5/WT.toolspeed
 		cutting = TRUE
 	else if(istype(tool,/obj/item/gun/energy/plasmacutter))
 		cut_verb = "cutting"
-		cut_sound = 'sound/items/Welder.ogg'
+		cut_sound = 'sound/items/welder.ogg'
 		cut_delay *= 1
 		cutting = TRUE
 	else if(istype(tool,/obj/item/melee/energy/blade) || istype(tool,/obj/item/melee/energy/sword))
@@ -1072,13 +1072,13 @@ About the new airlock wires panel:
 				SPAN_NOTICE("You begin welding [src] [welded ? "open" : "shut"]."),
 				"You hear a welding torch on metal."
 			)
-			playsound(src, 'sound/items/Welder.ogg', 50, 1)
+			playsound(src, 'sound/items/welder.ogg', 50, 1)
 			if (!do_after(user, 2/C.toolspeed SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open, src.density)))
 				return
 			if(!WT.remove_fuel(0,user))
 				to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
 				return
-			playsound(src, 'sound/items/Welder2.ogg', 50, 1)
+			playsound(src, 'sound/items/welder_pry.ogg', 50, 1)
 			welded = !welded
 			update_icon()
 			return
@@ -1114,7 +1114,7 @@ About the new airlock wires panel:
 			if(!locked && bolt_cut_state != BOLTS_CUT)
 				to_chat(user, SPAN_WARNING("The airlock bolts are in the way of the electronics, you need to drop them before you can reach them."))
 				return
-			playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+			playsound(src.loc, C.usesound, 100, 1)
 			user.visible_message("<b>[user]</b> starts removing the electronics from the airlock assembly.", SPAN_NOTICE("You start removing the electronics from the airlock assembly."))
 			if(do_after(user,40/C.toolspeed))
 				user.visible_message("<b>[user]</b> removes the electronics from the airlock assembly.", SPAN_NOTICE("You remove the electronics from the airlock assembly."))

code/game/machinery/doors/door.dm

@@ -329,7 +329,7 @@
 		var/obj/item/weldingtool/welder = I
 		if(welder.remove_fuel(0,user))
 			to_chat(user, "<span class='notice'>You start to fix dents and weld \the [repairing] into place.</span>")
-			playsound(src, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/welder.ogg', 100, 1)
 			if(do_after(user, 5 * repairing.amount) && welder && welder.isOn())
 				to_chat(user, "<span class='notice'>You finish repairing the damage to \the [src].</span>")
 				health = between(health, health + repairing.amount*DOOR_REPAIR_AMOUNT, maxhealth)
@@ -340,7 +340,7 @@
 
 	if(repairing && I.iscrowbar())
 		to_chat(user, "<span class='notice'>You remove \the [repairing].</span>")
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		playsound(src.loc, I.usesound, 100, 1)
 		repairing.forceMove(user.loc)
 		repairing = null
 		return

code/game/machinery/doors/firedoor.dm

@@ -269,7 +269,7 @@
 			user.visible_message("<span class='danger'>\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].</span>",\
 			"You [blocked ? "weld" : "unweld"] \the [src] with \the [W].",\
 			"You hear something being welded.")
-			playsound(src, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/welder.ogg', 100, 1)
 			update_icon()
 			return
 
@@ -288,7 +288,7 @@
 									"You start to remove the electronics from [src].")
 			if(do_after(user,30/C.toolspeed))
 				if(blocked && density && hatch_open)
-					playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+					playsound(src.loc, C.usesound, 100, 1)
 					user.visible_message("<span class='danger'>[user] has removed the electronics from \the [src].</span>",
 										"You have removed the electronics from [src].")
 
@@ -525,4 +525,4 @@
 	width = 2
 	dir = EAST
 
-	enable_smart_generation = FALSE
+	enable_smart_generation = FALSE

code/game/machinery/doors/firedoor_assembly.dm

@@ -27,7 +27,7 @@ obj/structure/firedoor_assembly/attackby(var/obj/item/C as obj, mob/user as mob)
 				to_chat(user, "<span class='notice'>You wire \the [src].</span>")
 
 	else if(C.iswirecutter() && wired )
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 		user.visible_message("[user] cuts the wires from \the [src].", "You start to cut the wires from \the [src].")
 
 		if(do_after(user, 40/C.toolspeed))

code/game/machinery/doors/windowdoor.dm

@@ -47,7 +47,7 @@
 		ae.icon_state = "door_electronics_smoked"
 		operating = 0
 	src.density = 0
-	playsound(src, "shatter", 70, 1)
+	playsound(src, "glass_break", 70, 1)
 	if(display_message)
 		visible_message("[src] shatters!")
 	qdel(src)
@@ -187,7 +187,7 @@
 
 	//If it's emagged, crowbar can pry electronics out.
 	if (src.operating == -1 && I.iscrowbar())
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		playsound(src.loc, I.usesound, 100, 1)
 		user.visible_message("[user] removes the electronics from the windoor.", "You start to remove electronics from the windoor.")
 		if (do_after(user,60/I.toolspeed))
 			to_chat(user, "<span class='notice'>You removed the windoor electronics!</span>")

code/game/machinery/firealarm.dm

@@ -115,7 +115,7 @@
 				else if (W.iswirecutter())
 					user.visible_message("<span class='notice'>\The [user] has cut the wires inside \the [src]!</span>", "<span class='notice'>You have cut the wires inside \the [src].</span>")
 					new/obj/item/stack/cable_coil(get_turf(src), 5)
-					playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 					buildstage = 1
 					update_icon()
 			if(1)
@@ -130,7 +130,7 @@
 						return
 				else if(W.iscrowbar())
 					to_chat(user, "You pry out the circuit!")
-					playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+					playsound(src.loc, W.usesound, 50, 1)
 					spawn(20)
 						var/obj/item/firealarm_electronics/circuit = new /obj/item/firealarm_electronics()
 						circuit.forceMove(user.loc)

code/game/machinery/floor_light.dm

@@ -27,13 +27,13 @@ var/list/floor_light_cache = list()
 	if(W.isscrewdriver())
 		anchored = !anchored
 		visible_message("<span class='notice'>\The [user] has [anchored ? "attached" : "detached"] \the [src].</span>")
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
 	else if(W.iswelder() && (damaged || (stat & BROKEN)))
 		var/obj/item/weldingtool/WT = W
 		if(!WT.remove_fuel(0, user))
 			to_chat(user, "<span class='warning'>\The [src] must be on to complete this task.</span>")
 			return
-		playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
 		if(!do_after(user, 20/W.toolspeed))
 			return
 		if(!src || !WT.isOn())
@@ -51,7 +51,7 @@ var/list/floor_light_cache = list()
 			return
 		else
 			to_chat(user, "<span class='notice'>You lever off the [name].</span>")
-			playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/crowbar_tile.ogg', 100, TRUE)
 			if(stat & BROKEN)
 				qdel(src)
 				return
@@ -65,7 +65,7 @@ var/list/floor_light_cache = list()
 	if(user.a_intent == I_HURT && !issmall(user))
 		if(!isnull(damaged) && !(stat & BROKEN))
 			visible_message("<span class='danger'>\The [user] smashes \the [src]!</span>")
-			playsound(src, "shatter", 70, 1)
+			playsound(src, "glass_break", 70, 1)
 			update_icon()
 			stat |= BROKEN
 		else

code/game/machinery/gumball.dm

@@ -97,7 +97,7 @@
 
 /obj/machinery/gumballmachine/proc/smashgumball()
 	icon_state = "[initialicon]_broken"
-	playsound(get_turf(src), "shatter", 75, 1)
+	playsound(get_turf(src), "glass_break", 75, 1)
 	if(amountleft)
 		var/amountleftinside = amountleft
 		for(var/i = 1;i<=amountleftinside,i++)

code/game/machinery/machinery.dm

@@ -347,7 +347,7 @@ Class Procs:
 		return 0
 	if(!LAZYLEN(component_parts))
 		return 0
-
+	var/parts_replaced = FALSE
 	if(panel_open)
 		var/obj/item/circuitboard/CB = locate(/obj/item/circuitboard) in component_parts
 		var/P
@@ -383,6 +383,7 @@ Class Procs:
 						component_parts += B
 						B.forceMove(src)
 						to_chat(user, "<span class='notice'>[A.name] replaced with [B.name].</span>")
+						parts_replaced = TRUE
 						break
 		RefreshParts()
 		update_icon()
@@ -390,10 +391,12 @@ Class Procs:
 		to_chat(user, "<span class='notice'>Following parts detected in the machine:</span>")
 		for(var/obj/item/C in component_parts)
 			to_chat(user, "<span class='notice'>    [C.name]</span>")
+	if(parts_replaced) //only play sound when RPED actually replaces parts
+		playsound(src, 'sound/items/rped.ogg', 40, TRUE)
 	return 1
 
 /obj/machinery/proc/dismantle()
-	playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
+	playsound(loc, "crowbar", 50, 1)
 	var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(loc)
 	M.set_dir(src.dir)
 	M.state = 3
@@ -449,4 +452,4 @@ Class Procs:
 			H.apply_damage(45, PAIN)
 
 /obj/machinery/proc/do_signaler() // override this to customize effects
-	return
+	return

code/game/machinery/newscaster.dm

@@ -109,7 +109,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 
 	if(hitstaken > 0) //Cosmetic damage overlay
 		add_overlay(screen_overlays["crack[hitstaken]"])
-	
+
 	icon_state = initial(icon_state)
 	return
 
@@ -749,7 +749,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 					for (var/mob/O in hearers(5, src.loc))
 						O.show_message("[user.name] smashes the [src.name]!" )
 					src.isbroken=1
-					playsound(src.loc, "shatter", 100, 1)
+					playsound(src.loc, "glass_break", 100, 1)
 				else
 					for (var/mob/O in hearers(5, src.loc))
 						O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" )

code/game/machinery/portable_turret.dm

@@ -63,7 +63,7 @@
 	var/eprojectile = /obj/item/projectile/beam		//holder for lethal (secondary) mode beam
 
 	var/shot_sound = 'sound/weapons/Taser.ogg'		//what sound should play when the turret fires
-	var/eshot_sound	= 'sound/weapons/Laser.ogg'		//what sound should play when the lethal turret fires
+	var/eshot_sound	= 'sound/weapons/laser1.ogg'		//what sound should play when the lethal turret fires
 
 	var/datum/effect_system/sparks/spark_system		//the spark system, used for generating... sparks?
 
@@ -373,7 +373,7 @@
 			if(do_after(user, 5))
 				if(QDELETED(src) || !WT.isOn())
 					return
-				playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+				playsound(src.loc, 'sound/items/welder_pry.ogg', 50, 1)
 				health += maxhealth / 3
 				health = min(maxhealth, health)
 				return
@@ -782,7 +782,7 @@
 				return
 
 			else if(I.iscrowbar() && !anchored)
-				playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+				playsound(loc, I.usesound, 75, 1)
 				to_chat(user, "<span class='notice'>You dismantle the turret construction.</span>")
 				new /obj/item/stack/material/steel( loc, 5)
 				qdel(src)
@@ -824,7 +824,7 @@
 					to_chat(user, "<span class='notice'>You need more fuel to complete this task.</span>")
 					return
 
-				playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
+				playsound(loc, pick('sound/items/welder.ogg', 'sound/items/welder_pry.ogg'), 50, 1)
 				if(do_after(user, 20/I.toolspeed))
 					if(!src || !WT.remove_fuel(5, user)) return
 					build_step = 1
@@ -913,7 +913,7 @@
 				if(WT.get_fuel() < 5)
 					to_chat(user, "<span class='notice'>You need more fuel to complete this task.</span>")
 
-				playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
+				playsound(loc, pick('sound/items/welder.ogg', 'sound/items/welder_pry.ogg'), 50, 1)
 				if(do_after(user, 30/I.toolspeed))
 					if(!src || !WT.remove_fuel(5, user))
 						return
@@ -953,7 +953,7 @@
 					qdel(src) // qdel
 
 			else if(I.iscrowbar())
-				playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+				playsound(loc, I.usesound, 75, 1)
 				to_chat(user, "<span class='notice'>You pry off the turret's exterior armor.</span>")
 				new /obj/item/stack/material/steel(loc, 2)
 				build_step = 6
@@ -1022,8 +1022,8 @@
 
 	projectile = /obj/item/projectile/ion/stun
 	eprojectile = /obj/item/projectile/ion
-	shot_sound = 'sound/weapons/Laser.ogg'
+	shot_sound = 'sound/weapons/laser1.ogg'
-	eshot_sound	= 'sound/weapons/Laser.ogg'
+	eshot_sound	= 'sound/weapons/laser1.ogg'
 	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/crossbow
@@ -1034,7 +1034,7 @@
 	sprite_set = "crossbow"
 
 	eprojectile = /obj/item/projectile/energy/bolt/large
-	eshot_sound	= 'sound/weapons/Genhit.ogg'
+	eshot_sound	= 'sound/weapons/genhit.ogg'
 	req_one_access = list(access_syndicate)
 
 /obj/machinery/porta_turret/cannon

code/game/machinery/telecomms/machine_interactions.dm

@@ -69,7 +69,7 @@
 					to_chat(user, "<span class='warning'>You need five coils of wire for this.</span>")
 			if(P.iscrowbar())
 				to_chat(user, "You begin prying out the circuit board other components...")
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(src.loc, P.usesound, 50, 1)
 				if(do_after(user,60/P.toolspeed))
 					to_chat(user, "You finish prying out the components.")
 

code/game/machinery/transformer.dm

@@ -51,7 +51,7 @@
 		playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
 		return
 	if(canuse)
-		playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
 		use_power(6000) // Use a lot of power.
 		message_admins("[key_name(H)] has been borgified by the Autoborger 5000.")
 		visible_message("<span class='danger'>The machine makes a series of loud sounds as it starts to replace [H]'s organs and limbs with robotic parts!</span>")

code/game/machinery/vending.dm

@@ -106,7 +106,7 @@
 	var/heating_temperature = T0C + 57 //Best temp for coffee.
 
 	var/vending_sound = "machines/vending/vending_drop.ogg"
-	
+
 	var/global/list/screen_overlays
 	var/exclusive_screen = TRUE // Are we not allowed to show the deny and screen states at the same time?
 
@@ -126,7 +126,7 @@
 
 	if(src.product_ads)
 		src.ads_list += text2list(src.product_ads, ";")
-	
+
 	add_screen_overlay()
 
 	src.build_inventory()

code/game/objects/effects/burnt_wall.dm

@@ -23,7 +23,7 @@
 			return
 		if(WT.remove_fuel(0,user))
 			user.visible_message("<b>[user]</b> starts slicing \the [src] apart.", SPAN_NOTICE("You start slicing \the [src] apart."))
-			playsound(src, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/welder.ogg', 100, 1)
 			var/slice_time = reinf_material ? 100 : 30
 			if(do_after(user, slice_time, TRUE))
 				user.visible_message("<b>[user]</b> slices \the [src] apart.", SPAN_NOTICE("You slice \the [src] apart."))

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

@@ -128,7 +128,7 @@
 
 /obj/structure/sign/poster/attackby(obj/item/W as obj, mob/user as mob)
 	if(W.iswirecutter())
-		playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
 		if(ruined)
 			to_chat(user, "<span class='notice'>You remove the remnants of the poster.</span>")
 			qdel(src)

code/game/objects/effects/spiders.dm

@@ -28,7 +28,7 @@
 		var/obj/item/weldingtool/WT = W
 		if(WT.remove_fuel(0, user))
 			damage = 15
-			playsound(loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(loc, 'sound/items/welder.ogg', 100, 1)
 
 	health -= damage
 	healthcheck()
@@ -320,4 +320,4 @@
 	src.visible_message(SPAN_WARNING("\The [src] splits open."))
 	for(var/atom/movable/A in contents)
 		A.forceMove(src.loc)
-	return ..()
+	return ..()

code/game/objects/items.dm

@@ -10,7 +10,7 @@
 	var/health
 	var/burn_point
 	var/burning
-	var/hitsound
+	var/hitsound = "swing_hit" //generic hit sound.
 	var/storage_cost
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
 	var/no_attack_log = 0			//If it's an item we don't want to log attack_logs with, set this to 1
@@ -51,7 +51,7 @@
 	///Used when thrown into a mob
 	var/mob_throw_hit_sound
 	///Sound used when equipping the item into a valid slot
-	var/equip_sound
+	var/equip_sound = null
 	///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.
@@ -286,8 +286,8 @@
 	..()
 	if(isliving(hit_atom)) //Living mobs handle hit sounds differently.
 		var/volume = get_volume_by_throwforce_and_or_w_class()
-		if (throwforce > 0)
+		if(throwforce > 0)
-			if (mob_throw_hit_sound)
+			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)
@@ -339,13 +339,13 @@
 	equip_slot = slot
 	if(user.client)	user.client.screen |= src
 	if(user.pulling == src) user.stop_pulling()
-	if((slot_flags & slot))
+	if(slot == slot_l_hand || slot == slot_r_hand)
+		playsound(src, pickup_sound, PICKUP_SOUND_VOLUME)
+	else if(slot_flags && slot)
 		if(equip_sound)
 			playsound(src, equip_sound, EQUIP_SOUND_VOLUME)
 		else
-			playsound(src, drop_sound, EQUIP_SOUND_VOLUME)
+			playsound(src, drop_sound, DROP_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
@@ -836,4 +836,4 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	return FALSE
 
 /obj/item/proc/glasses_examine_atom(var/atom/A, var/user)
-	return
+	return

code/game/objects/items/airbubble.dm

@@ -449,7 +449,7 @@
 		"<span class='warning'>[user] begins cutting cable restrains on zipper of [src].</span>",
 		"<span class='notice'>You begin cutting cable restrains on zipper of [src].</span>"
 		)
-		playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
+		playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
 		if (!do_after(user, 3 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
 			return
 		zipped = !zipped

code/game/objects/items/bodybag.dm

@@ -76,7 +76,7 @@
 		return
 	else if(W.iswirecutter())
 		to_chat(user, "You cut the tag off the bodybag.")
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 		src.name = "body bag"
 		cut_overlays()
 

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

@@ -32,7 +32,7 @@
 /obj/item/device/multitool/hacktool/attackby(var/obj/item/W, var/mob/user)
 	if(W.isscrewdriver())
 		in_hack_mode = !in_hack_mode
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/screwdriver.ogg', 50, 1)
 	else
 		..()
 
@@ -149,4 +149,4 @@
 /datum/topic_state/default/must_hack/can_use_topic(var/src_object, var/mob/user)
 	if(!hacktool || !hacktool.in_hack_mode || !(src_object in hacktool.known_targets))
 		return STATUS_CLOSE
-	return ..()
+	return ..()

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

@@ -145,7 +145,7 @@
 			return
 		else
 			user.visible_message("<span class='danger'>[user] hits [src] with [I] but fails to damage it.</span>", "<span class='warning'>You hit [src] with [I], [I.force >= 10 ? "and it almost makes a dent!" : "but it appears to have no visible effect."]</span>")
-			playsound(loc, "sound/weapons/Genhit.ogg", I.force*2.5, 1)
+			playsound(loc, "sound/weapons/genhit.ogg", I.force*2.5, 1)
 			return
 
 	if(invincible)
@@ -167,7 +167,7 @@
 				var/obj/item/weldingtool/WT = I
 				if (WT.remove_fuel(2, user))
 					user.visible_message(SPAN_NOTICE("[user] starts welding the metal shell of [src]."), SPAN_NOTICE("You start [hacked ? "repairing" : "welding open"] the metal covering of [src]."))
-					playsound(loc, 'sound/items/Welder.ogg', 50, 1)
+					playsound(loc, 'sound/items/welder.ogg', 50, 1)
 					add_overlay("overlay_welding")
 					if (do_after(user, 25/I.toolspeed))
 						to_chat(user, SPAN_NOTICE("You are able to [hacked ? "repair" : "weld through"] the metal shell of [src]."))
@@ -222,7 +222,7 @@
 		if (3)
 			if (I.iswirecutter())
 				to_chat(user, SPAN_NOTICE("You cut the wires connecting the [src]'s magnets to their internal powersupply, [target ? "making the device fall off [target] and rendering it unusable." : "rendering the device unusable."]"))
-				playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
+				playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
 				setconstructionstate(4)
 				return
 

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

@@ -47,7 +47,7 @@
 		to_chat(user, "<span class='warning'>[O] must be safely placed on the ground for modification.</span>")
 		return
 
-	playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+	playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
 
 	user.visible_message("<span class='notice'>\The [user] opens \the [src] and modifies \the [O].</span>","<span class='notice'>You open \the [src] and modify \the [O].</span>")
 

code/game/objects/items/paintkit.dm

@@ -13,7 +13,7 @@
 
 /obj/item/device/kit/proc/use(var/amt, var/mob/user)
 	uses -= amt
-	playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
+	playsound(get_turf(user), 'sound/items/screwdriver.ogg', 50, 1)
 	if(uses<1)
 		user.drop_from_inventory(src,get_turf(src))
 		qdel(src)
@@ -65,4 +65,4 @@
 			species_restricted = list(H.species.get_bodytype())
 		kit.use(1,user)
 		return 1
-	return ..()
+	return ..()

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

@@ -138,7 +138,7 @@
 	else if(O.iswirecutter())
 		user.drop_from_inventory(O,get_turf(src))
 		to_chat(user, "<span class='notice'>You detach the wire from the [name].</span>")
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 		new /obj/item/stack/cable_coil(user.loc, 5)
 		new /obj/item/stack/material/glass(user.loc)
 		use(1)

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

@@ -21,7 +21,7 @@
 	if(O.iscrowbar())
 		amount--
 		to_chat(user, "<span class='notice'>You pry off the steel sheet from the [name].</span>")
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		playsound(src.loc, O.usesound, 100, 1)
 		new /obj/item/stack/material/glass/wired(user.loc)
 		new /obj/item/stack/material/steel(user.loc)
 		if(amount <= 0)
@@ -34,4 +34,4 @@
 	playsound(src.loc, 'sound/items/Deconstruct.ogg', 80, 1)
 	new /obj/machinery/floor_light(user.loc)
 	if(amount <= 0)
-		qdel(src)
+		qdel(src)

code/game/objects/items/toys.dm

@@ -306,8 +306,8 @@
 	icon_state = "katana"
 	item_state = "katana"
 	drop_sound = 'sound/items/drop/gun.ogg'
-	pickup_sound = 'sound/items/pickup/gun.ogg'
+	pickup_sound = "pickup_sword"
-	hitsound = "swing_hit"
+	equip_sound = "equip_sword"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT | SLOT_BACK
 	force = 5

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

@@ -39,6 +39,7 @@
 	var/build_type
 	var/build_atom
 	var/build_delay
+	var/last_fail = 0
 
 /obj/item/rfd/Initialize()
 	. = ..()
@@ -60,7 +61,7 @@
 	if(++mode > number_of_modes)
 		mode = RFD_FLOORS_AND_WALL
 	to_chat(user, SPAN_NOTICE("The mode selection dial is now at [modes[mode]]."))
-	playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
+	playsound(get_turf(src), 'sound/weapons/laser_safetyon.ogg', 50, FALSE)
 	if(prob(20))
 		spark(get_turf(loc), 3, alldirs)
 
@@ -73,7 +74,7 @@
 		user.drop_from_inventory(W,src)
 		qdel(W)
 		stored_matter += 10
-		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+		playsound(src.loc, 'sound/weapons/laser_reload1.ogg', 50, FALSE)
 		to_chat(user, SPAN_NOTICE("The RFD now holds [stored_matter]/30 matter-units."))
 		update_icon()
 		return
@@ -165,7 +166,10 @@ RFD Construction-Class
 			mode = RFD_FLOORS_AND_WALL
 	if(current_mode)
 		to_chat(user, SPAN_NOTICE("You switch the selection dial to <i>\"[current_mode]\"</i>."))
-		playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
+		if(mode == 3)
+			playsound(get_turf(src), 'sound/weapons/laser_safetyoff.ogg', 50, FALSE)
+		else
+			playsound(get_turf(src), 'sound/weapons/laser_safetyon.ogg', 50, FALSE)
 		if(prob(20))
 			spark(get_turf(src), 3, alldirs)
 
@@ -242,7 +246,7 @@ RFD Construction-Class
 		flick("[icon_state]-empty", src)
 		return FALSE
 
-	playsound(get_turf(src), 'sound/machines/hydraulic_short.ogg', 50, 1)
+	playsound(get_turf(src), 'sound/items/rfd_start.ogg', 50, FALSE)
 
 	working = TRUE
 	user.visible_message(SPAN_NOTICE("[user] holds \the [src] towards \the [A]."), SPAN_NOTICE("You start [deconstruct ? "deconstructing" : "constructing"] \a [build_type]..."))
@@ -269,7 +273,7 @@ RFD Construction-Class
 		qdel(A)
 
 	rfd_effect.end_animation()
-	playsound(get_turf(src), 'sound/effects/magnetclamp.ogg', 50, 1)
+	playsound(get_turf(src), 'sound/items/rfd_end.ogg', 50, FALSE)
 	build_cost = null
 	build_delay = null
 	build_type = null
@@ -366,14 +370,18 @@ RFD Service-Class
 			return
 	else
 		if(stored_matter <= 0)
-			user << "The \'Low Ammo\' light on the device blinks yellow."
+			if(last_fail <= world.time - 20) //Spam limiter.
-			flick("[icon_state]-empty", src)
+				last_fail = world.time
+				to_chat(user, "The \'Low Ammo\' light on the device blinks yellow.")
+				playsound(get_turf(src), 'sound/items/rfd_empty.ogg', 50, FALSE)
+				flick("[icon_state]-empty", src)
 			return
 
 	if(!istype(A, /obj/structure/table) && !istype(A, /turf/simulated/floor))
 		return
 
-	playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
+	playsound(src.loc, 'sound/items/rfd_dispense.ogg', 20, FALSE)
+	sleep(2)
 	var/used_energy = 0
 	var/obj/product
 
@@ -396,6 +404,7 @@ RFD Service-Class
 
 	to_chat(user, "Dispensing [product ? product : "product"]...")
 	product.forceMove(get_turf(A))
+	playsound(src.loc, 'sound/machines/click.ogg' , 10, 1)
 	if(istype(A, /obj/structure/table))
 		var/obj/structure/table/T = A
 		T.auto_align(product, click_parameters)
@@ -426,13 +435,19 @@ RFD Mining-Class
 	if(isrobot(user))
 		var/mob/living/silicon/robot/R = user
 		if(R.stat || !R.cell || R.cell.charge <= 500)
-			to_chat(user, SPAN_WARNING("You are unable to produce enough charge to use \the [src]!"))
+			if(last_fail <= world.time - 20) //Spam limiter.
-			flick("[icon_state]-empty", src)
+				last_fail = world.time
+				to_chat(user, SPAN_WARNING("You are unable to produce enough charge to use \the [src]!"))
+				playsound(get_turf(src), 'sound/items/rfd_empty.ogg', 50, FALSE)
+				flick("[icon_state]-empty", src)
 			return
 	else
 		if(stored_matter <= 0)
-			user << "The \'Low Ammo\' light on the device blinks yellow."
+			if(last_fail <= world.time - 20) //Spam limiter.
-			flick("[icon_state]-empty", src)
+				last_fail = world.time
+				to_chat(user, "The \'Low Ammo\' light on the device blinks yellow.")
+				playsound(get_turf(src), 'sound/items/rfd_empty.ogg', 50, FALSE)
+				flick("[icon_state]-empty", src)
 			return
 
 	if(!istype(A, /turf/simulated/floor) && !istype(A, /turf/unsimulated/floor))
@@ -490,20 +505,24 @@ RFD Mining-Class
 		return
 
 	if(malftransformermade)
-		to_chat(user, "There is already a transformer machine made!")
+		if(last_fail <= world.time - 20) //Spam limiter.
-		flick("[icon_state]-empty", src)
+			last_fail = world.time
+			to_chat(user, "There is already a transformer machine made!")
+			playsound(get_turf(src), 'sound/items/rfd_empty.ogg', 50, FALSE)
+			flick("[icon_state]-empty", src)
 		return
 
 	playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 	var/used_energy = 100
 	to_chat(user, "Fabricating machine...")
+	playsound(get_turf(src), 'sound/items/rfd_start.ogg', 50, FALSE)
 	if(do_after(user, 30 SECONDS, act_target = src))
 		var/obj/product = new /obj/machinery/transformer
 		malftransformermade = 1
 		product.forceMove(get_turf(A))
 		stored_matter = 0
 		update_icon()
-
+		playsound(get_turf(src), 'sound/items/rfd_end.ogg', 50, FALSE)
 	if(isrobot(user))
 		var/mob/living/silicon/robot/R = user
 		if(R.cell)
@@ -590,15 +609,17 @@ RFD Piping-Class
 
 	if(stored_matter < build_cost)
 		to_chat(user, SPAN_WARNING("The \'Low Ammo\' light on the device blinks yellow."))
+		playsound(get_turf(src), 'sound/items/rfd_empty.ogg', 50, FALSE)
 		flick("[icon_state]-empty", src)
 		return FALSE
 
-	playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
+	playsound(get_turf(src), 'sound/items/rfd_start.ogg', 50, FALSE)
 
 	working = TRUE
 	user.visible_message(SPAN_NOTICE("[user] holds \the [src] towards \the [T]."), SPAN_NOTICE("You start laying down your pipe..."))
 
 	if((build_delay && !do_after(user, build_delay)) || (!useResource(build_cost, user)))
+		playsound(get_turf(src), 'sound/items/rfd_interrupt.ogg', 50, FALSE)
 		working = FALSE
 		return FALSE
 
@@ -611,12 +632,12 @@ RFD Piping-Class
 		pipe_dir = NORTHEAST
 	new /obj/item/pipe(T, selected_pipe, pipe_dir)
 
+	playsound(get_turf(src), 'sound/items/rfd_end.ogg', 50, FALSE)
 	working = FALSE
-	playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, TRUE)
 	return TRUE
 
 /obj/item/rfd/piping/attack_self(mob/user)
-	playsound(get_turf(src), 'sound/effects/pop.ogg', 50, FALSE)
+	playsound(get_turf(src), 'sound/weapons/laser_safetyon.ogg', 50, FALSE)
 	var/list/pipe_selection = list()
 	switch(selected_mode)
 		if(STANDARD_PIPE)

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

@@ -69,7 +69,7 @@
 	if (!cell || !cell.checked_use(power_usage*5*CELLRATE))//Costs a small burst to enter cloak
 		if (owner)
 			to_chat(owner, "The [src] clicks uselessly, it has no power left.")
-		playsound(get_turf(src), 'sound/weapons/empty.ogg', 25, 1)
+		playsound(get_turf(src), 'sound/weapons/click.ogg', 25, 1)
 		return
 
 	START_PROCESSING(SSprocessing, src)

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

@@ -8,8 +8,8 @@
 	slot_flags = SLOT_EARS
 	var/colour = "red"
 	var/open = 0
-	drop_sound = 'sound/items/drop/glass.ogg'
+	drop_sound = 'sound/items/drop/screwdriver.ogg'
-	pickup_sound = 'sound/items/pickup/glass.ogg'
+	pickup_sound = 'sound/items/pickup/screwdriver.ogg'
 
 /obj/item/lipstick/purple
 	name = "purple lipstick"
@@ -102,7 +102,7 @@
 		H.f_style = H.species.default_f_style
 
 	H.update_hair()
-	playsound(H, 'sound/items/welder2.ogg', 20, 1)
+	playsound(H, 'sound/items/welder_pry.ogg', 20, 1)
 
 
 /obj/item/razor/attack(mob/M, mob/user, var/target_zone)

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

@@ -181,7 +181,7 @@
 			update_icon(user)
 	else if(I.iswirecutter())
 		user.visible_message("[user] cuts the [src].", SPAN_NOTICE("You cut the [src]."))
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 		new/obj/item/stack/cable_coil(get_turf(src), 15, color)
 		qdel(src)
 		update_icon(user)

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

@@ -6,11 +6,11 @@
 	item_state = "metalbat"
 	throwforce = 7
 	attack_verb = list("smashed", "beaten", "slammed", "smacked", "struck", "battered", "bonked")
-	hitsound = 'sound/weapons/genhit3.ogg'
 	default_material = "wood"
 	force_divisor = 1.1           // 22 when wielded with weight 20 (steel)
 	unwielded_force_divisor = 0.7 // 15 when unwielded based on above.
 	slot_flags = SLOT_BACK
+	equip_sound = null
 
 //Predefined materials go here.
 /obj/item/material/twohanded/baseballbat/metal/New(var/newloc)
@@ -26,4 +26,4 @@
 	..(newloc, MATERIAL_PLATINUM)
 
 /obj/item/material/twohanded/baseballbat/diamond/New(var/newloc)
-	..(newloc, MATERIAL_DIAMOND)
+	..(newloc, MATERIAL_DIAMOND)

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

@@ -11,6 +11,7 @@
 /obj/item/material/kitchen/utensil
 	drop_sound = 'sound/items/drop/knife.ogg'
 	pickup_sound = 'sound/items/pickup/knife.ogg'
+	hitsound = 'sound/weapons/bladeslice.ogg'
 	w_class = 1
 	thrown_force_divisor = 1
 	origin_tech = list(TECH_MATERIAL = 1)
@@ -134,8 +135,6 @@
 	default_material = "wood"
 	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

@@ -21,6 +21,7 @@
 	unbreakable = 1
 	drop_sound = 'sound/items/drop/knife.ogg'
 	pickup_sound = 'sound/items/pickup/knife.ogg'
+	hitsound = 'sound/weapons/bladeslice.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/material_weapons.dm

@@ -3,7 +3,6 @@
 // They are also fragile based on material data and many can break/smash apart.
 /obj/item/material
 	health = 10
-	hitsound = 'sound/weapons/bladeslice.ogg'
 	gender = NEUTER
 	throw_speed = 3
 	throw_range = 7
@@ -11,9 +10,9 @@
 	sharp = 0
 	edge = 0
 	icon = 'icons/obj/weapons.dmi'
-	hitsound = "swing_hit"
 
 	var/use_material_name = TRUE // Does the finished item put the material name in front of it?
+	var/use_material_sound = TRUE
 	var/applies_material_colour = 1
 	var/unbreakable
 	var/force_divisor = 0.5
@@ -55,6 +54,13 @@
 	else
 		if(use_material_name)
 			name = "[material.display_name] [initial(name)]"
+		if(use_material_sound)
+			if(sharp && !material.weapon_hitsound == 'sound/weapons/metalhit.ogg' || !sharp)
+				// wooden swords don't sound like metal swords.
+				// metalhit check is so swords when metal use their regular slice sfx.
+				hitsound = material.weapon_hitsound
+				drop_sound = material.weapon_drop_sound
+				pickup_sound = material.weapon_pickup_sound
 		health = round(material.integrity/10)
 		if(applies_material_colour)
 			color = material.icon_colour
@@ -85,7 +91,7 @@
 	if(istype(loc, /mob/living))
 		var/mob/living/M = loc
 		M.drop_from_inventory(src)
-	playsound(src, "shatter", 70, 1)
+	playsound(src, material.shatter_sound, 70, 1)
 	if(!consumed && drops_debris) material.place_shard(T)
 	qdel(src)
 

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

@@ -17,7 +17,8 @@
 	can_embed = 0
 	var/parry_chance = 40
 	drop_sound = 'sound/items/drop/sword.ogg'
-	pickup_sound = 'sound/items/pickup/sword.ogg'
+	pickup_sound = "pickup_sword"
+	equip_sound = "equip_sword"
 
 /obj/item/material/sword/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
 	var/parry_bonus = 1

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

@@ -3,7 +3,6 @@
 	desc = "A sharp, perfectly weighted piece of metal."
 	icon_state = "star"
 	icon = 'icons/obj/weapons.dmi'
-	hitsound = "swing_hit"
 	force_divisor = 0.1 // 6 with hardness 60 (steel)
 	thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
 	throw_speed = 10

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

@@ -21,8 +21,8 @@
 	var/wielded = 0
 	var/force_wielded = 0
 	var/force_unwielded
-	var/wieldsound = null
+	var/wield_sound = "wield_generic"
-	var/unwieldsound = null
+	var/unwield_sound = null
 	var/base_icon
 	var/base_name
 	var/unwielded_force_divisor = 0.25
@@ -33,20 +33,25 @@
 		slot_l_hand_str = 'icons/mob/items/weapons/lefthand_twohanded.dmi',
 		slot_r_hand_str = 'icons/mob/items/weapons/righthand_twohanded.dmi'
 		)
-	hitsound = "swing_hit"
 	drop_sound = 'sound/items/drop/sword.ogg'
-	pickup_sound = 'sound/items/pickup/sword.ogg'
+	pickup_sound = "pickup_sword"
+	equip_sound = "equip_sword"
+	hitsound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/material/twohanded/proc/wield()
+	wielded = 1
+	force = force_wielded
+	update_icon()
+	if(src.wield_sound)
+		playsound(src.loc, wield_sound, 25, 1)
 
 /obj/item/material/twohanded/proc/unwield()
 	wielded = 0
 	force = force_unwielded
 	name = "[base_name]"
 	update_icon()
-
+	if(src.unwield_sound)
-/obj/item/material/twohanded/proc/wield()
+		playsound(src.loc, unwield_sound, 25, 1)
-	wielded = 1
-	force = force_wielded
-	update_icon()
 
 /obj/item/material/twohanded/update_force()
 	base_name = name
@@ -83,7 +88,7 @@
 /obj/item/material/twohanded/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
 	if(wielded && default_parry_check(user, attacker, damage_source) && prob(parry_chance))
 		user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
-		playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
+		playsound(user.loc, "punchmiss", 50, 1)
 		return 1
 	return 0
 
@@ -114,8 +119,6 @@
 	if(wielded) //Trying to unwield it
 		unwield()
 		to_chat(user, "<span class='notice'>You are now carrying the [name] with one hand.</span>")
-		if (src.unwieldsound)
-			playsound(src.loc, unwieldsound, 50, 1)
 
 		var/obj/item/material/twohanded/offhand/O = user.get_inactive_hand()
 		if(O && istype(O))
@@ -127,9 +130,7 @@
 			to_chat(user, "<span class='warning'>You need your other hand to be empty.</span>")
 			return
 		wield()
-		to_chat(user, "<span class='notice'>You grab the [base_name] with both hands.</span>")
+		to_chat(user, "<span class='notice'>You grip the [base_name] with both hands.</span>")
-		if (src.wieldsound)
-			playsound(src.loc, wieldsound, 50, 1)
 
 		var/obj/item/material/twohanded/offhand/O = new /obj/item/material/twohanded/offhand(user) ////Let's reserve his other hand~
 		O.name = "[base_name] - offhand"
@@ -160,6 +161,10 @@
 	icon_state = "offhand"
 	name = "offhand"
 	default_material = "placeholder"
+	drop_sound = null
+	pickup_sound = null
+	equip_sound = null
+	use_material_sound = FALSE
 
 /obj/item/material/twohanded/offhand/unwield()
 	if (ismob(loc))
@@ -196,6 +201,7 @@
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	applies_material_colour = 0
 	can_embed = 0
+	use_material_sound = FALSE
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
 
@@ -232,11 +238,11 @@
 	thrown_force_divisor = 1.2 // 24 damage for steel (weight 20)
 	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
+	use_material_sound = FALSE
 
 /obj/item/material/twohanded/spear/Destroy()
 	if(explosive)
@@ -338,7 +344,6 @@
 	edge = 1
 	origin_tech = list(TECH_COMBAT = 5)
 	attack_verb = list("chopped", "sliced", "shredded", "slashed", "cut", "ripped")
-	hitsound = "sound/weapons/bladeslice.ogg"
 	can_embed = 0
 	applies_material_colour = 0
 	default_material = "steel"
@@ -350,6 +355,7 @@
 
 	var/cutting = 0 //Ignore
 	var/powered = 0 //Ignore
+	use_material_sound = FALSE
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
 
@@ -526,7 +532,6 @@
 
 	AltClick(usr)
 
-
 /obj/item/material/twohanded/pike
 	icon_state = "pike0"
 	base_icon = "pike"
@@ -543,6 +548,7 @@
 	reach = 2
 	applies_material_colour = 0
 	can_embed = 0
+	use_material_sound = FALSE
 	drop_sound = 'sound/items/drop/woodweapon.ogg'
 	pickup_sound = 'sound/items/pickup/woodweapon.ogg'
 

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

@@ -324,7 +324,8 @@
 	active_w_class = 3
 	w_class = 3
 	drop_sound = 'sound/items/drop/sword.ogg'
-	pickup_sound = 'sound/items/pickup/sword.ogg'
+	pickup_sound = "pickup_sword"
+	equip_sound = "equip_sword"
 
 /obj/item/melee/energy/sword/powersword/activate(mob/living/user)
 	..()

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

@@ -1,6 +1,5 @@
 /obj/item/melee
 	icon = 'icons/obj/weapons.dmi'
-	hitsound = "swing_hit"
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/weapons/lefthand_melee.dmi',
 		slot_r_hand_str = 'icons/mob/items/weapons/righthand_melee.dmi'
@@ -76,8 +75,6 @@
 	attack_verb = list("smashed", "beaten", "slammed", "smacked", "struck", "battered", "bonked")
 	w_class = 3
 	origin_tech = list(TECH_MATERIAL = 3, TECH_ILLEGAL = 2)
-	hitsound = 'sound/weapons/genhit3.ogg'
-
 
 /obj/item/melee/hammer/powered
 	name = "powered hammer"

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

@@ -31,7 +31,6 @@
 
 /obj/item/shield
 	name = "shield"
-	hitsound = "swing_hit"
 	icon = 'icons/obj/weapons.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/weapons/lefthand_shield.dmi',
@@ -79,7 +78,7 @@
 
 /obj/item/shield/riot/handle_shield(mob/user)
 	. = ..()
-	if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+	if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
 
 /obj/item/shield/riot/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
 	if(istype(damage_source, /obj/item/projectile))
@@ -118,7 +117,7 @@
 
 /obj/item/shield/buckler/handle_shield(mob/user)
 	. = ..()
-	if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+	if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
 
 /obj/item/shield/buckler/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
 	if(istype(damage_source, /obj/item/projectile))
@@ -308,11 +307,11 @@
 	. = ..()
 
 	if(.)
-		if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+		if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
 
 /obj/item/shield/riot/tact/attack_self(mob/living/user)
 	active = !active
-	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+	playsound(src.loc, 'sound/weapons/click.ogg', 50, 1)
 
 	if(active)
 		icon_state = "[initial(icon_state)]_[active]"

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

@@ -80,6 +80,9 @@
 	icon_state = "offhand"
 	name = "second hand"
 	use_to_pickup = 0
+	drop_sound = null
+	pickup_sound = null
+	equip_sound = null
 
 /obj/item/storage/laundry_basket/offhand/dropped(mob/user as mob)
 	user.drop_from_inventory(linked)

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

@@ -66,7 +66,7 @@
 	desc = "You can drill using this item. You dig?"
 	icon_state = "drill"
 	item_state = "drill"
-	hitsound = 'sound/weapons/saw/circsawhit.ogg'
+	hitsound = "drillhit"
 	matter = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 10000)
 	flags = CONDUCT
 	force = 15.0

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

@@ -72,7 +72,7 @@
 		H.update_inv_l_hand()
 		H.update_inv_r_hand()
 
-	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+	playsound(src.loc, 'sound/weapons/click.ogg', 50, 1)
 	add_fingerprint(user)
 
 	if(blood_overlay && blood_DNA && (blood_DNA.len >= 1)) //updates blood overlay, if any

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

@@ -33,7 +33,7 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 150)
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
-	usesound = 'sound/items/Ratchet.ogg'
+	usesound = 'sound/items/wrench.ogg'
 	drop_sound = 'sound/items/drop/wrench.ogg'
 	pickup_sound = 'sound/items/pickup/wrench.ogg'
 
@@ -62,7 +62,7 @@
 	w_class = ITEMSIZE_TINY
 	matter = list(DEFAULT_WALL_MATERIAL = 75)
 	attack_verb = list("stabbed")
-	usesound = 'sound/items/Screwdriver.ogg'
+	usesound = 'sound/items/screwdriver.ogg'
 	drop_sound = 'sound/items/drop/screwdriver.ogg'
 	pickup_sound = 'sound/items/pickup/screwdriver.ogg'
 	lock_picking_level = 5
@@ -130,6 +130,7 @@
 	attack_verb = list("pinched", "nipped")
 	sharp = TRUE
 	edge = TRUE
+	usesound = 'sound/items/wirecutter.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
@@ -201,6 +202,7 @@
 	slot_flags = SLOT_BELT
 	drop_sound = 'sound/items/drop/weldingtool.ogg'
 	pickup_sound = 'sound/items/pickup/weldingtool.ogg'
+	usesound = 'sound/items/welder.ogg'
 	var/base_iconstate = "welder"//These are given an _on/_off suffix before being used
 	var/base_itemstate = "welder"
 
@@ -385,7 +387,7 @@
 			)
 			affecting.heal_damage(brute = 15, robo_repair = TRUE)
 			user.visible_message(SPAN_WARNING("\The [user] [pick(repair_messages)] on [target]'s [affecting.name] with \the [src]."))
-			playsound(target, 'sound/items/Welder2.ogg', 15)
+			playsound(target, 'sound/items/welder_pry.ogg', 15)
 			repair_organ(user, target, affecting)
 
 /obj/item/weldingtool/afterattack(obj/O, mob/user, proximity)
@@ -481,7 +483,7 @@
 				to_chat(M, "<span class='notice'>You switch the [src] on.</span>")
 			else if(T)
 				T.visible_message("<span class='danger'>\The [src] turns on.</span>")
-			playsound(loc, 'sound/items/WelderActivate.ogg', 50, 1)
+			playsound(loc, 'sound/items/welder_activate.ogg', 50, 1)
 			force = 15
 			damtype = BURN
 			w_class = ITEMSIZE_LARGE
@@ -498,7 +500,7 @@
 			to_chat(M, "<span class='notice'>You switch \the [src] off.</span>")
 		else if(T)
 			T.visible_message("<span class='warning'>\The [src] turns off.</span>")
-		playsound(loc, 'sound/items/WelderDeactivate.ogg', 50, 1)
+		playsound(loc, 'sound/items/welder_deactivate.ogg', 50, 1)
 		force = 3
 		damtype = BRUTE
 		w_class = initial(w_class)
@@ -600,7 +602,7 @@
 	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/crowbar.ogg'
 	pickup_sound = 'sound/items/pickup/crowbar.ogg'
-	usesound = 'sound/items/Crowbar.ogg'
+	usesound = "crowbar"
 	origin_tech = list(TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")

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

@@ -385,7 +385,7 @@
 	icon = 'icons/obj/vaurca_items.dmi'
 	icon_state = "gaussrifle"
 	item_state = "gaussrifle"
-	fire_sound = 'sound/effects/Explosion2.ogg'
+	fire_sound = "gauss_fire"
 	fire_sound_text = "a subdued boom"
 	fire_delay = 12
 	slot_flags = SLOT_BACK
@@ -420,7 +420,7 @@
 	pump(user)
 
 /obj/item/gun/launcher/crossbow/vaurca/proc/pump(mob/M as mob)
-	playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+	playsound(M, 'sound/weapons/shotgun_pump.ogg', 60, 1)
 
 	if(bolt)
 		if(tension < max_tension)

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

@@ -163,7 +163,8 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/sword.ogg'
-	pickup_sound = 'sound/items/pickup/sword.ogg'
+	pickup_sound = "pickup_sword"
+	equip_sound = "equip_sword"
 
 /obj/item/sord
 	name = "\improper SORD"

code/game/objects/structures/alien/node.dm

@@ -91,7 +91,7 @@
 
 		if(WT.remove_fuel(0, user))
 			damage = 15
-			playsound(loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(loc, 'sound/items/welder.ogg', 100, 1)
 
 	health -= damage
 	healthcheck()
@@ -102,4 +102,4 @@
 		health -= 5
 		healthcheck()
 
-#undef NODERANGE
+#undef NODERANGE

code/game/objects/structures/crates_lockers/closets.dm

@@ -270,7 +270,7 @@
 					"<span class='notice'>You begin cutting [src] apart.</span>",
 					"You hear a welding torch on metal."
 				)
-				playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+				playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
 				if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open)))
 					return
 				if(!WT.remove_fuel(0,user))
@@ -314,7 +314,7 @@
 				"<span class='notice'>You begin welding [src] [welded ? "open" : "shut"].</span>",
 				"You hear a welding torch on metal."
 			)
-			playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+			playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
 			if (!do_after(user, 2/W.toolspeed SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
 				return
 			if(!WT.remove_fuel(0,user))
@@ -509,4 +509,4 @@
 /obj/structure/closet/Destroy()
 	if(linked_teleporter)
 		QDEL_NULL(linked_teleporter)
-	return ..()
+	return ..()

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -94,7 +94,7 @@
 					"<span class='notice'>You begin cutting [src] apart.</span>",
 					"You hear a welding torch on metal."
 				)
-				playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+				playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
 				if (!do_after(user, 2/W.toolspeed SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open)))
 					return
 				if(!WT.remove_fuel(0,user))
@@ -126,7 +126,7 @@
 				screwed = 0
 		else if(!screwed && wrenched)
 			to_chat(user,  "<span class='notice'>You start to screw the locker to the floor...</span>")
-			playsound(src, 'sound/items/Welder.ogg', 80, 1)
+			playsound(src, 'sound/items/welder.ogg', 80, 1)
 			if (do_after(user, 15/W.toolspeed SECONDS, act_target = src))
 				to_chat(user,  "<span class='notice'>You screw the locker!</span>")
 				playsound(loc, W.usesound, 50, 1)
@@ -179,7 +179,7 @@
 					"<span class='notice'>You begin welding [src] [welded ? "open" : "shut"].</span>",
 					"You hear a welding torch on metal."
 				)
-				playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+				playsound(loc, 'sound/items/welder_pry.ogg', 50, 1)
 				if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
 					return
 				if(!WT.remove_fuel(0,user))

code/game/objects/structures/crates_lockers/crates.dm

@@ -110,7 +110,7 @@
 	else if(W.iswirecutter())
 		if(rigged)
 			to_chat(user, "<span class='notice'>You cut away the wiring.</span>")
-			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
 			rigged = 0
 			return
 	else return attack_hand(user)

code/game/objects/structures/curtains.dm

@@ -42,7 +42,7 @@
 		if(!do_after(user, 30/W.toolspeed))
 			manipulating = FALSE
 			return
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 		visible_message(SPAN_NOTICE("[user] cuts down \the [src]."),
 					SPAN_NOTICE("You cut down \the [src]."))
 		if(istype(src, /obj/structure/curtain/open/medical))

code/game/objects/structures/displaycase.dm

@@ -40,7 +40,7 @@
 			src.density = 0
 			src.destroyed = 1
 			new /obj/item/material/shard( src.loc )
-			playsound(src, "shatter", 70, 1)
+			playsound(src, "glass_break", 70, 1)
 			update_icon()
 	else
 		playsound(src.loc, 'sound/effects/glass_hit.ogg', 75, 1)

code/game/objects/structures/door_assembly.dm

@@ -175,7 +175,7 @@
 	if(W.iswelder() && ( (istext(glass)) || (glass == 1) || (!anchored) ))
 		var/obj/item/weldingtool/WT = W
 		if (WT.remove_fuel(0, user))
-			playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+			playsound(src.loc, 'sound/items/welder_pry.ogg', 50, 1)
 			if(istext(glass))
 				user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.")
 				if(do_after(user, 40/W.toolspeed))
@@ -228,7 +228,7 @@
 				to_chat(user, "<span class='notice'>You wire the airlock.</span>")
 
 	else if(W.iswirecutter() && state == 1 )
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 		user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
 
 		if(do_after(user, 40/W.toolspeed))
@@ -240,7 +240,7 @@
 	else if(istype(W, /obj/item/airlock_electronics) && state == 1)
 		var/obj/item/airlock_electronics/EL = W
 		if(!EL.is_installed)
-			playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
 			user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
 			EL.is_installed = 1
 			if(do_after(user, 40/W.toolspeed))
@@ -261,7 +261,7 @@
 			src.state = 1
 			return
 
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		playsound(src.loc, W.usesound, 100, 1)
 		user.visible_message("\The [user] starts removing the electronics from the airlock assembly.", "You start removing the electronics from the airlock assembly.")
 
 		if(do_after(user, 40/W.toolspeed))
@@ -278,7 +278,7 @@
 		if (S)
 			if (S.get_amount() >= 1)
 				if(material_name == "rglass")
-					playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+					playsound(src.loc, "crowbar", 100, 1)
 					user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
 					if(do_after(user, 40) && !glass)
 						if (S.use(1))
@@ -290,7 +290,7 @@
 						to_chat(user, "You cannot make an airlock out of that material.")
 						return
 					if(S.get_amount() >= 2)
-						playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+						playsound(src.loc, "crowbar", 100, 1)
 						user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
 						if(do_after(user, 40) && !glass)
 							if (S.use(2))

code/game/objects/structures/fireaxe_cabinet.dm

@@ -23,7 +23,7 @@
 	shattered = 1
 	unlocked = 1
 	open = 1
-	playsound(user, "shatter", 100, 1)
+	playsound(user, "glass_break", 100, 1)
 	update_icon()
 
 /obj/structure/fireaxecabinet/update_icon()

code/game/objects/structures/girders.dm

@@ -150,7 +150,7 @@
 			return
 
 	else if(W.iswirecutter() && state == 1)
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 		to_chat(user, "<span class='notice'>Now removing support struts...</span>")
 		if(do_after(user,40/W.toolspeed))
 			if(!src) return
@@ -159,7 +159,7 @@
 			reset_girder()
 
 	else if(W.iscrowbar() && state == 0 && anchored)
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		playsound(src.loc, W.usesound, 100, 1)
 		to_chat(user, "<span class='notice'>Now dislodging the girder...</span>")
 		if(do_after(user, 40/W.toolspeed))
 			if(!src) return

code/game/objects/structures/grille.dm

@@ -97,7 +97,7 @@
 /obj/structure/grille/attackby(obj/item/W, mob/user)
 	if(W.iswirecutter())
 		if(!shock(user, 100))
-			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
 			new /obj/item/stack/rods(get_turf(src), destroyed ? 1 : 2)
 			qdel(src)
 	else if(istype(W, /obj/item/gun/energy/plasmacutter))
@@ -110,7 +110,7 @@
 		qdel(src)
 	else if((W.isscrewdriver()) && (istype(loc, /turf/simulated) || anchored))
 		if(!shock(user, 90))
-			playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
+			playsound(loc, 'sound/items/screwdriver.ogg', 100, 1)
 			anchored = !anchored
 			user.visible_message("<span class='notice'>[user] [anchored ? "fastens" : "unfastens"] the grille.</span>", \
 								 "<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.</span>")

code/game/objects/structures/janicart.dm

@@ -144,23 +144,23 @@
 		//This prevents dumb stuff like splashing the cart with the contents of a container, after putting said container into trash
 
 	else if (!has_items && (I.iswrench() || I.iswelder() || istype(I, /obj/item/gun/energy/plasmacutter)))
-		dismantle(user)
+		dismantle(user, I)
 		return
 	..()
 
-/obj/structure/janitorialcart/proc/dismantle(var/mob/user = null)
+/obj/structure/janitorialcart/proc/dismantle(var/mob/user = null, var/obj/item/I)
-	if (!dismantled)
+	if(!dismantled)
-		if (has_items)
+		if(has_items)
 			spill()
 
-		if (user)
+		if(user)
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+			playsound(src.loc, I.usesound, 50, 1)
 			user.visible_message("[user] starts taking apart the [src]", "You start disasembling the [src]")
 			if (!do_after(user, 30, needhand = 0))
 				return
 
 		new /obj/item/stack/material/steel(src.loc, 15)
-		dismantled = 1
+		dismantled = TRUE
 		qdel(src)
 
 /obj/structure/janitorialcart/ex_act(severity)

code/game/objects/structures/lattice.dm

@@ -55,7 +55,7 @@
 		var/obj/item/stack/rods/R = C
 		if (R.use(2))
 			to_chat(user, "<span class='notice'>Constructing catwalk ...</span>")
-			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+			playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
 			new /obj/structure/lattice/catwalk(src.loc)
 			qdel(src)
 		return
@@ -81,7 +81,7 @@
 		var/obj/item/weldingtool/WT = C
 		if (do_after(user, 5/C.toolspeed, act_target = src) && WT.remove_fuel(1, user))
 			to_chat(user, "<span class='notice'>You slice apart [src].</span>")
-			playsound(src, 'sound/items/Welder.ogg', 50, 1)
+			playsound(src, 'sound/items/welder.ogg', 50, 1)
 			var/obj/item/stack/rods/R = new /obj/item/stack/rods(get_turf(src))
 			R.amount = return_amount
 			R.update_icon()
@@ -145,7 +145,7 @@
 		var/obj/item/weldingtool/WT = C
 		if(do_after(user, 5/C.toolspeed, act_target = src) && WT.remove_fuel(1, user))
 			to_chat(user, SPAN_NOTICE("You slice apart the [src] leaving nothing useful behind."))
-			playsound(src, 'sound/items/Welder.ogg', 50, 1)
+			playsound(src, 'sound/items/welder.ogg', 50, 1)
 			qdel(src)
 	else
 		..()
@@ -160,4 +160,4 @@
 				damaged = TRUE
 			else
 				qdel(src)
-	return
+	return

code/game/objects/structures/mirror.dm

@@ -28,7 +28,7 @@
 	if(shattered)	return
 	shattered = 1
 	icon_state = "mirror_broke"
-	playsound(src, "shatter", 70, 1)
+	playsound(src, "glass_break", 70, 1)
 	desc = "Oh no, seven years of bad luck!"
 
 
@@ -150,4 +150,4 @@
 				if(!newname || newname == "")
 					newname = user.species.get_random_name()
 				user.fully_replace_character_name(user.real_name,newname)
-	..()
+	..()

code/game/objects/structures/plasticflaps.dm

@@ -56,7 +56,7 @@
 		if(!do_after(user, 30/W.toolspeed))
 			manipulating = FALSE
 			return
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
 		visible_message(SPAN_NOTICE("[user] cuts down \the [src]."),
 		SPAN_NOTICE("You cut down \the [src]."))
 		qdel(src)

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

@@ -135,7 +135,7 @@
 			to_chat(user, "\The [src] has no padding to remove.")
 			return
 		to_chat(user, "You remove the padding from \the [src].")
-		playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(src, 'sound/items/wirecutter.ogg', 100, 1)
 		remove_padding()
 
 	else if(istype(W, /obj/item/grab))

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

@@ -178,7 +178,7 @@
 			to_chat(user, "\The [src] has no padding to remove.")
 			return
 		to_chat(user, "You remove the padding from \the [src].")
-		playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(src, 'sound/items/wirecutter.ogg', 100, 1)
 		remove_padding()
 	else
 		..()

code/game/objects/structures/windoor_assembly.dm

@@ -74,7 +74,7 @@ obj/structure/windoor_assembly/Destroy()
 				var/obj/item/weldingtool/WT = W
 				if (WT.remove_fuel(0,user))
 					user.visible_message("[user] dissassembles the windoor assembly.", "You start to dissassemble the windoor assembly.")
-					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+					playsound(src.loc, 'sound/items/welder_pry.ogg', 50, 1)
 
 					if(do_after(user, 40/W.toolspeed))
 						if(!src || !WT.isOn()) return
@@ -152,7 +152,7 @@ obj/structure/windoor_assembly/Destroy()
 
 			//Removing wire from the assembly. Step 5 undone.
 			if(W.iswirecutter() && !src.electronics)
-				playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+				playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 				user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
 
 				if(do_after(user, 40/W.toolspeed))
@@ -170,7 +170,7 @@ obj/structure/windoor_assembly/Destroy()
 			else if(istype(W, /obj/item/airlock_electronics) && W:icon_state != "door_electronics_smoked")
 				var/obj/item/airlock_electronics/EL = W
 				if(!EL.is_installed)
-					playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+					playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
 					user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
 					EL.is_installed = 1
 					if(do_after(user, 40))
@@ -205,7 +205,7 @@ obj/structure/windoor_assembly/Destroy()
 					to_chat(usr, "<span class='warning'>The assembly is missing electronics.</span>")
 					return
 				usr << browse(null, "window=windoor_access")
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+				playsound(src.loc, W.usesound, 100, 1)
 				user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame.")
 
 				if(do_after(user, 40/W.toolspeed))

code/game/objects/structures/window.dm

@@ -87,7 +87,7 @@
 	add_overlay(img)
 
 /obj/structure/window/proc/shatter(var/display_message = 1)
-	playsound(src, "shatter", 70, 1)
+	playsound(src, "glass_break", 70, 1)
 	if(display_message)
 		visible_message(SPAN_WARNING("\The [src] shatters!"))
 	if(dir == SOUTHWEST)

code/game/sound.dm

@@ -132,11 +132,21 @@ var/list/footstepfx = list(
 	"sand"
 	)
 
-var/list/shatter_sound = list(
+var/list/glass_break_sound = list(
 	'sound/effects/glass_break1.ogg',
 	'sound/effects/glass_break2.ogg',
 	'sound/effects/glass_break3.ogg'
 )
+var/list/cardboard_break_sound = list(
+	'sound/effects/cardboard_break1.ogg',
+	'sound/effects/cardboard_break2.ogg',
+	'sound/effects/cardboard_break3.ogg',
+)
+var/list/wood_break_sound = list(
+	'sound/effects/wood_break1.ogg',
+	'sound/effects/wood_break2.ogg',
+	'sound/effects/wood_break3.ogg',
+)
 var/list/explosion_sound = list(
 	'sound/effects/Explosion1.ogg',
 	'sound/effects/Explosion2.ogg'
@@ -160,6 +170,10 @@ var/list/punch_sound = list(
 	'sound/weapons/punch3.ogg',
 	'sound/weapons/punch4.ogg'
 )
+var/list/punchmiss_sound = list(
+	'sound/weapons/punchmiss1.ogg',
+	'sound/weapons/punchmiss2.ogg'
+)
 var/list/clown_sound = list(
 	'sound/effects/clownstep1.ogg',
 	'sound/effects/clownstep2.ogg'
@@ -206,39 +220,76 @@ var/list/switch_sound = list(
 	'sound/machines/switch4.ogg'
 )
 var/list/keyboard_sound = list(
-	'sound/machines/keyboard/keypress1.ogg',
+	'sound/machines/keyboard/keyboard1.ogg',
-	'sound/machines/keyboard/keypress2.ogg',
+	'sound/machines/keyboard/keyboard2.ogg',
-	'sound/machines/keyboard/keypress3.ogg',
+	'sound/machines/keyboard/keyboard3.ogg',
-	'sound/machines/keyboard/keypress4.ogg',
+	'sound/machines/keyboard/keyboard4.ogg',
-	'sound/machines/keyboard/keystroke1.ogg',
+	'sound/machines/keyboard/keyboard5.ogg'
-	'sound/machines/keyboard/keystroke2.ogg',
-	'sound/machines/keyboard/keystroke3.ogg',
-	'sound/machines/keyboard/keystroke4.ogg'
 )
 var/list/pickaxe_sound = list(
 	'sound/weapons/mine/pickaxe1.ogg',
 	'sound/weapons/mine/pickaxe2.ogg',
 	'sound/weapons/mine/pickaxe3.ogg',
 	'sound/weapons/mine/pickaxe4.ogg'
-	)
+)
 var/list/glasscrack_sound = list(
 	'sound/effects/glass_crack1.ogg',
 	'sound/effects/glass_crack2.ogg',
 	'sound/effects/glass_crack3.ogg',
 	'sound/effects/glass_crack4.ogg'
-	)
+)
 var/list/bodyfall_sound = list(
 	'sound/effects/bodyfall1.ogg',
 	'sound/effects/bodyfall2.ogg',
 	'sound/effects/bodyfall3.ogg',
 	'sound/effects/bodyfall4.ogg'
-	)
+)
-
 var/list/bodyfall_machine_sound = list(
 	'sound/effects/bodyfall_machine1.ogg',
-	'sound/effects/bodyfall_machine2.ogg',
+	'sound/effects/bodyfall_machine2.ogg'
-	)
+)
-
+var/list/bulletflyby_sound = list(
+	'sound/effects/bulletflyby1.ogg',
+	'sound/effects/bulletflyby2.ogg',
+	'sound/effects/bulletflyby3.ogg'
+)
+var/list/crowbar_sound = list(
+	'sound/items/crowbar1.ogg',
+	'sound/items/crowbar2.ogg',
+	'sound/items/crowbar3.ogg',
+	'sound/items/crowbar4.ogg'
+)
+var/list/casing_drop_sound = list(
+	'sound/items/drop/casing1.ogg',
+	'sound/items/drop/casing2.ogg',
+	'sound/items/drop/casing3.ogg',
+	'sound/items/drop/casing4.ogg',
+	'sound/items/drop/casing5.ogg'
+)
+var/list/drillhit_sound = list(
+	'sound/weapons/saw/drillhit1.ogg',
+	'sound/weapons/saw/drillhit2.ogg'
+)
+// drop/equip/pickup sounds if there are multiple.
+var/list/wield_generic_sound = list(
+	'sound/items/wield/wield_generic1.ogg',
+	'sound/items/wield/wield_generic2.ogg',
+	'sound/items/wield/wield_generic3.ogg'
+)
+var/list/sword_pickup_sound = list(
+	'sound/items/pickup/sword1.ogg',
+	'sound/items/pickup/sword2.ogg',
+	'sound/items/pickup/sword3.ogg'
+)
+var/list/sword_equip_sound = list(
+	'sound/items/equip/sword1.ogg',
+	'sound/items/equip/sword2.ogg'
+)
+// gunshots, if multiple.
+var/list/gauss_fire_sound = list(
+	'sound/weapons/gaussrifle1.ogg',
+	'sound/weapons/gaussrifle2.ogg'
+)
 //var/list/gun_sound = list('sound/weapons/gunshot/gunshot1.ogg', 'sound/weapons/gunshot/gunshot2.ogg','sound/weapons/gunshot/gunshot3.ogg','sound/weapons/gunshot/gunshot4.ogg')
 
 /proc/playsound(atom/source, soundin, vol, vary, extrarange, falloff, is_global, usepressure = 1, environment = -1, required_preferences = 0, required_asfx_toggles = 0)
@@ -441,12 +492,16 @@ var/list/bodyfall_machine_sound = list(
 			if ("lava") soundin = pick(lava_footstep)
 			if ("snow") soundin = pick(snow_footstep)
 			if ("sand") soundin = pick(sand_footstep)
+			// shatter sfx. mainly for materials
+			if ("glass_break") soundin = pick(glass_break_sound)
+			if ("cardboard_break") soundin = pick(cardboard_break_sound)
+			if ("wood_break") soundin = pick(wood_break_sound)
 			//misc
-			if ("shatter") soundin = pick(shatter_sound)
 			if ("explosion") soundin = pick(explosion_sound)
 			if ("sparks") soundin = pick(spark_sound)
 			if ("rustle") soundin = pick(rustle_sound)
 			if ("punch") soundin = pick(punch_sound)
+			if ("punchmiss") soundin = pick(punchmiss_sound)
 			if ("clownstep") soundin = pick(clown_sound)
 			if ("swing_hit") soundin = pick(swing_hit_sound)
 			if ("hiss") soundin = pick(hiss_sound)
@@ -460,4 +515,12 @@ var/list/bodyfall_machine_sound = list(
 			if ("pickaxe") soundin = pick(pickaxe_sound)
 			if ("bodyfall") soundin = pick(bodyfall_sound)
 			if ("bodyfall_machine") soundin = pick(bodyfall_machine_sound)
+			if ("bulletflyby") soundin = pick(bulletflyby_sound)
+			if ("crowbar") soundin = pick(crowbar_sound)
+			if ("casing_drop") soundin = pick(casing_drop_sound)
+			if ("drillhit") soundin = pick(drillhit_sound)
+			if ("wield_generic") soundin = pick(wield_generic_sound)
+			if ("equip_sword") soundin = pick(sword_equip_sound)
+			if ("pickup_sword") soundin = pick(sword_pickup_sound)
+			if ("gauss_fire") soundin = pick(gauss_fire_sound)
 	return soundin

code/game/turfs/simulated/floor_attackby.dm

@@ -16,14 +16,14 @@
 				make_plating(1)
 			else
 				return
-			playsound(src, 'sound/items/Crowbar.ogg', 80, 1)
+			playsound(src, C.usesound, 80, 1)
 			return
 		else if(C.isscrewdriver() && (flooring.flags & TURF_REMOVE_SCREWDRIVER))
 			if(broken || burnt)
 				return
 			to_chat(user, "<span class='notice'>You unscrew and remove the [flooring.descriptor].</span>")
 			make_plating(1)
-			playsound(src, 'sound/items/Screwdriver.ogg', 80, 1)
+			playsound(src, 'sound/items/screwdriver.ogg', 80, 1)
 			return
 		else if(C.iswrench() && (flooring.flags & TURF_REMOVE_WRENCH))
 			to_chat(user, "<span class='notice'>You unwrench and remove the [flooring.descriptor].</span>")
@@ -83,7 +83,7 @@
 				if(broken || burnt)
 					if(welder.remove_fuel(0,user))
 						to_chat(user, "<span class='notice'>You fix some dents on the broken plating.</span>")
-						playsound(src, 'sound/items/Welder.ogg', 80, 1)
+						playsound(src, 'sound/items/welder.ogg', 80, 1)
 						icon_state = "plating"
 						burnt = null
 						broken = null

code/game/turfs/simulated/shuttle_turfs.dm

@@ -33,7 +33,7 @@
 			var/obj/item/weldingtool/WT = W
 			if( WT.remove_fuel(0,user) )
 				to_chat(user, "<span class='notice'>You burn away the fungi with \the [WT].</span>")
-				playsound(src, 'sound/items/Welder.ogg', 10, 1)
+				playsound(src, 'sound/items/welder.ogg', 10, 1)
 				for(var/obj/effect/overlay/wallrot/WR in src)
 					qdel(WR)
 				return

code/game/turfs/simulated/wall_attacks.dm

@@ -53,7 +53,7 @@
 
 	if(!can_open)
 		to_chat(user, SPAN_NOTICE("You push the wall, but nothing happens."))
-		playsound(src, 'sound/weapons/Genhit.ogg', 25, TRUE)
+		playsound(src, 'sound/weapons/genhit.ogg', 25, TRUE)
 	else
 		toggle_open(user)
 	return FALSE
@@ -124,7 +124,7 @@
 			var/obj/item/weldingtool/WT = W
 			if(WT.remove_fuel(0,user))
 				to_chat(user, SPAN_NOTICE("You burn away the fungi with \the [WT]."))
-				playsound(src, 'sound/items/Welder.ogg', 10, 1)
+				playsound(src, 'sound/items/welder.ogg', 10, 1)
 				for(var/obj/effect/overlay/wallrot/WR in src)
 					qdel(WR)
 				return
@@ -165,7 +165,7 @@
 
 		if(WT.remove_fuel(0,user))
 			to_chat(user, SPAN_NOTICE("You start repairing the damage to [src]."))
-			playsound(src, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/welder.ogg', 100, 1)
 			if(do_after(user, max(5, damage / 5)) && WT && WT.isOn())
 				to_chat(user, SPAN_NOTICE("You finish repairing the damage to [src]."))
 				take_damage(-damage)
@@ -189,7 +189,7 @@
 				to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
 				return
 			dismantle_verb = "cutting"
-			dismantle_sound = 'sound/items/Welder.ogg'
+			dismantle_sound = 'sound/items/welder.ogg'
 			cut_delay *= 0.7
 		else if(istype(W, /obj/item/gun/energy/plasmacutter))
 			var/obj/item/gun/energy/plasmacutter/PC = W
@@ -296,7 +296,7 @@
 					cut_cover = 1
 				if(cut_cover)
 					to_chat(user, SPAN_NOTICE("You begin slicing through the metal cover."))
-					playsound(src, 'sound/items/Welder.ogg', 100, 1)
+					playsound(src, 'sound/items/welder.ogg', 100, 1)
 					if(!do_after(user, 60/W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 4)
 						return
 					construction_stage = 3
@@ -306,7 +306,7 @@
 			if(3)
 				if (W.iscrowbar())
 					to_chat(user, SPAN_NOTICE("You struggle to pry off the cover."))
-					playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
+					playsound(src, W.usesound, 100, 1)
 					if(!do_after(user,100/W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 3)
 						return
 					construction_stage = 2
@@ -336,7 +336,7 @@
 					cut_cover = 1
 				if(cut_cover)
 					to_chat(user, SPAN_NOTICE("You begin slicing through the support rods."))
-					playsound(src, 'sound/items/Welder.ogg', 100, 1)
+					playsound(src, 'sound/items/welder.ogg', 100, 1)
 					if(!do_after(user,70/W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 1)
 						return
 					construction_stage = 0
@@ -347,7 +347,7 @@
 			if(0)
 				if(W.iscrowbar())
 					to_chat(user, SPAN_NOTICE("You struggle to pry off the outer sheath."))
-					playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
+					playsound(src, W.usesound, 100, 1)
 					sleep(100)
 					if(!istype(src, /turf/simulated/wall) || !user || !W || !T )	return
 					if(user.loc == T && user.get_active_hand() == W )

code/game/turfs/simulated/walls.dm

@@ -173,7 +173,7 @@
 
 /turf/simulated/wall/proc/dismantle_wall(var/devastated, var/explode, var/no_product, var/no_change = FALSE)
 	if (!no_change)	// No change is TRUE when this is called by destroy.
-		playsound(src, 'sound/items/Welder.ogg', 100, 1)
+		playsound(src, 'sound/items/welder.ogg', 100, 1)
 
 	if(!no_product)
 		if(reinf_material)

code/game/turfs/space/space.dm

@@ -83,7 +83,7 @@
 		var/obj/item/stack/rods/R = C
 		if (R.use(1))
 			to_chat(user, "<span class='notice'>Constructing support lattice ...</span>")
-			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+			playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
 			ReplaceWithLattice()
 		return
 
@@ -94,7 +94,7 @@
 			if (S.get_amount() < 1)
 				return
 			qdel(L)
-			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+			playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
 			S.use(1)
 			ChangeTurf(/turf/simulated/floor/airless, keep_air = TRUE)
 			return

code/global.dm

@@ -134,8 +134,8 @@ var/static/list/scarySounds = list(
 	'sound/effects/glass_break1.ogg',
 	'sound/effects/glass_break2.ogg',
 	'sound/effects/glass_break3.ogg',
-	'sound/items/Welder.ogg',
+	'sound/items/welder.ogg',
-	'sound/items/Welder2.ogg',
+	'sound/items/welder_pry.ogg',
 	'sound/machines/airlock.ogg',
 	'sound/effects/clownstep1.ogg',
 	'sound/effects/clownstep2.ogg'

code/modules/blob/blob.dm

@@ -244,7 +244,7 @@
 		if("fire")
 			damage = (W.force / fire_resist)
 			if(W.iswelder())
-				playsound(loc, 'sound/items/Welder.ogg', 100, 1)
+				playsound(loc, 'sound/items/welder.ogg', 100, 1)
 		if("brute")
 			if(prob(30) && !issilicon(user))
 				visible_message("<span class='danger'>\The [W] gets caught in the gelatinous folds of \the [src]</span>")

code/modules/cargo/bounties/engineer.dm

@@ -151,4 +151,4 @@
 	reward_high = 6200
 	required_count = 2
 	random_count = 1
-	wanted_types = list(/obj/machinery/power/port_gen/pacman)
+	wanted_types = list(/obj/machinery/power/port_gen/pacman)

code/modules/clothing/clothing.dm

@@ -197,7 +197,7 @@
 			var/obj/item/material/shard/S = material.place_shard(T)
 			M.embed(S)
 
-	playsound(src.loc, "shatter", 70, 1)
+	playsound(src.loc, "glass_break", 70, 1)
 	qdel(src)
 
 /obj/item/clothing/suit/armor/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
@@ -379,7 +379,7 @@
 			update_icon()
 			return
 
-		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 		user.visible_message("<span class='warning'>[user] cuts the fingertips off of \the [src].</span>","<span class='warning'>You cut the fingertips off of \the [src].</span>")
 
 		clipped = 1
@@ -689,7 +689,7 @@
 	if(usr.put_in_hands(holding))
 		usr.visible_message("<span class='danger'>\The [usr] pulls \a [holding] out of their boot!</span>")
 		holding = null
-		playsound(get_turf(src), 'sound/weapons/holster/sheathout.ogg', 25)
+		playsound(get_turf(src), 'sound/weapons/holster/unholster_knife.ogg', 25)
 	else
 		to_chat(usr, "<span class='warning'>Your need an empty, unbroken hand to do that.</span>")
 		holding.forceMove(src)

code/modules/clothing/gloves/miscellaneous.dm

@@ -209,7 +209,7 @@
 			user.visible_message(SPAN_NOTICE("[user] screws the cover of the [src] closed."), SPAN_NOTICE("You screw the cover of the [src] closed."))
 			clipped = 0
 			return
-//		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+//		playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
 		user.visible_message(SPAN_NOTICE("[user] unscrews the cover of the [src]."), SPAN_NOTICE("You unscrew the cover of the [src]."))
 		clipped = 1
 		return
@@ -331,7 +331,7 @@
 	punch_force = 5
 	clipped = 1
 	drop_sound = 'sound/items/drop/sword.ogg'
-	pickup_sound = 'sound/items/pickup/sword.ogg'
+	pickup_sound = "pickup_sword"
 
 /obj/item/clothing/gloves/powerfist
 	name = "power fist"

code/modules/clothing/spacesuits/rig/rig_construction.dm

@@ -29,7 +29,7 @@
 	..()
 	construct = new /datum/construction/reversible/rig_assembly/combat(src)
 	construct.board_type = board_type
-	construct.target_board_type = target_board_type	
+	construct.target_board_type = target_board_type
 	construct.steps[12]["key"] = board_type // defining board in construction step
 	construct.steps[10]["key"] = target_board_type
 	construct.result = "[rig_type]"
@@ -141,17 +141,17 @@
 	if(I.iswelder())
 		var/obj/item/weldingtool/W = I
 		if (W.remove_fuel(0, user))
-			playsound(holder, 'sound/items/Welder2.ogg', 50, 1)
+			playsound(holder, 'sound/items/welder_pry.ogg', 50, 1)
 		else
 			return 0
 	else if(I.iswrench())
-		playsound(holder, 'sound/items/Ratchet.ogg', 50, 1)
+		playsound(holder, I.usesound, 50, 1)
 
 	else if(I.isscrewdriver())
-		playsound(holder, 'sound/items/Screwdriver.ogg', 50, 1)
+		playsound(holder, I.usesound, 50, 1)
 
 	else if(I.iswirecutter())
-		playsound(holder, 'sound/items/Wirecutter.ogg', 50, 1)
+		playsound(holder, I.usesound, 50, 1)
 
 	else if(I.iscoil())
 		var/obj/item/stack/cable_coil/C = used_atom
@@ -333,7 +333,7 @@
 		return 0
 
 	switch(index)
-		
+
 		if(14)
 			if(diff==FORWARD)
 				user.visible_message("[user] adds the wiring to [holder].", "You add the wiring to [holder].")

code/modules/clothing/spacesuits/void/void.dm

@@ -230,7 +230,7 @@
 			var/choice = input("What component would you like to remove?") as null|anything in list(helmet,boots,tank)
 			if(!choice) return
 
-			playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
+			playsound(src, 'sound/items/screwdriver.ogg', 50, 1)
 			if(choice == tank)	//No, a switch doesn't work here. Sorry. ~Techhead
 				to_chat(user, "You pop \the [tank] out of \the [src]'s storage compartment.")
 				tank.forceMove(get_turf(src))
@@ -247,7 +247,7 @@
 			to_chat(user, "\The [src] does not have anything installed.")
 		return
 	else if(istype(W,/obj/item/clothing/head/helmet/space))
-		if(helmet)	
+		if(helmet)
 			to_chat(user, "\The [src] already has a helmet installed.")
 		else
 			playsound(src, 'sound/items/Deconstruct.ogg', 30, 1)

code/modules/custom_ka/core.dm

@@ -445,7 +445,7 @@
 			installed_cell.forceMove(src)
 			update_stats()
 			update_icon()
-			playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
+			playsound(src,'sound/items/wirecutter.ogg', 50, 0)
 	else if(istype(I,/obj/item/custom_ka_upgrade/barrels))
 		if(!installed_cell)
 			to_chat(user,"You must install a power cell before installing \the [I].")
@@ -458,7 +458,7 @@
 			installed_barrel.forceMove(src)
 			update_stats()
 			update_icon()
-			playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
+			playsound(src,'sound/items/wirecutter.ogg', 50, 0)
 	else if(istype(I,/obj/item/custom_ka_upgrade/upgrade_chips))
 		if(!installed_cell || !installed_barrel)
 			to_chat(user,"A barrel and a cell need to be installed before you install \the [I].")
@@ -475,7 +475,7 @@
 			installed_upgrade_chip.forceMove(src)
 			update_stats()
 			update_icon()
-			playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
+			playsound(src,'sound/items/wirecutter.ogg', 50, 0)
 
 	if(installed_cell)
 		installed_cell.attackby(I,user)
@@ -593,4 +593,4 @@
 	else
 		to_chat(user,"<span class='notice'>Nothing happens.</span>")
 
-	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
+	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)

code/modules/hallucinations/types/sound.dm

@@ -21,20 +21,18 @@
 			'sound/misc/nymphchirp.ogg',
 			'sound/machines/twobeep.ogg',
 			'sound/machines/windowdoor.ogg',
-			'sound/effects/glass_break1.ogg',
+			"glass_break",
 			'sound/weapons/railgun.ogg',
 			'sound/effects/phasein.ogg',
-			'sound/effects/sparks1.ogg',
+			"sparks",
-			'sound/effects/sparks2.ogg',
-			'sound/effects/sparks3.ogg',
 			'sound/effects/stealthoff.ogg',
 			'sound/misc/zapsplat/chitter1.ogg',
 			'sound/misc/zapsplat/chitter2.ogg',
 			'sound/effects/squelch1.ogg',
-			'sound/items/Ratchet.ogg',
+			'sound/items/wrench.ogg',
-			'sound/items/Welder.ogg',
+			'sound/items/welder.ogg',
-			'sound/items/Crowbar.ogg',
+			"crowbar",
-			'sound/items/Screwdriver.ogg',
+			'sound/items/screwdriver.ogg',
 			'sound/items/drill_use.ogg',
 			'sound/items/air_wrench.ogg')
 
@@ -102,4 +100,4 @@
 			to_chat(holder, SPAN_DANGER("You feel numb as a shock courses through your body!")) //phantom pain reaction to audio
 			holder.adjustHalLoss(20)
 			if(prob(holder.hallucination))
-				holder.eye_blind += 4
+				holder.eye_blind += 4

code/modules/heavy_vehicle/components/_components.dm

@@ -129,7 +129,7 @@
 		if(brute_damage)
 			repair_brute_damage(repair_value)
 			to_chat(user, "<span class='notice'>You mend the damage to \the [src].</span>")
-			playsound(user.loc, 'sound/items/Welder.ogg', 25, 1)
+			playsound(user.loc, 'sound/items/welder.ogg', 25, 1)
 
 /obj/item/mech_component/proc/repair_burn_generic(var/obj/item/stack/cable_coil/CC, var/mob/user)
 	if(!istype(CC))

code/modules/heavy_vehicle/components/frame.dm

@@ -141,7 +141,7 @@
 		// We're all done. Finalize the mech and pass the frame to the new system.
 		var/mob/living/heavy_vehicle/M = new(get_turf(src), src)
 		visible_message("\The [user] finishes off \the [M].")
-		playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+		playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
 
 		arms = null
 		legs = null
@@ -182,7 +182,7 @@
 			return
 
 		visible_message("\The [user] [(is_wired == FRAME_WIRED_ADJUSTED) ? "snips some of" : "neatens"] the wiring in \the [src].")
-		playsound(user.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		playsound(user.loc, thing.usesound, 100, 1)
 		is_wired = (is_wired == FRAME_WIRED_ADJUSTED) ? FRAME_WIRED : FRAME_WIRED_ADJUSTED
 	// Installing metal.
 	else if(istype(thing, /obj/item/stack/material))
@@ -209,7 +209,7 @@
 			to_chat(user, "<span class='warning'>\The [src]'s internal reinforcement has been welded in.</span>")
 			return
 		visible_message("\The [user] [(is_reinforced == 2) ? "unsecures" : "secures"] the metal reinforcement in \the [src].")
-		playsound(user.loc, 'sound/items/Ratchet.ogg', 100, 1)
+		playsound(user.loc, thing.usesound, 100, 1)
 		is_reinforced = (is_reinforced == FRAME_REINFORCED_SECURE) ? FRAME_REINFORCED : FRAME_REINFORCED_SECURE
 	// Welding metal.
 	else if(thing.iswelder())
@@ -226,7 +226,7 @@
 		if(WT.remove_fuel(1, user))
 			visible_message("\The [user] [(is_reinforced == 3) ? "unwelds the reinforcement from" : "welds the reinforcement into"] \the [src].")
 			is_reinforced = (is_reinforced == FRAME_REINFORCED_WELDED) ? FRAME_REINFORCED_SECURE : FRAME_REINFORCED_WELDED
-			playsound(user.loc, 'sound/items/Welder.ogg', 50, 1)
+			playsound(user.loc, thing.usesound, 50, 1)
 		else
 			to_chat(user, "<span class='warning'>Not enough fuel!</span>")
 			return
@@ -290,4 +290,4 @@
 	component.forceMove(get_turf(src))
 	user.put_in_hands(component)
 	playsound(user.loc, 'sound/items/Deconstruct.ogg', 50, 1)
-	return TRUE
+	return TRUE

code/modules/heavy_vehicle/mech_construction.dm

@@ -71,7 +71,7 @@
 
 			if(user.unEquip(system))
 				to_chat(user, "<span class='notice'>You install \the [system] in \the [src]'s [system_hardpoint].</span>")
-				playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+				playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
 			else return FALSE
 	var/obj/item/mecha_equipment/ME = system
 	if(istype(ME))
@@ -147,6 +147,6 @@
 		system.forceMove(get_turf(user))
 		user.put_in_hands(system)
 		to_chat(user, "<span class='notice'>You remove \the [system] in \the [src]'s [system_hardpoint].</span>")
-		playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+		playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
 
-	return 1
+	return 1

code/modules/heavy_vehicle/mech_interaction.dm

@@ -47,7 +47,7 @@
 				selected_system.attack_self(user)
 				setClickCooldown(5)
 			return
-	
+
 	if(modifiers["ctrl"])
 		if(selected_system)
 			if(selected_system == A)
@@ -451,7 +451,7 @@
 
 				user.put_in_hands(body.cell)
 				to_chat(user, "<span class='notice'>You remove \the [body.cell] from \the [src].</span>")
-				playsound(user.loc, 'sound/items/Crowbar.ogg', 50, 1)
+				playsound(user.loc, thing.usesound, 50, 1)
 				visible_message("<span class='notice'>\The [user] pries out \the [body.cell] using the \the [thing].</span>")
 				body.cell = null
 				return
@@ -467,7 +467,7 @@
 					thing.forceMove(body)
 					body.cell = thing
 					to_chat(user, "<span class='notice'>You install \the [body.cell] into \the [src].</span>")
-					playsound(user.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+					playsound(user.loc, 'sound/items/screwdriver.ogg', 50, 1)
 					visible_message("<span class='notice'>\The [user] installs \the [body.cell] into \the [src].</span>")
 				return
 			else if(istype(thing, /obj/item/device/robotanalyzer))

code/modules/holodeck/HolodeckObjects.dm

@@ -183,7 +183,7 @@
 	return
 
 /obj/structure/window/reinforced/holowindow/shatter(var/display_message = 1)
-	playsound(src, "shatter", 70, 1)
+	playsound(src, "glass_break", 70, 1)
 	if(display_message)
 		visible_message("[src] fades away as it shatters!")
 	qdel(src)
@@ -225,7 +225,7 @@
 
 /obj/machinery/door/window/holowindoor/shatter(var/display_message = 1)
 	src.density = 0
-	playsound(src, "shatter", 70, 1)
+	playsound(src, "glass_break", 70, 1)
 	if(display_message)
 		visible_message("[src] fades away as it shatters!")
 	qdel(src)

code/modules/integrated_electronics/core/assemblies.dm

@@ -141,7 +141,7 @@
 		else
 			var/turf/T = get_turf(src)
 			battery.forceMove(T)
-			playsound(T, 'sound/items/Crowbar.ogg', 50, 1)
+			playsound(T, 'sound/items/crowbar_pry.ogg', 50, 1)
 			to_chat(usr, "<span class='notice'>You pull \the [battery] out of \the [src]'s power supply.</span>")
 			battery = null
 
@@ -247,7 +247,7 @@
 			return TRUE
 
 	else if(I.iswrench() && can_anchor)
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		playsound(src.loc, I.usesound, 50, 1)
 		anchored = !anchored
 		if(anchored)
 			on_anchored()
@@ -257,7 +257,7 @@
 		return TRUE
 
 	else if(I.iscrowbar())
-		playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+		playsound(get_turf(src), I.usesound, 50, 1)
 		opened = !opened
 		to_chat(user, "<span class='notice'>You [opened ? "open" : "close"] \the [src].</span>")
 		update_icon()
@@ -357,4 +357,4 @@
 
 /obj/item/device/electronic_assembly/proc/on_unanchored()
 	for(var/obj/item/integrated_circuit/IC in contents)
-		IC.on_unanchored()
+		IC.on_unanchored()

code/modules/integrated_electronics/core/device.dm

@@ -20,7 +20,7 @@
 		..()
 
 /obj/item/device/assembly/electronic_assembly/proc/toggle_open(mob/user)
-	playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
+	playsound(get_turf(src), 'sound/items/crowbar_pry.ogg', 50, 1)
 	opened = !opened
 	EA.opened = opened
 	to_chat(user, "<span class='notice'>You [opened ? "open" : "close"] \the [src].</span>")