From 15158a81effd6587cf370564b1b94969cb7c7388 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 25 Jun 2023 17:37:24 +0100 Subject: [PATCH 1/2] remove CL --- code/__HELPERS/job.dm | 4 ++-- code/modules/cm_marines/marines_consoles.dm | 22 ++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/code/__HELPERS/job.dm b/code/__HELPERS/job.dm index 43902b07cfd9..7226edfc8b69 100644 --- a/code/__HELPERS/job.dm +++ b/code/__HELPERS/job.dm @@ -15,7 +15,7 @@ return all_jobs -/proc/get_all_centcom_jobs() return list() +/proc/get_all_wy_jobs() return JOB_WY_GOON_LIST + JOB_PMC_GRUNT_LIST + list(JOB_CORPORATE_LIAISON) //gets the actual job rank (ignoring alt titles) //this is used solely for sechuds @@ -39,7 +39,7 @@ var/obj/item/card/id/I = src if(istype(I)) var/job_icons = get_all_job_icons() - var/centcom = get_all_centcom_jobs() + var/centcom = get_all_wy_jobs() if(I.assignment in job_icons) return I.assignment//Check if the job has a hud icon if(I.rank in job_icons) return I.rank diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 3539a43e6c15..bd8bde323a8d 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -20,7 +20,7 @@ var/list/factions = list(FACTION_MARINE) var/printing - var/is_centcom = FALSE + var/is_wey_yu = FALSE var/authenticated = FALSE /obj/structure/machinery/computer/card/proc/authenticate(mob/user, obj/item/card/id/id_card) @@ -196,7 +196,7 @@ target_id_card.assignment = custom_name else var/list/new_access = list() - if(is_centcom) + if(is_wey_yu) new_access = get_all_weyland_access() else var/datum/job/job = RoleAuthority.roles_for_mode[target] @@ -227,7 +227,7 @@ log_idmod(target_id_card, " [key_name_admin(usr)] granted [access_type] IFF. ") return TRUE access_type = text2num(params["access_target"]) - if(access_type in (is_centcom ? get_all_weyland_access() : get_main_marine_access())) + if(access_type in (is_wey_yu ? get_all_weyland_access() : get_main_marine_access())) if(access_type in target_id_card.access) target_id_card.access -= access_type log_idmod(target_id_card, " [key_name_admin(usr)] revoked access '[access_type]'. ") @@ -239,7 +239,7 @@ if(!authenticated || !target_id_card) return - target_id_card.access |= (is_centcom ? get_all_weyland_access() : get_main_marine_access()) + target_id_card.access |= (is_wey_yu ? get_all_weyland_access() : get_main_marine_access()) target_id_card.faction_group |= factions log_idmod(target_id_card, " [key_name_admin(usr)] granted the ID all access and USCM IFF. ") return TRUE @@ -294,18 +294,22 @@ /obj/structure/machinery/computer/card/ui_static_data(mob/user) var/list/data = list() data["station_name"] = station_name - data["centcom_access"] = is_centcom + data["wey_yu_access"] = is_wey_yu data["manifest"] = GLOB.data_core.get_manifest(FALSE, FALSE, TRUE) var/list/departments - if(is_centcom) - departments = list("CentCom" = get_all_centcom_jobs()) + if(is_wey_yu) + departments = list( + "Weyland Yutani" = list(JOB_CORPORATE_LIAISON, JOB_TRAINEE, JOB_JUNIOR_EXECUTIVE, JOB_EXECUTIVE), + "Corporate Security" = JOB_WY_GOON_LIST, + "PMCs" = JOB_PMC_GRUNT_LIST + ) else if(Check_WO()) // I am not sure about WOs departments so it may need adjustment departments = list( CARDCON_DEPARTMENT_COMMAND = ROLES_CIC & ROLES_WO, CARDCON_DEPARTMENT_AUXCOM = ROLES_AUXIL_SUPPORT & ROLES_WO, - CARDCON_DEPARTMENT_MISC = ROLES_MISC & ROLES_WO, + CARDCON_DEPARTMENT_MISC = ROLES_MISC & ROLES_WO - JOB_CORPORATE_LIAISON, CARDCON_DEPARTMENT_SECURITY = ROLES_POLICE & ROLES_WO, CARDCON_DEPARTMENT_ENGINEERING = ROLES_ENGINEERING & ROLES_WO, CARDCON_DEPARTMENT_SUPPLY = ROLES_REQUISITION & ROLES_WO, @@ -316,7 +320,7 @@ departments = list( CARDCON_DEPARTMENT_COMMAND = ROLES_CIC - ROLES_WO, CARDCON_DEPARTMENT_AUXCOM = ROLES_AUXIL_SUPPORT - ROLES_WO, - CARDCON_DEPARTMENT_MISC = ROLES_MISC - ROLES_WO, + CARDCON_DEPARTMENT_MISC = ROLES_MISC - ROLES_WO - JOB_CORPORATE_LIAISON, CARDCON_DEPARTMENT_SECURITY = ROLES_POLICE - ROLES_WO, CARDCON_DEPARTMENT_ENGINEERING = ROLES_ENGINEERING - ROLES_WO, CARDCON_DEPARTMENT_SUPPLY = ROLES_REQUISITION - ROLES_WO, From 261ebec2790844e66a4af559bc6112be6b7dc235 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Mon, 26 Jun 2023 15:07:58 +0100 Subject: [PATCH 2/2] Update code/modules/cm_marines/marines_consoles.dm Co-authored-by: fira --- code/modules/cm_marines/marines_consoles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index bd8bde323a8d..4a9c5c8c8dae 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -309,7 +309,7 @@ departments = list( CARDCON_DEPARTMENT_COMMAND = ROLES_CIC & ROLES_WO, CARDCON_DEPARTMENT_AUXCOM = ROLES_AUXIL_SUPPORT & ROLES_WO, - CARDCON_DEPARTMENT_MISC = ROLES_MISC & ROLES_WO - JOB_CORPORATE_LIAISON, + CARDCON_DEPARTMENT_MISC = (ROLES_MISC & ROLES_WO) - JOB_CORPORATE_LIAISON, CARDCON_DEPARTMENT_SECURITY = ROLES_POLICE & ROLES_WO, CARDCON_DEPARTMENT_ENGINEERING = ROLES_ENGINEERING & ROLES_WO, CARDCON_DEPARTMENT_SUPPLY = ROLES_REQUISITION & ROLES_WO,