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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update config.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-07 23:06:35 -05:00
committed by GitHub
parent 988dd75850
commit 4a2d9f82a1
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/entries/config.dm
View File

@@ -350,9 +350,6 @@ CONFIG_DEF(number/error_msg_delay) // How long to wait between messaging admins
CONFIG_DEF(flag/irc_announce_new_game) CONFIG_DEF(flag/irc_announce_new_game)
<<<<<<< HEAD
CONFIG_DEF(flag/debug_admin_hrefs)
=======
CONFIG_DEF(flag/debug_admin_hrefs) CONFIG_DEF(flag/debug_admin_hrefs)
CONFIG_DEF(number/mc_tick_rate/base_mc_tick_rate) CONFIG_DEF(number/mc_tick_rate/base_mc_tick_rate)
@@ -376,4 +373,3 @@ CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val))
. = ..() . = ..()
if (.) if (.)
Master.UpdateTickRate() Master.UpdateTickRate()
>>>>>>> 119f3fa... Allows editing config.allow_admin_ooccolor (#31371)