cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
This commit is contained in:
PsiOmega
2015-04-24 17:13:37 +02:00
parent e7d85f8edc d1741a3ade
commit 1fea589ad7
105 changed files with 6547 additions and 4590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+9 -6
View File
@@ -162,7 +162,11 @@
nanomanager.send_resources(src)
if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
src << "<span class='info'>You have unread updates in the changelog.</span>"
winset(src, "rpane.changelogb", "background-color=#eaeaea;font-style=bold")
if(config.aggressive_changelog)
src.changes()
//////////////
@@ -259,8 +263,9 @@
getFiles(
'html/search.js',
'html/panels.css',
'html/painew.png',
'html/loading.gif',
'html/images/loading.gif',
'html/images/ntlogo.png',
'html/images/talisman.png',
'icons/pda_icons/pda_atmos.png',
'icons/pda_icons/pda_back.png',
'icons/pda_icons/pda_bell.png',
@@ -298,7 +303,5 @@
'icons/spideros_icons/sos_11.png',
'icons/spideros_icons/sos_12.png',
'icons/spideros_icons/sos_13.png',
'icons/spideros_icons/sos_14.png',
'html/images/ntlogo.png',
'html/images/talisman.png'
'icons/spideros_icons/sos_14.png'
)