Tg 1 28 sync testing/confirmation (#5178)

* maps, tgui, tools * defines and helpers * onclick and controllers * datums fucking caught that hulk reversal too. * game and shuttle modular * module/admin * oh god they fucking moved antag shit again * haaaaate. Haaaaaaaaaate. * enables moff wings * more modules things * tgstation.dme before I forget something important * some mob stuff * s'more mob/living stuff * some carbon stuff * ayy lmaos and kitchen meat * Human stuff * species things moff wings have a 'none' version too * the rest of the module stuff. * some strings * misc * mob icons * some other icons. * It compiles FUCK BORERS FUCK BORERS
2025-12-11 10:22:13 +00:00 · 2018-01-29 04:42:29 -06:00
parent 89fa4b0f28
commit 03086dfa91
666 changed files with 27177 additions and 35945 deletions
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -49,6 +49,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/map_loading = FALSE	//Are we loading in a new map?

 	var/current_runlevel	//for scheduling different subsystems for different stages of the round
+	var/sleep_offline_after_initializations = TRUE

 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
@@ -65,7 +66,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	// Highlander-style: there can only be one! Kill off the old and replace it with the new.

 	if(!random_seed)
-		random_seed = rand(1, 1e9)
+		random_seed = (TEST_RUN_PARAMETER in world.params) ? 29051994 : rand(1, 1e9)
 		rand_seed(random_seed)
 	
 	var/list/_subsystems = list()
@@ -197,11 +198,12 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	// Sort subsystems by display setting for easy access.
 	sortTim(subsystems, /proc/cmp_subsystem_display)
 	// Set world options.
-	world.sleep_offline = TRUE
+	if(sleep_offline_after_initializations)
+		world.sleep_offline = TRUE
 	world.fps = CONFIG_GET(number/fps)
 	var/initialized_tod = REALTIMEOFDAY
 	sleep(1)
-	if(CONFIG_GET(flag/resume_after_initializations))
+	if(sleep_offline_after_initializations && CONFIG_GET(flag/resume_after_initializations))
 		world.sleep_offline = FALSE
 	initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10
 	// Loop.
--- a/code/controllers/subsystem/augury.dm
+++ b/code/controllers/subsystem/augury.dm
@@ -76,7 +76,7 @@ SUBSYSTEM_DEF(augury)
 	active = FALSE
 	UpdateButtonIcon()

-/datum/action/innate/augury/UpdateButtonIcon(status_only = FALSE)
+/datum/action/innate/augury/UpdateButtonIcon(status_only = FALSE, force)
 	..()
 	if(active)
 		button.icon_state = "template_active"
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -332,7 +332,6 @@ SUBSYSTEM_DEF(garbage)
 /datum/verb/find_refs()
 	set category = "Debug"
 	set name = "Find References"
-	set background = 1
 	set src in world

 	find_references(FALSE)
@@ -385,7 +384,6 @@ SUBSYSTEM_DEF(garbage)
 /datum/verb/qdel_then_find_references()
 	set category = "Debug"
 	set name = "qdel() then Find References"
-	set background = 1
 	set src in world

 	qdel(src)
--- a/code/controllers/subsystem/idlenpcpool.dm
+++ b/code/controllers/subsystem/idlenpcpool.dm
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(idlenpcpool)
 	name = "Idling NPC Pool"
-	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND
+	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
 	priority = FIRE_PRIORITY_IDLE_NPC
 	wait = 60
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
@@ -13,9 +13,12 @@ SUBSYSTEM_DEF(idlenpcpool)
 	var/list/zlist = GLOB.simple_animals[AI_Z_OFF]
 	..("IdleNPCS:[idlelist.len]|Z:[zlist.len]")

-/datum/controller/subsystem/idlenpcpool/Initialize(start_timeofday)
-	idle_mobs_by_zlevel = new /list(world.maxz,0)
-	return ..()
+/datum/controller/subsystem/idlenpcpool/proc/MaxZChanged()
+	if (!islist(idle_mobs_by_zlevel))
+		idle_mobs_by_zlevel = new /list(world.maxz,0)
+	while (SSidlenpcpool.idle_mobs_by_zlevel.len < world.maxz)
+		SSidlenpcpool.idle_mobs_by_zlevel.len++
+		SSidlenpcpool.idle_mobs_by_zlevel[idle_mobs_by_zlevel.len] = list()

 /datum/controller/subsystem/idlenpcpool/fire(resumed = FALSE)

--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -61,7 +61,7 @@ SUBSYSTEM_DEF(input)
 		"North", "East", "South", "West",
 		"Northeast", "Southeast", "Northwest", "Southwest",
 		"Insert", "Delete", "Ctrl", "Alt",
-		"F1", "F2", "F5", "F6", "F7", "F8", "F12",
+		"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12",
 		)

 	for(var/i in 1 to oldmode_keys.len)
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(mobs)
 	name = "Mobs"
 	priority = FIRE_PRIORITY_MOBS
-	flags = SS_KEEP_TIMING
+	flags = SS_KEEP_TIMING | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

 	var/list/currentrun = list()
@@ -10,9 +10,12 @@ SUBSYSTEM_DEF(mobs)
 /datum/controller/subsystem/mobs/stat_entry()
 	..("P:[GLOB.mob_living_list.len]")

-/datum/controller/subsystem/mobs/Initialize(start_timeofday)
-	clients_by_zlevel = new /list(world.maxz,0)
-	return ..()
+/datum/controller/subsystem/mobs/proc/MaxZChanged()
+	if (!islist(clients_by_zlevel))
+		clients_by_zlevel = new /list(world.maxz,0)
+	while (clients_by_zlevel.len < world.maxz)
+		clients_by_zlevel.len++
+		clients_by_zlevel[clients_by_zlevel.len] = list()

 /datum/controller/subsystem/mobs/fire(resumed = 0)
 	var/seconds = wait * 0.1
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -8,6 +8,8 @@ SUBSYSTEM_DEF(shuttle)
 	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME

+	var/obj/machinery/shuttle_manipulator/manipulator
+
 	var/list/mobile = list()
 	var/list/stationary = list()
 	var/list/transit = list()
@@ -53,19 +55,10 @@ SUBSYSTEM_DEF(shuttle)
 	var/list/shuttle_purchase_requirements_met = list() //For keeping track of ingame events that would unlock new shuttles, such as defeating a boss or discovering a secret item

 	var/lockdown = FALSE	//disallow transit after nuke goes off
-
+	
 	var/auto_call = 99000 //CIT CHANGE - time before in deciseconds in which the shuttle is auto called. Default is 2½ hours plus 15 for the shuttle. So total is 3.

 /datum/controller/subsystem/shuttle/Initialize(timeofday)
-	if(!arrivals)
-		WARNING("No /obj/docking_port/mobile/arrivals placed on the map!")
-	if(!emergency)
-		WARNING("No /obj/docking_port/mobile/emergency placed on the map!")
-	if(!backup_shuttle)
-		WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!")
-	if(!supply)
-		WARNING("No /obj/docking_port/mobile/supply placed on the map!")
-
 	ordernum = rand(1, 9000)

 	for(var/pack in subtypesof(/datum/supply_pack))
@@ -76,12 +69,32 @@ SUBSYSTEM_DEF(shuttle)

 	if(!transit_turfs.len)
 		setup_transit_zone()
-	initial_move()
+
+	initial_load()
+
 #ifdef HIGHLIGHT_DYNAMIC_TRANSIT
 	color_space()
 #endif
+
+	if(!arrivals)
+		WARNING("No /obj/docking_port/mobile/arrivals placed on the map!")
+	if(!emergency)
+		WARNING("No /obj/docking_port/mobile/emergency placed on the map!")
+	if(!backup_shuttle)
+		WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!")
+	if(!supply)
+		WARNING("No /obj/docking_port/mobile/supply placed on the map!")
 	..()

+/datum/controller/subsystem/shuttle/proc/initial_load()
+	if(!istype(manipulator))
+		CRASH("No shuttle manipulator found.")
+
+	for(var/s in stationary)
+		var/obj/docking_port/stationary/S = s
+		S.load_roundstart()
+		CHECK_TICK
+
 /datum/controller/subsystem/shuttle/proc/setup_transit_zone()
 	// transit zone
 	var/z = SSmapping.transit.z_value
@@ -436,14 +449,6 @@ SUBSYSTEM_DEF(shuttle)
 		if(!(M in transit_requesters))
 			transit_requesters += M

-
-/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 3 hours has passed.
-	if(world.time > auto_call && EMERGENCY_IDLE_OR_RECALLED) //3 hours
-		SSshuttle.emergency.request(null, 1.5)
-		priority_announce("The shift has come to an end and the shuttle called.")
-		log_game("Round time limit reached. Shuttle has been auto-called.")
-		message_admins("Round time limit reached. Shuttle called.")
-
 /datum/controller/subsystem/shuttle/proc/generate_transit_dock(obj/docking_port/mobile/M)
 	// First, determine the size of the needed zone
 	// Because of shuttle rotation, the "width" of the shuttle is not
@@ -558,15 +563,7 @@ SUBSYSTEM_DEF(shuttle)
 		T.flags_1 &= ~(UNUSED_TRANSIT_TURF_1)

 	M.assigned_transit = new_transit_dock
-	return TRUE
-
-/datum/controller/subsystem/shuttle/proc/initial_move()
-	for(var/obj/docking_port/mobile/M in mobile)
-		if(!M.roundstart_move)
-			continue
-		M.dockRoundstart()
-		M.roundstart_move = FALSE
-		CHECK_TICK
+	return new_transit_dock

 /datum/controller/subsystem/shuttle/Recover()
 	if (istype(SSshuttle.mobile))
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -1,5 +1,6 @@
 #define BUCKET_LEN (world.fps*1*60) //how many ticks should we keep in the bucket. (1 minutes worth)
-#define BUCKET_POS(timer) (round((timer.timeToRun - SStimer.head_offset) / world.tick_lag) + 1)
+#define BUCKET_POS(timer) ((round((timer.timeToRun - SStimer.head_offset) / world.tick_lag) % BUCKET_LEN) + 1)
+#define TIMER_MAX (world.time + TICKS2DS(min(BUCKET_LEN-(SStimer.practical_offset-DS2TICKS(world.time - SStimer.head_offset))-1, BUCKET_LEN-1)))
 #define TIMER_ID_MAX (2**24) //max float with integer precision

 SUBSYSTEM_DEF(timer)
@@ -9,11 +10,11 @@ SUBSYSTEM_DEF(timer)

 	flags = SS_TICKER|SS_NO_INIT

-	var/list/datum/timedevent/processing = list()
+	var/list/datum/timedevent/second_queue = list() //awe, yes, you've had first queue, but what about second queue?
 	var/list/hashes = list()

 	var/head_offset = 0 //world.time of the first entry in the the bucket.
-	var/practical_offset = 0 //index of the first non-empty item in the bucket.
+	var/practical_offset = 1 //index of the first non-empty item in the bucket.
 	var/bucket_resolution = 0 //world.tick_lag the bucket was designed for
 	var/bucket_count = 0 //how many timers are in the buckets

@@ -27,13 +28,19 @@ SUBSYSTEM_DEF(timer)
 	var/static/last_invoke_warning = 0
 	var/static/bucket_auto_reset = TRUE

+/datum/controller/subsystem/timer/PreInit()
+	bucket_list.len = BUCKET_LEN
+	head_offset = world.time
+	bucket_resolution = world.tick_lag
+
 /datum/controller/subsystem/timer/stat_entry(msg)
-	..("B:[bucket_count] P:[length(processing)] H:[length(hashes)] C:[length(clienttime_timers)]")
+	..("B:[bucket_count] P:[length(second_queue)] H:[length(hashes)] C:[length(clienttime_timers)] S:[length(timer_id_dict)]")

 /datum/controller/subsystem/timer/fire(resumed = FALSE)
 	var/lit = last_invoke_tick
 	var/last_check = world.time - TIMER_NO_INVOKE_WARNING
 	var/list/bucket_list = src.bucket_list
+
 	if(!bucket_count)
 		last_invoke_tick = world.time

@@ -60,50 +67,62 @@ SUBSYSTEM_DEF(timer)
 				bucket_node = bucket_node.next
 				anti_loop_check--
 			while(bucket_node && bucket_node != bucket_head && anti_loop_check)
-		log_world("Active timers in the processing queue:")
-		for(var/I in processing)
+		log_world("Active timers in the second_queue queue:")
+		for(var/I in second_queue)
 			log_world(get_timer_debug_string(I))

-	while(length(clienttime_timers))
-		var/datum/timedevent/ctime_timer = clienttime_timers[clienttime_timers.len]
-		if (ctime_timer.timeToRun <= REALTIMEOFDAY)
-			--clienttime_timers.len
-			var/datum/callback/callBack = ctime_timer.callBack
-			ctime_timer.spent = REALTIMEOFDAY
-			callBack.InvokeAsync()
-			qdel(ctime_timer)
-		else
-			break	//None of the rest are ready to run
+	var/next_clienttime_timer_index = 0
+	var/len = length(clienttime_timers)
+
+	for (next_clienttime_timer_index in 1 to len)
 		if (MC_TICK_CHECK)
-			return
+			next_clienttime_timer_index--
+			break
+		var/datum/timedevent/ctime_timer = clienttime_timers[next_clienttime_timer_index]
+		if (ctime_timer.timeToRun > REALTIMEOFDAY)
+			next_clienttime_timer_index--
+			break
+
+		var/datum/callback/callBack = ctime_timer.callBack
+		if (!callBack)
+			clienttime_timers.Cut(next_clienttime_timer_index,next_clienttime_timer_index+1)
+			CRASH("Invalid timer: [get_timer_debug_string(ctime_timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset], REALTIMEOFDAY: [REALTIMEOFDAY]")
+
+		ctime_timer.spent = REALTIMEOFDAY
+		callBack.InvokeAsync()
+		qdel(ctime_timer)
+
+
+	if (next_clienttime_timer_index)
+		clienttime_timers.Cut(1,next_clienttime_timer_index+1)
+
+	if (MC_TICK_CHECK)
+		return

 	var/static/list/spent = list()
 	var/static/datum/timedevent/timer
-	var/static/datum/timedevent/head
+	if (practical_offset > BUCKET_LEN)
+		head_offset += TICKS2DS(BUCKET_LEN)
+		practical_offset = 1
+		resumed = FALSE

-	if (practical_offset > BUCKET_LEN || (!resumed  && length(bucket_list) != BUCKET_LEN || world.tick_lag != bucket_resolution))
-		shift_buckets()
+	if ((length(bucket_list) != BUCKET_LEN) || (world.tick_lag != bucket_resolution))
+		reset_buckets()
 		bucket_list = src.bucket_list
 		resumed = FALSE


 	if (!resumed)
 		timer = null
-		head = null

-	while (practical_offset <= BUCKET_LEN && head_offset + (practical_offset*world.tick_lag) <= world.time && !MC_TICK_CHECK)
+	while (practical_offset <= BUCKET_LEN && head_offset + (practical_offset*world.tick_lag) <= world.time)
+		var/datum/timedevent/head = bucket_list[practical_offset]
 		if (!timer || !head || timer == head)
 			head = bucket_list[practical_offset]
-			if (!head)
-				practical_offset++
-				if (MC_TICK_CHECK)
-					break
-				continue
 			timer = head
-		do
+		while (timer)
 			var/datum/callback/callBack = timer.callBack
 			if (!callBack)
-				qdel(timer)
 				bucket_resolution = null //force bucket recreation
 				CRASH("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")

@@ -113,15 +132,68 @@ SUBSYSTEM_DEF(timer)
 				callBack.InvokeAsync()
 				last_invoke_tick = world.time

-			timer = timer.next
-
 			if (MC_TICK_CHECK)
 				return
-		while (timer && timer != head)
-		timer = null
+
+			timer = timer.next
+			if (timer == head)
+				break
+
+
 		bucket_list[practical_offset++] = null
-		if (MC_TICK_CHECK)
-			return
+
+		//we freed up a bucket, lets see if anything in second_queue needs to be shifted to that bucket.
+		var/i = 0
+		var/L = length(second_queue)
+		for (i in 1 to L)
+			timer = second_queue[i]
+			if (timer.timeToRun >= TIMER_MAX)
+				i--
+				break
+
+			if (timer.timeToRun < head_offset)
+				bucket_resolution = null //force bucket recreation
+				CRASH("[i] Invalid timer state: Timer in long run queue with a time to run less then head_offset. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
+
+				if (timer.callBack && !timer.spent)
+					timer.callBack.InvokeAsync()
+					spent += timer
+					bucket_count++
+				else if(!QDELETED(timer))
+					qdel(timer)
+				continue
+
+			if (timer.timeToRun < head_offset + TICKS2DS(practical_offset))
+				bucket_resolution = null //force bucket recreation
+				CRASH("[i] Invalid timer state: Timer in long run queue that would require a backtrack to transfer to short run queue. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
+				if (timer.callBack && !timer.spent)
+					timer.callBack.InvokeAsync()
+					spent += timer
+					bucket_count++
+				else if(!QDELETED(timer))
+					qdel(timer)
+				continue
+
+			bucket_count++
+			var/bucket_pos = max(1, BUCKET_POS(timer))
+
+			var/datum/timedevent/bucket_head = bucket_list[bucket_pos]
+			if (!bucket_head)
+				bucket_list[bucket_pos] = timer
+				timer.next = null
+				timer.prev = null
+				continue
+
+			if (!bucket_head.prev)
+				bucket_head.prev = bucket_head
+			timer.next = bucket_head
+			timer.prev = bucket_head.prev
+			timer.next.prev = timer
+			timer.prev.next = timer
+		if (i)
+			second_queue.Cut(1, i+1)
+
+		timer = null

 	bucket_count -= length(spent)

@@ -141,7 +213,7 @@ SUBSYSTEM_DEF(timer)
 	if(!TE.callBack)
 		. += ", NO CALLBACK"

-/datum/controller/subsystem/timer/proc/shift_buckets()
+/datum/controller/subsystem/timer/proc/reset_buckets()
 	var/list/bucket_list = src.bucket_list
 	var/list/alltimers = list()
 	//collect the timers currently in the bucket
@@ -162,7 +234,7 @@ SUBSYSTEM_DEF(timer)
 	head_offset = world.time
 	bucket_resolution = world.tick_lag

-	alltimers += processing
+	alltimers += second_queue
 	if (!length(alltimers))
 		return

@@ -173,22 +245,26 @@ SUBSYSTEM_DEF(timer)
 	if (head.timeToRun < head_offset)
 		head_offset = head.timeToRun

-	var/list/timers_to_remove = list()
-
-	for (var/thing in alltimers)
-		var/datum/timedevent/timer = thing
+	var/new_bucket_count
+	var/i = 1
+	for (i in 1 to length(alltimers))
+		var/datum/timedevent/timer = alltimers[1]
 		if (!timer)
-			timers_to_remove += timer
 			continue

 		var/bucket_pos = BUCKET_POS(timer)
-		if (bucket_pos > BUCKET_LEN)
+		if (timer.timeToRun >= TIMER_MAX)
+			i--
 			break

-		timers_to_remove += timer //remove it from the big list once we are done
+
 		if (!timer.callBack || timer.spent)
+			WARNING("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
+			if (timer.callBack)
+				qdel(timer)
 			continue
-		bucket_count++
+
+		new_bucket_count++
 		var/datum/timedevent/bucket_head = bucket_list[bucket_pos]
 		if (!bucket_head)
 			bucket_list[bucket_pos] = timer
@@ -202,12 +278,14 @@ SUBSYSTEM_DEF(timer)
 		timer.prev = bucket_head.prev
 		timer.next.prev = timer
 		timer.prev.next = timer
-
-	processing = (alltimers - timers_to_remove)
+	if (i)
+		alltimers.Cut(1, i+1)
+	second_queue = alltimers
+	bucket_count = new_bucket_count


 /datum/controller/subsystem/timer/Recover()
-	processing |= SStimer.processing
+	second_queue |= SStimer.second_queue
 	hashes |= SStimer.hashes
 	timer_id_dict |= SStimer.timer_id_dict
 	bucket_list |= SStimer.bucket_list
@@ -224,9 +302,8 @@ SUBSYSTEM_DEF(timer)
 	var/datum/timedevent/next
 	var/datum/timedevent/prev

-	var/static/nextid = 1
-
 /datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash)
+	var/static/nextid = 1
 	id = TIMER_ID_NULL
 	src.callBack = callBack
 	src.timeToRun = timeToRun
@@ -235,56 +312,69 @@ SUBSYSTEM_DEF(timer)

 	if (flags & TIMER_UNIQUE)
 		SStimer.hashes[hash] = src
+
 	if (flags & TIMER_STOPPABLE)
-		do
-			if (nextid >= TIMER_ID_MAX)
-				nextid = 1
-			id = nextid++
-		while(SStimer.timer_id_dict["timerid" + num2text(id, 8)])
-		SStimer.timer_id_dict["timerid" + num2text(id, 8)] = src
+		id = num2text(nextid, 100)
+		if (nextid >= SHORT_REAL_LIMIT)
+			nextid += min(1, 2**round(nextid/SHORT_REAL_LIMIT))
+		else
+			nextid++
+		SStimer.timer_id_dict[id] = src

-	name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: [REF(callBack)], callBack.object: [callBack.object][REF(callBack.object)]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])"
+	name = "Timer: [id] (\ref[src]), TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])"

-	if (spent)
-		CRASH("HOLY JESUS. WHAT IS THAT? WHAT THE FUCK IS THAT?")
+	if ((timeToRun < world.time || timeToRun < SStimer.head_offset) && !(flags & TIMER_CLIENT_TIME))
+		CRASH("Invalid timer state: Timer created that would require a backtrack to run (addtimer would never let this happen): [SStimer.get_timer_debug_string(src)]")

 	if (callBack.object != GLOBAL_PROC)
 		LAZYADD(callBack.object.active_timers, src)

+
+	var/list/L
+
 	if (flags & TIMER_CLIENT_TIME)
-		//sorted insert
-		var/list/ctts = SStimer.clienttime_timers
-		var/cttl = length(ctts)
+		L = SStimer.clienttime_timers
+	else if (timeToRun >= TIMER_MAX)
+		L = SStimer.second_queue
+
+
+	if (L)
+		//binary search sorted insert
+		var/cttl = length(L)
 		if(cttl)
-			var/datum/timedevent/Last = ctts[cttl]
-			if(Last.timeToRun >= timeToRun)
-				ctts += src
-			else
-				for(var/i in cttl to 1 step -1)
-					var/datum/timedevent/E = ctts[i]
-					if(E.timeToRun <= timeToRun)
-						ctts.Insert(i, src)
-						break
+			var/left = 1
+			var/right = cttl
+			var/mid = (left+right) >> 1 //rounded divide by two for hedgehogs
+
+			var/datum/timedevent/item
+			while (left < right)
+				item = L[mid]
+				if (item.timeToRun <= timeToRun)
+					left = mid+1
+				else
+					right = mid
+				mid = (left+right) >> 1
+
+			item = L[mid]
+			mid = item.timeToRun > timeToRun ? mid : mid+1
+			L.Insert(mid, src)
+
 		else
-			ctts += src
+			L += src
 		return

 	//get the list of buckets
 	var/list/bucket_list = SStimer.bucket_list
+
 	//calculate our place in the bucket list
 	var/bucket_pos = BUCKET_POS(src)
-	//we are too far aways from needing to run to be in the bucket list, shift_buckets() will handle us.
-	if (bucket_pos > length(bucket_list))
-		SStimer.processing += src
-		return
+
 	//get the bucket for our tick
 	var/datum/timedevent/bucket_head = bucket_list[bucket_pos]
 	SStimer.bucket_count++
 	//empty bucket, we will just add ourselves
 	if (!bucket_head)
 		bucket_list[bucket_pos] = src
-		if (bucket_pos < SStimer.practical_offset)
-			SStimer.practical_offset = bucket_pos
 		return
 	//other wise, lets do a simplified linked list add.
 	if (!bucket_head.prev)
@@ -296,10 +386,9 @@ SUBSYSTEM_DEF(timer)

 /datum/timedevent/Destroy()
 	..()
-	if (flags & TIMER_UNIQUE)
+	if (flags & TIMER_UNIQUE && hash)
 		SStimer.hashes -= hash

-
 	if (callBack && callBack.object && callBack.object != GLOBAL_PROC && callBack.object.active_timers)
 		callBack.object.active_timers -= src
 		UNSETEMPTY(callBack.object.active_timers)
@@ -307,13 +396,33 @@ SUBSYSTEM_DEF(timer)
 	callBack = null

 	if (flags & TIMER_STOPPABLE)
-		SStimer.timer_id_dict -= "timerid" + num2text(id, 8)
+		SStimer.timer_id_dict -= id

 	if (flags & TIMER_CLIENT_TIME)
-		SStimer.clienttime_timers -= src
+		if (!spent)
+			spent = world.time
+			SStimer.clienttime_timers -= src
 		return QDEL_HINT_IWILLGC

 	if (!spent)
+		spent = world.time
+		var/bucketpos = BUCKET_POS(src)
+		var/datum/timedevent/buckethead
+		var/list/bucket_list = SStimer.bucket_list
+		if (bucketpos > 0)
+			buckethead = bucket_list[bucketpos]
+
+		if (buckethead == src)
+			bucket_list[bucketpos] = next
+			SStimer.bucket_count--
+		else if (timeToRun < TIMER_MAX || next || prev)
+			SStimer.bucket_count--
+		else
+			var/l = length(SStimer.second_queue)
+			SStimer.second_queue -= src
+			if (l == length(SStimer.second_queue))
+				SStimer.bucket_count--
+
 		if (prev == next && next)
 			next.prev = null
 			prev.next = null
@@ -322,19 +431,6 @@ SUBSYSTEM_DEF(timer)
 				prev.next = next
 			if (next)
 				next.prev = prev
-
-		var/bucketpos = BUCKET_POS(src)
-		var/datum/timedevent/buckethead
-		var/list/bucket_list = SStimer.bucket_list
-
-		if (bucketpos > 0 && bucketpos <= length(bucket_list))
-			buckethead = bucket_list[bucketpos]
-			SStimer.bucket_count--
-		else
-			SStimer.processing -= src
-
-		if (buckethead == src)
-			bucket_list[bucketpos] = next
 	else
 		if (prev && prev.next == src)
 			prev.next = next
@@ -351,7 +447,7 @@ SUBSYSTEM_DEF(timer)
 	else
 		. = "[callBack.object.type]"

-/proc/addtimer(datum/callback/callback, wait, flags)
+/proc/addtimer(datum/callback/callback, wait = 0, flags = 0)
 	if (!callback)
 		CRASH("addtimer called without a callback")

@@ -381,11 +477,10 @@ SUBSYSTEM_DEF(timer)
 		var/datum/timedevent/hash_timer = SStimer.hashes[hash]
 		if(hash_timer)
 			if (hash_timer.spent) //it's pending deletion, pretend it doesn't exist.
-				hash_timer.hash = null
-				SStimer.hashes -= hash
+				hash_timer.hash = null //but keep it from accidentally deleting us
 			else
-
 				if (flags & TIMER_OVERRIDE)
+					hash_timer.hash = null //no need having it delete it's hash if we are going to replace it
 					qdel(hash_timer)
 				else
 					if (hash_timer.flags & TIMER_STOPPABLE)
@@ -410,7 +505,7 @@ SUBSYSTEM_DEF(timer)
 			qdel(id)
 			return TRUE
 	//id is string
-	var/datum/timedevent/timer = SStimer.timer_id_dict["timerid[id]"]
+	var/datum/timedevent/timer = SStimer.timer_id_dict[id]
 	if (timer && !timer.spent)
 		qdel(timer)
 		return TRUE
@@ -419,3 +514,5 @@ SUBSYSTEM_DEF(timer)

 #undef BUCKET_LEN
 #undef BUCKET_POS
+#undef TIMER_MAX
+#undef TIMER_ID_MAX
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -26,19 +26,12 @@ SUBSYSTEM_DEF(title)
 		if((L.len == 1 && L[1] != "blank.png")|| (L.len > 1 && ((use_rare_screens && lowertext(L[1]) == "rare") || (lowertext(L[1]) == lowertext(SSmapping.config.map_name)))))
 			title_screens += S

-	for(var/S in title_screens)
-		var/list/L = splittext(S,".")
-		if(L.len != 2)
-			continue
-		title_screens -= S
-		break
-		
 	if(length(title_screens))
 		file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]"
 	
 	if(!file_path)
 		file_path = "icons/default_title.dmi"
-	
+
 	ASSERT(fexists(file_path))

 	icon = new(fcopy_rsc(file_path))
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -11,7 +11,7 @@ SUBSYSTEM_DEF(traumas)
 #define PHOBIA_FILE "phobia.json"

 /datum/controller/subsystem/traumas/Initialize()
-	phobia_types = list("spiders", "space", "security", "clowns", "greytide", "lizards", "skeletons")
+	phobia_types = list("spiders", "space", "security", "clowns", "greytide", "lizards", "skeletons", "snakes")

 	phobia_words = list("spiders"   = strings(PHOBIA_FILE, "spiders"),
 						"space"     = strings(PHOBIA_FILE, "space"),
@@ -20,11 +20,13 @@ SUBSYSTEM_DEF(traumas)
 						"greytide"  = strings(PHOBIA_FILE, "greytide"),
 						"lizards"   = strings(PHOBIA_FILE, "lizards"),
 						"skeletons" = strings(PHOBIA_FILE, "skeletons"),
+						"snakes"	= strings(PHOBIA_FILE, "snakes")
 					   )

 	phobia_mobs = list("spiders"  = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)),
 					   "security" = typecacheof(list(/mob/living/simple_animal/bot/secbot)),
-					   "lizards"  = typecacheof(list(/mob/living/simple_animal/hostile/lizard))
+					   "lizards"  = typecacheof(list(/mob/living/simple_animal/hostile/lizard)),
+					   "snakes"   = typecacheof(list(/mob/living/simple_animal/hostile/retaliate/poison/snake))
 					   )

 	phobia_objs = list("spiders"   = typecacheof(list(/obj/structure/spider)),