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

Merge pull request #3526 from VOREStation/stonedmc-update

Browse Source 
StonedMC Update & Hookup
This commit is contained in:
Anewbe
2017-06-16 16:22:26 -05:00
committed by GitHub
parent 99320866b0 82e6049821
commit 3997a1510a
13 changed files with 151 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/Processes/ticker.dm
View File

@@ -34,5 +34,9 @@ var/global/datum/controller/process/ticker/tickerProcess
/datum/controller/process/ticker/proc/getLastTickerTimeDuration()
return lastTickerTimeDuration
/world/proc/has_round_started()
// Use these preferentially to directly examining ticker.current_state to help prepare for transition to ticker as subsystem!
/datum/controller/process/ticker/proc/HasRoundStarted()
return (ticker && ticker.current_state >= GAME_STATE_PLAYING)
/datum/controller/process/ticker/proc/IsRoundInProgress()
return (ticker && ticker.current_state == GAME_STATE_PLAYING)