From 460ddecf3307a8274f46a6a3d9ed6d49e88e045f Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Thu, 26 Feb 2026 17:58:50 -0700 Subject: [PATCH] [MIRROR] cleanup (#12464) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/__defines/_init.dm | 2 +- tgui/packages/tgui/backend.ts | 2 +- .../tgui/interfaces/BodyScanner/functions.tsx | 9 +++++-- .../tgui/interfaces/ColorPickerModal.tsx | 4 +-- .../tgui/interfaces/Filteriffic/index.tsx | 2 +- tgui/packages/tgui/interfaces/OreSilo.tsx | 2 +- .../PreferencesMenu/GamePreferencesPage.tsx | 27 +++++++++---------- .../bay_prefs/general/SubtabTraits.tsx | 6 ++--- .../PreferencesMenu/bay_prefs/general/data.ts | 6 ++--- 9 files changed, 32 insertions(+), 28 deletions(-) diff --git a/code/__defines/_init.dm b/code/__defines/_init.dm index c87faec59c..02d28996e4 100644 --- a/code/__defines/_init.dm +++ b/code/__defines/_init.dm @@ -9,7 +9,7 @@ #if defined(ENABLE_BYOND_TRACY) var/tracy_init = LIBCALL(world.system_type == MS_WINDOWS ? "prof.dll" : "./libprof.so", "init")() // Setup Tracy integration if(length(tracy_init) != 0 && tracy_init[1] == ".") // it returned the output file - to_world_log("TRACY Enabled, streaming to [tracy_init].") + log_world("TRACY Enabled, streaming to [tracy_init].") else if(tracy_init != "0") CRASH("Tracy init error: [tracy_init]") #endif diff --git a/tgui/packages/tgui/backend.ts b/tgui/packages/tgui/backend.ts index 5996951ed6..a4232e0d54 100644 --- a/tgui/packages/tgui/backend.ts +++ b/tgui/packages/tgui/backend.ts @@ -17,7 +17,7 @@ import type { BackendState } from './events/types'; * ``` */ export function useBackend< - TData extends Record, + TData extends Record, >(): BackendState { const state = store.get(backendStateAtom); diff --git a/tgui/packages/tgui/interfaces/BodyScanner/functions.tsx b/tgui/packages/tgui/interfaces/BodyScanner/functions.tsx index 8b48558d07..15d7d4884b 100644 --- a/tgui/packages/tgui/interfaces/BodyScanner/functions.tsx +++ b/tgui/packages/tgui/interfaces/BodyScanner/functions.tsx @@ -3,11 +3,16 @@ import type { BooleanLike } from 'tgui-core/react'; /* */ -export function mapTwoByTwo(a: any[][], c: any) { - const result: any[] = []; +export function mapTwoByTwo( + a: T[][], + c: (row1: T[], row2: T[] | undefined, index: number) => R, +): R[] { + const result: R[] = []; + for (let i = 0; i < a.length; i += 2) { result.push(c(a[i], a[i + 1], i)); } + return result; } diff --git a/tgui/packages/tgui/interfaces/ColorPickerModal.tsx b/tgui/packages/tgui/interfaces/ColorPickerModal.tsx index b411c38414..0b9dbf0ab0 100644 --- a/tgui/packages/tgui/interfaces/ColorPickerModal.tsx +++ b/tgui/packages/tgui/interfaces/ColorPickerModal.tsx @@ -42,7 +42,7 @@ import { classes } from 'tgui-core/react'; import { InputButtons } from './common/InputButtons'; import { Loader } from './common/Loader'; -interface ColorPickerData { +type ColorPickerData = { autofocus: boolean; buttons: string[]; message: string; @@ -52,7 +52,7 @@ interface ColorPickerData { title: string; default_color: string; presets?: string; -} +}; type ColorPickerModalProps = Record; diff --git a/tgui/packages/tgui/interfaces/Filteriffic/index.tsx b/tgui/packages/tgui/interfaces/Filteriffic/index.tsx index b32f9919b2..9e8da80428 100644 --- a/tgui/packages/tgui/interfaces/Filteriffic/index.tsx +++ b/tgui/packages/tgui/interfaces/Filteriffic/index.tsx @@ -13,7 +13,7 @@ import { import { FilterEntry } from './FilterEntry'; import type { Data } from './types'; -export const Filteriffic = (props: any) => { +export const Filteriffic = (props) => { const { act, data } = useBackend(); const name = data.target_name || 'Unknown Object'; const filters = data.target_filter_data || {}; diff --git a/tgui/packages/tgui/interfaces/OreSilo.tsx b/tgui/packages/tgui/interfaces/OreSilo.tsx index bf2bc01c83..f0dfe47297 100644 --- a/tgui/packages/tgui/interfaces/OreSilo.tsx +++ b/tgui/packages/tgui/interfaces/OreSilo.tsx @@ -47,7 +47,7 @@ type Data = { logs: Log[]; }; -export const OreSilo = (props: any) => { +export const OreSilo = (props) => { const { act, data } = useBackend(); const { SHEET_MATERIAL_AMOUNT, machines, logs } = data; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/GamePreferencesPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/GamePreferencesPage.tsx index 44479cc607..53e2ebd6be 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/GamePreferencesPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/GamePreferencesPage.tsx @@ -110,20 +110,19 @@ export const GamePreferencesPage = (props) => { const [searchVisible, setSearchVisible] = useState(false); // For some reason, typescript thinks that this call to filter() can change the shape of the array - const gamePreferenceEntries: any = sortByName(Object.entries(gamePreferences)) - .map(([category, preferences]) => { - return [ - category, - preferences - .filter( - (entry) => - !search || - entry.name.toLowerCase().includes(search.toLowerCase()), - ) - .map((entry) => entry.children), - ]; - }) - .filter(([category, prefs]) => prefs.length !== 0); + const gamePreferenceEntries: [string, ReactNode[]][] = sortByName( + Object.entries(gamePreferences), + ) + .map(([category, preferences]): [string, ReactNode[]] => [ + category, + preferences + .filter( + (entry) => + !search || entry.name.toLowerCase().includes(search.toLowerCase()), + ) + .map((entry) => entry.children), + ]) + .filter((item): item is [string, ReactNode[]] => item[1].length !== 0); return ( <> diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/SubtabTraits.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/SubtabTraits.tsx index 5b57d833af..38e8d842c9 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/SubtabTraits.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/SubtabTraits.tsx @@ -20,7 +20,7 @@ import { function ensureRecord( trait: string[] | Record, -): Record { +): Record { if (Array.isArray(trait)) { const new_obj: Record = {}; for (let i = 0; i < trait.length; i++) { @@ -161,7 +161,7 @@ export const SubtabTraits = (props: { export const TraitComponent = (props: { traitPath: string; trait: Trait; - data: any; + data: unknown; }) => { const { act } = useBackend(); const { traitPath, trait, data } = props; @@ -208,7 +208,7 @@ export const TraitSubprefSelector = (props: { trait: string; prefKey: string; prefData: TraitSubpref; - data: any; + data: unknown; }) => { const { act } = useBackend(); const { trait, prefKey, prefData, data } = props; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/data.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/data.ts index de4a94c504..5c7c8746a5 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/data.ts +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/bay_prefs/general/data.ts @@ -285,9 +285,9 @@ export type MiscData = { custom_species: string; ignore_shoes: BooleanLike; - pos_traits: string[] | Record | null>; - neu_traits: string[] | Record | null>; - neg_traits: string[] | Record | null>; + pos_traits: string[] | Record | null>; + neu_traits: string[] | Record | null>; + neg_traits: string[] | Record | null>; traits_cheating: BooleanLike; max_traits: number; trait_points: number;