cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary proc get_roletext (#28520)

Browse Source
This commit is contained in:
warriorstar-orion
2025-02-24 16:04:41 +00:00
committed by GitHub
parent 041d65a626
commit c293dd3dd6
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/game_mode.dm
+5 -12
View File
@@ -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! <b>Please remember all \
rules aside from those without explicit exceptions apply to antagonists.</b>")
/proc/get_roletext(role)
return role
/proc/get_nuke_code()
var/nukecode = "ERROR"
for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list)