From f8e7802d6f300c2f8431b239af1d035fca4ce3a0 Mon Sep 17 00:00:00 2001 From: Avunia Date: Sun, 10 Feb 2019 14:37:30 +0100 Subject: [PATCH 1/3] Changing player number checks --- code/game/gamemodes/cult/cult.dm | 8 ++++---- code/game/gamemodes/nuclear/nuclear.dm | 6 +++--- code/game/gamemodes/wizard/wizard.dm | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 13ceff2451..37c66625e5 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -37,10 +37,10 @@ false_report_weight = 10 restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") protected_jobs = list() - required_players = 24 - required_enemies = 4 - recommended_enemies = 4 - enemy_minimum_age = 14 + required_players = 20 + required_enemies = 3 + recommended_enemies = 3 + enemy_minimum_age = 7 announce_span = "cult" announce_text = "Some crew members are trying to start a cult to Nar'Sie!\n\ diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index ab5978a3e5..bda53d1c6e 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -2,11 +2,11 @@ name = "nuclear emergency" config_tag = "nuclear" false_report_weight = 10 - required_players = 30 // 30 players - 3 players to be the nuke ops = 27 players remaining + required_players = 28 // 30 players - 3 players to be the nuke ops = 25 players remaining required_enemies = 2 - recommended_enemies = 5 + recommended_enemies = 4 antag_flag = ROLE_OPERATIVE - enemy_minimum_age = 14 + enemy_minimum_age = 7 announce_span = "danger" announce_text = "Syndicate forces are approaching the station in an attempt to destroy it!\n\ diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index d27f977575..9ea2694354 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -10,7 +10,7 @@ required_players = 20 required_enemies = 1 recommended_enemies = 1 - enemy_minimum_age = 14 + enemy_minimum_age = 7 round_ends_with_antag_death = 1 announce_span = "danger" announce_text = "There is a space wizard attacking the station!\n\ From 1a87a008935d05196df76d3ca70205287b73aa50 Mon Sep 17 00:00:00 2001 From: Cyprian Date: Thu, 14 Feb 2019 12:24:10 +0100 Subject: [PATCH 2/3] Reverting the changes for team numbers. Lowering clock cult requirement to 20 aswell now that it won't conflict with the PR about fixes to clockcult --- code/game/gamemodes/clock_cult/clock_cult.dm | 4 ++-- code/game/gamemodes/cult/cult.dm | 4 ++-- code/game/gamemodes/nuclear/nuclear.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index f0ccf235ae..79383305d2 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -130,10 +130,10 @@ Credit where due: config_tag = "clockwork_cult" antag_flag = ROLE_SERVANT_OF_RATVAR false_report_weight = 10 - required_players = 24 + required_players = 20 required_enemies = 4 recommended_enemies = 4 - enemy_minimum_age = 14 + enemy_minimum_age = 7 protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //Silicons can eventually be converted restricted_jobs = list("Chaplain", "Captain") announce_span = "brass" diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 37c66625e5..34d0c2cfd2 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -38,8 +38,8 @@ restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") protected_jobs = list() required_players = 20 - required_enemies = 3 - recommended_enemies = 3 + required_enemies = 4 + recommended_enemies = 4 enemy_minimum_age = 7 announce_span = "cult" diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index bda53d1c6e..d76552982c 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -4,7 +4,7 @@ false_report_weight = 10 required_players = 28 // 30 players - 3 players to be the nuke ops = 25 players remaining required_enemies = 2 - recommended_enemies = 4 + recommended_enemies = 5 antag_flag = ROLE_OPERATIVE enemy_minimum_age = 7 From b45b6efea78a6dbc7acef07a1c5e75467e0193ac Mon Sep 17 00:00:00 2001 From: Alexander Meinhardt Date: Thu, 21 Feb 2019 03:49:50 +0100 Subject: [PATCH 3/3] Reduced req. enemies on BC and CC to 2 --- code/game/gamemodes/clock_cult/clock_cult.dm | 2 +- code/game/gamemodes/cult/cult.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 79383305d2..e47c439897 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -131,7 +131,7 @@ Credit where due: antag_flag = ROLE_SERVANT_OF_RATVAR false_report_weight = 10 required_players = 20 - required_enemies = 4 + required_enemies = 2 recommended_enemies = 4 enemy_minimum_age = 7 protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //Silicons can eventually be converted diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 34d0c2cfd2..782ad54e4c 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -38,7 +38,7 @@ restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") protected_jobs = list() required_players = 20 - required_enemies = 4 + required_enemies = 2 recommended_enemies = 4 enemy_minimum_age = 7