From 557ed2e43e8cc46a7043df594678296a60d777f5 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 15 Mar 2020 14:40:44 -0400 Subject: [PATCH] Update occupation.dm --- .../client/preference_setup/occupation/occupation.dm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 6e1af2f0ac0..5e36571da13 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -54,11 +54,7 @@ if(alt_title && !(alt_title in job.alt_titles)) pref.player_alt_titles -= job.title -<<<<<<< HEAD /datum/category_item/player_setup_item/occupation/content(mob/user, limit = 20, list/splitJobs = list("Pathfinder")) //VOREStation Edit -======= -/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 20, list/splitJobs = list()) ->>>>>>> 920e495... Merge pull request #6813 from Neerti/occupation_screen_fix if(!job_master) return @@ -71,12 +67,6 @@ //The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows. var/datum/job/lastJob -<<<<<<< HEAD - if (!job_master) return - for(var/datum/job/job in job_master.occupations) - if(job.latejoin_only) continue //VOREStation Code - if((++index >= limit) || (job.title in splitJobs)) -======= var/datum/department/last_department = null // Used to avoid repeating the look-ahead check for if a whole department can fit. var/list/all_valid_jobs = list() @@ -92,6 +82,7 @@ all_valid_jobs += department.jobs[J] for(var/datum/job/job in all_valid_jobs) + if(job.latejoin_only) continue //VOREStation Code var/datum/department/current_department = SSjob.get_primary_department_of_job(job) // Should we add a new column? @@ -114,7 +105,6 @@ if(make_new_column) ->>>>>>> 920e495... Merge pull request #6813 from Neerti/occupation_screen_fix /******* if((index < limit) && (lastJob != null)) //If the cells were broken up by a job in the splitJob list then it will fill in the rest of the cells with