diff --git a/code/game/sound.dm b/code/game/sound.dm
index 7d9914a220..a77c794dec 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -75,7 +75,7 @@ client/verb/Toggle_Soundscape()
 		if (!A:client) return
 		//if (A:ear_deaf) return
 
-		if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! - LastyScratch
+		if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas next to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
 			A:client:ambience_playing = 1
 			A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
 
@@ -91,15 +91,17 @@ client/verb/Toggle_Soundscape()
 			if ("AI Sat Ext") sound = pick('ambiruntime.ogg','ambimalf.ogg')
 			if ("AI Satellite") sound = pick('ambimalf.ogg')
 			if ("AI Satellite Teleporter Room") sound = pick('ambiruntime.ogg','ambimalf.ogg')
-			if ("Central Primary Hallway") sound = pick('ambiruntime.ogg')
-			if ("Aft Primary Hallway") sound = pick('ambiruntime.ogg')
-			if ("AI Upload Foyer") sound = pick('ambimalf.ogg', 'null.ogg', 'null.ogg')
-			if ("AI Upload Chamber") sound = pick('ambimalf.ogg','null.ogg','null.ogg')
+			if ("Port Primary Hallway") sound = pick('ambiruntime.ogg, ambistat.ogg')
+			if ("Bar") sound = pick('ambibar.ogg')
+			if ("Locker Room") sound = pick('ambiruntime.ogg','ambistat.ogg')
+			if ("Primary Tool Storage") sound = pick('ambiruntime.ogg','ambistat.ogg')
+			if ("AI Upload Foyer") sound = pick('ambimalf.ogg', 'null.ogg')
+			if ("AI Upload Chamber") sound = pick('ambimalf.ogg','null.ogg')
 			if ("Mine")
 				sound = pick('ambimine.ogg')
 				musVolume = 25
 			else
-				sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg')
+				sound = pick('ambiruntime.ogg','ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg')
 
 
 		if (prob(35))
diff --git a/sound/ambience/ambibar.ogg b/sound/ambience/ambibar.ogg
new file mode 100644
index 0000000000..9138683d14
Binary files /dev/null and b/sound/ambience/ambibar.ogg differ
diff --git a/sound/ambience/traitor.ogg b/sound/ambience/traitor.ogg
deleted file mode 100644
index 383d1edbe4..0000000000
Binary files a/sound/ambience/traitor.ogg and /dev/null differ
diff --git a/sound/spells/brucebanner.ogg b/sound/spells/brucebanner.ogg
deleted file mode 100644
index e981ea28ca..0000000000
Binary files a/sound/spells/brucebanner.ogg and /dev/null differ
diff --git a/sound/spells/einath.ogg b/sound/spells/einath.ogg
deleted file mode 100644
index cfb9149efa..0000000000
Binary files a/sound/spells/einath.ogg and /dev/null differ
diff --git a/sound/spells/fortigyama.ogg b/sound/spells/fortigyama.ogg
deleted file mode 100644
index 74c470ab2e..0000000000
Binary files a/sound/spells/fortigyama.ogg and /dev/null differ
diff --git a/sound/spells/neccantio.ogg b/sound/spells/neccantio.ogg
deleted file mode 100644
index cf805cf462..0000000000
Binary files a/sound/spells/neccantio.ogg and /dev/null differ
diff --git a/sound/spells/onisoma.ogg b/sound/spells/onisoma.ogg
deleted file mode 100644
index e1bcf39419..0000000000
Binary files a/sound/spells/onisoma.ogg and /dev/null differ
diff --git a/sound/spells/scyarnila.ogg b/sound/spells/scyarnila.ogg
deleted file mode 100644
index cfdd0b5c60..0000000000
Binary files a/sound/spells/scyarnila.ogg and /dev/null differ
diff --git a/sound/spells/stikaly.ogg b/sound/spells/stikaly.ogg
deleted file mode 100644
index 7bb706e169..0000000000
Binary files a/sound/spells/stikaly.ogg and /dev/null differ
diff --git a/sound/spells/tarcolminti.ogg b/sound/spells/tarcolminti.ogg
deleted file mode 100644
index 4e1cc3f885..0000000000
Binary files a/sound/spells/tarcolminti.ogg and /dev/null differ