From ed78e7dbe9dbf0fac7b4b83ff9b1f6185e46df4c Mon Sep 17 00:00:00 2001 From: Leshana Date: Wed, 22 Feb 2017 17:50:53 -0500 Subject: [PATCH] Make vore jukebox re-constructable * Put in our own circuit board so de-constructing and re-constructing gets the same machine back. * Polaris now has all the same icon states as we do! We don't need our own jukebox_vr.dmi anymore. --- code/game/machinery/jukebox_vr.dm | 2 +- .../weapons/circuitboards/circuitboards_vr.dm | 10 ++++++++++ icons/obj/jukebox_vr.dmi | Bin 7870 -> 0 bytes vorestation.dme | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm delete mode 100644 icons/obj/jukebox_vr.dmi diff --git a/code/game/machinery/jukebox_vr.dm b/code/game/machinery/jukebox_vr.dm index 0a6fb98891..dd9ddcca88 100644 --- a/code/game/machinery/jukebox_vr.dm +++ b/code/game/machinery/jukebox_vr.dm @@ -1,7 +1,7 @@ // The improved, hackable jukebox for vorestation! /obj/machinery/media/jukebox/vore - icon = 'icons/obj/jukebox_vr.dmi' + circuit = /obj/item/weapon/circuitboard/jukebox/vore secret_tracks = list( new/datum/track("Bandit Radio", 'sound/music/jukebox/bandit_radio.ogg'), new/datum/track("Ghost Fight (Toby Fox)", 'sound/music/jukebox/TobyFoxGhostFight.mid'), diff --git a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm new file mode 100644 index 0000000000..ad3788720a --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm @@ -0,0 +1,10 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +// VOREStation specific circuit boards! + +// Our own board so deconstructing and reconstructing gets the same machine back... +/obj/item/weapon/circuitboard/jukebox/vore + name = T_BOARD("VORE jukebox") + build_path = /obj/machinery/media/jukebox/vore diff --git a/icons/obj/jukebox_vr.dmi b/icons/obj/jukebox_vr.dmi deleted file mode 100644 index 52386940e9819a4b76d794f9ede58d51f665859c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7870 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 x!JW