cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22793 from Core0verload/world_time

Browse Source 
Fixes latejoin panel and world topic showing incorrect round duration
This commit is contained in:
oranges
2017-01-07 19:43:39 +13:00
committed by GitHub
parent 65a750391f 06d8ffb439
commit 37b1fa6eea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+1 -1
View File
@@ -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
code/world.dm
+1 -1
View File
@@ -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)