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] 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"