mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Added a config.txt option to manually designate a server address, as the current world.address method doesn't work right.
Fixed a runtime error I noticed in login.dm git-svn-id: http://tgstation13.googlecode.com/svn/trunk@100 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -31,6 +31,8 @@
|
|||||||
var/hostedby = null
|
var/hostedby = null
|
||||||
var/respawn = 1
|
var/respawn = 1
|
||||||
|
|
||||||
|
var/server
|
||||||
|
|
||||||
/datum/configuration/New()
|
/datum/configuration/New()
|
||||||
var/list/L = typesof(/datum/game_mode) - /datum/game_mode
|
var/list/L = typesof(/datum/game_mode) - /datum/game_mode
|
||||||
for (var/T in L)
|
for (var/T in L)
|
||||||
@@ -156,6 +158,9 @@
|
|||||||
if ("hostedby")
|
if ("hostedby")
|
||||||
config.hostedby = value
|
config.hostedby = value
|
||||||
|
|
||||||
|
if ("server")
|
||||||
|
config.server = value
|
||||||
|
|
||||||
if ("probability")
|
if ("probability")
|
||||||
var/prob_pos = findtext(value, " ")
|
var/prob_pos = findtext(value, " ")
|
||||||
var/prob_name = null
|
var/prob_name = null
|
||||||
|
|||||||
@@ -128,6 +128,9 @@
|
|||||||
// M << sound('NewRound.ogg')
|
// M << sound('NewRound.ogg')
|
||||||
|
|
||||||
for(var/client/C)
|
for(var/client/C)
|
||||||
|
if (config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
|
||||||
|
C <<link("byond://[config.server]")
|
||||||
|
else
|
||||||
C << link("byond://[world.address]:[world.port]")
|
C << link("byond://[world.address]:[world.port]")
|
||||||
|
|
||||||
// sleep(10) // wait for sound to play
|
// sleep(10) // wait for sound to play
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
src.logged_in = 1
|
src.logged_in = 1
|
||||||
if (!src.client.changes)
|
if (!src.client.changes)
|
||||||
src.changes()
|
src.changes()
|
||||||
if(ticker)
|
if(istype (src, /mob/living))
|
||||||
if(ticker.mode.name == "revolution")
|
if(ticker.mode.name == "revolution")
|
||||||
if ((src.mind in ticker.mode:revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
|
if ((src.mind in ticker.mode:revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
|
||||||
ticker.mode:update_rev_icons_added(src.mind)
|
ticker.mode:update_rev_icons_added(src.mind)
|
||||||
|
|||||||
@@ -63,3 +63,6 @@ NORESPAWN
|
|||||||
|
|
||||||
# set a hosted by name for unix platforms
|
# set a hosted by name for unix platforms
|
||||||
HOSTEDBY Yournamehere
|
HOSTEDBY Yournamehere
|
||||||
|
|
||||||
|
# set a server location for world reboot. Don't include the byond://, just give the addresss and port.
|
||||||
|
# SERVER ss13.jdarksun.doesntexist.org:2506
|
||||||
|
|||||||
Reference in New Issue
Block a user