From f87c9e7b7e423d76c32f1297604accaaeba6d0e7 Mon Sep 17 00:00:00 2001
From: spaghettiweaver <54292197+spaghettiweaver@users.noreply.github.com>
Date: Thu, 23 Apr 2020 00:28:03 -0500
Subject: [PATCH 1/2] Adds purchaseable Piano crates to cargo

Costs 150 cargo points, to deliver a largecrate infamous for their ability to make their contents lighter and ship better. When pried open the crate produces either a minimoog or space piano.
---
 code/datums/supplypacks/recreation_yw.dm               |  7 +++++++
 .../objects/structures/crates_lockers/largecrate.dm    | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/code/datums/supplypacks/recreation_yw.dm b/code/datums/supplypacks/recreation_yw.dm
index 1cd2bb0bbe..5a3a86462e 100644
--- a/code/datums/supplypacks/recreation_yw.dm
+++ b/code/datums/supplypacks/recreation_yw.dm
@@ -14,3 +14,10 @@
 	cost = 100
 	containertype = /obj/structure/closet/crate
 	containername = "Instrument crate"
+
+/datum/supply_pack/recreation/piano
+	name = "Grand* Piano"
+	contains = list()
+	cost = 150
+	containertype = /obj/structure/largecrate/piano
+	containername = "Piano Crate"
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 79bd5e2949..31fe06f686 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -111,3 +111,13 @@
 /obj/structure/largecrate/animal/chick
 	name = "chicken crate"
 	starts_with = list(/mob/living/simple_mob/animal/passive/chick = 5)
+
+/obj/structure/largecrate/piano
+	name = "piano crate"
+	starts_with = list(/obj/structure/device/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))
+	return ..()
\ No newline at end of file

From b5a2bfee1fdf3e111900a6caf66f3135f34b0d68 Mon Sep 17 00:00:00 2001
From: spaghettiweaver <54292197+spaghettiweaver@users.noreply.github.com>
Date: Fri, 24 Apr 2020 22:45:54 -0500
Subject: [PATCH 2/2] Moves the piano crate to largecrate_yw

modularity and all that
---
 .../objects/structures/crates_lockers/largecrate.dm    | 10 ----------
 .../objects/structures/crates_lockers/largecrate_yw.dm |  9 +++++++++
 vorestation.dme                                        |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 code/game/objects/structures/crates_lockers/largecrate_yw.dm

diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 202ae10144..29f1b231aa 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -110,13 +110,3 @@
 /obj/structure/largecrate/animal/chick
 	name = "chicken crate"
 	starts_with = list(/mob/living/simple_mob/animal/passive/chick = 5)
-
-/obj/structure/largecrate/piano
-	name = "piano crate"
-	starts_with = list(/obj/structure/device/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))
-	return ..()
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/largecrate_yw.dm b/code/game/objects/structures/crates_lockers/largecrate_yw.dm
new file mode 100644
index 0000000000..b680e5fde3
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/largecrate_yw.dm
@@ -0,0 +1,9 @@
+/obj/structure/largecrate/piano
+	name = "piano crate"
+	starts_with = list(/obj/structure/device/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))
+	return ..()
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 55f3747228..abc6f7c49c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1406,6 +1406,7 @@
 #include "code\game\objects\structures\crates_lockers\crates_vr.dm"
 #include "code\game\objects\structures\crates_lockers\largecrate.dm"
 #include "code\game\objects\structures\crates_lockers\largecrate_vr.dm"
+#include "code\game\objects\structures\crates_lockers\largecrate_yw.dm"
 #include "code\game\objects\structures\crates_lockers\vehiclecage.dm"
 #include "code\game\objects\structures\crates_lockers\closets\coffin.dm"
 #include "code\game\objects\structures\crates_lockers\closets\crittercrate.dm"