From 9eeab0f0845fb664bac2004ae9746ba34162d2c2 Mon Sep 17 00:00:00 2001 From: Morrow Date: Tue, 7 Nov 2023 09:50:45 -0500 Subject: [PATCH] OK CSS --- code/game/jobs/job/marine/squad_info.dm | 2 +- code/modules/asset_cache/asset_list_items.dm | 2 +- tgui/packages/tgui/interfaces/SquadInfo.tsx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/jobs/job/marine/squad_info.dm b/code/game/jobs/job/marine/squad_info.dm index d19f171184..6a59ecf560 100644 --- a/code/game/jobs/job/marine/squad_info.dm +++ b/code/game/jobs/job/marine/squad_info.dm @@ -23,7 +23,7 @@ "primary" = primary_objective, "secondary" = secondary_objective, ) - data["squad_ref"] = REF(src) + data["partial_squad_ref"] = copytext(REF(src), 2, 12) return data /datum/squad/proc/get_leadership(mob/user) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index cd69bab142..cf4f0b52c6 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -297,7 +297,7 @@ background.Crop(25,25,32,32) background.Scale(16,16) - Insert("squad-[REF(squad)]-hud-[iconref[1]]", background) + Insert("squad-[copytext(REF(squad), 2, 12)]-hud-[iconref[1]]", background) return ..() /datum/asset/spritesheet/vending_products diff --git a/tgui/packages/tgui/interfaces/SquadInfo.tsx b/tgui/packages/tgui/interfaces/SquadInfo.tsx index 79d4c80f7d..6503caf4ce 100644 --- a/tgui/packages/tgui/interfaces/SquadInfo.tsx +++ b/tgui/packages/tgui/interfaces/SquadInfo.tsx @@ -41,7 +41,7 @@ interface SquadProps { total_free: number; user: { name: string; observer: number }; squad: string; - squad_ref: string; + partial_squad_ref: string; squad_color: string; is_lead: 'pltsgt' | 'SQ1' | 'SQ2' | 0; objective: { primary?: string; secondary?: string }; @@ -59,7 +59,7 @@ const FireTeamLeadLabel = (props: { ftl: SquadMarineEntry }, context) => { @@ -225,7 +225,7 @@ const FireTeamMember = (