diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 9a05c75283021..93e64d08b36ee 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -90,6 +90,8 @@ SUBSYSTEM_DEF(job) JobDebug("AR job doesn't exist! Player: [player], Job: [job]") return FALSE JobDebug("Running AR, Player: [player], Job: [job.title], LJ: [latejoin]") + if(!player.IsJobAvailable(job)) + return FALSE if(is_banned_from(player.ckey, job.title)) JobDebug("AR isbanned failed, Player: [player], Job:[job.title]") return FALSE @@ -213,9 +215,6 @@ SUBSYSTEM_DEF(job) // If the player wants that job on this level, then try give it to him. if(player.client.prefs.job_preferences[job.title] != level) continue - // If the job isn't filled - if((job.total_positions != -1 && job.current_positions >= job.total_positions)) - continue if(job.faction == faction_rejected) continue JobDebug("DO pass, Trying to assign Player: [player], Level:[level], Job:[job.title]") diff --git a/config/config.txt b/config/config.txt index f18c32756bf4f..7ac97bde34626 100644 --- a/config/config.txt +++ b/config/config.txt @@ -153,6 +153,20 @@ NOTIFY_NEW_PLAYER_AGE 0 ## Notify admins when a new byond account connects for the first x days after its creation. (-1 for never) NOTIFY_NEW_ACCOUNT_AGE 7 +##Note: all EXP tracking/restriction require database to be enabled. + +## Unhash this to track player playtime in the database. +#USE_EXP_TRACKING + +## Allows admins to bypass job playtime requirements. +#USE_EXP_RESTRICTIONS_ADMIN_BYPASS + +## Use XP restrictions for command roles +#USE_EXP_RESTRICTIONS_COMMAND + +## Use playtime in hours restrictions for command +#USE_EXP_RESTRICTIONS_COMMAND_HOURS + ##Note: all population caps can be used with each other if desired. ## Uncomment for 'soft' population caps, players will be warned while joining if the living crew exceeds the listed number.