From d990328e29c192de3d2ba089edd6807f1032a554 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 16 Mar 2021 22:37:39 -0700 Subject: [PATCH 1/2] Added a "no antags please" button --- code/__DEFINES/role_preferences.dm | 1 + code/game/gamemodes/game_mode.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 605b3f6485..09b5be572f 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -45,6 +45,7 @@ //The gamemode specific ones are just so the gamemodes can query whether a player is old enough //(in game days played) to play that role GLOBAL_LIST_INIT(special_roles, list( + ROLE_SYNDICATE, ROLE_TRAITOR = /datum/game_mode/traitor, ROLE_BROTHER = /datum/game_mode/traitor/bros, ROLE_OPERATIVE = /datum/game_mode/nuclear, diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 10c0154412..2134ea77ad 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -420,7 +420,7 @@ for(var/mob/dead/new_player/player in players) if(player.client && player.ready == PLAYER_READY_TO_PLAY) - if(role in player.client.prefs.be_special) + if(role in player.client.prefs.be_special && ROLE_SYNDICATE in player.client.prefs.be_special) if(!jobban_isbanned(player, ROLE_SYNDICATE) && !QDELETED(player) && !jobban_isbanned(player, role) && !QDELETED(player)) //Nodrak/Carn: Antag Job-bans if(age_check(player.client)) //Must be older than the minimum age candidates += player.mind // Get a list of all the people who want to be the antagonist for this round From f3ea1b1a0c33abc2b75e609c269392c072cabb1d Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 16 Mar 2021 22:53:55 -0700 Subject: [PATCH 2/2] Relabeled to "Antag"; unambiguized in --- code/game/gamemodes/game_mode.dm | 2 +- code/modules/client/preferences.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 2134ea77ad..610db63b1b 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -420,7 +420,7 @@ for(var/mob/dead/new_player/player in players) if(player.client && player.ready == PLAYER_READY_TO_PLAY) - if(role in player.client.prefs.be_special && ROLE_SYNDICATE in player.client.prefs.be_special) + if((role in player.client.prefs.be_special) && (ROLE_SYNDICATE in player.client.prefs.be_special)) if(!jobban_isbanned(player, ROLE_SYNDICATE) && !QDELETED(player) && !jobban_isbanned(player, role) && !QDELETED(player)) //Nodrak/Carn: Antag Job-bans if(age_check(player.client)) //Must be older than the minimum age candidates += player.mind // Get a list of all the people who want to be the antagonist for this round diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 05c2596f65..151b271d9e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -863,7 +863,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(days_remaining) dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS]
" else - dat += "Be [capitalize(i)]: [(i in be_special) ? "Enabled" : "Disabled"]
" + dat += "Be [i == ROLE_SYNDICATE ? "Antag": capitalize(i)]: [(i in be_special) ? "Enabled" : "Disabled"]
" dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]
" dat += "
"