diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 96182d31510..abc908b183d 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -166,6 +166,7 @@
 		src.occupant = M
 		update_use_power(2)
 		src.icon_state = "body_scanner_1"
+		playsound(src.loc, 'sound/machines/medbayscanner1.ogg', 50)
 		for(var/obj/Obj in src)
 			Obj.forceMove(src.loc)
 			//Foreach goto(154)
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 6fa0d9a8806..7e1e3f9cd7b 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -349,6 +349,7 @@
 					var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No")
 					if(answer != "No" && pod.growclone(C))
 						temp = "Initiating cloning cycle..."
+						playsound(src.loc, 'sound/machines/medbayscanner1.ogg', 100, 1)
 						records.Remove(C)
 						qdel(C)
 						menu = 1
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index cc90d761f7f..9d8f87fe887 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -15,6 +15,7 @@
 	var/light_power_on = 1
 	var/overlay_layer
 	var/is_holographic = TRUE
+	clicksound = "keyboard"
 
 /obj/machinery/computer/Initialize()
 	. = ..()
diff --git a/code/game/machinery/crusher_piston.dm b/code/game/machinery/crusher_piston.dm
index 0f82f6d453c..4513367d3a3 100644
--- a/code/game/machinery/crusher_piston.dm
+++ b/code/game/machinery/crusher_piston.dm
@@ -188,7 +188,7 @@
 		//If we are idle, flash the warning lights and then put us into pre_start once we are done
 		if(status == "idle")
 			if(initial)
-				playsound(loc, 'sound/machines/airalarm.ogg', 50, 1)	//Plays a beep
+				playsound(src.loc, 'sound/effects/crusher_alarm.ogg', 50, 1)	//Plays a sound
 				initial = 0
 			//TODO: Flash the lights
 			if(timediff > time_stage_pre)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 2a1b535fe82..4a0baebb629 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -38,12 +38,12 @@
 	var/panel_visible_while_open = FALSE
 
 	var/open_sound_powered = 'sound/machines/airlock.ogg'
-	var/close_sound_powered = 'sound/machines/AirlockClose.ogg'
-	var/open_sound_unpowered = 'sound/machines/airlock_creaking.ogg'
-	var/close_sound_unpowered = 'sound/machines/airlock_creaking.ogg'
+	var/close_sound_powered = 'sound/machines/airlockclose.ogg'
+	var/open_sound_unpowered = 'sound/machines/airlock_open_force.ogg'
+	var/close_sound_unpowered = 'sound/machines/airlock_close_force.ogg'
 
-	var/bolts_dropping = 'sound/machines/BoltsDown.ogg'
-	var/bolts_rising = 'sound/machines/BoltsUp.ogg'
+	var/bolts_dropping = 'sound/machines/boltsdown.ogg'
+	var/bolts_rising = 'sound/machines/boltsup.ogg'
 
 	hashatch = 1
 
@@ -86,7 +86,7 @@
 	aiControlDisabled = 1
 	hackProof = 1
 	electrified_until = -1
-	open_sound_powered = 'sound/machines/airlock_creaking.ogg'
+	open_sound_powered = 'sound/machines/airlock_open_force.ogg'
 
 /obj/machinery/door/airlock/security
 	name = "Airlock"
diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm
index 2035570e7d4..18d4ad9da94 100644
--- a/code/game/machinery/doors/blast_door.dm
+++ b/code/game/machinery/doors/blast_door.dm
@@ -20,6 +20,8 @@
 	var/icon_state_opening = null
 	var/icon_state_closed = null
 	var/icon_state_closing = null
+	var/open_sound = 'sound/machines/blastdooropen.ogg'
+	var/close_sound = 'sound/machines/blastdoorclose.ogg'
 	var/damage = BLAST_DOOR_CRUSH_DAMAGE
 	closed_layer = 3.4 // Above airlocks when closed
 	var/id = 1.0
@@ -72,6 +74,7 @@
 // Description: Opens the door. No checks are done inside this proc.
 /obj/machinery/door/blast/proc/force_open()
 	src.operating = 1
+	playsound(src.loc, open_sound, 100, 1)
 	flick(icon_state_opening, src)
 	src.density = 0
 	update_nearby_tiles()
@@ -88,6 +91,7 @@
 	if(density)
 		return 0
 	src.operating = 1
+	playsound(src.loc, close_sound, 100, 1)
 	src.layer = closed_layer
 	flick(icon_state_closing, src)
 	src.density = 1
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index cc2a61dd7fc..638d3387a4c 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -128,6 +128,8 @@ Class Procs:
 	var/printing = 0 // Is this machine currently printing anything?
 	var/tmp/machinery_processing = FALSE	// Are we process()ing in SSmachinery?
 	var/has_special_power_checks = FALSE	// If true, call auto_use_power instead of doing it all in SSmachinery.
+	var/clicksound //played sound on usage
+	var/clickvol = 40 //volume
 
 /obj/machinery/Initialize(mapload, d = 0, populate_components = TRUE)
 	. = ..()
@@ -229,6 +231,8 @@ Class Procs:
 
 /obj/machinery/CouldUseTopic(var/mob/user)
 	..()
+	if(istype (user, /mob/living/carbon))
+		playsound(src, clicksound, clickvol)
 	user.set_machine(src)
 
 /obj/machinery/CouldNotUseTopic(var/mob/user)
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 59464354eb5..8e9e9263ee1 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -147,6 +147,16 @@ var/list/switchsounds = list(
 	'sound/machines/switch3.ogg',
 	'sound/machines/switch4.ogg'
 )
+var/list/keyboardsounds = list(
+	'sound/machines/keyboard/keypress1.ogg',
+	'sound/machines/keyboard/keypress2.ogg',
+	'sound/machines/keyboard/keypress3.ogg',
+	'sound/machines/keyboard/keypress4.ogg',
+	'sound/machines/keyboard/keystroke1.ogg',
+	'sound/machines/keyboard/keystroke2.ogg',
+	'sound/machines/keyboard/keystroke3.ogg',
+	'sound/machines/keyboard/keystroke4.ogg'
+	)
 
 var/list/footstepfx = list("defaultstep","concretestep","grassstep","dirtstep","waterstep","sandstep", "gravelstep")
 
@@ -308,4 +318,5 @@ var/list/footstepfx = list("defaultstep","concretestep","grassstep","dirtstep","
 			if ("gravelstep") soundin = pick(gravelfootsteps)
 			if ("computerbeep") soundin = pick(computerbeeps)
 			if ("switch") soundin = pick(switchsounds)
+			if ("keyboard") soundin = pick(keyboardsounds)
 	return soundin
diff --git a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm
index 86ac3d8b4b5..f6d37f97de2 100644
--- a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm
+++ b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm
@@ -84,7 +84,7 @@
 		message = "Crushing"
 		airlock_close()
 		crush_start()
-
+		
 	if(href_list["abort"])
 		message = "Aborting"
 		crush_stop()
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 4487fa430f9..603bd18c943 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -49,7 +49,7 @@
 	caliber = "10mm"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
 	slot_flags = SLOT_BELT|SLOT_BACK
-	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	fire_sound = 'sound/weapons/gunshot_pistol.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/a10mm
 	allowed_magazines = list(/obj/item/ammo_magazine/a10mm)
@@ -74,7 +74,7 @@
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
 	slot_flags = SLOT_BELT
 	ammo_type = "/obj/item/ammo_casing/c9mmr"
-	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	fire_sound = 'sound/weapons/gunshot_pistol.ogg'
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/mc9mmt/rubber
 	allowed_magazines = list(/obj/item/ammo_magazine/mc9mmt)
@@ -165,7 +165,7 @@
 	caliber = "a556"
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3)
 	ammo_type = "/obj/item/ammo_casing/a556"
-	fire_sound = 'sound/weapons/Gunshot.ogg'
+	fire_sound = 'sound/weapons/rifleshot.ogg'
 	slot_flags = SLOT_BACK
 	load_method = MAGAZINE
 	magazine_type = /obj/item/ammo_magazine/a556
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 3cf312be931..bec07c56ac1 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -103,7 +103,7 @@
 	caliber = "10mm"
 	accuracy = 1
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
-	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	fire_sound = 'sound/weapons/gunshot_pistol.ogg'
 	load_method = MAGAZINE
 	sel_mode = 1
 
@@ -292,7 +292,7 @@
 	ammo_type = /obj/item/ammo_casing/c10mm
 	max_shells = 5
 	origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1)
-	fire_sound = 'sound/weapons/Gunshot_light.ogg'
+	fire_sound = 'sound/weapons/gunshot_pistol.ogg'
 	load_method = SINGLE_CASING|SPEEDLOADER
 
 /obj/item/weapon/gun/projectile/leyon/load_ammo(var/obj/item/A, mob/user)
diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm
index a66d101526c..a312143dc55 100644
--- a/code/modules/supermatter/supermatter.dm
+++ b/code/modules/supermatter/supermatter.dm
@@ -159,6 +159,10 @@
 		if((damage > emergency_point) && !public_alert)
 			radio.autosay("WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT!", "Supermatter Monitor")
 			public_alert = 1
+			for(var/mob/M in player_list)
+				var/turf/T = get_turf(M)
+				if(T && !istype(M, /mob/abstract/new_player) && !isdeaf(M))
+					sound_to(M, 'sound/effects/nuclearsiren.ogg')
 		else if(safe_warned && public_alert)
 			radio.autosay(alert_msg, "Supermatter Monitor")
 			public_alert = 0
diff --git a/html/changelogs/mattatlas-soundsoundrevolution.yml b/html/changelogs/mattatlas-soundsoundrevolution.yml
new file mode 100644
index 00000000000..e4eb39c05f1
--- /dev/null
+++ b/html/changelogs/mattatlas-soundsoundrevolution.yml
@@ -0,0 +1,4 @@
+author: MattAtlas
+delete-after: True
+changes: 
+  - rscadd: "Added some new sounds and modified some current ones."
diff --git a/sound/effects/crusher_alarm.ogg b/sound/effects/crusher_alarm.ogg
new file mode 100644
index 00000000000..e7da4780c4a
Binary files /dev/null and b/sound/effects/crusher_alarm.ogg differ
diff --git a/sound/effects/nuclearsiren.ogg b/sound/effects/nuclearsiren.ogg
new file mode 100644
index 00000000000..18254352164
Binary files /dev/null and b/sound/effects/nuclearsiren.ogg differ
diff --git a/sound/effects/switch1.ogg b/sound/effects/switch1.ogg
new file mode 100644
index 00000000000..b9ece70204d
Binary files /dev/null and b/sound/effects/switch1.ogg differ
diff --git a/sound/machines/AirlockClose.ogg b/sound/machines/AirlockClose.ogg
index 58a06817f00..bd928cad8b0 100644
Binary files a/sound/machines/AirlockClose.ogg and b/sound/machines/AirlockClose.ogg differ
diff --git a/sound/machines/BoltsDown.ogg b/sound/machines/BoltsDown.ogg
index c7320a04dfe..02040d1d08d 100644
Binary files a/sound/machines/BoltsDown.ogg and b/sound/machines/BoltsDown.ogg differ
diff --git a/sound/machines/BoltsUp.ogg b/sound/machines/BoltsUp.ogg
index bc422e28726..ee815207237 100644
Binary files a/sound/machines/BoltsUp.ogg and b/sound/machines/BoltsUp.ogg differ
diff --git a/sound/machines/airlock.ogg b/sound/machines/airlock.ogg
index c0a4cfdcba6..d47c40d3fce 100644
Binary files a/sound/machines/airlock.ogg and b/sound/machines/airlock.ogg differ
diff --git a/sound/machines/airlock_close_force.ogg b/sound/machines/airlock_close_force.ogg
new file mode 100644
index 00000000000..28b190d8e09
Binary files /dev/null and b/sound/machines/airlock_close_force.ogg differ
diff --git a/sound/machines/airlock_creaking.ogg b/sound/machines/airlock_creaking.ogg
deleted file mode 100644
index e69ebc275fc..00000000000
Binary files a/sound/machines/airlock_creaking.ogg and /dev/null differ
diff --git a/sound/machines/airlock_open_force.ogg b/sound/machines/airlock_open_force.ogg
new file mode 100644
index 00000000000..4caefc0b9e4
Binary files /dev/null and b/sound/machines/airlock_open_force.ogg differ
diff --git a/sound/machines/blastdoorclose.ogg b/sound/machines/blastdoorclose.ogg
new file mode 100644
index 00000000000..c48a0bd7d6f
Binary files /dev/null and b/sound/machines/blastdoorclose.ogg differ
diff --git a/sound/machines/blastdooropen.ogg b/sound/machines/blastdooropen.ogg
new file mode 100644
index 00000000000..4f61ea2302a
Binary files /dev/null and b/sound/machines/blastdooropen.ogg differ
diff --git a/sound/machines/buzz-two.ogg b/sound/machines/buzz-two.ogg
index 3f79e2a0e91..1bd0a190cb3 100644
Binary files a/sound/machines/buzz-two.ogg and b/sound/machines/buzz-two.ogg differ
diff --git a/sound/machines/keyboard/keypress1.ogg b/sound/machines/keyboard/keypress1.ogg
new file mode 100644
index 00000000000..582a7eaf122
Binary files /dev/null and b/sound/machines/keyboard/keypress1.ogg differ
diff --git a/sound/machines/keyboard/keypress2.ogg b/sound/machines/keyboard/keypress2.ogg
new file mode 100644
index 00000000000..20f3e6697c6
Binary files /dev/null and b/sound/machines/keyboard/keypress2.ogg differ
diff --git a/sound/machines/keyboard/keypress3.ogg b/sound/machines/keyboard/keypress3.ogg
new file mode 100644
index 00000000000..852478f06e2
Binary files /dev/null and b/sound/machines/keyboard/keypress3.ogg differ
diff --git a/sound/machines/keyboard/keypress4.ogg b/sound/machines/keyboard/keypress4.ogg
new file mode 100644
index 00000000000..2cc664bf582
Binary files /dev/null and b/sound/machines/keyboard/keypress4.ogg differ
diff --git a/sound/machines/keyboard/keystroke1.ogg b/sound/machines/keyboard/keystroke1.ogg
new file mode 100644
index 00000000000..dc2b4bf3432
Binary files /dev/null and b/sound/machines/keyboard/keystroke1.ogg differ
diff --git a/sound/machines/keyboard/keystroke2.ogg b/sound/machines/keyboard/keystroke2.ogg
new file mode 100644
index 00000000000..35fbaedbf73
Binary files /dev/null and b/sound/machines/keyboard/keystroke2.ogg differ
diff --git a/sound/machines/keyboard/keystroke3.ogg b/sound/machines/keyboard/keystroke3.ogg
new file mode 100644
index 00000000000..01bd8d900c1
Binary files /dev/null and b/sound/machines/keyboard/keystroke3.ogg differ
diff --git a/sound/machines/keyboard/keystroke4.ogg b/sound/machines/keyboard/keystroke4.ogg
new file mode 100644
index 00000000000..8647c2b310d
Binary files /dev/null and b/sound/machines/keyboard/keystroke4.ogg differ
diff --git a/sound/machines/medbayscanner1.ogg b/sound/machines/medbayscanner1.ogg
new file mode 100644
index 00000000000..a3402e33046
Binary files /dev/null and b/sound/machines/medbayscanner1.ogg differ
diff --git a/sound/mecha/mechstep.ogg b/sound/mecha/mechstep.ogg
index 66540860df7..6aaec0cecc0 100644
Binary files a/sound/mecha/mechstep.ogg and b/sound/mecha/mechstep.ogg differ
diff --git a/sound/mecha/mechturn.ogg b/sound/mecha/mechturn.ogg
index 67dc345c026..58ac0d312ee 100644
Binary files a/sound/mecha/mechturn.ogg and b/sound/mecha/mechturn.ogg differ