From a681213a020944bf242ff04f2becac3cfe9fba00 Mon Sep 17 00:00:00 2001 From: Datraen Date: Sun, 17 Apr 2016 22:53:24 -0400 Subject: [PATCH 1/2] Adds three new mixed modes! --- code/game/gamemodes/mixed/mercrenegade.dm | 11 +++++++++++ code/game/gamemodes/mixed/mercwiz.dm | 11 +++++++++++ code/game/gamemodes/mixed/traitorrenegade.dm | 11 +++++++++++ html/changelogs/Dat-MoreMixedModes.yml | 4 ++++ polaris.dme | 3 +++ 5 files changed, 40 insertions(+) create mode 100644 code/game/gamemodes/mixed/mercrenegade.dm create mode 100644 code/game/gamemodes/mixed/mercwiz.dm create mode 100644 code/game/gamemodes/mixed/traitorrenegade.dm create mode 100644 html/changelogs/Dat-MoreMixedModes.yml diff --git a/code/game/gamemodes/mixed/mercrenegade.dm b/code/game/gamemodes/mixed/mercrenegade.dm new file mode 100644 index 0000000000..1c7d49b63d --- /dev/null +++ b/code/game/gamemodes/mixed/mercrenegade.dm @@ -0,0 +1,11 @@ +/datum/game_mode/mercren + name = "Mercenaries & Renegades" + round_description = "A mercenary team has invaded the station, as well as other having brought their own form protection." + extended_round_description = "Mercenaries and traitors spawn during this round." + config_tag = "mercren" + required_players = 12 //What could possibly go wrong? + required_players_secret = 12 + required_enemies = 8 + end_on_antag_death = 0 + antag_tags = list(MODE_MERCENARY, MODE_RENEGADE) + require_all_templates = 1 \ No newline at end of file diff --git a/code/game/gamemodes/mixed/mercwiz.dm b/code/game/gamemodes/mixed/mercwiz.dm new file mode 100644 index 0000000000..af3629bfef --- /dev/null +++ b/code/game/gamemodes/mixed/mercwiz.dm @@ -0,0 +1,11 @@ +/datum/game_mode/mercwiz + name = "Mercenaries & Wizard" + round_description = "A mercenary team and a wizard have invaded the station!" + extended_round_description = "Mercenaries and wizard spawn during this round." + config_tag = "mercwiz" + required_players = 15 //I don't think we can have it lower and not need an ERT every round. + required_players_secret = 15 //I don't think we can have it lower and not need an ERT every round. + required_enemies = 7 + end_on_antag_death = 0 + antag_tags = list(MODE_MERCENARY, MODE_WIZARD) + require_all_templates = 1 \ No newline at end of file diff --git a/code/game/gamemodes/mixed/traitorrenegade.dm b/code/game/gamemodes/mixed/traitorrenegade.dm new file mode 100644 index 0000000000..c9430b10f9 --- /dev/null +++ b/code/game/gamemodes/mixed/traitorrenegade.dm @@ -0,0 +1,11 @@ +/datum/game_mode/traitorren + name = "Traitors & Renegades" + round_description = "Subversive elements have invaded the station, and certain individuals are feeling uncertain about their safety." + extended_round_description = "Traitors and renegades spawn during this round." + config_tag = "traitorren" + required_players = 10 //I don't think we can have it lower and not need an ERT every round. + required_players_secret = 11 //I don't think we can have it lower and not need an ERT every round. + required_enemies = 4 + end_on_antag_death = 0 + antag_tags = list(MODE_TRAITOR, MODE_RENEGADE) + require_all_templates = 1 \ No newline at end of file diff --git a/html/changelogs/Dat-MoreMixedModes.yml b/html/changelogs/Dat-MoreMixedModes.yml new file mode 100644 index 0000000000..2be981df6a --- /dev/null +++ b/html/changelogs/Dat-MoreMixedModes.yml @@ -0,0 +1,4 @@ +author: Datraen +delete-after: True +changes: + - rscadd: "Added three mixed modes, 'Mercenaries & Wizard', 'Mercenaries & Renegades', and 'Traitors & Renegades'." diff --git a/polaris.dme b/polaris.dme index 871fddeff9..82459576ff 100644 --- a/polaris.dme +++ b/polaris.dme @@ -339,8 +339,11 @@ #include "code\game\gamemodes\mixed\infestation.dm" #include "code\game\gamemodes\mixed\intrigue.dm" #include "code\game\gamemodes\mixed\lizard.dm" +#include "code\game\gamemodes\mixed\mercrenegade.dm" +#include "code\game\gamemodes\mixed\mercwiz.dm" #include "code\game\gamemodes\mixed\paranoia.dm" #include "code\game\gamemodes\mixed\traitorling.dm" +#include "code\game\gamemodes\mixed\traitorrenegade.dm" #include "code\game\gamemodes\mixed\uprising.dm" #include "code\game\gamemodes\mixed\visitors.dm" #include "code\game\gamemodes\ninja\ninja.dm" From c24ba098340b094bbcce4c8a54359e26fa06b3a4 Mon Sep 17 00:00:00 2001 From: Datraen Date: Tue, 19 Apr 2016 13:05:05 -0400 Subject: [PATCH 2/2] Bumps up MercenaryRenegade gamemode requirement. --- code/game/gamemodes/mixed/mercrenegade.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/mixed/mercrenegade.dm b/code/game/gamemodes/mixed/mercrenegade.dm index 1c7d49b63d..37ef6b76d9 100644 --- a/code/game/gamemodes/mixed/mercrenegade.dm +++ b/code/game/gamemodes/mixed/mercrenegade.dm @@ -3,8 +3,8 @@ round_description = "A mercenary team has invaded the station, as well as other having brought their own form protection." extended_round_description = "Mercenaries and traitors spawn during this round." config_tag = "mercren" - required_players = 12 //What could possibly go wrong? - required_players_secret = 12 + required_players = 16 //What could possibly go wrong? + required_players_secret = 15 required_enemies = 8 end_on_antag_death = 0 antag_tags = list(MODE_MERCENARY, MODE_RENEGADE)