Mixed gamemodes changes (#3239)

-changes uprising from cult and rev to rev and traitors
-enable intrigue that was left behind
-updates the config to include all gamemodes

aurorastation.dme

@@ -421,6 +421,7 @@
 #include "code\game\gamemodes\mixed\conflux.dm"
 #include "code\game\gamemodes\mixed\crossfire.dm"
 #include "code\game\gamemodes\mixed\infestation.dm"
+#include "code\game\gamemodes\mixed\intrigue.dm"
 #include "code\game\gamemodes\mixed\paranoia.dm"
 #include "code\game\gamemodes\mixed\siege.dm"
 #include "code\game\gamemodes\mixed\traitorling.dm"

code/game/gamemodes/mixed/uprising.dm

@@ -1,11 +1,11 @@
 /datum/game_mode/uprising
-	name = "Uprising (Cult+Rev)"
+	name = "Uprising (Rev+Traitor)"
 	config_tag = "uprising"
-	round_description = "Some crewmembers are attempting to start a revolution while a cult plots in the shadows!"
-	extended_round_description = "Cultists and revolutionaries spawn in this round."
+	round_description = "Some crewmembers are attempting to start a revolution while subversive elements infest the crew!"
+	extended_round_description = "Traitors and revolutionaries spawn in this round."
 	required_players = 15
 	required_enemies = 3
 	end_on_antag_death = 1
-	antag_tags = list(MODE_REVOLUTIONARY, MODE_LOYALIST, MODE_CULTIST)
+	antag_tags = list(MODE_REVOLUTIONARY, MODE_LOYALIST, MODE_TRAITOR)
 	require_all_templates = 1
 	votable = 1

config/example/config.txt

@@ -117,12 +117,18 @@ PROBABILITY S MERCENARY 1
 PROBABILITY S WIZARD 1
 PROBABILITY S CHANGELING 1
 PROBABILITY S CULT 1
+PROBABILITY S NINJA 1
+PROBABILITY S HEIST 1
+PROBABILITY S VAMPIRE 1
 PROBABILITY S EXTEND-A-TRAITORMONGOUS 6
 PROBABILITY MS CONFLUX 1
 PROBABILITY MS CROSSFIRE 1
 PROBABILITY MS PARANOIA 1
 PROBABILITY MS UPRISING 1
 PROBABILITY MS VISITORS 1
+PROBABILITY MS INTRIGUE 1
+PROBABILITY MS SIEGE 1
+PROBABILITY MS TRAITORLING 1
 PROBABILITY MS EXTENDED 1
 
 ## Hash out to disable random events during the round.

html/changelogs/alberyk-PR-3239.yml

@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - tweak: "Changed the uprising gamemode to be revolution and traitor, instead of revolution and cult."