adds new sounds (the not stupid version) (#6307)

code/game/objects/structures/bedsheet_bin.dm

@@ -15,6 +15,7 @@ LINEN BINS
 	throw_speed = 1
 	throw_range = 2
 	w_class = 2.0
+	drop_sound = 'sound/items/drop/clothing.ogg'
 
 /obj/item/weapon/bedsheet/attack_self(mob/user as mob)
 	user.drop_item()

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

@@ -42,7 +42,7 @@
 		if(istype(W, /obj/item/weapon/melee/energy/blade))//Attempt to cut open locker if locked
 			if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
 				spark(src, 5)
-				playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
+				playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
 				playsound(loc, "sparks", 50, 1)
 		else
 			togglelock(user)//Attempt to lock locker if closed

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

@@ -79,7 +79,7 @@
 	else if(istype(W, /obj/item/weapon/melee/energy/blade))
 		if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying."))
 			W:spark_system.queue()
-			playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
 			playsound(loc, "sparks", 50, 1)
 	else
 		to_chat(user, "<span class='warning'>Access Denied</span>")

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

@@ -161,7 +161,7 @@
 		else if(istype(W, /obj/item/weapon/melee/energy/blade))//Attempt to cut open locker if locked
 			if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
 				spark(src, 5)
-				playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
+				playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
 				playsound(loc, "sparks", 50, 1)
 		else if(W.iswelder())
 			var/obj/item/weapon/weldingtool/WT = W

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

@@ -373,7 +373,7 @@
 		if(istype(W, /obj/item/weapon/melee/energy/blade))//Attempt to cut open locker if locked
 			if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
 				spark(src, 5)
-				playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
+				playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
 				playsound(loc, "sparks", 50, 1)
 		else
 			togglelock(user)//Attempt to lock locker if closed

code/game/objects/structures/flora.dm

@@ -103,6 +103,7 @@
 	if(!ishuman(user))
 		return
 	user.visible_message("[user] begins digging around inside of \the [src].", "You begin digging around in \the [src], trying to hide \the [W].")
+	playsound(loc, 'sound/effects/plantshake.ogg', 50, 1)
 	if(do_after(user, 20, act_target = src))
 		if(!stored_item)
 			if(W.w_class <= ITEMSIZE_NORMAL)
@@ -120,6 +121,7 @@
 
 /obj/structure/flora/pottedplant/attack_hand(mob/user)
 	user.visible_message("[user] begins digging around inside of \the [src].", "You begin digging around in \the [src], searching it.")
+	playsound(loc, 'sound/effects/plantshake.ogg', 50, 1)
 	if(do_after(user, 40, act_target = src))
 		if(!stored_item)
 			to_chat(user,"<span class='notice'>There is nothing hidden in [src].</span>")

code/game/objects/structures/morgue.dm

@@ -66,9 +66,11 @@
 			if (!( A.anchored ))
 				A.forceMove(src)
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+		playsound(src, 'sound/effects/roll.ogg', 5, 1)
 		qdel(src.connected)
 		src.connected = null
 	else
+		playsound(src, 'sound/effects/roll.ogg', 5, 1)
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		src.connected = new /obj/structure/m_tray( src.loc )
 		step(src.connected, src.dir)

code/game/objects/structures/signs.dm

@@ -585,7 +585,7 @@
 		if(!do_after(user, 2 SECONDS, act_target = src))
 			return 0
 		visible_message("<span class='warning'>\The [user] burns \the [src] down!</span>")
-		playsound(src.loc, 'sound/items/zippo_on.ogg', 100, 1)
+		playsound(src.loc, 'sound/items/cigs_lighters/zippo_on.ogg', 100, 1)
 		new /obj/effect/decal/cleanable/ash(src.loc)
 
 		qdel(src)

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

@@ -258,6 +258,7 @@
 
 /obj/structure/bed/roller/Move()
 	..()
+	playsound(src, 'sound/effects/roll.ogg', 100, 1)
 	if(buckled_mob)
 		if(buckled_mob.buckled == src)
 			buckled_mob.forceMove(src.loc)

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

@@ -137,6 +137,7 @@
 
 /obj/structure/bed/chair/office/Move()
 	. = ..()
+	playsound(src, 'sound/effects/roll.ogg', 100, 1)
 	if(buckled_mob)
 		var/mob/living/occupant = buckled_mob
 		occupant.buckled = null

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

@@ -86,6 +86,8 @@
 
 /obj/structure/bed/chair/wheelchair/Move()
 	. = ..()
+	cut_overlays()
+	playsound(src, 'sound/effects/roll.ogg', 75, 1)
 	if(buckled_mob)
 		var/mob/living/occupant = buckled_mob
 		if(!driving)

code/game/objects/structures/watercloset.dm

@@ -141,10 +141,16 @@
 	var/mobpresent = 0		//true if there is a mob on the shower's loc, this is to ease process()
 	var/is_washing = 0
 	var/list/temperature_settings = list("normal" = 310, "boiling" = T0C+100, "freezing" = T0C)
+	var/datum/looping_sound/showering/soundloop
 
 /obj/machinery/shower/Initialize()
 	. = ..()
 	create_reagents(2)
+	soundloop = new(list(src), FALSE)
+
+/obj/machinery/shower/Destroy()
+	QDEL_NULL(soundloop)
+	return ..()
 
 //add heat controls? when emagged, you can freeze to death in it?
 
@@ -184,6 +190,7 @@
 		qdel(mymist)
 
 	if(on)
+		soundloop.start()
 		add_overlay(image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir))
 		if(temperature_settings[watertemp] < T20C)
 			return //no mist for cold water
@@ -193,6 +200,7 @@
 					ismist = 1
 					mymist = new /obj/effect/mist(loc)
 		else
+			soundloop.stop()
 			ismist = 1
 			mymist = new /obj/effect/mist(loc)
 	else if(ismist)
@@ -360,8 +368,6 @@
 	icon_state = "rubberducky"
 	item_state = "rubberducky"
 
-
-
 /obj/structure/sink
 	name = "sink"
 	icon = 'icons/obj/watercloset.dmi'
@@ -401,6 +407,7 @@
 		return
 
 	to_chat(usr, "<span class='notice'>You start washing your hands.</span>")
+	playsound(src.loc, 'sound/effects/sink_fill.ogg', 25, 1)
 
 	busy = 1
 	sleep(40)
@@ -413,7 +420,7 @@
 		user:update_inv_gloves()
 	for(var/mob/V in viewers(src, null))
 		V.show_message("<span class='notice'>[user] washes their hands using \the [src].</span>")
-
+		playsound(src.loc, 'sound/effects/sink_empty.ogg', 25, 1)
 
 /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
 	if(busy)
@@ -440,6 +447,7 @@
 				RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this))
 				to_chat(oviewers(3, usr), "<span class='notice'>[usr] fills \the [RG] using \the [src].</span>")
 				to_chat(usr, "<span class='notice'>You fill \the [RG] using \the [src].</span>")
+				playsound(src.loc, 'sound/effects/sink_fill.ogg', 25, 1)
 			if ("Empty")
 				if(!RG.reagents.total_volume)
 					to_chat(usr, "<span class='warning'>\The [RG] is already empty.</span>")
@@ -448,6 +456,7 @@
 				var/empty_amount = RG.reagents.trans_to(src, RG.amount_per_transfer_from_this)
 				to_chat(oviewers(3, usr), "<span class='notice'>[usr] empties [empty_amount]u of \the [RG] into \the [src].</span>")
 				to_chat(usr, "<span class='notice'>You empty [empty_amount]u of \the [RG] into \the [src].</span>")
+				playsound(src.loc, 'sound/effects/sink_empty.ogg', 25, 1)
 		return
 
 	// Filling/empying Syringes