Skip to content

Commit

Permalink
Fixes readying up bypassing exp requirements + adds the missing exp f…
Browse files Browse the repository at this point in the history
…lags to the default config (#13557)

* Fixes readying up bypassing exp requirements + adds the missing exp flags to the default config

* AssignRole should handle this check instead
  • Loading branch information
ivanmixo authored Jul 25, 2023
1 parent 24b7cca commit dcb6a6c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
5 changes: 2 additions & 3 deletions code/controllers/subsystem/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]")
Expand Down
14 changes: 14 additions & 0 deletions config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit dcb6a6c

Please sign in to comment.