[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.
This commit is contained in:
CitadelStationBot
2018-03-02 18:36:39 -06:00
committed by Poojawa
parent 16fd0f274c
commit d4f08c37a7
+3 -3
View File
@@ -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))