From 370ba0a7b09dbf8f1bc11581a93eb7255a20c7d0 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Mon, 30 Oct 2017 18:14:42 -0200
Subject: [PATCH] We have arrived, and it is now that we perform our charge.
 (#3782)

In fealty of the Triumvirate, our undying Lords, and by the grace of the Administratum; I declare exterminatus upon Mixed Secret.
I hereby sign the death warrant of an entire gamemode, and consign a million pubbies to tears.
May Imperial justice account in all balance, the Triumvirate protects.
---
 code/controllers/configuration.dm |  6 +++---
 config/example/config.txt         | 15 ++++++++++++++-
 html/changelogs/alberky-mixed.yml |  6 ++++++
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/alberky-mixed.yml

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 55b9be85b99..0c634e81c2e 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -295,7 +295,7 @@ var/list/gamemode_cache = list()
 				if (M.votable)
 					src.votable_modes += M.config_tag
 	src.votable_modes += ROUNDTYPE_STR_SECRET
-	votable_modes += ROUNDTYPE_STR_MIXED_SECRET
+//	votable_modes += ROUNDTYPE_STR_MIXED_SECRET
 
 /datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
 	var/list/Lines = file2list(filename)
@@ -601,7 +601,7 @@ var/list/gamemode_cache = list()
 
 				if("alert_yellow")
 					config.alert_desc_yellow_to = value
-		
+
 				if("alert_delta")
 					config.alert_desc_delta = value
 
@@ -846,7 +846,7 @@ var/list/gamemode_cache = list()
 					access_deny_vms = text2num(value)
 				if("access_warn_vms")
 					access_warn_vms = text2num(value)
-				
+
 				if("cargo_load_items_from")
 					cargo_load_items_from = value
 
diff --git a/config/example/config.txt b/config/example/config.txt
index c7db3c67665..ace7ebc048f 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -122,6 +122,19 @@ PROBABILITY S NINJA 1
 PROBABILITY S HEIST 1
 PROBABILITY S VAMPIRE 1
 PROBABILITY S EXTEND-A-TRAITORMONGOUS 6
+PROBABILITY S CONFLUX 1
+PROBABILITY S CROSSFIRE 1
+PROBABILITY S PARANOIA 1
+PROBABILITY S UPRISING 1
+PROBABILITY S VISITORS 1
+PROBABILITY S INTRIGUE 1
+PROBABILITY S SIEGE 1
+PROBABILITY S EXTENDED 1
+PROBABILITY S INFILTRATION 1
+PROBABILITY S VEILPARTY 1
+PROBABILITY S FEEDING 1
+PROBABILITY S TRAITORLING 1
+
 PROBABILITY MS CONFLUX 1
 PROBABILITY MS CROSSFIRE 1
 PROBABILITY MS PARANOIA 1
@@ -500,4 +513,4 @@ LOG_GELF_PORT 12201
 FASTBOOT
 
 # Where to load the cargo items from. json or sql
-CARGO_LOAD_ITEMS_FROM json
\ No newline at end of file
+CARGO_LOAD_ITEMS_FROM json
diff --git a/html/changelogs/alberky-mixed.yml b/html/changelogs/alberky-mixed.yml
new file mode 100644
index 00000000000..cc0eeca9d33
--- /dev/null
+++ b/html/changelogs/alberky-mixed.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscdel: "Removed mixed secret from the voting options, all mixed gamemodes should be added to the regular secret rotation."