From 499f9463cd2fa258a05bf3dc578c09c1b4f3bd03 Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Mon, 1 Aug 2022 22:46:39 +0200 Subject: [PATCH] fixes chameleon card reset issues and makes nuke op trim have a hud icon (#68879) * partial fix * outfits now update ids --- code/controllers/subsystem/id_access.dm | 3 +++ code/datums/id_trim/syndicate.dm | 11 ++++++----- code/datums/outfit.dm | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index 94fd11c3f98..bad70a1c556 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -456,6 +456,9 @@ SUBSYSTEM_DEF(id_access) id_card.trim_state_override = null id_card.trim_assignment_override = null id_card.sechud_icon_state_override = null + id_card.department_color_override = null + id_card.department_state_override = null + id_card.subdepartment_color_override = null /** * Adds the accesses associated with a trim to an ID card. diff --git a/code/datums/id_trim/syndicate.dm b/code/datums/id_trim/syndicate.dm index d4c35252fce..087d61fc857 100644 --- a/code/datums/id_trim/syndicate.dm +++ b/code/datums/id_trim/syndicate.dm @@ -40,6 +40,12 @@ trim_state = "trim_syndicate" department_color = COLOR_SYNDIE_RED subdepartment_color = COLOR_SYNDIE_RED + sechud_icon_state = SECHUD_SYNDICATE + +/// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards. +/datum/id_trim/chameleon/operative/nuke_leader + assignment = "Syndicate Operative Leader" + access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) /// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards. /datum/id_trim/chameleon/operative/clown @@ -50,8 +56,3 @@ /datum/id_trim/chameleon/operative/clown_leader assignment = "Syndicate Entertainment Operative Leader" access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) - -/// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards. -/datum/id_trim/chameleon/operative/nuke_leader - assignment = "Syndicate Operative Leader" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index a2988edf510..05445b164e5 100644 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -200,6 +200,7 @@ if(id_trim) if(!SSid_access.apply_trim_to_card(id_card, id_trim)) WARNING("Unable to apply trim [id_trim] to [id_card] in outfit [name].") + H.sec_hud_set_ID() if(suit_store) EQUIP_OUTFIT_ITEM(suit_store, ITEM_SLOT_SUITSTORE)