diff --git a/code/controllers/subsystems/timer.dm b/code/controllers/subsystems/timer.dm index e2d9ec6913..8d02dd18cd 100644 --- a/code/controllers/subsystems/timer.dm +++ b/code/controllers/subsystems/timer.dm @@ -416,12 +416,15 @@ SUBSYSTEM_DEF(timer) prev = next = null /datum/timedevent/proc/bucketJoin() + to_chat(world, "JOINING BUCKET") var/list/L if (flags & TIMER_CLIENT_TIME) L = SStimer.clienttime_timers + to_chat(world, "DEBUG: inserting into clienttime timers") else if (timeToRun >= TIMER_MAX) L = SStimer.second_queue + to_chat(world, "DEBUG: Inserting into second queue") if(L) BINARY_INSERT(src, L, datum/timedevent, timeToRun) @@ -430,19 +433,24 @@ SUBSYSTEM_DEF(timer) //get the list of buckets var/list/bucket_list = SStimer.bucket_list + to_chat(world, "DEBUG: bucket list len [bucket_list.len]") + //calculate our place in the bucket list var/bucket_pos = BUCKET_POS(src) //get the bucket for our tick var/datum/timedevent/bucket_head = bucket_list[bucket_pos] SStimer.bucket_count++ + to_chat(world, "DEBUG: bucket pos [bucket_pos]") //empty bucket, we will just add ourselves if (!bucket_head) bucket_list[bucket_pos] = src + to_chat(world, "DEBUG: src is bucket head") return //other wise, lets do a simplified linked list add. if (!bucket_head.prev) bucket_head.prev = bucket_head + to_chat(world, "DEBUG: src is not bucket head") next = bucket_head prev = bucket_head.prev next.prev = src diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index b491a923f8..bcc7e78c9b 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -353,3 +353,6 @@ to_chat(user, "You drill through the girder!") new /obj/effect/decal/remains/human(get_turf(src)) dismantle() + +/proc/timertest(atom/A, time = 10) + QDEL_IN(A, time) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 107b164165..b84ecdbc84 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -674,14 +674,18 @@ stat("Location:", "([x], [y], [z]) [loc]") stat("CPU:","[world.cpu]") stat("Instances:","[world.contents.len]") + stat(null, "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)") if(statpanel("Processes")) if(processScheduler) processScheduler.statProcesses() if(statpanel("MC")) + stat("Location:", "([x], [y], [z]) [loc]") stat("CPU:","[world.cpu]") stat("Instances:","[world.contents.len]") + stat("World Time:", world.time) + stat("Real time of day:", REALTIMEOFDAY) stat(null) if(Master) Master.stat_entry() @@ -695,10 +699,10 @@ stat(null) for(var/datum/controller/subsystem/SS in Master.subsystems) SS.stat_entry() - + if(statpanel("Tickets")) GLOB.ahelp_tickets.stat_entry() - + if(listed_turf && client) if(!TurfAdjacent(listed_turf)) listed_turf = null