From 1ad7a1f430fcca708f232bde2a33cfd09685fb67 Mon Sep 17 00:00:00 2001 From: Gaxeer <44334376+Gaxeer@users.noreply.github.com> Date: Fri, 4 Apr 2025 14:17:08 +0300 Subject: [PATCH] actual round time (#90398) ## About The Pull Request Use actual time since round start in `ROUND_TIME` macro ## Why It's Good For The Game no bugs good ## Changelog :cl: fix: `round_time` in stat panel and ESC menu will show actual time since the round start, not the world time /:cl: --- code/__DEFINES/time.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm index ad87ba9229c..ceb16215e40 100644 --- a/code/__DEFINES/time.dm +++ b/code/__DEFINES/time.dm @@ -2,7 +2,7 @@ #define MIDNIGHT_ROLLOVER 864000 ///displays the current time into the round, with a lot of extra code just there for ensuring it looks okay after an entire day passes -#define ROUND_TIME(...) ( "[world.time - SSticker.round_start_time > MIDNIGHT_ROLLOVER ? "[round((world.time - SSticker.round_start_time)/MIDNIGHT_ROLLOVER)]:[gameTimestamp()]" : gameTimestamp()]" ) +#define ROUND_TIME(...) ( "[STATION_TIME_PASSED() > MIDNIGHT_ROLLOVER ? "[round(STATION_TIME_PASSED()/MIDNIGHT_ROLLOVER)]:[gameTimestamp(wtime = STATION_TIME_PASSED())]" : gameTimestamp(wtime = STATION_TIME_PASSED())]" ) ///Returns the time that has passed since the game started #define STATION_TIME_PASSED(...) (world.time - SSticker.round_start_time)