cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

Browse Source 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
This commit is contained in:
Ccomp5950
2014-04-25 21:14:58 -05:00
parent 9dcea4f753 0a345ea9e0
commit 976ae06e6b
79 changed files with 1440 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
-3
View File
@@ -243,9 +243,6 @@
/client/proc/send_resources()
// preload_vox() //Causes long delays with initial start window and subsequent windows when first logged in.
// Send NanoUI resources to this client
nanomanager.send_resources(src)
getFiles(
'html/search.js',
'html/panels.css',
code/modules/client/preferences.dm
+2
View File
@@ -555,6 +555,8 @@ datum/preferences
return
proc/SetAntagoptions(mob/user)
if(uplinklocation == "")
uplinklocation = "PDA"
var/HTML = "<body>"
HTML += "<tt><center>"
HTML += "<b>Antagonist Options</b> <hr />"