diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index ca05aea9d76..25de46476da 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -112,7 +112,7 @@ log_debug("[key_name(player)] is not eligible to become a [role_text]: They are blacklisted for this role!") else if(player_is_antag(player)) log_debug("[key_name(player)] is not eligible to become a [role_text]: They are already an antagonist!") - else if(required_age && required_age > player.current.client?.player_age) + else if(establish_db_connection(dbcon) && required_age && required_age > player.current.client?.player_age) log_debug("[key_name(player)] is not eligible to become a [role_text]: Their playtime age is too low!") else candidates += player diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm index 13fdc257277..b876de0d738 100644 --- a/code/game/antagonist/antagonist_helpers.dm +++ b/code/game/antagonist/antagonist_helpers.dm @@ -3,6 +3,8 @@ return 0 if(jobban_isbanned(player.current, bantype)) return 0 + if(required_age && required_age > player.current.client.player_age) + return FALSE if(!ignore_role) if(player.assigned_role in restricted_jobs) return 0 diff --git a/code/modules/client/preference_setup/antagonism/01_candidacy.dm b/code/modules/client/preference_setup/antagonism/01_candidacy.dm index 22d62a9208c..e4eae1f4f28 100644 --- a/code/modules/client/preference_setup/antagonism/01_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/01_candidacy.dm @@ -50,6 +50,8 @@ dat += "\[IN [player_old_enough_for_role(preference_mob(), antag.bantype)] DAYS\]
" else if(is_global_banned || ban_reason) dat += "\[BANNED\]
" + else if(establish_db_connection(dbcon) && antag.required_age && antag.required_age > user.client?.player_age) + dat += "ACC TOO YOUNG
" else if(antag.role_type in pref.be_special_role) dat += "Yes / No
" else diff --git a/html/changelogs/geeves - antagonistFix.yml b/html/changelogs/geeves - antagonistFix.yml new file mode 100644 index 00000000000..99a2dffc26b --- /dev/null +++ b/html/changelogs/geeves - antagonistFix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Players with accounts too young to be antagonists now properly cannot select those roles. No more empty gamemodes." \ No newline at end of file