[MIRROR] Changes Nanotrasen Consultant and Blueshield's ID trims to b…

…e limited while preventing self-service AA (#5277) * 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 <[email protected]> * Update modular_nova/master_files/code/datums/id_trim/jobs.dm Co-authored-by: FlufflesTheDog <[email protected]> * oop --------- Co-authored-by: FlufflesTheDog <[email protected]> * [MIRROR] Changes Nanotrasen Consultant and Blueshield's ID trims to be limited while preventing self-service AA * Fix conflict --------- Co-authored-by: Hardly3D <[email protected]> Co-authored-by: FlufflesTheDog <[email protected]> Co-authored-by: StealsThePRs <[email protected]> Co-authored-by: Feenie <[email protected]>
Fluffy-Frontier · Jan 8, 2025 · 8c3223d · 8c3223d
1 parent c92ed7d
commit 8c3223d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -47,8 +47,8 @@
 	jobtype = /datum/job/blueshield
 	uniform = /obj/item/clothing/under/rank/blueshield
 	suit = /obj/item/clothing/suit/armor/vest/blueshield/jacket
-	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
 	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
@@ -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