TGS Test Merge (#6373)

cmss13-devs · Jun 4, 2024 · 96457cd · 96457cd
2 parents e3808a4 + c0d3b66
commit 96457cd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
@@ -118,6 +118,7 @@
 					var/datum/caste_datum/caste = xeno.caste
 					serialized["caste"] = caste.caste_type
 					serialized["icon"] = caste.minimap_icon
+					serialized["hivenumber"] = xeno.hivenumber
 				xenos += list(serialized)
 				continue
 

diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx
@@ -129,17 +129,25 @@ const ObservableSearch = () => {
 const xenoSplitter = (members: Array<Observable>) => {
   const primeHive: Array<Observable> = [];
   const corruptedHive: Array<Observable> = [];
+  const forsakenHive: Array<Observable> = [];
+  const otherHives: Array<Observable> = [];
 
   members.forEach((x) => {
-    if (x.full_name?.includes('Corrupted')) {
+    if (x.hivenumber?.includes('normal')) {
+      primeHive.push(x);
+    } else if (x.hivenumber?.includes('corrupted')) {
       corruptedHive.push(x);
+    } else if (x.hivenumber?.includes('forsaken')) {
+      forsakenHive.push(x);
     } else {
-      primeHive.push(x);
+      otherHives.push(x);
     }
   });
   const squads = [
     buildSquadObservable('Prime', 'xeno', primeHive),
     buildSquadObservable('Corrupted', 'green', corruptedHive),
+    buildSquadObservable('Forsaken', 'grey', forsakenHive),
+    buildSquadObservable('Other', 'light-grey', otherHives),
   ];
   return squads;
 };

diff --git a/tgui/packages/tgui/interfaces/Orbit/types.ts b/tgui/packages/tgui/interfaces/Orbit/types.ts
@@ -38,6 +38,7 @@ export type Observable = {
   nickname?: string;
   orbiters?: number;
   ref: string;
+  hivenumber: string;
 };
 
 export type SquadObservable = {