shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
+9 -94
View File
@@ -1,4 +1,4 @@
//Configuraton defines //TODO: Move all yes/no switches into bitflags
f//Configuraton defines //TODO: Move all yes/no switches into bitflags
//Used by jobs_have_maint_access
#define ASSISTANTS_HAVE_MAINT_ACCESS 1
@@ -18,7 +18,6 @@
var/server_suffix = 0 // generate numeric suffix based on server port
var/lobby_countdown = 120 // In between round countdown.
var/round_end_countdown = 25 // Post round murder death kill countdown
var/hub = 0
var/log_ooc = 0 // log OOC channel
var/log_access = 0 // log login/logout
@@ -34,7 +33,6 @@
var/log_adminchat = 0 // log admin chat messages
var/log_pda = 0 // log pda messages
var/log_hrefs = 0 // log all links clicked in-game. Could be used for debugging and tracking down exploits
var/log_twitter = 0 // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases.
var/log_world_topic = 0 // log all world.Topic() calls
var/sql_enabled = 0 // for sql switching
var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour
@@ -72,11 +70,6 @@
var/forbid_singulo_possession = 0
var/useircbot = 0
var/check_randomizer = 0
var/allow_panic_bunker_bounce = 0 //Send new players somewhere else
var/panic_server_name = "somewhere else"
//IP Intel vars
var/ipintel_email
var/ipintel_rating_bad = 1
@@ -87,7 +80,6 @@
var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt
var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt
var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database
var/use_account_age_for_jobs = 0 //Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected.
var/see_own_notes = 0 //Can players see their own admin notes (read-only)? Config option in config.txt
//Population cap vars
@@ -104,8 +96,6 @@
var/list/modes = list() // allowed modes
var/list/votable_modes = list() // votable modes
var/list/probabilities = list() // relative probability of each mode
var/list/min_pop = list() // overrides for acceptible player counts in a mode
var/list/max_pop = list()
var/humans_need_surnames = 0
var/allow_ai = 0 // allow ai job
@@ -147,6 +137,9 @@
var/alert_desc_red_downto = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised."
var/alert_desc_delta = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill."
var/health_threshold_crit = 0
var/health_threshold_dead = -100
var/revival_pod_plants = 1
var/revival_cloning = 1
var/revival_brain_life = -1
@@ -174,8 +167,6 @@
var/silent_ai = 0
var/silent_borg = 0
var/damage_multiplier = 1 //Modifier for damage to all mobs. Impacts healing as well.
var/allowwebclient = 0
var/webclientmembersonly = 0
@@ -183,9 +174,6 @@
var/default_laws = 0 //Controls what laws the AI spawns with.
var/silicon_max_law_amount = 12
var/list/lawids = list()
var/list/law_weights = list()
var/assistant_cap = -1
@@ -194,7 +182,6 @@
var/grey_assistants = 0
var/lavaland_budget = 60
var/space_budget = 16
var/aggressive_changelog = 0
@@ -226,7 +213,6 @@
var/client_error_message = "Your version of byond is too old, may have issues, and is blocked from accessing this server."
var/cross_name = "Other server"
var/showircname = 0
/datum/configuration/New()
var/list/L = subtypesof(/datum/game_mode)
@@ -274,16 +260,12 @@
if(type == "config")
switch(name)
if("hub")
config.hub = 1
if("admin_legacy_system")
config.admin_legacy_system = 1
if("ban_legacy_system")
config.ban_legacy_system = 1
if("use_age_restriction_for_jobs")
config.use_age_restriction_for_jobs = 1
if("use_account_age_for_jobs")
config.use_account_age_for_jobs = 1
if("lobby_countdown")
config.lobby_countdown = text2num(value)
if("round_end_countdown")
@@ -316,8 +298,6 @@
config.log_pda = 1
if("log_hrefs")
config.log_hrefs = 1
if("log_twitter")
config.log_twitter = 1
if("log_world_topic")
config.log_world_topic = 1
if("allow_admin_ooccolor")
@@ -361,7 +341,7 @@
if("guest_ban")
guests_allowed = 0
if("usewhitelist")
config.usewhitelist = TRUE
config.usewhitelist = 1
if("allow_metadata")
config.allow_Metadata = 1
if("kick_inactive")
@@ -396,18 +376,6 @@
global.cross_allowed = 1
if("cross_comms_name")
cross_name = value
if("panic_server_name")
panic_server_name = value
if("panic_server_address")
global.panic_address = value
if(value != "byond:\\address:port")
allow_panic_bunker_bounce = 1
if("medal_hub_address")
global.medal_hub = value
if("medal_hub_password")
global.medal_pass = value
if("show_irc_name")
config.showircname = 1
if("see_own_notes")
config.see_own_notes = 1
if("soft_popcap")
@@ -428,8 +396,6 @@
config.notify_new_player_age = text2num(value)
if("irc_first_connection_alert")
config.irc_first_connection_alert = 1
if("check_randomizer")
config.check_randomizer = 1
if("ipintel_email")
if (value != "ch@nge.me")
config.ipintel_email = value
@@ -482,8 +448,10 @@
else if(type == "game_options")
switch(name)
if("damage_multiplier")
config.damage_multiplier = text2num(value)
if("health_threshold_crit")
config.health_threshold_crit = text2num(value)
if("health_threshold_dead")
config.health_threshold_dead = text2num(value)
if("revival_pod_plants")
config.revival_pod_plants = text2num(value)
if("revival_cloning")
@@ -552,34 +520,6 @@
config.midround_antag_time_check = text2num(value)
if("midround_antag_life_check")
config.midround_antag_life_check = text2num(value)
if("min_pop")
var/pop_pos = findtext(value, " ")
var/mode_name = null
var/mode_value = null
if(pop_pos)
mode_name = lowertext(copytext(value, 1, pop_pos))
mode_value = copytext(value, pop_pos + 1)
if(mode_name in config.modes)
config.min_pop[mode_name] = text2num(mode_value)
else
diary << "Unknown minimum population configuration definition: [mode_name]."
else
diary << "Incorrect minimum population configuration definition: [mode_name] [mode_value]."
if("max_pop")
var/pop_pos = findtext(value, " ")
var/mode_name = null
var/mode_value = null
if(pop_pos)
mode_name = lowertext(copytext(value, 1, pop_pos))
mode_value = copytext(value, pop_pos + 1)
if(mode_name in config.modes)
config.max_pop[mode_name] = text2num(mode_value)
else
diary << "Unknown maximum population configuration definition: [mode_name]."
else
diary << "Incorrect maximum population configuration definition: [mode_name] [mode_value]."
if("shuttle_refuel_delay")
config.shuttle_refuel_delay = text2num(value)
if("show_game_type_odds")
@@ -649,19 +589,6 @@
config.sandbox_autoclose = 1
if("default_laws")
config.default_laws = text2num(value)
if("random_laws")
var/law_id = lowertext(value)
lawids += law_id
if("law_weight")
// Value is in the form "LAWID,NUMBER"
var/list/L = splittext(value, ",")
if(L.len != 2)
diary << "Invalid LAW_WEIGHT: " + t
continue
var/lawid = L[1]
var/weight = text2num(L[2])
law_weights[lawid] = weight
if("silicon_max_law_amount")
config.silicon_max_law_amount = text2num(value)
if("join_with_mutant_race")
@@ -682,8 +609,6 @@
config.grey_assistants = 1
if("lavaland_budget")
config.lavaland_budget = text2num(value)
if("space_budget")
config.space_budget = text2num(value)
if("no_summon_guns")
config.no_summon_guns = 1
if("no_summon_magic")
@@ -828,10 +753,6 @@
if(probabilities[M.config_tag]<=0)
qdel(M)
continue
if(min_pop[M.config_tag])
M.required_players = min_pop[M.config_tag]
if(max_pop[M.config_tag])
M.maximum_players = max_pop[M.config_tag]
if(M.can_start())
runnable_modes[M] = probabilities[M.config_tag]
//world << "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]"
@@ -847,13 +768,7 @@
if(probabilities[M.config_tag]<=0)
qdel(M)
continue
if(min_pop[M.config_tag])
M.required_players = min_pop[M.config_tag]
if(max_pop[M.config_tag])
M.maximum_players = max_pop[M.config_tag]
if(M.required_players <= crew)
if(M.maximum_players >= 0 && M.maximum_players < crew)
continue
runnable_modes[M] = probabilities[M.config_tag]
return runnable_modes