cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

The stat panel now displays station time along with current round duration.

Browse Source
This commit is contained in:
PsiOmega
2015-08-15 22:05:52 +02:00
parent a2ae87aaf9
commit 1186ec2af6
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/__HELPERS/time.dm
View File

@@ -12,7 +12,7 @@ proc/worldtime2text(time = world.time)
proc/worlddate2text() proc/worlddate2text()
return num2text((text2num(time2text(world.timeofday, "YYYY"))+544)) + "-" + time2text(world.timeofday, "MM-DD") return num2text((text2num(time2text(world.timeofday, "YYYY"))+544)) + "-" + time2text(world.timeofday, "MM-DD")
proc/time_stamp() proc/time_stamp()
return time2text(world.timeofday, "hh:mm:ss") return time2text(world.timeofday, "hh:mm:ss")
@@ -27,3 +27,18 @@ proc/isDay(var/month, var/day)
// Uncomment this out when debugging! // Uncomment this out when debugging!
//else //else
//return 1 //return 1
var/next_duration_update = 0
var/last_round_duration = 0
proc/round_duration()
if(last_round_duration && world.time < next_duration_update)
return last_round_duration
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
last_round_duration = "[round(hours)]h [round(mins)]m"
next_duration_update = world.time + 1 MINUTES
return last_round_duration

1
code/modules/mob/dead/observer/observer.dm
View File

@@ -189,7 +189,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/Stat() /mob/dead/observer/Stat()
..() ..()
if(statpanel("Status")) if(statpanel("Status"))
stat(null, "Station Time: [worldtime2text()]")
if(emergency_shuttle) if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta() var/eta_status = emergency_shuttle.get_status_panel_eta()
if(eta_status) if(eta_status)

7
code/modules/mob/living/silicon/silicon.dm
View File

@@ -149,12 +149,6 @@
/mob/living/silicon/proc/show_malf_ai() /mob/living/silicon/proc/show_malf_ai()
return 0 return 0
// this function displays the station time in the status panel
/mob/living/silicon/proc/show_station_time()
stat(null, "Station Time: [worldtime2text()]")
// this function displays the shuttles ETA in the status panel if the shuttle has been called // this function displays the shuttles ETA in the status panel if the shuttle has been called
/mob/living/silicon/proc/show_emergency_shuttle_eta() /mob/living/silicon/proc/show_emergency_shuttle_eta()
if(emergency_shuttle) if(emergency_shuttle)
@@ -166,7 +160,6 @@
// This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms // This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms
/mob/living/silicon/Stat() /mob/living/silicon/Stat()
if(statpanel("Status")) if(statpanel("Status"))
show_station_time()
show_emergency_shuttle_eta() show_emergency_shuttle_eta()
show_system_integrity() show_system_integrity()
show_malf_ai() show_malf_ai()

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

@@ -638,6 +638,10 @@
. = (client && client.inactivity < 1200) . = (client && client.inactivity < 1200)
if(.) if(.)
if(statpanel("Status") && ticker && ticker.current_state != GAME_STATE_PREGAME)
statpanel("Status", "Station Time", worldtime2text())
statpanel("Status", "Round Duration", round_duration())
if(client.holder) if(client.holder)
if(statpanel("Status")) if(statpanel("Status"))
statpanel("Status","Location:","([x], [y], [z])") statpanel("Status","Location:","([x], [y], [z])")
@@ -1067,4 +1071,4 @@ mob/proc/yank_out_object()
/mob/proc/throw_mode_on() /mob/proc/throw_mode_on()
src.in_throw_mode = 1 src.in_throw_mode = 1
if(src.throw_icon) if(src.throw_icon)
src.throw_icon.icon_state = "act_throw_on" src.throw_icon.icon_state = "act_throw_on"

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

@@ -67,12 +67,7 @@
Stat() Stat()
..() ..()
statpanel("Status") if(statpanel("Lobby") && ticker)
if (client.statpanel == "Status" && ticker)
if (ticker.current_state != GAME_STATE_PREGAME)
stat(null, "Station Time: [worldtime2text()]")
statpanel("Lobby")
if(client.statpanel=="Lobby" && ticker)
if(ticker.hide_mode) if(ticker.hide_mode)
stat("Game Mode:", "Secret") stat("Game Mode:", "Secret")
else else
@@ -387,16 +382,11 @@
global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer") global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
proc/LateChoices() 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/name = client.prefs.be_random_name ? "friend" : client.prefs.real_name var/name = client.prefs.be_random_name ? "friend" : client.prefs.real_name
var/dat = "<html><body><center>" var/dat = "<html><body><center>"
dat += "<b>Welcome, [name].<br></b>" dat += "<b>Welcome, [name].<br></b>"
dat += "Round Duration: [round(hours)]h [round(mins)]m<br>" dat += "Round Duration: [round_duration()]<br>"
if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles. if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled