Revert "vote overhaul start"

This reverts commit 232811dd18.
This commit is contained in:
Putnam
2019-12-24 17:52:33 -08:00
parent 232811dd18
commit 124ea51c09
3 changed files with 22 additions and 43 deletions
+1 -2
View File
@@ -660,8 +660,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null)
SSblackbox.record_feedback("tally","dynamic",1,"Rulesets finished")
SSblackbox.record_feedback("associative","dynamic_rulesets_finished",1,rule.get_blackbox_info())
if(!storyteller.do_process())
return
storyteller.do_process()
if (midround_injection_cooldown < world.time)
if (GLOB.dynamic_forced_extended)
@@ -38,7 +38,7 @@ Property weights are:
mode.event_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max)) + world.time)
/datum/dynamic_storyteller/proc/do_process()
return TRUE
return
/datum/dynamic_storyteller/proc/on_start()
return
@@ -172,7 +172,6 @@ Property weights are:
mode.refund_threat(10)
mode.log_threat("Cowabunga it is. Refunded 10 threat. Threat is now [mode.threat].")
refund_cooldown = world.time + 300 SECONDS
return TRUE
/datum/dynamic_storyteller/team
name = "Teamwork"
@@ -217,10 +216,3 @@ Property weights are:
/datum/dynamic_storyteller/extended/on_start()
GLOB.dynamic_forced_extended = TRUE
/datum/dynamic_storyteller/ghosts
name = "Ghosts"
desc = "Deadchat control everything. Maximum variation."
/datum/dynamic_storyteller/ghosts/do_process()