cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 12:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
This commit is contained in:
Ccomp5950
2014-03-28 18:46:04 -05:00
parent 820b5e0d9b b5dfa3f08d
commit 56ef5c165c
43 changed files with 1651 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/controllers/configuration.dm
View File

@@ -150,7 +150,7 @@
if (M.config_tag)
if(!(M.config_tag in modes)) // ensure each mode is added only once
diary << "Adding game mode [M.name] ([M.config_tag]) to configuration."
log_misc("Adding game mode [M.name] ([M.config_tag]) to configuration.")
src.modes += M.config_tag
src.mode_names[M.config_tag] = M.name
src.probabilities[M.config_tag] = M.probability
@@ -362,9 +362,9 @@
if (prob_name in config.modes)
config.probabilities[prob_name] = text2num(prob_value)
else
diary << "Unknown game mode probability configuration definition: [prob_name]."
log_misc("Unknown game mode probability configuration definition: [prob_name].")
else
diary << "Incorrect probability configuration definition: [prob_name] [prob_value]."
log_misc("Incorrect probability configuration definition: [prob_name] [prob_value].")
if("allow_random_events")
config.allow_random_events = 1
@@ -484,11 +484,11 @@
config.cult_ghostwriter_req_cultists = value
else
diary << "Unknown setting in configuration: '[name]'"
log_misc("Unknown setting in configuration: '[name]'")
else if(type == "game_options")
if(!value)
diary << "Unknown value for setting [name] in [filename]."
log_misc("Unknown value for setting [name] in [filename].")
value = text2num(value)
switch(name)
@@ -529,7 +529,7 @@
if("limbs_can_break")
config.limbs_can_break = value
else
diary << "Unknown setting in configuration: '[name]'"
log_misc("Unknown setting in configuration: '[name]'")
/datum/configuration/proc/loadsql(filename) // -- TLE
var/list/Lines = file2list(filename)
@@ -575,7 +575,7 @@
if ("enable_stat_tracking")
sqllogging = 1
else
diary << "Unknown setting in configuration: '[name]'"
log_misc("Unknown setting in configuration: '[name]'")
/datum/configuration/proc/loadforumsql(filename) // -- TLE
var/list/Lines = file2list(filename)
@@ -617,7 +617,7 @@
if ("authenticatedgroup")
forum_authenticated_group = value
else
diary << "Unknown setting in configuration: '[name]'"
log_misc("Unknown setting in configuration: '[name]'")
/datum/configuration/proc/pick_mode(mode_name)
// I wish I didn't have to instance the game modes in order to look up