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

[SEMI-MODULAR]Require flavour text to join the round. (#9969)

Browse Source 
* Place 1 missing distro pipe segment

* Revert "[MIRROR] Gasmaks tint and tint calculation update (Oranges approved edition) [MDB IGNORE] (#9817)"

This reverts commit d0987f545e.

* Revert "Revert "[MIRROR] Gasmaks tint and tint calculation update (Oranges approved edition) [MDB IGNORE] (#9817)""

This reverts commit df2c3caa41f60a6711ff59e290edc835154fcd9f.

* Require flavour text to enter the round.

* Update code/__DEFINES/jobs.dm

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>

* 150 min

* request for unicode

Co-authored-by: SkyratBot <skyratcommunity@gmail.com>
Co-authored-by: nevimer <foxmail@protonmail.com>
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
This commit is contained in:
nevimer
2021-12-13 10:43:09 +00:00
committed by GitHub
co-authored by Seris02 SkyratBot nevimer
parent 9db569c3ff
commit a2fb4eb5ab
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/jobs.dm
+1 -1
View File
@@ -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"
code/controllers/subsystem/job.dm
+6
View File
@@ -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.
code/modules/mob/dead/new_player/new_player.dm
+2
View File
@@ -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."