diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 490b714bf57..77102364446 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -302,7 +302,6 @@ return null /proc/get_candidates(be_special_type, afk_bracket=3000, override_age=0, override_jobban=0) - var/roletext = get_roletext(be_special_type) var/list/candidates = list() // Keep looping until we find a non-afk candidate within the time bracket (we limit the bracket to 10 minutes (6000)) while(!length(candidates) && afk_bracket < 6000) @@ -310,7 +309,7 @@ if(G.client != null) if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD)) if(!G.client.is_afk(afk_bracket) && (be_special_type in G.client.prefs.be_special)) - if(!override_jobban || (!jobban_isbanned(G, roletext) && !jobban_isbanned(G, ROLE_SYNDICATE))) + if(!override_jobban || (!jobban_isbanned(G, be_special_type) && !jobban_isbanned(G, ROLE_SYNDICATE))) if(override_age || player_old_enough_antag(G.client,be_special_type)) candidates += G.client afk_bracket += 600 // Add a minute to the bracket, for every attempt @@ -318,7 +317,6 @@ return candidates /proc/get_candidate_ghosts(be_special_type, afk_bracket=3000, override_age=0, override_jobban=0) - var/roletext = get_roletext(be_special_type) var/list/candidates = list() // Keep looping until we find a non-afk candidate within the time bracket (we limit the bracket to 10 minutes (6000)) while(!length(candidates) && afk_bracket < 6000) @@ -326,7 +324,7 @@ if(G.client != null) if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD)) if(!G.client.is_afk(afk_bracket) && (be_special_type in G.client.prefs.be_special)) - if(!override_jobban || (!jobban_isbanned(G, roletext) && !jobban_isbanned(G, ROLE_SYNDICATE))) + if(!override_jobban || (!jobban_isbanned(G, be_special_type) && !jobban_isbanned(G, ROLE_SYNDICATE))) if(override_age || player_old_enough_antag(G.client,be_special_type)) candidates += G afk_bracket += 600 // Add a minute to the bracket, for every attempt diff --git a/code/controllers/subsystem/SSghost_spawns.dm b/code/controllers/subsystem/SSghost_spawns.dm index ad1690b7610..fc81bd9a4b6 100644 --- a/code/controllers/subsystem/SSghost_spawns.dm +++ b/code/controllers/subsystem/SSghost_spawns.dm @@ -44,7 +44,7 @@ SUBSYSTEM_DEF(ghost_spawns) * * role_cleanname - The name override to display to clients */ /datum/controller/subsystem/ghost_spawns/proc/poll_candidates(question = "Would you like to play a special role?", role, antag_age_check = FALSE, poll_time = 30 SECONDS, ignore_respawnability = FALSE, min_hours = 0, flash_window = TRUE, check_antaghud = TRUE, source, role_cleanname, reason, dont_play_notice_sound = FALSE) - log_debug("Polling candidates [role ? "for [role_cleanname || get_roletext(role)]" : "\"[question]\""] for [poll_time / 10] seconds") + log_debug("Polling candidates [role ? "for [role_cleanname || role]" : "\"[question]\""] for [poll_time / 10] seconds") // Start firing polls_active = TRUE @@ -132,7 +132,7 @@ SUBSYSTEM_DEF(ghost_spawns) if(isatom(source)) act_jump = "\[Teleport]" var/act_signup = "\[Sign Up]" - to_chat(M, "Now looking for candidates [role ? "to play as \an [role_cleanname || get_roletext(role)]" : "\"[question]\""]. [act_jump] [act_signup] [reason ? "\nReason: [sanitize(reason)]" : ""]", MESSAGE_TYPE_DEADCHAT) + to_chat(M, "Now looking for candidates [role ? "to play as \an [role_cleanname || role]" : "\"[question]\""]. [act_jump] [act_signup] [reason ? "\nReason: [sanitize(reason)]" : ""]", MESSAGE_TYPE_DEADCHAT) // Start processing it so it updates visually the timer START_PROCESSING(SSprocessing, A) @@ -196,7 +196,7 @@ SUBSYSTEM_DEF(ghost_spawns) // Trim players who aren't eligible anymore var/len_pre_trim = length(P.signed_up) P.trim_candidates() - log_debug("Candidate poll [P.role ? "for [get_roletext(P.role)]" : "\"[P.question]\""] finished. [len_pre_trim] players signed up, [length(P.signed_up)] after trimming") + log_debug("Candidate poll [P.role ? "for [P.role]" : "\"[P.question]\""] finished. [len_pre_trim] players signed up, [length(P.signed_up)] after trimming") P.finished = TRUE currently_polling -= P diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index d072659317c..5b4a22dbc5d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -280,17 +280,15 @@ var/list/players = list() var/list/candidates = list() - var/roletext = get_roletext(role) - // Assemble a list of active players without jobbans. for(var/mob/new_player/player in GLOB.player_list) if(player.client && player.ready) - if(!jobban_isbanned(player, ROLE_SYNDICATE) && !jobban_isbanned(player, roletext)) + if(!jobban_isbanned(player, ROLE_SYNDICATE) && !jobban_isbanned(player, role)) if(player_old_enough_antag(player.client,role)) players += player for(var/mob/living/carbon/human/player in GLOB.player_list) - if(jobban_isbanned(player, ROLE_SYNDICATE) || jobban_isbanned(player, roletext)) + if(jobban_isbanned(player, ROLE_SYNDICATE) || jobban_isbanned(player, role)) continue if(player_old_enough_antag(player.client, role)) players += player @@ -303,7 +301,7 @@ if(species_exclusive && (eligible_player.client.prefs.active_character.species != species_exclusive)) continue if(role in eligible_player.client.prefs.be_special) - player_draft_log += "[eligible_player.key] had [roletext] enabled, so we are drafting them." + player_draft_log += "[eligible_player.key] had [role] enabled, so we are drafting them." candidates += eligible_player.mind players -= eligible_player @@ -327,13 +325,11 @@ var/list/players = list() var/list/candidates = list() - var/roletext = get_roletext(role) - // Assemble a list of active players without jobbans. for(var/mob/living/carbon/human/player in GLOB.player_list) if(!player.client || (locate(player) in SSafk.afk_players)) continue - if(!jobban_isbanned(player, ROLE_SYNDICATE) && !jobban_isbanned(player, roletext)) + if(!jobban_isbanned(player, ROLE_SYNDICATE) && !jobban_isbanned(player, role)) players += player // Shuffle the players list so that it becomes ping-independent. @@ -347,7 +343,7 @@ if(!(role in player.client.prefs.be_special) || (player.client.prefs.active_character.species in species_to_mindflayer)) continue - player_draft_log += "[player.key] had [roletext] enabled, so we are drafting them." + player_draft_log += "[player.key] had [role] enabled, so we are drafting them." candidates += player.mind players -= player @@ -491,9 +487,6 @@ Think through your actions and make the roleplay immersive! Please remember all \ rules aside from those without explicit exceptions apply to antagonists.") -/proc/get_roletext(role) - return role - /proc/get_nuke_code() var/nukecode = "ERROR" for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list)