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

[MIRROR] PDAs now include round time (#6672)

Browse Source 
* PDAs now include round time (#59957)

Part of my document on duplicating verb panel functionality so at some point in the far, far future we may be rid of it. you can read more here.

hackmd.io/tJ5H3opRQiG1GCN1sP142w

The other thing the status panel needs to do is send time dilation to the tgui chat. Having messed around with tgui chat, I am very confident i'm going to need stylemistake or mothblocks help me out with that one, it's so beyond my level it isn't even funny.

I know this is a VERY long description for a very small change but expect more of this in the future

* PDAs now include round time

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-07-03 22:23:07 +01:00
committed by GitHub
co-authored by tralezab
parent cafc3b4380
commit cda689393e
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/time.dm
+6 -1
View File
@@ -1,4 +1,9 @@
#define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day
///number of deciseconds in a day
#define MIDNIGHT_ROLLOVER 864000
///displays the current time into the round, with a lot of extra code just there for ensuring it looks okay after an entire day passes
#define ROUND_TIME ( "[world.time - SSticker.round_start_time > MIDNIGHT_ROLLOVER ? "[round(world.time - SSticker.round_start_time/MIDNIGHT_ROLLOVER)]:[worldtime2text()]" : worldtime2text()]" )
#define JANUARY 1
#define FEBRUARY 2
code/controllers/subsystem/statpanel.dm
+1 -2
View File
@@ -13,13 +13,12 @@ SUBSYSTEM_DEF(statpanels)
/datum/controller/subsystem/statpanels/fire(resumed = FALSE)
if (!resumed)
var/datum/map_config/cached = SSmapping.next_map_config
var/round_time = world.time - SSticker.round_start_time
var/list/global_data = list(
"Map: [SSmapping.config?.map_name || "Loading..."]",
cached ? "Next Map: [cached.map_name]" : null,
"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
"Round Time: [round_time > MIDNIGHT_ROLLOVER ? "[round(round_time/MIDNIGHT_ROLLOVER)]:[worldtime2text()]" : worldtime2text()]",
"Round Time: [ROUND_TIME]",
"Station Time: [station_time_timestamp()]",
"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)"
)
code/game/objects/items/devices/PDA/PDA.dm
+3 -1
View File
@@ -259,7 +259,9 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += text("<br><a href='?src=[REF(src)];choice=UpdateInfo'>[id ? "Update PDA Info" : ""]</A><br><br>")
dat += "[station_time_timestamp()]<br>" //:[world.time / 100 % 6][world.time / 100 % 10]"
dat += "[time2text(world.realtime, "MMM DD")] [GLOB.year_integer+540]"
dat += "[time2text(world.realtime, "MMM DD")] [GLOB.year_integer+540]<br>"
dat += "It has been [ROUND_TIME] since the emergency shuttle was last called."
dat += "<br><br>"