diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm
index 4230547f5d1..9ab69e217a8 100644
--- a/code/datums/diseases/retrovirus.dm
+++ b/code/datums/diseases/retrovirus.dm
@@ -19,6 +19,7 @@
 		agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
 		if(prob(40))
 			cure_id = list("ryetalyn")
+			cure_list = list("ryetalyn")
 		else
 			restcure = 1
 
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 91e35e2cdb0..46e98610788 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -269,42 +269,25 @@
 		L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
 
 	if(prob(35))
-		switch(src.name)
-			if("Chapel")
-				sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg')
-			if("Morgue")
-				sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/title2.ogg')
-			if("Space")
-				sound = pick('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',)
-			if("Engine Control", "Engineering", "Engineering SMES")
-				sound = pick('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg')
-			if("AI Satellite Teleporter Room")
-				sound = pick('sound/ambience/ambimalf.ogg')
-			if("AI Upload Foyer")
-				sound = pick('sound/ambience/ambimalf.ogg')
-			if("AI Upload Chamber")
-				sound = pick('sound/ambience/ambimalf.ogg')
-			if("Mine")
-				sound = pick('sound/ambience/ambimine.ogg')
-				musVolume = 25
-			if("Telecoms Teleporter")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			if("Telecoms Central Compartment")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			if("Telecoms Satellite")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			if("Telecoms Foyer")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			if("Telecommunications Satellite West Wing")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			if("Telecommunications Satellite East Wing")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			if("Telecoms Control Room")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			if("Telecommunications Satellite Lounge")
-				sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
-			else
-				sound = pick('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
+
+		if(istype(src, /area/chapel))
+			sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg')
+		else if(istype(src, /area/medical/morgue))
+			sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/title2.ogg')
+		else if(type == /area)
+			sound = pick('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',)
+		else if(istype(src, /area/engine))
+			sound = pick('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg')
+		else if(istype(src, /area/AIsattele) || istype(src, /area/turret_protected/ai) || istype(src, /area/turret_protected/ai_upload) || istype(src, /area/turret_protected/ai_upload_foyer))
+			sound = pick('sound/ambience/ambimalf.ogg')
+		else if(istype(src, /area/mine/explored) || istype(src, /area/mine/unexplored))
+			sound = pick('sound/ambience/ambimine.ogg')
+			musVolume = 25
+		else if(istype(src, /area/tcommsat) || istype(src, /area/turret_protected/tcomwest) || istype(src, /area/turret_protected/tcomeast) || istype(src, /area/turret_protected/tcomfoyer) || istype(src, /area/turret_protected/tcomsat))
+			sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
+		else
+			sound = pick('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
+
 		if(!L.client.played)
 			L << sound(sound, repeat = 0, wait = 0, volume = musVolume, channel = 1)
 			L.client.played = 1
@@ -312,7 +295,6 @@
 				if(L.&& L.client)
 					L.client.played = 0
 
-
 /area/proc/gravitychange(var/gravitystate = 0, var/area/A)
 
 	A.has_gravity = gravitystate
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 7f9005b65e3..4b28e6ab598 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -341,7 +341,7 @@
 	set name = "Empty Contents"
 	set category = "Object"
 
-	if(!ishuman(usr) || usr.stat || usr.restrained())
+	if((!ishuman(usr) && (src.loc != usr)) || usr.stat || usr.restrained())
 		return
 
 	var/turf/T = get_turf(src)