Merge branch 'master' into mhelp-ticket-system

code/controllers/configuration.dm

@@ -2,6 +2,8 @@
 	var/server_name = null				// server name (for world name / status)
 	var/server_suffix = 0				// generate numeric suffix based on server port
 
+	var/minimum_client_build = 1421		// Build 1421 due to the middle mouse button exploit
+
 	var/nudge_script_path = "nudge.py"  // where the nudge.py script is located
 
 	var/log_ooc = 0						// log OOC channel
@@ -98,10 +100,6 @@
 
 	//game_options.txt configs
 
-	var/health_threshold_softcrit = 0
-	var/health_threshold_crit = 0
-	var/health_threshold_dead = -100
-
 	var/bones_can_break = 1
 
 	var/revival_pod_plants = 1
@@ -215,6 +213,9 @@
 
 	// Automatic localhost admin disable
 	var/disable_localhost_admin = 0
+	
+	//Start now warning
+	var/start_now_confirmation = 0
 
 /datum/configuration/New()
 	for(var/T in subtypesof(/datum/game_mode))
@@ -357,6 +358,12 @@
 
 				if("no_dead_vote")
 					config.vote_no_dead = 1
+					
+				if("vote_autotransfer_initial")
+					config.vote_autotransfer_initial = text2num(value)
+					
+				if("vote_autotransfer_interval")
+					config.vote_autotransfer_interval = text2num(value)
 
 				if("default_no_vote")
 					config.vote_no_default = 1
@@ -382,6 +389,9 @@
 				if("serversuffix")
 					config.server_suffix = 1
 
+				if("minimum_client_build")
+					config.minimum_client_build = text2num(value)
+
 				if("nudge_script_path")
 					config.nudge_script_path = value
 
@@ -635,6 +645,9 @@
 
 				if("disable_karma")
 					config.disable_karma = 1
+					
+				if("start_now_confirmation")
+					config.start_now_confirmation = 1
 
 				if("tick_limit_mc_init")
 					config.tick_limit_mc_init = text2num(value)
@@ -658,10 +671,6 @@
 			value = text2num(value)
 
 			switch(name)
-				if("health_threshold_crit")
-					config.health_threshold_crit = value
-				if("health_threshold_dead")
-					config.health_threshold_dead = value
 				if("revival_pod_plants")
 					config.revival_pod_plants = value
 				if("revival_cloning")

code/controllers/subsystem/timer.dm

@@ -71,7 +71,6 @@ SUBSYSTEM_DEF(timer)
 		for(var/I in second_queue)
 			log_world(get_timer_debug_string(I))
 
-	var/cut_start_index = 1
 	var/next_clienttime_timer_index = 0
 	var/len = length(clienttime_timers)
 
@@ -94,14 +93,14 @@ SUBSYSTEM_DEF(timer)
 
 		if(ctime_timer.flags & TIMER_LOOP)
 			ctime_timer.spent = 0
-			clienttime_timers.Insert(ctime_timer, 1)
-			cut_start_index++
+			ctime_timer.timeToRun = REALTIMEOFDAY + ctime_timer.wait
+			BINARY_INSERT(ctime_timer, clienttime_timers, datum/timedevent, timeToRun)
 		else
 			qdel(ctime_timer)
 
 
 	if(next_clienttime_timer_index)
-		clienttime_timers.Cut(cut_start_index,next_clienttime_timer_index+1)
+		clienttime_timers.Cut(1, next_clienttime_timer_index+1)
 
 	if(MC_TICK_CHECK)
 		return
@@ -269,7 +268,7 @@ SUBSYSTEM_DEF(timer)
 	var/new_bucket_count
 	var/i = 1
 	for(i in 1 to length(alltimers))
-		var/datum/timedevent/timer = alltimers[1]
+		var/datum/timedevent/timer = alltimers[i]
 		if(!timer)
 			continue
 
@@ -411,10 +410,8 @@ SUBSYSTEM_DEF(timer)
 		prev.next = next
 		next.prev = prev
 	else
-		if(prev)
-			prev.next = null
-		if(next)
-			next.prev = null
+		prev?.next = null
+		next?.prev = null
 	prev = next = null
 
 /datum/timedevent/proc/bucketJoin()
@@ -521,4 +518,4 @@ SUBSYSTEM_DEF(timer)
 #undef BUCKET_LEN
 #undef BUCKET_POS
 #undef TIMER_MAX
-#undef TIMER_ID_MAX
+#undef TIMER_ID_MAX