diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 6d8cb6ac390..4e0c5a92eb2 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -27,6 +27,8 @@
 	var/datum/wires/connected = null
 
 	var/next_activate = 0 //When we're next allowed to activate - for spam control
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 
 /obj/item/assembly/get_part_rating()
 	return 1
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index bb380e34db6..e5ca43d4c46 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -5,6 +5,8 @@
 	custom_materials = list(/datum/material/iron=500, /datum/material/glass=50)
 	var/datum/effect_system/spark_spread/sparks
 	heat = 1000
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 
 /obj/item/assembly/igniter/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is trying to ignite [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 77d90ddb758..59e4d7e2ede 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -12,6 +12,8 @@
 	var/olddir = 0
 	var/turf/listeningTo
 	var/hearing_range = 3
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 
 /obj/item/assembly/infra/Initialize()
 	. = ..()
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 504639b459b..5d31d190a3a 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -6,6 +6,8 @@
 	custom_materials = list(/datum/material/iron=100)
 	attachable = TRUE
 	var/armed = FALSE
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 
 
 /obj/item/assembly/mousetrap/examine(mob/user)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 3b7f15aa15d..be75a725c17 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -10,6 +10,9 @@
 	var/time = 10
 	var/sensitivity = 1
 	var/hearing_range = 3
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
+
 
 /obj/item/assembly/prox_sensor/Initialize()
 	. = ..()
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 472fc872c56..45613b79497 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -18,6 +18,8 @@
 	///Holds a reference string to the mob, decides how much of a gamer you are.
 	var/suicide_mob
 	var/hearing_range = 1
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 
 /obj/item/assembly/signaler/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] eats \the [src]! If it is signaled, [user.p_they()] will die!</span>")
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index e87a0dea75b..a8e479f4875 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -10,6 +10,8 @@
 	var/saved_time = 5
 	var/loop = FALSE
 	var/hearing_range = 3
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 
 /obj/item/assembly/timer/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!</span>")
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 1ef781bafff..dd572b83d69 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -20,6 +20,8 @@
 								 "exclusive",
 								 "recognizer",
 								 "voice sensor")
+	drop_sound = 'sound/items/handling/component_drop.ogg'
+	pickup_sound =  'sound/items/handling/component_pickup.ogg'
 
 /obj/item/assembly/voice/examine(mob/user)
 	. = ..()
diff --git a/sound/items/handling/component_drop.ogg b/sound/items/handling/component_drop.ogg
new file mode 100644
index 00000000000..093fde7c90c
Binary files /dev/null and b/sound/items/handling/component_drop.ogg differ
diff --git a/sound/items/handling/component_pickup.ogg b/sound/items/handling/component_pickup.ogg
new file mode 100644
index 00000000000..cfaba1dd193
Binary files /dev/null and b/sound/items/handling/component_pickup.ogg differ