diff --git a/code/game/machinery/jukebox_vr.dm b/code/game/machinery/jukebox_vr.dm index dd9ddcca88..f48b3365b5 100644 --- a/code/game/machinery/jukebox_vr.dm +++ b/code/game/machinery/jukebox_vr.dm @@ -1,7 +1,6 @@ -// The improved, hackable jukebox for vorestation! - -/obj/machinery/media/jukebox/vore - circuit = /obj/item/weapon/circuitboard/jukebox/vore +// Add more nice songs for VOREStation jukeboxes +/obj/machinery/media/jukebox/New() + ..() 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 index 2f51602746..25b2514c34 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm @@ -4,11 +4,6 @@ // 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 - // Board for the parts lathe in partslathe.dm /obj/item/weapon/circuitboard/partslathe name = T_BOARD("parts lathe") diff --git a/maps/virgo/virgo-1.dmm b/maps/virgo/virgo-1.dmm index 79a6ba8c26..fd3dd231f5 100644 --- a/maps/virgo/virgo-1.dmm +++ b/maps/virgo/virgo-1.dmm @@ -5233,7 +5233,7 @@ "bWG" = (/obj/structure/flora/ausbushes/stalkybush,/turf/simulated/floor/grass,/area/crew_quarters/kitchen) "bWH" = (/obj/structure/closet/crate,/obj/random/drinkbottle,/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor,/area/maintenance/central) "bWI" = (/obj/machinery/door/airlock{name = "Bar Backroom"; req_access = list(25)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bWJ" = (/obj/machinery/media/jukebox/vore,/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bWJ" = (/obj/machinery/media/jukebox,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bWK" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bWL" = (/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bWM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/firedoor,/obj/machinery/door/blast/shutters{dir = 8; id = "cap_office"; layer = 3.1; name = "Captain's Shutters"},/turf/simulated/floor/plating,/area/bridge_hallway) @@ -5600,7 +5600,7 @@ "cdJ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cdK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "cdL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/hallway/primary/central_three) -"cdM" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/media/jukebox/vore,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) +"cdM" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/media/jukebox,/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/crew_quarters/coffee_shop) "cdN" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "cdO" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,/obj/item/weapon/reagent_containers/glass/rag,/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/lino,/area/crew_quarters/bar) "cdP" = (/obj/structure/table/reinforced,/obj/machinery/door/blast/shutters{dir = 2; id = "bar"; layer = 3.1; name = "Bar Shutters"},/turf/simulated/floor/lino,/area/crew_quarters/bar) diff --git a/maps/virgo/virgo-4.dmm b/maps/virgo/virgo-4.dmm index d488b09196..d46a286579 100644 --- a/maps/virgo/virgo-4.dmm +++ b/maps/virgo/virgo-4.dmm @@ -456,7 +456,7 @@ "iN" = (/obj/machinery/computer/arcade/orion_trail,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/common_area) "iO" = (/obj/machinery/light,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/common_area) "iP" = (/turf/simulated/shuttle/floor{icon_state = "floor7"},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/houseboat) -"iQ" = (/obj/machinery/media/jukebox/vore,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/common_area) +"iQ" = (/obj/machinery/media/jukebox,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/common_area) "iR" = (/obj/machinery/door/airlock/multi_tile/glass,/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/houseboat/airlock) "iS" = (/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/airlock) "iT" = (/obj/machinery/button/remote/blast_door{id = "ls_tport"; name = "Shutters"; pixel_x = 0; pixel_y = -26; req_access = list(101)},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/houseboat/teleporter)