From f2ef07239fc3d7420d0fcb780911b0f9b08b4b36 Mon Sep 17 00:00:00 2001
From: Henri215 <77684085+Henri215@users.noreply.github.com>
Date: Fri, 2 Jun 2023 13:34:10 -0300
Subject: [PATCH] Updates piano path (#20839)

* Updates piano path

* ops
---
 _maps/map_files/Delta/delta.dmm                        | 4 ++--
 _maps/map_files/MetaStation/MetaStation.dmm            | 2 +-
 _maps/map_files/RandomRuins/SpaceRuins/ussp.dmm        | 2 +-
 _maps/map_files/RandomZLevels/example.dmm              | 2 +-
 _maps/map_files/cerestation/cerestation.dmm            | 2 +-
 _maps/map_files/cyberiad/cyberiad.dmm                  | 2 +-
 _maps/map_files/shuttles/emergency_bar.dmm             | 2 +-
 code/modules/instruments/objs/structures/piano.dm      | 7 +++----
 code/modules/supply/supply_packs/pack_miscellaneous.dm | 2 +-
 9 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 4d6d46ab040..2621959e312 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -16884,7 +16884,7 @@
 /turf/simulated/floor/plasteel/grimy,
 /area/crew_quarters/theatre)
 "aXD" = (
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /obj/machinery/light,
 /turf/simulated/floor/plasteel/grimy,
 /area/crew_quarters/theatre)
@@ -84571,7 +84571,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /turf/simulated/floor/plating,
 /area/crew_quarters/theatre)
 "iiY" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 33504136752..4329ed09de3 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -71441,7 +71441,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /turf/simulated/floor/wood,
 /area/crew_quarters/theatre)
 "nhR" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
index f07d0e35cff..32cc87da524 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -1704,7 +1704,7 @@
 	icon_state = "0-2";
 	pixel_y = 1
 	},
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /obj/machinery/power/apc/off_station{
 	dir = 1;
 	pixel_y = 24
diff --git a/_maps/map_files/RandomZLevels/example.dmm b/_maps/map_files/RandomZLevels/example.dmm
index 37d44b4a606..33124a50412 100644
--- a/_maps/map_files/RandomZLevels/example.dmm
+++ b/_maps/map_files/RandomZLevels/example.dmm
@@ -710,7 +710,7 @@
 	},
 /area/awaymission/example)
 "bQ" = (
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index c3f3f925410..f7e629a055f 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -28813,7 +28813,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/port)
 "cOa" = (
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index f05b07f85cc..40555341738 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -25653,7 +25653,7 @@
 	},
 /area/crew_quarters/kitchen)
 "bok" = (
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /obj/machinery/light{
 	dir = 8
 	},
diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm
index a3295684786..3d34829b0d2 100644
--- a/_maps/map_files/shuttles/emergency_bar.dmm
+++ b/_maps/map_files/shuttles/emergency_bar.dmm
@@ -122,7 +122,7 @@
 /obj/machinery/light/spot{
 	dir = 1
 	},
-/obj/structure/piano,
+/obj/structure/musician/piano,
 /turf/simulated/floor/carpet/royalblack,
 /area/shuttle/escape)
 "aD" = (
diff --git a/code/modules/instruments/objs/structures/piano.dm b/code/modules/instruments/objs/structures/piano.dm
index a68f07e53a3..f842d6cee41 100644
--- a/code/modules/instruments/objs/structures/piano.dm
+++ b/code/modules/instruments/objs/structures/piano.dm
@@ -1,5 +1,4 @@
-/obj/structure/piano
-	parent_type = /obj/structure/musician // TODO: Can't edit maps right now due to a freeze, remove and update path when it's done
+/obj/structure/musician/piano
 	name = "space minimoog"
 	icon = 'icons/obj/musician.dmi'
 	icon_state = "minimoog"
@@ -7,10 +6,10 @@
 	density = TRUE
 	allowed_instrument_ids = "piano"
 
-/obj/structure/piano/unanchored
+/obj/structure/musician/piano/unanchored
 	anchored = FALSE
 
-/obj/structure/piano/Initialize(mapload)
+/obj/structure/musician/piano/Initialize(mapload)
 	. = ..()
 	if(prob(50) && icon_state == initial(icon_state))
 		name = "space minimoog"
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index 9c92d448e5a..bb82459583f 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -328,7 +328,7 @@
 					/obj/item/instrument/recorder,
 					/obj/item/instrument/harmonica,
 					/obj/item/instrument/xylophone,
-					/obj/structure/piano)
+					/obj/structure/musician/piano)
 	cost = 500
 	containername = "big band musical instruments collection"