OK CSS

cmss13-devs · Nov 7, 2023 · 9eeab0f · 9eeab0f
1 parent 9e8f38a
commit 9eeab0f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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) => {
         <span
           className={classes([
             'squadranks16x16',
-            `squad-${data.squad_ref}-hud-${ftl.rank}`,
+            `squad-${data.partial_squad_ref}-hud-${ftl.rank}`,
           ])}
         />
       </Stack.Item>
@@ -225,7 +225,7 @@ const FireTeamMember = (
         <span
           className={classes([
             'squadranks16x16',
-            `squad-${data.squad_ref}-hud-${props.member.rank}`,
+            `squad-${data.partial_squad_ref}-hud-${props.member.rank}`,
           ])}
         />
       </TableCell>