cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 03:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-08-06 22:09:41 +03:00
parent cb5e227320 1ae15cd900
commit 81bb348a42
28 changed files with 204 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration.dm
View File

@@ -160,6 +160,7 @@ var/list/gamemode_cache = list()
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_age_restriction_for_antags = 0 //Do antags use account age restrictions? --requires database
var/age_restrictions_from_file = 0 // Are hardcoded values used or config ones?
var/sql_stats = 0 //Do we record round statistics on the database (deaths, round reports, population, etcetera) or not?
var/sql_whitelists = 0 //Defined whether the server uses an SQL based whitelist system, or the legacy one with two .txts. Config option in config.txt
var/sql_saves = 0 //Defines whether the server uses an SQL based character and preference saving system. Config option in config.txt
@@ -332,6 +333,9 @@ var/list/gamemode_cache = list()
if ("use_age_restriction_for_antags")
config.use_age_restriction_for_antags = 1
if ("load_age_restrictions_from_file")
config.age_restrictions_from_file = 1
if ("jobs_have_minimal_access")
config.jobs_have_minimal_access = 1