Half-Refactors Jobs (#6762)

* Somewhat cleans up a piece of job code, makes new ID computers not be awful.

* Changes ROLE_ defines to DEPARTMENT_ to be clearer. Backports the new ID computer's assignment section of its UI to the old ID computer.

* Swaps back to southern cross map.

* Removes a block of commented code.
This commit is contained in:
Neerti
2020-03-03 16:27:37 -05:00
committed by GitHub
parent 5f33c40356
commit 24fbd0b87e
80 changed files with 653 additions and 590 deletions

View File

@@ -206,16 +206,16 @@ var/list/event_last_fired = list()
else if(istype(R.module, /obj/item/weapon/robot_module/robot/research))
active_with_role["Scientist"]++
if(M.mind.assigned_role in engineering_positions)
if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_ENGINEERING))
active_with_role["Engineer"]++
if(M.mind.assigned_role in medical_positions)
if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_MEDICAL))
active_with_role["Medical"]++
if(M.mind.assigned_role in security_positions)
if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_SECURITY))
active_with_role["Security"]++
if(M.mind.assigned_role in science_positions)
if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_RESEARCH))
active_with_role["Scientist"]++
if(M.mind.assigned_role == "AI")