From 97ded4b27b2b1402fe5ddea7bfda0259aeae6232 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 14 Jan 2020 18:09:12 -0700 Subject: [PATCH] ok --- code/controllers/subsystem/time_track.dm | 2 +- code/modules/keybindings/setup.dm | 3 --- code/modules/mob/mob.dm | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index ac09c3ce65..81146f34d6 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(time_track) var/time_dilation_text /datum/controller/subsystem/time_track/fire() - stat_time_text = "TIME: Server [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")] Round [WORLDTIME2TEXT("hh:mm:ss")] Station [STATION_TIME_TIMESTAMP("hh:mm:ss")]\n[time_dilation_text]" + stat_time_text = "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]\n\nRound Time: [WORLDTIME2TEXT("hh:mm:ss")]\n\nStation Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]\n[time_dilation_text]" if(++last_measurement == measurement_delay) last_measurement = 0 diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index 90524f2c66..9a13bfb11c 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -34,10 +34,7 @@ /client/proc/set_macros() set waitfor = FALSE - //Reset and populate the rolling buffer keys_held.Cut() - for(var/i in 1 to HELD_KEY_BUFFER_LENGTH) - keys_held += null erase_all_macros() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 7f4274d43e..53810a8a48 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -579,7 +579,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) L += "Round ID: [GLOB.round_id || "NULL"]" L += SStime_track.stat_time_text L += SSshuttle.emergency_shuttle_stat_text - stat(null, "[L.Join("\n")]") + stat(null, "[L.Join("\n\n")]") if(client.holder) if(statpanel("MC"))