Sabre tweaks

code/controllers/configuration/__config_defines.dm

@@ -34,9 +34,7 @@
 
 /// Wrapper to not overwrite a variable if a list key doesnt exist. Ensures target is a list.
 #define CONFIG_LOAD_LIST(target, input) \
-	if(!isnull(input)) {\
-		if(islist(input)) {\
-			target = input\
-		}\
+	if(islist(input)) {\
+		target = input\
 	}
 

code/controllers/configuration/sections/gamemode_configuration.dm

@@ -69,6 +69,7 @@
 			return new T()
 
 	// Default to extended if it didnt work
+	stack_trace("Could not pick a gamemode. Defaulting to extended. (Attempted mode: [mode_name])")
 	return new /datum/game_mode/extended()
 
 /datum/configuration_section/gamemode_configuration/proc/get_runnable_modes()
@@ -80,7 +81,7 @@
 			qdel(M)
 			continue
 
-		if(probabilities[M.config_tag]<=0)
+		if(probabilities[M.config_tag] <= 0)
 			qdel(M)
 			continue
 

code/controllers/configuration/sections/ipintel_configuration.dm

@@ -2,7 +2,7 @@
 /datum/configuration_section/ipintel_configuration
 	/// Is IPIntel enabled
 	var/enabled = FALSE
-	/// Arew we in whitelist mode (Auto-kick people who are on proxies/VPNs)
+	/// Are we in whitelist mode (Auto-kick people who are on proxies/VPNs)
 	var/whitelist_mode = TRUE
 	/// 0-1 float for percentage threshold to kick people out
 	var/bad_rating = 0.9

code/controllers/configuration/sections/mc_configuration.dm

@@ -5,19 +5,19 @@
 	/// Tick limit % during world Init
 	var/world_init_tick_limit = TICK_LIMIT_MC_INIT_DEFAULT
 	/// Base MC tick rate
-	var/mc_base_tickrate = 1
+	var/base_tickrate = 1
 	/// Highpop MC tickrate
-	var/mc_highpop_tickrate = 1.1
+	var/highpop_tickrate = 1.1
 	/// MC Highpop enable threshold
-	var/mc_highpop_enable_threshold = 65
+	var/highpop_enable_threshold = 65
 	/// MC Highpop disable threshold
-	var/mc_highpop_disable_threshold = 60
+	var/highpop_disable_threshold = 60
 
 /datum/configuration_section/mc_configuration/load_data(list/data)
 	// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
 	CONFIG_LOAD_NUM(ticklag, data["ticklag"])
 	CONFIG_LOAD_NUM(world_init_tick_limit, data["world_init_mc_tick_limit"])
-	CONFIG_LOAD_NUM(mc_base_tickrate, data["base_mc_tick_rate"])
-	CONFIG_LOAD_NUM(mc_highpop_tickrate, data["highpop_mc_tick_rate"])
-	CONFIG_LOAD_NUM(mc_highpop_enable_threshold, data["mc_highpop_threshold_enable"])
-	CONFIG_LOAD_NUM(mc_highpop_disable_threshold, data["mc_highpop_threshold_disable"])
+	CONFIG_LOAD_NUM(base_tickrate, data["base_mc_tick_rate"])
+	CONFIG_LOAD_NUM(highpop_tickrate, data["highpop_mc_tick_rate"])
+	CONFIG_LOAD_NUM(highpop_enable_threshold, data["mc_highpop_threshold_enable"])
+	CONFIG_LOAD_NUM(highpop_disable_threshold, data["mc_highpop_threshold_disable"])

code/controllers/configuration/sections/vote_configuration.dm

@@ -10,7 +10,7 @@
 	var/vote_time = 600 // 60 seconds
 	/// Time before the first shuttle vote (deciseconds)
 	var/autotransfer_initial_time = 72000 // 2 hours
-	/// Time between subsequent shuttle votes if the first one is not successful (dedicseconds)
+	/// Time between subsequent shuttle votes if the first one is not successful (deciseconds)
 	var/autotransfer_interval_time = 18000 // 30 mins
 	/// Prevent dead players from voting
 	var/prevent_dead_voting = FALSE

code/controllers/master.dm

@@ -626,10 +626,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	if(!processing)
 		return
 	var/client_count = length(GLOB.clients)
-	if(client_count < GLOB.configuration.mc.mc_highpop_disable_threshold)
-		processing = GLOB.configuration.mc.mc_base_tickrate
-	else if(client_count > GLOB.configuration.mc.mc_highpop_enable_threshold)
-		processing = GLOB.configuration.mc.mc_highpop_tickrate
+	if(client_count < GLOB.configuration.mc.highpop_disable_threshold)
+		processing = GLOB.configuration.mc.base_tickrate
+	else if(client_count > GLOB.configuration.mc.highpop_enable_threshold)
+		processing = GLOB.configuration.mc.highpop_tickrate
 
 /datum/controller/master/proc/formatcpu()
 	switch(world.cpu)

code/controllers/subsystem/shuttles.dm

@@ -1,7 +1,4 @@
 #define CALL_SHUTTLE_REASON_LENGTH 12
-/// Time elapsed from roundstart before shuttle calls are allowed
-#define SHUTTLE_REFUEL_DELAY 20 MINUTES
-
 SUBSYSTEM_DEF(shuttle)
 	name = "Shuttle"
 	wait = 10
@@ -45,7 +42,7 @@ SUBSYSTEM_DEF(shuttle)
 	var/list/hidden_shuttle_turfs = list() //all turfs hidden from navigation computers associated with a list containing the image hiding them and the type of the turf they are pretending to be
 	var/list/hidden_shuttle_turf_images = list() //only the images from the above list
 	/// Default refuel delay
-	var/refuel_delay = SHUTTLE_REFUEL_DELAY
+	var/refuel_delay = 20 MINUTES
 
 /datum/controller/subsystem/shuttle/Initialize(start_timeofday)
 	ordernum = rand(1,9000)