diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index df98efe6..df5ea45d 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -1,4 +1,4 @@ -#define DYNAMIC_DEFAULT_CHAOS 1.5 //The default chaos value for low pop low vote rounds +#define DYNAMIC_DEFAULT_CHAOS 1.0 //The default chaos value for low pop low vote rounds #define DYNAMIC_VOTE_NORMALIZATION 5 //If there are fewer than this many votes, the average will be skewed towards the default SUBSYSTEM_DEF(vote) @@ -158,7 +158,7 @@ SUBSYSTEM_DEF(vote) . = (total / v) if(total == 0)//If statements down the road break if total is allowed to be 0 and it defaults to normal extended. . = 0.1 - text += "\nChaos level [obfuscated ? "???" : .]" + text += "\nChaos level [.]" if(mode != "custom" && mode != "dynamic") if(winners.len > 1 && !obfuscated) //CIT CHANGE - adds obfuscated votes @@ -285,6 +285,7 @@ SUBSYSTEM_DEF(vote) if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote choices.Add("secret", "extended") if("dynamic") + obfuscated = TRUE choices.Add("0","1","2","3","4","5") if("custom") question = stripped_input(usr,"What is the vote for?") diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index ca878983..31ce4c27 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -125,9 +125,10 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5) /datum/game_mode/dynamic/admin_panel() var/list/dat = list("Game Mode Panel

Game Mode Panel

") dat += "Dynamic Mode \[VV\]
" - dat += "Threat Level: [threat_level]
" - - dat += "Threat to Spend: [threat] \[Adjust\] \[View Log\]
" + dat += "Chaos Level: [GLOB.dynamic_chaos_level]
" + //dat += "Threat Level: [threat_level]
" + //dat += "Threat to Spend: [threat] \[Adjust\] \[View Log\]
" + dat += "Threat Level: [threat] \[Adjust\] \[View Log\]
" dat += "
" dat += "Parameters: centre = [GLOB.dynamic_curve_centre] ; width = [GLOB.dynamic_curve_width].
" //dat += "On average, [peaceful_percentage]% of the rounds are more peaceful.
" diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 65afdc7c..fd0b256e 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -290,7 +290,7 @@ requirements = list(10,10,10,10,10,10,10,10,10,10) high_population_requirement = 10 chaos_min = 0.1 - chaos_max = 2.5 + chaos_max = 2.0 admin_required = TRUE //vars for execution var/list/mob/living/carbon/human/lewd_candidates = list() @@ -591,6 +591,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/nightmare name = "Nightmare" antag_datum = /datum/antagonist/nightmare + controller = /datum/round_event_control/nightmare antag_flag = "Nightmare" antag_flag_override = ROLE_ALIEN enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index f6971539..41b239ba 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -81,7 +81,7 @@ requirements = list(10,10,10,10,10,10,10,10,10,10) high_population_requirement = 10 chaos_min = 0.1 - chaos_max = 2.5 + chaos_max = 2.0 admin_required = TRUE //vars for execution var/list/mob/living/carbon/human/lewd_candidates = list()