diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 1866d36e517..20883c733f6 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -828,6 +828,22 @@
 	if(tool)
 		playsound(user, 'sound/items/penclick.ogg', 25)
 		current_tool = tool
+		switch(tool)
+			if("wrench")
+				usesound = 'sound/items/wrench.ogg'
+				surgerysound = 'sound/items/surgery/bonesetter.ogg'
+			if("screwdriver")
+				usesound = 'sound/items/screwdriver.ogg'
+				surgerysound = 'sound/items/screwdriver.ogg'
+			if("wirecutters")
+				usesound = 'sound/items/wirecutter.ogg'
+				surgerysound = 'sound/items/surgery/hemostat.ogg'
+			if("crowbar")
+				usesound = /singleton/sound_category/crowbar_sound
+				surgerysound = 'sound/items/surgery/retractor.ogg'
+			if("multitool")
+				usesound = null
+				surgerysound = null
 		update_tool()
 	return 1
 
diff --git a/html/changelogs/hockaa-combitooltest.yml b/html/changelogs/hockaa-combitooltest.yml
new file mode 100644
index 00000000000..537c62b4ed7
--- /dev/null
+++ b/html/changelogs/hockaa-combitooltest.yml
@@ -0,0 +1,6 @@
+author: Hocka
+
+delete-after: True
+
+changes:
+  - tweak: "Combitools now have appropriate sounds corresponding to their selected bit."