cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7711 from VOREStation/aro-timing

Browse Source 
Fix/rename some timing stuff
This commit is contained in:
Aronai Sieyes
2020-05-08 14:42:32 -04:00
committed by GitHub
parent b9a4370bd2 6d47c2f95c
commit f3bd738ee9
11 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/game_master.dm
+1 -1
View File
@@ -109,7 +109,7 @@ SUBSYSTEM_DEF(game_master)
return FALSE
// Last minute antagging is bad for humans to do, so the GM will respect the start and end of the round.
var/mills = round_duration_in_ticks
var/mills = round_duration_in_ds
var/mins = round((mills % 36000) / 600)
var/hours = round(mills / 36000)
code/controllers/subsystems/nightshift.dm
+1 -1
View File
@@ -20,7 +20,7 @@ SUBSYSTEM_DEF(nightshift)
return ..()
/datum/controller/subsystem/nightshift/fire(resumed = FALSE)
if(round_duration_in_ticks < nightshift_first_check)
if(round_duration_in_ds < nightshift_first_check)
return
check_nightshift()