cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 03:36:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2477 from CHOMPStationBot/upstream-merge-10946

Browse Source 
[MIRROR] Makes time/tram use REALTIMEOFDAY rather than world.time
This commit is contained in:
Nadyr
2021-07-10 01:46:02 -04:00
committed by GitHub
parent 48c609ddca 7476daf3f8
commit 19630dcdcc
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_helpers/time.dm
+5 -6
View File
@@ -51,7 +51,7 @@ var/next_station_date_change = 1 DAY
#define duration2stationtime(time) time2text(station_time_in_ds + time, "hh:mm")
#define worldtime2stationtime(time) time2text(GLOB.roundstart_hour HOURS + time, "hh:mm")
#define round_duration_in_ds (GLOB.round_start_time ? world.time - GLOB.round_start_time : 0)
#define round_duration_in_ds (GLOB.round_start_time ? REALTIMEOFDAY - GLOB.round_start_time : 0)
#define station_time_in_ds (GLOB.roundstart_hour HOURS + round_duration_in_ds)
/proc/stationtime2text()
@@ -63,9 +63,7 @@ var/next_station_date_change = 1 DAY
next_station_date_change += 1 DAY
update_time = TRUE
if(!station_date || update_time)
var/extra_days = round(station_time_in_ds / (1 DAY)) DAYS
var/timeofday = world.timeofday + extra_days
station_date = num2text((text2num(time2text(timeofday, "YYYY"))+544)) + "-" + time2text(timeofday, "MM-DD") //YW EDIT
station_date = num2text((text2num(time2text(REALTIMEOFDAY, "YYYY"))+544)) + "-" + time2text(REALTIMEOFDAY, "MM-DD") //CHOMP EDIT
return station_date
//ISO 8601
@@ -103,7 +101,7 @@ var/last_round_duration = 0
GLOBAL_VAR_INIT(round_start_time, 0)
/hook/roundstart/proc/start_timer()
GLOB.round_start_time = world.time
GLOB.round_start_time = REALTIMEOFDAY
return 1
/proc/roundduration2text()
@@ -128,7 +126,8 @@ GLOBAL_VAR_INIT(round_start_time, 0)
/var/rollovercheck_last_timeofday = 0
/proc/update_midnight_rollover()
if (world.timeofday < rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS!
return midnight_rollovers++
midnight_rollovers += 1
rollovercheck_last_timeofday = world.timeofday
return midnight_rollovers
//Increases delay as the server gets more overloaded,