diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm
index 69e99c3000..7d3da6f6b4 100644
--- a/code/datums/configuration.dm
+++ b/code/datums/configuration.dm
@@ -31,6 +31,8 @@
 	var/hostedby = null
 	var/respawn = 1
 
+	var/server
+
 /datum/configuration/New()
 	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
 	for (var/T in L)
@@ -156,6 +158,9 @@
 			if ("hostedby")
 				config.hostedby = value
 
+			if ("server")
+				config.server = value
+
 			if ("probability")
 				var/prob_pos = findtext(value, " ")
 				var/prob_name = null
diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm
index c917c324f4..bd0af3a427 100644
--- a/code/game/cellautomata.dm
+++ b/code/game/cellautomata.dm
@@ -128,7 +128,10 @@
 		//			M << sound('NewRound.ogg')
 
 	for(var/client/C)
-		C << link("byond://[world.address]:[world.port]")
+		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]")
 
 //	sleep(10) // wait for sound to play
 	..(reason)
diff --git a/code/modules/mob/living/silicon/decoy/death.dm b/code/modules/mob/living/silicon/decoy/death.dm
index 7817354f3a..080ea66387 100644
--- a/code/modules/mob/living/silicon/decoy/death.dm
+++ b/code/modules/mob/living/silicon/decoy/death.dm
@@ -5,5 +5,5 @@
 
 	for(var/obj/machinery/ai_status_display/O in world) //change status
 		spawn( 0 )
-		O.mode = 2
+			O.mode = 2
 	return ..(gibbed)
\ No newline at end of file
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 97cb425a88..536b2fe047 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -37,7 +37,7 @@
 	src.logged_in = 1
 	if (!src.client.changes)
 		src.changes()
-	if(ticker)
+	if(istype (src, /mob/living))
 		if(ticker.mode.name == "revolution")
 			if ((src.mind in ticker.mode:revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
 				ticker.mode:update_rev_icons_added(src.mind)
diff --git a/config/config.txt b/config/config.txt
index f8e3999d90..ac0d84a956 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -63,3 +63,6 @@ NORESPAWN
 
 # set a hosted by name for unix platforms
 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