cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] removes the last of the old job controller (#12674)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-04-13 03:11:31 -04:00
committed by GitHub
co-authored by Kashargul Cameron Lennox
parent 9894b96ffc
commit 850642c4c5
42 changed files with 1038 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/occupation/occupation.dm
+4 -4
View File
@@ -71,10 +71,10 @@
//CHOMPStation Add End
if(!(pref.player_alt_titles)) pref.player_alt_titles = new()
if(!GLOB.job_master)
if(!SSjob)
return
for(var/datum/job/job in GLOB.job_master.occupations)
for(var/datum/job/job in SSjob.occupations)
var/alt_title = pref.player_alt_titles[job.title]
if(alt_title && !(alt_title in job.alt_titles))
pref.player_alt_titles -= job.title
@@ -188,7 +188,7 @@
if("job_info")
var/rank = params["rank"]
var/datum/job/job = GLOB.job_master.GetJob(rank)
var/datum/job/job = SSjob.get_job(rank)
if(!istype(job))
return TOPIC_NOACTION
@@ -240,7 +240,7 @@
pref.player_alt_titles[job.title] = new_title
/datum/category_item/player_setup_item/occupation/proc/SetJob(mob/user, role, level)
var/datum/job/job = GLOB.job_master.GetJob(role)
var/datum/job/job = SSjob.get_job(role)
if(!job)
return 0