diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
deleted file mode 100644
index 7a078a67970..00000000000
--- a/code/controllers/master_controller.dm
+++ /dev/null
@@ -1,42 +0,0 @@
-// old deprecated rusted piece of shit MC
-// All this does now is misc. world init stuff because too lazy to put it somewhere else
-// It used to run all of the repeating processes controlling the game but now the SMC and Process Scheduler do that
-
-var/global/datum/controller/game_controller/master_controller //Set in world.New()
-
-var/global/controller_iteration = 0
-var/global/last_tick_duration = 0
-
-var/global/air_processing_killed = 0
-var/global/pipe_processing_killed = 0
-
-/datum/controller/game_controller
- var/list/shuttle_list // For debugging and VV
-
-/datum/controller/game_controller/New()
- //There can be only one master_controller. Out with the old and in with the new.
- if(master_controller != src)
- if(istype(master_controller))
- qdel(master_controller)
- master_controller = src
-
- var/watch=0
- if(!job_master)
- watch = start_watch()
- job_master = new /datum/controller/occupations()
- job_master.SetupOccupations()
- job_master.LoadJobs("config/jobs.txt")
- log_startup_progress("Job setup complete in [stop_watch(watch)]s.")
-
- if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase()
- if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
-
-/datum/controller/game_controller/Destroy()
- ..()
- return QDEL_HINT_HARDDEL_NOW
-
-/datum/controller/game_controller/proc/setup()
- setupfactions()
- setup_economy()
-
- populate_spawn_points()
\ No newline at end of file
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 620723c3a9a..73feeecd0aa 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -14,7 +14,7 @@ SUBSYSTEM_DEF(air)
wait = 5
flags = SS_BACKGROUND
runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
-
+ var/air_processing_killed = 0
var/cost_turfs = 0
var/cost_groups = 0
var/cost_highpressure = 0
diff --git a/code/game/jobs/job_controller.dm b/code/controllers/subsystem/jobs.dm
similarity index 89%
rename from code/game/jobs/job_controller.dm
rename to code/controllers/subsystem/jobs.dm
index 0b858a744ed..3639db6bbd2 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/controllers/subsystem/jobs.dm
@@ -1,598 +1,603 @@
-
-var/global/datum/controller/occupations/job_master
-
-/datum/controller/occupations
- //List of all jobs
- var/list/occupations = list()
- var/list/name_occupations = list() //Dict of all jobs, keys are titles
- var/list/type_occupations = list() //Dict of all jobs, keys are types
- var/list/prioritized_jobs = list() // List of jobs set to priority by HoP/Captain
- //Players who need jobs
- var/list/unassigned = list()
- //Debug info
- var/list/job_debug = list()
-
-
-/datum/controller/occupations/proc/SetupOccupations(var/list/faction = list("Station"))
- occupations = list()
-
- var/list/all_jobs = subtypesof(/datum/job)
- if(!all_jobs.len)
- to_chat(world, "Error setting up jobs, no job datums found")
- return 0
-
- for(var/J in all_jobs)
- var/datum/job/job = new J()
- if(!job)
- continue
- if(!job.faction in faction)
- continue
- occupations += job
- name_occupations[job.title] = job
- type_occupations[J] = job
-
- return 1
-
-
-/datum/controller/occupations/proc/Debug(var/text)
- if(!Debug2)
- return 0
- job_debug.Add(text)
- return 1
-
-
-/datum/controller/occupations/proc/GetJob(rank)
- if(!occupations.len)
- SetupOccupations()
- return name_occupations[rank]
-
-/datum/controller/occupations/proc/GetJobType(jobtype)
- if(!occupations.len)
- SetupOccupations()
- return type_occupations[jobtype]
-
-/datum/controller/occupations/proc/GetPlayerAltTitle(mob/new_player/player, rank)
- return player.client.prefs.GetPlayerAltTitle(GetJob(rank))
-
-/datum/controller/occupations/proc/AssignRole(var/mob/new_player/player, var/rank, var/latejoin = 0)
- Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]")
- if(player && player.mind && rank)
- var/datum/job/job = GetJob(rank)
- if(!job)
- return 0
- if(jobban_isbanned(player, rank))
- return 0
- if(!job.player_old_enough(player.client))
- return 0
- if(job.available_in_playtime(player.client))
- return 0
- if(job.barred_by_disability(player.client))
- return 0
- if(!is_job_whitelisted(player, rank))
- return 0
-
- var/position_limit = job.total_positions
- if(!latejoin)
- position_limit = job.spawn_positions
-
- if((job.current_positions < position_limit) || position_limit == -1)
- Debug("Player: [player] is now Rank: [rank], JCP:[job.current_positions], JPL:[position_limit]")
- player.mind.assigned_role = rank
- player.mind.role_alt_title = GetPlayerAltTitle(player, rank)
-
- // JOB OBJECTIVES OH SHIT
- player.mind.job_objectives.Cut()
- for(var/objectiveType in job.required_objectives)
- new objectiveType(player.mind)
-
- // 50/50 chance of getting optional objectives.
- for(var/objectiveType in job.optional_objectives)
- if(prob(50))
- new objectiveType(player.mind)
-
- unassigned -= player
- job.current_positions++
- return 1
-
- Debug("AR has failed, Player: [player], Rank: [rank]")
- return 0
-
-/datum/controller/occupations/proc/FreeRole(var/rank) //making additional slot on the fly
- var/datum/job/job = GetJob(rank)
- if(job && job.current_positions >= job.total_positions && job.total_positions != -1)
- job.total_positions++
- return 1
- return 0
-
-/datum/controller/occupations/proc/FindOccupationCandidates(datum/job/job, level, flag)
- Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]")
- var/list/candidates = list()
- for(var/mob/new_player/player in unassigned)
- Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] AvInPlaytime: [job.available_in_playtime(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
- if(jobban_isbanned(player, job.title))
- Debug("FOC isbanned failed, Player: [player]")
- continue
- if(!job.player_old_enough(player.client))
- Debug("FOC player not old enough, Player: [player]")
- continue
- if(job.available_in_playtime(player.client))
- Debug("FOC player not enough playtime, Player: [player]")
- continue
- if(job.barred_by_disability(player.client))
- Debug("FOC player has disability rendering them ineligible for job, Player: [player]")
- continue
- if(flag && !(flag in player.client.prefs.be_special))
- Debug("FOC flag failed, Player: [player], Flag: [flag], ")
- continue
- if(player.mind && job.title in player.mind.restricted_roles)
- Debug("FOC incompatbile with antagonist role, Player: [player]")
- continue
- if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
- Debug("FOC pass, Player: [player], Level:[level]")
- candidates += player
- return candidates
-
-/datum/controller/occupations/proc/GiveRandomJob(var/mob/new_player/player)
- Debug("GRJ Giving random job, Player: [player]")
- for(var/datum/job/job in shuffle(occupations))
- if(!job)
- continue
-
- if(istype(job, GetJob("Civilian"))) // We don't want to give him assistant, that's boring!
- continue
-
- if(job.title in command_positions) //If you want a command position, select it!
- continue
-
- if(job.title in whitelisted_positions) // No random whitelisted job, sorry!
- continue
-
- if(job.admin_only) // No admin positions either.
- continue
-
- if(jobban_isbanned(player, job.title))
- Debug("GRJ isbanned failed, Player: [player], Job: [job.title]")
- continue
-
- if(!job.player_old_enough(player.client))
- Debug("GRJ player not old enough, Player: [player]")
- continue
-
- if(job.available_in_playtime(player.client))
- Debug("GRJ player not enough playtime, Player: [player]")
- continue
-
- if(job.barred_by_disability(player.client))
- Debug("GRJ player has disability rendering them ineligible for job, Player: [player]")
- continue
-
- if(player.mind && job.title in player.mind.restricted_roles)
- Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
- continue
-
- if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
- Debug("GRJ Random job given, Player: [player], Job: [job]")
- AssignRole(player, job.title)
- unassigned -= player
- break
-
-/datum/controller/occupations/proc/ResetOccupations()
- for(var/mob/new_player/player in GLOB.player_list)
- if((player) && (player.mind))
- player.mind.assigned_role = null
- player.mind.special_role = null
- SetupOccupations()
- unassigned = list()
- return
-
-
-///This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until it locates a head or runs out of levels to check
-/datum/controller/occupations/proc/FillHeadPosition()
- for(var/level = 1 to 3)
- for(var/command_position in command_positions)
- var/datum/job/job = GetJob(command_position)
- if(!job)
- continue
- var/list/candidates = FindOccupationCandidates(job, level)
- if(!candidates.len)
- continue
-
- var/list/filteredCandidates = list()
-
- for(var/mob/V in candidates)
- // Log-out during round-start? What a bad boy, no head position for you!
- if(!V.client)
- continue
- filteredCandidates += V
-
- if(!filteredCandidates.len)
- continue
-
- var/mob/new_player/candidate = pick(filteredCandidates)
- if(AssignRole(candidate, command_position))
- return 1
-
- return 0
-
-
-///This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level
-/datum/controller/occupations/proc/CheckHeadPositions(var/level)
- for(var/command_position in command_positions)
- var/datum/job/job = GetJob(command_position)
- if(!job)
- continue
- var/list/candidates = FindOccupationCandidates(job, level)
- if(!candidates.len)
- continue
- var/mob/new_player/candidate = pick(candidates)
- AssignRole(candidate, command_position)
-
-
-/datum/controller/occupations/proc/FillAIPosition()
- if(config && !config.allow_ai)
- return 0
-
- var/ai_selected = 0
- var/datum/job/job = GetJob("AI")
- if(!job)
- return 0
-
- for(var/i = job.total_positions, i > 0, i--)
- for(var/level = 1 to 3)
- var/list/candidates = list()
- candidates = FindOccupationCandidates(job, level)
- if(candidates.len)
- var/mob/new_player/candidate = pick(candidates)
- if(AssignRole(candidate, "AI"))
- ai_selected++
- break
-
- if(ai_selected)
- return 1
-
- return 0
-
-
-/** Proc DivideOccupations
-* fills var "assigned_role" for all ready players.
-* This proc must not have any side effect besides of modifying "assigned_role".
-**/
-/datum/controller/occupations/proc/DivideOccupations()
- //Setup new player list and get the jobs list
- Debug("Running DO")
- SetupOccupations()
-
- //Holder for Triumvirate is stored in the ticker, this just processes it
- if(ticker)
- for(var/datum/job/ai/A in occupations)
- if(ticker.triai)
- A.spawn_positions = 3
-
- //Get the players who are ready
- for(var/mob/new_player/player in GLOB.player_list)
- if(player.ready && player.mind && !player.mind.assigned_role)
- unassigned += player
- if(player.client.prefs.randomslot)
- player.client.prefs.load_random_character_slot(player.client)
-
- Debug("DO, Len: [unassigned.len]")
- if(unassigned.len == 0)
- return 0
-
- //Shuffle players and jobs
- unassigned = shuffle(unassigned)
-
- HandleFeedbackGathering()
-
- //People who wants to be assistants, sure, go on.
- Debug("DO, Running Civilian Check 1")
- var/datum/job/civ = new /datum/job/civilian()
- var/list/civilian_candidates = FindOccupationCandidates(civ, 3)
- Debug("AC1, Candidates: [civilian_candidates.len]")
- for(var/mob/new_player/player in civilian_candidates)
- Debug("AC1 pass, Player: [player]")
- AssignRole(player, "Civilian")
- civilian_candidates -= player
- Debug("DO, AC1 end")
-
- //Select one head
- Debug("DO, Running Head Check")
- FillHeadPosition()
- Debug("DO, Head Check end")
-
- //Check for an AI
- Debug("DO, Running AI Check")
- FillAIPosition()
- Debug("DO, AI Check end")
-
- //Other jobs are now checked
- Debug("DO, Running Standard Check")
-
-
- // New job giving system by Donkie
- // This will cause lots of more loops, but since it's only done once it shouldn't really matter much at all.
- // Hopefully this will add more randomness and fairness to job giving.
-
- // Loop through all levels from high to low
- var/list/shuffledoccupations = shuffle(occupations)
- for(var/level = 1 to 3)
- //Check the head jobs first each level
- CheckHeadPositions(level)
-
- // Loop through all unassigned players
- for(var/mob/new_player/player in unassigned)
-
- // Loop through all jobs
- for(var/datum/job/job in shuffledoccupations) // SHUFFLE ME BABY
- if(!job)
- continue
-
- if(jobban_isbanned(player, job.title))
- Debug("DO isbanned failed, Player: [player], Job:[job.title]")
- continue
-
- if(!job.player_old_enough(player.client))
- Debug("DO player not old enough, Player: [player], Job:[job.title]")
- continue
-
- if(job.available_in_playtime(player.client))
- Debug("DO player not enough playtime, Player: [player], Job:[job.title]")
- continue
-
- if(job.barred_by_disability(player.client))
- Debug("DO player has disability rendering them ineligible for job, Player: [player], Job:[job.title]")
- continue
-
- if(player.mind && job.title in player.mind.restricted_roles)
- Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
- continue
-
- if(!is_job_whitelisted(player, job.title))
- Debug("DO player not whitelisted, Player: [player], Job:[job.title]")
- continue
-
- // If the player wants that job on this level, then try give it to him.
- if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
-
- // If the job isn't filled
- if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
- Debug("DO pass, Player: [player], Level:[level], Job:[job.title]")
- Debug(" - Job Flag: [job.flag] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Current Pos: [job.current_positions] Job Spawn Positions = [job.spawn_positions]")
- AssignRole(player, job.title)
- unassigned -= player
- break
-
- // Hand out random jobs to the people who didn't get any in the last check
- // Also makes sure that they got their preference correct
- for(var/mob/new_player/player in unassigned)
- if(player.client.prefs.alternate_option == GET_RANDOM_JOB)
- GiveRandomJob(player)
-
- Debug("DO, Standard Check end")
-
- Debug("DO, Running AC2")
-
- // Antags, who have to get in, come first
- for(var/mob/new_player/player in unassigned)
- if(player.mind.special_role)
- GiveRandomJob(player)
- if(player in unassigned)
- AssignRole(player, "Civilian")
-
- // Then we assign what we can to everyone else.
- for(var/mob/new_player/player in unassigned)
- if(player.client.prefs.alternate_option == BE_ASSISTANT)
- Debug("AC2 Assistant located, Player: [player]")
- AssignRole(player, "Civilian")
- else if(player.client.prefs.alternate_option == RETURN_TO_LOBBY)
- player.ready = 0
- unassigned -= player
-
- return 1
-
-/datum/controller/occupations/proc/AssignRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0)
- if(!H)
- return null
- var/datum/job/job = GetJob(rank)
-
- H.job = rank
-
- var/alt_title = null
-
- if(H.mind)
- H.mind.assigned_role = rank
- alt_title = H.mind.role_alt_title
-
- CreateMoneyAccount(H, rank, job)
-
- to_chat(H, "You are the [alt_title ? alt_title : rank].")
- to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.")
- to_chat(H, "For more information on how the station works, see Standard Operating Procedure (SOP)")
- if(job.is_service)
- to_chat(H, "As a member of Service, make sure to read up on your Department SOP")
- if(job.is_supply)
- to_chat(H, "As a member of Supply, make sure to read up on your Department SOP")
- if(job.is_command)
- to_chat(H, "As an important member of Command, read up on your Department SOP")
- if(job.is_legal)
- to_chat(H, "Your job requires complete knowledge of Space Law and Legal Standard Operating Procedure")
- if(job.is_engineering)
- to_chat(H, "As a member of Engineering, make sure to read up on your Department SOP")
- if(job.is_medical)
- to_chat(H, "As a member of Medbay, make sure to read up on your Department SOP")
- if(job.is_science)
- to_chat(H, "As a member of Science, make sure to read up on your Department SOP")
- if(job.is_security)
- to_chat(H, "As a member of Security, you are to know Space Law, Legal Standard Operating Procedure, as well as your Department SOP")
- if(job.req_admin_notify)
- to_chat(H, "You are playing a job that is important for the game progression. If you have to disconnect, please notify the admins via adminhelp.")
-
- return H
-/datum/controller/occupations/proc/EquipRank(mob/living/carbon/human/H, rank, joined_late = 0) // Equip and put them in an area
- if(!H)
- return null
-
- var/datum/job/job = GetJob(rank)
-
- H.job = rank
-
- if(!joined_late)
- var/turf/T = null
- var/obj/S = null
- for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list)
- if(sloc.name != rank)
- continue
- if(locate(/mob/living) in sloc.loc)
- continue
- S = sloc
- break
- if(!S)
- S = locate("start*[rank]") // use old stype
- if(!S) // still no spawn, fall back to the arrivals shuttle
- for(var/turf/TS in get_area_turfs(/area/shuttle/arrival))
- if(!TS.density)
- var/clear = 1
- for(var/obj/O in TS)
- if(O.density)
- clear = 0
- break
- if(clear)
- T = TS
- continue
-
- if(isturf(S))
- T = S
- else if(istype(S, /obj/effect/landmark/start) && isturf(S.loc))
- T = S.loc
-
- if(T)
- H.loc = T
- // Moving wheelchair if they have one
- if(H.buckled && istype(H.buckled, /obj/structure/chair/wheelchair))
- H.buckled.loc = H.loc
- H.buckled.dir = H.dir
-
- if(job)
- var/new_mob = job.equip(H)
- if(ismob(new_mob))
- H = new_mob
-
- if(job && H)
- job.after_spawn(H)
-
- //Gives glasses to the vision impaired
- if(H.disabilities & DISABILITY_FLAG_NEARSIGHTED)
- var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), slot_glasses)
- if(equipped != 1)
- var/obj/item/clothing/glasses/G = H.glasses
- if(istype(G) && !G.prescription)
- G.prescription = 1
- G.name = "prescription [G.name]"
- return H
-
-
-
-
-
-/datum/controller/occupations/proc/LoadJobs(jobsfile) //ran during round setup, reads info from jobs.txt -- Urist
- if(!config.load_jobs_from_txt)
- return 0
-
- var/list/jobEntries = file2list(jobsfile)
-
- for(var/job in jobEntries)
- if(!job)
- continue
-
- job = trim(job)
- if(!length(job))
- continue
-
- var/pos = findtext(job, "=")
- var/name = null
- var/value = null
-
- if(pos)
- name = copytext(job, 1, pos)
- value = copytext(job, pos + 1)
- else
- continue
-
- if(name && value)
- var/datum/job/J = GetJob(name)
- if(!J) continue
- J.total_positions = text2num(value)
- J.spawn_positions = text2num(value)
- if(name == "AI" || name == "Cyborg")//I dont like this here but it will do for now
- J.total_positions = 0
-
- return 1
-
-
-/datum/controller/occupations/proc/HandleFeedbackGathering()
- for(var/datum/job/job in occupations)
- var/tmp_str = "|[job.title]|"
-
- var/level1 = 0 //high
- var/level2 = 0 //medium
- var/level3 = 0 //low
- var/level4 = 0 //never
- var/level5 = 0 //banned
- var/level6 = 0 //account too young
- var/level7 = 0 //has disability rendering them ineligible
- for(var/mob/new_player/player in GLOB.player_list)
- if(!(player.ready && player.mind && !player.mind.assigned_role))
- continue //This player is not ready
- if(jobban_isbanned(player, job.title))
- level5++
- continue
- if(!job.player_old_enough(player.client))
- level6++
- continue
- if(job.available_in_playtime(player.client))
- level6++
- continue
- if(job.barred_by_disability(player.client))
- level7++
- continue
- if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
- level1++
- else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
- level2++
- else if(player.client.prefs.GetJobDepartment(job, 3) & job.flag)
- level3++
- else level4++ //not selected
-
- tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|DISABILITY=[level7]|-"
- feedback_add_details("job_preferences",tmp_str)
-
-
-/datum/controller/occupations/proc/CreateMoneyAccount(mob/living/H, rank, datum/job/job)
- var/datum/money_account/M = create_account(H.real_name, rand(50,500)*10, null)
- var/remembered_info = ""
-
- remembered_info += "Your account number is: #[M.account_number]
"
- remembered_info += "Your account pin is: [M.remote_access_pin]
"
- remembered_info += "Your account funds are: $[M.money]
"
-
- if(M.transaction_log.len)
- var/datum/transaction/T = M.transaction_log[1]
- remembered_info += "Your account was created: [T.time], [T.date] at [T.source_terminal]
"
- H.mind.store_memory(remembered_info)
-
- // If they're head, give them the account info for their department
- if(job && job.head_position)
- remembered_info = ""
- var/datum/money_account/department_account = department_accounts[job.department]
-
- if(department_account)
- remembered_info += "Your department's account number is: #[department_account.account_number]
"
- remembered_info += "Your department's account pin is: [department_account.remote_access_pin]
"
- remembered_info += "Your department's account funds are: $[department_account.money]
"
-
- H.mind.store_memory(remembered_info)
-
- H.mind.initial_account = M
-
- spawn(0)
- to_chat(H, "Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]")
+SUBSYSTEM_DEF(jobs)
+ name = "Jobs"
+ init_order = INIT_ORDER_JOBS // 12
+ flags = SS_NO_FIRE
+
+ //List of all jobs
+ var/list/occupations = list()
+ var/list/name_occupations = list() //Dict of all jobs, keys are titles
+ var/list/type_occupations = list() //Dict of all jobs, keys are types
+ var/list/prioritized_jobs = list() // List of jobs set to priority by HoP/Captain
+ //Players who need jobs
+ var/list/unassigned = list()
+ //Debug info
+ var/list/job_debug = list()
+
+/datum/controller/subsystem/jobs/Initialize(timeofday)
+ if(!occupations.len)
+ SetupOccupations()
+ LoadJobs("config/jobs.txt")
+ ..()
+
+/datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station"))
+ occupations = list()
+ var/list/all_jobs = subtypesof(/datum/job)
+ if(!all_jobs.len)
+ to_chat(world, "Error setting up jobs, no job datums found")
+ return 0
+
+ for(var/J in all_jobs)
+ var/datum/job/job = new J()
+ if(!job)
+ continue
+ if(!job.faction in faction)
+ continue
+ occupations += job
+ name_occupations[job.title] = job
+ type_occupations[J] = job
+
+ return 1
+
+
+/datum/controller/subsystem/jobs/proc/Debug(var/text)
+ if(!Debug2)
+ return 0
+ job_debug.Add(text)
+ return 1
+
+
+/datum/controller/subsystem/jobs/proc/GetJob(rank)
+ if(!occupations.len)
+ SetupOccupations()
+ return name_occupations[rank]
+
+/datum/controller/subsystem/jobs/proc/GetJobType(jobtype)
+ if(!occupations.len)
+ SetupOccupations()
+ return type_occupations[jobtype]
+
+/datum/controller/subsystem/jobs/proc/GetPlayerAltTitle(mob/new_player/player, rank)
+ return player.client.prefs.GetPlayerAltTitle(GetJob(rank))
+
+/datum/controller/subsystem/jobs/proc/AssignRole(var/mob/new_player/player, var/rank, var/latejoin = 0)
+ Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]")
+ if(player && player.mind && rank)
+ var/datum/job/job = GetJob(rank)
+ if(!job)
+ return 0
+ if(jobban_isbanned(player, rank))
+ return 0
+ if(!job.player_old_enough(player.client))
+ return 0
+ if(job.available_in_playtime(player.client))
+ return 0
+ if(job.barred_by_disability(player.client))
+ return 0
+ if(!is_job_whitelisted(player, rank))
+ return 0
+
+ var/position_limit = job.total_positions
+ if(!latejoin)
+ position_limit = job.spawn_positions
+
+ if((job.current_positions < position_limit) || position_limit == -1)
+ Debug("Player: [player] is now Rank: [rank], JCP:[job.current_positions], JPL:[position_limit]")
+ player.mind.assigned_role = rank
+ player.mind.role_alt_title = GetPlayerAltTitle(player, rank)
+
+ // JOB OBJECTIVES OH SHIT
+ player.mind.job_objectives.Cut()
+ for(var/objectiveType in job.required_objectives)
+ new objectiveType(player.mind)
+
+ // 50/50 chance of getting optional objectives.
+ for(var/objectiveType in job.optional_objectives)
+ if(prob(50))
+ new objectiveType(player.mind)
+
+ unassigned -= player
+ job.current_positions++
+ return 1
+
+ Debug("AR has failed, Player: [player], Rank: [rank]")
+ return 0
+
+/datum/controller/subsystem/jobs/proc/FreeRole(var/rank) //making additional slot on the fly
+ var/datum/job/job = GetJob(rank)
+ if(job && job.current_positions >= job.total_positions && job.total_positions != -1)
+ job.total_positions++
+ return 1
+ return 0
+
+/datum/controller/subsystem/jobs/proc/FindOccupationCandidates(datum/job/job, level, flag)
+ Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]")
+ var/list/candidates = list()
+ for(var/mob/new_player/player in unassigned)
+ Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] AvInPlaytime: [job.available_in_playtime(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
+ if(jobban_isbanned(player, job.title))
+ Debug("FOC isbanned failed, Player: [player]")
+ continue
+ if(!job.player_old_enough(player.client))
+ Debug("FOC player not old enough, Player: [player]")
+ continue
+ if(job.available_in_playtime(player.client))
+ Debug("FOC player not enough playtime, Player: [player]")
+ continue
+ if(job.barred_by_disability(player.client))
+ Debug("FOC player has disability rendering them ineligible for job, Player: [player]")
+ continue
+ if(flag && !(flag in player.client.prefs.be_special))
+ Debug("FOC flag failed, Player: [player], Flag: [flag], ")
+ continue
+ if(player.mind && job.title in player.mind.restricted_roles)
+ Debug("FOC incompatbile with antagonist role, Player: [player]")
+ continue
+ if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
+ Debug("FOC pass, Player: [player], Level:[level]")
+ candidates += player
+ return candidates
+
+/datum/controller/subsystem/jobs/proc/GiveRandomJob(var/mob/new_player/player)
+ Debug("GRJ Giving random job, Player: [player]")
+ for(var/datum/job/job in shuffle(occupations))
+ if(!job)
+ continue
+
+ if(istype(job, GetJob("Civilian"))) // We don't want to give him assistant, that's boring!
+ continue
+
+ if(job.title in command_positions) //If you want a command position, select it!
+ continue
+
+ if(job.title in whitelisted_positions) // No random whitelisted job, sorry!
+ continue
+
+ if(job.admin_only) // No admin positions either.
+ continue
+
+ if(jobban_isbanned(player, job.title))
+ Debug("GRJ isbanned failed, Player: [player], Job: [job.title]")
+ continue
+
+ if(!job.player_old_enough(player.client))
+ Debug("GRJ player not old enough, Player: [player]")
+ continue
+
+ if(job.available_in_playtime(player.client))
+ Debug("GRJ player not enough playtime, Player: [player]")
+ continue
+
+ if(job.barred_by_disability(player.client))
+ Debug("GRJ player has disability rendering them ineligible for job, Player: [player]")
+ continue
+
+ if(player.mind && job.title in player.mind.restricted_roles)
+ Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
+ continue
+
+ if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
+ Debug("GRJ Random job given, Player: [player], Job: [job]")
+ AssignRole(player, job.title)
+ unassigned -= player
+ break
+
+/datum/controller/subsystem/jobs/proc/ResetOccupations()
+ for(var/mob/new_player/player in GLOB.player_list)
+ if((player) && (player.mind))
+ player.mind.assigned_role = null
+ player.mind.special_role = null
+ SetupOccupations()
+ unassigned = list()
+ return
+
+
+///This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until it locates a head or runs out of levels to check
+/datum/controller/subsystem/jobs/proc/FillHeadPosition()
+ for(var/level = 1 to 3)
+ for(var/command_position in command_positions)
+ var/datum/job/job = GetJob(command_position)
+ if(!job)
+ continue
+ var/list/candidates = FindOccupationCandidates(job, level)
+ if(!candidates.len)
+ continue
+
+ var/list/filteredCandidates = list()
+
+ for(var/mob/V in candidates)
+ // Log-out during round-start? What a bad boy, no head position for you!
+ if(!V.client)
+ continue
+ filteredCandidates += V
+
+ if(!filteredCandidates.len)
+ continue
+
+ var/mob/new_player/candidate = pick(filteredCandidates)
+ if(AssignRole(candidate, command_position))
+ return 1
+
+ return 0
+
+
+///This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level
+/datum/controller/subsystem/jobs/proc/CheckHeadPositions(var/level)
+ for(var/command_position in command_positions)
+ var/datum/job/job = GetJob(command_position)
+ if(!job)
+ continue
+ var/list/candidates = FindOccupationCandidates(job, level)
+ if(!candidates.len)
+ continue
+ var/mob/new_player/candidate = pick(candidates)
+ AssignRole(candidate, command_position)
+
+
+/datum/controller/subsystem/jobs/proc/FillAIPosition()
+ if(config && !config.allow_ai)
+ return 0
+
+ var/ai_selected = 0
+ var/datum/job/job = GetJob("AI")
+ if(!job)
+ return 0
+
+ for(var/i = job.total_positions, i > 0, i--)
+ for(var/level = 1 to 3)
+ var/list/candidates = list()
+ candidates = FindOccupationCandidates(job, level)
+ if(candidates.len)
+ var/mob/new_player/candidate = pick(candidates)
+ if(AssignRole(candidate, "AI"))
+ ai_selected++
+ break
+
+ if(ai_selected)
+ return 1
+
+ return 0
+
+
+/** Proc DivideOccupations
+* fills var "assigned_role" for all ready players.
+* This proc must not have any side effect besides of modifying "assigned_role".
+**/
+/datum/controller/subsystem/jobs/proc/DivideOccupations()
+ //Setup new player list and get the jobs list
+ Debug("Running DO")
+ SetupOccupations()
+
+ //Holder for Triumvirate is stored in the ticker, this just processes it
+ if(ticker)
+ for(var/datum/job/ai/A in occupations)
+ if(ticker.triai)
+ A.spawn_positions = 3
+
+ //Get the players who are ready
+ for(var/mob/new_player/player in GLOB.player_list)
+ if(player.ready && player.mind && !player.mind.assigned_role)
+ unassigned += player
+ if(player.client.prefs.randomslot)
+ player.client.prefs.load_random_character_slot(player.client)
+
+ Debug("DO, Len: [unassigned.len]")
+ if(unassigned.len == 0)
+ return 0
+
+ //Shuffle players and jobs
+ unassigned = shuffle(unassigned)
+
+ HandleFeedbackGathering()
+
+ //People who wants to be assistants, sure, go on.
+ Debug("DO, Running Civilian Check 1")
+ var/datum/job/civ = new /datum/job/civilian()
+ var/list/civilian_candidates = FindOccupationCandidates(civ, 3)
+ Debug("AC1, Candidates: [civilian_candidates.len]")
+ for(var/mob/new_player/player in civilian_candidates)
+ Debug("AC1 pass, Player: [player]")
+ AssignRole(player, "Civilian")
+ civilian_candidates -= player
+ Debug("DO, AC1 end")
+
+ //Select one head
+ Debug("DO, Running Head Check")
+ FillHeadPosition()
+ Debug("DO, Head Check end")
+
+ //Check for an AI
+ Debug("DO, Running AI Check")
+ FillAIPosition()
+ Debug("DO, AI Check end")
+
+ //Other jobs are now checked
+ Debug("DO, Running Standard Check")
+
+
+ // New job giving system by Donkie
+ // This will cause lots of more loops, but since it's only done once it shouldn't really matter much at all.
+ // Hopefully this will add more randomness and fairness to job giving.
+
+ // Loop through all levels from high to low
+ var/list/shuffledoccupations = shuffle(occupations)
+ for(var/level = 1 to 3)
+ //Check the head jobs first each level
+ CheckHeadPositions(level)
+
+ // Loop through all unassigned players
+ for(var/mob/new_player/player in unassigned)
+
+ // Loop through all jobs
+ for(var/datum/job/job in shuffledoccupations) // SHUFFLE ME BABY
+ if(!job)
+ continue
+
+ if(jobban_isbanned(player, job.title))
+ Debug("DO isbanned failed, Player: [player], Job:[job.title]")
+ continue
+
+ if(!job.player_old_enough(player.client))
+ Debug("DO player not old enough, Player: [player], Job:[job.title]")
+ continue
+
+ if(job.available_in_playtime(player.client))
+ Debug("DO player not enough playtime, Player: [player], Job:[job.title]")
+ continue
+
+ if(job.barred_by_disability(player.client))
+ Debug("DO player has disability rendering them ineligible for job, Player: [player], Job:[job.title]")
+ continue
+
+ if(player.mind && job.title in player.mind.restricted_roles)
+ Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
+ continue
+
+ if(!is_job_whitelisted(player, job.title))
+ Debug("DO player not whitelisted, Player: [player], Job:[job.title]")
+ continue
+
+ // If the player wants that job on this level, then try give it to him.
+ if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
+
+ // If the job isn't filled
+ if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
+ Debug("DO pass, Player: [player], Level:[level], Job:[job.title]")
+ Debug(" - Job Flag: [job.flag] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Current Pos: [job.current_positions] Job Spawn Positions = [job.spawn_positions]")
+ AssignRole(player, job.title)
+ unassigned -= player
+ break
+
+ // Hand out random jobs to the people who didn't get any in the last check
+ // Also makes sure that they got their preference correct
+ for(var/mob/new_player/player in unassigned)
+ if(player.client.prefs.alternate_option == GET_RANDOM_JOB)
+ GiveRandomJob(player)
+
+ Debug("DO, Standard Check end")
+
+ Debug("DO, Running AC2")
+
+ // Antags, who have to get in, come first
+ for(var/mob/new_player/player in unassigned)
+ if(player.mind.special_role)
+ GiveRandomJob(player)
+ if(player in unassigned)
+ AssignRole(player, "Civilian")
+
+ // Then we assign what we can to everyone else.
+ for(var/mob/new_player/player in unassigned)
+ if(player.client.prefs.alternate_option == BE_ASSISTANT)
+ Debug("AC2 Assistant located, Player: [player]")
+ AssignRole(player, "Civilian")
+ else if(player.client.prefs.alternate_option == RETURN_TO_LOBBY)
+ player.ready = 0
+ unassigned -= player
+
+ return 1
+
+/datum/controller/subsystem/jobs/proc/AssignRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0)
+ if(!H)
+ return null
+ var/datum/job/job = GetJob(rank)
+
+ H.job = rank
+
+ var/alt_title = null
+
+ if(H.mind)
+ H.mind.assigned_role = rank
+ alt_title = H.mind.role_alt_title
+
+ CreateMoneyAccount(H, rank, job)
+
+ to_chat(H, "You are the [alt_title ? alt_title : rank].")
+ to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.")
+ to_chat(H, "For more information on how the station works, see Standard Operating Procedure (SOP)")
+ if(job.is_service)
+ to_chat(H, "As a member of Service, make sure to read up on your Department SOP")
+ if(job.is_supply)
+ to_chat(H, "As a member of Supply, make sure to read up on your Department SOP")
+ if(job.is_command)
+ to_chat(H, "As an important member of Command, read up on your Department SOP")
+ if(job.is_legal)
+ to_chat(H, "Your job requires complete knowledge of Space Law and Legal Standard Operating Procedure")
+ if(job.is_engineering)
+ to_chat(H, "As a member of Engineering, make sure to read up on your Department SOP")
+ if(job.is_medical)
+ to_chat(H, "As a member of Medbay, make sure to read up on your Department SOP")
+ if(job.is_science)
+ to_chat(H, "As a member of Science, make sure to read up on your Department SOP")
+ if(job.is_security)
+ to_chat(H, "As a member of Security, you are to know Space Law, Legal Standard Operating Procedure, as well as your Department SOP")
+ if(job.req_admin_notify)
+ to_chat(H, "You are playing a job that is important for the game progression. If you have to disconnect, please notify the admins via adminhelp.")
+
+ return H
+/datum/controller/subsystem/jobs/proc/EquipRank(mob/living/carbon/human/H, rank, joined_late = 0) // Equip and put them in an area
+ if(!H)
+ return null
+
+ var/datum/job/job = GetJob(rank)
+
+ H.job = rank
+
+ if(!joined_late)
+ var/turf/T = null
+ var/obj/S = null
+ for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list)
+ if(sloc.name != rank)
+ continue
+ if(locate(/mob/living) in sloc.loc)
+ continue
+ S = sloc
+ break
+ if(!S)
+ S = locate("start*[rank]") // use old stype
+ if(!S) // still no spawn, fall back to the arrivals shuttle
+ for(var/turf/TS in get_area_turfs(/area/shuttle/arrival))
+ if(!TS.density)
+ var/clear = 1
+ for(var/obj/O in TS)
+ if(O.density)
+ clear = 0
+ break
+ if(clear)
+ T = TS
+ continue
+
+ if(isturf(S))
+ T = S
+ else if(istype(S, /obj/effect/landmark/start) && isturf(S.loc))
+ T = S.loc
+
+ if(T)
+ H.loc = T
+ // Moving wheelchair if they have one
+ if(H.buckled && istype(H.buckled, /obj/structure/chair/wheelchair))
+ H.buckled.loc = H.loc
+ H.buckled.dir = H.dir
+
+ if(job)
+ var/new_mob = job.equip(H)
+ if(ismob(new_mob))
+ H = new_mob
+
+ if(job && H)
+ job.after_spawn(H)
+
+ //Gives glasses to the vision impaired
+ if(H.disabilities & DISABILITY_FLAG_NEARSIGHTED)
+ var/equipped = H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), slot_glasses)
+ if(equipped != 1)
+ var/obj/item/clothing/glasses/G = H.glasses
+ if(istype(G) && !G.prescription)
+ G.prescription = 1
+ G.name = "prescription [G.name]"
+ return H
+
+
+
+
+
+/datum/controller/subsystem/jobs/proc/LoadJobs(jobsfile) //ran during round setup, reads info from jobs.txt -- Urist
+ if(!config.load_jobs_from_txt)
+ return 0
+
+ var/list/jobEntries = file2list(jobsfile)
+
+ for(var/job in jobEntries)
+ if(!job)
+ continue
+
+ job = trim(job)
+ if(!length(job))
+ continue
+
+ var/pos = findtext(job, "=")
+ var/name = null
+ var/value = null
+
+ if(pos)
+ name = copytext(job, 1, pos)
+ value = copytext(job, pos + 1)
+ else
+ continue
+
+ if(name && value)
+ var/datum/job/J = GetJob(name)
+ if(!J) continue
+ J.total_positions = text2num(value)
+ J.spawn_positions = text2num(value)
+ if(name == "AI" || name == "Cyborg")//I dont like this here but it will do for now
+ J.total_positions = 0
+
+ return 1
+
+
+/datum/controller/subsystem/jobs/proc/HandleFeedbackGathering()
+ for(var/datum/job/job in occupations)
+ var/tmp_str = "|[job.title]|"
+
+ var/level1 = 0 //high
+ var/level2 = 0 //medium
+ var/level3 = 0 //low
+ var/level4 = 0 //never
+ var/level5 = 0 //banned
+ var/level6 = 0 //account too young
+ var/level7 = 0 //has disability rendering them ineligible
+ for(var/mob/new_player/player in GLOB.player_list)
+ if(!(player.ready && player.mind && !player.mind.assigned_role))
+ continue //This player is not ready
+ if(jobban_isbanned(player, job.title))
+ level5++
+ continue
+ if(!job.player_old_enough(player.client))
+ level6++
+ continue
+ if(job.available_in_playtime(player.client))
+ level6++
+ continue
+ if(job.barred_by_disability(player.client))
+ level7++
+ continue
+ if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
+ level1++
+ else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
+ level2++
+ else if(player.client.prefs.GetJobDepartment(job, 3) & job.flag)
+ level3++
+ else level4++ //not selected
+
+ tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|DISABILITY=[level7]|-"
+ feedback_add_details("job_preferences",tmp_str)
+
+
+/datum/controller/subsystem/jobs/proc/CreateMoneyAccount(mob/living/H, rank, datum/job/job)
+ var/datum/money_account/M = create_account(H.real_name, rand(50,500)*10, null)
+ var/remembered_info = ""
+
+ remembered_info += "Your account number is: #[M.account_number]
"
+ remembered_info += "Your account pin is: [M.remote_access_pin]
"
+ remembered_info += "Your account funds are: $[M.money]
"
+
+ if(M.transaction_log.len)
+ var/datum/transaction/T = M.transaction_log[1]
+ remembered_info += "Your account was created: [T.time], [T.date] at [T.source_terminal]
"
+ H.mind.store_memory(remembered_info)
+
+ // If they're head, give them the account info for their department
+ if(job && job.head_position)
+ remembered_info = ""
+ var/datum/money_account/department_account = department_accounts[job.department]
+
+ if(department_account)
+ remembered_info += "Your department's account number is: #[department_account.account_number]
"
+ remembered_info += "Your department's account pin is: [department_account.remote_access_pin]
"
+ remembered_info += "Your department's account funds are: $[department_account.money]
"
+
+ H.mind.store_memory(remembered_info)
+
+ H.mind.initial_account = M
+
+ spawn(0)
+ to_chat(H, "Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]")
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index 88c4f9f4ea9..b57f9e11cc2 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -17,8 +17,7 @@
message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.")
return
-/client/proc/debug_controller(controller in list("Master",
- "failsafe","Scheduler","StonedMaster","Ticker","Air","Jobs","Sun","Radio","Configuration","pAI",
+/client/proc/debug_controller(controller in list("failsafe","Scheduler","StonedMaster","Ticker","Air","Jobs","Sun","Radio","Configuration","pAI",
"Cameras","Garbage", "Transfer Controller","Event","Alarm","Nano","Vote","Fires",
"Mob","NPC AI","Shuttle","Timer","Weather","Space","Mob Hunt Server"))
set category = "Debug"
@@ -27,9 +26,6 @@
if(!holder) return
switch(controller)
- if("Master")
- debug_variables(master_controller)
- feedback_add_details("admin_verb","DMC")
if("failsafe")
debug_variables(Failsafe)
feedback_add_details("admin_verb", "dfailsafe")
@@ -46,7 +42,7 @@
debug_variables(SSair)
feedback_add_details("admin_verb","DAir")
if("Jobs")
- debug_variables(job_master)
+ debug_variables(SSjobs)
feedback_add_details("admin_verb","DJobs")
if("Sun")
debug_variables(SSsun)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 891e377b5e1..fac14f000a9 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -357,7 +357,7 @@ proc/display_roundstart_logout_report()
if(L.stat)
if(L.suiciding) //Suicider
msg += "[L.name] ([L.ckey]), the [L.job] (Suicide)\n"
- job_master.FreeRole(L.job)
+ SSjobs.FreeRole(L.job)
message_admins("[key_name_admin(L)], the [L.job] has been freed due to (Early Round Suicide)\n")
continue //Disconnected client
if(L.stat == UNCONSCIOUS)
@@ -383,7 +383,7 @@ proc/display_roundstart_logout_report()
continue //Lolwhat
else
msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n"
- job_master.FreeRole(L.job)
+ SSjobs.FreeRole(L.job)
message_admins("[key_name_admin(L)], the [L.job] has been freed due to (Early Round Ghosted While Alive)\n")
continue //Ghosted while alive
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 8682074d482..565980bd843 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -95,7 +95,7 @@ var/round_start_time = 0
var/datum/game_mode/M = config.pick_mode(secret_force_mode)
if(M.can_start())
src.mode = config.pick_mode(secret_force_mode)
- job_master.ResetOccupations()
+ SSjobs.ResetOccupations()
if(!src.mode)
src.mode = pickweight(runnable_modes)
if(src.mode)
@@ -107,7 +107,7 @@ var/round_start_time = 0
to_chat(world, "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.")
mode = null
current_state = GAME_STATE_PREGAME
- job_master.ResetOccupations()
+ SSjobs.ResetOccupations()
Master.SetRunLevel(RUNLEVEL_LOBBY)
return 0
@@ -115,12 +115,12 @@ var/round_start_time = 0
src.mode.pre_pre_setup()
var/can_continue
can_continue = src.mode.pre_setup()//Setup special modes
- job_master.DivideOccupations() //Distribute jobs
+ SSjobs.DivideOccupations() //Distribute jobs
if(!can_continue)
qdel(mode)
current_state = GAME_STATE_PREGAME
to_chat(world, "Error setting up [master_mode]. Reverting to pre-game lobby.")
- job_master.ResetOccupations()
+ SSjobs.ResetOccupations()
Master.SetRunLevel(RUNLEVEL_LOBBY)
return 0
@@ -134,7 +134,10 @@ var/round_start_time = 0
else
src.mode.announce()
+ setupfactions()
+ setup_economy()
create_characters() //Create player characters and transfer them
+ populate_spawn_points()
collect_minds()
equip_characters()
data_core.manifest()
@@ -375,8 +378,8 @@ var/round_start_time = 0
if(player.mind.assigned_role == "Captain")
captainless=0
if(player.mind.assigned_role != player.mind.special_role)
- job_master.AssignRank(player, player.mind.assigned_role, 0)
- job_master.EquipRank(player, player.mind.assigned_role, 0)
+ SSjobs.AssignRank(player, player.mind.assigned_role, 0)
+ SSjobs.EquipRank(player, player.mind.assigned_role, 0)
EquipCustomItems(player)
if(captainless)
for(var/mob/M in GLOB.player_list)
diff --git a/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm b/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm
index 0d891edb3eb..5db63d3450d 100644
--- a/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm
+++ b/code/game/gamemodes/miniantags/abduction/abductee_objectives.dm
@@ -26,7 +26,7 @@
explanation_text = "Capture"
/datum/objective/abductee/capture/New()
- var/list/jobs = job_master.occupations.Copy()
+ var/list/jobs = SSjobs.occupations.Copy()
for(var/datum/job/J in jobs)
if(J.current_positions < 1)
jobs -= J
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 61e458927e9..9e06d662053 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -235,9 +235,9 @@
return 1
/datum/outfit/job/proc/imprint_idcard(mob/living/carbon/human/H)
- var/datum/job/J = job_master.GetJobType(jobtype)
+ var/datum/job/J = SSjobs.GetJobType(jobtype)
if(!J)
- J = job_master.GetJob(H.job)
+ J = SSjobs.GetJob(H.job)
var/alt_title
if(H.mind)
diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm
index 218b0761eb3..6f5be69280a 100644
--- a/code/game/jobs/job_exp.dm
+++ b/code/game/jobs/job_exp.dm
@@ -72,7 +72,7 @@ var/global/list/role_playtime_requirements = list(
jtext = "-"
if(C.mob.mind && C.mob.mind.assigned_role)
- theirjob = job_master.GetJob(C.mob.mind.assigned_role)
+ theirjob = SSjobs.GetJob(C.mob.mind.assigned_role)
if(theirjob)
jtext = theirjob.title
msg += "[jtext] | "
@@ -180,7 +180,7 @@ var/global/list/role_playtime_requirements = list(
if(config.use_exp_restrictions)
var/list/jobs_locked = list()
var/list/jobs_unlocked = list()
- for(var/datum/job/job in job_master.occupations)
+ for(var/datum/job/job in SSjobs.occupations)
if(job.exp_requirements && job.exp_type)
if(!job.available_in_playtime(mob.client))
jobs_unlocked += job.title
diff --git a/code/game/jobs/job_scaling.dm b/code/game/jobs/job_scaling.dm
index 89bd8374351..90d55b03444 100644
--- a/code/game/jobs/job_scaling.dm
+++ b/code/game/jobs/job_scaling.dm
@@ -5,7 +5,7 @@
if(playercount >= highpop_trigger)
log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - loading highpop job config");
- job_master.LoadJobs("config/jobs_highpop.txt")
+ SSjobs.LoadJobs("config/jobs_highpop.txt")
else
log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - keeping standard job config");
return 1
\ No newline at end of file
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 4cde71a4705..5cb19358358 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -69,7 +69,7 @@ var/time_last_changed_position = 0
/obj/machinery/computer/card/proc/format_jobs(list/jobs)
var/list/formatted = list()
for(var/job in jobs)
- if(job_in_department(job_master.GetJob(job)))
+ if(job_in_department(SSjobs.GetJob(job)))
formatted.Add(list(list(
"display_name" = replacetext(job, " ", " "),
"target_rank" = get_target_rank(),
@@ -79,7 +79,7 @@ var/time_last_changed_position = 0
/obj/machinery/computer/card/proc/format_job_slots()
var/list/formatted = list()
- for(var/datum/job/job in job_master.occupations)
+ for(var/datum/job/job in SSjobs.occupations)
if(job_blacklisted_full(job))
continue
if(!job_in_department(job))
@@ -166,7 +166,7 @@ var/time_last_changed_position = 0
/obj/machinery/computer/card/proc/can_close_job(datum/job/job)
if(job)
if(!job_blacklisted_full(job) && !job_blacklisted_partial(job) && job_in_department(job, FALSE))
- if(job.total_positions > job.current_positions && !(job in job_master.prioritized_jobs))
+ if(job.total_positions > job.current_positions && !(job in SSjobs.prioritized_jobs))
var/delta = (world.time / 10) - time_last_changed_position
if((change_position_cooldown < delta) || (opened_positions[job.title] > 0))
return 1
@@ -177,10 +177,10 @@ var/time_last_changed_position = 0
/obj/machinery/computer/card/proc/can_prioritize_job(datum/job/job)
if(job)
if(!job_blacklisted_full(job) && job_in_department(job, FALSE))
- if(job in job_master.prioritized_jobs)
+ if(job in SSjobs.prioritized_jobs)
return 2
else
- if(job_master.prioritized_jobs.len >= 3)
+ if(SSjobs.prioritized_jobs.len >= 3)
return 0
if(job.total_positions <= job.current_positions)
return 0
@@ -205,7 +205,7 @@ var/time_last_changed_position = 0
/obj/machinery/computer/card/proc/get_subordinates(rank, addcivs)
var/list/jobs_returned = list()
- for(var/datum/job/thisjob in job_master.occupations)
+ for(var/datum/job/thisjob in SSjobs.occupations)
if(rank in thisjob.department_head)
jobs_returned += thisjob.title
if(addcivs)
@@ -364,10 +364,10 @@ var/time_last_changed_position = 0
if(target_dept && modify.assignment == "Unassigned")
visible_message("[src]: Demoted individuals must see the HoP for a new job.")
return 0
- if(!job_in_department(job_master.GetJob(modify.rank), FALSE))
+ if(!job_in_department(SSjobs.GetJob(modify.rank), FALSE))
visible_message("[src]: Cross-department job transfers must be done by the HoP.")
return 0
- if(!job_in_department(job_master.GetJob(t1)))
+ if(!job_in_department(SSjobs.GetJob(t1)))
return 0
if(t1 == "Custom")
var/temp_t = sanitize(copytext(input("Enter a custom job assignment.","Assignment"),1,MAX_MESSAGE_LEN))
@@ -473,7 +473,7 @@ var/time_last_changed_position = 0
if(modify.assignment == "Unassigned")
visible_message("[src]: Unassigned crew cannot be demoted any further. If further action is warranted, ask the Captain about Termination.")
return 0
- if(!job_in_department(job_master.GetJob(modify.rank), FALSE))
+ if(!job_in_department(SSjobs.GetJob(modify.rank), FALSE))
visible_message("[src]: Heads may only demote members of their own department.")
return 0
@@ -494,7 +494,7 @@ var/time_last_changed_position = 0
// MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
if(is_authenticated(usr))
var/edit_job_target = href_list["job"]
- var/datum/job/j = job_master.GetJob(edit_job_target)
+ var/datum/job/j = SSjobs.GetJob(edit_job_target)
if(!job_in_department(j, FALSE))
return 0
if(!j)
@@ -513,7 +513,7 @@ var/time_last_changed_position = 0
// MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
if(is_authenticated(usr))
var/edit_job_target = href_list["job"]
- var/datum/job/j = job_master.GetJob(edit_job_target)
+ var/datum/job/j = SSjobs.GetJob(edit_job_target)
if(!job_in_department(j, FALSE))
return 0
if(!j)
@@ -533,17 +533,17 @@ var/time_last_changed_position = 0
// TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
if(is_authenticated(usr) && !target_dept)
var/priority_target = href_list["job"]
- var/datum/job/j = job_master.GetJob(priority_target)
+ var/datum/job/j = SSjobs.GetJob(priority_target)
if(!j)
return 0
if(!job_in_department(j))
return 0
var/priority = TRUE
- if(j in job_master.prioritized_jobs)
- job_master.prioritized_jobs -= j
+ if(j in SSjobs.prioritized_jobs)
+ SSjobs.prioritized_jobs -= j
priority = FALSE
- else if(job_master.prioritized_jobs.len < 3)
- job_master.prioritized_jobs += j
+ else if(SSjobs.prioritized_jobs.len < 3)
+ SSjobs.prioritized_jobs += j
else
return 0
log_game("[key_name(usr)] [priority ? "prioritized" : "unprioritized"] the job \"[j.title]\".")
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 9c39f84ffda..9674a60c7d4 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -397,7 +397,7 @@
//Handle job slot/tater cleanup.
var/job = occupant.mind.assigned_role
- job_master.FreeRole(job)
+ SSjobs.FreeRole(job)
if(occupant.mind.objectives.len)
occupant.mind.objectives.Cut()
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 2e4b7b19378..f354feb1629 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -284,7 +284,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(12)
var/list/jobs = list()
data["jobs"] = jobs
- for(var/datum/job/job in job_master.occupations)
+ for(var/datum/job/job in SSjobs.occupations)
if(job_blacklisted(job))
continue
if(job.is_position_available())
diff --git a/code/game/world.dm b/code/game/world.dm
index d87ad886937..4681f46498a 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -31,13 +31,15 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
Master.Initialize(10, FALSE)
processScheduler = new
- master_controller = new /datum/controller/game_controller()
spawn(1)
processScheduler.deferSetupFor(/datum/controller/process/ticker)
processScheduler.setup()
- master_controller.setup()
+ if(!syndicate_code_phrase)
+ syndicate_code_phrase = generate_code_phrase()
+ if(!syndicate_code_response)
+ syndicate_code_response = generate_code_phrase()
if(using_map && using_map.name)
map_name = "[using_map.name]"
else
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 08ef6797811..d8bef3e406c 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -689,11 +689,11 @@ var/list/admin_verbs_ticket = list(
if(!check_rights(R_DEBUG))
return
- if(air_processing_killed)
- air_processing_killed = 0
+ if(SSair.air_processing_killed)
+ SSair.air_processing_killed = 0
to_chat(usr, "Enabled air processing.")
else
- air_processing_killed = 1
+ SSair.air_processing_killed = 1
to_chat(usr, "Disabled air processing.")
feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] used 'kill air'.")
@@ -888,7 +888,7 @@ var/list/admin_verbs_ticket = list(
return
var/list/jobs = list()
- for(var/datum/job/J in job_master.occupations)
+ for(var/datum/job/J in SSjobs.occupations)
if(J.current_positions >= J.total_positions && J.total_positions != -1)
jobs += J.title
if(!jobs.len)
@@ -896,7 +896,7 @@ var/list/admin_verbs_ticket = list(
return
var/job = input("Please select job slot to free", "Free Job Slot") as null|anything in jobs
if(job)
- job_master.FreeRole(job)
+ SSjobs.FreeRole(job)
log_admin("[key_name(usr)] has freed a job slot for [job].")
message_admins("[key_name_admin(usr)] has freed a job slot for [job].")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index adab72d5404..88d10abde98 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -491,8 +491,8 @@
if(!M.ckey) //sanity
to_chat(usr, "This mob has no ckey")
return
- if(!job_master)
- to_chat(usr, "Job Master has not been setup!")
+ if(!SSjobs)
+ to_chat(usr, "SSjobs has not been setup!")
return
var/dat = ""
@@ -512,7 +512,7 @@
jobs += "| Command Positions |
|---|
"
for(var/jobPos in command_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -533,7 +533,7 @@
jobs += "
| Security Positions |
|---|
"
for(var/jobPos in security_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -554,7 +554,7 @@
jobs += "
| Engineering Positions |
|---|
"
for(var/jobPos in engineering_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -575,7 +575,7 @@
jobs += "
| Medical Positions |
|---|
"
for(var/jobPos in medical_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -596,7 +596,7 @@
jobs += "
| Science Positions |
|---|
"
for(var/jobPos in science_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -617,7 +617,7 @@
jobs += "
| Support Positions |
|---|
"
for(var/jobPos in support_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -638,7 +638,7 @@
jobs += "
| Non-human Positions |
|---|
"
for(var/jobPos in nonhuman_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -707,7 +707,7 @@
jobs += "
| Whitelisted Positions |
|---|
"
for(var/jobPos in whitelisted_positions)
if(!jobPos) continue
- var/datum/job/job = job_master.GetJob(jobPos)
+ var/datum/job/job = SSjobs.GetJob(jobPos)
if(!job) continue
if(jobban_isbanned(M, job.title))
@@ -743,8 +743,8 @@
var/ban_ckey_param = href_list["dbbanaddckey"]
- if(!job_master)
- to_chat(usr, "Job Master has not been setup!")
+ if(!SSjobs)
+ to_chat(usr, "SSjobs has not been setup!")
return
//get jobs for department if specified, otherwise just returnt he one job in a list.
@@ -753,50 +753,50 @@
if("commanddept")
for(var/jobPos in command_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("securitydept")
for(var/jobPos in security_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("engineeringdept")
for(var/jobPos in engineering_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("medicaldept")
for(var/jobPos in medical_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("sciencedept")
for(var/jobPos in science_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("supportdept")
for(var/jobPos in support_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("nonhumandept")
joblist += "pAI"
for(var/jobPos in nonhuman_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
if("whitelistdept")
for(var/jobPos in whitelisted_positions)
if(!jobPos) continue
- var/datum/job/temp = job_master.GetJob(jobPos)
+ var/datum/job/temp = SSjobs.GetJob(jobPos)
if(!temp) continue
joblist += temp.title
else
@@ -2935,11 +2935,11 @@
usr << browse(dat, "window=lawchanges;size=800x500")
if("list_job_debug")
var/dat = "Job Debug info.
"
- if(job_master)
- for(var/line in job_master.job_debug)
+ if(SSjobs)
+ for(var/line in SSjobs.job_debug)
dat += "[line]
"
dat+= "*******
"
- for(var/datum/job/job in job_master.occupations)
+ for(var/datum/job/job in SSjobs.occupations)
if(!job) continue
dat += "job: [job.title], current_positions: [job.current_positions], total_positions: [job.total_positions]
"
usr << browse(dat, "window=jobdebug;size=600x500")
@@ -3029,7 +3029,7 @@
M.req_one_access = list(access_brig,access_engine)
message_admins("[key_name_admin(usr)] made all maint doors engineering and brig access-only.")
if("infinite_sec")
- var/datum/job/J = job_master.GetJob("Security Officer")
+ var/datum/job/J = SSjobs.GetJob("Security Officer")
if(!J) return
J.total_positions = -1
J.spawn_positions = -1
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 2b96f7d3290..3492061f1f6 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -612,7 +612,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/datum/job/jobdatum
if(dresscode == "as job...")
var/jobname = input("Select job", "Robust quick dress shop") as null|anything in get_all_jobs()
- jobdatum = job_master.GetJob(jobname)
+ jobdatum = SSjobs.GetJob(jobname)
feedback_add_details("admin_verb", "SEQ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
if(dostrip)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 0a80079562b..15ee321656c 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -435,8 +435,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
//Now for special roles and equipment.
switch(new_character.mind.special_role)
if("traitor")
- job_master.AssignRank(new_character, new_character.mind.assigned_role, 0)
- job_master.EquipRank(new_character, new_character.mind.assigned_role, 1)
+ SSjobs.AssignRank(new_character, new_character.mind.assigned_role, 0)
+ SSjobs.EquipRank(new_character, new_character.mind.assigned_role, 1)
ticker.mode.equip_traitor(new_character)
if("Wizard")
new_character.loc = pick(wizardstart)
@@ -466,8 +466,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
call(/datum/game_mode/proc/add_law_zero)(new_character)
//Add aliens.
else
- job_master.AssignRank(new_character, new_character.mind.assigned_role, 0)
- job_master.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them.
+ SSjobs.AssignRank(new_character, new_character.mind.assigned_role, 0)
+ SSjobs.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them.
//Announces the character on all the systems, based on the record.
if(!issilicon(new_character))//If they are not a cyborg/AI.
@@ -662,11 +662,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!check_rights(R_ADMIN))
return
- if(job_master)
+ if(SSjobs)
var/currentpositiontally
var/totalpositiontally
to_chat(src, "Job Name: Filled job slot / Total job slots (Free job slots)")
- for(var/datum/job/job in job_master.occupations)
+ for(var/datum/job/job in SSjobs.occupations)
to_chat(src, "[job.title]: [job.current_positions] / \
[job.total_positions == -1 ? "UNLIMITED" : job.total_positions] \
([job.total_positions == -1 ? "UNLIMITED" : job.total_positions - job.current_positions])")
diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm
index 0da0dfc42f6..10ad3f07020 100644
--- a/code/modules/admin/verbs/tripAI.dm
+++ b/code/modules/admin/verbs/tripAI.dm
@@ -6,8 +6,8 @@
to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.")
return
- if(job_master && ticker)
- var/datum/job/job = job_master.GetJob("AI")
+ if(SSjobs && ticker)
+ var/datum/job/job = SSjobs.GetJob("AI")
if(!job)
to_chat(usr, "Unable to locate the AI job")
return
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index caf98b866cc..22894aaa691 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -576,7 +576,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
/datum/preferences/proc/SetChoices(mob/user, limit = 13, list/splitJobs = list("Civilian","Research Director","AI","Bartender"), width = 760, height = 790)
- if(!job_master)
+ if(!SSjobs)
return
//limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice.
@@ -597,8 +597,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
//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
- if(!job_master) return
- for(var/datum/job/job in job_master.occupations)
+ if(!SSjobs)
+ return
+ for(var/datum/job/job in SSjobs.occupations)
if(job.admin_only)
continue
@@ -802,7 +803,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
return 0
/datum/preferences/proc/UpdateJobPreference(mob/user, role, desiredLvl)
- var/datum/job/job = job_master.GetJob(role)
+ var/datum/job/job = SSjobs.GetJob(role)
if(!job)
user << browse(null, "window=mob_occupation")
@@ -908,7 +909,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
player_alt_titles[job.title] = new_title
/datum/preferences/proc/SetJob(mob/user, role)
- var/datum/job/job = job_master.GetJob(role)
+ var/datum/job/job = SSjobs.GetJob(role)
if(!job)
user << browse(null, "window=mob_occupation")
ShowChoices(user)
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index 311d7387614..c3887fe4660 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -165,7 +165,7 @@
var/mob/living/carbon/human/H = user
for(var/obj/item/W in H)
H.unEquip(W)
- var/datum/job/clown/C = job_master.GetJob("Clown")
+ var/datum/job/clown/C = SSjobs.GetJob("Clown")
C.equip(H)
affected_targets.Add(H)
diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm
index bb9ae87bdc7..69dfa740b09 100644
--- a/code/modules/mob/living/carbon/human/interactive/interactive.dm
+++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm
@@ -166,7 +166,7 @@
return
var/list/jobs[0]
- for(var/datum/job/j in job_master.occupations)
+ for(var/datum/job/j in SSjobs.occupations)
if(j.title != "AI" && j.title != "Cyborg")
jobs[j.title] = j
jobs = sortAssoc(jobs)
diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm
index c364c8d21b9..69136e07a99 100644
--- a/code/modules/mob/living/silicon/ai/latejoin.dm
+++ b/code/modules/mob/living/silicon/ai/latejoin.dm
@@ -27,7 +27,7 @@ var/global/list/empty_playable_ai_cores = list()
//Handle job slot/tater cleanup.
var/job = mind.assigned_role
- job_master.FreeRole(job)
+ SSjobs.FreeRole(job)
if(mind.objectives.len)
mind.objectives.Cut()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 80303c1dcd1..a46b9a94fc7 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -256,7 +256,7 @@
new_player_panel()
/mob/new_player/proc/IsJobAvailable(rank)
- var/datum/job/job = job_master.GetJob(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
@@ -269,9 +269,9 @@
if(config.assistantlimit)
if(job.title == "Civilian")
var/count = 0
- var/datum/job/officer = job_master.GetJob("Security Officer")
- var/datum/job/warden = job_master.GetJob("Warden")
- var/datum/job/hos = job_master.GetJob("Head of Security")
+ var/datum/job/officer = SSjobs.GetJob("Security Officer")
+ var/datum/job/warden = SSjobs.GetJob("Warden")
+ var/datum/job/hos = SSjobs.GetJob("Head of Security")
count += (officer.current_positions + warden.current_positions + hos.current_positions)
if(job.current_positions > (config.assistantratio * count))
if(count >= 5) // if theres more than 5 security on the station just let assistants join regardless, they should be able to handle the tide
@@ -280,21 +280,21 @@
return 1
/mob/new_player/proc/IsAdminJob(rank)
- var/datum/job/job = job_master.GetJob(rank)
+ var/datum/job/job = SSjobs.GetJob(rank)
if(job.admin_only)
return 1
else
return 0
/mob/new_player/proc/IsERTSpawnJob(rank)
- var/datum/job/job = job_master.GetJob(rank)
+ var/datum/job/job = SSjobs.GetJob(rank)
if(job.spawn_ert)
return 1
else
return 0
/mob/new_player/proc/IsSyndicateCommand(rank)
- var/datum/job/job = job_master.GetJob(rank)
+ var/datum/job/job = SSjobs.GetJob(rank)
if(job.syndicate_command)
return 1
else
@@ -312,15 +312,15 @@
if(!IsJobAvailable(rank))
to_chat(src, alert("[rank] is not available. Please try another."))
return 0
- var/datum/job/thisjob = job_master.GetJob(rank)
+ var/datum/job/thisjob = SSjobs.GetJob(rank)
if(thisjob.barred_by_disability(client))
to_chat(src, alert("[rank] is not available due to your character's disability. Please try another."))
return 0
- job_master.AssignRole(src, rank, 1)
+ SSjobs.AssignRole(src, rank, 1)
var/mob/living/character = create_character() //creates the human and transfers vars and mind
- character = job_master.AssignRank(character, rank, 1) //equips the human
+ character = SSjobs.AssignRank(character, rank, 1) //equips the human
// AIs don't need a spawnpoint, they must spawn at an empty core
if(character.mind.assigned_role == "AI")
@@ -367,7 +367,7 @@
character.buckled.loc = character.loc
character.buckled.dir = character.dir
- character = job_master.EquipRank(character, rank, 1) //equips the human
+ character = SSjobs.EquipRank(character, rank, 1) //equips the human
EquipCustomItems(character)
ticker.mode.latespawn(character)
@@ -384,8 +384,8 @@
callHook("latespawn", list(character))
AddEmploymentContract(character)
- if(!thisjob.is_position_available() && thisjob in job_master.prioritized_jobs)
- job_master.prioritized_jobs -= thisjob
+ if(!thisjob.is_position_available() && thisjob in SSjobs.prioritized_jobs)
+ SSjobs.prioritized_jobs -= thisjob
qdel(src)
@@ -452,11 +452,11 @@
else if(SSshuttle.emergency.mode >= SHUTTLE_CALL)
dat += "The station is currently undergoing evacuation procedures.
"
- if(length(job_master.prioritized_jobs))
+ if(length(SSjobs.prioritized_jobs))
dat += "The station has flagged these jobs as high priority: "
- var/amt = length(job_master.prioritized_jobs)
+ var/amt = length(SSjobs.prioritized_jobs)
var/amt_count
- for(var/datum/job/a in job_master.prioritized_jobs)
+ for(var/datum/job/a in SSjobs.prioritized_jobs)
amt_count++
if(amt_count != amt)
dat += " [a.title], "
@@ -478,7 +478,7 @@
"Science" = list(jobs = list(), titles = science_positions, color = "#e6b3e6"),
"Supply" = list(jobs = list(), titles = supply_positions, color = "#ead4ae"),
)
- for(var/datum/job/job in job_master.occupations)
+ for(var/datum/job/job in SSjobs.occupations)
if(job && IsJobAvailable(job.title) && !job.barred_by_disability(client))
activePlayers[job] = 0
var/categorized = 0
@@ -512,7 +512,7 @@
dat += "