Added extended, deobfuscated, made "how many to vote" bigger

code/controllers/subsystem/ticker.dm

@@ -481,7 +481,7 @@ SUBSYSTEM_DEF(ticker)
 		SSticker.modevoted = TRUE
 		var/dynamic = CONFIG_GET(flag/dynamic_voting)
 		if(dynamic)
-			SSvote.initiate_vote("dynamic","server",hideresults=TRUE,votesystem=RANKED_CHOICE_VOTING,forced=TRUE)
+			SSvote.initiate_vote("dynamic","server",hideresults=FALSE,votesystem=RANKED_CHOICE_VOTING,forced=TRUE)
 		else
 			SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE)
 

code/controllers/subsystem/vote.dm

@@ -1,4 +1,4 @@
-#define VOTE_COOLDOWN 5
+#define VOTE_COOLDOWN 10
 
 SUBSYSTEM_DEF(vote)
 	name = "Vote"
@@ -143,6 +143,8 @@ SUBSYSTEM_DEF(vote)
 			text += "<b>[capitalize(mode)] Vote</b>"
 		if(was_roundtype_vote)
 			stored_gamemode_votes = list()
+		if(!obfuscated && vote_system == RANKED_CHOICE_VOTING)
+			text += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
 		for(var/i=1,i<=choices.len,i++)
 			var/votes = choices[choices[i]]
 			if(!votes)
@@ -166,6 +168,8 @@ SUBSYSTEM_DEF(vote)
 	to_chat(world, "\n<font color='purple'>[text]</font>")
 	if(obfuscated) //CIT CHANGE - adds obfuscated votes. this messages admins with the vote's true results
 		var/admintext = "Obfuscated results"
+		if(vote_system == RANKED_CHOICE_VOTING)
+			admintext += "\nIt should be noted that this is not a raw tally of votes (impossible in ranked choice) but the score determined by the schulze method of voting, so the numbers will look weird!"
 		for(var/i=1,i<=choices.len,i++)
 			var/votes = choices[choices[i]]
 			admintext += "\n<b>[choices[i]]:</b> [votes]"
@@ -198,15 +202,10 @@ SUBSYSTEM_DEF(vote)
 				if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
 					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
 				GLOB.master_mode = "dynamic"
-				if(. == "extended")
+				var/datum/dynamic_storyteller/S = config.pick_storyteller(.)
-					GLOB.dynamic_forced_extended = TRUE // we still do the rest of the stuff
+				GLOB.dynamic_storyteller_type = S
-					GLOB.dynamic_storyteller_type = /datum/dynamic_storyteller/liteextended
+				GLOB.dynamic_curve_centre = initial(S.curve_centre)
-					GLOB.dynamic_forced_threat_level = 15
+				GLOB.dynamic_curve_width = initial(S.curve_width)
-				else
-					var/datum/dynamic_storyteller/S = config.pick_storyteller(.)
-					GLOB.dynamic_storyteller_type = S
-					GLOB.dynamic_curve_centre = initial(S.curve_centre)
-					GLOB.dynamic_curve_width = initial(S.curve_width)
 			if("map")
 				var/datum/map_config/VM = config.maplist[.]
 				message_admins("The map has been voted for and will change to: [VM.map_name]")
@@ -309,9 +308,6 @@ SUBSYSTEM_DEF(vote)
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
 			if("dynamic")
-				var/saved_threats = SSpersistence.saved_threat_levels
-				if((saved_threats[1]+saved_threats[2]+saved_threats[3])>150)
-					choices.Add("extended")
 				for(var/T in config.storyteller_cache)
 					var/datum/dynamic_storyteller/S = T
 					choices.Add(initial(S.name))
@@ -372,11 +368,11 @@ SUBSYSTEM_DEF(vote)
 			. += "<h2>Vote: [capitalize(mode)]</h2>"
 		switch(vote_system)
 			if(PLURALITY_VOTING)
-				. += "<h3>Vote one.</h3>"
+				. += "<h1>Vote one.</h1>"
 			if(APPROVAL_VOTING)
-				. += "<h3>Vote any number of choices.</h3>"
+				. += "<h1>Vote any number of choices.</h1>"
 			if(RANKED_CHOICE_VOTING)
-				. += "<h3>Vote by order of preference. Revoting will demote to the bottom.</h3>"
+				. += "<h1>Vote by order of preference. Revoting will demote to the bottom.</h1>"
 		. += "Time Left: [time_remaining] s<hr><ul>"
 		switch(vote_system)
 			if(PLURALITY_VOTING, APPROVAL_VOTING)

code/game/gamemodes/dynamic/dynamic.dm

@@ -383,6 +383,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, null)
 				if(ruleset.weight)
 					events += ruleset
 	storyteller = new GLOB.dynamic_storyteller_type
+	storyteller.on_start()
 	SSblackbox.record_feedback("text","dynamic_storyteller",1,storyteller.name)
 	for(var/mob/dead/new_player/player in GLOB.player_list)
 		if(player.ready == PLAYER_READY_TO_PLAY && player.mind)

code/game/gamemodes/dynamic/dynamic_storytellers.dm

@@ -25,6 +25,9 @@ Property weights are:
 /datum/dynamic_storyteller/proc/do_process()
 	return
 
+/datum/dynamic_storyteller/proc/on_start()
+	return
+
 /datum/dynamic_storyteller/proc/roundstart_draft()
 	var/list/drafted_rules = list()
 	for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules)
@@ -104,17 +107,27 @@ Property weights are:
 	property_weights = list("valid" = 3, "trust" = 5)
 
 /datum/dynamic_storyteller/liteextended
-	name = "Extended-lite"
+	name = "Calm"
 	desc = "Rules that are likely to lead to rounds that reach their finish at the shuttle autocall."
 	curve_centre = -5
 	curve_width = 0.5
 	property_weights = list("extended" = 5, "chaos" = -1, "valid" = -1, "story_potential" = 1, "conversion" = -10)
 
+/datum/dynamic_storyteller/extended
+	name = "Extended"
+	desc = "No antags. Few threatening events. The calmest shift imaginable."
+	curve_centre = -20
+	curve_width = 0.5
+	
+/datum/dynamic_storyteller/extended/on_start()
+	GLOB.dynamic_forced_extended = TRUE
+
+
 /datum/dynamic_storyteller/memes
 	name = "Story"
 	desc = "Rules that might lead to fun stories to tell."
 	curve_width = 4
-	property_weights = list("story_potential" = 10)
+	property_weights = list("story_potential" = 10, "extended" = 1)
 
 /datum/dynamic_storyteller/cowabunga
 	name = "Cowabunga"