cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 06:26:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7964 from Baystation12/dev-freeze

Browse Source 
Dev-Freezer -> Master v0.1.17 Botswan Punchout
This commit is contained in:
Zuhayr
2015-02-02 02:14:08 +10:30
parent d0f537180e 19f288e22e
commit 20da84646b
1191 changed files with 44223 additions and 39318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/world.dm
+10 -11
View File
@@ -6,6 +6,7 @@ var/global/datum/global_init/init = new ()
/datum/global_init/New()
makeDatumRefLists()
load_configuration()
del(src)
@@ -25,15 +26,13 @@ var/global/datum/global_init/init = new ()
var/date_string = time2text(world.realtime, "YYYY/MM-Month/DD-Day")
href_logfile = file("data/logs/[date_string] hrefs.htm")
diary = file("data/logs/[date_string].log")
diaryofmeanpeople = file("data/logs/[date_string] Attack.log")
diary << "[log_end]\n[log_end]\nStarting up. [time2text(world.timeofday, "hh:mm.ss")][log_end]\n---------------------[log_end]"
diaryofmeanpeople << "[log_end]\n[log_end]\nStarting up. [time2text(world.timeofday, "hh:mm.ss")][log_end]\n---------------------[log_end]"
changelog_hash = md5('html/changelog.html') //used for telling if the changelog has changed recently
if(byond_version < RECOMMENDED_VERSION)
world.log << "Your server's byond version does not meet the recommended requirements for this server. Please update BYOND"
load_configuration()
config.post_load()
if(config && config.server_name != null && config.server_suffix && world.port > 0)
// dumb and hardcoded but I don't care~
@@ -58,6 +57,9 @@ var/global/datum/global_init/init = new ()
// due to this list not being instantiated.
populate_seed_list()
// Create autolathe recipes, as above.
populate_lathe_recipes()
master_controller = new /datum/controller/game_controller()
spawn(1)
master_controller.setup()
@@ -106,8 +108,8 @@ var/world_topic_spam_protect_time = world.timeofday
var/list/s = list()
s["version"] = game_version
s["mode"] = master_mode
s["respawn"] = config ? abandon_allowed : 0
s["enter"] = enter_allowed
s["respawn"] = config.abandon_allowed
s["enter"] = config.enter_allowed
s["vote"] = config.allow_vote_mode
s["ai"] = config.allow_ai
s["host"] = host ? host : null
@@ -254,15 +256,12 @@ var/world_topic_spam_protect_time = world.timeofday
join_motd = file2text("config/motd.txt")
/world/proc/load_configuration()
/proc/load_configuration()
config = new /datum/configuration()
config.load("config/config.txt")
config.load("config/game_options.txt","game_options")
config.loadsql("config/dbconfig.txt")
config.loadforumsql("config/forumdbconfig.txt")
// apply some settings from config..
abandon_allowed = config.respawn
/hook/startup/proc/loadMods()
world.load_mods()
@@ -312,10 +311,10 @@ var/world_topic_spam_protect_time = world.timeofday
else
features += "<b>STARTING</b>"
if (!enter_allowed)
if (!config.enter_allowed)
features += "closed"
features += abandon_allowed ? "respawn" : "no respawn"
features += config.abandon_allowed ? "respawn" : "no respawn"
if (config && config.allow_vote_mode)
features += "vote"