Additional sounds

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

@@ -85,6 +85,7 @@
 					M << "[user] activates the power sink!"
 				mode = 2
 				icon_state = "powersink1"
+				playsound(get_turf(src), 'sound/effects/phasein.ogg', 30, 1)
 				processing_objects.Add(src)
 
 			if(2)  //This switch option wasn't originally included. It exists now. --NeoFite
@@ -95,6 +96,7 @@
 				mode = 1
 				SetLuminosity(0)
 				icon_state = "powersink0"
+				playsound(get_turf(src), 'sound/effects/teleport.ogg', 50, 1)
 				processing_objects.Remove(src)
 
 	process()

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

@@ -16,7 +16,7 @@
 
 	suicide_act(mob/user)
 		viewers(user) << "\red <b>[user] is putting the live paddles on \his chest! It looks like \he's trying to commit suicide.</b>"
-		playsound(get_turf(src), 'sound/items/defib.ogg', 50, 1, -1)
+		playsound(get_turf(src), 'sound/items/defib.ogg', 50, 1)
 		return (OXYLOSS)
 
 /obj/item/weapon/melee/defibrillator/update_icon()
@@ -98,7 +98,7 @@
 			if(!charges)
 				status = 0
 			update_icon()
-			playsound(get_turf(src), 'sound/items/defib.ogg', 50, 1, -1)
+			playsound(get_turf(src), 'sound/items/defib.ogg', 50, 1)
 			user.attack_log += "\[[time_stamp()]\]<font color='red'> Defibrillated [H.name] ([H.ckey]) with [src.name]</font>"
 			H.attack_log += "\[[time_stamp()]\]<font color='orange'> Defibrillated by [user.name] ([user.ckey]) with [src.name]</font>"
 			log_attack("<font color='red'>[user.name] ([user.ckey]) defibrillated [H.name] ([H.ckey]) with [src.name]</font>" )

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

@@ -3,6 +3,7 @@
 	name = "mop"
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "mop"
+	hitsound = "sound/weapons/whip.ogg"
 	force = 3.0
 	throwforce = 10.0
 	throw_speed = 5

code/modules/detectivework/detective_scanner.dm

@@ -126,6 +126,7 @@
 		//PRINTS
 		if(fingerprints_found.len>0)
 			user << "\blue Isolated [fingerprints_found.len] fingerprints: Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+			playsound(get_turf(src), 'sound/items/detscan.ogg', 50, 1)
 
 			var/list/complete_prints = list()
 			for(var/i in fingerprints_found)
@@ -143,6 +144,7 @@
 		//FIBERS
 		if(fibers_found.len)
 			user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+			playsound(get_turf(src), 'sound/items/detscan.ogg', 50, 1)
 
 		//Blood
 		if (blood_DNA_found.len)

code/modules/supermatter/supermatter.dm

@@ -228,7 +228,9 @@
 /obj/machinery/power/supermatter/attack_hand(mob/user as mob)
 	user.visible_message("<span class=\"warning\">\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.</span>",\
 		"<span class=\"danger\">You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"</span>",\
-		"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
+		"<span class=\"warning\">You hear an unearthly noise as a wave of heat washes over you.</span>")
+
+	playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
 
 	Consume(user)
 
@@ -243,6 +245,8 @@
 		"<span class=\"danger\">You touch \the [W] to \the [src] when everything suddenly goes silent.\"</span>\n<span class=\"notice\">\The [W] flashes into dust as you flinch away from \the [src].</span>",\
 		"<span class=\"warning\">Everything suddenly goes silent.</span>")
 
+	playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
+
 	user.drop_from_inventory(W)
 	Consume(W)
 
@@ -253,11 +257,13 @@
 	if(istype(AM, /mob/living))
 		AM.visible_message("<span class=\"warning\">\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.</span>",\
 		"<span class=\"danger\">You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"</span>",\
-		"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
+		"<span class=\"warning\">You hear an unearthly noise as a wave of heat washes over you.</span>")
 	else
 		AM.visible_message("<span class=\"warning\">\The [AM] smacks into \the [src] and rapidly flashes to ash.</span>",\
 		"<span class=\"warning\">You hear a loud crack as you are washed with a wave of heat.</span>")
 
+	playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
+
 	Consume(AM)