diff --git a/aurorastation.dme b/aurorastation.dme
index b1ad29d9af1..456ce4e1756 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -387,6 +387,7 @@
 #include "code\defines\procs\hud.dm"
 #include "code\defines\procs\radio.dm"
 #include "code\defines\procs\sd_Alert.dm"
+#include "code\game\ambience.dm"
 #include "code\game\atoms.dm"
 #include "code\game\atoms_init.dm"
 #include "code\game\atoms_movable.dm"
diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm
index bb98899c25d..29b6f10dba8 100644
--- a/code/controllers/subsystems/vote.dm
+++ b/code/controllers/subsystems/vote.dm
@@ -295,9 +295,9 @@ var/datum/controller/subsystem/vote/SSvote
 					if("crew_transfer")
 						C << sound('sound/effects/vote.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
 					if("gamemode")
-						C << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
+						C << sound('sound/ambience/vote_alarm.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
 					if("custom")
-						C << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
+						C << sound('sound/ambience/vote_alarm.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
 		if(mode == "gamemode" && round_progressing)
 			round_progressing = 0
 			to_world("<font color='red'><b>Round start has been delayed.</b></font>")
diff --git a/code/game/ambience.dm b/code/game/ambience.dm
new file mode 100644
index 00000000000..145e3a75337
--- /dev/null
+++ b/code/game/ambience.dm
@@ -0,0 +1,178 @@
+// Ambience presets.
+// All you need to do to make an area play one of these is set their ambience var to one of these lists.
+// You can even combine them by adding them together, since they're just lists, however you'd have to do that in initialization.
+
+// For weird alien places like Srom.
+#define AMBIENCE_OTHERWORLDLY list(\
+	'sound/ambience/otherworldly/otherworldly1.ogg',\
+	'sound/ambience/otherworldly/otherworldly2.ogg',\
+	'sound/ambience/otherworldly/otherworldly3.ogg'\
+	)
+
+// Restricted, military, or mercenary aligned locations like the armory, the merc ship/base, BSD, etc.
+#define AMBIENCE_HIGHSEC list(\
+	'sound/ambience/highsec/highsec1.ogg',\
+	'sound/ambience/highsec/highsec2.ogg',\
+	'sound/ambience/highsec/highsec3.ogg',\
+	'sound/ambience/highsec/highsec4.ogg'\
+	)
+
+// Ruined structures found on the surface or in the caves.
+#define AMBIENCE_RUINS list(\
+	'sound/ambience/ruins/ruins1.ogg',\
+	'sound/ambience/ruins/ruins2.ogg',\
+	'sound/ambience/ruins/ruins3.ogg',\
+	'sound/ambience/ruins/ruins4.ogg',\
+	'sound/ambience/ruins/ruins5.ogg',\
+	'sound/ambience/ruins/ruins6.ogg'\
+	)
+
+// Similar to the above, but for more technology/signaling based ruins.
+#define AMBIENCE_TECH_RUINS list(\
+	'sound/ambience/tech_ruins/tech_ruins1.ogg',\
+	'sound/ambience/tech_ruins/tech_ruins2.ogg',\
+	'sound/ambience/tech_ruins/tech_ruins3.ogg'\
+	)
+
+// The actual chapel room, and maybe some other places of worship.
+#define AMBIENCE_CHAPEL list(\
+	'sound/ambience/chapel/chapel1.ogg',\
+	'sound/ambience/chapel/chapel2.ogg',\
+	'sound/ambience/chapel/chapel3.ogg',\
+	'sound/ambience/chapel/chapel4.ogg'\
+	)
+
+// For peaceful, serene areas, distinct from the Chapel.
+#define AMBIENCE_HOLY list(\
+	'sound/ambience/holy/holy1.ogg',\
+	'sound/ambience/holy/holy2.ogg'\
+	)
+
+// Generic sounds for less special rooms.
+#define AMBIENCE_GENERIC list(\
+	'sound/ambience/generic/generic1.ogg',\
+	'sound/ambience/generic/generic2.ogg',\
+	'sound/ambience/generic/generic3.ogg',\
+	'sound/ambience/generic/generic4.ogg',\
+	'sound/ambience/generic/generic5.ogg',\
+	'sound/ambience/generic/generic6.ogg',\
+	'sound/ambience/generic/generic7.ogg',\
+	'sound/ambience/generic/generic8.ogg'\
+	)
+
+// Sounds of PA announcements, presumably involving shuttles?
+#define AMBIENCE_ARRIVALS list(\
+	'sound/ambience/arrivals/arrivals1.ogg',\
+	'sound/ambience/arrivals/arrivals2.ogg',\
+	'sound/ambience/arrivals/arrivals3.ogg',\
+	'sound/ambience/arrivals/arrivals4.ogg',\
+	'sound/ambience/arrivals/arrivals5.ogg',\
+	'sound/ambience/arrivals/arrivals6.ogg',\
+	'sound/ambience/arrivals/arrivals7.ogg'\
+	)
+
+
+// Sounds suitable for being inside dark, tight corridors in the underbelly of the station.
+#define AMBIENCE_MAINTENANCE list(\
+	'sound/ambience/maintenance/maintenance1.ogg',\
+	'sound/ambience/maintenance/maintenance2.ogg',\
+	'sound/ambience/maintenance/maintenance3.ogg',\
+	'sound/ambience/maintenance/maintenance4.ogg',\
+	'sound/ambience/maintenance/maintenance5.ogg',\
+	'sound/ambience/maintenance/maintenance6.ogg',\
+	'sound/ambience/maintenance/maintenance7.ogg',\
+	'sound/ambience/maintenance/maintenance8.ogg',\
+	'sound/ambience/maintenance/maintenance9.ogg',\
+	'sound/ambience/maintenance/maintenance10.ogg',\
+	'sound/ambience/maintenance/maintenance11.ogg',\
+	'sound/ambience/maintenance/maintenance12.ogg'\
+	)
+
+// Life support machinery at work, keeping everyone breathing.
+#define AMBIENCE_ENGINEERING list(\
+	'sound/ambience/engineering/engineering1.ogg',\
+	'sound/ambience/engineering/engineering2.ogg',\
+	'sound/ambience/engineering/engineering3.ogg'\
+	)
+
+#define AMBIENCE_SINGULARITY list(\
+	'sound/ambience/singularity/singularity1.ogg',\
+	'sound/ambience/singularity/singularity2.ogg',\
+	'sound/ambience/singularity/singularity3.ogg',\
+	'sound/ambience/singularity/singularity4.ogg'\
+	)
+
+//CHOMP Edit Sounds for atmos
+#define AMBIENCE_ATMOS list(\
+	'sound/ambience/atmospherics/atmospherics1.ogg',\
+	'sound/ambience/atmospherics/atmospherics2.ogg'\
+	)
+
+// Creepy AI/borg stuff.
+#define AMBIENCE_AI list(\
+	'sound/ambience/ai/ai1.ogg',\
+	'sound/ambience/ai/ai2.ogg',\
+	'sound/ambience/ai/ai3.ogg'\
+	)
+
+// Peaceful sounds when floating in the void.
+#define AMBIENCE_SPACE list(\
+	'sound/ambience/space/space_serithi.ogg',\
+	'sound/ambience/space/space1.ogg'\
+	)
+
+// Vaguely spooky sounds when around dead things.
+#define AMBIENCE_GHOSTLY list(\
+	'sound/ambience/ghostly/ghostly1.ogg',\
+	'sound/ambience/ghostly/ghostly2.ogg'\
+	)
+
+// Concerning sounds, for when one discovers something horrible happened in a PoI.
+#define AMBIENCE_FOREBODING list(\
+	'sound/ambience/foreboding/foreboding1.ogg',\
+	'sound/ambience/foreboding/foreboding2.ogg'\
+	)
+
+// If we ever add geothermal PoIs or other places that are really hot, this will do.
+#define AMBIENCE_LAVA list(\
+	'sound/ambience/lava/lava1.ogg'\
+	)
+
+// Cult-y ambience, for some PoIs, and maybe when the cultists darken the world with the ritual.
+#define AMBIENCE_UNHOLY list(\
+	'sound/ambience/unholy/unholy1.ogg'\
+	)
+
+#define AMBIENCE_ELEVATOR list(\
+	'sound/ambience/elevator.ogg'\
+	)
+
+//CHOMPedit: Exploration outpost ambience.
+#define AMBIENCE_EXPOUTPOST list(\
+	'sound/ambience/expoutpost/expoutpost1.ogg',\
+	'sound/ambience/expoutpost/expoutpost2.ogg',\
+	'sound/ambience/expoutpost/expoutpost3.ogg',\
+	'sound/ambience/expoutpost/expoutpost4.ogg'\
+	)
+
+//CHOMP Edit Sounds for Substation rooms. Just electrical sounds, really.
+#define AMBIENCE_SUBSTATION list(\
+	'sound/ambience/substation/substation1.ogg',\
+	'sound/ambience/substation/substation2.ogg',\
+	'sound/ambience/substation/substation3.ogg',\
+	'sound/ambience/substation/substation4.ogg',\
+	'sound/ambience/substation/substation5.ogg',\
+	'sound/ambience/substation/substation6.ogg',\
+	'sound/ambience/substation/substation7.ogg',\
+	'sound/ambience/substation/substation8.ogg'\
+	)
+
+//CHOMP Edit Sounds for hangars
+#define AMBIENCE_HANGAR list(\
+	'sound/ambience/hangar/hangar1.ogg',\
+	'sound/ambience/hangar/hangar2.ogg',\
+	'sound/ambience/hangar/hangar3.ogg',\
+	'sound/ambience/hangar/hangar4.ogg',\
+	'sound/ambience/hangar/hangar5.ogg',\
+	'sound/ambience/hangar/hangar6.ogg'\
+	)
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index ee09ecbd7a2..ead6df82260 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -39,20 +39,7 @@
 //	var/list/lights				// list of all lights on this area
 	var/list/all_doors = list()		//Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area
 	var/air_doors_activated = 0
-	var/list/ambience = list(
-		'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'
-	)
+	var/list/ambience = list()
 	var/list/forced_ambience = null
 	var/loop_ambience = TRUE
 	var/sound_env = STANDARD_STATION
diff --git a/code/game/sound.dm b/code/game/sound.dm
index e04676a1c3a..c2e06a8d0e5 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -8,7 +8,7 @@
 #define AUDITORIUM 6
 #define CONCERT_HALL 7
 #define CAVE 8
-#define ARENA 9
+#define ARENA 9 // used for thunderdome and arena.
 #define HANGAR 10
 #define CARPETED_HALLWAY 11
 #define HALLWAY 12
@@ -26,16 +26,16 @@
 #define DIZZY 24
 
 
-#define STANDARD_STATION STONEROOM
-#define LARGE_ENCLOSED HANGAR
-#define SMALL_ENCLOSED BATHROOM
-#define TUNNEL_ENCLOSED CAVE
-#define LARGE_SOFTFLOOR CARPETED_HALLWAY
-#define MEDIUM_SOFTFLOOR LIVINGROOM
-#define SMALL_SOFTFLOOR ROOM
-#define ASTEROID CAVE
-#define SPACE UNDERWATER
-#define PSYCHOTIC PARKING_LOT
+#define STANDARD_STATION STONEROOM // default
+#define LARGE_ENCLOSED HANGAR // used for hangars, chapel
+#define SMALL_ENCLOSED BATHROOM // used for bathrooms, mostly.
+#define TUNNEL_ENCLOSED CAVE // maint tunnels and crawlspaces
+#define LARGE_SOFTFLOOR CARPETED_HALLWAY // used for library and theater
+#define MEDIUM_SOFTFLOOR LIVINGROOM // used for larger offices, usually with wooden floors
+#define SMALL_SOFTFLOOR ROOM // used for offices, dormitories and other small miscallaneous rooms
+#define ASTEROID CAVE // well, the asteroid
+#define SPACE UNDERWATER // space
+#define PSYCHOTIC PARKING_LOT // not actually used in areas, used in drug hallucinations.
 
 #define EQUIP_SOUND_VOLUME 30
 #define PICKUP_SOUND_VOLUME 15
diff --git a/code/modules/shareddream/area.dm b/code/modules/shareddream/area.dm
index 99718385808..09974d06e9f 100644
--- a/code/modules/shareddream/area.dm
+++ b/code/modules/shareddream/area.dm
@@ -1,4 +1,5 @@
 /area/centcom/shared_dream
 	name = "\improper The Shared Dream"
 	icon_state = "dream"
-	dynamic_lighting = 1
\ No newline at end of file
+	ambience = AMBIENCE_OTHERWORLDLY
+	dynamic_lighting = 1
diff --git a/code/modules/turbolift/turbolift_areas.dm b/code/modules/turbolift/turbolift_areas.dm
index c3adce35970..bada7ec2373 100644
--- a/code/modules/turbolift/turbolift_areas.dm
+++ b/code/modules/turbolift/turbolift_areas.dm
@@ -5,6 +5,7 @@
 	requires_power = 0
 	station_area = 1
 	sound_env = SMALL_ENCLOSED
+	ambience = AMBIENCE_ELEVATOR
 
 	var/lift_floor_label = null
 	var/lift_floor_name = null
diff --git a/html/changelogs/wezzy_neue_ambience.yml b/html/changelogs/wezzy_neue_ambience.yml
new file mode 100644
index 00000000000..714bbd5fb85
--- /dev/null
+++ b/html/changelogs/wezzy_neue_ambience.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - soundadd: "Adds new ambience sounds."
+  - soundadd: "New sound for votes starting."
diff --git a/maps/_common/areas/ai.dm b/maps/_common/areas/ai.dm
index 393f6c672d8..cff2129399f 100644
--- a/maps/_common/areas/ai.dm
+++ b/maps/_common/areas/ai.dm
@@ -7,6 +7,7 @@
 /area/ai_monitored/storage/secure
 	name = "Secure Storage"
 	icon_state = "storage"
+	ambience = AMBIENCE_HIGHSEC
 
 /area/ai_monitored/storage/emergency
 	name = "Emergency Storage"
@@ -19,63 +20,71 @@
 /area/turret_protected/ai_upload
 	name = "AI Upload Chamber"
 	icon_state = "ai_upload"
-	ambience = list('sound/ambience/ambimalf.ogg')
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/ai_upload_foyer
 	name = "AI Upload Access"
 	icon_state = "ai_foyer"
-	ambience = list('sound/ambience/ambimalf.ogg')
 	sound_env = SMALL_ENCLOSED
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/ai_server_room
 	name = "Messaging Server Room"
 	icon_state = "ai_server"
 	sound_env = SMALL_ENCLOSED
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/ai
 	name = "AI Chamber"
 	icon_state = "ai_chamber"
-	ambience = list('sound/ambience/ambimalf.ogg')
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/ai_cyborg_station
 	name = "Cyborg Station"
 	icon_state = "ai_cyborg"
 	sound_env = SMALL_ENCLOSED
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/aisat
 	name = "AI Satellite"
 	icon_state = "ai"
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/aisat_interior
 	name = "AI Satellite"
 	icon_state = "ai"
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/AIsatextFP
 	name = "AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/AIsatextFS
 	name = "AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/AIsatextAS
 	name = "AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/AIsatextAP
 	name = "AI Sat Ext"
 	icon_state = "storage"
 	luminosity = 1
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/NewAIMain
 	name = "AI Main New"
 	icon_state = "storage"
+	ambience = AMBIENCE_AI
 
 /area/turret_protected/corp_vault
 	name = "NanoTrasen Corporate Vault"
 	icon_state = "ai_upload"
-	ambience = list('sound/ambience/ambimalf.ogg')
-
+	ambience = AMBIENCE_AI
diff --git a/maps/_common/areas/areas.dm b/maps/_common/areas/areas.dm
index 5dc52b49dc2..4507f02ba24 100644
--- a/maps/_common/areas/areas.dm
+++ b/maps/_common/areas/areas.dm
@@ -18,6 +18,9 @@ Generally you don't want to put your areas in here; if the area is only used in
 
 /*-----------------------------------------------------------------------------*/
 
+/area
+	ambience = AMBIENCE_GENERIC
+
 /////////
 //SPACE//
 /////////
@@ -31,7 +34,7 @@ Generally you don't want to put your areas in here; if the area is only used in
 	power_light = 0
 	power_equip = 0
 	power_environ = 0
-	ambience = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg')
+	ambience = AMBIENCE_SPACE
 	no_light_control = 1
 	base_turf = /turf/space
 
diff --git a/maps/_common/areas/asteroid_areas.dm b/maps/_common/areas/asteroid_areas.dm
index 464dcf3ee47..68a21282ca6 100644
--- a/maps/_common/areas/asteroid_areas.dm
+++ b/maps/_common/areas/asteroid_areas.dm
@@ -14,9 +14,10 @@
 	icon_state = "unexplored"
 	flags = HIDE_FROM_HOLOMAP
 
-//S
-
 // Smalls
+/area/outpost
+	ambience = AMBIENCE_EXPOUTPOST
+
 /area/outpost/mining_north
 	name = "North Mining"
 	icon_state = "outpost_mine_north"
@@ -56,8 +57,6 @@
 /area/outpost/mining_main/refinery
 	name = "Mining Refinery"
 
-
-
 // Engineering
 /area/outpost/engineering
 	icon_state = "outpost_engine"
@@ -82,8 +81,6 @@
 /area/outpost/engineering/meeting
 	name = "Engineering - Break Room"
 
-
-
 // Research
 /area/outpost/research
 	icon_state = "outpost_research"
diff --git a/maps/_common/areas/derelict.dm b/maps/_common/areas/derelict.dm
index 0507ce1b20e..6695be26ae6 100644
--- a/maps/_common/areas/derelict.dm
+++ b/maps/_common/areas/derelict.dm
@@ -3,6 +3,7 @@
 /area/derelict
 	name = "Derelict Station"
 	icon_state = "storage"
+	ambience = AMBIENCE_RUINS
 	no_light_control = 1
 	base_turf = /turf/space
 	requires_power = FALSE
diff --git a/maps/_common/areas/shuttles.dm b/maps/_common/areas/shuttles.dm
index b7a53d66da7..e86275595df 100644
--- a/maps/_common/areas/shuttles.dm
+++ b/maps/_common/areas/shuttles.dm
@@ -13,6 +13,7 @@
 /area/shuttle/arrival
 	name = "Arrival Shuttle"
 	base_turf = /turf/unsimulated/floor/plating
+	ambience = AMBIENCE_ARRIVALS
 
 /area/shuttle/arrival/Entered(atom/movable/Obj, atom/oldLoc)
 	. = ..()
@@ -57,6 +58,7 @@
 /area/shuttle/specops
 	name = "Special Ops Shuttle"
 	base_turf = /turf/unsimulated/floor/plating
+	ambience = AMBIENCE_HIGHSEC
 
 /area/shuttle/burglar
 	name = "Unidentified Transport"
@@ -89,4 +91,4 @@
 	name = "Merchant Ship"
 	flags = RAD_SHIELDED | SPAWN_ROOF
 	base_turf = /turf/space
-	sound_env = LARGE_ENCLOSED
\ No newline at end of file
+	sound_env = LARGE_ENCLOSED
diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm
index 71092dc9416..3b55df1c1b6 100644
--- a/maps/_common/areas/special.dm
+++ b/maps/_common/areas/special.dm
@@ -19,6 +19,7 @@
 
 /area/centcom/spawning
 	name = "Centcom Preparatory Wing"
+	ambience = AMBIENCE_ARRIVALS
 
 /area/centcom/evac
 	name = "Centcom Emergency Shuttle"
@@ -43,10 +44,14 @@
 
 /area/centcom/creed
 	name = "Creed's Office"
+	sound_env = SMALL_SOFTFLOOR
 
 /area/centcom/holding
 	name = "Holding Facility"
 
+/area/centcom/checkpoint
+	ambience = AMBIENCE_ARRIVALS
+
 /area/centcom/checkpoint/fore
 	name = "Fore Checkpoint"
 
@@ -60,9 +65,12 @@
 /area/centcom/legion/hangar5
 	name = "BLV The Tower - Hangar 5"
 	icon_state = "blvhangar5"
+	ambience = AMBIENCE_HANGAR
+	sound_env = HANGAR
 
 /area/centcom/distress_prep
 	name = "Distress Team Preparation"
+	ambience = AMBIENCE_HIGHSEC
 
 /area/merchant_station
 	name = "Merchant Station"
@@ -71,10 +79,12 @@
 	dynamic_lighting = 1
 	no_light_control = 1
 	centcomm_area = 1
+	ambience = AMBIENCE_HIGHSEC
 
 /area/merchant_station/warehouse
 	name = "Merchant Warehouse"
 	icon_state = "merchant_ware"
+	sound_env = LARGE_ENCLOSED
 
 // Antagonist Bases
 
@@ -147,10 +157,12 @@
 /area/kataphract_chapter/bridge
 	name = "Kataphract Chapter - Bridge"
 	icon_state = "bridge"
+	ambience = AMBIENCE_HIGHSEC
 
 /area/kataphract_chapter/sparring_chamber
 	name = "Kataphract Chapter - Sparring Chamber"
 	icon_state = "security"
+	sound_env = ARENA
 
 /area/kataphract_chapter/commissary
 	name = "Kataphract Chapter - Commissary"
@@ -161,16 +173,19 @@
 	icon_state = "yellow"
 
 /area/kataphract_chapter/dorms
-	name = "Kataphract Chapter - Dorms"
+	name = "Kataphract Chapter - Dormitory"
 	icon_state = "Sleep"
+	sound_env = SMALL_SOFTFLOOR
 
 /area/kataphract_chapter/toilets
 	name = "Kataphract Chapter - Toilets"
 	icon_state = "toilet"
+	sound_env = SMALL_ENCLOSED
 
 /area/kataphract_chapter/office
 	name = "Kataphract Chapter - Knight's Office"
 	icon_state = "law"
+	sound_env = SMALL_SOFTFLOOR
 
 /area/kataphract_chapter/cafeteria
 	name = "Kataphract Chapter - Cafeteria"
@@ -179,14 +194,17 @@
 /area/kataphract_chapter/engineering
 	name = "Kataphract Chapter - Engineering"
 	icon_state = "engineering_workshop"
+	ambience = AMBIENCE_ENGINEERING
 
 /area/kataphract_chapter/port_solars
 	name = "Kataphract Chapter - Port Solars"
 	icon_state = "panelsA"
+	ambience = AMBIENCE_SPACE
 
 /area/kataphract_chapter/starboard_solars
 	name = "Kataphract Chapter - Starboard Solars"
 	icon_state = "panelsA"
+	ambience = AMBIENCE_SPACE
 
 /area/kataphract_chapter/trading_area
 	name = "Kataphract Chapter - Trading Area"
@@ -195,10 +213,13 @@
 /area/kataphract_chapter/warehouse
 	name = "Kataphract Chapter - Warehouse"
 	icon_state = "quartstorage"
+	sound_env = LARGE_ENCLOSED
 
 /area/kataphract_chapter/hangar
 	name = "Kataphract Chapter - Hangar"
 	icon_state = "green"
+	ambience = AMBIENCE_HANGAR
+	sound_env = HANGAR
 
 /area/kataphract_chapter/hull
 	name = "Kataphract Chapter - Hull"
@@ -258,4 +279,4 @@
 	luminosity = 1
 	dynamic_lighting = 0
 	requires_power = 0
-	no_light_control = 1
\ No newline at end of file
+	no_light_control = 1
diff --git a/maps/_common/areas/station/civilian.dm b/maps/_common/areas/station/civilian.dm
index ce9daea4297..680be87a17b 100644
--- a/maps/_common/areas/station/civilian.dm
+++ b/maps/_common/areas/station/civilian.dm
@@ -143,13 +143,13 @@
  	station_area = 1
 
 /area/chapel
- 	station_area = 1
+	station_area = 1
 
 /area/chapel/main
 	name = "Chapel"
 	icon_state = "chapel"
-	ambience = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/music/traitor.ogg')
 	sound_env = LARGE_ENCLOSED
+	ambience = AMBIENCE_CHAPEL
 
 /area/chapel/office
 	name = "Chapel Office"
@@ -159,6 +159,7 @@
 	name = "Representative Office"
 	icon_state = "law"
 	station_area = 1
+	sound_env = MEDIUM_SOFTFLOOR
 
 /area/quartermaster
 	name = "Quartermasters"
@@ -169,6 +170,7 @@
 /area/quartermaster/office
 	name = "Cargo Office"
 	icon_state = "quartoffice"
+	sound_env = MEDIUM_SOFTFLOOR
 
 /area/quartermaster/lobby
 	name = "Cargo Lobby"
@@ -194,15 +196,17 @@
 /area/quartermaster/qm
 	name = "Cargo - Quartermaster's Office"
 	icon_state = "quart"
+	sound_env = SMALL_SOFTFLOOR
 
 /area/quartermaster/miningdock
 	name = "Cargo Mining Dock"
 	icon_state = "mining"
 
-/area/janitor/
+/area/janitor
 	name = "Custodial Closet"
 	icon_state = "janitor"
 	station_area = 1
+	ambience = AMBIENCE_MAINTENANCE
 
 /area/janitor/stairs
 	name = "Stairwell Custodial Closet"
diff --git a/maps/_common/areas/station/engineering.dm b/maps/_common/areas/station/engineering.dm
index d4518acd722..d68bac1cb31 100644
--- a/maps/_common/areas/station/engineering.dm
+++ b/maps/_common/areas/station/engineering.dm
@@ -4,12 +4,7 @@
 /area/engineering
 	name = "Engineering"
 	icon_state = "engineering"
-	ambience = list(
-		'sound/ambience/ambisin1.ogg',
-		'sound/ambience/ambisin2.ogg',
-		'sound/ambience/ambisin3.ogg',
-		'sound/ambience/ambisin4.ogg'
-	)
+	ambience = AMBIENCE_ENGINEERING
 	station_area = 1
 	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
 
@@ -18,7 +13,7 @@
 	icon_state = "atmos"
 	sound_env = LARGE_ENCLOSED
 	no_light_control = 1
-	ambience = list('sound/ambience/ambiatm1.ogg')
+	ambience = list(AMBIENCE_ENGINEERING, AMBIENCE_ATMOS)
 
 /area/engineering/atmos/monitoring
 	name = "Engineering - Atmospherics Monitoring Room"
@@ -39,12 +34,14 @@
 	name = "Engineering - Main Lvl. SMES Room"
 	icon_state = "engine_smes"
 	sound_env = SMALL_ENCLOSED
+	ambience = AMBIENCE_SINGULARITY
 
 /area/engineering/engine_room
 	name = "Engineering - Engine Room"
 	icon_state = "engine"
 	sound_env = LARGE_ENCLOSED
 	no_light_control = 1
+	ambience = AMBIENCE_SINGULARITY
 
 /area/engineering/engine_airlock
 	name = "Engineering - Engine Room Airlock"
diff --git a/maps/_common/areas/station/maintenance.dm b/maps/_common/areas/station/maintenance.dm
index a2dedaa1e61..70797458791 100644
--- a/maps/_common/areas/station/maintenance.dm
+++ b/maps/_common/areas/station/maintenance.dm
@@ -4,13 +4,7 @@
 	flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP
 	sound_env = TUNNEL_ENCLOSED
 	turf_initializer = new /datum/turf_initializer/maintenance()
-	ambience = list(
-		'sound/ambience/ambimaint1.ogg',
-		'sound/ambience/ambimaint2.ogg',
-		'sound/ambience/ambimaint3.ogg',
-		'sound/ambience/ambimaint4.ogg',
-		'sound/ambience/ambimaint5.ogg'
-	)
+	ambience = AMBIENCE_MAINTENANCE
 	station_area = 1
 
 /area/maintenance/civ
@@ -250,6 +244,7 @@
 	name = "Substation"
 	icon_state = "substation"
 	sound_env = SMALL_ENCLOSED
+	ambience = AMBIENCE_SUBSTATION
 
 /area/maintenance/substation/engineering // Engineering
 	name = "Engineering Substation"
@@ -295,6 +290,7 @@
 /area/solar
 	requires_power = 1
 	always_unpowered = 1
+	ambience = AMBIENCE_SPACE
 	base_turf = /turf/space
 	station_area = 1
 
diff --git a/maps/_common/areas/station/medical.dm b/maps/_common/areas/station/medical.dm
index afee348749a..bd5b16e4693 100644
--- a/maps/_common/areas/station/medical.dm
+++ b/maps/_common/areas/station/medical.dm
@@ -5,22 +5,14 @@
 	station_area = 1
 	holomap_color = HOLOMAP_AREACOLOR_MEDICAL
 
+//Medbay is a large area, these additional areas help level out APC load.
+
 /area/medical/medbay
 	name = "Medbay Hallway - Port"
 	lightswitch = TRUE
 	icon_state = "medbay"
 	ambience = list('sound/ambience/signal.ogg')
 
-//Medbay is a large area, these additional areas help level out APC load.
-
-/area/medical/emt
-	name = "Medical - Emergency Technician Storage"
-	icon_state = "medbay"
-
-/area/medical/temp_morgue
-	name = "Medical - Temporary Morgue"
-	icon_state = "morgue"
-
 /area/medical/medbay2
 	name = "Medbay Hallway - Starboard"
 	lightswitch = TRUE
@@ -39,10 +31,18 @@
 	icon_state = "medbay4"
 	ambience = list('sound/ambience/signal.ogg')
 
+/area/medical/emt
+	name = "Medical - Emergency Technician Storage"
+	icon_state = "medbay"
+
+/area/medical/temp_morgue
+	name = "Medical - Temporary Morgue"
+	icon_state = "morgue"
+	ambience = AMBIENCE_GHOSTLY
+
 /area/medical/biostorage
 	name = "Medical - Secondary Storage"
 	icon_state = "medbay2"
-	ambience = list('sound/ambience/signal.ogg')
 
 /area/medical/reception
 	name = "Medical - Reception"
@@ -52,7 +52,6 @@
 /area/medical/psych
 	name = "Medical - Psych Room"
 	icon_state = "medbay3"
-	ambience = list('sound/ambience/signal.ogg')
 
 /area/medical/upperlevel
 	name = "Medical - Upper-Level Hallway"
@@ -62,7 +61,6 @@
 /area/crew_quarters/medbreak
 	name = "Medical - Break Room"
 	icon_state = "medbay3"
-	ambience = list('sound/ambience/signal.ogg')
 
 /area/medical/patients_rooms
 	name = "Medical - Patient's Rooms"
@@ -120,11 +118,12 @@
 /area/medical/robotics
 	name = "Robotics"
 	icon_state = "medresearch"
+	ambience = AMBIENCE_ENGINEERING
 
 /area/medical/morgue
 	name = "Medical - Long-term Morgue"
 	icon_state = "morgue"
-	ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/music/main.ogg')
+	ambience = AMBIENCE_GHOSTLY
 
 /area/medical/pharmacy
 	name = "Medical - Pharmacy"
@@ -191,4 +190,4 @@
 
 /area/medical/main_storage
 	name = "Medical - Main Storage"
-	icon_state = "exam_room"
\ No newline at end of file
+	icon_state = "exam_room"
diff --git a/maps/_common/areas/station/security.dm b/maps/_common/areas/station/security.dm
index b6108e31590..2fef81ee0fe 100644
--- a/maps/_common/areas/station/security.dm
+++ b/maps/_common/areas/station/security.dm
@@ -51,10 +51,12 @@
 /area/security/warden
 	name = "Security - Warden's Office"
 	icon_state = "Warden"
+	sound_env = SMALL_SOFTFLOOR
 
 /area/security/armory
 	name = "Security - Armory"
 	icon_state = "Warden"
+	ambience = AMBIENCE_HIGHSEC
 
 /area/security/forensics_office
 	name = "Security - Forensic Office"
@@ -64,6 +66,7 @@
 /area/security/detectives_office
 	name = "Security - Detective's Office"
 	icon_state = "detective"
+	sound_env = SMALL_SOFTFLOOR
 
 /area/security/investigations
 	name = "Security - Investigations Division"
@@ -81,6 +84,7 @@
 /area/security/tactical
 	name = "Security - Tactical Equipment"
 	icon_state = "Tactical"
+	ambience = AMBIENCE_HIGHSEC
 
 /area/security/security_office
 	name = "Security - Security Office"
@@ -106,6 +110,7 @@
 /area/security/nuke_storage
 	name = "Vault"
 	icon_state = "nuke_storage"
+	ambience = AMBIENCE_HIGHSEC
 	holomap_color = null
 	flags = HIDE_FROM_HOLOMAP
 
@@ -116,6 +121,7 @@
 /area/security/checkpoint2
 	name = "Security - Arrivals Checkpoint"
 	icon_state = "security"
+	ambience = AMBIENCE_ARRIVALS
 
 /area/security/bridge_surface_checkpoint
 	name = "Bridge Security Checkpoint"
@@ -143,4 +149,3 @@
 
 /area/security/vacantoffice2
 	name = "Security - Meeting Room"
-	icon_state = "security"
diff --git a/maps/_common/areas/telecomms.dm b/maps/_common/areas/telecomms.dm
index bc1b90783c3..7ebd6ed13e5 100644
--- a/maps/_common/areas/telecomms.dm
+++ b/maps/_common/areas/telecomms.dm
@@ -2,7 +2,7 @@
 
 // Telecommunications Satellite
 /area/tcommsat
-	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
+	ambience = AMBIENCE_ENGINEERING
 	no_light_control = 1
 	station_area = 1
 	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
@@ -19,22 +19,22 @@
 /area/turret_protected/tcomsat
 	name = "Telecoms Exterior"
 	icon_state = "tcomsatlob"
-	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
+	ambience = AMBIENCE_ENGINEERING
 
 /area/turret_protected/tcomfoyer
 	name = "Telecoms Foyer"
 	icon_state = "tcomsatentrance"
-	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
+	ambience = AMBIENCE_ENGINEERING
 
 /area/turret_protected/tcomwest
 	name = "Telecommunications Satellite West Wing"
 	icon_state = "tcomsatwest"
-	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
+	ambience = AMBIENCE_ENGINEERING
 
 /area/turret_protected/tcomeast
 	name = "Telecommunications Satellite East Wing"
 	icon_state = "tcomsateast"
-	ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')
+	ambience = AMBIENCE_ENGINEERING
 
 /area/tcommsat/computer
 	name = "Telecoms Control Room"
diff --git a/maps/aurora/code/aurora_holodeck.dm b/maps/aurora/code/aurora_holodeck.dm
index 6e057d07dce..6cef8797f20 100644
--- a/maps/aurora/code/aurora_holodeck.dm
+++ b/maps/aurora/code/aurora_holodeck.dm
@@ -35,10 +35,8 @@
 		),
 		"space" = new /datum/holodeck_program(/area/holodeck/source_space,
 			list(
-				'sound/ambience/ambispace.ogg',
-				'sound/music/main.ogg',
-				'sound/music/space.ogg',
-				'sound/music/traitor.ogg'
+				'sound/ambience/space/space_serithi.ogg',
+				'sound/ambience/space/space1.ogg'
 			)
 		),
 		"picnicarea" = new /datum/holodeck_program(/area/holodeck/source_picnicarea,
@@ -49,22 +47,21 @@
 		),
 		"theatre" = new /datum/holodeck_program(/area/holodeck/source_theatre),
 		"meetinghall" = new /datum/holodeck_program(/area/holodeck/source_meetinghall),
-		"courtroom" = new /datum/holodeck_program(/area/holodeck/source_courtroom, 
+		"courtroom" = new /datum/holodeck_program(/area/holodeck/source_courtroom,
 			list('sound/music/traitor.ogg')
 		),
 		"burntest" = new /datum/holodeck_program(/area/holodeck/source_burntest, list()),
 		"wildlifecarp" = new /datum/holodeck_program(/area/holodeck/source_wildlife, list()),
 		"chapel" = new /datum/holodeck_program(/area/holodeck/source_chapel,
 			list(
-				'sound/ambience/ambicha1.ogg',
-				'sound/ambience/ambicha2.ogg',
-				'sound/ambience/ambicha3.ogg',
-				'sound/ambience/ambicha4.ogg',
-				'sound/music/traitor.ogg'
+				'sound/ambience/chapel/chapel1.ogg',
+				'sound/ambience/chapel/chapel2.ogg',
+				'sound/ambience/chapel/chapel3.ogg',
+				'sound/ambience/chapel/chapel4.ogg'
 			)
 		),
 		"gym" = new /datum/holodeck_program(/area/holodeck/source_gym),
-		"battlemonsters" = new /datum/holodeck_program(/area/holodeck/source_battlemonsters, 
+		"battlemonsters" = new /datum/holodeck_program(/area/holodeck/source_battlemonsters,
 			list(
 				'sound/music/battlemonsters_theme.ogg'
 			),
diff --git a/maps/exodus/code/exodus_areas.dm b/maps/exodus/code/exodus_areas.dm
index 458930eb235..e900d0341f6 100644
--- a/maps/exodus/code/exodus_areas.dm
+++ b/maps/exodus/code/exodus_areas.dm
@@ -9,4 +9,4 @@
 /area/AIsattele
 	name = "AI Satellite Teleporter Room"
 	icon_state = "teleporter"
-	ambience = list('sound/ambience/ambimalf.ogg')
\ No newline at end of file
+	ambience = AMBIENCE_AI
diff --git a/sound/ambience/ambimalf.ogg b/sound/ambience/ai/ai1.ogg
similarity index 100%
rename from sound/ambience/ambimalf.ogg
rename to sound/ambience/ai/ai1.ogg
diff --git a/sound/ambience/ai/ai2.ogg b/sound/ambience/ai/ai2.ogg
new file mode 100644
index 00000000000..691b437f496
Binary files /dev/null and b/sound/ambience/ai/ai2.ogg differ
diff --git a/sound/ambience/ai/ai3.ogg b/sound/ambience/ai/ai3.ogg
new file mode 100644
index 00000000000..b20e79fdde6
Binary files /dev/null and b/sound/ambience/ai/ai3.ogg differ
diff --git a/sound/ambience/alarm4.ogg b/sound/ambience/alarm4.ogg
deleted file mode 100644
index a86bfd155f8..00000000000
Binary files a/sound/ambience/alarm4.ogg and /dev/null differ
diff --git a/sound/ambience/ambiatm1.ogg b/sound/ambience/ambiatm1.ogg
deleted file mode 100644
index db8ceeebf96..00000000000
Binary files a/sound/ambience/ambiatm1.ogg and /dev/null differ
diff --git a/sound/ambience/ambieng1.ogg b/sound/ambience/ambieng1.ogg
deleted file mode 100644
index 357f3c72425..00000000000
Binary files a/sound/ambience/ambieng1.ogg and /dev/null differ
diff --git a/sound/ambience/ambigen13.ogg b/sound/ambience/ambigen13.ogg
deleted file mode 100644
index 0ae24a9a680..00000000000
Binary files a/sound/ambience/ambigen13.ogg and /dev/null differ
diff --git a/sound/ambience/ambigen2.ogg b/sound/ambience/ambigen2.ogg
deleted file mode 100644
index 6a5a2d27c92..00000000000
Binary files a/sound/ambience/ambigen2.ogg and /dev/null differ
diff --git a/sound/ambience/ambimaint1.ogg b/sound/ambience/ambimaint1.ogg
deleted file mode 100644
index 0c18c46af68..00000000000
Binary files a/sound/ambience/ambimaint1.ogg and /dev/null differ
diff --git a/sound/ambience/ambimaint2.ogg b/sound/ambience/ambimaint2.ogg
deleted file mode 100644
index 655d940cda9..00000000000
Binary files a/sound/ambience/ambimaint2.ogg and /dev/null differ
diff --git a/sound/ambience/ambimaint3.ogg b/sound/ambience/ambimaint3.ogg
deleted file mode 100644
index 9891916010e..00000000000
Binary files a/sound/ambience/ambimaint3.ogg and /dev/null differ
diff --git a/sound/ambience/ambimaint4.ogg b/sound/ambience/ambimaint4.ogg
deleted file mode 100644
index 1d01e2016ca..00000000000
Binary files a/sound/ambience/ambimaint4.ogg and /dev/null differ
diff --git a/sound/ambience/ambimaint5.ogg b/sound/ambience/ambimaint5.ogg
deleted file mode 100644
index 7a065ecbcb3..00000000000
Binary files a/sound/ambience/ambimaint5.ogg and /dev/null differ
diff --git a/sound/ambience/ambigen1.ogg b/sound/ambience/arrivals/arrivals1.ogg
similarity index 100%
rename from sound/ambience/ambigen1.ogg
rename to sound/ambience/arrivals/arrivals1.ogg
diff --git a/sound/ambience/ambigen14.ogg b/sound/ambience/arrivals/arrivals2.ogg
similarity index 100%
rename from sound/ambience/ambigen14.ogg
rename to sound/ambience/arrivals/arrivals2.ogg
diff --git a/sound/ambience/arrivals/arrivals3.ogg b/sound/ambience/arrivals/arrivals3.ogg
new file mode 100644
index 00000000000..d396599d2da
Binary files /dev/null and b/sound/ambience/arrivals/arrivals3.ogg differ
diff --git a/sound/ambience/arrivals/arrivals4.ogg b/sound/ambience/arrivals/arrivals4.ogg
new file mode 100644
index 00000000000..d82763c0e59
Binary files /dev/null and b/sound/ambience/arrivals/arrivals4.ogg differ
diff --git a/sound/ambience/arrivals/arrivals5.ogg b/sound/ambience/arrivals/arrivals5.ogg
new file mode 100644
index 00000000000..0e56fa439ed
Binary files /dev/null and b/sound/ambience/arrivals/arrivals5.ogg differ
diff --git a/sound/ambience/arrivals/arrivals6.ogg b/sound/ambience/arrivals/arrivals6.ogg
new file mode 100644
index 00000000000..d0241cc0e2d
Binary files /dev/null and b/sound/ambience/arrivals/arrivals6.ogg differ
diff --git a/sound/ambience/arrivals/arrivals7.ogg b/sound/ambience/arrivals/arrivals7.ogg
new file mode 100644
index 00000000000..3a609012d97
Binary files /dev/null and b/sound/ambience/arrivals/arrivals7.ogg differ
diff --git a/sound/ambience/atmospherics/atmospherics1.ogg b/sound/ambience/atmospherics/atmospherics1.ogg
new file mode 100644
index 00000000000..006de1c9cc6
Binary files /dev/null and b/sound/ambience/atmospherics/atmospherics1.ogg differ
diff --git a/sound/ambience/atmospherics/atmospherics2.ogg b/sound/ambience/atmospherics/atmospherics2.ogg
new file mode 100644
index 00000000000..315cdfbb048
Binary files /dev/null and b/sound/ambience/atmospherics/atmospherics2.ogg differ
diff --git a/sound/ambience/ambicha1.ogg b/sound/ambience/chapel/chapel1.ogg
similarity index 100%
rename from sound/ambience/ambicha1.ogg
rename to sound/ambience/chapel/chapel1.ogg
diff --git a/sound/ambience/ambicha2.ogg b/sound/ambience/chapel/chapel2.ogg
similarity index 100%
rename from sound/ambience/ambicha2.ogg
rename to sound/ambience/chapel/chapel2.ogg
diff --git a/sound/ambience/ambicha3.ogg b/sound/ambience/chapel/chapel3.ogg
similarity index 100%
rename from sound/ambience/ambicha3.ogg
rename to sound/ambience/chapel/chapel3.ogg
diff --git a/sound/ambience/ambicha4.ogg b/sound/ambience/chapel/chapel4.ogg
similarity index 100%
rename from sound/ambience/ambicha4.ogg
rename to sound/ambience/chapel/chapel4.ogg
diff --git a/sound/ambience/elevator.ogg b/sound/ambience/elevator.ogg
new file mode 100644
index 00000000000..1045d226108
Binary files /dev/null and b/sound/ambience/elevator.ogg differ
diff --git a/sound/ambience/engineering/engineering1.ogg b/sound/ambience/engineering/engineering1.ogg
new file mode 100644
index 00000000000..c832c677d5e
Binary files /dev/null and b/sound/ambience/engineering/engineering1.ogg differ
diff --git a/sound/ambience/engineering/engineering2.ogg b/sound/ambience/engineering/engineering2.ogg
new file mode 100644
index 00000000000..9651049c25b
Binary files /dev/null and b/sound/ambience/engineering/engineering2.ogg differ
diff --git a/sound/ambience/engineering/engineering3.ogg b/sound/ambience/engineering/engineering3.ogg
new file mode 100644
index 00000000000..63afd437a65
Binary files /dev/null and b/sound/ambience/engineering/engineering3.ogg differ
diff --git a/sound/ambience/expoutpost/expoutpost1.ogg b/sound/ambience/expoutpost/expoutpost1.ogg
new file mode 100644
index 00000000000..04b393816fb
Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost1.ogg differ
diff --git a/sound/ambience/expoutpost/expoutpost2.ogg b/sound/ambience/expoutpost/expoutpost2.ogg
new file mode 100644
index 00000000000..6c40d0a32b0
Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost2.ogg differ
diff --git a/sound/ambience/expoutpost/expoutpost3.ogg b/sound/ambience/expoutpost/expoutpost3.ogg
new file mode 100644
index 00000000000..ef9cfba72e2
Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost3.ogg differ
diff --git a/sound/ambience/expoutpost/expoutpost4.ogg b/sound/ambience/expoutpost/expoutpost4.ogg
new file mode 100644
index 00000000000..ad95b9d4750
Binary files /dev/null and b/sound/ambience/expoutpost/expoutpost4.ogg differ
diff --git a/sound/ambience/foreboding/foreboding1.ogg b/sound/ambience/foreboding/foreboding1.ogg
new file mode 100644
index 00000000000..b6e65c0bf62
Binary files /dev/null and b/sound/ambience/foreboding/foreboding1.ogg differ
diff --git a/sound/ambience/foreboding/foreboding2.ogg b/sound/ambience/foreboding/foreboding2.ogg
new file mode 100644
index 00000000000..dde64a9858f
Binary files /dev/null and b/sound/ambience/foreboding/foreboding2.ogg differ
diff --git a/sound/ambience/ambigen9.ogg b/sound/ambience/foreboding/foreboding3.ogg
similarity index 100%
rename from sound/ambience/ambigen9.ogg
rename to sound/ambience/foreboding/foreboding3.ogg
diff --git a/sound/ambience/ambigen10.ogg b/sound/ambience/foreboding/foreboding4.ogg
similarity index 100%
rename from sound/ambience/ambigen10.ogg
rename to sound/ambience/foreboding/foreboding4.ogg
diff --git a/sound/ambience/ambigen11.ogg b/sound/ambience/foreboding/foreboding5.ogg
similarity index 100%
rename from sound/ambience/ambigen11.ogg
rename to sound/ambience/foreboding/foreboding5.ogg
diff --git a/sound/ambience/ambigen12.ogg b/sound/ambience/foreboding/foreboding6.ogg
similarity index 100%
rename from sound/ambience/ambigen12.ogg
rename to sound/ambience/foreboding/foreboding6.ogg
diff --git a/sound/ambience/ambigen3.ogg b/sound/ambience/generic/generic1.ogg
similarity index 100%
rename from sound/ambience/ambigen3.ogg
rename to sound/ambience/generic/generic1.ogg
diff --git a/sound/ambience/ambigen4.ogg b/sound/ambience/generic/generic2.ogg
similarity index 100%
rename from sound/ambience/ambigen4.ogg
rename to sound/ambience/generic/generic2.ogg
diff --git a/sound/ambience/ambigen5.ogg b/sound/ambience/generic/generic3.ogg
similarity index 100%
rename from sound/ambience/ambigen5.ogg
rename to sound/ambience/generic/generic3.ogg
diff --git a/sound/ambience/ambigen6.ogg b/sound/ambience/generic/generic4.ogg
similarity index 100%
rename from sound/ambience/ambigen6.ogg
rename to sound/ambience/generic/generic4.ogg
diff --git a/sound/ambience/generic/generic5.ogg b/sound/ambience/generic/generic5.ogg
new file mode 100644
index 00000000000..f4f3707d3d9
Binary files /dev/null and b/sound/ambience/generic/generic5.ogg differ
diff --git a/sound/ambience/generic/generic6.ogg b/sound/ambience/generic/generic6.ogg
new file mode 100644
index 00000000000..fb1c8aef1b3
Binary files /dev/null and b/sound/ambience/generic/generic6.ogg differ
diff --git a/sound/ambience/generic/generic7.ogg b/sound/ambience/generic/generic7.ogg
new file mode 100644
index 00000000000..03a40fe7917
Binary files /dev/null and b/sound/ambience/generic/generic7.ogg differ
diff --git a/sound/ambience/generic/generic8.ogg b/sound/ambience/generic/generic8.ogg
new file mode 100644
index 00000000000..c4436a5ede6
Binary files /dev/null and b/sound/ambience/generic/generic8.ogg differ
diff --git a/sound/ambience/ambimo1.ogg b/sound/ambience/ghostly/ghostly1.ogg
similarity index 100%
rename from sound/ambience/ambimo1.ogg
rename to sound/ambience/ghostly/ghostly1.ogg
diff --git a/sound/ambience/ambimo2.ogg b/sound/ambience/ghostly/ghostly2.ogg
similarity index 100%
rename from sound/ambience/ambimo2.ogg
rename to sound/ambience/ghostly/ghostly2.ogg
diff --git a/sound/ambience/hangar/hangar1.ogg b/sound/ambience/hangar/hangar1.ogg
new file mode 100644
index 00000000000..6fea9fc0f5b
Binary files /dev/null and b/sound/ambience/hangar/hangar1.ogg differ
diff --git a/sound/ambience/hangar/hangar2.ogg b/sound/ambience/hangar/hangar2.ogg
new file mode 100644
index 00000000000..1c8a63424c8
Binary files /dev/null and b/sound/ambience/hangar/hangar2.ogg differ
diff --git a/sound/ambience/hangar/hangar3.ogg b/sound/ambience/hangar/hangar3.ogg
new file mode 100644
index 00000000000..4518a70a943
Binary files /dev/null and b/sound/ambience/hangar/hangar3.ogg differ
diff --git a/sound/ambience/hangar/hangar4.ogg b/sound/ambience/hangar/hangar4.ogg
new file mode 100644
index 00000000000..a28c914c9ed
Binary files /dev/null and b/sound/ambience/hangar/hangar4.ogg differ
diff --git a/sound/ambience/hangar/hangar5.ogg b/sound/ambience/hangar/hangar5.ogg
new file mode 100644
index 00000000000..cef20f5628b
Binary files /dev/null and b/sound/ambience/hangar/hangar5.ogg differ
diff --git a/sound/ambience/hangar/hangar6.ogg b/sound/ambience/hangar/hangar6.ogg
new file mode 100644
index 00000000000..938cb83f195
Binary files /dev/null and b/sound/ambience/hangar/hangar6.ogg differ
diff --git a/sound/ambience/highsec/highsec1.ogg b/sound/ambience/highsec/highsec1.ogg
new file mode 100644
index 00000000000..265b51f2c9b
Binary files /dev/null and b/sound/ambience/highsec/highsec1.ogg differ
diff --git a/sound/ambience/highsec/highsec2.ogg b/sound/ambience/highsec/highsec2.ogg
new file mode 100644
index 00000000000..761c63a4809
Binary files /dev/null and b/sound/ambience/highsec/highsec2.ogg differ
diff --git a/sound/ambience/highsec/highsec3.ogg b/sound/ambience/highsec/highsec3.ogg
new file mode 100644
index 00000000000..87318e62039
Binary files /dev/null and b/sound/ambience/highsec/highsec3.ogg differ
diff --git a/sound/ambience/highsec/highsec4.ogg b/sound/ambience/highsec/highsec4.ogg
new file mode 100644
index 00000000000..9fb613e031b
Binary files /dev/null and b/sound/ambience/highsec/highsec4.ogg differ
diff --git a/sound/ambience/holy/holy1.ogg b/sound/ambience/holy/holy1.ogg
new file mode 100644
index 00000000000..cd53dc2789c
Binary files /dev/null and b/sound/ambience/holy/holy1.ogg differ
diff --git a/sound/ambience/holy/holy2.ogg b/sound/ambience/holy/holy2.ogg
new file mode 100644
index 00000000000..4532dd0a815
Binary files /dev/null and b/sound/ambience/holy/holy2.ogg differ
diff --git a/sound/ambience/lava/lava1.ogg b/sound/ambience/lava/lava1.ogg
new file mode 100644
index 00000000000..b552965faac
Binary files /dev/null and b/sound/ambience/lava/lava1.ogg differ
diff --git a/sound/ambience/ambigen7.ogg b/sound/ambience/maintenance/maintenance1.ogg
similarity index 100%
rename from sound/ambience/ambigen7.ogg
rename to sound/ambience/maintenance/maintenance1.ogg
diff --git a/sound/ambience/maintenance/maintenance10.ogg b/sound/ambience/maintenance/maintenance10.ogg
new file mode 100644
index 00000000000..13b07ee8030
Binary files /dev/null and b/sound/ambience/maintenance/maintenance10.ogg differ
diff --git a/sound/ambience/maintenance/maintenance11.ogg b/sound/ambience/maintenance/maintenance11.ogg
new file mode 100644
index 00000000000..dc3cd9a5897
Binary files /dev/null and b/sound/ambience/maintenance/maintenance11.ogg differ
diff --git a/sound/ambience/maintenance/maintenance12.ogg b/sound/ambience/maintenance/maintenance12.ogg
new file mode 100644
index 00000000000..728049f3ede
Binary files /dev/null and b/sound/ambience/maintenance/maintenance12.ogg differ
diff --git a/sound/ambience/ambigen8.ogg b/sound/ambience/maintenance/maintenance2.ogg
similarity index 100%
rename from sound/ambience/ambigen8.ogg
rename to sound/ambience/maintenance/maintenance2.ogg
diff --git a/sound/ambience/maintenance/maintenance3.ogg b/sound/ambience/maintenance/maintenance3.ogg
new file mode 100644
index 00000000000..4214afd9b8b
Binary files /dev/null and b/sound/ambience/maintenance/maintenance3.ogg differ
diff --git a/sound/ambience/maintenance/maintenance4.ogg b/sound/ambience/maintenance/maintenance4.ogg
new file mode 100644
index 00000000000..2a8177f274d
Binary files /dev/null and b/sound/ambience/maintenance/maintenance4.ogg differ
diff --git a/sound/ambience/maintenance/maintenance5.ogg b/sound/ambience/maintenance/maintenance5.ogg
new file mode 100644
index 00000000000..604a013a5e2
Binary files /dev/null and b/sound/ambience/maintenance/maintenance5.ogg differ
diff --git a/sound/ambience/maintenance/maintenance6.ogg b/sound/ambience/maintenance/maintenance6.ogg
new file mode 100644
index 00000000000..522aec4afe4
Binary files /dev/null and b/sound/ambience/maintenance/maintenance6.ogg differ
diff --git a/sound/ambience/maintenance/maintenance7.ogg b/sound/ambience/maintenance/maintenance7.ogg
new file mode 100644
index 00000000000..1fd30f252f0
Binary files /dev/null and b/sound/ambience/maintenance/maintenance7.ogg differ
diff --git a/sound/ambience/maintenance/maintenance8.ogg b/sound/ambience/maintenance/maintenance8.ogg
new file mode 100644
index 00000000000..5d8feb5fd6f
Binary files /dev/null and b/sound/ambience/maintenance/maintenance8.ogg differ
diff --git a/sound/ambience/maintenance/maintenance9.ogg b/sound/ambience/maintenance/maintenance9.ogg
new file mode 100644
index 00000000000..4a8078b344c
Binary files /dev/null and b/sound/ambience/maintenance/maintenance9.ogg differ
diff --git a/sound/ambience/matteralarm.ogg b/sound/ambience/matteralarm.ogg
new file mode 100644
index 00000000000..c341077d360
Binary files /dev/null and b/sound/ambience/matteralarm.ogg differ
diff --git a/sound/ambience/otherworldly/otherworldly1.ogg b/sound/ambience/otherworldly/otherworldly1.ogg
new file mode 100644
index 00000000000..77599fac5bf
Binary files /dev/null and b/sound/ambience/otherworldly/otherworldly1.ogg differ
diff --git a/sound/ambience/otherworldly/otherworldly2.ogg b/sound/ambience/otherworldly/otherworldly2.ogg
new file mode 100644
index 00000000000..3bc051cf5a9
Binary files /dev/null and b/sound/ambience/otherworldly/otherworldly2.ogg differ
diff --git a/sound/ambience/otherworldly/otherworldly3.ogg b/sound/ambience/otherworldly/otherworldly3.ogg
new file mode 100644
index 00000000000..3ef1211897d
Binary files /dev/null and b/sound/ambience/otherworldly/otherworldly3.ogg differ
diff --git a/sound/ambience/ruins/ruins1.ogg b/sound/ambience/ruins/ruins1.ogg
new file mode 100644
index 00000000000..ff4cef4a415
Binary files /dev/null and b/sound/ambience/ruins/ruins1.ogg differ
diff --git a/sound/ambience/ruins/ruins2.ogg b/sound/ambience/ruins/ruins2.ogg
new file mode 100644
index 00000000000..2dc408e2b69
Binary files /dev/null and b/sound/ambience/ruins/ruins2.ogg differ
diff --git a/sound/ambience/ruins/ruins3.ogg b/sound/ambience/ruins/ruins3.ogg
new file mode 100644
index 00000000000..ad56a915f92
Binary files /dev/null and b/sound/ambience/ruins/ruins3.ogg differ
diff --git a/sound/ambience/ruins/ruins4.ogg b/sound/ambience/ruins/ruins4.ogg
new file mode 100644
index 00000000000..2073b5a2770
Binary files /dev/null and b/sound/ambience/ruins/ruins4.ogg differ
diff --git a/sound/ambience/ruins/ruins5.ogg b/sound/ambience/ruins/ruins5.ogg
new file mode 100644
index 00000000000..4b6c79a72d5
Binary files /dev/null and b/sound/ambience/ruins/ruins5.ogg differ
diff --git a/sound/ambience/ruins/ruins6.ogg b/sound/ambience/ruins/ruins6.ogg
new file mode 100644
index 00000000000..ed88fcd52d4
Binary files /dev/null and b/sound/ambience/ruins/ruins6.ogg differ
diff --git a/sound/ambience/seag1.ogg b/sound/ambience/seag1.ogg
deleted file mode 100644
index 8b26eeefc4d..00000000000
Binary files a/sound/ambience/seag1.ogg and /dev/null differ
diff --git a/sound/ambience/seag2.ogg b/sound/ambience/seag2.ogg
deleted file mode 100644
index b0c714b77b9..00000000000
Binary files a/sound/ambience/seag2.ogg and /dev/null differ
diff --git a/sound/ambience/seag3.ogg b/sound/ambience/seag3.ogg
deleted file mode 100644
index 6385e87e1d9..00000000000
Binary files a/sound/ambience/seag3.ogg and /dev/null differ
diff --git a/sound/ambience/shore.ogg b/sound/ambience/shore.ogg
deleted file mode 100644
index d3edf179616..00000000000
Binary files a/sound/ambience/shore.ogg and /dev/null differ
diff --git a/sound/ambience/ambisin1.ogg b/sound/ambience/singularity/singularity1.ogg
similarity index 100%
rename from sound/ambience/ambisin1.ogg
rename to sound/ambience/singularity/singularity1.ogg
diff --git a/sound/ambience/ambisin2.ogg b/sound/ambience/singularity/singularity2.ogg
similarity index 100%
rename from sound/ambience/ambisin2.ogg
rename to sound/ambience/singularity/singularity2.ogg
diff --git a/sound/ambience/ambisin3.ogg b/sound/ambience/singularity/singularity3.ogg
similarity index 100%
rename from sound/ambience/ambisin3.ogg
rename to sound/ambience/singularity/singularity3.ogg
diff --git a/sound/ambience/ambisin4.ogg b/sound/ambience/singularity/singularity4.ogg
similarity index 100%
rename from sound/ambience/ambisin4.ogg
rename to sound/ambience/singularity/singularity4.ogg
diff --git a/sound/ambience/space/aurora_caelus.ogg b/sound/ambience/space/aurora_caelus.ogg
new file mode 100644
index 00000000000..655e47fc3b4
Binary files /dev/null and b/sound/ambience/space/aurora_caelus.ogg differ
diff --git a/sound/ambience/space/space1.ogg b/sound/ambience/space/space1.ogg
new file mode 100644
index 00000000000..44b4c62c36e
Binary files /dev/null and b/sound/ambience/space/space1.ogg differ
diff --git a/sound/ambience/space/space_serithi.ogg b/sound/ambience/space/space_serithi.ogg
new file mode 100644
index 00000000000..b83f2220809
Binary files /dev/null and b/sound/ambience/space/space_serithi.ogg differ
diff --git a/sound/ambience/substation/substation1.ogg b/sound/ambience/substation/substation1.ogg
new file mode 100644
index 00000000000..5aa2dd36c1e
Binary files /dev/null and b/sound/ambience/substation/substation1.ogg differ
diff --git a/sound/ambience/substation/substation2.ogg b/sound/ambience/substation/substation2.ogg
new file mode 100644
index 00000000000..837fbe1b918
Binary files /dev/null and b/sound/ambience/substation/substation2.ogg differ
diff --git a/sound/ambience/substation/substation3.ogg b/sound/ambience/substation/substation3.ogg
new file mode 100644
index 00000000000..02c6899f4d9
Binary files /dev/null and b/sound/ambience/substation/substation3.ogg differ
diff --git a/sound/ambience/substation/substation4.ogg b/sound/ambience/substation/substation4.ogg
new file mode 100644
index 00000000000..1220751a184
Binary files /dev/null and b/sound/ambience/substation/substation4.ogg differ
diff --git a/sound/ambience/substation/substation5.ogg b/sound/ambience/substation/substation5.ogg
new file mode 100644
index 00000000000..23f55a302de
Binary files /dev/null and b/sound/ambience/substation/substation5.ogg differ
diff --git a/sound/ambience/substation/substation6.ogg b/sound/ambience/substation/substation6.ogg
new file mode 100644
index 00000000000..ee39656907e
Binary files /dev/null and b/sound/ambience/substation/substation6.ogg differ
diff --git a/sound/ambience/substation/substation7.ogg b/sound/ambience/substation/substation7.ogg
new file mode 100644
index 00000000000..fd2b7372b67
Binary files /dev/null and b/sound/ambience/substation/substation7.ogg differ
diff --git a/sound/ambience/substation/substation8.ogg b/sound/ambience/substation/substation8.ogg
new file mode 100644
index 00000000000..770ca2c8a31
Binary files /dev/null and b/sound/ambience/substation/substation8.ogg differ
diff --git a/sound/ambience/tech_ruins/tech_ruins1.ogg b/sound/ambience/tech_ruins/tech_ruins1.ogg
new file mode 100644
index 00000000000..5f21514e5c4
Binary files /dev/null and b/sound/ambience/tech_ruins/tech_ruins1.ogg differ
diff --git a/sound/ambience/tech_ruins/tech_ruins2.ogg b/sound/ambience/tech_ruins/tech_ruins2.ogg
new file mode 100644
index 00000000000..bd6428bff3e
Binary files /dev/null and b/sound/ambience/tech_ruins/tech_ruins2.ogg differ
diff --git a/sound/ambience/tech_ruins/tech_ruins3.ogg b/sound/ambience/tech_ruins/tech_ruins3.ogg
new file mode 100644
index 00000000000..effd23b1326
Binary files /dev/null and b/sound/ambience/tech_ruins/tech_ruins3.ogg differ
diff --git a/sound/ambience/tension/argitoth.ogg b/sound/ambience/tension/argitoth.ogg
new file mode 100644
index 00000000000..f1bc3331abd
Binary files /dev/null and b/sound/ambience/tension/argitoth.ogg differ
diff --git a/sound/ambience/tension/burning_terror.ogg b/sound/ambience/tension/burning_terror.ogg
new file mode 100644
index 00000000000..acb4e32f3ba
Binary files /dev/null and b/sound/ambience/tension/burning_terror.ogg differ
diff --git a/sound/ambience/tension/horror.ogg b/sound/ambience/tension/horror.ogg
new file mode 100644
index 00000000000..4be21a786e9
Binary files /dev/null and b/sound/ambience/tension/horror.ogg differ
diff --git a/sound/ambience/tension/tension.ogg b/sound/ambience/tension/tension.ogg
new file mode 100644
index 00000000000..2d3e9dfb4e0
Binary files /dev/null and b/sound/ambience/tension/tension.ogg differ
diff --git a/sound/ambience/vote_alarm.ogg b/sound/ambience/vote_alarm.ogg
new file mode 100644
index 00000000000..0df767c0d23
Binary files /dev/null and b/sound/ambience/vote_alarm.ogg differ