cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-21 12:03:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merges VOREStation jukebox into standard jukebox

Browse Source 
Fixes #1184 by simply eliminating the "/vore" sub-type of jukebox.  Now that upstream jukebox has all of our hacking capabilities, we only need to sideways override New to update the songs list.
This commit is contained in:
Leshana
2017-03-19 23:51:56 -04:00
parent d8c96082f4
commit 476b85a489
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/jukebox_vr.dm
+3 -4
View File
@@ -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'),
code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm
-5
View File
@@ -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")
maps/virgo/virgo-1.dmm
+2 -2
View File
@@ -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)
maps/virgo/virgo-4.dmm
+1 -1
View File
@@ -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)