From e45fb4ca440e5318dfecb2b1965957b11ce3d508 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Mon, 30 Nov 2020 12:22:23 +0000 Subject: [PATCH] Realtime Indicator [NON-MODULAR] (#1921) * REAL TIME BABY * REAL TIME BABY --- code/controllers/subsystem/statpanel.dm | 5 ++++- code/controllers/subsystem/ticker.dm | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index f6e245fc1e9..6705866333b 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -13,6 +13,7 @@ SUBSYSTEM_DEF(statpanels) if (!resumed) var/datum/map_config/cached = SSmapping.next_map_config var/round_time = world.time - SSticker.round_start_time + var/real_round_time = world.timeofday - SSticker.real_round_start_time var/list/global_data = list( "Map: [SSmapping.config?.map_name || "Loading..."]", cached ? "Next Map: [cached.map_name]" : null, @@ -20,8 +21,10 @@ SUBSYSTEM_DEF(statpanels) "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]", "Round Time: [round_time > MIDNIGHT_ROLLOVER ? "[round(round_time/MIDNIGHT_ROLLOVER)]:[worldtime2text()]" : worldtime2text()]", "Station Time: [station_time_timestamp()]", + " ", //SKYRAT EDIT ADDITION "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)]%)", - "Connected Players: [GLOB.clients.len]" + "Real Round Time: [time2text(real_round_time, "hh:mm:ss")]", //SKYRAT EDIT ADDITION + "Connected Players: [GLOB.clients.len]" //SKYRAT EDIT ADDITION ) if(SSshuttle.emergency) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index a3ea0934daf..3ae290dc6d3 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -65,6 +65,8 @@ SUBSYSTEM_DEF(ticker) /// Why an emergency shuttle was called var/emergency_reason + var/real_round_start_time = 0 //SKYRAT EDIT ADDITION + /datum/controller/subsystem/ticker/Initialize(timeofday) load_mode() @@ -87,6 +89,8 @@ SUBSYSTEM_DEF(ticker) var/list/music = list() var/use_rare_music = prob(1) + real_round_start_time = world.timeofday //SKYRAT EDIT ADDITION + for(var/S in provisional_title_music) var/lower = lowertext(S) var/list/L = splittext(lower,"+")