cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix shift duration timestamp in join game menu and check antags menu (#36447)

Browse Source 
* fix shift duration timestamp in join game menu and check antags menu

* return

* tab

---------

Co-authored-by: nervere <sage@lulz>
This commit is contained in:
nervere
2024-05-10 04:49:55 +00:00
committed by GitHub
parent 17bf3cc128
commit f4e17d4794
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__DEFINES/global.dm
View File

@@ -85,6 +85,8 @@ var/station_name = null
var/game_version = "veegee"
var/changelog_hash = ""
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
var/time_taken_to_init = 0
var/roundstart_timestamp = 0
var/going = 1.0
var/master_mode = "extended"//"extended"

5
code/__HELPERS/time.dm
View File

@@ -37,7 +37,7 @@
//Returns the world time in english
/proc/worldtime2text(timestamp = world.time, give_seconds = FALSE)
if(timestamp == world.time)
timestamp -= Master.time_taken_to_init
timestamp -= time_taken_to_init
return "[add_zero((round(((timestamp / 600) + 55) / 60) + 11) % 24, 2)]:[add_zero(round(((timestamp / 600) + 55) % 60), 2)]\
[give_seconds ? " : [add_zero(round(timestamp / 10) % 60, 2)]" : ""]"
@@ -63,6 +63,9 @@
. += "[m]m "
. += "[s]s"
/proc/getShiftDuration()
return altFormatTimeDuration(world.timeofday - roundstart_timestamp)
/proc/time_stamp()
return time2text(world.timeofday, "hh:mm:ss")

2
code/controllers/mc/master.dm
View File

@@ -35,8 +35,6 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING
var/init_time
var/tickdrift = 0
var/time_taken_to_init = 0
var/sleep_delta
var/make_runtime = 0

2
code/game/gamemodes/gameticker.dm
View File

@@ -720,6 +720,8 @@ var/datum/controller/gameticker/ticker
qdel(obj)
to_chat(world, "<span class='notice'><B>Enjoy the game!</B></span>")
roundstart_timestamp = world.timeofday
//Holiday Round-start stuff ~Carn
Holiday_Game_Start()

2
code/modules/admin/check_antagonists.dm
View File

@@ -6,7 +6,7 @@
var/dat = "<html><head><title>Round Status</title></head><body><h2>Round Status</h2>"
dat += {"Current Game Mode: <B>[ticker.mode.name]</B><BR>
Round Duration: <B>[round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B><BR>
Shift duration: <B>[getShiftDuration()]</B><BR>
<A HREF='?src=\ref[src];emergency_shuttle_panel=1'><B>Emergency Shuttle Panel</B></A><BR>"}
dat += "<a href='?src=\ref[src];delay_round_end=1'>[ticker.delay_end ? "End Round Normally" : "Delay Round End"]</a><br>"

6
code/modules/mob/new_player/new_player.dm
View File

@@ -498,10 +498,6 @@
qdel(speech)
/mob/new_player/proc/LateChoices()
var/mills = world.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
var/list/highprior = new()
var/list/heads = new()
@@ -525,7 +521,7 @@
.manifest tr.requested_department td {background-color: #00FF00}
.manifest th.reqhead td {background-color: #844}
.manifest tr.reqalt td {background-color: #FCC}
</style></head><body><center>Round Duration: [round(hours)]h [round(mins)]m<br>"}
</style></head><body><center>Shift duration: [getShiftDuration()]<br>"}
if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
if(emergency_shuttle.direction == 2) //Shuttle is going to centcomm, not recalled
dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"