shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #607 from Citadel-Station-13/upstream-merge-26624

Browse Source 
[MIRROR] Fixes changelog assets
This commit is contained in:
LetterJay
2017-04-28 08:19:41 -05:00
committed by GitHub
parent d34b65da86 404b2314c5
commit 8d37d21df4
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/asset_cache.dm
+20 -8
View File
@@ -172,7 +172,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
//DEFINITIONS FOR ASSET DATUMS START HERE. //DEFINITIONS FOR ASSET DATUMS START HERE.
/datum/asset/simple/tgui /datum/asset/simple/tgui
assets = list( assets = list(
"tgui.css" = 'tgui/assets/tgui.css', "tgui.css" = 'tgui/assets/tgui.css',
@@ -208,13 +207,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
"sig_none.gif" = 'icons/program_icons/sig_none.gif', "sig_none.gif" = 'icons/program_icons/sig_none.gif',
) )
/datum/asset/simple/pda /datum/asset/simple/pda
assets = list( assets = list(
"pda_atmos.png" = 'icons/pda_icons/pda_atmos.png', "pda_atmos.png" = 'icons/pda_icons/pda_atmos.png',
@@ -267,6 +259,26 @@ GLOBAL_LIST_EMPTY(asset_datums)
"jquery-1.10.2.min.js" = 'html/IRV/jquery-1.10.2.min.js' "jquery-1.10.2.min.js" = 'html/IRV/jquery-1.10.2.min.js'
) )
/datum/asset/simple/changelog
assets = list(
"88x31.png" = 'html/88x31.png',
"bug-minus.png" = 'html/bug-minus.png',
"cross-circle.png" = 'html/cross-circle.png',
"hard-hat-exclamation.png" = 'html/hard-hat-exclamation.png',
"image-minus.png" = 'html/image-minus.png',
"image-plus.png" = 'html/image-plus.png',
"music-minus.png" = 'html/music-minus.png',
"music-plus.png" = 'html/music-plus.png',
"tick-circle.png" = 'html/tick-circle.png',
"wrench-screwdriver.png" = 'html/wrench-screwdriver.png',
"spell-check.png" = 'html/spell-check.png',
"burn-exclamation.png" = 'html/burn-exclamation.png',
"chevron.png" = 'html/chevron.png',
"chevron-expand.png" = 'html/chevron-expand.png',
"scales.png" = 'html/scales.png',
"changelog.css" = 'html/changelog.css'
)
//Registers HTML Interface assets. //Registers HTML Interface assets.
/datum/asset/HTML_interface/register() /datum/asset/HTML_interface/register()
for(var/path in typesof(/datum/html_interface)) for(var/path in typesof(/datum/html_interface))
interface/interface.dm
+2 -18
View File
@@ -83,24 +83,8 @@ Admin:
/client/verb/changelog() /client/verb/changelog()
set name = "Changelog" set name = "Changelog"
set category = "OOC" set category = "OOC"
getFiles( var/datum/asset/changelog = get_asset_datum(/datum/asset/simple/changelog)
'html/88x31.png', changelog.send(src)
'html/bug-minus.png',
'html/cross-circle.png',
'html/hard-hat-exclamation.png',
'html/image-minus.png',
'html/image-plus.png',
'html/music-minus.png',
'html/music-plus.png',
'html/tick-circle.png',
'html/wrench-screwdriver.png',
'html/spell-check.png',
'html/burn-exclamation.png',
'html/chevron.png',
'html/chevron-expand.png',
'html/changelog.css',
'html/changelog.html'
)
src << browse('html/changelog.html', "window=changes;size=675x650") src << browse('html/changelog.html', "window=changes;size=675x650")
if(prefs.lastchangelog != GLOB.changelog_hash) if(prefs.lastchangelog != GLOB.changelog_hash)
prefs.lastchangelog = GLOB.changelog_hash prefs.lastchangelog = GLOB.changelog_hash