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

Round start timer now remains at 0 until the round actually starts.

Browse Source
This commit is contained in:
PsiOmegaDelta
2016-04-19 17:46:48 +02:00
committed by Yoshax
parent ebeaddea6e
commit a3f8bc815e
6 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/_helpers/time.dm
View File

@@ -30,11 +30,20 @@ proc/isDay(var/month, var/day)
var/next_duration_update = 0 var/next_duration_update = 0
var/last_round_duration = 0 var/last_round_duration = 0
proc/round_duration() var/round_start_time = 0
/hook/roundstart/proc/start_timer()
round_start_time = world.time
#define round_duration_in_ticks (round_start_time ? world.time - round_start_time : 0)
/proc/round_duration_as_text()
if(!round_start_time)
return "00:00"
if(last_round_duration && world.time < next_duration_update) if(last_round_duration && world.time < next_duration_update)
return last_round_duration return last_round_duration
var/mills = world.time // 1/10 of a second, not real milliseconds but whatever var/mills = round_duration_in_ticks // 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/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
var/mins = round((mills % 36000) / 600) var/mins = round((mills % 36000) / 600)
var/hours = round(mills / 36000) var/hours = round(mills / 36000)

4
code/controllers/autotransfer.dm
View File

@@ -12,6 +12,6 @@ datum/controller/transfer_controller/Destroy()
datum/controller/transfer_controller/proc/process() datum/controller/transfer_controller/proc/process()
currenttick = currenttick + 1 currenttick = currenttick + 1
if (world.time >= timerbuffer - 600) if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
vote.autotransfer() vote.autotransfer()
timerbuffer = timerbuffer + config.vote_autotransfer_interval timerbuffer = timerbuffer + config.vote_autotransfer_interval

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

@@ -392,7 +392,7 @@
if (ticker && ticker.current_state >= GAME_STATE_PLAYING) if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>" var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>" dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
dat += "Round Duration: <B>[round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B><BR>" dat += "Round Duration: <B>[round_duration_as_text()]</B><BR>"
dat += "<B>Emergency shuttle</B><BR>" dat += "<B>Emergency shuttle</B><BR>"
if (!emergency_shuttle.online()) if (!emergency_shuttle.online())
dat += "<a href='?src=\ref[src];call_shuttle=1'>Call Shuttle</a><br>" dat += "<a href='?src=\ref[src];call_shuttle=1'>Call Shuttle</a><br>"

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

@@ -645,7 +645,7 @@
if(.) if(.)
if(statpanel("Status") && ticker && ticker.current_state != GAME_STATE_PREGAME) if(statpanel("Status") && ticker && ticker.current_state != GAME_STATE_PREGAME)
stat("Station Time", worldtime2text()) stat("Station Time", worldtime2text())
stat("Round Duration", round_duration()) stat("Round Duration", round_duration_as_text())
if(client.holder) if(client.holder)
if(statpanel("Status")) if(statpanel("Status"))

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

@@ -364,7 +364,7 @@
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_duration()]<br>" dat += "Round Duration: [round_duration_as_text()]<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

2
code/world.dm
View File

@@ -155,7 +155,7 @@ var/world_topic_spam_protect_time = world.timeofday
// This is dumb, but spacestation13.com's banners break if player count isn't the 8th field of the reply, so... this has to go here. // This is dumb, but spacestation13.com's banners break if player count isn't the 8th field of the reply, so... this has to go here.
s["players"] = 0 s["players"] = 0
s["stationtime"] = worldtime2text() s["stationtime"] = worldtime2text()
s["roundduration"] = round_duration() s["roundduration"] = round_duration_as_text()
if(input["status"] == "2") if(input["status"] == "2")
var/list/players = list() var/list/players = list()