From 870070e15f9b4d39f18a642355687636020f0fa8 Mon Sep 17 00:00:00 2001 From: Hardly3D <66234359+Hardly3D@users.noreply.github.com> Date: Tue, 7 Jan 2025 01:14:40 -0300 Subject: [PATCH 1/3] Changes Nanotrasen Consultant and Blueshield's ID trims to be limited while preventing self-service AA (#4602) * Changes NTC and BS's trim * And encourages them to interact with the HoP * A better solution (thanks deadmon) * Update modular_nova/master_files/code/datums/id_trim/jobs.dm Whoops Co-authored-by: FlufflesTheDog * Update modular_nova/master_files/code/datums/id_trim/jobs.dm Co-authored-by: FlufflesTheDog * oop --------- Co-authored-by: FlufflesTheDog --- .../modules/modular_computers/file_system/programs/card.dm | 4 ++++ modular_nova/master_files/code/datums/id_trim/jobs.dm | 7 ------- .../master_files/code/game/objects/items/cards_ids.dm | 4 ++++ modular_nova/modules/blueshield/code/blueshield.dm | 5 +++++ .../modules/nanotrasen_rep/code/nanotrasen_consultant.dm | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index fe5fbbdfce1..b2f574e89ba 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -59,6 +59,10 @@ for(var/access_as_text in managers) var/list/info = managers[access_as_text] var/access = access_as_text + // NOVA EDIT ADDITION BEGIN - Prevents those with captain access only from changing their own access (Blueshields and NTCs) + if(access == ACCESS_CAPTAIN) + continue + // NOVA EDIT ADDITION END if((access in auth_card.access) && ((target_dept in info["regions"]) || !target_dept)) region_access |= info["regions"] job_templates |= info["templates"] diff --git a/modular_nova/master_files/code/datums/id_trim/jobs.dm b/modular_nova/master_files/code/datums/id_trim/jobs.dm index 215fc6c20ca..d6eccc59de1 100644 --- a/modular_nova/master_files/code/datums/id_trim/jobs.dm +++ b/modular_nova/master_files/code/datums/id_trim/jobs.dm @@ -74,10 +74,7 @@ ACCESS_SCIENCE, ACCESS_TELEPORTER, ACCESS_WEAPONS, - ) - minimal_wildcard_access = list( ACCESS_CAPTAIN, - ACCESS_CENT_GENERAL, ) template_access = list( ACCESS_CAPTAIN, @@ -99,7 +96,6 @@ ACCESS_BAR, ACCESS_BRIG_ENTRANCE, ACCESS_CENT_GENERAL, - ACCESS_CHANGE_IDS, ACCESS_CHAPEL_OFFICE, ACCESS_COMMAND, ACCESS_CONSTRUCTION, @@ -132,10 +128,7 @@ ACCESS_THEATRE, ACCESS_VAULT, ACCESS_WEAPONS, - ) - minimal_wildcard_access = list( ACCESS_CAPTAIN, - ACCESS_CENT_GENERAL, ) template_access = list( ACCESS_CAPTAIN, diff --git a/modular_nova/master_files/code/game/objects/items/cards_ids.dm b/modular_nova/master_files/code/game/objects/items/cards_ids.dm index 3ca1380d481..0ee066b1205 100644 --- a/modular_nova/master_files/code/game/objects/items/cards_ids.dm +++ b/modular_nova/master_files/code/game/objects/items/cards_ids.dm @@ -31,3 +31,7 @@ icon = 'modular_nova/master_files/icons/obj/card.dmi' icon_state = "card_solfed" assigned_icon_state = "assigned_solfed" + +// Station CC +/obj/item/card/id/advanced/centcom/station + wildcard_slots = WILDCARD_LIMIT_SILVER diff --git a/modular_nova/modules/blueshield/code/blueshield.dm b/modular_nova/modules/blueshield/code/blueshield.dm index 2602def9ec8..bf9132f76fa 100644 --- a/modular_nova/modules/blueshield/code/blueshield.dm +++ b/modular_nova/modules/blueshield/code/blueshield.dm @@ -47,8 +47,13 @@ jobtype = /datum/job/blueshield uniform = /obj/item/clothing/under/rank/blueshield suit = /obj/item/clothing/suit/armor/vest/blueshield/jacket +<<<<<<< HEAD gloves = /obj/item/clothing/gloves/tackler/combat/insulated id = /obj/item/card/id/advanced/centcom +======= + gloves = /obj/item/clothing/gloves/tackler/security + id = /obj/item/card/id/advanced/centcom/station +>>>>>>> 8cb3c78e96e (Changes Nanotrasen Consultant and Blueshield's ID trims to be limited while preventing self-service AA (#4602)) shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_bs/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses diff --git a/modular_nova/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_nova/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index cf7fb0dbd29..e8505a0b228 100644 --- a/modular_nova/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_nova/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -69,7 +69,7 @@ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/centcom) - id = /obj/item/card/id/advanced/centcom + id = /obj/item/card/id/advanced/centcom/station id_trim = /datum/id_trim/job/nanotrasen_consultant /obj/item/radio/headset/heads/nanotrasen_consultant From 5a727fe84b88dd2504f285b44300f160ae8e1988 Mon Sep 17 00:00:00 2001 From: StealsThePRs Date: Tue, 7 Jan 2025 07:15:37 +0300 Subject: [PATCH 2/3] [MIRROR] Changes Nanotrasen Consultant and Blueshield's ID trims to be limited while preventing self-service AA From f76446d045fedcac4ed9039aff10f52b268e7333 Mon Sep 17 00:00:00 2001 From: Feenie <62373791+FeenieRU@users.noreply.github.com> Date: Wed, 8 Jan 2025 04:52:32 +0300 Subject: [PATCH 3/3] Fix conflict --- modular_nova/modules/blueshield/code/blueshield.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modular_nova/modules/blueshield/code/blueshield.dm b/modular_nova/modules/blueshield/code/blueshield.dm index bf9132f76fa..01c765152ef 100644 --- a/modular_nova/modules/blueshield/code/blueshield.dm +++ b/modular_nova/modules/blueshield/code/blueshield.dm @@ -47,13 +47,8 @@ jobtype = /datum/job/blueshield uniform = /obj/item/clothing/under/rank/blueshield suit = /obj/item/clothing/suit/armor/vest/blueshield/jacket -<<<<<<< HEAD - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - id = /obj/item/card/id/advanced/centcom -======= gloves = /obj/item/clothing/gloves/tackler/security id = /obj/item/card/id/advanced/centcom/station ->>>>>>> 8cb3c78e96e (Changes Nanotrasen Consultant and Blueshield's ID trims to be limited while preventing self-service AA (#4602)) shoes = /obj/item/clothing/shoes/jackboots ears = /obj/item/radio/headset/headset_bs/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses