diff --git a/code/modules/instruments/instrument_data/fun.dm b/code/modules/instruments/instrument_data/fun.dm
index 5a9b1292c42..790abe46473 100644
--- a/code/modules/instruments/instrument_data/fun.dm
+++ b/code/modules/instruments/instrument_data/fun.dm
@@ -17,3 +17,9 @@
 	name = "Chime"
 	id = "chime"
 	real_samples = list("79"='sound/machines/chime.ogg')
+
+/datum/instrument/fun/mothscream
+	name = "Moth Scream"
+	id = "mothscream"
+	real_samples = list("60"='sound/voice/moth/scream_moth.ogg')
+	admin_only = TRUE
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index 3df64d024e4..d44441ae5ca 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -134,7 +134,7 @@
 	attack_verb_continuous = list("plays metal on", "serenades", "crashes", "smashes")
 	attack_verb_simple = list("play metal on", "serenade", "crash", "smash")
 	hitsound = 'sound/weapons/stringsmash.ogg'
-	allowed_instrument_ids = "guitar"
+	allowed_instrument_ids = list("guitar","csteelgt","cnylongt", "ccleangt", "cmutedgt")
 
 /obj/item/instrument/eguitar
 	name = "electric guitar"
@@ -151,21 +151,21 @@
 	name = "glockenspiel"
 	desc = "Smooth metal bars perfect for any marching band."
 	icon_state = "glockenspiel"
-	allowed_instrument_ids = "glockenspiel"
+	allowed_instrument_ids = list("glockenspiel","crvibr", "sgmmbox", "r3celeste")
 	inhand_icon_state = "glockenspiel"
 
 /obj/item/instrument/accordion
 	name = "accordion"
 	desc = "Pun-Pun not included."
 	icon_state = "accordion"
-	allowed_instrument_ids = "accordion"
+	allowed_instrument_ids = list("crack", "crtango", "accordion")
 	inhand_icon_state = "accordion"
 
 /obj/item/instrument/trumpet
 	name = "trumpet"
 	desc = "To announce the arrival of the king!"
 	icon_state = "trumpet"
-	allowed_instrument_ids = "trombone"
+	allowed_instrument_ids = "crtrumpet"
 	inhand_icon_state = "trumpet"
 
 /obj/item/instrument/trumpet/spectral
@@ -213,7 +213,7 @@
 	name = "trombone"
 	desc = "How can any pool table ever hope to compete?"
 	icon_state = "trombone"
-	allowed_instrument_ids = "trombone"
+	allowed_instrument_ids = list("crtrombone", "crbrass", "trombone")
 	inhand_icon_state = "trombone"
 
 /obj/item/instrument/trombone/spectral
@@ -245,7 +245,7 @@
 	name = "harmonica"
 	desc = "For when you get a bad case of the space blues."
 	icon_state = "harmonica"
-	allowed_instrument_ids = "harmonica"
+	allowed_instrument_ids = list("crharmony", "harmonica")
 	inhand_icon_state = "harmonica"
 	slot_flags = ITEM_SLOT_MASK
 	force = 5
@@ -272,7 +272,7 @@
 	inhand_icon_state = "bike_horn"
 	lefthand_file = 'icons/mob/inhands/equipment/horns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/horns_righthand.dmi'
-	allowed_instrument_ids = "bikehorn"
+	allowed_instrument_ids = list("bikehorn", "honk")
 	attack_verb_continuous = list("beautifully honks")
 	attack_verb_simple = list("beautifully honk")
 	w_class = WEIGHT_CLASS_TINY
@@ -308,3 +308,16 @@
 			var/atom/A = V
 			instruments[initial(A.name)] = A
 	return instruments
+
+/obj/item/instrument/musicalmoth
+	name = "musical moth"
+	desc = "Despite its popularity, this controversial musical toy was eventually banned due to its unethically sampled sounds of moths screaming in agony."
+	icon_state = "mothsician"
+	allowed_instrument_ids = "mothscream"
+	attack_verb_continuous = list("flutters", "flaps")
+	attack_verb_simple = list("flutter", "flap")
+	w_class = WEIGHT_CLASS_TINY
+	force = 0
+	hitsound = 'sound/voice/moth/scream_moth.ogg'
+	custom_price = 237
+	custom_premium_price = 237
diff --git a/code/modules/instruments/stationary.dm b/code/modules/instruments/stationary.dm
index f236927c38e..009e02494e7 100644
--- a/code/modules/instruments/stationary.dm
+++ b/code/modules/instruments/stationary.dm
@@ -3,7 +3,7 @@
 	desc = "Something broke, contact coderbus."
 	interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT | INTERACT_ATOM_REQUIRES_DEXTERITY
 	var/can_play_unanchored = FALSE
-	var/list/allowed_instrument_ids
+	var/list/allowed_instrument_ids = list("r3grand","r3harpsi","crharpsi","crgrand1","crbright1", "crichugan", "crihamgan","piano")
 	var/datum/song/song
 
 /obj/structure/musician/Initialize(mapload)
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index dbe85c65448..5cb5ee50858 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -21,7 +21,8 @@
 					/obj/item/skillchip/light_remover=2,
 					/obj/item/skillchip/useless_adapter=5)
 	contraband = list(/obj/item/dice/fudge = 9,
-					/obj/item/clothing/shoes/wheelys/skishoes=4)
+					/obj/item/clothing/shoes/wheelys/skishoes=4,
+					/obj/item/instrument/musicalmoth=1)
 	premium = list(/obj/item/melee/skateboard/pro = 3,
 					/obj/item/clothing/shoes/wheelys/rollerskates= 3,
 					/obj/item/melee/skateboard/hoverboard = 1)
diff --git a/icons/obj/musician.dmi b/icons/obj/musician.dmi
index 7112453da61..c3e0f21f05a 100644
Binary files a/icons/obj/musician.dmi and b/icons/obj/musician.dmi differ