Merge branch 'master' into upstream-merge-29839

This commit is contained in:
LetterJay
2017-09-11 18:03:51 -05:00
committed by GitHub
92 changed files with 2479 additions and 2105 deletions
+5 -1
View File
@@ -16,7 +16,7 @@ GLOBAL_PROTECT(config_dir)
return ..()
/datum/configuration/vv_edit_var(var_name, var_value)
var/static/list/banned_edits = list("cross_address", "cross_allowed", "autoadmin", "autoadmin_rank")
var/static/list/banned_edits = list("cross_address", "cross_allowed", "autoadmin", "autoadmin_rank", "invoke_youtubedl")
if(var_name in banned_edits)
return FALSE
return ..()
@@ -94,6 +94,8 @@ GLOBAL_PROTECT(config_dir)
var/panic_server_name
var/panic_address //Reconnect a player this linked server if this server isn't accepting new players
var/invoke_youtubedl
//IP Intel vars
var/ipintel_email
var/ipintel_rating_bad = 1
@@ -478,6 +480,8 @@ GLOBAL_PROTECT(config_dir)
if("panic_server_address")
if(value != "byond://address:port")
panic_address = value
if("invoke_youtubedl")
invoke_youtubedl = value
if("show_irc_name")
showircname = 1
if("see_own_notes")