diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 6e490191c78..d6b2e218efc 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -16,8 +16,8 @@
 	var/storage_capacity = 40 //Tying this to mob sizes was dumb
 	//This is so that someone can't pack hundreds of items in a locker/crate
 							  //then open it in a populated area to crash clients.
-	var/open_sound = 'sound/effects/locker_open.ogg'
-	var/close_sound = 'sound/effects/locker_close.ogg'
+	var/open_sound = 'sound/effects/closet_open.ogg'
+	var/close_sound = 'sound/effects/closet_close.ogg'
 
 	var/store_misc = 1
 	var/store_items = 1
@@ -114,7 +114,7 @@
 
 	icon_state = icon_opened
 	opened = 1
-	playsound(loc, open_sound, 15, 1, -3)
+	playsound(loc, open_sound, 25, 0, -3)
 	density = 0
 	return 1
 
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index b2fe8b30996..f7c5d69dd42 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -22,6 +22,7 @@
 	var/can_dismantle = 1
 	gfi_layer_rotation = GFI_ROTATION_DEFDIR
 	var/apply_material_color = TRUE
+	var/buckle_sound = 'sound/effects/buckle.ogg'
 
 /obj/structure/bed/Initialize(mapload, var/new_material, var/new_padding_material)
 	. = ..()
@@ -39,6 +40,11 @@
 /obj/structure/bed/get_material()
 	return material
 
+/obj/structure/bed/buckle_mob(mob/living/M)
+	. = ..()
+	if(. && buckle_sound)
+		playsound(src, buckle_sound, 20)
+
 // Reuse the cache/code from stools, todo maybe unify.
 /obj/structure/bed/update_icon()
 	// Prep icon.
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 6401334734d..ce79cda4863 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -67,6 +67,8 @@
 		)
 
 	action_button_name = "Toggle Helmet"
+	var/helmet_deploy_sound = 'sound/items/helmet_close.ogg'
+	var/helmet_retract_sound = 'sound/items/helmet_open.ogg'
 
 	//Breach thresholds, should ideally be inherited by most (if not all) voidsuits.
 	//With 0.2 resiliance, will reach 10 breach damage after 3 laser carbine blasts or 8 smg hits.
@@ -113,6 +115,7 @@
 			to_chat(M, "You are unable to deploy your suit's helmet as \the [H.head] is in the way.")
 		else if (H.equip_to_slot_if_possible(helmet, slot_head))
 			to_chat(M, "Your suit's helmet deploys with a hiss.")
+			playsound(loc, helmet_deploy_sound, 30)
 			helmet.canremove = 0
 
 	if(tank)
@@ -171,6 +174,7 @@
 
 	if(H.head == helmet)
 		to_chat(H, "<span class='notice'>You retract your suit helmet.</span>")
+		playsound(loc, helmet_retract_sound, 30)
 		helmet.canremove = 1
 		H.drop_from_inventory(helmet,src)
 	else
diff --git a/html/changelogs/wezzy_buckle_closet_helmet_sound.yml b/html/changelogs/wezzy_buckle_closet_helmet_sound.yml
new file mode 100644
index 00000000000..4e451dfb39c
--- /dev/null
+++ b/html/changelogs/wezzy_buckle_closet_helmet_sound.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 sounds to buckling, closets, and toggling voidsuit helmets."
+  - tweak: "Tweaks coffee machine vend sound."
diff --git a/sound/effects/buckle.ogg b/sound/effects/buckle.ogg
index ad7ae2efddd..4196c9efb3b 100644
Binary files a/sound/effects/buckle.ogg and b/sound/effects/buckle.ogg differ
diff --git a/sound/effects/buckle_undo.ogg b/sound/effects/buckle_undo.ogg
deleted file mode 100644
index 80c92d36295..00000000000
Binary files a/sound/effects/buckle_undo.ogg and /dev/null differ
diff --git a/sound/effects/closet_close.ogg b/sound/effects/closet_close.ogg
new file mode 100644
index 00000000000..56d9594ee88
Binary files /dev/null and b/sound/effects/closet_close.ogg differ
diff --git a/sound/effects/closet_open.ogg b/sound/effects/closet_open.ogg
new file mode 100644
index 00000000000..6e7a02e13ae
Binary files /dev/null and b/sound/effects/closet_open.ogg differ
diff --git a/sound/effects/locker_close.ogg b/sound/effects/locker_close.ogg
deleted file mode 100644
index 86913e51a26..00000000000
Binary files a/sound/effects/locker_close.ogg and /dev/null differ
diff --git a/sound/effects/locker_open.ogg b/sound/effects/locker_open.ogg
deleted file mode 100644
index 4a254c2b0b8..00000000000
Binary files a/sound/effects/locker_open.ogg and /dev/null differ
diff --git a/sound/items/helmet_close.ogg b/sound/items/helmet_close.ogg
new file mode 100644
index 00000000000..d29b8b6a6bc
Binary files /dev/null and b/sound/items/helmet_close.ogg differ
diff --git a/sound/items/helmet_open.ogg b/sound/items/helmet_open.ogg
new file mode 100644
index 00000000000..ce28d7294bc
Binary files /dev/null and b/sound/items/helmet_open.ogg differ
diff --git a/sound/machines/vending/vending_coffee.ogg b/sound/machines/vending/vending_coffee.ogg
index de59d1601d7..b1f7e17bda5 100644
Binary files a/sound/machines/vending/vending_coffee.ogg and b/sound/machines/vending/vending_coffee.ogg differ