Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/nano/modules/human_appearance.dm
This commit is contained in:
PsiOmegaDelta
2015-06-22 16:59:19 +02:00
14 changed files with 111 additions and 125 deletions
+1 -1
View File
@@ -160,7 +160,7 @@
if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
src << "<span class='info'>You have unread updates in the changelog.</span>"
winset(src, "rpane.changelogb", "background-color=#eaeaea;font-style=bold")
winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
if(config.aggressive_changelog)
src.changes()