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

This commit is contained in:
Ccomp5950
2014-05-24 19:02:16 -05:00
6 changed files with 9 additions and 7 deletions

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>"