cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors job EXP to allow for multiple departments in restrictions (#17442)

Browse Source
This commit is contained in:
AffectedArc07
2022-02-25 09:42:15 +00:00
committed by GitHub
parent 4db2b24e41
commit cf63dda631
13 changed files with 100 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/character.dm
+3 -3
View File
@@ -2024,9 +2024,9 @@
if(jobban_isbanned(user, job.title))
html += "<del class='dark'>[rank]</del></td><td class='bad'><b> \[BANNED]</b></td></tr>"
continue
var/available_in_playtime = job.available_in_playtime(user.client)
if(available_in_playtime)
html += "<del class='dark'>[rank]</del></td><td class='bad'><b> \[[get_exp_format(available_in_playtime)] as [job.get_exp_req_type()]\]</b></td></tr>"
var/restrictions = job.get_exp_restrictions(user.client)
if(restrictions)
html += "<del class='dark'>[rank]</del></td><td class='bad'><b> \[[restrictions]]</b></td></tr>"
continue
if(job.barred_by_disability(user.client))
html += "<del class='dark'>[rank]</del></td><td class='bad'><b> \[DISABILITY\]</b></td></tr>"
code/modules/mob/new_player/new_player.dm
+14 -8
View File
@@ -253,14 +253,20 @@
/mob/new_player/proc/IsJobAvailable(rank)
var/datum/job/job = SSjobs.GetJob(rank)
if(!job) return 0
if(!job.is_position_available()) return 0
if(jobban_isbanned(src,rank)) return 0
if(!is_job_whitelisted(src, rank)) return 0
if(!job.player_old_enough(client)) return 0
if(job.admin_only && !(check_rights(R_EVENT, 0))) return 0
if(job.available_in_playtime(client))
return 0
if(!job)
return FALSE
if(!job.is_position_available())
return FALSE
if(jobban_isbanned(src, rank))
return FALSE
if(!is_job_whitelisted(src, rank))
return FALSE
if(!job.player_old_enough(client))
return FALSE
if(job.admin_only && !check_rights(R_EVENT, FALSE))
return FALSE
if(job.get_exp_restrictions(client))
return FALSE
if(GLOB.configuration.jobs.assistant_limit)
if(job.title == "Assistant")