From f4a9cea05987f3c3a805415c19b1afae87ffb4a7 Mon Sep 17 00:00:00 2001
From: FalloutFalcon <falloutfalconplays@gmail.com>
Date: Tue, 28 May 2024 12:51:18 -0500
Subject: [PATCH] simplification of behaviors

---
 code/__DEFINES/datacore.dm                    |   4 +-
 .../game/machinery/computer/record/medical.dm |   8 +
 .../game/machinery/computer/record/records.dm |   8 -
 .../machinery/computer/record/security.dm     |  56 +++-
 .../interfaces/MedicalRecords/RecordTabs.tsx  |  25 +-
 .../interfaces/MedicalRecords/RecordView.tsx  |  28 +-
 .../tgui/interfaces/MedicalRecords/helpers.ts |  11 +-
 .../SecurityRecords/CrimeWatcher.tsx          | 284 ------------------
 .../interfaces/SecurityRecords/RecordTabs.tsx |  32 +-
 .../interfaces/SecurityRecords/RecordView.tsx | 108 +++----
 .../interfaces/SecurityRecords/helpers.ts     |  54 +---
 .../tgui/interfaces/SecurityRecords/types.ts  |  16 +-
 12 files changed, 163 insertions(+), 471 deletions(-)
 delete mode 100644 tgui/packages/tgui/interfaces/SecurityRecords/CrimeWatcher.tsx

diff --git a/code/__DEFINES/datacore.dm b/code/__DEFINES/datacore.dm
index 3c61434ae757..7d55dda74d29 100644
--- a/code/__DEFINES/datacore.dm
+++ b/code/__DEFINES/datacore.dm
@@ -20,6 +20,8 @@
 
 #define DATACORE_NOTES "notes"
 //#define DATACORE_NOTES_DETAILS "notes_d"
+#define DATACORE_NOTES_SECURITY "security_note"
+#define DATACORE_NOTES_MEDICAL "medical_note"
 
 #define DATACORE_RANK "rank"
 #define DATACORE_INITIAL_RANK "initial_rank"
@@ -74,7 +76,7 @@
 #define WANTED_SUSPECT "Suspected"
 
 /// List of available wanted statuses
-#define WANTED_STATUSES(...) list(\
+#define WANTED_STATUSES list(\
 	WANTED_NONE, \
 	WANTED_SUSPECT, \
 	WANTED_ARREST, \
diff --git a/code/game/machinery/computer/record/medical.dm b/code/game/machinery/computer/record/medical.dm
index 532aba0990f6..e4c3895b52d6 100644
--- a/code/game/machinery/computer/record/medical.dm
+++ b/code/game/machinery/computer/record/medical.dm
@@ -42,6 +42,14 @@
 
 	return data
 
+/obj/machinery/computer/records/med/ui_static_data(mob/user)
+	var/list/data = list()
+	data["min_age"] = AGE_MIN
+	data["max_age"] = AGE_MAX
+	data["physical_statuses"] = PHYSICAL_STATUSES
+	data["mental_statuses"] = MENTAL_STATUSES
+	return data
+
 /obj/machinery/computer/records/med/syndie
 	icon_keyboard = "syndie_key"
 
diff --git a/code/game/machinery/computer/record/records.dm b/code/game/machinery/computer/record/records.dm
index 1a4532a33177..e41098197681 100644
--- a/code/game/machinery/computer/record/records.dm
+++ b/code/game/machinery/computer/record/records.dm
@@ -25,14 +25,6 @@
 	insert_new_record(user, attacking_item)
 */
 
-/obj/machinery/computer/records/ui_static_data(mob/user)
-	var/list/data = list()
-	data["min_age"] = AGE_MIN
-	data["max_age"] = AGE_MAX
-	data["physical_statuses"] = PHYSICAL_STATUSES
-	data["mental_statuses"] = MENTAL_STATUSES
-	return data
-
 /obj/machinery/computer/records/ui_data(mob/user)
 	var/list/data = ..()
 
diff --git a/code/game/machinery/computer/record/security.dm b/code/game/machinery/computer/record/security.dm
index da2c48ddee29..29d8f9e2164d 100644
--- a/code/game/machinery/computer/record/security.dm
+++ b/code/game/machinery/computer/record/security.dm
@@ -17,10 +17,9 @@
 		ui.set_autoupdate(FALSE)
 		ui.open()
 
-/obj/machinery/computer/records/med/ui_data(mob/user)
+/obj/machinery/computer/records/sec/ui_data(mob/user)
 	var/list/data = ..()
 
-	data["available_statuses"] = WANTED_STATUSES()
 	data["current_user"] = user.name
 
 	var/list/records = list()
@@ -43,12 +42,65 @@
 			rank = target.fields[DATACORE_RANK],
 			species = target.fields[DATACORE_SPECIES],
 			wanted_status = target.fields[DATACORE_CRIMINAL_STATUS],
+			security_note = target.fields[DATACORE_NOTES_SECURITY],
 		))
 
 	data["records"] = records
 
 	return data
 
+/obj/machinery/computer/records/sec/ui_static_data(mob/user)
+	var/list/data = list()
+	data["min_age"] = AGE_MIN
+	data["max_age"] = AGE_MAX
+	data["available_statuses"] = WANTED_STATUSES
+	return data
+
+/obj/machinery/computer/records/sec/ui_act(action, list/params, datum/tgui/ui)
+	. = ..()
+	if(.)
+		return
+
+	var/mob/user = ui.user
+
+	var/datum/data/record/target
+	if(params["record_ref"])
+		target = locate(params["record_ref"]) in SSdatacore.get_records(linked_ship)
+
+	if(!target)
+		return FALSE
+
+	switch(action)
+		if("add_crime")
+			//add_crime(user, target, params)
+			return TRUE
+
+		if("edit_crime")
+			//edit_crime(user, target, params)
+			return TRUE
+
+		if("invalidate_crime")
+			//invalidate_crime(user, target, params)
+			return TRUE
+
+		if("set_note")
+			var/note = trim(params["security_note"], MAX_MESSAGE_LEN)
+			investigate_log("[user] has changed the security note of record: \"[target]\" from \"[target.fields[DATACORE_NOTES_SECURITY]]\" to \"[note]\".")
+			target.fields[DATACORE_NOTES_SECURITY] = note
+			return TRUE
+
+		if("set_wanted_status")
+			var/wanted_status = params["wanted_status"]
+			if(!wanted_status || !(wanted_status in WANTED_STATUSES))
+				return FALSE
+
+			investigate_log("[target.name] has been set from [target.fields[DATACORE_CRIMINAL_STATUS]] to [wanted_status] by [key_name(usr)].", INVESTIGATE_RECORDS)
+			target.fields[DATACORE_CRIMINAL_STATUS] = wanted_status
+
+			return TRUE
+
+	return FALSE
+
 /obj/machinery/computer/records/sec/syndie
 	icon_keyboard = "syndie_key"
 
diff --git a/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx b/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx
index 62c90660390f..d9cc1bae598c 100644
--- a/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx
+++ b/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx
@@ -5,9 +5,6 @@ import { useBackend, useLocalState } from 'tgui/backend';
 import {
   Box,
   Button,
-  Icon,
-  Input,
-  NoticeBox,
   Section,
   Stack,
   Tabs,
@@ -18,13 +15,14 @@ import { MedicalRecord, MedicalRecordData } from './types';
 /** Displays all found records. */
 export const MedicalRecordTabs = (props, context) => {
   const { act, data } = useBackend<MedicalRecordData>(context);
+  const { records = [] } = data;
 
   return (
     <Stack fill vertical>
       <Stack.Item grow>
         <Section fill scrollable>
           <Tabs vertical>
-            {data.records.map((record, index) => (
+            {records.map((record, index) => (
               <CrewTab key={index} record={record} />
             ))}
           </Tabs>
@@ -38,8 +36,7 @@ export const MedicalRecordTabs = (props, context) => {
               onClick={() => act('new_record')}
               icon="plus"
               tooltip="New Record."
-            >
-            </Button>
+            ></Button>
           </Stack.Item>
           <Stack.Item>
             <Button.Confirm
@@ -57,11 +54,9 @@ export const MedicalRecordTabs = (props, context) => {
 
 /** Individual crew tab */
 const CrewTab = (props: { record: MedicalRecord }, context) => {
-  const [selectedRecord, setSelectedRecord] = useLocalState(
-    context,
-    'medicalRecord',
-    undefined
-  );
+const [selectedRecord, setSelectedRecord] = useLocalState<
+    MedicalRecord | undefined
+  >(context, 'medicalRecord', undefined);
 
   const { act, data } = useBackend(context);
   const { assigned_view } = data;
@@ -81,13 +76,17 @@ const CrewTab = (props: { record: MedicalRecord }, context) => {
     }
   };
 
+  const isSelected = selectedRecord?.record_ref === record_ref;
+
   return (
     <Tabs.Tab
       className="candystripe"
       onClick={() => selectRecord(record)}
-      selected={selectedRecord?.record_ref === record_ref}
+      selected={isSelected}
     >
-      {name}
+      <Box bold={isSelected}>
+        {name}
+      </Box>
     </Tabs.Tab>
   );
 };
diff --git a/tgui/packages/tgui/interfaces/MedicalRecords/RecordView.tsx b/tgui/packages/tgui/interfaces/MedicalRecords/RecordView.tsx
index 3df7bb6d0200..c909fc62dfe8 100644
--- a/tgui/packages/tgui/interfaces/MedicalRecords/RecordView.tsx
+++ b/tgui/packages/tgui/interfaces/MedicalRecords/RecordView.tsx
@@ -52,15 +52,20 @@ export const MedicalRecordView = (props, context) => {
       <Stack.Item grow>
         <Section
           buttons={
-            <Button.Confirm
-              content="Delete"
-              icon="trash"
-              onClick={() => act('expunge_record', { record_ref: record_ref })}
-              tooltip="Expunge record data."
-            />
+            <Stack>
+              <Stack.Item>
+                <Button.Confirm
+                  content="Delete"
+                  icon="trash"
+                  onClick={() =>
+                    act('delete_record', { record_ref: record_ref })
+                  }
+                  tooltip="Delete record data."
+                />
+              </Stack.Item>
+            </Stack>
           }
           fill
-          scrollable
           title={name}
         >
           <LabeledList>
@@ -119,7 +124,7 @@ export const MedicalRecordView = (props, context) => {
                 return (
                   <Button
                     color={isSelected ? PHYSICALSTATUS2COLOR[button] : 'grey'}
-                    height={'1.75rem'}
+
                     icon={PHYSICALSTATUS2ICON[button]}
                     key={index}
                     onClick={() =>
@@ -128,10 +133,11 @@ export const MedicalRecordView = (props, context) => {
                         physical_status: button,
                       })
                     }
+                    height={'1.75rem'}
+                    width={!isSelected ? '3.0rem' : 3.0}
                     textAlign="center"
                     tooltip={PHYSICALSTATUS2DESC[button] || ''}
                     tooltipPosition="bottom-start"
-                    width={!isSelected ? '3.0rem' : 3.0}
                   >
                     {button[0]}
                   </Button>
@@ -149,7 +155,6 @@ export const MedicalRecordView = (props, context) => {
                 return (
                   <Button
                     color={isSelected ? MENTALSTATUS2COLOR[button] : 'grey'}
-                    height={'1.75rem'}
                     icon={MENTALSTATUS2ICON[button]}
                     key={index}
                     onClick={() =>
@@ -158,10 +163,11 @@ export const MedicalRecordView = (props, context) => {
                         mental_status: button,
                       })
                     }
+                    height={'1.75rem'}
+                    width={!isSelected ? '3.0rem' : 3.0}
                     textAlign="center"
                     tooltip={MENTALSTATUS2DESC[button] || ''}
                     tooltipPosition="bottom-start"
-                    width={!isSelected ? '3.0rem' : 3.0}
                   >
                     {button[0]}
                   </Button>
diff --git a/tgui/packages/tgui/interfaces/MedicalRecords/helpers.ts b/tgui/packages/tgui/interfaces/MedicalRecords/helpers.ts
index 8b4318e59750..a5606c9be822 100644
--- a/tgui/packages/tgui/interfaces/MedicalRecords/helpers.ts
+++ b/tgui/packages/tgui/interfaces/MedicalRecords/helpers.ts
@@ -2,11 +2,6 @@ import { useBackend, useLocalState } from 'tgui/backend';
 
 import { MedicalRecord, MedicalRecordData } from './types';
 
-/** Splits a medical string on <br> into a string array */
-export const getQuirkStrings = (string: string) => {
-  return string?.split('<br>') || [];
-};
-
 /** We need an active reference and this a pain to rewrite */
 export const getMedicalRecord = (props, context) => {
   const [selectedRecord, SetRecord] = useLocalState<MedicalRecord>(
@@ -14,6 +9,7 @@ export const getMedicalRecord = (props, context) => {
     'medicalRecord',
     ''
   );
+  if (!selectedRecord) return;
   const { data } = useBackend<MedicalRecord>(context);
   const { records = [] } = data;
   const foundRecord = records.find(
@@ -23,3 +19,8 @@ export const getMedicalRecord = (props, context) => {
 
   return foundRecord;
 };
+
+/** Splits a medical string on <br> into a string array */
+export const getQuirkStrings = (string: string) => {
+  return string?.split('<br>') || [];
+};
diff --git a/tgui/packages/tgui/interfaces/SecurityRecords/CrimeWatcher.tsx b/tgui/packages/tgui/interfaces/SecurityRecords/CrimeWatcher.tsx
deleted file mode 100644
index f5f0c7323b47..000000000000
--- a/tgui/packages/tgui/interfaces/SecurityRecords/CrimeWatcher.tsx
+++ /dev/null
@@ -1,284 +0,0 @@
-import { useBackend, useLocalState } from 'tgui/backend';
-import {
-  BlockQuote,
-  Box,
-  Button,
-  Collapsible,
-  Icon,
-  Input,
-  LabeledList,
-  NoticeBox,
-  RestrictedInput,
-  Section,
-  Stack,
-  Tabs,
-  TextArea,
-  Tooltip,
-} from 'tgui/components';
-
-import { getSecurityRecord } from './helpers';
-import { Crime, SECURETAB, SecurityRecordsData } from './types';
-
-/** Displays a list of crimes and allows to add new ones. */
-export const CrimeWatcher = (props, context) => {
-  const foundRecord = getSecurityRecord();
-  if (!foundRecord) return <> </>;
-
-  const { crimes, citations } = foundRecord;
-  const [selectedTab, setSelectedTab] = useLocalState<SECURETAB>(
-    context,
-    'selectedTab',
-    SECURETAB.Crimes
-  );
-
-  return (
-    <Stack fill vertical>
-      <Stack.Item>
-        <Tabs fluid>
-          <Tabs.Tab
-            onClick={() => setSelectedTab(SECURETAB.Crimes)}
-            selected={selectedTab === SECURETAB.Crimes}
-          >
-            Crimes: {crimes.length}
-          </Tabs.Tab>
-          <Tabs.Tab
-            onClick={() => setSelectedTab(SECURETAB.Citations)}
-            selected={selectedTab === SECURETAB.Citations}
-          >
-            Citations: {citations.length}
-          </Tabs.Tab>
-          <Tooltip content="Add a new crime or citation" position="bottom">
-            <Tabs.Tab
-              onClick={() => setSelectedTab(SECURETAB.Add)}
-              selected={selectedTab === SECURETAB.Add}
-            >
-              <Icon name="plus" />
-            </Tabs.Tab>
-          </Tooltip>
-        </Tabs>
-      </Stack.Item>
-      <Stack.Item grow>
-        <Section fill scrollable>
-          {selectedTab < SECURETAB.Add ? (
-            <CrimeList tab={selectedTab} />
-          ) : (
-            <CrimeAuthor />
-          )}
-        </Section>
-      </Stack.Item>
-    </Stack>
-  );
-};
-
-/** Displays the crimes and citations of a record. */
-const CrimeList = (props) => {
-  const foundRecord = getSecurityRecord();
-  if (!foundRecord) return <> </>;
-
-  const { citations, crimes } = foundRecord;
-  const { tab } = props;
-  const toDisplay = tab === SECURETAB.Crimes ? crimes : citations;
-
-  return (
-    <Stack fill vertical>
-      {!toDisplay.length ? (
-        <Stack.Item>
-          <NoticeBox>
-            No {tab === SECURETAB.Crimes ? 'crimes' : 'citations'} found.
-          </NoticeBox>
-        </Stack.Item>
-      ) : (
-        toDisplay.map((item, index) => <CrimeDisplay key={index} item={item} />)
-      )}
-    </Stack>
-  );
-};
-
-/** Displays an individual crime */
-const CrimeDisplay = (props, context, { item }: { item: Crime }) => {
-  const foundRecord = getSecurityRecord(props, context);
-  if (!foundRecord) return <> </>;
-
-  const { crew_ref } = foundRecord;
-  const { act, data } = useBackend<SecurityRecordsData>(context);
-  const { current_user, higher_access } = data;
-  const { author, crime_ref, details, fine, name, paid, time, valid } = item;
-  const showFine = !!fine && fine > 0 ? `: ${fine} cr` : '';
-
-  let collapsibleColor = '';
-  if (!valid) {
-    collapsibleColor = 'grey';
-  } else if (fine && fine > 0) {
-    collapsibleColor = 'average';
-  }
-
-  let displayTitle = name;
-  if (fine && fine > 0) {
-    displayTitle = name.slice(0, 18) + showFine;
-  }
-
-  const [editing, setEditing] = useLocalState(`editing_${crime_ref}`, false);
-
-  return (
-    <Stack.Item>
-      <Collapsible color={collapsibleColor} open={editing} title={displayTitle}>
-        <LabeledList>
-          <LabeledList.Item label="Time">{time}</LabeledList.Item>
-          <LabeledList.Item label="Author">{author}</LabeledList.Item>
-          <LabeledList.Item color={!valid ? 'bad' : 'good'} label="Status">
-            {!valid ? 'Void' : 'Active'}
-          </LabeledList.Item>
-          {fine && (
-            <>
-              <LabeledList.Item color="bad" label="Fine">
-                {fine}cr <Icon color="gold" name="coins" />
-              </LabeledList.Item>
-              <LabeledList.Item color="good" label="Paid">
-                {paid}cr <Icon color="gold" name="coins" />
-              </LabeledList.Item>
-            </>
-          )}
-        </LabeledList>
-        <Box color="label" mt={1} mb={1}>
-          Details:
-        </Box>
-        <BlockQuote>{details}</BlockQuote>
-
-        {!editing ? (
-          <Box mt={2}>
-            <Button
-              disabled={!valid || (!higher_access && author !== current_user)}
-              icon="pen"
-              onClick={() => setEditing(true)}
-            >
-              Edit
-            </Button>
-            <Button.Confirm
-              content="Invalidate"
-              disabled={!higher_access || !valid}
-              icon="ban"
-              onClick={() =>
-                act('invalidate_crime', {
-                  crew_ref: crew_ref,
-                  crime_ref: crime_ref,
-                })
-              }
-            />
-          </Box>
-        ) : (
-          <>
-            <Input
-              fluid
-              maxLength={25}
-              onEscape={() => setEditing(false)}
-              onEnter={(event, value) => {
-                setEditing(false);
-                act('edit_crime', {
-                  crew_ref: crew_ref,
-                  crime_ref: crime_ref,
-                  name: value,
-                });
-              }}
-              placeholder="Enter a new name"
-            />
-            <Input
-              fluid
-              maxLength={1025}
-              mt={1}
-              onEscape={() => setEditing(false)}
-              onEnter={(event, value) => {
-                setEditing(false);
-                act('edit_crime', {
-                  crew_ref: crew_ref,
-                  crime_ref: crime_ref,
-                  description: value,
-                });
-              }}
-              placeholder="Enter a new description"
-            />
-          </>
-        )}
-      </Collapsible>
-    </Stack.Item>
-  );
-};
-
-/** Writes a new crime. Reducers don't seem to work here, so... */
-const CrimeAuthor = (props) => {
-  const foundRecord = getSecurityRecord();
-  if (!foundRecord) return <> </>;
-
-  const { crew_ref } = foundRecord;
-  const { act } = useBackend<SecurityRecordsData>();
-
-  const [crimeName, setCrimeName] = useState('');
-  const [crimeDetails, setCrimeDetails] = useState('');
-  const [crimeFine, setCrimeFine] = useState(0);
-  const [selectedTab, setSelectedTab] = useLocalState<SECURETAB>(
-    'selectedTab',
-    SECURETAB.Crimes
-  );
-
-  const nameMeetsReqs = crimeName?.length > 2;
-
-  /** Sends form to backend */
-  const createCrime = () => {
-    if (!crimeName) return;
-    act('add_crime', {
-      crew_ref: crew_ref,
-      details: crimeDetails,
-      fine: crimeFine,
-      name: crimeName,
-    });
-    reset();
-  };
-
-  /** Resets form data since it persists.. */
-  const reset = () => {
-    setCrimeDetails('');
-    setCrimeFine(0);
-    setCrimeName('');
-    setSelectedTab(crimeFine ? SECURETAB.Citations : SECURETAB.Crimes);
-  };
-
-  return (
-    <Stack fill vertical>
-      <Stack.Item color="label">
-        Name
-        <Input
-          fluid
-          maxLength={25}
-          onChange={(_, value) => setCrimeName(value)}
-          placeholder="Brief overview"
-        />
-      </Stack.Item>
-      <Stack.Item color="label">
-        Details
-        <TextArea
-          fluid
-          height={4}
-          maxLength={1025}
-          onChange={(_, value) => setCrimeDetails(value)}
-          placeholder="Type some details..."
-        />
-      </Stack.Item>
-      <Stack.Item color="label">
-        Fine (leave blank to arrest)
-        <RestrictedInput
-          onChange={(_, value) => setCrimeFine(value)}
-          fluid
-          maxValue={1000}
-        />
-      </Stack.Item>
-      <Stack.Item>
-        <Button.Confirm
-          content="Create"
-          disabled={!nameMeetsReqs}
-          icon="plus"
-          onClick={createCrime}
-          tooltip={!nameMeetsReqs ? 'Name must be at least 3 characters.' : ''}
-        />
-      </Stack.Item>
-    </Stack>
-  );
-};
diff --git a/tgui/packages/tgui/interfaces/SecurityRecords/RecordTabs.tsx b/tgui/packages/tgui/interfaces/SecurityRecords/RecordTabs.tsx
index b0b5c0df313e..f46698303b76 100644
--- a/tgui/packages/tgui/interfaces/SecurityRecords/RecordTabs.tsx
+++ b/tgui/packages/tgui/interfaces/SecurityRecords/RecordTabs.tsx
@@ -1,11 +1,7 @@
-import { filter, sortBy } from 'common/collections';
 import { useBackend, useLocalState } from 'tgui/backend';
 import {
   Box,
   Button,
-  Icon,
-  Input,
-  NoticeBox,
   Section,
   Stack,
   Tabs,
@@ -14,10 +10,9 @@ import {
 import { CRIMESTATUS2COLOR } from './constants';
 import { SecurityRecord, SecurityRecordsData } from './types';
 
-/** Tabs on left, with search bar */
 export const SecurityRecordTabs = (props, context) => {
   const { act, data } = useBackend<SecurityRecordsData>(context);
-  const { higher_access, records = [], station_z } = data;
+  const { records = []} = data;
 
   return (
     <Stack fill vertical>
@@ -25,7 +20,7 @@ export const SecurityRecordTabs = (props, context) => {
         <Section fill scrollable>
           <Tabs vertical>
             {records.map((record, index) => (
-              <CrewTab record={record} key={index} />
+              <CrewTab key={index} record={record} />
             ))}
           </Tabs>
         </Section>
@@ -33,15 +28,19 @@ export const SecurityRecordTabs = (props, context) => {
       <Stack.Item align="center">
         <Stack fill>
           <Stack.Item>
-            <Button content="Create" icon="plus" tooltip="New Record!"></Button>
+            <Button
+              content="Create"
+              onClick={() => act('new_record')}
+              icon="plus"
+              tooltip="New Record."
+            ></Button>
           </Stack.Item>
           <Stack.Item>
             <Button.Confirm
               content="Purge"
-              disabled={!higher_access || !station_z}
               icon="trash"
               onClick={() => act('purge_records')}
-              tooltip="Wipe criminal record data."
+              tooltip="Wipe all record data."
             />
           </Stack.Item>
         </Stack>
@@ -54,24 +53,27 @@ export const SecurityRecordTabs = (props, context) => {
 const CrewTab = (props: { record: SecurityRecord }, context) => {
   const [selectedRecord, setSelectedRecord] = useLocalState<
     SecurityRecord | undefined
-  >('securityRecord', undefined);
+  >(context, 'securityRecord', undefined);
 
   const { act, data } = useBackend<SecurityRecordsData>(context);
   const { assigned_view } = data;
   const { record } = props;
-  const { crew_ref, name, trim, wanted_status } = record;
+  const { record_ref, name, wanted_status } = record;
 
   /** Chooses a record */
   const selectRecord = (record: SecurityRecord) => {
-    if (selectedRecord?.crew_ref === crew_ref) {
+    if (selectedRecord?.record_ref === record_ref) {
       setSelectedRecord(undefined);
     } else {
       setSelectedRecord(record);
-      act('view_record', { assigned_view: assigned_view, crew_ref: crew_ref });
+      act('view_record', {
+        assigned_view: assigned_view,
+        record_ref: record_ref,
+      });
     }
   };
 
-  const isSelected = selectedRecord?.crew_ref === crew_ref;
+  const isSelected = selectedRecord?.record_ref === record_ref;
 
   return (
     <Tabs.Tab
diff --git a/tgui/packages/tgui/interfaces/SecurityRecords/RecordView.tsx b/tgui/packages/tgui/interfaces/SecurityRecords/RecordView.tsx
index 5188bfa514a2..a6f946bb599b 100644
--- a/tgui/packages/tgui/interfaces/SecurityRecords/RecordView.tsx
+++ b/tgui/packages/tgui/interfaces/SecurityRecords/RecordView.tsx
@@ -12,7 +12,6 @@ import {
 
 import { EditableText } from '../common/EditableText';
 import { CRIMESTATUS2COLOR, CRIMESTATUS2DESC } from './constants';
-import { CrimeWatcher } from './CrimeWatcher';
 import { getSecurityRecord } from './helpers';
 import { SecurityRecordsData } from './types';
 
@@ -28,13 +27,6 @@ export const SecurityRecordView = (props, context) => {
 
   return (
     <Stack fill vertical>
-      <Stack.Item grow>
-        <Stack fill>
-          <Stack.Item grow>
-            <CrimeWatcher />
-          </Stack.Item>
-        </Stack>
-      </Stack.Item>
       <Stack.Item grow>{<RecordInfo />}</Stack.Item>
     </Stack>
   );
@@ -52,16 +44,15 @@ const RecordInfo = (props, context) => {
 
   const {
     age,
-    crew_ref,
+    record_ref,
     crimes,
     fingerprint,
     gender,
     name,
-    note,
+    security_note,
     rank,
     species,
     wanted_status,
-    voice,
   } = foundRecord;
 
   return (
@@ -70,21 +61,13 @@ const RecordInfo = (props, context) => {
         <Section
           buttons={
             <Stack>
-              <Stack.Item>
-                <Button
-                  height="1.7rem"
-                  icon="print"
-                  onClick={() => setOpen(true)}
-                  tooltip="Print a rapsheet or poster."
-                >
-                  Print
-                </Button>
-              </Stack.Item>
               <Stack.Item>
                 <Button.Confirm
                   content="Delete"
                   icon="trash"
-                  onClick={() => act('delete_record', { crew_ref: crew_ref })}
+                  onClick={() =>
+                    act('delete_record', { record_ref: record_ref })
+                  }
                   tooltip="Delete record data."
                 />
               </Stack.Item>
@@ -96,48 +79,16 @@ const RecordInfo = (props, context) => {
               {name}
             </Table.Cell>
           }
-        >
-          <LabeledList>
-            <LabeledList.Item
-              buttons={available_statuses.map((button, index) => {
-                const isSelected = button === wanted_status;
-                return (
-                  <Button
-                    color={isSelected ? CRIMESTATUS2COLOR[button] : 'grey'}
-                    disabled={button === 'Arrest'}
-                    icon={isSelected ? 'check' : ''}
-                    key={index}
-                    onClick={() =>
-                      act('set_wanted', {
-                        crew_ref: crew_ref,
-                        status: button,
-                      })
-                    }
-                    pl={!isSelected ? '1.8rem' : 1}
-                    tooltip={CRIMESTATUS2DESC[button] || ''}
-                    tooltipPosition="bottom-start"
-                  >
-                    {button[0]}
-                  </Button>
-                );
-              })}
-              label="Status"
-            >
-              <Box color={CRIMESTATUS2COLOR[wanted_status]}>
-                {wanted_status}
-              </Box>
-            </LabeledList.Item>
-          </LabeledList>
-        </Section>
+        ></Section>
       </Stack.Item>
       <Stack.Item grow={2}>
         <Section fill scrollable>
           <LabeledList>
             <LabeledList.Item label="Name">
-              <EditableText field="name" target_ref={crew_ref} text={name} />
+              <EditableText field="name" target_ref={record_ref} text={name} />
             </LabeledList.Item>
             <LabeledList.Item label="Job">
-              <EditableText field="rank" target_ref={crew_ref} text={rank} />
+              <EditableText field="rank" target_ref={record_ref} text={rank} />
             </LabeledList.Item>
             <LabeledList.Item label="Age">
               <RestrictedInput
@@ -145,7 +96,7 @@ const RecordInfo = (props, context) => {
                 maxValue={max_age}
                 onEnter={(event, value) =>
                   act('edit_field', {
-                    crew_ref: crew_ref,
+                    record_ref: record_ref,
                     field: 'age',
                     value: value,
                   })
@@ -156,14 +107,14 @@ const RecordInfo = (props, context) => {
             <LabeledList.Item label="Species">
               <EditableText
                 field="species"
-                target_ref={crew_ref}
+                target_ref={record_ref}
                 text={species}
               />
             </LabeledList.Item>
             <LabeledList.Item label="Gender">
               <EditableText
                 field="gender"
-                target_ref={crew_ref}
+                target_ref={record_ref}
                 text={gender}
               />
             </LabeledList.Item>
@@ -171,18 +122,45 @@ const RecordInfo = (props, context) => {
               <EditableText
                 color="good"
                 field="fingerprint"
-                target_ref={crew_ref}
+                target_ref={record_ref}
                 text={fingerprint}
               />
             </LabeledList.Item>
-            <LabeledList.Item label="Voice">
-              <EditableText field="voice" target_ref={crew_ref} text={voice} />
+            <LabeledList.Item
+              buttons={available_statuses.map((button, index) => {
+                const isSelected = button === wanted_status;
+                return (
+                  <Button
+                    color={isSelected ? CRIMESTATUS2COLOR[button] : 'grey'}
+                    icon={isSelected ? 'check' : ''}
+                    key={index}
+                    onClick={() =>
+                      act('set_wanted_status', {
+                        record_ref: record_ref,
+                        wanted_status: button,
+                      })
+                    }
+                    height={'1.75rem'}
+                    width={!isSelected ? '3.0rem' : 3.0}
+                    textAlign="center"
+                    tooltip={CRIMESTATUS2DESC[button] || ''}
+                    tooltipPosition="bottom-start"
+                  >
+                    {button[0]}
+                  </Button>
+                );
+              })}
+              label="Wanted Status"
+            >
+              <Box color={CRIMESTATUS2COLOR[wanted_status]}>
+                {wanted_status}
+              </Box>
             </LabeledList.Item>
             <LabeledList.Item label="Note">
               <EditableText
                 field="security_note"
-                target_ref={crew_ref}
-                text={note}
+                target_ref={record_ref}
+                text={security_note}
               />
             </LabeledList.Item>
           </LabeledList>
diff --git a/tgui/packages/tgui/interfaces/SecurityRecords/helpers.ts b/tgui/packages/tgui/interfaces/SecurityRecords/helpers.ts
index 66d83d322e04..e0b122bcb00c 100644
--- a/tgui/packages/tgui/interfaces/SecurityRecords/helpers.ts
+++ b/tgui/packages/tgui/interfaces/SecurityRecords/helpers.ts
@@ -13,61 +13,9 @@ export const getSecurityRecord = (props, context) => {
   const { data } = useBackend<SecurityRecordsData>(context);
   const { records = [] } = data;
   const foundRecord = records.find(
-    (record) => record.crew_ref === selectedRecord.crew_ref
+    (record) => record.record_ref === selectedRecord.record_ref
   );
   if (!foundRecord) return;
 
   return foundRecord;
 };
-
-// Lazy type union
-type GenericRecord = {
-  name: string;
-  rank: string;
-  fingerprint?: string;
-  dna?: string;
-};
-
-/** Matches search by fingerprint, dna, job, or name */
-export const isRecordMatch = (record: GenericRecord, search: string) => {
-  if (!search) return true;
-  const { name, rank, fingerprint, dna } = record;
-
-  switch (true) {
-    case name?.toLowerCase().includes(search?.toLowerCase()):
-    case rank?.toLowerCase().includes(search?.toLowerCase()):
-    case fingerprint?.toLowerCase().includes(search?.toLowerCase()):
-    case dna?.toLowerCase().includes(search?.toLowerCase()):
-      return true;
-
-    default:
-      return false;
-  }
-};
-
-/** Returns a string header based on print type */
-export const getDefaultPrintHeader = (printType: PRINTOUT) => {
-  switch (printType) {
-    case PRINTOUT.Rapsheet:
-      return 'Record';
-    case PRINTOUT.Wanted:
-      return 'WANTED';
-    case PRINTOUT.Missing:
-      return 'MISSING';
-  }
-};
-
-/** Returns a string description based on print type */
-export const getDefaultPrintDescription = (
-  name: string,
-  printType: PRINTOUT
-) => {
-  switch (printType) {
-    case PRINTOUT.Rapsheet:
-      return `A standard security record for ${name}.`;
-    case PRINTOUT.Wanted:
-      return `A poster declaring ${name} to be a wanted criminal, wanted by Nanotrasen. Report any sightings to security immediately.`;
-    case PRINTOUT.Missing:
-      return `A poster declaring ${name} to be a missing individual, missed by Nanotrasen. Report any sightings to security immediately.`;
-  }
-};
diff --git a/tgui/packages/tgui/interfaces/SecurityRecords/types.ts b/tgui/packages/tgui/interfaces/SecurityRecords/types.ts
index 2c54ab880bd0..2f4da2bd6ee5 100644
--- a/tgui/packages/tgui/interfaces/SecurityRecords/types.ts
+++ b/tgui/packages/tgui/interfaces/SecurityRecords/types.ts
@@ -3,10 +3,8 @@ import { BooleanLike } from 'common/react';
 export type SecurityRecordsData = {
   assigned_view: string;
   authenticated: BooleanLike;
-  station_z: BooleanLike;
   available_statuses: string[];
   current_user: string;
-  higher_access: BooleanLike;
   records: SecurityRecord[];
   min_age: number;
   max_age: number;
@@ -14,18 +12,15 @@ export type SecurityRecordsData = {
 
 export type SecurityRecord = {
   age: number;
-  citations: Crime[];
-  crew_ref: string;
+  record_ref: string;
   crimes: Crime[];
   fingerprint: string;
   gender: string;
   name: string;
-  note: string;
+  security_note: string;
   rank: string;
   species: string;
-  trim: string;
   wanted_status: string;
-  voice: string;
 };
 
 export type Crime = {
@@ -36,7 +31,6 @@ export type Crime = {
   name: string;
   paid: number;
   time: number;
-  valid: BooleanLike;
 };
 
 export enum SECURETAB {
@@ -44,9 +38,3 @@ export enum SECURETAB {
   Citations,
   Add,
 }
-
-export enum PRINTOUT {
-  Missing = 'missing',
-  Rapsheet = 'rapsheet',
-  Wanted = 'wanted',
-}