From 9979fc30f84bb4f926ece6248a4e63e7992fa61a Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Wed, 15 Dec 2021 09:19:05 -0800 Subject: [PATCH] [NON-MODULAR] The flavor text requirement now doesn't let you open the latejoin menu or ready up (#10063) * fuck * let's do pregame too --- code/__DEFINES/~skyrat_defines/jobs.dm | 2 ++ code/_onclick/hud/new_player.dm | 14 ++++++++++++++ code/controllers/subsystem/job.dm | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/~skyrat_defines/jobs.dm b/code/__DEFINES/~skyrat_defines/jobs.dm index 89a5f3945fd..f67ca4aab6e 100644 --- a/code/__DEFINES/~skyrat_defines/jobs.dm +++ b/code/__DEFINES/~skyrat_defines/jobs.dm @@ -7,3 +7,5 @@ #define SEC_RESTRICTED_QUIRKS "Blind" = TRUE, "Brain Tumor" = TRUE, "Deaf" = TRUE, "Paraplegic" = TRUE, "Mute" = TRUE, "Foreigner" = TRUE, "Pacifist" = TRUE, "Chunky Fingers" = TRUE #define HEAD_RESTRICTED_QUIRKS "Blind" = TRUE, "Deaf" = TRUE, "Mute" = TRUE, "Foreigner" = TRUE, "Chunky Fingers" = TRUE #define TECH_RESTRICTED_QUIRKS "Chunky Fingers" = TRUE + +#define FLAVOR_TEXT_CHAR_REQUIREMENT 150 diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index 8423819332d..34fbaf330f0 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -136,6 +136,13 @@ if(!.) return var/mob/dead/new_player/new_player = hud.mymob + + // SKYRAT EDIT BEGIN + if(length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text)) <= FLAVOR_TEXT_CHAR_REQUIREMENT) + to_chat(new_player, span_notice("You need at least [FLAVOR_TEXT_CHAR_REQUIREMENT] characters of flavor text to ready up for the round. You have [length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text))] characters.")) + return + // SKYRAT EDIT END + ready = !ready if(ready) new_player.ready = PLAYER_READY_TO_PLAY @@ -195,6 +202,13 @@ SSticker.queued_players += new_player to_chat(new_player, span_notice("You have been added to the queue to join the game. Your position in queue is [SSticker.queued_players.len].")) return + + // SKYRAT EDIT BEGIN + if(length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text)) <= FLAVOR_TEXT_CHAR_REQUIREMENT) + to_chat(new_player, span_notice("You need at least [FLAVOR_TEXT_CHAR_REQUIREMENT] characters of flavor text to join the round. You have [length_char(new_player.client.prefs.read_preference(/datum/preference/text/flavor_text))] characters.")) + return + // SKYRAT EDIT END + new_player.LateChoices() /atom/movable/screen/lobby/button/join/proc/show_join_button() diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index ed658aec803..807531f77c0 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -952,7 +952,7 @@ SUBSYSTEM_DEF(job) JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_SPECIES)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_SPECIES - if(length_char(player.client.prefs.read_preference(/datum/preference/text/flavor_text)) <= 150) + if(length_char(player.client.prefs.read_preference(/datum/preference/text/flavor_text)) <= FLAVOR_TEXT_CHAR_REQUIREMENT) JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FLAVOUR)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_FLAVOUR