Merge conflict fix

code/controllers/configuration/config_entry.dm

@@ -103,7 +103,7 @@
 		return FALSE
 	var/temp = text2num(trim(str_val))
 	if(!isnull(temp))
-		config_entry_value = CLAMP(integer ? round(temp) : temp, min_val, max_val)
+		config_entry_value = clamp(integer ? round(temp) : temp, min_val, max_val)
 		if(config_entry_value != temp && !(datum_flags & DF_VAR_EDITED))
 			log_config("Changing [name] from [temp] to [config_entry_value]!")
 		return TRUE

code/controllers/configuration/entries/game_options.dm

@@ -35,6 +35,13 @@
 /datum/config_entry/keyed_list/midround_antag/ValidateListEntry(key_name, key_value)
 	return key_name in config.modes
 
+/datum/config_entry/keyed_list/force_antag_count
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_FLAG
+
+/datum/config_entry/keyed_list/force_antag_count/ValidateListEntry(key_name, key_value)
+	return key_name in config.modes
+
 /datum/config_entry/keyed_list/policy
 	key_mode = KEY_MODE_TEXT
 	value_mode = VALUE_MODE_TEXT
@@ -217,7 +224,8 @@
 	config_entry_value = list(			//DEFAULTS
 	/mob/living/simple_animal = 1,
 	/mob/living/silicon/pai = 1,
-	/mob/living/carbon/alien/humanoid/hunter = -1,
+	/mob/living/carbon/alien/humanoid/sentinel = 0.25,
+	/mob/living/carbon/alien/humanoid/drone = 0.5,
 	/mob/living/carbon/alien/humanoid/royal/praetorian = 1,
 	/mob/living/carbon/alien/humanoid/royal/queen = 3
 	)
@@ -248,8 +256,18 @@
 
 /datum/config_entry/number/movedelay/run_delay
 
+/datum/config_entry/number/movedelay/run_delay/ValidateAndSet()
+	. = ..()
+	var/datum/movespeed_modifier/config_walk_run/M = get_cached_movespeed_modifier(/datum/movespeed_modifier/config_walk_run/run)
+	M.sync()
+
 /datum/config_entry/number/movedelay/walk_delay
 
+/datum/config_entry/number/movedelay/walk_delay/ValidateAndSet()
+	. = ..()
+	var/datum/movespeed_modifier/config_walk_run/M = get_cached_movespeed_modifier(/datum/movespeed_modifier/config_walk_run/walk)
+	M.sync()
+
 /datum/config_entry/number/movedelay/sprint_speed_increase
 	config_entry_value = 1
 
@@ -288,6 +306,8 @@
 
 /datum/config_entry/flag/roundstart_away	//Will random away mission be loaded.
 
+/datum/config_entry/flag/roundstart_vr 		//Will virtual reality missions be loaded?
+
 /datum/config_entry/number/gateway_delay	//How long the gateway takes before it activates. Default is half an hour. Only matters if roundstart_away is enabled.
 	config_entry_value = 18000
 	min_val = 0
@@ -335,6 +355,11 @@
 	config_entry_value = 16
 	min_val = 0
 
+/datum/config_entry/number/icemoon_budget
+	config_entry_value = 90
+	integer = FALSE
+	min_val = 0
+
 /datum/config_entry/number/station_space_budget
 	config_entry_value = 10
 	min_val = 0
@@ -455,10 +480,12 @@
 	config_entry_value = RESIZE_DEFAULT_SIZE
 	min_val = 0.1 //to avoid issues with zeros and negative values.
 	max_val = RESIZE_DEFAULT_SIZE
+	integer = FALSE
 
 /datum/config_entry/number/body_size_max
 	config_entry_value = RESIZE_DEFAULT_SIZE
 	min_val = RESIZE_DEFAULT_SIZE
+	integer = FALSE
 
 //Pun-Pun movement slowdown given to characters with a body size smaller than this value,
 //to compensate for their smaller hitbox.
@@ -467,13 +494,14 @@
 	config_entry_value = RESIZE_DEFAULT_SIZE * 0.85
 	min_val = 0
 	max_val = RESIZE_DEFAULT_SIZE
+	integer = FALSE
 
 //multiplicative slowdown multiplier. See 'dna.update_body_size' for the operation.
 //doesn't apply to floating or crawling mobs
 /datum/config_entry/number/body_size_slowdown_multiplier
 	config_entry_value = 0.25
 	min_val = 0.1 //To encourage folks to disable the slowdown through the above config instead.
+	integer = FALSE
 
 //Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones.
-/datum/config_entry/number/allow_custom_skintones
-	config_entry_value = 1
+/datum/config_entry/flag/allow_custom_skintones