From d4f08c37a7785816190fc17b65e4bef2f3187e38 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 2 Mar 2018 18:36:39 -0600 Subject: [PATCH] [MIRROR] When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works. (#5752) * Merge pull request #35966 from kevinz000/patch-452 When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works. * When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works. --- code/__HELPERS/time.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index daf2b33889..321a55babd 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -11,11 +11,11 @@ wtime = world.time return time2text(wtime - GLOB.timezoneOffset, format) -/proc/station_time() - return ((((world.time - SSticker.round_start_time) * SSticker.station_time_rate_multiplier) + SSticker.gametime_offset) % 864000) - GLOB.timezoneOffset +/proc/station_time(display_only = FALSE) + return ((((world.time - SSticker.round_start_time) * SSticker.station_time_rate_multiplier) + SSticker.gametime_offset) % 864000) - (display_only? GLOB.timezoneOffset : 0) /proc/station_time_timestamp(format = "hh:mm:ss") - return time2text(station_time(), format) + return time2text(station_time(TRUE), format) /proc/station_time_debug(force_set) if(isnum(force_set))