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

Clockcult fixes and tweaks (#19795)

Browse Source 
* Clockcult fixes and tweaks

* die but don't stay dead

* stay dead but never die

* instinct

* unreadable dark magic

* idiocy knows no bounds

* danger close

* like four fucking times faster

* superdynamics
This commit is contained in:
Joan Lung
2016-08-11 17:06:21 -04:00
committed by oranges
parent 6f4693d0f9
commit 81329edda6
22 changed files with 211 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,11 @@ var/datum/subsystem/ticker/ticker
var/list/syndicate_coalition = list() //list of traitor-compatible factions
var/list/factions = list() //list of all factions
var/list/availablefactions = list() //list of factions with openings
var/list/scripture_states = list(SCRIPTURE_DRIVER = TRUE, \
SCRIPTURE_SCRIPT = FALSE, \
SCRIPTURE_APPLICATION = FALSE, \
SCRIPTURE_REVENANT = FALSE, \
SCRIPTURE_JUDGEMENT = FALSE) //list of clockcult scripture states for announcements
var/delay_end = 0 //if set true, the round will not restart on it's own
@@ -103,6 +108,7 @@ var/datum/subsystem/ticker/ticker
mode.process(wait * 0.1)
check_queue()
check_maprotate()
scripture_states = scripture_unlock_alert(scripture_states)
if(!mode.explosion_in_progress && mode.check_finished() || force_ending)
current_state = GAME_STATE_FINISHED