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

This commit is contained in:
Ccomp5950
2014-05-24 19:03:51 -05:00
18 changed files with 325 additions and 283 deletions
+1 -1
View File
@@ -561,7 +561,7 @@ datum/preferences
return
proc/SetAntagoptions(mob/user)
if(uplinklocation == "")
if(uplinklocation == "" || !uplinklocation)
uplinklocation = "PDA"
var/HTML = "<body>"
HTML += "<tt><center>"