diff --git a/code/game/machinery/casino_ch.dm b/code/game/machinery/casino_ch.dm index 942c813461..01385d09dc 100644 --- a/code/game/machinery/casino_ch.dm +++ b/code/game/machinery/casino_ch.dm @@ -390,11 +390,11 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/unathiliquor, /obj/item/weapon/reagent_containers/chem_disp_cartridge/winebrandy, /obj/item/weapon/reagent_containers/chem_disp_cartridge/snaps - ) - - /*/obj/item/weapon/reagent_containers/chem_disp_cartridge/matcha_latte,*/ //Not ported yet either - Jack - /*/obj/item/weapon/reagent_containers/chem_disp_cartridge/nutbutter,*/ //Not ported yet - Jack - /*/obj/item/weapon/reagent_containers/chem_disp_cartridge/gelatin,*/ //Not ported yet - Jack + ) + +/*/obj/item/weapon/reagent_containers/chem_disp_cartridge/matcha_latte,*/ //Not ported yet either - Jack +/*/obj/item/weapon/reagent_containers/chem_disp_cartridge/nutbutter,*/ //Not ported yet - Jack +/*/obj/item/weapon/reagent_containers/chem_disp_cartridge/gelatin,*/ //Not ported yet - Jack /obj/machinery/chemical_dispenser/deluxe/New() ..() @@ -544,7 +544,7 @@ /obj/item/weapon/reagent_containers/food/drinks/ice = 10, /obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 10, /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 10 - ) + ) contraband = list() vend_delay = 15 diff --git a/code/modules/media/media_tracks.dm b/code/modules/media/media_tracks.dm index 5731d9ba3c..f6698c9e2e 100644 --- a/code/modules/media/media_tracks.dm +++ b/code/modules/media/media_tracks.dm @@ -10,7 +10,7 @@ var/duration // Song length in deciseconds var/secret // Show up in regular playlist or secret playlist? var/lobby // Be one of the choices for lobby music? - var/casino // Music for casino jukebox + var/casino // CHOMP Music for casino jukebox - Jack /datum/track/New(var/url, var/title, var/duration, var/artist = "", var/secret = 0, var/lobby = 0) src.url = url @@ -19,7 +19,7 @@ src.duration = duration src.secret = secret src.lobby = lobby - src.casino = casino + src.casino = casino // CHOMP Music for casino jukebox /datum/track/proc/display() var str = "\"[title]\"" @@ -58,7 +58,7 @@ var/global/list/all_lobby_tracks = list() if(istext(entry["artist"])) T.artist = entry["artist"] T.secret = entry["secret"] ? 1 : 0 - T.casino = entry["casino"] ? 1 : 0 //CHOMP Casino music - Jack + T.casino = entry["casino"] ? 1 : 0 //CHOMP Casino music T.lobby = entry["lobby"] ? 1 : 0 all_jukebox_tracks += T if(T.lobby)