From 06d8ffb43997e5c9b3df2775c8ece075636424c3 Mon Sep 17 00:00:00 2001 From: c0 Date: Fri, 6 Jan 2017 07:15:07 +0300 Subject: [PATCH] Fixes latejoin panel and world topic showing incorrect round duration --- code/modules/mob/new_player/new_player.dm | 2 +- code/world.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index dcec1b95502..ea620362a58 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -374,7 +374,7 @@ /mob/new_player/proc/LateChoices() - var/mills = world.time // 1/10 of a second, not real milliseconds but whatever + var/mills = world.time - round_start_time // 1/10 of a second, not real milliseconds but whatever //var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something var/mins = (mills % 36000) / 600 var/hours = mills / 36000 diff --git a/code/world.dm b/code/world.dm index 1b613efbdb4..ddd96a1d030 100644 --- a/code/world.dm +++ b/code/world.dm @@ -133,7 +133,7 @@ var/last_irc_status = 0 // Key-authed callers may know the truth behind the "secret" s["security_level"] = get_security_level() - s["round_duration"] = round(world.time/10) + s["round_duration"] = round((world.time-round_start_time)/10) // Amount of world's ticks in seconds, useful for calculating round duration if(SSshuttle && SSshuttle.emergency)