diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index bd81e6ab5de..01c4d946ef7 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -255,6 +255,7 @@
 	icon = 'icons/obj/chemical.dmi'
 	item_state = "contsolid"
 	belt_icon = "pill_bottle"
+	use_sound = "pillbottle"
 	w_class = WEIGHT_CLASS_SMALL
 	can_hold = list(/obj/item/reagent_containers/food/pill)
 	cant_hold = list(/obj/item/reagent_containers/food/pill/patch)
@@ -361,6 +362,7 @@
 	desc = "It's a container for storing medical patches."
 	icon_state = "patch_pack"
 	belt_icon = "patch_pack"
+	use_sound = "patchpack"
 	can_hold = list(/obj/item/reagent_containers/food/pill/patch)
 	cant_hold = list()
 	rapid_intake_message = "flips the lid of the patch pack open and begins rapidly stamping patches on themselves!"
diff --git a/code/game/objects/items/weapons/storage/storage_base.dm b/code/game/objects/items/weapons/storage/storage_base.dm
index 57b16883cf5..05c1cd43756 100644
--- a/code/game/objects/items/weapons/storage/storage_base.dm
+++ b/code/game/objects/items/weapons/storage/storage_base.dm
@@ -41,7 +41,6 @@
 	var/pickup_all_on_tile = TRUE
 	/// Sound played when used. `null` for no sound.
 	var/use_sound = "rustle"
-
 	/// What kind of [/obj/item/stack] can this be folded into. (e.g. Boxes and cardboard)
 	var/foldable = null
 	/// How much of the stack item do you get.
@@ -141,7 +140,6 @@
 		return ..()
 	if(!(loc == M) || (loc && loc.loc == M))
 		return
-	playsound(loc, "rustle", 50, 1, -5)
 	if(!M.restrained() && !M.stat)
 		switch(over_object.name)
 			if("r_hand")
@@ -163,7 +161,7 @@
 	. = ..()
 	if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE))
 		show_to(user)
-		playsound(loc, "rustle", 50, TRUE, -5)
+		playsound(loc, use_sound, 50, TRUE, -5)
 		add_fingerprint(user)
 	else if(isobserver(user))
 		show_to(user)
@@ -549,7 +547,7 @@
 
 
 /obj/item/storage/attack_hand(mob/user)
-	playsound(loc, "rustle", 50, TRUE, -5)
+	playsound(loc, use_sound, 50, TRUE, -5)
 
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 0425ca97f9a..c7478164b41 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -189,6 +189,10 @@ falloff_distance - Distance at which falloff begins. Sound is at peak volume (in
 /proc/get_sfx(soundin)
 	if(istext(soundin))
 		switch(soundin)
+			if("patchpack")
+				soundin = pick('sound/effects/CC0/patchpack1.ogg', 'sound/effects/CC0/patchpack2.ogg', 'sound/effects/CC0/patchpack3.ogg', 'sound/effects/CC0/patchpack4.ogg', 'sound/effects/CC0/patchpack5.ogg')
+			if("pillbottle")
+				soundin = pick('sound/effects/CC0/pillbottle1.ogg', 'sound/effects/CC0/pillbottle2.ogg', 'sound/effects/CC0/pillbottle3.ogg', 'sound/effects/CC0/pillbottle4.ogg')
 			if("shatter")
 				soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg')
 			if("explosion")
diff --git a/sound/effects/CC0/licence.txt b/sound/effects/CC0/licence.txt
new file mode 100644
index 00000000000..ab94075ce2f
--- /dev/null
+++ b/sound/effects/CC0/licence.txt
@@ -0,0 +1,5 @@
+The sounds stored in this folder are licenced under CC0 1.0. https://creativecommons.org/publicdomain/zero/1.0/ https://creativecommons.org/publicdomain/zero/1.0/legalcode
+
+Credits:
+pillbottle1.ogg, pillbottle2.ogg, pillbottle3.ogg, pillbottle4.ogg are a derivative of https://freesound.org/people/Rudmer_Rotteveel/sounds/536419/.
+patchpack1.ogg, patchpack2.ogg, patchpack3.ogg, patchpack4.ogg, patchpack5.ogg are a derivative of https://freesound.org/people/SpliceSound/sounds/188189/
diff --git a/sound/effects/CC0/patchpack1.ogg b/sound/effects/CC0/patchpack1.ogg
new file mode 100644
index 00000000000..e4139b52e73
Binary files /dev/null and b/sound/effects/CC0/patchpack1.ogg differ
diff --git a/sound/effects/CC0/patchpack2.ogg b/sound/effects/CC0/patchpack2.ogg
new file mode 100644
index 00000000000..291102f013a
Binary files /dev/null and b/sound/effects/CC0/patchpack2.ogg differ
diff --git a/sound/effects/CC0/patchpack3.ogg b/sound/effects/CC0/patchpack3.ogg
new file mode 100644
index 00000000000..aa0ad7cb271
Binary files /dev/null and b/sound/effects/CC0/patchpack3.ogg differ
diff --git a/sound/effects/CC0/patchpack4.ogg b/sound/effects/CC0/patchpack4.ogg
new file mode 100644
index 00000000000..02c37578e06
Binary files /dev/null and b/sound/effects/CC0/patchpack4.ogg differ
diff --git a/sound/effects/CC0/patchpack5.ogg b/sound/effects/CC0/patchpack5.ogg
new file mode 100644
index 00000000000..34a80a6b321
Binary files /dev/null and b/sound/effects/CC0/patchpack5.ogg differ
diff --git a/sound/effects/CC0/pillbottle1.ogg b/sound/effects/CC0/pillbottle1.ogg
new file mode 100644
index 00000000000..28cea0e6c95
Binary files /dev/null and b/sound/effects/CC0/pillbottle1.ogg differ
diff --git a/sound/effects/CC0/pillbottle2.ogg b/sound/effects/CC0/pillbottle2.ogg
new file mode 100644
index 00000000000..82ea9ca397d
Binary files /dev/null and b/sound/effects/CC0/pillbottle2.ogg differ
diff --git a/sound/effects/CC0/pillbottle3.ogg b/sound/effects/CC0/pillbottle3.ogg
new file mode 100644
index 00000000000..bd06cf1c5b9
Binary files /dev/null and b/sound/effects/CC0/pillbottle3.ogg differ
diff --git a/sound/effects/CC0/pillbottle4.ogg b/sound/effects/CC0/pillbottle4.ogg
new file mode 100644
index 00000000000..b7081e4cb87
Binary files /dev/null and b/sound/effects/CC0/pillbottle4.ogg differ