Commit Graph

12 Commits

Author SHA1 Message Date
Kyle Spier-Swenson
988dd75850 Allows editing config.allow_admin_ooccolor 2017-10-07 12:38:17 -05:00
deathride58
5692228379 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:41 -04:00
deathride58
5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
JJRcop
65a997f929 Hosts can lock config options from admins (#31254)
* Hosts can lock config options from admins

* Optimization of LoadEntries

a very very very small one
2017-10-04 14:59:33 -05:00
Jordan Brown
f1dfc1b6db Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss
Partial revert of #30763 (datum config refactor)
2017-10-03 17:55:05 -05:00
deathride58
70f06cfe35 config. > CONFIG_GET 2017-10-01 19:56:44 -04:00
Jordan Brown
4d610b95bd Maplist is loaded regardless of maprotation config setting (#31172)
* Uncomments map rotation in default config

* Maplist is loaded regardless of maprotation config setting

Also logs loading of the map file
2017-10-01 15:27:51 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
Jordan Brown
3b64e0ec35 [s] Fixes config reading exploit 2017-09-30 09:45:13 -05:00
Jordan Brown
116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00