diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 27336af3431..64fda878ec1 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -53,9 +53,9 @@
 	///Sound used when equipping the item into a valid slot
 	var/equip_sound = null
 	///Sound uses when picking the item up (into your hands)
-	var/pickup_sound = 'sound/items/pickup/device.ogg'
+	var/pickup_sound = "generic_pickup"
 	///Sound uses when dropping the item, or when its thrown.
-	var/drop_sound = 'sound/items/drop/device.ogg' // drop sound - this is the default
+	var/drop_sound = "generic_drop" // drop sound - this is the default
 
 	//Item_state definition moved to /obj
 	//var/item_state = null // Used to specify the item state for the on-mob overlays.
@@ -111,6 +111,8 @@
 		slot_l_hand_str = 'icons/mob/items/lefthand_device.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_device.dmi',
 		)
+	pickup_sound = 'sound/items/pickup/device.ogg'
+	drop_sound = 'sound/items/drop/device.ogg'
 
 /atom/proc/get_cell()
 	return DEVICE_NO_CELL
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 253d681eb40..0c867aff54e 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -271,10 +271,19 @@ var/list/drillhit_sound = list(
 	'sound/weapons/saw/drillhit2.ogg'
 )
 // drop/equip/pickup sounds if there are multiple.
-var/list/wield_generic_sound = list(
-	'sound/items/wield/wield_generic1.ogg',
-	'sound/items/wield/wield_generic2.ogg',
-	'sound/items/wield/wield_generic3.ogg'
+var/list/generic_drop_sound = list(
+	'sound/items/drop/generic1.ogg',
+	'sound/items/drop/generic2.ogg',
+)
+var/list/generic_pickup_sound = list(
+	'sound/items/pickup/generic1.ogg',
+	'sound/items/pickup/generic2.ogg',
+	'sound/items/pickup/generic3.ogg',
+)
+var/list/generic_wield_sound = list(
+	'sound/items/wield/generic1.ogg',
+	'sound/items/wield/generic2.ogg',
+	'sound/items/wield/generic3.ogg'
 )
 var/list/sword_pickup_sound = list(
 	'sound/items/pickup/sword1.ogg',
@@ -519,7 +528,9 @@ var/list/gauss_fire_sound = list(
 			if ("crowbar") soundin = pick(crowbar_sound)
 			if ("casing_drop") soundin = pick(casing_drop_sound)
 			if ("drillhit") soundin = pick(drillhit_sound)
-			if ("wield_generic") soundin = pick(wield_generic_sound)
+			if ("generic_drop") soundin = pick(generic_drop_sound)
+			if ("generic_pickup") soundin = pick(generic_pickup_sound)
+			if ("generic_wield") soundin = pick(generic_wield_sound)
 			if ("equip_sword") soundin = pick(sword_equip_sound)
 			if ("pickup_sword") soundin = pick(sword_pickup_sound)
 			if ("gauss_fire") soundin = pick(gauss_fire_sound)
diff --git a/html/changelogs/wezzy_generic_pickupdrop.yml b/html/changelogs/wezzy_generic_pickupdrop.yml
new file mode 100644
index 00000000000..58bca71a784
--- /dev/null
+++ b/html/changelogs/wezzy_generic_pickupdrop.yml
@@ -0,0 +1,41 @@
+################################
+# 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 generic pickup and drop sounds."
diff --git a/sound/items/drop/generic1.ogg b/sound/items/drop/generic1.ogg
new file mode 100644
index 00000000000..c2195b1e24a
Binary files /dev/null and b/sound/items/drop/generic1.ogg differ
diff --git a/sound/items/drop/generic2.ogg b/sound/items/drop/generic2.ogg
new file mode 100644
index 00000000000..ac0bd3710fe
Binary files /dev/null and b/sound/items/drop/generic2.ogg differ
diff --git a/sound/items/pickup/generic1.ogg b/sound/items/pickup/generic1.ogg
new file mode 100644
index 00000000000..64f37c6dd9c
Binary files /dev/null and b/sound/items/pickup/generic1.ogg differ
diff --git a/sound/items/pickup/generic2.ogg b/sound/items/pickup/generic2.ogg
new file mode 100644
index 00000000000..57092778f28
Binary files /dev/null and b/sound/items/pickup/generic2.ogg differ
diff --git a/sound/items/pickup/generic3.ogg b/sound/items/pickup/generic3.ogg
new file mode 100644
index 00000000000..be46e772422
Binary files /dev/null and b/sound/items/pickup/generic3.ogg differ
diff --git a/sound/items/wield/wield_generic1.ogg b/sound/items/wield/generic1.ogg
similarity index 100%
rename from sound/items/wield/wield_generic1.ogg
rename to sound/items/wield/generic1.ogg
diff --git a/sound/items/wield/wield_generic2.ogg b/sound/items/wield/generic2.ogg
similarity index 100%
rename from sound/items/wield/wield_generic2.ogg
rename to sound/items/wield/generic2.ogg
diff --git a/sound/items/wield/wield_generic3.ogg b/sound/items/wield/generic3.ogg
similarity index 100%
rename from sound/items/wield/wield_generic3.ogg
rename to sound/items/wield/generic3.ogg