cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update configuration.dm

Browse Source
This commit is contained in:
LetterJay
2018-01-11 15:15:50 -06:00
committed by GitHub
parent f9309d4716
commit 4ac9269cdf
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration/configuration.dm
View File

@@ -22,11 +22,7 @@ GLOBAL_PROTECT(config_dir)
config = src
InitEntries()
LoadModes()
<<<<<<< HEAD
if(LoadEntries("config.txt") <= 1)
=======
if(fexists("config/config.txt") && LoadEntries("config.txt") <= 1)
>>>>>>> f860a0f... Merge pull request #34290 from tgstation/Cyberboss-patch-2
log_config("No $include directives found in config.txt! Loading legacy game_options/dbconfig/comms files...")
LoadEntries("game_options.txt")
LoadEntries("dbconfig.txt")