diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 6199274798d..a29c3179b21 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -279,19 +279,6 @@ GLOBAL_LIST_EMPTY(asset_datums) "changelog.css" = 'html/changelog.css' ) -/datum/asset/simple/chat - assets = list( - "jquery.min.js" = 'code/modules/html_interface/js/jquery.min.js', - "json2.min.js" = 'goon/browserassets/js/json2.min.js', - "browserOutput.js" = 'goon/browserassets/js/browserOutput.js', - "fontawesome-webfont.eot" = 'tgui/assets/fonts/fontawesome-webfont.eot', - "fontawesome-webfont.svg" = 'tgui/assets/fonts/fontawesome-webfont.svg', - "fontawesome-webfont.ttf" = 'tgui/assets/fonts/fontawesome-webfont.ttf', - "fontawesome-webfont.woff" = 'tgui/assets/fonts/fontawesome-webfont.woff', - "font-awesome.css" = 'goon/browserassets/css/font-awesome.css', - "browserOutput.css" = 'goon/browserassets/css/browserOutput.css' - ) - //Registers HTML Interface assets. /datum/asset/HTML_interface/register() for(var/path in typesof(/datum/html_interface)) diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index 182210d7656..820537e32b1 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -117,7 +117,7 @@ a.popt {text-decoration: none;} } #options .sub {clear: both; display: none; width: 160px;} #options .sub.scroll {overflow-y: scroll;} -#options .sub a {padding: 5px 0 5px 8px; line-height: 30px; font-size: 0.9em; clear: both;} +#options .sub a {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;} #options .sub span { display: block; line-height: 30px; diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm index a708b2094d8..54b6f28d463 100644 --- a/goon/code/datums/browserOutput.dm +++ b/goon/code/datums/browserOutput.dm @@ -4,6 +4,17 @@ For the main html chat area //Precaching a bunch of shit var/savefile/iconCache = new /savefile("data/iconCache.sav") //Cache of icons for the browser output +var/list/chatResources = list( + "code/modules/html_interface/js/jquery.min.js", + "goon/browserassets/js/json2.min.js", + "goon/browserassets/js/browserOutput.js", + "tgui/assets/fonts/fontawesome-webfont.eot", + "tgui/assets/fonts/fontawesome-webfont.svg", + "tgui/assets/fonts/fontawesome-webfont.ttf", + "tgui/assets/fonts/fontawesome-webfont.woff", + "goon/browserassets/css/font-awesome.css", + "goon/browserassets/css/browserOutput.css" + ) //On client, created on login /datum/chatOutput @@ -44,11 +55,18 @@ var/savefile/iconCache = new /savefile("data/iconCache.sav") //Cache of icons fo return // to_chat(world.log, "chatOutput: load()") + for(var/attempts in 1 to 5) + for(var/asset in chatResources) + owner << browse_rsc(file(asset)) - var/datum/asset/chat = get_asset_datum(/datum/asset/simple/chat) - chat.send(owner) - //log_world("Sending main chat window to client [owner.ckey]") - owner << browse(file("goon/browserassets/html/browserOutput.html"), "window=browseroutput") + //log_world("Sending main chat window to client [owner.ckey]") + owner << browse(file("goon/browserassets/html/browserOutput.html"), "window=browseroutput") + sleep(14 + (chatResources.len * 7)) + if(!owner || loaded) + break + + if(!loaded) + stack_trace("[owner] failed to load chat.") // log_world("chatOutput: [owner.ckey] load() completed")