diff --git a/.travis.yml b/.travis.yml index 7b4ba39aa81..cb6334d6e62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: - (num=`grep -E '\\\\(red|blue|green|black|b|i[^mc])' **/*.dm | wc -l`; echo "$num escapes (expecting ${MACRO_COUNT} or less)"; [ $num -le ${MACRO_COUNT} ]) - awk -f tools/indentation.awk **/*.dm - md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int" - - md5sum -c - <<< "88490b460c26947f5ec1ab1bb9fa9f17 *html/changelogs/example.yml" + - md5sum -c - <<< "94c0d540b3b0f008fbc4353e667de690 *html/changelogs/example.yml" - python tools/TagMatcher/tag-matcher.py ../.. - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs --dry-run - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index dd0aca952fc..1b9fe21661d 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -207,6 +207,7 @@ var/list/asset_datums = list() "wrench-screwdriver.png" = 'html/wrench-screwdriver.png', "spell-check.png" = 'html/spell-check.png', "burn-exclamation.png" = 'html/burn-exclamation.png', + "scales.png" = 'html/scales.png', "chevron.png" = 'html/chevron.png', "chevron-expand.png" = 'html/chevron-expand.png', "changelog.css" = 'html/changelog.css', diff --git a/html/changelog.css b/html/changelog.css index d5155db7261..10534d2fa26 100644 --- a/html/changelog.css +++ b/html/changelog.css @@ -21,6 +21,7 @@ a img {border:none;} .spellcheck {background-image:url(spell-check.png)} .experiment {background-image:url(burn-exclamation.png)} .maptweak {background-image:url(map-pencil.png)} +.balance {background-image:url(scales.png)} .sansserif {font-size:12px;} .commit { margin-bottom:20px; diff --git a/html/changelogs/example.yml b/html/changelogs/example.yml index c34ccdd0a08..5eb24e1c0c9 100644 --- a/html/changelogs/example.yml +++ b/html/changelogs/example.yml @@ -19,6 +19,7 @@ # maptweak # spellcheck (typo fixes) # experiment +# balance ################################# # Your name. diff --git a/html/scales.png b/html/scales.png new file mode 100644 index 00000000000..bb28dc9b595 Binary files /dev/null and b/html/scales.png differ diff --git a/tools/GenerateChangelog/ss13_genchangelog.py b/tools/GenerateChangelog/ss13_genchangelog.py index 0782a6ad354..21133a9d351 100644 --- a/tools/GenerateChangelog/ss13_genchangelog.py +++ b/tools/GenerateChangelog/ss13_genchangelog.py @@ -61,7 +61,8 @@ validPrefixes = [ 'imagedel', 'maptweak', 'spellcheck', - 'experiment' + 'experiment', + 'balance' ]