Merge branch 'master' into prepare_stuff_for_second_week

code/game/objects/structures/safe.dm

@@ -54,7 +54,6 @@ FLOOR SAFES
 
 /obj/structure/safe/Destroy()
 	if(drill)
-		drill.soundloop.stop()
 		drill.forceMove(loc)
 		drill = null
 	return ..()
@@ -119,7 +118,6 @@ FLOOR SAFES
 					if(broken)
 						return
 					last_drill_time = world.time
-					drill.soundloop.start()
 					START_PROCESSING(SSprocessing, src)
 					update_icon()
 			if("Turn Off")
@@ -128,7 +126,6 @@ FLOOR SAFES
 				if(do_after(user, 2 SECONDS))
 					if(!drill || !isprocessing)
 						return
-					drill.soundloop.stop()
 					STOP_PROCESSING(SSprocessing, src)
 					update_icon()
 			if("Remove Drill")
@@ -251,12 +248,10 @@ FLOOR SAFES
 
 /obj/structure/safe/proc/drill_open()
 	broken = TRUE
-	if(drill)
-		drill.soundloop.stop()
 	STOP_PROCESSING(SSprocessing, src)
 	update_icon()
 
-obj/structure/safe/ex_act(severity)
+/obj/structure/safe/ex_act(severity)
 	return
 
 //FLOOR SAFES

code/game/objects/structures/watercloset.dm

@@ -142,15 +142,12 @@
 	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?
@@ -191,7 +188,6 @@
 		qdel(mymist)
 
 	if(on)
-		soundloop.start(src)
 		add_overlay(image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir))
 		if(temperature_settings[watertemp] < T20C)
 			return //no mist for cold water
@@ -204,7 +200,6 @@
 			ismist = 1
 			mymist = new /obj/effect/mist(loc)
 	else
-		soundloop.stop(src)
 		if(ismist)
 			ismist = 1
 			mymist = new /obj/effect/mist(loc)