diff --git a/code/controllers/subsystems/evacuation/evacuation.dm b/code/controllers/subsystems/evacuation/evacuation.dm
index d1fc61954eb..2eadf2b7547 100644
--- a/code/controllers/subsystems/evacuation/evacuation.dm
+++ b/code/controllers/subsystems/evacuation/evacuation.dm
@@ -115,13 +115,13 @@ var/datum/evacuation_controller/evacuation_controller
 	auto_recall_time =  null
 
 	if(emergency_evacuation)
-		evac_recalled.Announce(current_map.emergency_shuttle_recall_message)
+		evac_recalled.Announce(current_map.emergency_shuttle_recall_message, new_sound = 'sound/AI/emergency_shuttle_recall_message.ogg')
 		for(var/area/A in all_areas)
 			if(istype(A, /area/hallway))
 				A.readyreset()
 		emergency_evacuation = 0
 	else
-		priority_announcement.Announce(current_map.shuttle_recall_message)
+		priority_announcement.Announce(current_map.shuttle_recall_message, new_sound = 'sound/AI/bluespace_jump_recalled.ogg')
 
 	return TRUE
 
@@ -130,9 +130,9 @@ var/datum/evacuation_controller/evacuation_controller
 
 	var/estimated_time = round(get_eta()/60,1)
 	if (emergency_evacuation)
-		evac_waiting.Announce(replacetext(current_map.emergency_shuttle_docked_message, "%ETA%", "[estimated_time] minute\s"), new_sound = sound('sound/AI/emergencyshuttledock.ogg'))
+		evac_waiting.Announce(replacetext(current_map.emergency_shuttle_docked_message, "%ETA%", "[estimated_time] minute\s"), new_sound = sound('sound/AI/emergency_shuttle_docked.ogg'))
 	else
-		priority_announcement.Announce(replacetext(replacetext(current_map.shuttle_docked_message, "%dock%", "[current_map.dock_name]"), "%ETA%", "[estimated_time] minute\s"), new_sound = sound('sound/AI/shuttledock.ogg'))
+		priority_announcement.Announce(replacetext(replacetext(current_map.shuttle_docked_message, "%dock%", "[current_map.dock_name]"), "%ETA%", "[estimated_time] minute\s"), new_sound = sound('sound/AI/bluespace_jump_docked.ogg'))
 
 /datum/evacuation_controller/proc/launch_evacuation()
 	if(waiting_to_leave())
@@ -141,9 +141,9 @@ var/datum/evacuation_controller/evacuation_controller
 	state = EVAC_IN_TRANSIT
 
 	if (emergency_evacuation)
-		priority_announcement.Announce(replacetext(replacetext(current_map.emergency_shuttle_leaving_dock, "%dock%", "[current_map.dock_name]"),  "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+		priority_announcement.Announce(replacetext(replacetext(current_map.emergency_shuttle_leaving_dock, "%dock%", "[current_map.dock_name]"),  "%ETA%", "[round(get_eta()/60,1)] minute\s"), new_sound = sound('sound/AI/emergency_shuttle_leaving_dock.ogg'))
 	else
-		priority_announcement.Announce(replacetext(replacetext(current_map.shuttle_leaving_dock, "%dock%", "[current_map.dock_name]"),  "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+		priority_announcement.Announce(replacetext(replacetext(current_map.shuttle_leaving_dock, "%dock%", "[current_map.dock_name]"),  "%ETA%", "[round(get_eta()/60,1)] minute\s"), new_sound = sound('sound/AI/bluespace_jump_leaving.ogg'))
 
 	return TRUE
 
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 4136aaa24cf..69106f6473c 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -105,7 +105,7 @@
 	return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name
 
 /proc/level_seven_announcement()
-	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
+	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/level_seven_biohazard.ogg')
 
 /proc/ion_storm_announcement()
 	command_announcement.Announce("It has come to our attention that the station passed through an ion storm.  Please monitor all electronic equipment for malfunctions.", "Anomaly Alert")
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index f03cc560f4d..fb3ca7e3a0d 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -21,7 +21,7 @@ var/hadevent    = 0
 				randmutg(H)
 				domutcheck(H,null,MUTCHK_FORCED)
 	sleep(100)
-	command_announcement.Announce("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
+	command_announcement.Announce("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert")
 
 
 
@@ -70,11 +70,11 @@ var/hadevent    = 0
 			new /mob/living/simple_animal/hostile/carp(C.loc)
 	//sleep(100)
 	spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes.
-		command_announcement.Announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", new_sound = 'sound/AI/commandreport.ogg')
+		command_announcement.Announce("Attention: unknown biological entities have been detected near the [station_name()]'s exterior.", "Lifesign Sensor Array Alert", new_sound = 'sound/AI/commandreport.ogg')
 
 /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights
 	if(isEvent)
-		command_announcement.Announce("An Electrical storm has been detected in your area, please repair potential electronic overloads.","Electrical Storm Alert")
+		command_announcement.Announce("Attention: an electrical storm has been detected in your sector, please repair potential electronic overloads.", "Electrical Storm Alert")
 
 	if(lightsoutAmount)
 		var/list/epicentreList = list()
diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm
index 5ab45452af1..354768f4e64 100644
--- a/code/game/gamemodes/events/power_failure.dm
+++ b/code/game/gamemodes/events/power_failure.dm
@@ -1,7 +1,7 @@
 
 /proc/power_failure(var/announce = 1, var/severity = 2)
 	if(announce)
-		command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg')
+		command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the ship's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg')
 
 	for(var/obj/machinery/power/smes/buildable/S in SSpower.smes_units)
 		if(!S.is_critical)
@@ -16,7 +16,7 @@
 	var/list/skipped_areas = list(/area/turret_protected/ai)
 
 	if(announce)
-		command_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
+		command_announcement.Announce("The ship's power subroutines have been stabilized and restored.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/apc/C in SSmachinery.processing_machines)
 		if(C.cell && isStationLevel(C.z))
 			C.cell.charge = C.cell.maxcharge
@@ -31,7 +31,7 @@
 /proc/power_restore_quick(var/announce = 1)
 
 	if(announce)
-		command_announcement.Announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
+		command_announcement.Announce("The ship's power subroutines have been stabilized and restored.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
 	for(var/obj/machinery/power/smes/S in SSpower.smes_units)
 		if(isNotStationLevel(S.z))
 			continue
diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index 74cc42ee3df..644e5fd195a 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -23,7 +23,7 @@
 	for (var/zlevel in affecting_z)
 		if(zlevel in current_map.station_levels)
 			var/announcement = ""
-			var/soundfile = 'sound/AI/spacecarp.ogg'
+			var/soundfile = 'sound/AI/carp_migration.ogg'
 			if(severity == EVENT_LEVEL_MAJOR && deploy_drones)
 				announcement = "Massive migration of unknown biological entities has been detected near [location_name()], please stand-by. The NDV Icarus has dispatched combat drones to assist."
 				soundfile = 'sound/AI/massivespacecarp.ogg'
diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm
index 4bc7fcc4bf1..fff5cd0c7e5 100644
--- a/code/modules/events/communications_blackout.dm
+++ b/code/modules/events/communications_blackout.dm
@@ -16,7 +16,7 @@
 			to_chat(A, "<br>")
 
 	if(prob(30))	//most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
-		command_announcement.Announce(alert, new_sound = sound('sound/AI/ionospheric.ogg', volume=25))
+		command_announcement.Announce(alert, volume=25)
 		return
 	return 1
 
diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm
index c1b6d7a10ad..cd45ca930da 100644
--- a/code/modules/events/electrical_storm.dm
+++ b/code/modules/events/electrical_storm.dm
@@ -11,11 +11,11 @@
 		if(zlevel in current_map.station_levels)
 			switch(severity)
 				if(EVENT_LEVEL_MUNDANE)
-					command_announcement.Announce("A minor electrical storm has been detected near the [location_name()]. Please watch out for possible electrical discharges.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
+					command_announcement.Announce("A minor electrical storm has been detected near the [location_name()]. Please watch out for possible electrical discharges.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electrical_storm.ogg')
 				if(EVENT_LEVEL_MODERATE)
-					command_announcement.Announce("The [location_name()] is about to pass through an electrical storm. Please secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
+					command_announcement.Announce("The [location_name()] is about to pass through an electrical storm. Please secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electrical_storm.ogg')
 				if(EVENT_LEVEL_MAJOR)
-					command_announcement.Announce("Alert. A strong electrical storm has been detected in proximity of the [location_name()]. It is recommended to immediately secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg')
+					command_announcement.Announce("Alert. A strong electrical storm has been detected in proximity of the [location_name()]. It is recommended to immediately secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electrical_storm.ogg')
 			break
 
 /datum/event/electrical_storm/start()
diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm
index effc1c0e4a0..f2127be7d9e 100644
--- a/code/modules/events/meteors.dm
+++ b/code/modules/events/meteors.dm
@@ -110,17 +110,17 @@
 /datum/event/meteor_wave/downed_ship/announce()
 	for (var/zlevel in affecting_z)
 		if(zlevel in current_map.station_levels)
-			command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/unknownvesseldowned.ogg')
+			command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_end_message.ogg')
 			break
 
 /datum/event/meteor_wave/downed_ship/start()
-	command_announcement.Announce(current_map.ship_meteor_contact_message, "Ship Debris Alert")
+	command_announcement.Announce(current_map.ship_meteor_contact_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_contact_message.ogg')
 
 /datum/event/meteor_wave/downed_ship/end(var/faked)
 	if(faked)
 		return
 	spawn(100)//We give 10 seconds before announcing, for the last wave of meteors to hit the station
-		command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert")
+		command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/meteor_end_message.ogg')
 
 /datum/event/meteor_wave/overmap
 	next_meteor_lower = 5
@@ -136,17 +136,17 @@
 /datum/event/meteor_wave/dust/announce()
 	for (var/zlevel in affecting_z)
 		if(zlevel in current_map.station_levels)
-			command_announcement.Announce(current_map.dust_detected_message, "Dust Belt Alert")
+			command_announcement.Announce(current_map.dust_detected_message, "Dust Belt Alert", new_sound = 'sound/AI/dust_detected_message.ogg')
 			break
 
 /datum/event/meteor_wave/dust/start()
-	command_announcement.Announce(current_map.dust_contact_message, "Dust Belt Alert")
+	command_announcement.Announce(current_map.dust_contact_message, "Dust Belt Alert", new_sound = 'sound/AI/dust_contact_message.ogg')
 
 /datum/event/meteor_wave/dust/end(var/faked)
 	if(faked)
 		return
 	spawn(100)//We give 10 seconds before announcing, for the last wave of meteors to hit the station
-		command_announcement.Announce(current_map.dust_end_message, "Dust Belt Alert")
+		command_announcement.Announce(current_map.dust_end_message, "Dust Belt Alert", , new_sound = 'sound/AI/dust_end_message.ogg')
 
 /datum/event/meteor_wave/dust/get_meteors()
 	return meteors_dust
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index 4be1c2c2cb1..fc00ddefc61 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -11,7 +11,7 @@
 	ic_name = "radiation"
 
 /datum/event/radiation_storm/announce()
-	command_announcement.Announce(current_map.radiation_detected_message, "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
+	command_announcement.Announce(current_map.radiation_detected_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_detected_message.ogg')
 
 /datum/event/radiation_storm/start()
 	make_maint_all_access()
@@ -19,7 +19,7 @@
 
 /datum/event/radiation_storm/tick()
 	if(activeFor == enterBelt)
-		command_announcement.Announce(current_map.radiation_contact_message, "Anomaly Alert")
+		command_announcement.Announce(current_map.radiation_contact_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_contact_message.ogg')
 		radiate()
 
 	if(activeFor >= enterBelt && activeFor <= leaveBelt)
@@ -30,7 +30,7 @@
 		radiate()
 
 	else if(activeFor == leaveBelt)
-		command_announcement.Announce(current_map.radiation_end_message, "Anomaly Alert")
+		command_announcement.Announce(current_map.radiation_end_message, "Radiation Sensor Array Automated Alert", new_sound = 'sound/AI/radiation_end_message.ogg')
 		lights()
 
 /datum/event/radiation_storm/proc/radiate()
diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm
index 6d49cc27208..afbe0fc58a7 100644
--- a/code/modules/events/rogue_drones.dm
+++ b/code/modules/events/rogue_drones.dm
@@ -18,7 +18,15 @@
 			D.disabled = rand(15, 60)
 
 /datum/event/rogue_drone/announce()
-	command_announcement.Announce(pick(current_map.rogue_drone_detected_messages), "Rogue drone alert", new_sound = 'sound/AI/combatdrones.ogg')
+	var/message_index = rand(1, length(current_map.rogue_drone_detected_messages))
+	var/message = current_map.rogue_drone_detected_messages[message_index]
+	var/list/possible_sounds = list('sound/AI/rogue_drone_detected_message_1.ogg', 'sound/AI/rogue_drone_detected_message_2.ogg')
+	var/our_sound
+	if(length(current_map.rogue_drone_detected_messages > possible_sounds))
+		our_sound = possible_sounds[message_index]
+	else
+		our_sound = possible_sounds[1]
+	command_announcement.Announce(message, "Rogue Drone Alert", new_sound = our_sound)
 
 /datum/event/rogue_drone/end(var/faked)
 	var/num_recovered = 0
@@ -30,6 +38,6 @@
 
 	if(!faked)
 		if(num_recovered > length(drones_list) * 0.75)
-			command_announcement.Announce(current_map.rogue_drone_end_message, "Rogue drone alert")
+			command_announcement.Announce(current_map.rogue_drone_end_message, "Rogue Drone Alert", new_sound = 'sound/AI/rogue_drone_end_message.ogg')
 		else
-			command_announcement.Announce(current_map.rogue_drone_destroyed_message, "Rogue drone alert")
+			command_announcement.Announce(current_map.rogue_drone_destroyed_message, "Rogue Drone Alert", new_sound = 'sound/AI/rogue_drone_destroyed_message.ogg')
diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm
index 39a44ea52b8..5c6fdde8e34 100644
--- a/maps/sccv_horizon/code/sccv_horizon.dm
+++ b/maps/sccv_horizon/code/sccv_horizon.dm
@@ -57,16 +57,16 @@
 		NETWORK_INTREPID
 	)
 
-	shuttle_docked_message = "Attention all hands: Jump preparation complete. The bluespace drive is now spooling up, secure all stations for departure. Time to jump: approximately %ETA%."
-	shuttle_leaving_dock = "Attention all hands: Jump initiated, exiting bluespace in %ETA%."
-	shuttle_called_message = "Attention all hands: Jump sequence initiated. Transit procedures are now in effect. Jump in %ETA%."
-	shuttle_recall_message = "Attention all hands: Jump sequence aborted, return to normal operating conditions."
-	emergency_shuttle_docked_message = "The emergency evacuation has started. You have approximately %ETA% minutes to board the emergency pods."
-	emergency_shuttle_leaving_dock = "The emergency evacuatioon has been completed."
-	emergency_shuttle_recall_message = "The emergency evacuation has been canceled."
-	emergency_shuttle_called_message = "An emergency evacuation has been called. It will start in approximately %ETA%."
+	shuttle_docked_message = "Attention all hands: Bluespace jump preparation complete. The bluespace drive is now spooling up, secure all stations for departure. Time to jump: approximately %ETA%."
+	shuttle_leaving_dock = "Attention all hands: Bluespace jump initiated, exiting bluespace in %ETA%."
+	shuttle_called_message = "Attention all hands: Bluespace jump sequence initiated. Transit procedures are now in effect. Jump in %ETA%."
+	shuttle_recall_message = "Attention all hands: Bluespace jump sequence aborted, return to normal operating conditions."
+	emergency_shuttle_docked_message = "Attention all hands: the emergency evacuation has started. You have approximately %ETA% minutes to board the emergency pods."
+	emergency_shuttle_leaving_dock = "Attention all hands: the emergency evacuation has been completed."
+	emergency_shuttle_recall_message = "Attention all hands: the emergency evacuation has been canceled."
+	emergency_shuttle_called_message = "Attention all hands: an emergency evacuation has been called. It will start in approximately %ETA%."
 
-	meteors_detected_message = "A meteor storm has been detected on collision course with the ship. Estimated three minutes until impact, please activate station shields, and seek shelter in the central areas."
+	meteors_detected_message = "A meteor storm has been detected on collision course with the ship. Estimated three minutes until impact, please activate the shielding fields and seek shelter in the central areas."
 	meteor_contact_message = "Contact with meteor wave imminent, all hands brace for impact."
 	meteor_end_message = "The ship has cleared the meteor shower, please return to your stations."
 
diff --git a/sound/AI/Voice how-to.txt b/sound/AI/Voice how-to.txt
index 10c0abed8ff..995203a6b77 100644
--- a/sound/AI/Voice how-to.txt	
+++ b/sound/AI/Voice how-to.txt	
@@ -1,7 +1,7 @@
-1. Get your system to record your web-browser.
-2. Go to https://www.naturalreaders.com/ and select the American heather voice.
-3. Type whatever you want/need and record it.
-4. I used audacity. Set the project rate (hz) to 16000.
+1. Download https://github.com/N3X15/ss13-vox and follow the instructions for setup.
+2. Open create.py, remove line 171 to 174 to get rid of post processing.
+3. Generate lines as normal.
+4. Download Audacity. Set the project rate (hz) to 16000.
 5. Apply reverb, the settings are this: 
 	Room size: 40
 	Pre-delay: 48
@@ -14,5 +14,6 @@
 	Stereo Width (%): 32
 	Wet only: no
 6. Apply amplify with -4.0
+7. In effects, change tempo speed to 15% higher.
 7. Export as .ogg at 10 quality.
 8. Done.
\ No newline at end of file
diff --git a/sound/AI/bluespace_jump_called.ogg b/sound/AI/bluespace_jump_called.ogg
new file mode 100644
index 00000000000..f17ca85a7d1
Binary files /dev/null and b/sound/AI/bluespace_jump_called.ogg differ
diff --git a/sound/AI/bluespace_jump_docked.ogg b/sound/AI/bluespace_jump_docked.ogg
new file mode 100644
index 00000000000..13d2529c878
Binary files /dev/null and b/sound/AI/bluespace_jump_docked.ogg differ
diff --git a/sound/AI/bluespace_jump_leaving.ogg b/sound/AI/bluespace_jump_leaving.ogg
new file mode 100644
index 00000000000..c66b3471a3b
Binary files /dev/null and b/sound/AI/bluespace_jump_leaving.ogg differ
diff --git a/sound/AI/bluespace_jump_recalled.ogg b/sound/AI/bluespace_jump_recalled.ogg
new file mode 100644
index 00000000000..2065d18fca0
Binary files /dev/null and b/sound/AI/bluespace_jump_recalled.ogg differ
diff --git a/sound/AI/brandintelligence.ogg b/sound/AI/brandintelligence.ogg
deleted file mode 100644
index 3bf4246d011..00000000000
Binary files a/sound/AI/brandintelligence.ogg and /dev/null differ
diff --git a/sound/AI/carp_migration.ogg b/sound/AI/carp_migration.ogg
new file mode 100644
index 00000000000..b776ff48ed2
Binary files /dev/null and b/sound/AI/carp_migration.ogg differ
diff --git a/sound/AI/combatdrones.ogg b/sound/AI/combatdrones.ogg
deleted file mode 100644
index e65c82dc3c4..00000000000
Binary files a/sound/AI/combatdrones.ogg and /dev/null differ
diff --git a/sound/AI/commandreport.ogg b/sound/AI/commandreport.ogg
deleted file mode 100644
index 912404222d8..00000000000
Binary files a/sound/AI/commandreport.ogg and /dev/null differ
diff --git a/sound/AI/cozmo_migration.ogg b/sound/AI/cozmo_migration.ogg
deleted file mode 100644
index 33234da73fb..00000000000
Binary files a/sound/AI/cozmo_migration.ogg and /dev/null differ
diff --git a/sound/AI/done.ogg b/sound/AI/done.ogg
deleted file mode 100644
index 6bb67bcbd5f..00000000000
Binary files a/sound/AI/done.ogg and /dev/null differ
diff --git a/sound/AI/dust_contact_message.ogg b/sound/AI/dust_contact_message.ogg
new file mode 100644
index 00000000000..c7f700053b0
Binary files /dev/null and b/sound/AI/dust_contact_message.ogg differ
diff --git a/sound/AI/dust_detected_message.ogg b/sound/AI/dust_detected_message.ogg
new file mode 100644
index 00000000000..ef97bdae8b0
Binary files /dev/null and b/sound/AI/dust_detected_message.ogg differ
diff --git a/sound/AI/dust_end_message.ogg b/sound/AI/dust_end_message.ogg
new file mode 100644
index 00000000000..819565336ab
Binary files /dev/null and b/sound/AI/dust_end_message.ogg differ
diff --git a/sound/AI/electrical_storm.ogg b/sound/AI/electrical_storm.ogg
new file mode 100644
index 00000000000..79403623c58
Binary files /dev/null and b/sound/AI/electrical_storm.ogg differ
diff --git a/sound/AI/electronicoverload.ogg b/sound/AI/electronicoverload.ogg
deleted file mode 100644
index e563386b0e4..00000000000
Binary files a/sound/AI/electronicoverload.ogg and /dev/null differ
diff --git a/sound/AI/emergency_shuttle_called_message.ogg b/sound/AI/emergency_shuttle_called_message.ogg
new file mode 100644
index 00000000000..90266606ee9
Binary files /dev/null and b/sound/AI/emergency_shuttle_called_message.ogg differ
diff --git a/sound/AI/emergency_shuttle_docked.ogg b/sound/AI/emergency_shuttle_docked.ogg
new file mode 100644
index 00000000000..9d79b11af19
Binary files /dev/null and b/sound/AI/emergency_shuttle_docked.ogg differ
diff --git a/sound/AI/emergency_shuttle_leaving_dock.ogg b/sound/AI/emergency_shuttle_leaving_dock.ogg
new file mode 100644
index 00000000000..ab938b2423b
Binary files /dev/null and b/sound/AI/emergency_shuttle_leaving_dock.ogg differ
diff --git a/sound/AI/emergency_shuttle_recall_message.ogg b/sound/AI/emergency_shuttle_recall_message.ogg
new file mode 100644
index 00000000000..aaafd0d87c1
Binary files /dev/null and b/sound/AI/emergency_shuttle_recall_message.ogg differ
diff --git a/sound/AI/emergencyshuttlecalled.ogg b/sound/AI/emergencyshuttlecalled.ogg
deleted file mode 100644
index a1410dce417..00000000000
Binary files a/sound/AI/emergencyshuttlecalled.ogg and /dev/null differ
diff --git a/sound/AI/emergencyshuttledock.ogg b/sound/AI/emergencyshuttledock.ogg
deleted file mode 100644
index e2e9aa51d3a..00000000000
Binary files a/sound/AI/emergencyshuttledock.ogg and /dev/null differ
diff --git a/sound/AI/emergencyshuttlerecalled.ogg b/sound/AI/emergencyshuttlerecalled.ogg
deleted file mode 100644
index 902412c1899..00000000000
Binary files a/sound/AI/emergencyshuttlerecalled.ogg and /dev/null differ
diff --git a/sound/AI/escapepod.ogg b/sound/AI/escapepod.ogg
deleted file mode 100644
index 941660ed9f1..00000000000
Binary files a/sound/AI/escapepod.ogg and /dev/null differ
diff --git a/sound/AI/fun_gi.ogg b/sound/AI/fun_gi.ogg
deleted file mode 100644
index 0859873a708..00000000000
Binary files a/sound/AI/fun_gi.ogg and /dev/null differ
diff --git a/sound/AI/fun_guy.ogg b/sound/AI/fun_guy.ogg
deleted file mode 100644
index ab600069a91..00000000000
Binary files a/sound/AI/fun_guy.ogg and /dev/null differ
diff --git a/sound/AI/fungi.ogg b/sound/AI/fungi.ogg
deleted file mode 100644
index 22ec9e0a29f..00000000000
Binary files a/sound/AI/fungi.ogg and /dev/null differ
diff --git a/sound/AI/funguy.ogg b/sound/AI/funguy.ogg
deleted file mode 100644
index 3af0e6a64d8..00000000000
Binary files a/sound/AI/funguy.ogg and /dev/null differ
diff --git a/sound/AI/ionospheric.ogg b/sound/AI/ionospheric.ogg
deleted file mode 100644
index 180dd92640f..00000000000
Binary files a/sound/AI/ionospheric.ogg and /dev/null differ
diff --git a/sound/AI/ionstorm.ogg b/sound/AI/ionstorm.ogg
deleted file mode 100644
index 226f021a358..00000000000
Binary files a/sound/AI/ionstorm.ogg and /dev/null differ
diff --git a/sound/AI/level_7_biohazard.ogg b/sound/AI/level_7_biohazard.ogg
new file mode 100644
index 00000000000..76ef41fb038
Binary files /dev/null and b/sound/AI/level_7_biohazard.ogg differ
diff --git a/sound/AI/massivespacecarp.ogg b/sound/AI/massivespacecarp.ogg
deleted file mode 100644
index 0bb7f1c4b90..00000000000
Binary files a/sound/AI/massivespacecarp.ogg and /dev/null differ
diff --git a/sound/AI/meteor_contact_message.ogg b/sound/AI/meteor_contact_message.ogg
new file mode 100644
index 00000000000..4d20306d9bd
Binary files /dev/null and b/sound/AI/meteor_contact_message.ogg differ
diff --git a/sound/AI/meteor_detected_end_message.ogg b/sound/AI/meteor_detected_end_message.ogg
new file mode 100644
index 00000000000..32fb644a3ec
Binary files /dev/null and b/sound/AI/meteor_detected_end_message.ogg differ
diff --git a/sound/AI/meteor_end_message.ogg b/sound/AI/meteor_end_message.ogg
new file mode 100644
index 00000000000..0981dab3180
Binary files /dev/null and b/sound/AI/meteor_end_message.ogg differ
diff --git a/sound/AI/meteors.ogg b/sound/AI/meteors.ogg
deleted file mode 100644
index 8aecec250b7..00000000000
Binary files a/sound/AI/meteors.ogg and /dev/null differ
diff --git a/sound/AI/meteors_contact_message.ogg b/sound/AI/meteors_contact_message.ogg
new file mode 100644
index 00000000000..5c196e8e925
Binary files /dev/null and b/sound/AI/meteors_contact_message.ogg differ
diff --git a/sound/AI/meteors_detected_message.ogg b/sound/AI/meteors_detected_message.ogg
new file mode 100644
index 00000000000..46efb6a34d1
Binary files /dev/null and b/sound/AI/meteors_detected_message.ogg differ
diff --git a/sound/AI/newAI.ogg b/sound/AI/newAI.ogg
deleted file mode 100644
index 14ef97e546f..00000000000
Binary files a/sound/AI/newAI.ogg and /dev/null differ
diff --git a/sound/AI/newroundsexy.ogg b/sound/AI/newroundsexy.ogg
deleted file mode 100644
index 5f48c09e85e..00000000000
Binary files a/sound/AI/newroundsexy.ogg and /dev/null differ
diff --git a/sound/AI/newroundsexy2.ogg b/sound/AI/newroundsexy2.ogg
deleted file mode 100644
index 531bba10014..00000000000
Binary files a/sound/AI/newroundsexy2.ogg and /dev/null differ
diff --git a/sound/AI/outbreak5.ogg b/sound/AI/outbreak5.ogg
deleted file mode 100644
index f00423eeb92..00000000000
Binary files a/sound/AI/outbreak5.ogg and /dev/null differ
diff --git a/sound/AI/outbreak7.ogg b/sound/AI/outbreak7.ogg
deleted file mode 100644
index e9ee1ea1aed..00000000000
Binary files a/sound/AI/outbreak7.ogg and /dev/null differ
diff --git a/sound/AI/poweroff.ogg b/sound/AI/poweroff.ogg
index 4a758412b15..742a85482db 100644
Binary files a/sound/AI/poweroff.ogg and b/sound/AI/poweroff.ogg differ
diff --git a/sound/AI/poweron.ogg b/sound/AI/poweron.ogg
index 7dfb594dd66..2165a93226f 100644
Binary files a/sound/AI/poweron.ogg and b/sound/AI/poweron.ogg differ
diff --git a/sound/AI/radiation.ogg b/sound/AI/radiation.ogg
deleted file mode 100644
index c2817510e7f..00000000000
Binary files a/sound/AI/radiation.ogg and /dev/null differ
diff --git a/sound/AI/radiation_contact_message.ogg b/sound/AI/radiation_contact_message.ogg
new file mode 100644
index 00000000000..40a83d46e75
Binary files /dev/null and b/sound/AI/radiation_contact_message.ogg differ
diff --git a/sound/AI/radiation_detected_message.ogg b/sound/AI/radiation_detected_message.ogg
new file mode 100644
index 00000000000..43de4ea6717
Binary files /dev/null and b/sound/AI/radiation_detected_message.ogg differ
diff --git a/sound/AI/radiation_end_message.ogg b/sound/AI/radiation_end_message.ogg
new file mode 100644
index 00000000000..5ef7384588d
Binary files /dev/null and b/sound/AI/radiation_end_message.ogg differ
diff --git a/sound/AI/rogue_drone_destroyed_message.ogg b/sound/AI/rogue_drone_destroyed_message.ogg
new file mode 100644
index 00000000000..88d91bcf007
Binary files /dev/null and b/sound/AI/rogue_drone_destroyed_message.ogg differ
diff --git a/sound/AI/rogue_drone_detected_message_1.ogg b/sound/AI/rogue_drone_detected_message_1.ogg
new file mode 100644
index 00000000000..dd9c6470028
Binary files /dev/null and b/sound/AI/rogue_drone_detected_message_1.ogg differ
diff --git a/sound/AI/rogue_drone_detected_message_2.ogg b/sound/AI/rogue_drone_detected_message_2.ogg
new file mode 100644
index 00000000000..d43f980fefa
Binary files /dev/null and b/sound/AI/rogue_drone_detected_message_2.ogg differ
diff --git a/sound/AI/rogue_drone_end_message.ogg b/sound/AI/rogue_drone_end_message.ogg
new file mode 100644
index 00000000000..aaa9ba16bab
Binary files /dev/null and b/sound/AI/rogue_drone_end_message.ogg differ
diff --git a/sound/AI/scrubbers.ogg b/sound/AI/scrubbers.ogg
deleted file mode 100644
index 7dcbf4a25c7..00000000000
Binary files a/sound/AI/scrubbers.ogg and /dev/null differ
diff --git a/sound/AI/shuttlecalled.ogg b/sound/AI/shuttlecalled.ogg
deleted file mode 100644
index dfaa747f556..00000000000
Binary files a/sound/AI/shuttlecalled.ogg and /dev/null differ
diff --git a/sound/AI/shuttledock.ogg b/sound/AI/shuttledock.ogg
deleted file mode 100644
index 75e4a5323e1..00000000000
Binary files a/sound/AI/shuttledock.ogg and /dev/null differ
diff --git a/sound/AI/shuttlerecalled.ogg b/sound/AI/shuttlerecalled.ogg
deleted file mode 100644
index 14f464e6d33..00000000000
Binary files a/sound/AI/shuttlerecalled.ogg and /dev/null differ
diff --git a/sound/AI/spacecarp.ogg b/sound/AI/spacecarp.ogg
deleted file mode 100644
index eaf47c96d81..00000000000
Binary files a/sound/AI/spacecarp.ogg and /dev/null differ
diff --git a/sound/AI/spacedust.ogg b/sound/AI/spacedust.ogg
deleted file mode 100644
index 2ccced30038..00000000000
Binary files a/sound/AI/spacedust.ogg and /dev/null differ
diff --git a/sound/AI/strangeobject.ogg b/sound/AI/strangeobject.ogg
deleted file mode 100644
index d1e7500196a..00000000000
Binary files a/sound/AI/strangeobject.ogg and /dev/null differ
diff --git a/sound/AI/unknownvesseldowned.ogg b/sound/AI/unknownvesseldowned.ogg
deleted file mode 100644
index c961aeced3a..00000000000
Binary files a/sound/AI/unknownvesseldowned.ogg and /dev/null differ
diff --git a/sound/AI/vermin.ogg b/sound/AI/vermin.ogg
deleted file mode 100644
index d37878900c8..00000000000
Binary files a/sound/AI/vermin.ogg and /dev/null differ