Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Changes Nanotrasen Consultant and Blueshield's ID trims to be limited while preventing self-service AA #5277

Merged
merged 3 commits into from
Jan 8, 2025
Merged

[MIRROR] Changes Nanotrasen Consultant and Blueshield's ID trims to be limited while preventing self-service AA #5277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
870070e
Changes Nanotrasen Consultant and Blueshield's ID trims to be limited…
Hardly3D Jan 7, 2025
5a727fe
[MIRROR] Changes Nanotrasen Consultant and Blueshield's ID trims to b…
Jan 7, 2025
f76446d
Fix conflict
FeenieRU Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/modules/modular_computers/file_system/programs/card.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
7 changes: 0 additions & 7 deletions modular_nova/master_files/code/datums/id_trim/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@
ACCESS_SCIENCE,
ACCESS_TELEPORTER,
ACCESS_WEAPONS,
)
minimal_wildcard_access = list(
ACCESS_CAPTAIN,
ACCESS_CENT_GENERAL,
)
template_access = list(
ACCESS_CAPTAIN,
Expand All @@ -99,7 +96,6 @@
ACCESS_BAR,
ACCESS_BRIG_ENTRANCE,
ACCESS_CENT_GENERAL,
ACCESS_CHANGE_IDS,
ACCESS_CHAPEL_OFFICE,
ACCESS_COMMAND,
ACCESS_CONSTRUCTION,
Expand Down Expand Up @@ -132,10 +128,7 @@
ACCESS_THEATRE,
ACCESS_VAULT,
ACCESS_WEAPONS,
)
minimal_wildcard_access = list(
ACCESS_CAPTAIN,
ACCESS_CENT_GENERAL,
)
template_access = list(
ACCESS_CAPTAIN,
Expand Down
4 changes: 4 additions & 0 deletions modular_nova/master_files/code/game/objects/items/cards_ids.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions modular_nova/modules/blueshield/code/blueshield.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modular_nova/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading