Moved several globals into the config controller, updated eample config appropriately.

This commit is contained in:
Zuhayr
2014-12-25 21:10:30 +10:30
parent 844c795c7a
commit 8978747e53
27 changed files with 187 additions and 180 deletions
+36 -1
View File
@@ -83,6 +83,7 @@
var/limitalienplayers = 0
var/alien_to_human_ratio = 0.5
var/guests_allowed = 1
var/debugparanoid = 0
var/server
@@ -118,6 +119,8 @@
var/use_loyalty_implants = 0
var/welder_vision = 1
//Used for modifying movement speed for mobs.
//Unversal modifiers
var/run_speed = 0
@@ -145,6 +148,8 @@
var/comms_password = ""
var/enter_allowed = 1
var/use_irc_bot = 0
var/irc_bot_host = ""
var/main_irc = ""
@@ -170,6 +175,12 @@
// 15, 45, 70 minutes respectively
var/list/event_delay_upper = list(EVENT_LEVEL_MUNDANE = 9000, EVENT_LEVEL_MODERATE = 27000, EVENT_LEVEL_MAJOR = 42000)
var/aliens_allowed = 0
var/ninjas_allowed = 0
var/abandon_allowed = 1
var/ooc_allowed = 1
var/dooc_allowed = 1
var/dsay_allowed = 1
/datum/configuration/New()
var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -367,7 +378,22 @@
config.guest_jobban = 1
if ("guest_ban")
guests_allowed = 0
config.guests_allowed = 0
if ("disable_ooc")
config.ooc_allowed = 0
if ("disable_entry")
config.enter_allowed = 0
if ("disable_dead_ooc")
config.dooc_allowed = 0
if ("disable_dsay")
config.dsay_allowed = 0
if ("disable_respawn")
config.abandon_allowed = 0
if ("usewhitelist")
config.usewhitelist = 1
@@ -381,6 +407,12 @@
if ("traitor_scaling")
config.traitor_scaling = 1
if ("aliens_allowed")
config.aliens_allowed = 1
if ("ninjas_allowed")
config.ninjas_allowed = 1
if ("objectives_disabled")
config.objectives_disabled = 1
@@ -544,6 +576,9 @@
if("expected_round_length")
config.expected_round_length = MinutesToTicks(text2num(value))
if("disable_welder_vision")
config.welder_vision = 0
if("event_custom_start_mundane")
var/values = text2numlist(value, ";")
config.event_first_run[EVENT_LEVEL_MUNDANE] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-29
View File
@@ -67,14 +67,6 @@ datum/controller/vote
current_votes.Cut()
additional_text.Cut()
/* if(auto_muted && !ooc_allowed)
auto_muted = 0
ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically enabled due to vote end.</b>"
log_admin("OOC was toggled automatically due to vote end.")
message_admins("OOC has been toggled on automatically.")
*/
proc/get_result()
//get the highest number of votes
var/greatest_votes = 0
@@ -262,27 +254,6 @@ datum/controller/vote
if(mode == "gamemode" && going)
going = 0
world << "<font color='red'><b>Round start has been delayed.</b></font>"
/* if(mode == "crew_transfer" && ooc_allowed)
auto_muted = 1
ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically disabled due to a crew transfer vote.</b>"
log_admin("OOC was toggled automatically due to crew_transfer vote.")
message_admins("OOC has been toggled off automatically.")
if(mode == "gamemode" && ooc_allowed)
auto_muted = 1
ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically disabled due to the gamemode vote.</b>"
log_admin("OOC was toggled automatically due to gamemode vote.")
message_admins("OOC has been toggled off automatically.")
if(mode == "custom" && ooc_allowed)
auto_muted = 1
ooc_allowed = !( ooc_allowed )
world << "<b>The OOC channel has been automatically disabled due to a custom vote.</b>"
log_admin("OOC was toggled automatically due to custom vote.")
message_admins("OOC has been toggled off automatically.")
*/
time_remaining = round(config.vote_period/10)
return 1