brings us up to date

code/datums/supplypacks/recreation_yw.dm

@@ -1,15 +1,15 @@
 /datum/supply_pack/recreation/bigband
 	name = "Instrument bundle"
 	contains = list(
-			/obj/item/device/instrument/guitar = 1,
-			/obj/item/device/instrument/keytar = 1,
-			/obj/item/device/instrument/eguitar = 1,
-			/obj/item/device/instrument/xylophone = 1,
-			/obj/item/device/instrument/accordion = 1,
-			/obj/item/device/instrument/saxophone = 1,
-			/obj/item/device/instrument/glockenspiel = 1,
-			/obj/item/device/instrument/harmonica = 1,
-			/obj/item/device/instrument/trombone = 1,
+			/obj/item/instrument/guitar = 1,
+			/obj/item/instrument/piano_synth = 1,
+			/obj/item/instrument/eguitar = 1,
+			/obj/item/instrument/xylophone = 1,
+			/obj/item/instrument/accordion = 1,
+			/obj/item/instrument/saxophone = 1,
+			/obj/item/instrument/glockenspiel = 1,
+			/obj/item/instrument/harmonica = 1,
+			/obj/item/instrument/trombone = 1,
 			)
 	cost = 100
 	containertype = /obj/structure/closet/crate

code/game/objects/items/devices/instruments.dm

@@ -1,105 +1,9 @@
 //copy pasta of the space violin, don't hurt me -RF
 
-/obj/item/device/instrument/guitar
-	name = "guitar"
-	desc = "It's made of wood and has bronze strings."
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "guitar"
-	item_state = "guitar"
-	attack_verb = list("smashed")
-	instrumentId = "guitar"
-	instrumentExt = "ogg"
-
-/obj/item/device/instrument/keytar
-	name = "portable keyboard"
-	desc = "A keyboard, for those interested in the piano on the go! "
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "keyboard"
-	item_state = "keyboard"
-	attack_verb = list("smashed")
-	instrumentId = "piano"
-	instrumentExt = "ogg"
-
-/obj/item/device/instrument/eguitar
-	name = "electrica guitar"
-	desc = "A metallic musical instrument with strings, made for all your shredding needs."
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "eguitar"
-	item_state = "eguitar"
-	attack_verb = list("smashed")
-	instrumentId = "eguitar"
-	instrumentExt = "ogg"
-
-/obj/item/device/instrument/xylophone
+/obj/item/instrument/xylophone
 	name = "xylophone"
 	desc = "A percussion instrument consisting of a series of wooden bars graduated in length."
 	icon = 'icons/obj/musician_yw.dmi'
 	icon_state = "xylophone"
 	attack_verb = list("smashed")
-	instrumentId = "xylophone"
-	instrumentExt = "mid"
-
-/obj/item/device/instrument/accordion
-	name = "accordion"
-	desc = "A musical instrument played by blowing and pressing keys. Someone detached Pun-Pun's hands!"
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "accordion"
-	attack_verb = list("smashed")
-	instrumentId = "accordion"
-	instrumentExt = "mid"
-
-/obj/item/device/instrument/saxophone
-	name = "saxophone"
-	desc = "A metal wind instruments with a single-reed mouthpiece known for it's soothing tones."
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "saxophone"
-	attack_verb = list("smashed")
-	instrumentId = "saxophone"
-	instrumentExt = "mid"
-
-/obj/item/device/instrument/glockenspiel
-	name = "glockenspiel"
-	desc = "A percussion instrument composed of a set of tuned metal bars perfect for any marching band."
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "glockenspiel"
-	attack_verb = list("smashed")
-	instrumentId = "glockenspiel"
-	instrumentExt = "mid"
-
-/obj/item/device/instrument/recorder
-	name = "recorder"
-	desc = "A depressing version of a flute. Does anyone even play this?"
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "recorder"
-	attack_verb = list("smashed")
-	instrumentId = "recorder"
-	instrumentExt = "mid"
-
-/obj/item/device/instrument/trombone
-	name = "trombone"
-	desc = "A large brass wind instrument. Seems to call for incidental music."
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "trombone"
-	attack_verb = list("smashed")
-	instrumentId = "trombone"
-	instrumentExt = "mid"
-
-/obj/item/device/instrument/harmonica
-	name = "harmonica"
-	desc = "A literal mouth organ, it just smells of the frontier!"
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "harmonica"
-	attack_verb = list("smashed")
-	instrumentId = "harmonica"
-	instrumentExt = "mid"
-	w_class = ITEMSIZE_SMALL
-
-/obj/item/device/instrument/bikehorn
-	name = "bike horn"
-	desc = "Why... why would you even play this?!"
-	icon = 'icons/obj/musician_yw.dmi'
-	icon_state = "bike_horn"
-	attack_verb = list("smashed")
-	instrumentId = "bikehorn"
-	instrumentExt = "ogg"
-
+	allowed_instrument_ids = "xylophone"

code/game/objects/structures/crates_lockers/largecrate_yw.dm

@@ -1,9 +1,9 @@
 /obj/structure/largecrate/piano
 	name = "piano crate"
-	starts_with = list(/obj/structure/device/piano)
+	starts_with = list(/obj/structure/musician/piano)
 	desc = "*Grand piano may end up being a minimoog."
 
 /obj/structure/largecrate/piano/Initialize() //This is nessesary to get a random one each time.
-	starts_with = list(pick(/obj/structure/device/piano/minimoog,
-					/obj/structure/device/piano))
+	starts_with = list(pick(/obj/structure/musician/piano,
+					/obj/structure/musician/piano))
 	return ..()

maps/yw/cryogaia-01-centcomm.dmm

@@ -2341,7 +2341,7 @@
 	},
 /area/centcom/specops)
 "kJ" = (
-/obj/structure/device/piano{
+/obj/structure/musician/piano{
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/yellow/diagonal,

maps/yw/cryogaia-04-maintenance.dmm

@@ -24314,7 +24314,7 @@
 /area/ai_upload_foyer)
 "oVM" = (
 /obj/structure/table/woodentable,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/recreation_area)
 "oVX" = (
@@ -32496,7 +32496,7 @@
 /turf/simulated/wall/r_wall,
 /area/maintenance/aft)
 "tSp" = (
-/obj/item/device/instrument/harmonica,
+/obj/item/instrument/harmonica,
 /turf/simulated/floor/plating,
 /area/maintenance/security_lower)
 "tSx" = (

maps/yw/cryogaia-05-main.dmm

@@ -28468,7 +28468,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay_primary_storage)
 "ljV" = (
-/obj/structure/device/piano{
+/obj/structure/musician/piano{
 	dir = 4
 	},
 /turf/simulated/floor/wood,

maps/yw/cryogaia-06-upper.dmm

@@ -4705,7 +4705,7 @@
 "kd" = (
 /obj/structure/table/woodentable,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/item/device/instrument/harmonica,
+/obj/item/instrument/harmonica,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "ke" = (
@@ -7034,7 +7034,7 @@
 /area/constructionsite/medical/upper)
 "pV" = (
 /obj/structure/table/woodentable,
-/obj/item/device/instrument/trombone,
+/obj/item/instrument/trombone,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "pW" = (
@@ -8090,7 +8090,7 @@
 /area/constructionsite/cryogaia/upper)
 "wb" = (
 /obj/structure/table/woodentable,
-/obj/item/device/instrument/eguitar,
+/obj/item/instrument/eguitar,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "wd" = (
@@ -8846,7 +8846,7 @@
 /area/medical/medbayupper)
 "Aj" = (
 /obj/structure/table/woodentable,
-/obj/item/device/instrument/accordion,
+/obj/item/instrument/accordion,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "Al" = (
@@ -10331,7 +10331,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/item/device/instrument/violin,
+/obj/item/instrument/violin,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "IH" = (
@@ -11119,7 +11119,7 @@
 /area/civilian/atrium/upper)
 "Nl" = (
 /obj/structure/table/woodentable,
-/obj/item/device/instrument/saxophone,
+/obj/item/instrument/saxophone,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "Nn" = (
@@ -11285,7 +11285,7 @@
 /turf/simulated/floor/reinforced/cryogaia,
 /area/borealis2/outdoors/grounds/upper)
 "Oh" = (
-/obj/structure/device/piano,
+/obj/structure/musician/piano,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "Ok" = (
@@ -11691,7 +11691,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "Qo" = (
@@ -12206,7 +12206,7 @@
 /area/borealis2/outdoors/grounds/upper)
 "SP" = (
 /obj/structure/table/woodentable,
-/obj/item/device/instrument/recorder,
+/obj/item/instrument/recorder,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "SZ" = (
@@ -12756,7 +12756,7 @@
 	dir = 1
 	},
 /obj/structure/table/woodentable,
-/obj/item/device/instrument/keytar,
+/obj/item/instrument/piano_synth,
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "Wa" = (

maps/yw/cryogaia_areas.dm

@@ -23,7 +23,7 @@
 /area/borealis2/outdoors
 	name = "Outside - Surface"
 	icon_state = "outside1"
-	sound_env = MOUNTAINS
+	sound_env = SOUND_ENVIRONMENT_MOUNTAINS
 
 /area/crew_quarters/meeting
 	name = "\improper Public Conference"

maps/yw/residential/residential.dmm

@@ -2897,7 +2897,7 @@
 /turf/simulated/floor/tiled/white,
 /area/residential/mansion)
 "ou" = (
-/obj/structure/device/piano{
+/obj/structure/musician/piano{
 	dir = 4
 	},
 /turf/simulated/floor/carpet,
@@ -3805,7 +3805,7 @@
 /obj/structure/window/reinforced/tinted{
 	dir = 8
 	},
-/obj/structure/device/piano{
+/obj/structure/musician/piano{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor/black,
@@ -6791,7 +6791,7 @@
 /turf/simulated/floor/carpet,
 /area/residential/room4)
 "Iq" = (
-/obj/structure/device/piano,
+/obj/structure/musician/piano,
 /turf/simulated/floor/carpet,
 /area/residential/mansion)
 "Ir" = (
@@ -8434,7 +8434,7 @@
 /area/residential/room6)
 "QA" = (
 /obj/structure/closet/cabinet,
-/obj/item/device/instrument/guitar,
+/obj/item/instrument/guitar,
 /turf/simulated/floor/carpet,
 /area/residential/mroom2)
 "QB" = (