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

Merge branch 'master' into upstream-25-04b

Browse Source
This commit is contained in:
Roxy
2025-05-05 16:24:56 -04:00
parent b3e01e470a ff9b029a09
commit d9d0902b70
7 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/statpanel.dm
+12 -27
View File
@@ -21,21 +21,10 @@ SUBSYSTEM_DEF(statpanels)
if (!resumed)
num_fires++
var/datum/map_config/cached = SSmap_vote.next_map_config
/* SKYRAT EDIT CHANGE
if(isnull(SSmapping.current_map))
global_data = list("Loading")
else if(SSmapping.current_map.feedback_link)
global_data = list(list("Map: [SSmapping.current_map.map_name]", " (Feedback)", "action=openLink&link=[SSmapping.current_map.feedback_link]"))
else
global_data = list("Map: [SSmapping.current_map?.map_name]")
if(SSmapping.current_map?.mapping_url)
global_data += list(list("same_line", " | (View in Browser)", "action=openWebMap"))
if(cached)
global_data += "Next Map: [cached.map_name]"
global_data += list(
/* BUBBER EDIT CHANGE BEGIN - Stat Panel - Original:
global_data = list(
"Map: [SSmapping.current_map?.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", world.timezone)]",
"Round Time: [ROUND_TIME()]",
@@ -43,29 +32,25 @@ SUBSYSTEM_DEF(statpanels)
"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)]%)",
)
*/
var/round_time = world.time - SSticker.round_start_time
var/real_round_time = world.timeofday - SSticker.real_round_start_time
//BUBBER EDIT ADDITION: ACTIVE AND OBSERVING PLAYERS
var/active_players = get_active_player_count(alive_check = FALSE, afk_check = TRUE, human_check = FALSE) //This is a list of all active players, including players who are dead
var/observing_players = length(GLOB.current_observers_list) //This is a list of all players that started as an observer-- dead and lobby players are not included.
//BUBBER EDIT ADDITION: Time in the world (as in, in-game date)
var/timeinworld = "[time2text(world.realtime, "DD of Month,")] [CURRENT_STATION_YEAR]"
var/current_date = "[time2text(world.realtime, "DDD Month DD")], [CURRENT_STATION_YEAR]"
global_data = list(
"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)]%)",
"Map: [SSmapping.current_map?.map_name || "Loading..."]",
cached ? "Next Map: [cached.map_name]" : null,
"Storyteller: [SSgamemode.storyteller ? SSgamemode.storyteller.name : "N/A"]", // BUBBER EDIT ADDITION
"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
"Connected: [GLOB.clients.len] | Active: [active_players]/[CONFIG_GET(number/hard_popcap)] | Observing: [observing_players]", //BUBBER EDIT: ACTIVE AND OBSERVING PLAYERS
" ",
"Connected: [GLOB.clients.len] | Active: [active_players]/[CONFIG_GET(number/hard_popcap)] | Observing: [observing_players]",
"OOC: [GLOB.ooc_allowed ? "Enabled" : "Disabled"]",
" ",
"Storyteller: [SSgamemode.storyteller ? SSgamemode.storyteller.name : "N/A"]",
"Station Time: [station_time_timestamp(format = "hh:mm")], [current_date]",
"Round Time: [time2text(real_round_time, "hh:mm:ss", 0)]",
"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
"Station Time: [time_to_twelve_hour(station_time(), format = "hh:mm")], [timeinworld]", //BUBBER EDIT: READABLE STATION TIME
"Round Timer: [round_time > MIDNIGHT_ROLLOVER ? "[round(round_time/MIDNIGHT_ROLLOVER)]:[gameTimestamp()]" : gameTimestamp()]",
"Actual Round Timer: [time2text(real_round_time, "hh:mm:ss", 0)]"
"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)]%)",
)
// SKYRAT EDIT END
// BUBBER EDIT CHANGE END
if(SSshuttle.emergency)
var/ETA = SSshuttle.emergency.getModeStr()