From a6452d754137b25034f829634d64b51bf7dc0559 Mon Sep 17 00:00:00 2001
From: Cameron Lennox <killer65311@gmail.com>
Date: Wed, 29 Jan 2025 21:07:03 -0500
Subject: [PATCH] Fixes bodybags and crew console (#16997)

* Fixes bodybags

Enables the bodybag label overlay as well

* Labeling stuff

* Fixes bodybags

Enables the bodybag label overlay as well

* crewfix by Kash

Fixed by Kash

* more crew fix

* This got swapped, somehow
---
 code/datums/repositories/crew.dm              |  4 +-
 code/game/objects/items/bodybag.dm            |  9 ++--
 .../CrewMonitor/CrewMonitorCrew.tsx           | 18 ++++----
 .../tgui/interfaces/CrewMonitor/functions.ts  | 43 +++++++++++++------
 .../tgui/interfaces/CrewMonitor/types.ts      |  2 +-
 5 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/code/datums/repositories/crew.dm b/code/datums/repositories/crew.dm
index c6e3dca5565..d6c9ff2fc06 100644
--- a/code/datums/repositories/crew.dm
+++ b/code/datums/repositories/crew.dm
@@ -24,8 +24,8 @@ var/global/datum/repository/crew/crew_repository = new()
 	var/tracked = scan()
 	for(var/obj/item/clothing/under/C in tracked)
 		var/turf/pos = get_turf(C)
-		var/area/B = pos?.loc //VOREStation Add: No sensor in Dorm
-		if((C.has_sensor) && (pos?.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(B.flag_check(AREA_BLOCK_SUIT_SENSORS)) && !(is_jammed(C)) && !(is_vore_jammed(C))) //VOREStation Edit
+		var/area/B = pos?.loc //No sensor in Dorm
+		if((C.has_sensor) && (pos?.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(B.flag_check(AREA_BLOCK_SUIT_SENSORS)) && !(is_jammed(C)) && !(is_vore_jammed(C)))
 			if(ishuman(C.loc))
 				var/mob/living/carbon/human/H = C.loc
 				if(H.w_uniform != C)
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 37ce6472261..e5f2b4600e5 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -29,7 +29,8 @@
 	var/item_path = /obj/item/bodybag
 	density = FALSE
 	storage_capacity = (MOB_MEDIUM * 2) - 1
-	var/contains_body = 0
+	var/contains_body = FALSE
+	var/has_label = FALSE
 
 /obj/structure/closet/body_bag/attackby(var/obj/item/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/pen))
@@ -42,6 +43,7 @@
 		if (t)
 			src.name = "body bag - "
 			src.name += t
+			has_label = TRUE
 			add_overlay("bodybag_label")
 		else
 			src.name = "body bag"
@@ -50,6 +52,7 @@
 	else if(W.has_tool_quality(TOOL_WIRECUTTER))
 		to_chat(user, "You cut the tag off the bodybag")
 		src.name = "body bag"
+		has_label = FALSE
 		cut_overlays()
 		return
 
@@ -96,13 +99,11 @@
 	if(opened)
 		icon_state = "open"
 	else
-		icon_state = "closed_unlocked"
+		icon_state = "base"
 
 	cut_overlays()
-	/* Ours don't have toetags
 	if(has_label)
 		add_overlay("bodybag_label")
-	*/
 
 
 /obj/item/bodybag/cryobag
diff --git a/tgui/packages/tgui/interfaces/CrewMonitor/CrewMonitorCrew.tsx b/tgui/packages/tgui/interfaces/CrewMonitor/CrewMonitorCrew.tsx
index 78e0829101a..67936c03251 100644
--- a/tgui/packages/tgui/interfaces/CrewMonitor/CrewMonitorCrew.tsx
+++ b/tgui/packages/tgui/interfaces/CrewMonitor/CrewMonitorCrew.tsx
@@ -23,8 +23,10 @@ export const CrewMonitorCrew = (props: { crew: crewmember[] }) => {
 
   const { isAI, map_levels } = data;
 
+  const our_levels: number[] = [-1, ...map_levels];
+
   const levelObject = Object.fromEntries(
-    map_levels.map((level) => [level.toString(), true]),
+    our_levels.map((level) => [level.toString(), true]),
   );
 
   const [locationSearch, setLocationSearch] = useState<object>(levelObject);
@@ -57,11 +59,11 @@ export const CrewMonitorCrew = (props: { crew: crewmember[] }) => {
   return (
     <Table>
       <Table.Row header>
-        <Table.Cell>Name</Table.Cell>
+        <Table.Cell width="35%">Name</Table.Cell>
         <Table.Cell>Status</Table.Cell>
-        <Table.Cell>Location</Table.Cell>
+        <Table.Cell width="30%">Location</Table.Cell>
       </Table.Row>
-      <Table.Row>
+      <Table.Row mb="rem">
         <Table.Cell>
           <Stack>
             <Stack.Item grow>
@@ -76,10 +78,10 @@ export const CrewMonitorCrew = (props: { crew: crewmember[] }) => {
               <Button
                 selected={sortType === 'name'}
                 icon={nameSortOrder ? 'arrow-down' : 'arrow-up'}
-                height="19px"
                 tooltip={nameSortOrder ? 'Descending order' : 'Ascending order'}
                 tooltipPosition="bottom-end"
                 ml="0.5rem"
+                mr="1rem"
                 onClick={() => {
                   setSortType('name');
                   setNameSortOrder(!nameSortOrder);
@@ -110,7 +112,6 @@ export const CrewMonitorCrew = (props: { crew: crewmember[] }) => {
           <Button
             selected={sortType === 'damage'}
             icon={damageSortOrder ? 'arrow-down' : 'arrow-up'}
-            height="19px"
             tooltip={damageSortOrder ? 'Descending order' : 'Ascending order'}
             tooltipPosition="bottom-end"
             ml="0.5rem"
@@ -121,7 +122,7 @@ export const CrewMonitorCrew = (props: { crew: crewmember[] }) => {
           />
         </Table.Cell>
         <Table.Cell>
-          {map_levels
+          {our_levels
             .sort((a, b) => Number(a) - Number(b))
             .map((level) => (
               <Button
@@ -134,13 +135,12 @@ export const CrewMonitorCrew = (props: { crew: crewmember[] }) => {
                   });
                 }}
               >
-                {level.toString()}
+                {level === -1 ? '?' : level.toString()}
               </Button>
             ))}
           <Button
             selected={sortType === 'location'}
             icon={locationSortOrder ? 'arrow-down' : 'arrow-up'}
-            height="19px"
             tooltip={locationSortOrder ? 'Descending order' : 'Ascending order'}
             tooltipPosition="bottom-end"
             ml="0.5rem"
diff --git a/tgui/packages/tgui/interfaces/CrewMonitor/functions.ts b/tgui/packages/tgui/interfaces/CrewMonitor/functions.ts
index 5a53003c1c3..04e82af13af 100644
--- a/tgui/packages/tgui/interfaces/CrewMonitor/functions.ts
+++ b/tgui/packages/tgui/interfaces/CrewMonitor/functions.ts
@@ -1,4 +1,3 @@
-import { filter, sortBy } from 'common/collections';
 import { flow } from 'tgui-core/fp';
 
 import { crewmember } from './types';
@@ -29,6 +28,24 @@ export function getTotalDamage(cm: crewmember) {
   return cm.brute + cm.fire + cm.oxy + cm.tox;
 }
 
+function crewStatus(
+  cm: crewmember,
+  deceasedStatus: boolean,
+  livingStatus: boolean,
+  unconsciousStatus: boolean,
+) {
+  if (deceasedStatus && cm.dead) {
+    return true;
+  }
+  if (livingStatus && !cm.dead && (!cm.stat || cm.stat < 1)) {
+    return true;
+  }
+  if (unconsciousStatus && cm.stat === 1) {
+    return true;
+  }
+  return false;
+}
+
 export function getShownCrew(
   crew: crewmember[],
   locationSearch: object,
@@ -43,23 +60,19 @@ export function getShownCrew(
       if (!locationSearch) {
         return crew;
       } else {
-        return filter(crew, (cm) => locationSearch[cm.realZ.toString()]);
+        return crew.filter((cm) => locationSearch[cm.realZ.toString()]);
       }
     },
     (crew: crewmember[]) => {
-      return filter(
-        crew,
-        (cm) =>
-          (deceasedStatus && cm.dead === true) ||
-          (livingStatus && cm.stat < 1) ||
-          (unconsciousStatus && cm.stat === 1),
+      return crew.filter((cm) =>
+        crewStatus(cm, deceasedStatus, livingStatus, unconsciousStatus),
       );
     },
     (crew: crewmember[]) => {
       if (!nameSearch) {
         return crew;
       } else {
-        return filter(crew, testSearch);
+        return crew.filter(testSearch);
       }
     },
   ])(crew);
@@ -75,7 +88,7 @@ export function getSortedCrew(
   return flow([
     (shownCrew: crewmember[]) => {
       if (sortType === 'name') {
-        const sorted = sortBy(shownCrew, (cm) => cm.name);
+        const sorted = shownCrew.sort((a, b) => a.name.localeCompare(b.name));
         if (nameSortOrder) {
           return sorted.reverse();
         }
@@ -86,7 +99,9 @@ export function getSortedCrew(
     },
     (shownCrew: crewmember[]) => {
       if (sortType === 'damage') {
-        const sorted = sortBy(shownCrew, (cm) => getTotalDamage(cm));
+        const sorted = shownCrew.sort(
+          (a, b) => getTotalDamage(a) - getTotalDamage(b),
+        );
         if (damageSortOrder) {
           return sorted.reverse();
         }
@@ -97,7 +112,7 @@ export function getSortedCrew(
     },
     (shownCrew: crewmember[]) => {
       if (sortType === 'location') {
-        const sorted = sortBy(shownCrew, (cm) => cm.x);
+        const sorted = shownCrew.sort((a, b) => a.x - b.x);
         if (locationSortOrder) {
           return sorted.reverse();
         }
@@ -108,7 +123,7 @@ export function getSortedCrew(
     },
     (shownCrew: crewmember[]) => {
       if (sortType === 'location') {
-        const sorted = sortBy(shownCrew, (cm) => cm.y);
+        const sorted = shownCrew.sort((a, b) => a.y - b.y);
         if (locationSortOrder) {
           return sorted.reverse();
         }
@@ -119,7 +134,7 @@ export function getSortedCrew(
     },
     (shownCrew: crewmember[]) => {
       if (sortType === 'location') {
-        const sorted = sortBy(shownCrew, (cm) => cm.realZ);
+        const sorted = shownCrew.sort((a, b) => a.realZ - b.realZ);
         if (locationSortOrder) {
           return sorted.reverse();
         }
diff --git a/tgui/packages/tgui/interfaces/CrewMonitor/types.ts b/tgui/packages/tgui/interfaces/CrewMonitor/types.ts
index 08ba01f4218..79449b42a27 100644
--- a/tgui/packages/tgui/interfaces/CrewMonitor/types.ts
+++ b/tgui/packages/tgui/interfaces/CrewMonitor/types.ts
@@ -13,7 +13,7 @@ export type crewmember = {
   rank: string;
   assignment: string;
   dead: BooleanLike;
-  stat: number;
+  stat?: number;
   oxy: number;
   tox: number;
   fire: number;