cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

Browse Source 
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
This commit is contained in:
Arokha Sieyes
2017-04-25 15:04:54 -04:00
parent b7898c1eaf 40e58d6f5b
commit 055c998f82
234 changed files with 2523 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration.dm
View File

@@ -157,6 +157,8 @@ var/list/gamemode_cache = list()
var/slime_delay = 0
var/animal_delay = 0
var/footstep_volume = 0
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
@@ -772,6 +774,8 @@ var/list/gamemode_cache = list()
if("animal_delay")
config.animal_delay = value
if("footstep_volume")
config.footstep_volume = text2num(value)
if("use_loyalty_implants")
config.use_loyalty_implants = 1