Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hubshite

# Conflicts:
#	code/hub.dm
This commit is contained in:
Yoshax
2016-06-25 01:27:37 +01:00
13 changed files with 123 additions and 78 deletions

View File

@@ -4,7 +4,6 @@
hub_password = "kMZy3U5jJHSiBQjr"
//hub_password = "SORRYNOPASSWORD"
name = "Space Station 13"
visibility = 0
/* This is for any host that would like their server to appear on the main SS13 hub.
To use it, simply replace the password above, with the password found below, and it should work.
@@ -13,4 +12,4 @@ If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstatio
hub = "Exadv1.spacestation13"
hub_password = "kMZy3U5jJHSiBQjr"
name = "Space Station 13"
*/
*/