cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

its fixed, now, yes.

Browse Source 
also added comments on media tracks
This commit is contained in:
Shadowfire
2020-02-17 15:25:34 +01:00
parent bc06c99ae2
commit 10cac44a5b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/casino_ch.dm
View File

@@ -390,11 +390,11 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/unathiliquor, /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/winebrandy,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/snaps /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/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/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/gelatin,*/ //Not ported yet - Jack
/obj/machinery/chemical_dispenser/deluxe/New() /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/ice = 10,
/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 10, /obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 10,
/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 10 /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 10
) )
contraband = list() contraband = list()
vend_delay = 15 vend_delay = 15

6
code/modules/media/media_tracks.dm
View File

@@ -10,7 +10,7 @@
var/duration // Song length in deciseconds var/duration // Song length in deciseconds
var/secret // Show up in regular playlist or secret playlist? var/secret // Show up in regular playlist or secret playlist?
var/lobby // Be one of the choices for lobby music? 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) /datum/track/New(var/url, var/title, var/duration, var/artist = "", var/secret = 0, var/lobby = 0)
src.url = url src.url = url
@@ -19,7 +19,7 @@
src.duration = duration src.duration = duration
src.secret = secret src.secret = secret
src.lobby = lobby src.lobby = lobby
src.casino = casino src.casino = casino // CHOMP Music for casino jukebox
/datum/track/proc/display() /datum/track/proc/display()
var str = "\"[title]\"" var str = "\"[title]\""
@@ -58,7 +58,7 @@ var/global/list/all_lobby_tracks = list()
if(istext(entry["artist"])) if(istext(entry["artist"]))
T.artist = entry["artist"] T.artist = entry["artist"]
T.secret = entry["secret"] ? 1 : 0 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 T.lobby = entry["lobby"] ? 1 : 0
all_jukebox_tracks += T all_jukebox_tracks += T
if(T.lobby) if(T.lobby)