From dc8923ca16fdf75598919c83e86da26c2f6b4ee2 Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Fri, 12 Jul 2024 01:50:30 +0300 Subject: [PATCH] Converts id trim assignment value from strings to defines (#84848) ## About The Pull Request A small refactor to rule them all. Converted strings to defines, need it to stay in sync with job titles. ## Why It's Good For The Game Less space for typos, defines good. --- code/datums/id_trim/jobs.dm | 82 ++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 4d4c44138e0..190c4a38a29 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -77,7 +77,7 @@ return TRUE /datum/id_trim/job/assistant - assignment = "Assistant" + assignment = JOB_ASSISTANT trim_state = "trim_assistant" intern_alt_name = "Intern" sechud_icon_state = SECHUD_ASSISTANT @@ -104,7 +104,7 @@ ACCESS_MAINT_TUNNELS) /datum/id_trim/job/atmospheric_technician - assignment = "Atmospheric Technician" + assignment = JOB_ATMOSPHERIC_TECHNICIAN trim_state = "trim_atmospherictechnician" department_color = COLOR_ENGINEERING_ORANGE subdepartment_color = COLOR_ENGINEERING_ORANGE @@ -133,7 +133,7 @@ job = /datum/job/atmospheric_technician /datum/id_trim/job/bartender - assignment = "Bartender" + assignment = JOB_BARTENDER trim_state = "trim_bartender" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -157,7 +157,7 @@ job = /datum/job/bartender /datum/id_trim/job/bitrunner - assignment = "Bitrunner" + assignment = JOB_BITRUNNER trim_state = "trim_bitrunner" department_color = COLOR_CARGO_BROWN subdepartment_color = COLOR_CARGO_BROWN @@ -181,7 +181,7 @@ job = /datum/job/bitrunner /datum/id_trim/job/botanist - assignment = "Botanist" + assignment = JOB_BOTANIST trim_state = "trim_botanist" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -204,7 +204,7 @@ job = /datum/job/botanist /datum/id_trim/job/bridge_assistant - assignment = "Bridge Assistant" + assignment = JOB_BRIDGE_ASSISTANT trim_state = "trim_assistant" department_color = COLOR_COMMAND_BLUE subdepartment_color = COLOR_COMMAND_BLUE @@ -226,7 +226,7 @@ job = /datum/job/bridge_assistant /datum/id_trim/job/captain - assignment = "Captain" + assignment = JOB_CAPTAIN intern_alt_name = "Captain-in-Training" trim_state = "trim_captain" department_color = COLOR_COMMAND_BLUE @@ -249,7 +249,7 @@ return ..() /datum/id_trim/job/cargo_technician - assignment = "Cargo Technician" + assignment = JOB_CARGO_TECHNICIAN trim_state = "trim_cargotechnician" department_color = COLOR_CARGO_BROWN subdepartment_color = COLOR_CARGO_BROWN @@ -274,7 +274,7 @@ job = /datum/job/cargo_technician /datum/id_trim/job/chaplain - assignment = "Chaplain" + assignment = JOB_CHAPLAIN trim_state = "trim_chaplain" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -296,7 +296,7 @@ job = /datum/job/chaplain /datum/id_trim/job/chemist - assignment = "Chemist" + assignment = JOB_CHEMIST trim_state = "trim_chemist" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_MEDICAL_BLUE @@ -321,7 +321,7 @@ job = /datum/job/chemist /datum/id_trim/job/chief_engineer - assignment = "Chief Engineer" + assignment = JOB_CHIEF_ENGINEER intern_alt_name = "Chief Engineer-in-Training" trim_state = "trim_stationengineer" department_color = COLOR_COMMAND_BLUE @@ -362,7 +362,7 @@ job = /datum/job/chief_engineer /datum/id_trim/job/chief_medical_officer - assignment = "Chief Medical Officer" + assignment = JOB_CHIEF_MEDICAL_OFFICER intern_alt_name = "Chief Medical Officer-in-Training" trim_state = "trim_medicaldoctor" department_color = COLOR_COMMAND_BLUE @@ -401,7 +401,7 @@ job = /datum/job/chief_medical_officer /datum/id_trim/job/clown - assignment = "Clown" + assignment = JOB_CLOWN trim_state = "trim_clown" department_color = COLOR_MAGENTA subdepartment_color = COLOR_MAGENTA @@ -420,7 +420,7 @@ job = /datum/job/clown /datum/id_trim/job/cook - assignment = "Cook" + assignment = JOB_COOK trim_state = "trim_cook" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -443,11 +443,11 @@ job = /datum/job/cook /datum/id_trim/job/cook/chef - assignment = "Chef" + assignment = JOB_CHEF sechud_icon_state = SECHUD_CHEF /datum/id_trim/job/coroner - assignment = "Coroner" + assignment = JOB_CORONER trim_state = "trim_coroner" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_SERVICE_LIME @@ -474,7 +474,7 @@ job = /datum/job/coroner /datum/id_trim/job/curator - assignment = "Curator" + assignment = JOB_CURATOR trim_state = "trim_curator" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -495,7 +495,7 @@ job = /datum/job/curator /datum/id_trim/job/detective - assignment = "Detective" + assignment = JOB_DETECTIVE trim_state = "trim_detective" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_SECURITY_RED @@ -533,7 +533,7 @@ access |= list(ACCESS_MAINT_TUNNELS) /datum/id_trim/job/geneticist - assignment = "Geneticist" + assignment = JOB_GENETICIST trim_state = "trim_geneticist" department_color = COLOR_SCIENCE_PINK subdepartment_color = COLOR_SCIENCE_PINK @@ -561,7 +561,7 @@ job = /datum/job/geneticist /datum/id_trim/job/head_of_personnel - assignment = "Head of Personnel" + assignment = JOB_HEAD_OF_PERSONNEL intern_alt_name = "Head of Personnel-in-Training" trim_state = "trim_headofpersonnel" department_color = COLOR_COMMAND_BLUE @@ -614,7 +614,7 @@ job = /datum/job/head_of_personnel /datum/id_trim/job/head_of_security - assignment = "Head of Security" + assignment = JOB_HEAD_OF_SECURITY intern_alt_name = "Head of Security-in-Training" trim_state = "trim_securityofficer" department_color = COLOR_COMMAND_BLUE @@ -673,7 +673,7 @@ access |= list(ACCESS_MAINT_TUNNELS) /datum/id_trim/job/janitor - assignment = "Janitor" + assignment = JOB_JANITOR trim_state = "trim_janitor" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -693,7 +693,7 @@ job = /datum/job/janitor /datum/id_trim/job/lawyer - assignment = "Lawyer" + assignment = JOB_LAWYER trim_state = "trim_lawyer" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SECURITY_RED @@ -714,7 +714,7 @@ job = /datum/job/lawyer /datum/id_trim/job/medical_doctor - assignment = "Medical Doctor" + assignment = JOB_MEDICAL_DOCTOR trim_state = "trim_medicaldoctor" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_MEDICAL_BLUE @@ -739,7 +739,7 @@ job = /datum/job/doctor /datum/id_trim/job/mime - assignment = "Mime" + assignment = JOB_MIME trim_state = "trim_mime" department_color = COLOR_SILVER subdepartment_color = COLOR_WHITE @@ -758,7 +758,7 @@ job = /datum/job/mime /datum/id_trim/job/paramedic - assignment = "Paramedic" + assignment = JOB_PARAMEDIC trim_state = "trim_paramedic" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_MEDICAL_BLUE @@ -790,7 +790,7 @@ job = /datum/job/paramedic /datum/id_trim/job/prisoner - assignment = "Prisoner" + assignment = JOB_PRISONER trim_state = "trim_warden" department_color = COLOR_PRISONER_BLACK subdepartment_color = COLOR_PRISONER_BLACK @@ -833,7 +833,7 @@ template_access = null /datum/id_trim/job/psychologist - assignment = "Psychologist" + assignment = JOB_PSYCHOLOGIST trim_state = "trim_psychologist" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_MEDICAL_BLUE @@ -857,7 +857,7 @@ job = /datum/job/psychologist /datum/id_trim/job/quartermaster - assignment = "Quartermaster" + assignment = JOB_QUARTERMASTER intern_alt_name = "Quartermaster-in-Training" trim_state = "trim_cargotechnician" department_color = COLOR_COMMAND_BLUE @@ -895,7 +895,7 @@ job = /datum/job/quartermaster /datum/id_trim/job/research_director - assignment = "Research Director" + assignment = JOB_RESEARCH_DIRECTOR intern_alt_name = "Research Director-in-Training" trim_state = "trim_scientist" department_color = COLOR_COMMAND_BLUE @@ -943,7 +943,7 @@ job = /datum/job/research_director /datum/id_trim/job/roboticist - assignment = "Roboticist" + assignment = JOB_ROBOTICIST trim_state = "trim_roboticist" department_color = COLOR_SCIENCE_PINK subdepartment_color = COLOR_SCIENCE_PINK @@ -973,7 +973,7 @@ job = /datum/job/roboticist /datum/id_trim/job/scientist - assignment = "Scientist" + assignment = JOB_SCIENTIST trim_state = "trim_scientist" department_color = COLOR_SCIENCE_PINK subdepartment_color = COLOR_SCIENCE_PINK @@ -1001,7 +1001,7 @@ /// Sec officers have departmental variants. They each have their own trims with bonus departmental accesses. /datum/id_trim/job/security_officer - assignment = "Security Officer" + assignment = JOB_SECURITY_OFFICER trim_state = "trim_securityofficer" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_SECURITY_RED @@ -1064,7 +1064,7 @@ access |= elevated_access /datum/id_trim/job/security_officer/supply - assignment = "Security Officer (Cargo)" + assignment = JOB_SECURITY_OFFICER_SUPPLY subdepartment_color = COLOR_CARGO_BROWN department_access = list( ACCESS_BIT_DEN, @@ -1078,7 +1078,7 @@ ) /datum/id_trim/job/security_officer/engineering - assignment = "Security Officer (Engineering)" + assignment = JOB_SECURITY_OFFICER_ENGINEERING subdepartment_color = COLOR_ENGINEERING_ORANGE department_access = list( ACCESS_ATMOSPHERICS, @@ -1092,7 +1092,7 @@ ) /datum/id_trim/job/security_officer/medical - assignment = "Security Officer (Medical)" + assignment = JOB_SECURITY_OFFICER_MEDICAL subdepartment_color = COLOR_MEDICAL_BLUE department_access = list( ACCESS_MEDICAL, @@ -1106,7 +1106,7 @@ ) /datum/id_trim/job/security_officer/science - assignment = "Security Officer (Science)" + assignment = JOB_SECURITY_OFFICER_SCIENCE subdepartment_color = COLOR_SCIENCE_PINK department_access = list( ACCESS_RESEARCH, @@ -1122,7 +1122,7 @@ ) /datum/id_trim/job/shaft_miner - assignment = "Shaft Miner" + assignment = JOB_SHAFT_MINER trim_state = "trim_shaftminer" department_color = COLOR_CARGO_BROWN subdepartment_color = COLOR_SCIENCE_PINK @@ -1159,7 +1159,7 @@ template_access = null /datum/id_trim/job/station_engineer - assignment = "Station Engineer" + assignment = JOB_STATION_ENGINEER trim_state = "trim_stationengineer" department_color = COLOR_ENGINEERING_ORANGE subdepartment_color = COLOR_ENGINEERING_ORANGE @@ -1188,7 +1188,7 @@ job = /datum/job/station_engineer /datum/id_trim/job/veteran_advisor - assignment = "Veteran Security Advisor" + assignment = JOB_VETERAN_ADVISOR trim_state = "trim_veteranadvisor" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_COMMAND_BLUE @@ -1219,7 +1219,7 @@ /datum/id_trim/job/warden - assignment = "Warden" + assignment = JOB_WARDEN trim_state = "trim_warden" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_SECURITY_RED