diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm
index ec96e88553..9da8e0105c 100644
--- a/code/controllers/configuration/entries/config.dm
+++ b/code/controllers/configuration/entries/config.dm
@@ -56,7 +56,6 @@ CONFIG_DEF(flag/log_twitter)	// log certain expliotable parrots and other such f
 CONFIG_DEF(flag/log_world_topic)	// log all world.Topic() calls
 
 CONFIG_DEF(flag/allow_admin_ooccolor)	// Allows admins with relevant permissions to have their own ooc colour
-	protection = CONFIG_ENTRY_LOCKED
 
 CONFIG_DEF(flag/allow_vote_restart)	// allow votes to restart
 
@@ -351,4 +350,30 @@ CONFIG_DEF(number/error_msg_delay)	// How long to wait between messaging admins
 
 CONFIG_DEF(flag/irc_announce_new_game)
 
-CONFIG_DEF(flag/debug_admin_hrefs)
\ No newline at end of file
+<<<<<<< HEAD
+CONFIG_DEF(flag/debug_admin_hrefs)
+=======
+CONFIG_DEF(flag/debug_admin_hrefs)
+
+CONFIG_DEF(number/mc_tick_rate/base_mc_tick_rate)
+	integer = FALSE
+	value = 1
+
+CONFIG_DEF(number/mc_tick_rate/high_pop_mc_tick_rate)
+	integer = FALSE
+	value = 1.1
+
+CONFIG_DEF(number/mc_tick_rate/high_pop_mc_mode_amount)
+	value = 65
+
+CONFIG_DEF(number/mc_tick_rate/disable_high_pop_mc_mode_amount)
+	value = 60
+
+CONFIG_TWEAK(number/mc_tick_rate)
+	abstract_type = /datum/config_entry/number/mc_tick_rate
+
+CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val))
+	. = ..()
+	if (.)
+		Master.UpdateTickRate()
+>>>>>>> 119f3fa... Allows editing config.allow_admin_ooccolor (#31371)