diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index fea0a1b95f5..881e8967615 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -6,7 +6,7 @@ #define JOB_UNAVAILABLE_SLOTFULL 5 /// Job unavailable due to incompatibility with an antag role. #define JOB_UNAVAILABLE_ANTAG_INCOMPAT 6 - +#define JOB_UNAVAILABLE_FLAVOUR 7 // SKYRAT EDIT ADDITION #define DEFAULT_RELIGION "Christianity" #define DEFAULT_DEITY "Space Jesus" #define DEFAULT_BIBLE "Default Bible Name" diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index a976fe6c20e..3c4efcae17c 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -951,6 +951,12 @@ SUBSYSTEM_DEF(job) if(possible_job.has_banned_species(player.client.prefs)) 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) + 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 + + //SKYRAT EDIT END // Run this check after is_banned_from since it can query the DB which may sleep. diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index cb3b84cddc2..d5c004709ed 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -161,6 +161,8 @@ return "[jobtitle] is restricted from your languages." if(JOB_UNAVAILABLE_SPECIES) return "[jobtitle] is restricted from your species." + if(JOB_UNAVAILABLE_FLAVOUR) + return "[jobtitle] requires you to have flavour text for your character." //SKYRAT EDIT END if(JOB_UNAVAILABLE_ANTAG_INCOMPAT) return "[jobtitle] is not compatible with some antagonist role assigned to you."