Sound Updates

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

@@ -118,11 +118,11 @@
 	if(safety)
 		safety = 0
 		src.visible_message("<span class='notice'>[src] beeps: Safety protocols disabled!</span>")
-		playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+		playsound(get_turf(src), 'sound/machines/defib_saftyOff.ogg', 50, 0)
 	else
 		safety = 1
 		src.visible_message("<span class='notice'>[src] beeps: Safety protocols enabled!</span>")
-		playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+		playsound(get_turf(src), 'sound/machines/defib_saftyOn.ogg', 50, 0)
 	update_icon()
 	..()
 
@@ -187,14 +187,14 @@
 		if(bcell)
 			if(bcell.charge >= paddles.revivecost)
 				user.visible_message("<span class='notice'>[src] beeps: Unit ready.</span>")
-				playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+				playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0)
 			else
 				user.visible_message("<span class='notice'>[src] beeps: Charge depleted.</span>")
-				playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+				playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
 		paddles.cooldown = 0
 		paddles.update_icon()
 		update_icon()
-		
+
 /obj/item/weapon/defibrillator/compact
 	name = "compact defibrillator"
 	desc = "A belt-equipped defibrillator that can be rapidly deployed."
@@ -274,7 +274,7 @@
 /obj/item/weapon/twohanded/shockpaddles/suicide_act(mob/user)
 	user.visible_message("<span class='danger'>[user] is putting the live paddles on \his chest! It looks like \he's trying to commit suicide.</span>")
 	defib.deductcharge(revivecost)
-	playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+	playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
 	return (OXYLOSS)
 
 /obj/item/weapon/twohanded/shockpaddles/dropped(mob/user as mob)
@@ -305,7 +305,7 @@
 		return
 	if(!defib.powered)
 		user.visible_message("<span class='notice'>[defib] beeps: Unit is unpowered.</span>")
-		playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+		playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
 		return
 	if(!wielded)
 		user << "<span class='boldnotice'>You need to wield the paddles in both hands before you can use them on someone!</span>"
@@ -324,7 +324,7 @@
 			H.adjustStaminaLoss(50)
 			H.Weaken(5)
 			H.updatehealth() //forces health update before next life tick
-			playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+			playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
 			H.emote("gasp")
 			add_logs(user, M, "stunned", object="defibrillator")
 			defib.deductcharge(revivecost)
@@ -339,7 +339,7 @@
 			update_icon()
 			if(do_after(user, 30)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
 				user.visible_message("<span class='notice'>[user] places [src] on [M.name]'s chest.</span>", "<span class='warning'>You place [src] on [M.name]'s chest.</span>")
-				playsound(get_turf(src), 'sound/weapons/flash.ogg', 50, 0)
+				playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
 				var/mob/dead/observer/ghost = H.get_ghost()
 				var/tplus = world.time - H.timeofdeath
 				var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
@@ -351,7 +351,7 @@
 						if(istype(carried_item, /obj/item/clothing/suit/space))
 							if(!defib.combat)
 								user.visible_message("<span class='notice'>[defib] buzzes: Patient's chest is obscured. Operation aborted.</span>")
-								playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
+								playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
 								busy = 0
 								update_icon()
 								return
@@ -359,7 +359,7 @@
 						var/health = H.health
 						M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
 						playsound(get_turf(src), "bodyfall", 50, 1)
-						playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+						playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
 						for(var/datum/organ/external/O in H.organs)
 							total_brute	+= O.brute_dam
 							total_burn	+= O.burn_dam
@@ -371,7 +371,7 @@
 							H.adjustFireLoss(tobehealed)
 							H.adjustBruteLoss(tobehealed)
 							user.visible_message("<span class='boldnotice'>[defib] pings: Resuscitation successful.</span>")
-							playsound(get_turf(src), 'sound/machines/ping.ogg', 50, 0)
+							playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
 							H.stat = 1
 							H.update_revive()
 							H.emote("gasp")
@@ -389,14 +389,14 @@
 								if(ghost)
 									ghost << "<span class='ghostalert'>Your heart is being defibrillated. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)"
 									ghost << sound('sound/effects/genetics.ogg')
-							playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 0)
+							playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
 							defib.deductcharge(revivecost)
 						update_icon()
 						cooldown = 1
 						defib.cooldowncheck(user)
 					else
 						user.visible_message("<span class='notice'>[defib] buzzes: Patient is not in a valid state. Operation aborted.</span>")
-						playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
+						playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
 			busy = 0
 			update_icon()
 		else

code/modules/admin/verbs/onlyone.dm

@@ -51,5 +51,4 @@
 
 	message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
 	nologevent = 1
-	log_admin("[key_name(usr)] used there can be only one.")
-	world << sound('sound/music/highlander.ogg')
+	log_admin("[key_name(usr)] used there can be only one.")

code/modules/admin/verbs/onlyoneteam.dm

@@ -58,7 +58,6 @@
 	message_admins("\blue [key_name_admin(usr)] used DODGEBAWWWWWWWL! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
 	nologevent = 1
 	log_admin("[key_name(usr)] used dodgeball.")
-	world << sound('sound/music/nowyouman.ogg')
 
 /obj/item/weapon/beach_ball/dodgeball
 	name = "dodgeball"

code/modules/mining/mine_items.dm

@@ -55,19 +55,22 @@
 	flags = FPRINT | TABLEPASS| CONDUCT
 	slot_flags = SLOT_BELT
 	force = 15.0
-	throwforce = 4.0
+	throwforce = 10.0
 	item_state = "pickaxe"
 	w_class = 4.0
 	m_amt = 3750 //one sheet, but where can you make them?
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
-	var/drill_sound = 'sound/weapons/Genhit.ogg'
+	var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
 	var/drill_verb = "picking"
 	sharp = 1
 
 	var/excavation_amount = 100
 
+	proc/playDigSound()
+		playsound(src, pick(digsound),20,1)
+
 	hammer
 		name = "sledgehammer"
 		//icon_state = "sledgehammer" Waiting on sprite
@@ -86,6 +89,8 @@
 		icon_state = "handdrill"
 		item_state = "jackhammer"
 		digspeed = 30
+		hitsound = 'sound/weapons/drill.ogg'
+		digsound = list('sound/weapons/drill.ogg')
 		origin_tech = "materials=2;powerstorage=3;engineering=2"
 		desc = "Yours is the drill that will pierce through the rock walls."
 
@@ -94,6 +99,8 @@
 		icon_state = "jackhammer"
 		item_state = "jackhammer"
 		digspeed = 15 //faster than drill, but cannot dig
+		hitsound = 'sound/weapons/sonic_jackhammer.ogg'
+		digsound = list('sound/weapons/sonic_jackhammer.ogg')
 		origin_tech = "materials=3;powerstorage=2;engineering=2"
 		desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
 
@@ -112,6 +119,8 @@
 		w_class = 3.0 //it is smaller than the pickaxe
 		damtype = "fire"
 		digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
+		hitsound = 'sound/weapons/plasma_cutter.ogg'
+		digsound = list('sound/weapons/plasma_cutter.ogg')
 		origin_tech = "materials=4;plasmatech=3;engineering=3"
 		desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 
@@ -129,6 +138,8 @@
 		item_state = "jackhammer"
 		digspeed = 5 //Digs through walls, girders, and can dig up sand
 		origin_tech = "materials=6;powerstorage=4;engineering=5"
+		hitsound = 'sound/weapons/drill.ogg'
+		digsound = list('sound/weapons/drill.ogg')
 		desc = "Yours is the drill that will pierce the heavens!"
 
 		traitor //Pocket-sized traitor diamond drill.
@@ -143,6 +154,8 @@
 		icon_state = "jackhammer"
 		item_state = "jackhammer"
 		digspeed = 15
+		hitsound = 'sound/weapons/drill.ogg'
+		digsound = list('sound/weapons/drill.ogg')
 		desc = ""
 
 /*****************************Shovel********************************/

code/modules/mining/mine_turfs.dm

@@ -137,7 +137,7 @@
 				return
 			last_act = world.time
 
-			playsound(user, P.drill_sound, 20, 1)
+			P.playDigSound()
 
 			//handle any archaeological finds we might uncover
 			var/fail_message

code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm

@@ -10,7 +10,7 @@
 	digspeed = 20
 	desc = "Thick metallic wires for clearing away dust and loose scree (1 centimetre excavation depth)."
 	excavation_amount = 0.5
-	drill_sound = 'sound/weapons/thudswoosh.ogg'
+	digsound = list('sound/weapons/thudswoosh.ogg')
 	drill_verb = "brushing"
 	w_class = 2
 
@@ -22,7 +22,7 @@
 	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
 	excavation_amount = 1
-	drill_sound = 'sound/items/Screwdriver.ogg'
+	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
 	w_class = 2
 
@@ -34,7 +34,7 @@
 	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
 	excavation_amount = 2
-	drill_sound = 'sound/items/Screwdriver.ogg'
+	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
 	w_class = 2
 
@@ -46,7 +46,7 @@
 	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
 	excavation_amount = 3
-	drill_sound = 'sound/items/Screwdriver.ogg'
+	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
 	w_class = 2
 
@@ -58,7 +58,7 @@
 	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
 	excavation_amount = 4
-	drill_sound = 'sound/items/Screwdriver.ogg'
+	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
 	w_class = 2
 
@@ -70,7 +70,7 @@
 	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
 	excavation_amount = 5
-	drill_sound = 'sound/items/Screwdriver.ogg'
+	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
 	w_class = 2
 
@@ -82,7 +82,7 @@
 	digspeed = 20
 	desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
 	excavation_amount = 6
-	drill_sound = 'sound/items/Screwdriver.ogg'
+	digsound = list('sound/items/Screwdriver.ogg')
 	drill_verb = "delicately picking"
 	w_class = 2
 
@@ -94,7 +94,7 @@
 	digspeed = 30
 	desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)."
 	excavation_amount = 15
-	drill_sound = 'sound/items/Crowbar.ogg'
+	digsound = list('sound/items/Crowbar.ogg')
 	drill_verb = "clearing"
 	w_class = 3