diff --git a/tgui/packages/common/redux.ts b/tgui/packages/common/redux.ts index 4e618bddafd..1635853c6b4 100644 --- a/tgui/packages/common/redux.ts +++ b/tgui/packages/common/redux.ts @@ -201,12 +201,16 @@ export const createAction = ( export const useDispatch = (context: { store: Store; }): Dispatch => { - return context.store.dispatch; + return context?.store?.dispatch; }; export const useSelector = ( context: { store: Store }, selector: (state: State) => Selected ): Selected => { - return selector(context.store.getState()); + if (!context) { + return {} as Selected; + } + + return selector(context?.store?.getState()); }; diff --git a/tgui/packages/tgui-panel/index.jsx b/tgui/packages/tgui-panel/index.jsx index 6bc6b32c462..336d46031c4 100644 --- a/tgui/packages/tgui-panel/index.jsx +++ b/tgui/packages/tgui-panel/index.jsx @@ -22,6 +22,7 @@ import { setupPanelFocusHacks } from './panelFocus'; import { pingMiddleware, pingReducer } from './ping'; import { settingsMiddleware, settingsReducer } from './settings'; import { telemetryMiddleware } from './telemetry'; +import { setGlobalStore } from 'tgui/backend'; perf.mark('inception', window.performance?.timing?.navigationStart); perf.mark('init'); @@ -47,6 +48,8 @@ const store = configureStore({ }); const renderApp = createRenderer(() => { + setGlobalStore(store); + const { Panel } = require('./Panel'); return ( diff --git a/tgui/packages/tgui/backend.ts b/tgui/packages/tgui/backend.ts index dd4cae9e622..46b86feb7bc 100644 --- a/tgui/packages/tgui/backend.ts +++ b/tgui/packages/tgui/backend.ts @@ -21,6 +21,12 @@ import { resumeRenderer, suspendRenderer } from './renderer'; const logger = createLogger('backend'); +export let globalStore; + +export const setGlobalStore = (store) => { + globalStore = store; +}; + export const backendUpdate = createAction('backend/update'); export const backendSetSharedState = createAction('backend/setSharedState'); export const backendSuspendStart = createAction('backend/suspendStart'); @@ -267,6 +273,10 @@ type BackendState = { shared: Record; suspending: boolean; suspended: boolean; + debug?: { + debugLayout: boolean; + kitchenSink: boolean; + }; }; /** @@ -280,9 +290,9 @@ export const selectBackend = (state: any): BackendState => * * Includes the `act` function for performing DM actions. */ -export const useBackend = (context: any) => { - const { store } = context; - const state = selectBackend(store.getState()); +export const useBackend = () => { + const state: BackendState = globalStore?.getState()?.backend; + return { ...state, act: sendAct, @@ -308,18 +318,16 @@ type StateWithSetter = [T, (nextState: T) => void]; * @param initialState Initializes your global variable with this value. */ export const useLocalState = ( - context: any, key: string, initialState: T ): StateWithSetter => { - const { store } = context; - const state = selectBackend(store.getState()); - const sharedStates = state.shared ?? {}; + const state = globalStore?.getState()?.backend; + const sharedStates = state?.shared ?? {}; const sharedState = key in sharedStates ? sharedStates[key] : initialState; return [ sharedState, (nextState) => { - store.dispatch( + globalStore.dispatch( backendSetSharedState({ key, nextState: @@ -347,26 +355,22 @@ export const useLocalState = ( * @param initialState Initializes your global variable with this value. */ export const useSharedState = ( - context: any, key: string, initialState: T ): StateWithSetter => { - const { store } = context; - const state = selectBackend(store.getState()); - const sharedStates = state.shared ?? {}; + const state = globalStore?.getState()?.backend; + const sharedStates = state?.shared ?? {}; const sharedState = key in sharedStates ? sharedStates[key] : initialState; return [ sharedState, (nextState) => { - // prettier-ignore Byond.sendMessage({ type: 'setSharedState', key, - value: JSON.stringify( - typeof nextState === 'function' - ? nextState(sharedState) - : nextState - ) || '', + value: + JSON.stringify( + typeof nextState === 'function' ? nextState(sharedState) : nextState + ) || '', }); }, ]; diff --git a/tgui/packages/tgui/components/Dropdown.tsx b/tgui/packages/tgui/components/Dropdown.tsx index 0d417af4593..7fa0e3ae8d1 100644 --- a/tgui/packages/tgui/components/Dropdown.tsx +++ b/tgui/packages/tgui/components/Dropdown.tsx @@ -180,33 +180,24 @@ export class Dropdown extends Component { const to_render = ops.length ? ops : 'No Options Found'; - render( -
{to_render}
, - renderedMenu, - () => { - let singletonPopper = Dropdown.singletonPopper; - if (singletonPopper === undefined) { - singletonPopper = createPopper( - Dropdown.virtualElement, - renderedMenu!, - { - ...DEFAULT_OPTIONS, - placement: 'bottom-start', - } - ); + render(
{to_render}
, renderedMenu, () => { + let singletonPopper = Dropdown.singletonPopper; + if (singletonPopper === undefined) { + singletonPopper = createPopper(Dropdown.virtualElement, renderedMenu!, { + ...DEFAULT_OPTIONS, + placement: 'bottom-start', + }); - Dropdown.singletonPopper = singletonPopper; - } else { - singletonPopper.setOptions({ - ...DEFAULT_OPTIONS, - placement: 'bottom-start', - }); + Dropdown.singletonPopper = singletonPopper; + } else { + singletonPopper.setOptions({ + ...DEFAULT_OPTIONS, + placement: 'bottom-start', + }); - singletonPopper.update(); - } - }, - this.context - ); + singletonPopper.update(); + } + }); } setOpen(open: boolean) { diff --git a/tgui/packages/tgui/components/Popper.tsx b/tgui/packages/tgui/components/Popper.tsx index 1d6c4a73a79..907896d6b8a 100644 --- a/tgui/packages/tgui/components/Popper.tsx +++ b/tgui/packages/tgui/components/Popper.tsx @@ -70,12 +70,7 @@ export class Popper extends Component { renderPopperContent(callback: () => void) { // `render` errors when given false, so we convert it to `null`, // which is supported. - render( - this.props.popperContent || null, - this.renderedContent, - callback, - this.context - ); + render(this.props.popperContent || null, this.renderedContent, callback); } render() { diff --git a/tgui/packages/tgui/components/TextArea.jsx b/tgui/packages/tgui/components/TextArea.jsx index 3fe2cd985d4..4fdf5542428 100644 --- a/tgui/packages/tgui/components/TextArea.jsx +++ b/tgui/packages/tgui/components/TextArea.jsx @@ -12,8 +12,8 @@ import { toInputValue } from './Input'; import { KEY_ENTER, KEY_ESCAPE, KEY_TAB } from 'common/keycodes'; export class TextArea extends Component { - constructor(props, context) { - super(props, context); + constructor(props) { + super(props); this.textareaRef = props.innerRef || createRef(); this.state = { editing: false, diff --git a/tgui/packages/tgui/components/Tooltip.tsx b/tgui/packages/tgui/components/Tooltip.tsx index cb35425e740..b4278d49af6 100644 --- a/tgui/packages/tgui/components/Tooltip.tsx +++ b/tgui/packages/tgui/components/Tooltip.tsx @@ -103,33 +103,28 @@ export class Tooltip extends Component { return; } - render( - {this.props.content}, - renderedTooltip, - () => { - let singletonPopper = Tooltip.singletonPopper; - if (singletonPopper === undefined) { - singletonPopper = createPopper( - Tooltip.virtualElement, - renderedTooltip!, - { - ...DEFAULT_OPTIONS, - placement: this.props.position || 'auto', - } - ); - - Tooltip.singletonPopper = singletonPopper; - } else { - singletonPopper.setOptions({ + render({this.props.content}, renderedTooltip, () => { + let singletonPopper = Tooltip.singletonPopper; + if (singletonPopper === undefined) { + singletonPopper = createPopper( + Tooltip.virtualElement, + renderedTooltip!, + { ...DEFAULT_OPTIONS, placement: this.props.position || 'auto', - }); + } + ); - singletonPopper.update(); - } - }, - this.context - ); + Tooltip.singletonPopper = singletonPopper; + } else { + singletonPopper.setOptions({ + ...DEFAULT_OPTIONS, + placement: this.props.position || 'auto', + }); + + singletonPopper.update(); + } + }); } componentDidUpdate() { diff --git a/tgui/packages/tgui/debug/KitchenSink.jsx b/tgui/packages/tgui/debug/KitchenSink.jsx index 246b4f50b47..cd6ba33c42d 100644 --- a/tgui/packages/tgui/debug/KitchenSink.jsx +++ b/tgui/packages/tgui/debug/KitchenSink.jsx @@ -20,10 +20,10 @@ const r = require.context('../stories', false, /\.stories\.js$/); */ const getStories = () => r.keys().map((path) => r(path)); -export const KitchenSink = (props, context) => { +export const KitchenSink = (props) => { const { panel } = props; - const [theme] = useLocalState(context, 'kitchenSinkTheme'); - const [pageIndex, setPageIndex] = useLocalState(context, 'pageIndex', 0); + const [theme] = useLocalState('kitchenSinkTheme'); + const [pageIndex, setPageIndex] = useLocalState('pageIndex', 0); const stories = getStories(); const story = stories[pageIndex]; const Layout = panel ? Pane : Window; diff --git a/tgui/packages/tgui/index.tsx b/tgui/packages/tgui/index.tsx index 0215f738c16..f62a03c3665 100644 --- a/tgui/packages/tgui/index.tsx +++ b/tgui/packages/tgui/index.tsx @@ -26,7 +26,7 @@ import './styles/themes/syndicate.scss'; import './styles/themes/wizard.scss'; import './styles/themes/admin.scss'; -import { StoreProvider, configureStore } from './store'; +import { configureStore } from './store'; import { captureExternalLinks } from './links'; import { createRenderer } from './renderer'; @@ -34,6 +34,7 @@ import { perf } from 'common/perf'; import { setupGlobalEvents } from './events'; import { setupHotKeys } from './hotkeys'; import { setupHotReloading } from 'tgui-dev-server/link/client.cjs'; +import { setGlobalStore } from './backend'; perf.mark('inception', window.performance?.timing?.navigationStart); perf.mark('init'); @@ -41,13 +42,11 @@ perf.mark('init'); const store = configureStore(); const renderApp = createRenderer(() => { + setGlobalStore(store); + const { getRoutedComponent } = require('./routes'); const Component = getRoutedComponent(store); - return ( - - - - ); + return ; }); const setupApp = () => { diff --git a/tgui/packages/tgui/interfaces/AbductorConsole.jsx b/tgui/packages/tgui/interfaces/AbductorConsole.jsx index 3e5aa16f27b..a45f41aa4e9 100644 --- a/tgui/packages/tgui/interfaces/AbductorConsole.jsx +++ b/tgui/packages/tgui/interfaces/AbductorConsole.jsx @@ -3,8 +3,8 @@ import { Button, LabeledList, NoticeBox, Section, Tabs } from '../components'; import { Window } from '../layouts'; import { GenericUplink } from './Uplink/GenericUplink'; -export const AbductorConsole = (props, context) => { - const [tab, setTab] = useSharedState(context, 'tab', 1); +export const AbductorConsole = (props) => { + const [tab, setTab] = useSharedState('tab', 1); return ( @@ -36,8 +36,8 @@ export const AbductorConsole = (props, context) => { ); }; -const Abductsoft = (props, context) => { - const { act, data } = useBackend(context); +const Abductsoft = (props) => { + const { act, data } = useBackend(); const { experiment, points, credits, categories } = data; if (!experiment) { @@ -81,8 +81,8 @@ const Abductsoft = (props, context) => { ); }; -const EmergencyTeleporter = (props, context) => { - const { act, data } = useBackend(context); +const EmergencyTeleporter = (props) => { + const { act, data } = useBackend(); const { pad, gizmo } = data; if (!pad) { @@ -114,8 +114,8 @@ const EmergencyTeleporter = (props, context) => { ); }; -const VestSettings = (props, context) => { - const { act, data } = useBackend(context); +const VestSettings = (props) => { + const { act, data } = useBackend(); const { vest, vest_mode, vest_lock } = data; if (!vest) { diff --git a/tgui/packages/tgui/interfaces/AccountingConsole.tsx b/tgui/packages/tgui/interfaces/AccountingConsole.tsx index 25cc40cd8a3..b716e0b9f05 100644 --- a/tgui/packages/tgui/interfaces/AccountingConsole.tsx +++ b/tgui/packages/tgui/interfaces/AccountingConsole.tsx @@ -30,12 +30,8 @@ enum SCREENS { audit, } -export const AccountingConsole = (props, context) => { - const [screenmode, setScreenmode] = useLocalState( - context, - 'tab_main', - SCREENS.users - ); +export const AccountingConsole = (props) => { + const [screenmode, setScreenmode] = useLocalState('tab_main', SCREENS.users); return ( @@ -66,8 +62,8 @@ export const AccountingConsole = (props, context) => { ); }; -const UsersScreen = (props, context) => { - const { data } = useBackend(context); +const UsersScreen = (props) => { + const { data } = useBackend(); const { PlayerAccounts } = data; return ( @@ -93,8 +89,8 @@ const UsersScreen = (props, context) => { ); }; -const AuditScreen = (props, context) => { - const { data } = useBackend(context); +const AuditScreen = (props) => { + const { data } = useBackend(); const { AuditLog } = data; return ( @@ -110,8 +106,8 @@ const AuditScreen = (props, context) => { }; /** The modal menu that contains the prompts to making new channels. */ -const MarketCrashing = (props, context) => { - const { data } = useBackend(context); +const MarketCrashing = (props) => { + const { data } = useBackend(); const { Crashing } = data; if (!Crashing) { diff --git a/tgui/packages/tgui/interfaces/Achievements.jsx b/tgui/packages/tgui/interfaces/Achievements.jsx index 1ab38ca3655..54013f421c1 100644 --- a/tgui/packages/tgui/interfaces/Achievements.jsx +++ b/tgui/packages/tgui/interfaces/Achievements.jsx @@ -2,11 +2,10 @@ import { useBackend, useLocalState } from '../backend'; import { Box, Flex, Icon, Table, Tabs, Tooltip } from '../components'; import { Window } from '../layouts'; -export const Achievements = (props, context) => { - const { data } = useBackend(context); +export const Achievements = (props) => { + const { data } = useBackend(); const { categories } = data; const [selectedCategory, setSelectedCategory] = useLocalState( - context, 'category', categories[0] ); @@ -39,7 +38,7 @@ export const Achievements = (props, context) => { ); }; -const AchievementTable = (props, context) => { +const AchievementTable = (props) => { const { achievements } = props; return ( @@ -90,14 +89,10 @@ const Achievement = (props) => { ); }; -const HighScoreTable = (props, context) => { - const { data } = useBackend(context); +const HighScoreTable = (props) => { + const { data } = useBackend(); const { highscore: highscores, user_ckey } = data; - const [highScoreIndex, setHighScoreIndex] = useLocalState( - context, - 'highscore', - 0 - ); + const [highScoreIndex, setHighScoreIndex] = useLocalState('highscore', 0); const highscore = highscores[highScoreIndex]; if (!highscore) { return null; diff --git a/tgui/packages/tgui/interfaces/AdminBookViewer.tsx b/tgui/packages/tgui/interfaces/AdminBookViewer.tsx index 5996b3937d7..653c029cd71 100644 --- a/tgui/packages/tgui/interfaces/AdminBookViewer.tsx +++ b/tgui/packages/tgui/interfaces/AdminBookViewer.tsx @@ -9,8 +9,8 @@ type ViewerData = { view_raw: boolean; }; -export const AdminBookViewer = (_: any, context: any) => { - const { data } = useBackend(context); +export const AdminBookViewer = (_: any) => { + const { data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/AdminFax.jsx b/tgui/packages/tgui/interfaces/AdminFax.jsx index 46e12615922..8e78204db8d 100644 --- a/tgui/packages/tgui/interfaces/AdminFax.jsx +++ b/tgui/packages/tgui/interfaces/AdminFax.jsx @@ -2,7 +2,7 @@ import { useBackend, useLocalState } from '../backend'; import { Section, Box, Dropdown, Button, Input, TextArea, Divider, NumberInput, Tooltip, Knob } from '../components'; import { Window } from '../layouts'; -export const AdminFax = (props, context) => { +export const AdminFax = (props) => { return ( @@ -12,26 +12,18 @@ export const AdminFax = (props, context) => { ); }; -export const FaxMainPanel = (props, context) => { - const { act, data } = useBackend(context); +export const FaxMainPanel = (props) => { + const { act, data } = useBackend(); - const [fax, setFax] = useLocalState(context, 'fax', ''); - const [saved, setSaved] = useLocalState(context, 'saved', false); - const [paperName, setPaperName] = useLocalState(context, 'paperName', ''); - const [fromWho, setFromWho] = useLocalState(context, 'fromWho', ''); - const [rawText, setRawText] = useLocalState(context, 'rawText', ''); - const [stamp, setStamp] = useLocalState(context, 'stampType', ''); - const [stampCoordX, setStampCoordX] = useLocalState( - context, - 'stampCoordX', - 0 - ); - const [stampCoordY, setStampCoordY] = useLocalState( - context, - 'stampCoordY', - 0 - ); - const [stampAngle, setStampAngle] = useLocalState(context, 'stampAngle', 0); + const [fax, setFax] = useLocalState('fax', ''); + const [saved, setSaved] = useLocalState('saved', false); + const [paperName, setPaperName] = useLocalState('paperName', ''); + const [fromWho, setFromWho] = useLocalState('fromWho', ''); + const [rawText, setRawText] = useLocalState('rawText', ''); + const [stamp, setStamp] = useLocalState('stampType', ''); + const [stampCoordX, setStampCoordX] = useLocalState('stampCoordX', 0); + const [stampCoordY, setStampCoordY] = useLocalState('stampCoordY', 0); + const [stampAngle, setStampAngle] = useLocalState('stampAngle', 0); if (stamp && data.stamps[0] !== 'None') { data.stamps.unshift('None'); } diff --git a/tgui/packages/tgui/interfaces/AdminPDA.jsx b/tgui/packages/tgui/interfaces/AdminPDA.jsx index c9a60dd6987..af68c99b95e 100644 --- a/tgui/packages/tgui/interfaces/AdminPDA.jsx +++ b/tgui/packages/tgui/interfaces/AdminPDA.jsx @@ -3,7 +3,7 @@ import { useBackend, useLocalState } from '../backend'; import { Button } from '../components/Button'; import { Window } from '../layouts'; -export const AdminPDA = (props, context) => { +export const AdminPDA = (props) => { return ( @@ -15,15 +15,14 @@ export const AdminPDA = (props, context) => { ); }; -const ReceiverChoice = (props, context) => { - const { data } = useBackend(context); +const ReceiverChoice = (props) => { + const { data } = useBackend(); const { users } = data; const receivers = Array.from(Object.values(users)); - const [user, setUser] = useLocalState(context, 'user', ''); - const [spam, setSpam] = useLocalState(context, 'spam', false); + const [user, setUser] = useLocalState('user', ''); + const [spam, setSpam] = useLocalState('spam', false); const [showInvisible, setShowInvisible] = useLocalState( - context, 'showInvisible', false ); @@ -66,9 +65,9 @@ const ReceiverChoice = (props, context) => { ); }; -const SenderInfo = (props, context) => { - const [name, setName] = useLocalState(context, 'name', ''); - const [job, setJob] = useLocalState(context, 'job', ''); +const SenderInfo = (props) => { + const [name, setName] = useLocalState('name', ''); + const [job, setJob] = useLocalState('job', ''); return (
@@ -94,17 +93,16 @@ const SenderInfo = (props, context) => { ); }; -const MessageInput = (props, context) => { - const { act } = useBackend(context); +const MessageInput = (props) => { + const { act } = useBackend(); - const [user, setUser] = useLocalState(context, 'user', ''); - const [name, setName] = useLocalState(context, 'name', ''); - const [job, setJob] = useLocalState(context, 'job', ''); - const [messageText, setMessageText] = useLocalState(context, 'message', ''); - const [spam, setSpam] = useLocalState(context, 'spam', false); - const [force, setForce] = useLocalState(context, 'force', false); + const [user, setUser] = useLocalState('user', ''); + const [name, setName] = useLocalState('name', ''); + const [job, setJob] = useLocalState('job', ''); + const [messageText, setMessageText] = useLocalState('message', ''); + const [spam, setSpam] = useLocalState('spam', false); + const [force, setForce] = useLocalState('force', false); const [showInvisible, setShowInvisible] = useLocalState( - context, 'showInvisible', false ); diff --git a/tgui/packages/tgui/interfaces/Adminhelp.tsx b/tgui/packages/tgui/interfaces/Adminhelp.tsx index 817e25e37cb..c2a888cdc33 100644 --- a/tgui/packages/tgui/interfaces/Adminhelp.tsx +++ b/tgui/packages/tgui/interfaces/Adminhelp.tsx @@ -10,8 +10,8 @@ type AdminhelpData = { urgentAhelpPromptMessage: string; }; -export const Adminhelp = (props, context) => { - const { act, data } = useBackend(context); +export const Adminhelp = (props) => { + const { act, data } = useBackend(); const { adminCount, urgentAhelpEnabled, @@ -19,20 +19,14 @@ export const Adminhelp = (props, context) => { urgentAhelpPromptMessage, } = data; const [requestForAdmin, setRequestForAdmin] = useLocalState( - context, 'request_for_admin', false ); const [currentlyInputting, setCurrentlyInputting] = useLocalState( - context, 'confirm_request', false ); - const [ahelpMessage, setAhelpMessage] = useLocalState( - context, - 'ahelp_message', - '' - ); + const [ahelpMessage, setAhelpMessage] = useLocalState('ahelp_message', ''); const confirmationText = 'alert admins'; return ( diff --git a/tgui/packages/tgui/interfaces/AdventureBrowser.tsx b/tgui/packages/tgui/interfaces/AdventureBrowser.tsx index cde10cf4afa..74c2e688635 100644 --- a/tgui/packages/tgui/interfaces/AdventureBrowser.tsx +++ b/tgui/packages/tgui/interfaces/AdventureBrowser.tsx @@ -23,10 +23,9 @@ type AdventureBrowserData = AdventureDataProvider & { delay_message: string; }; -const AdventureList = (props, context) => { - const { data, act } = useBackend(context); +const AdventureList = (props) => { + const { data, act } = useBackend(); const [openAdventure, setOpenAdventure] = useLocalState( - context, 'openAdventure', null ); @@ -57,8 +56,8 @@ const AdventureList = (props, context) => { ); }; -const DebugPlayer = (props, context) => { - const { data, act } = useBackend(context); +const DebugPlayer = (props) => { + const { data, act } = useBackend(); return (
{ ); }; -export const AdventureBrowser = (props, context) => { - const { data } = useBackend(context); +export const AdventureBrowser = (props) => { + const { data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/AiAirlock.jsx b/tgui/packages/tgui/interfaces/AiAirlock.jsx index 89b866d55c1..5059f9e40eb 100644 --- a/tgui/packages/tgui/interfaces/AiAirlock.jsx +++ b/tgui/packages/tgui/interfaces/AiAirlock.jsx @@ -17,8 +17,8 @@ const dangerMap = { }, }; -export const AiAirlock = (props, context) => { - const { act, data } = useBackend(context); +export const AiAirlock = (props) => { + const { act, data } = useBackend(); const statusMain = dangerMap[data.power.main] || dangerMap[0]; const statusBackup = dangerMap[data.power.backup] || dangerMap[0]; const statusElectrify = dangerMap[data.shock] || dangerMap[0]; diff --git a/tgui/packages/tgui/interfaces/AiRestorer.tsx b/tgui/packages/tgui/interfaces/AiRestorer.tsx index bb32482f4ed..c4d3760b9d6 100644 --- a/tgui/packages/tgui/interfaces/AiRestorer.tsx +++ b/tgui/packages/tgui/interfaces/AiRestorer.tsx @@ -24,8 +24,8 @@ export const AiRestorer = () => { ); }; -export const AiRestorerContent = (props, context) => { - const { act, data } = useBackend(context); +export const AiRestorerContent = (props) => { + const { act, data } = useBackend(); const { AI_present, error, diff --git a/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx b/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx index 8bda438a5b8..09300373e9b 100644 --- a/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx +++ b/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx @@ -11,8 +11,8 @@ type Data = { name: string; }; -export const AiVoiceChanger = (props, context) => { - const { act, data } = useBackend(context); +export const AiVoiceChanger = (props) => { + const { act, data } = useBackend(); const { loud, name, on, say_verb, voices } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AirAlarm.tsx b/tgui/packages/tgui/interfaces/AirAlarm.tsx index 78e3c02847e..0caa2398dac 100644 --- a/tgui/packages/tgui/interfaces/AirAlarm.tsx +++ b/tgui/packages/tgui/interfaces/AirAlarm.tsx @@ -43,8 +43,8 @@ type AirAlarmData = { thresholdTypeMap: Record; }; -export const AirAlarm = (props, context) => { - const { act, data } = useBackend(context); +export const AirAlarm = (props) => { + const { act, data } = useBackend(); const locked = data.locked && !data.siliconUser; return ( @@ -57,8 +57,8 @@ export const AirAlarm = (props, context) => { ); }; -const AirAlarmStatus = (props, context) => { - const { data } = useBackend(context); +const AirAlarmStatus = (props) => { + const { data } = useBackend(); const { envData } = data; const dangerMap = { 0: { @@ -142,8 +142,8 @@ const AIR_ALARM_ROUTES = { type Screen = keyof typeof AIR_ALARM_ROUTES; -const AirAlarmControl = (props, context) => { - const [screen, setScreen] = useLocalState(context, 'screen', 'home'); +const AirAlarmControl = (props) => { + const [screen, setScreen] = useLocalState('screen', 'home'); const route = AIR_ALARM_ROUTES[screen] || AIR_ALARM_ROUTES.home; const Component = route.component(); return ( @@ -166,9 +166,9 @@ const AirAlarmControl = (props, context) => { // Home screen // -------------------------------------------------------- -const AirAlarmControlHome = (props, context) => { - const { act, data } = useBackend(context); - const [screen, setScreen] = useLocalState(context, 'screen', 'home'); +const AirAlarmControlHome = (props) => { + const { act, data } = useBackend(); + const [screen, setScreen] = useLocalState('screen', 'home'); const { selectedModePath, panicSiphonPath, @@ -238,8 +238,8 @@ const AirAlarmControlHome = (props, context) => { // Vents // -------------------------------------------------------- -const AirAlarmControlVents = (props, context) => { - const { data } = useBackend(context); +const AirAlarmControlVents = (props) => { + const { data } = useBackend(); const { vents } = data; if (!vents || vents.length === 0) { return Nothing to show; @@ -256,8 +256,8 @@ const AirAlarmControlVents = (props, context) => { // Scrubbers // -------------------------------------------------------- -const AirAlarmControlScrubbers = (props, context) => { - const { data } = useBackend(context); +const AirAlarmControlScrubbers = (props) => { + const { data } = useBackend(); const { scrubbers } = data; if (!scrubbers || scrubbers.length === 0) { return Nothing to show; @@ -274,8 +274,8 @@ const AirAlarmControlScrubbers = (props, context) => { // Modes // -------------------------------------------------------- -const AirAlarmControlModes = (props, context) => { - const { act, data } = useBackend(context); +const AirAlarmControlModes = (props) => { + const { act, data } = useBackend(); const { modes, selectedModePath } = data; if (!modes || modes.length === 0) { return Nothing to show; @@ -315,8 +315,8 @@ type EditingModalProps = { finish: () => void; }; -const EditingModal = (props: EditingModalProps, context) => { - const { act, data } = useBackend(context); +const EditingModal = (props: EditingModalProps) => { + const { act, data } = useBackend(); const { id, name, type, typeVar, typeName, unit, oldValue, finish } = props; return ( @@ -370,12 +370,12 @@ const EditingModal = (props: EditingModalProps, context) => { ); }; -const AirAlarmControlThresholds = (props, context) => { - const { act, data } = useBackend(context); +const AirAlarmControlThresholds = (props) => { + const { act, data } = useBackend(); const [activeModal, setActiveModal] = useLocalState | null>(context, 'tlvModal', null); + > | null>('tlvModal', null); const { tlvSettings, thresholdTypeMap } = data; return ( <> diff --git a/tgui/packages/tgui/interfaces/AirlockController.tsx b/tgui/packages/tgui/interfaces/AirlockController.tsx index 324a34da10f..ca3551c3415 100644 --- a/tgui/packages/tgui/interfaces/AirlockController.tsx +++ b/tgui/packages/tgui/interfaces/AirlockController.tsx @@ -16,8 +16,8 @@ type AirlockStatus = { color: string; }; -export const AirlockController = (props, context) => { - const { data } = useBackend(context); +export const AirlockController = (props) => { + const { data } = useBackend(); const { airlockState, pumpStatus, interiorStatus, exteriorStatus } = data; const currentStatus: AirlockStatus = getAirlockStatus(airlockState); const nameToUpperCase = (str: string) => @@ -55,8 +55,8 @@ export const AirlockController = (props, context) => { }; /** Displays the buttons on top of the window to cycle the airlock */ -const AirLockButtons = (props, context) => { - const { act, data } = useBackend(context); +const AirLockButtons = (props) => { + const { act, data } = useBackend(); const { airlockState } = data; switch (airlockState) { case 'pressurize': @@ -105,8 +105,8 @@ const AirLockButtons = (props, context) => { }; /** Displays the numeric pressure alongside an icon for the user */ -const PressureIndicator = (props, context) => { - const { data } = useBackend(context); +const PressureIndicator = (props) => { + const { data } = useBackend(); const { sensorPressure } = data; const { currentStatus: { icon, color }, diff --git a/tgui/packages/tgui/interfaces/AirlockElectronics.tsx b/tgui/packages/tgui/interfaces/AirlockElectronics.tsx index a5617b88267..d66d90986ed 100644 --- a/tgui/packages/tgui/interfaces/AirlockElectronics.tsx +++ b/tgui/packages/tgui/interfaces/AirlockElectronics.tsx @@ -14,8 +14,8 @@ type Data = { shell: BooleanLike; }; -export const AirLockMainSection = (props, context) => { - const { act, data } = useBackend(context); +export const AirLockMainSection = (props) => { + const { act, data } = useBackend(); const { accesses = [], oneAccess, @@ -138,7 +138,7 @@ export const AirLockMainSection = (props, context) => { ); }; -export const AirlockElectronics = (props, context) => { +export const AirlockElectronics = (props) => { return ( diff --git a/tgui/packages/tgui/interfaces/AlertModal.tsx b/tgui/packages/tgui/interfaces/AlertModal.tsx index ee53a0f1b63..60f60c94c52 100644 --- a/tgui/packages/tgui/interfaces/AlertModal.tsx +++ b/tgui/packages/tgui/interfaces/AlertModal.tsx @@ -17,8 +17,8 @@ type AlertModalData = { const KEY_DECREMENT = -1; const KEY_INCREMENT = 1; -export const AlertModal = (props, context) => { - const { act, data } = useBackend(context); +export const AlertModal = (props) => { + const { act, data } = useBackend(); const { autofocus, buttons = [], @@ -27,7 +27,7 @@ export const AlertModal = (props, context) => { timeout, title, } = data; - const [selected, setSelected] = useLocalState(context, 'selected', 0); + const [selected, setSelected] = useLocalState('selected', 0); // Dynamically sets window dimensions const windowHeight = 115 + @@ -89,8 +89,8 @@ export const AlertModal = (props, context) => { * Technically this handles more than 2 buttons, but you * should just be using a list input in that case. */ -const ButtonDisplay = (props, context) => { - const { data } = useBackend(context); +const ButtonDisplay = (props) => { + const { data } = useBackend(); const { buttons = [], large_buttons, swapped_buttons } = data; const { selected } = props; @@ -127,8 +127,8 @@ const ButtonDisplay = (props, context) => { /** * Displays a button with variable sizing. */ -const AlertButton = (props, context) => { - const { act, data } = useBackend(context); +const AlertButton = (props) => { + const { act, data } = useBackend(); const { large_buttons } = data; const { button, selected } = props; const buttonWidth = button.length > 7 ? button.length : 7; diff --git a/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx b/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx index 9da731a071e..fc73c541510 100644 --- a/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx +++ b/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx @@ -3,8 +3,8 @@ import { Button, Icon, Modal, Section, Stack, LabeledList, Box } from '../compon import { Window } from '../layouts'; import { GasmixParser } from './common/GasmixParser'; -export const AnomalyRefinery = (props, context) => { - const { act, data } = useBackend(context); +export const AnomalyRefinery = (props) => { + const { act, data } = useBackend(); return ( @@ -14,9 +14,9 @@ export const AnomalyRefinery = (props, context) => { ); }; -const AnomalyRefineryContent = (props, context) => { - const { act, data } = useBackend(context); - const [currentTab, changeTab] = useSharedState(context, 'exploderTab', 1); +const AnomalyRefineryContent = (props) => { + const { act, data } = useBackend(); + const [currentTab, changeTab] = useSharedState('exploderTab', 1); const { core, valvePresent, active } = data; return ( @@ -59,8 +59,8 @@ const AnomalyRefineryContent = (props, context) => { ); }; -const CoreCompressorContent = (props, context) => { - const { act, data } = useBackend(context); +const CoreCompressorContent = (props) => { + const { act, data } = useBackend(); const { core, requiredRadius, gasList, valveReady, active, valvePresent } = data; return ( @@ -160,8 +160,8 @@ const CoreCompressorContent = (props, context) => { ); }; -const BombProcessorContent = (props, context) => { - const { act, data } = useBackend(context); +const BombProcessorContent = (props) => { + const { act, data } = useBackend(); const { gasList, reactionIncrement } = data; return ( <> diff --git a/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx b/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx index e8471a6a5ac..0b6d4da98b6 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx @@ -14,7 +14,7 @@ type Data = { const BLOB_COLOR = '#556b2f'; -export const AntagInfoBlob = (props, context) => { +export const AntagInfoBlob = (props) => { return ( @@ -31,8 +31,8 @@ export const AntagInfoBlob = (props, context) => { ); }; -const Overview = (props, context) => { - const { data } = useBackend(context); +const Overview = (props) => { + const { data } = useBackend(); const { color, description, effects, name } = data; if (!name) { @@ -89,7 +89,7 @@ const Overview = (props, context) => { ); }; -const Basics = (props, context) => { +const Basics = (props) => { return ( @@ -118,7 +118,7 @@ const Basics = (props, context) => { ); }; -const Minions = (props, context) => { +const Minions = (props) => { return ( @@ -137,7 +137,7 @@ const Minions = (props, context) => { ); }; -const Structures = (props, context) => { +const Structures = (props) => { return ( @@ -173,8 +173,8 @@ const Structures = (props, context) => { ); }; -const ObjectiveDisplay = (props, context) => { - const { data } = useBackend(context); +const ObjectiveDisplay = (props) => { + const { data } = useBackend(); const { color, objectives } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx b/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx index bc7be496827..2587850b8fb 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx @@ -7,8 +7,8 @@ type Data = { objectives: Objective[]; }; -export const AntagInfoBrainwashed = (porps, context) => { - const { data } = useBackend(context); +export const AntagInfoBrainwashed = (porps) => { + const { data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx b/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx index 327c46c8df9..a1214e0c0b9 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx @@ -9,8 +9,8 @@ type Info = { brothers: string; }; -export const AntagInfoBrother = (props, context) => { - const { data } = useBackend(context); +export const AntagInfoBrother = (props) => { + const { data } = useBackend(); const { antag_name, brothers, objectives } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx index f3eda78c661..78cdf334594 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx @@ -54,7 +54,7 @@ type Info = { can_change_objective: BooleanLike; }; -export const AntagInfoChangeling = (props, context) => { +export const AntagInfoChangeling = (props) => { return ( { ); }; -const HivemindSection = (props, context) => { - const { act, data } = useBackend(context); +const HivemindSection = (props) => { + const { act, data } = useBackend(); const { true_name } = data; return (
@@ -115,8 +115,8 @@ const HivemindSection = (props, context) => { ); }; -const IntroductionSection = (props, context) => { - const { act, data } = useBackend(context); +const IntroductionSection = (props) => { + const { act, data } = useBackend(); const { true_name, hive_name, objectives, can_change_objective } = data; return (
{ ); }; -const AbilitiesSection = (props, context) => { - const { data } = useBackend(context); +const AbilitiesSection = (props) => { + const { data } = useBackend(); return (
@@ -195,11 +195,10 @@ const AbilitiesSection = (props, context) => { ); }; -const MemoriesSection = (props, context) => { - const { data } = useBackend(context); +const MemoriesSection = (props) => { + const { data } = useBackend(); const { memories } = data; const [selectedMemory, setSelectedMemory] = useSharedState( - context, 'memory', (!!memories && memories[0]) || null ); @@ -245,8 +244,8 @@ const MemoriesSection = (props, context) => { ); }; -const VictimPatternsSection = (props, context) => { - const { data } = useBackend(context); +const VictimPatternsSection = (props) => { + const { data } = useBackend(); const { stolen_antag_info } = data; return (
{ - const { data } = useBackend(context); +export const AntagInfoDemon = (props) => { + const { data } = useBackend(); const { fluff, objectives, explain_attack } = data; return ( @@ -84,7 +84,7 @@ export const AntagInfoDemon = (props, context) => { ); }; -const DemonRunes = (props, context) => { +const DemonRunes = (props) => { return (
{/* diff --git a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx index 33b7623c44f..c16f9e735fc 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx @@ -8,8 +8,8 @@ type Info = { objectives: Objective[]; }; -export const AntagInfoGeneric = (props, context) => { - const { data } = useBackend(context); +export const AntagInfoGeneric = (props) => { + const { data } = useBackend(); const { antag_name, objectives } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx b/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx index ca6ac70ccb3..1281bc61904 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx @@ -17,8 +17,8 @@ const textStyles = { }, } as const; -export const AntagInfoGlitch = (props, context) => { - const { data } = useBackend(context); +export const AntagInfoGlitch = (props) => { + const { data } = useBackend(); const { antag_name, objectives = [] } = data; return ( @@ -64,8 +64,8 @@ export const AntagInfoGlitch = (props, context) => { ); }; -const SpecificInfo = (props, context) => { - const { data } = useBackend(context); +const SpecificInfo = (props) => { + const { data } = useBackend(); const { antag_name } = data; switch (antag_name) { diff --git a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx index 952f559e3f8..4b9eb3183de 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx @@ -52,8 +52,8 @@ type Info = { can_change_objective: BooleanLike; }; -const IntroductionSection = (props, context) => { - const { data, act } = useBackend(context); +const IntroductionSection = (props) => { + const { data, act } = useBackend(); const { objectives, ascended, can_change_objective } = data; return ( @@ -176,8 +176,8 @@ const GuideSection = () => { ); }; -const InformationSection = (props, context) => { - const { data } = useBackend(context); +const InformationSection = (props) => { + const { data } = useBackend(); const { charges, total_sacrifices, ascended } = data; return ( @@ -212,8 +212,8 @@ const InformationSection = (props, context) => { ); }; -const ResearchedKnowledge = (props, context) => { - const { data } = useBackend(context); +const ResearchedKnowledge = (props) => { + const { data } = useBackend(); const { learnedKnowledge } = data; return ( @@ -237,8 +237,8 @@ const ResearchedKnowledge = (props, context) => { ); }; -const KnowledgeShop = (props, context) => { - const { data, act } = useBackend(context); +const KnowledgeShop = (props) => { + const { data, act } = useBackend(); const { learnableKnowledge } = data; return ( @@ -272,8 +272,8 @@ const KnowledgeShop = (props, context) => { ); }; -const ResearchInfo = (props, context) => { - const { data } = useBackend(context); +const ResearchInfo = (props) => { + const { data } = useBackend(); const { charges } = data; return ( @@ -299,11 +299,11 @@ const ResearchInfo = (props, context) => { ); }; -export const AntagInfoHeretic = (props, context) => { - const { data } = useBackend(context); +export const AntagInfoHeretic = (props) => { + const { data } = useBackend(); const { ascended } = data; - const [currentTab, setTab] = useLocalState(context, 'currentTab', 0); + const [currentTab, setTab] = useLocalState('currentTab', 0); return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx index 0e2444ee491..45878ca754f 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx @@ -35,8 +35,8 @@ type Info = { can_change_objective: BooleanLike; }; -const IntroductionSection = (props, context) => { - const { act, data } = useBackend(context); +const IntroductionSection = (props) => { + const { act, data } = useBackend(); const { intro, objectives, can_change_objective } = data; return (
@@ -61,8 +61,8 @@ const IntroductionSection = (props, context) => { ); }; -const FlavorSection = (props, context) => { - const { data } = useBackend(context); +const FlavorSection = (props) => { + const { data } = useBackend(); const { allies, goal } = data; return (
{ ); }; -const CodewordsSection = (props, context) => { - const { data } = useBackend(context); +const CodewordsSection = (props) => { + const { data } = useBackend(); const { has_codewords, phrases, responses } = data; return (
@@ -162,14 +162,10 @@ const CodewordsSection = (props, context) => { ); }; -export const AntagInfoMalf = (props, context) => { - const { act, data } = useBackend(context); +export const AntagInfoMalf = (props) => { + const { act, data } = useBackend(); const { processingTime, categories } = data; - const [antagInfoTab, setAntagInfoTab] = useLocalState( - context, - 'antagInfoTab', - 0 - ); + const [antagInfoTab, setAntagInfoTab] = useLocalState('antagInfoTab', 0); const categoriesList: string[] = []; const items: Item[] = []; for (let i = 0; i < categories.length; i++) { diff --git a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx index fb98e1aa35b..e6ce213d3e7 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx @@ -13,7 +13,7 @@ const noticestyle = { color: 'lightblue', }; -export const AntagInfoMorph = (props, context) => { +export const AntagInfoMorph = (props) => { return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx index 327e114e2fd..dd3729477d8 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx @@ -9,7 +9,7 @@ const noticestyle = { color: 'lightblue', }; -export const AntagInfoNightmare = (props, context) => { +export const AntagInfoNightmare = (props) => { return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx index a537888af75..befd7f9d420 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx @@ -13,8 +13,8 @@ type NinjaInfo = { can_change_objective: BooleanLike; }; -export const AntagInfoNinja = (props, context) => { - const { data } = useBackend(context); +export const AntagInfoNinja = (props) => { + const { data } = useBackend(); const { objectives, can_change_objective } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx b/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx index a389fe2df7e..d3d939b50c6 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx +++ b/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { BlockQuote, Section, Stack } from '../components'; import { Window } from '../layouts'; -export const AntagInfoSentient = (props, context) => { - const { act, data } = useBackend(context); +export const AntagInfoSentient = (props) => { + const { act, data } = useBackend(); const { enslaved_to, holographic, p_them, p_their } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx b/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx index 4475adba4e5..2a10fe0b1fe 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx @@ -9,8 +9,8 @@ type Info = { nationColor: string; }; -export const AntagInfoSeparatist = (props, context) => { - const { data } = useBackend(context); +export const AntagInfoSeparatist = (props) => { + const { data } = useBackend(); const { nationColor } = data; return ( @@ -28,8 +28,8 @@ export const AntagInfoSeparatist = (props, context) => { ); }; -const IntroductionObjectives = (props, context) => { - const { data } = useBackend(context); +const IntroductionObjectives = (props) => { + const { data } = useBackend(); const { nation, objectives } = data; return (
@@ -48,8 +48,8 @@ const IntroductionObjectives = (props, context) => { ); }; -const FrequentlyAskedQuestions = (props, context) => { - const { data } = useBackend(context); +const FrequentlyAskedQuestions = (props) => { + const { data } = useBackend(); const { nation } = data; return (
diff --git a/tgui/packages/tgui/interfaces/AntagInfoShade.jsx b/tgui/packages/tgui/interfaces/AntagInfoShade.jsx index caa9e953b47..4a44a323f7d 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoShade.jsx +++ b/tgui/packages/tgui/interfaces/AntagInfoShade.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Icon, Section, Stack } from '../components'; import { Window } from '../layouts'; -export const AntagInfoShade = (props, context) => { - const { act, data } = useBackend(context); +export const AntagInfoShade = (props) => { + const { act, data } = useBackend(); const { master_name } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx b/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx index cc62986c085..50592eefc63 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx @@ -38,8 +38,8 @@ type Info = { objectives: Objective[]; }; -const IntroductionSection = (props, context) => { - const { act, data } = useBackend(context); +const IntroductionSection = (props) => { + const { act, data } = useBackend(); const { intro, objectives } = data; return (
@@ -53,8 +53,8 @@ const IntroductionSection = (props, context) => { ); }; -const EmployerSection = (props, context) => { - const { data } = useBackend(context); +const EmployerSection = (props) => { + const { data } = useBackend(); const { allies, goal } = data; return (
{ ); }; -const UplinkSection = (props, context) => { - const { data } = useBackend(context); +const UplinkSection = (props) => { + const { data } = useBackend(); const { has_uplink, uplink_intro, @@ -172,8 +172,8 @@ const UplinkSection = (props, context) => { ); }; -const CodewordsSection = (props, context) => { - const { data } = useBackend(context); +const CodewordsSection = (props) => { + const { data } = useBackend(); const { has_codewords, phrases, responses } = data; return (
@@ -218,8 +218,8 @@ const CodewordsSection = (props, context) => { ); }; -export const AntagInfoTraitor = (props, context) => { - const { data } = useBackend(context); +export const AntagInfoTraitor = (props) => { + const { data } = useBackend(); const { theme } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx index e5de257851a..a94ca5ab3d0 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx @@ -48,8 +48,8 @@ type Info = { can_change_objective: BooleanLike; }; -export const AntagInfoWizard = (props, context) => { - const { data, act } = useBackend(context); +export const AntagInfoWizard = (props) => { + const { data, act } = useBackend(); const { ritual, objectives, can_change_objective } = data; return ( @@ -152,7 +152,7 @@ export const AntagInfoWizard = (props, context) => { ); }; -const RitualPrintout = (props: { ritual: GrandRitual }, context) => { +const RitualPrintout = (props: { ritual: GrandRitual }) => { const { ritual } = props; if (!ritual.next_area) { return null; diff --git a/tgui/packages/tgui/interfaces/Apc.jsx b/tgui/packages/tgui/interfaces/Apc.jsx index 60e8539f992..eb137c1a214 100644 --- a/tgui/packages/tgui/interfaces/Apc.jsx +++ b/tgui/packages/tgui/interfaces/Apc.jsx @@ -3,7 +3,7 @@ import { Box, Button, LabeledList, NoticeBox, ProgressBar, Section } from '../co import { Window } from '../layouts'; import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox'; -export const Apc = (props, context) => { +export const Apc = (props) => { return ( @@ -54,8 +54,8 @@ const malfMap = { }, }; -const ApcContent = (props, context) => { - const { act, data } = useBackend(context); +const ApcContent = (props) => { + const { act, data } = useBackend(); const locked = data.locked && !data.siliconUser; const externalPowerStatus = powerStatusMap[data.externalPower] || powerStatusMap[0]; diff --git a/tgui/packages/tgui/interfaces/ApcControl.jsx b/tgui/packages/tgui/interfaces/ApcControl.jsx index bd7fc54d9f3..98cab09b763 100644 --- a/tgui/packages/tgui/interfaces/ApcControl.jsx +++ b/tgui/packages/tgui/interfaces/ApcControl.jsx @@ -6,8 +6,8 @@ import { Box, Button, Dimmer, Icon, Table, Tabs, Stack, Section } from '../compo import { Window } from '../layouts'; import { AreaCharge, powerRank } from './PowerMonitor'; -export const ApcControl = (props, context) => { - const { data } = useBackend(context); +export const ApcControl = (props) => { + const { data } = useBackend(); return ( @@ -18,8 +18,8 @@ export const ApcControl = (props, context) => { ); }; -const ApcLoggedOut = (props, context) => { - const { act, data } = useBackend(context); +const ApcLoggedOut = (props) => { + const { act, data } = useBackend(); const { emagged } = data; const text = emagged === 1 ? 'Open' : 'Log In'; return ( @@ -35,10 +35,10 @@ const ApcLoggedOut = (props, context) => { ); }; -const ApcLoggedIn = (props, context) => { - const { act, data } = useBackend(context); +const ApcLoggedIn = (props) => { + const { act, data } = useBackend(); const { restoring } = data; - const [tabIndex, setTabIndex] = useLocalState(context, 'tab-index', 1); + const [tabIndex, setTabIndex] = useLocalState('tab-index', 1); return ( @@ -90,14 +90,10 @@ const ApcLoggedIn = (props, context) => { ); }; -const ControlPanel = (props, context) => { - const { act, data } = useBackend(context); +const ControlPanel = (props) => { + const { act, data } = useBackend(); const { emagged, logging } = data; - const [sortByField, setSortByField] = useLocalState( - context, - 'sortByField', - 'name' - ); + const [sortByField, setSortByField] = useLocalState('sortByField', 'name'); return ( @@ -146,10 +142,10 @@ const ControlPanel = (props, context) => { ); }; -const ApcControlScene = (props, context) => { - const { data, act } = useBackend(context); +const ApcControlScene = (props) => { + const { data, act } = useBackend(); - const [sortByField] = useLocalState(context, 'sortByField', 'name'); + const [sortByField] = useLocalState('sortByField', 'name'); const apcs = flow([ map((apc, i) => ({ @@ -243,8 +239,8 @@ const ApcControlScene = (props, context) => { ); }; -const LogPanel = (props, context) => { - const { data } = useBackend(context); +const LogPanel = (props) => { + const { data } = useBackend(); const logs = flow([ map((line, i) => ({ diff --git a/tgui/packages/tgui/interfaces/ApprenticeContract.tsx b/tgui/packages/tgui/interfaces/ApprenticeContract.tsx index f0077e7f0fc..1544f1e3709 100644 --- a/tgui/packages/tgui/interfaces/ApprenticeContract.tsx +++ b/tgui/packages/tgui/interfaces/ApprenticeContract.tsx @@ -4,7 +4,7 @@ import { useBackend } from '../backend'; import { BlockQuote, Box, Button, Icon, Section, Stack } from '../components'; import { Window } from '../layouts'; -export const ApprenticeContract = (props, context) => { +export const ApprenticeContract = (props) => { return ( @@ -65,8 +65,8 @@ export const ApprenticeContract = (props, context) => { ); }; -const ApprenticeSelection = (props, context) => { - const { act } = useBackend(context); +const ApprenticeSelection = (props) => { + const { act } = useBackend(); const { iconName, fluffName, schoolTitle, assetName, blurb } = props; return (
diff --git a/tgui/packages/tgui/interfaces/Aquarium.tsx b/tgui/packages/tgui/interfaces/Aquarium.tsx index edcb718a172..fd1702bb798 100644 --- a/tgui/packages/tgui/interfaces/Aquarium.tsx +++ b/tgui/packages/tgui/interfaces/Aquarium.tsx @@ -14,8 +14,8 @@ type Data = { feeding_interval: number; }; -export const Aquarium = (props, context) => { - const { act, data } = useBackend(context); +export const Aquarium = (props) => { + const { act, data } = useBackend(); const { temperature, fluid_type, diff --git a/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx b/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx index 63b0d26d5a9..1202c5d73bd 100644 --- a/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx +++ b/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx @@ -7,8 +7,8 @@ type Data = { minor: string[]; }; -export const AtmosAlertConsole = (props, context) => { - const { act, data } = useBackend(context); +export const AtmosAlertConsole = (props) => { + const { act, data } = useBackend(); const { priority = [], minor = [] } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx index db38e32eaba..cf766108ea5 100644 --- a/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx +++ b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx @@ -12,25 +12,21 @@ type Chamber = { output_info?: { active: boolean; amount: number }; }; -export const AtmosControlConsole = (props, context) => { +export const AtmosControlConsole = (props) => { const { act, data } = useBackend<{ chambers: Chamber[]; maxInput: number; maxOutput: number; reconnecting: boolean; control: boolean; - }>(context); + }>(); const chambers = data.chambers || []; - const [chamberId, setChamberId] = useLocalState( - context, - 'chamberId', - chambers[0]?.id - ); + const [chamberId, setChamberId] = useLocalState('chamberId', chambers[0]?.id); const selectedChamber = chambers.length === 1 ? chambers[0] : chambers.find((chamber) => chamber.id === chamberId); - const [setActiveGasId, setActiveReactionId] = atmosHandbookHooks(context); + const [setActiveGasId, setActiveReactionId] = atmosHandbookHooks(); return ( diff --git a/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx b/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx index 6ca6a642b5a..f77b445b2f6 100644 --- a/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx +++ b/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx @@ -4,8 +4,8 @@ import { useBackend } from '../backend'; import { Box, Button, Flex, Section, Table } from '../components'; import { Window } from '../layouts'; -export const AtmosControlPanel = (props, context) => { - const { act, data } = useBackend(context); +export const AtmosControlPanel = (props) => { + const { act, data } = useBackend(); const groups = flow([ map((group, i) => ({ ...group, diff --git a/tgui/packages/tgui/interfaces/AtmosFilter.tsx b/tgui/packages/tgui/interfaces/AtmosFilter.tsx index 7116f39f049..83c2e76d0ed 100644 --- a/tgui/packages/tgui/interfaces/AtmosFilter.tsx +++ b/tgui/packages/tgui/interfaces/AtmosFilter.tsx @@ -17,8 +17,8 @@ type Filter = { gas_id: string; }; -export const AtmosFilter = (props, context) => { - const { act, data } = useBackend(context); +export const AtmosFilter = (props) => { + const { act, data } = useBackend(); const { filter_types = [], on, rate, max_rate } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AtmosMixer.tsx b/tgui/packages/tgui/interfaces/AtmosMixer.tsx index 4769b30eaec..fa95104c7ee 100644 --- a/tgui/packages/tgui/interfaces/AtmosMixer.tsx +++ b/tgui/packages/tgui/interfaces/AtmosMixer.tsx @@ -11,8 +11,8 @@ type Data = { node2_concentration: number; }; -export const AtmosMixer = (props, context) => { - const { act, data } = useBackend(context); +export const AtmosMixer = (props) => { + const { act, data } = useBackend(); const { on, set_pressure, diff --git a/tgui/packages/tgui/interfaces/AtmosPump.tsx b/tgui/packages/tgui/interfaces/AtmosPump.tsx index f61dcc155c3..a915138690c 100644 --- a/tgui/packages/tgui/interfaces/AtmosPump.tsx +++ b/tgui/packages/tgui/interfaces/AtmosPump.tsx @@ -11,8 +11,8 @@ type Data = { max_pressure: number; }; -export const AtmosPump = (props, context) => { - const { act, data } = useBackend(context); +export const AtmosPump = (props) => { + const { act, data } = useBackend(); const { on, max_rate, max_pressure, rate, pressure } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AtmosTempGate.tsx b/tgui/packages/tgui/interfaces/AtmosTempGate.tsx index ec82d049f9e..569da6347ed 100644 --- a/tgui/packages/tgui/interfaces/AtmosTempGate.tsx +++ b/tgui/packages/tgui/interfaces/AtmosTempGate.tsx @@ -10,8 +10,8 @@ type Data = { max_temperature: number; }; -export const AtmosTempGate = (props, context) => { - const { act, data } = useBackend(context); +export const AtmosTempGate = (props) => { + const { act, data } = useBackend(); const { on, temperature, min_temperature, max_temperature } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AtmosTempPump.tsx b/tgui/packages/tgui/interfaces/AtmosTempPump.tsx index 33f8ec96a11..1c2ddccb9d8 100644 --- a/tgui/packages/tgui/interfaces/AtmosTempPump.tsx +++ b/tgui/packages/tgui/interfaces/AtmosTempPump.tsx @@ -9,8 +9,8 @@ type Data = { max_heat_transfer_rate: number; }; -export const AtmosTempPump = (props, context) => { - const { act, data } = useBackend(context); +export const AtmosTempPump = (props) => { + const { act, data } = useBackend(); const { on, rate, max_heat_transfer_rate } = data; return ( diff --git a/tgui/packages/tgui/interfaces/Autolathe.tsx b/tgui/packages/tgui/interfaces/Autolathe.tsx index e83554e7164..5f247389203 100644 --- a/tgui/packages/tgui/interfaces/Autolathe.tsx +++ b/tgui/packages/tgui/interfaces/Autolathe.tsx @@ -17,8 +17,8 @@ type AutolatheData = { active: BooleanLike; }; -export const Autolathe = (props, context) => { - const { data } = useBackend(context); +export const Autolathe = (props) => { + const { data } = useBackend(); const { materialtotal, materialsmax, @@ -121,8 +121,8 @@ type PrintButtonProps = { maxmult: number; }; -const PrintButton = (props: PrintButtonProps, context) => { - const { act } = useBackend(context); +const PrintButton = (props: PrintButtonProps) => { + const { act } = useBackend(); const { design, quantity, @@ -163,8 +163,8 @@ type AutolatheRecipeProps = { SHEET_MATERIAL_AMOUNT: number; }; -const AutolatheRecipe = (props: AutolatheRecipeProps, context) => { - const { act } = useBackend(context); +const AutolatheRecipe = (props: AutolatheRecipeProps) => { + const { act } = useBackend(); const { design, availableMaterials, SHEET_MATERIAL_AMOUNT } = props; const maxmult = design.maxmult; diff --git a/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx b/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx index e61e0e38660..8885bcb08fb 100644 --- a/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx +++ b/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx @@ -16,8 +16,8 @@ type Data = { newhead: string; }; -export const AutomatedAnnouncement = (props, context) => { - const { act, data } = useBackend(context); +export const AutomatedAnnouncement = (props) => { + const { act, data } = useBackend(); const { arrivalToggle, arrival, newheadToggle, newhead } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx b/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx index e3fda06589a..3777850e9e7 100644 --- a/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx +++ b/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx @@ -27,9 +27,9 @@ const STATUS_COLOR_KEYS = { 'All Clear': 'good', } as const; -export const AuxBaseConsole = (props, context) => { - const { data } = useBackend(context); - const [tab, setTab] = useLocalState(context, 'tab', 1); +export const AuxBaseConsole = (props) => { + const { data } = useBackend(); + const [tab, setTab] = useLocalState('tab', 1); const { type, blind_drop, turrets = [] } = data; return ( @@ -62,8 +62,8 @@ export const AuxBaseConsole = (props, context) => { ); }; -export const AuxBaseConsoleContent = (props, context) => { - const { act, data } = useBackend(context); +export const AuxBaseConsoleContent = (props) => { + const { act, data } = useBackend(); const { turrets = [] } = data; return ( diff --git a/tgui/packages/tgui/interfaces/AvatarHelp.tsx b/tgui/packages/tgui/interfaces/AvatarHelp.tsx index 647d3a2e22b..be2796dcf94 100644 --- a/tgui/packages/tgui/interfaces/AvatarHelp.tsx +++ b/tgui/packages/tgui/interfaces/AvatarHelp.tsx @@ -47,8 +47,8 @@ const boxHelp = [ }, ] as const; -export const AvatarHelp = (props, context) => { - const { data } = useBackend(context); +export const AvatarHelp = (props) => { + const { data } = useBackend(); const { help_text = DEFAULT_HELP } = data; return ( @@ -96,7 +96,7 @@ export const AvatarHelp = (props, context) => { }; // I wish I had media queries -const BoxHelp = (props: { index: number }, context) => { +const BoxHelp = (props: { index: number }) => { const { index } = props; return ( diff --git a/tgui/packages/tgui/interfaces/BankMachine.tsx b/tgui/packages/tgui/interfaces/BankMachine.tsx index cd045a9ce6b..7a5c9c9677c 100644 --- a/tgui/packages/tgui/interfaces/BankMachine.tsx +++ b/tgui/packages/tgui/interfaces/BankMachine.tsx @@ -10,8 +10,8 @@ type Data = { station_name: string; }; -export const BankMachine = (props, context) => { - const { act, data } = useBackend(context); +export const BankMachine = (props) => { + const { act, data } = useBackend(); const { current_balance, siphoning, station_name } = data; return ( diff --git a/tgui/packages/tgui/interfaces/BasketballPanel.tsx b/tgui/packages/tgui/interfaces/BasketballPanel.tsx index 4a0e15c97d7..dd78fb570b4 100644 --- a/tgui/packages/tgui/interfaces/BasketballPanel.tsx +++ b/tgui/packages/tgui/interfaces/BasketballPanel.tsx @@ -13,8 +13,8 @@ type BasketballPanelData = { }[]; }; -export const BasketballPanel = (props, context) => { - const { act, data } = useBackend(context); +export const BasketballPanel = (props) => { + const { act, data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/Biogenerator.tsx b/tgui/packages/tgui/interfaces/Biogenerator.tsx index 1ee9444d313..134e69a9931 100644 --- a/tgui/packages/tgui/interfaces/Biogenerator.tsx +++ b/tgui/packages/tgui/interfaces/Biogenerator.tsx @@ -32,8 +32,8 @@ type Design = { amount: number; }; -export const Biogenerator = (props, context) => { - const { act, data } = useBackend(context); +export const Biogenerator = (props) => { + const { act, data } = useBackend(); const { processing, beaker, @@ -48,7 +48,6 @@ export const Biogenerator = (props, context) => { categories, } = data; const [selectedCategory, setSelectedCategory] = useLocalState( - context, 'category', data.categories[0]?.name ); @@ -163,11 +162,10 @@ export const Biogenerator = (props, context) => { ); }; -const ItemList = (props, context) => { - const { act } = useBackend(context); +const ItemList = (props) => { + const { act } = useBackend(); const items = props.items.map((item) => { const [amount, setAmount] = useLocalState( - context, 'amount' + item.name, item.is_reagent ? Math.min(Math.max(props.space, 1), 10) : 1 ); diff --git a/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx index c7c9e22805b..85f26cd5200 100644 --- a/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx +++ b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx @@ -34,8 +34,8 @@ type DeliveryMethod = { price: number; }; -export const BlackMarketUplink = (props, context) => { - const { act, data } = useBackend(context); +export const BlackMarketUplink = (props) => { + const { act, data } = useBackend(); const { categories = [], markets = [], @@ -124,8 +124,8 @@ export const BlackMarketUplink = (props, context) => { ); }; -const ShipmentSelector = (props, context) => { - const { act, data } = useBackend(context); +const ShipmentSelector = (props) => { + const { act, data } = useBackend(); const { buying, ltsrbt_built, money } = data; if (!buying) { return null; diff --git a/tgui/packages/tgui/interfaces/BloodFilter.tsx b/tgui/packages/tgui/interfaces/BloodFilter.tsx index 23d0f4bec25..4e1d553edfd 100644 --- a/tgui/packages/tgui/interfaces/BloodFilter.tsx +++ b/tgui/packages/tgui/interfaces/BloodFilter.tsx @@ -7,8 +7,8 @@ type Data = { whitelist: string[]; }; -export const BloodFilter = (props, context) => { - const { data } = useBackend(context); +export const BloodFilter = (props) => { + const { data } = useBackend(); const { whitelist = [] } = data; return ( diff --git a/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx b/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx index 136f5e76a89..31a3bc204e8 100644 --- a/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx +++ b/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx @@ -10,8 +10,8 @@ type Data = { target: string; }; -export const BluespaceArtillery = (props, context) => { - const { act, data } = useBackend(context); +export const BluespaceArtillery = (props) => { + const { act, data } = useBackend(); const { notice, connected, unlocked, target } = data; return ( diff --git a/tgui/packages/tgui/interfaces/BluespaceLocator.tsx b/tgui/packages/tgui/interfaces/BluespaceLocator.tsx index 7f6c37b8929..27b7b20d3e0 100644 --- a/tgui/packages/tgui/interfaces/BluespaceLocator.tsx +++ b/tgui/packages/tgui/interfaces/BluespaceLocator.tsx @@ -25,8 +25,8 @@ const DIRECTION_TO_ICON = { northwest: 315, } as const; -export const BluespaceLocator = (props, context) => { - const [tab, setTab] = useLocalState(context, 'tab', 'implant'); +export const BluespaceLocator = (props) => { + const [tab, setTab] = useLocalState('tab', 'implant'); return ( @@ -50,8 +50,8 @@ export const BluespaceLocator = (props, context) => { ); }; -const TeleporterBeacons = (props, context) => { - const { data } = useBackend(context); +const TeleporterBeacons = (props) => { + const { data } = useBackend(); const { telebeacons } = data; return ( @@ -68,8 +68,8 @@ const TeleporterBeacons = (props, context) => { ); }; -const TrackingImplants = (props, context) => { - const { data } = useBackend(context); +const TrackingImplants = (props) => { + const { data } = useBackend(); const { trackimplants } = data; return ( @@ -86,8 +86,8 @@ const TrackingImplants = (props, context) => { ); }; -const SignalLocator = (props, context) => { - const { data } = useBackend(context); +const SignalLocator = (props) => { + const { data } = useBackend(); const { trackingrange } = data; const { name, direction, distance } = props; diff --git a/tgui/packages/tgui/interfaces/BluespaceSender.tsx b/tgui/packages/tgui/interfaces/BluespaceSender.tsx index d3663b69146..036d1d54351 100644 --- a/tgui/packages/tgui/interfaces/BluespaceSender.tsx +++ b/tgui/packages/tgui/interfaces/BluespaceSender.tsx @@ -29,8 +29,8 @@ type GasDisplayProps = { const mappedTopMargin = '2%'; -export const BluespaceSender = (props, context) => { - const { act, data } = useBackend(context); +export const BluespaceSender = (props) => { + const { act, data } = useBackend(); const { gas_transfer_rate, credits, bluespace_network_gases = [], on } = data; const gases: Gas[] = flow([ @@ -106,8 +106,8 @@ export const BluespaceSender = (props, context) => { ); }; -const GasDisplay = (props: GasDisplayProps, context) => { - const { act } = useBackend(context); +const GasDisplay = (props: GasDisplayProps) => { + const { act } = useBackend(); const { gas: { amount, id, name, price }, gasMax, diff --git a/tgui/packages/tgui/interfaces/BluespaceVendor.tsx b/tgui/packages/tgui/interfaces/BluespaceVendor.tsx index 8f536f976be..1ebf42704ee 100644 --- a/tgui/packages/tgui/interfaces/BluespaceVendor.tsx +++ b/tgui/packages/tgui/interfaces/BluespaceVendor.tsx @@ -32,8 +32,8 @@ type GasDisplayProps = { gasMax: number; }; -export const BluespaceVendor = (props, context) => { - const { act, data } = useBackend(context); +export const BluespaceVendor = (props) => { + const { act, data } = useBackend(); const { bluespace_network_gases = [], inserted_tank, @@ -153,8 +153,8 @@ export const BluespaceVendor = (props, context) => { ); }; -const GasDisplay = (props: GasDisplayProps, context) => { - const { act, data } = useBackend(context); +const GasDisplay = (props: GasDisplayProps) => { + const { act, data } = useBackend(); const { pumping, selected_gas, inserted_tank } = data; const { gas: { name, amount, price, id }, diff --git a/tgui/packages/tgui/interfaces/BorgHypo.tsx b/tgui/packages/tgui/interfaces/BorgHypo.tsx index 7c7ba032c7e..ff478c82160 100644 --- a/tgui/packages/tgui/interfaces/BorgHypo.tsx +++ b/tgui/packages/tgui/interfaces/BorgHypo.tsx @@ -16,8 +16,8 @@ type Reagent = { description: string; }; -export const BorgHypo = (props, context) => { - const { data } = useBackend(context); +export const BorgHypo = (props) => { + const { data } = useBackend(); const { maxVolume, theme, reagents, selectedReagent } = data; const dynamicHeight = reagents.length * 25 + 60; @@ -37,8 +37,8 @@ export const BorgHypo = (props, context) => { ); }; -const ReagentDisplay = (props, context) => { - const { act } = useBackend(context); +const ReagentDisplay = (props) => { + const { act } = useBackend(); const { reagents, selected, maxVolume } = props; if (reagents.length === 0) { return No reagents available!; diff --git a/tgui/packages/tgui/interfaces/BorgPanel.jsx b/tgui/packages/tgui/interfaces/BorgPanel.jsx index 68bc405ddc3..d7c46910854 100644 --- a/tgui/packages/tgui/interfaces/BorgPanel.jsx +++ b/tgui/packages/tgui/interfaces/BorgPanel.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Box, Button, LabeledList, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; -export const BorgPanel = (props, context) => { - const { act, data } = useBackend(context); +export const BorgPanel = (props) => { + const { act, data } = useBackend(); const borg = data.borg || {}; const cell = data.cell || {}; const cellPercent = cell.charge / cell.maxcharge; diff --git a/tgui/packages/tgui/interfaces/BorgShaker.tsx b/tgui/packages/tgui/interfaces/BorgShaker.tsx index ae137d60a1e..c77bf32ea8c 100644 --- a/tgui/packages/tgui/interfaces/BorgShaker.tsx +++ b/tgui/packages/tgui/interfaces/BorgShaker.tsx @@ -16,8 +16,8 @@ type Reagent = { description: string; }; -export const BorgShaker = (props, context) => { - const { data } = useBackend(context); +export const BorgShaker = (props) => { + const { data } = useBackend(); const { theme, minVolume, sodas, alcohols, selectedReagent } = data; const dynamicHeight = @@ -47,8 +47,8 @@ export const BorgShaker = (props, context) => { ); }; -const ReagentDisplay = (props, context) => { - const { act } = useBackend(context); +const ReagentDisplay = (props) => { + const { act } = useBackend(); const { reagents, selected, minimum } = props; if (reagents.length === 0) { return No reagents available!; diff --git a/tgui/packages/tgui/interfaces/BountyBoard.tsx b/tgui/packages/tgui/interfaces/BountyBoard.tsx index c8800eafb82..f07bfd5d8b5 100644 --- a/tgui/packages/tgui/interfaces/BountyBoard.tsx +++ b/tgui/packages/tgui/interfaces/BountyBoard.tsx @@ -31,7 +31,7 @@ type User = { name: string; }; -export const BountyBoard = (props, context) => { +export const BountyBoard = (props) => { return ( @@ -41,8 +41,8 @@ export const BountyBoard = (props, context) => { ); }; -export const BountyBoardContent = (props, context) => { - const { act, data } = useBackend(context); +export const BountyBoardContent = (props) => { + const { act, data } = useBackend(); const { accountName, requests = [], diff --git a/tgui/packages/tgui/interfaces/BrigTimer.tsx b/tgui/packages/tgui/interfaces/BrigTimer.tsx index 1e5b253828d..b38f63104d9 100644 --- a/tgui/packages/tgui/interfaces/BrigTimer.tsx +++ b/tgui/packages/tgui/interfaces/BrigTimer.tsx @@ -10,8 +10,8 @@ type Data = { flash_charging: BooleanLike; }; -export const BrigTimer = (props, context) => { - const { act, data } = useBackend(context); +export const BrigTimer = (props) => { + const { act, data } = useBackend(); const { timing, minutes, seconds, flash_charging } = data; return ( diff --git a/tgui/packages/tgui/interfaces/CTFPanel.tsx b/tgui/packages/tgui/interfaces/CTFPanel.tsx index ea213ac0420..7cc0b67b4ce 100644 --- a/tgui/packages/tgui/interfaces/CTFPanel.tsx +++ b/tgui/packages/tgui/interfaces/CTFPanel.tsx @@ -19,8 +19,8 @@ type CTFPanelData = voted: BooleanLike; }; -export const CTFPanel = (props, context) => { - const { act, data } = useBackend(context); +export const CTFPanel = (props) => { + const { act, data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/CameraConsole.tsx b/tgui/packages/tgui/interfaces/CameraConsole.tsx index e94df880d6d..d0d5022204d 100644 --- a/tgui/packages/tgui/interfaces/CameraConsole.tsx +++ b/tgui/packages/tgui/interfaces/CameraConsole.tsx @@ -70,7 +70,7 @@ const selectCameras = (cameras: Camera[], searchText = ''): Camera[] => { ])(cameras); }; -export const CameraConsole = (props, context) => { +export const CameraConsole = (props) => { return ( @@ -80,7 +80,7 @@ export const CameraConsole = (props, context) => { ); }; -export const CameraContent = (props, context) => { +export const CameraContent = (props) => { return ( @@ -93,9 +93,9 @@ export const CameraContent = (props, context) => { ); }; -const CameraSelector = (props, context) => { - const { act, data } = useBackend(context); - const [searchText, setSearchText] = useLocalState(context, 'searchText', ''); +const CameraSelector = (props) => { + const { act, data } = useBackend(); + const [searchText, setSearchText] = useLocalState('searchText', ''); const { activeCamera } = data; const cameras = selectCameras(data.cameras, searchText); @@ -141,10 +141,10 @@ const CameraSelector = (props, context) => { ); }; -const CameraControls = (props, context) => { - const { act, data } = useBackend(context); +const CameraControls = (props) => { + const { act, data } = useBackend(); const { activeCamera, can_spy, mapRef } = data; - const [searchText] = useLocalState(context, 'searchText', ''); + const [searchText] = useLocalState('searchText', ''); const cameras = selectCameras(data.cameras, searchText); diff --git a/tgui/packages/tgui/interfaces/Canister.jsx b/tgui/packages/tgui/interfaces/Canister.jsx index 0522b81796d..efb74f42177 100644 --- a/tgui/packages/tgui/interfaces/Canister.jsx +++ b/tgui/packages/tgui/interfaces/Canister.jsx @@ -11,8 +11,8 @@ const formatPressure = (value) => { return formatSiUnit(value * 1000, 1, 'Pa'); }; -export const Canister = (props, context) => { - const { act, data } = useBackend(context); +export const Canister = (props) => { + const { act, data } = useBackend(); const { portConnected, tankPressure, diff --git a/tgui/packages/tgui/interfaces/Canvas.tsx b/tgui/packages/tgui/interfaces/Canvas.tsx index 1dddec2e907..df7e98dc144 100644 --- a/tgui/packages/tgui/interfaces/Canvas.tsx +++ b/tgui/packages/tgui/interfaces/Canvas.tsx @@ -240,8 +240,8 @@ type CanvasData = { show_grid: boolean; }; -export const Canvas = (props, context) => { - const { act, data } = useBackend(context); +export const Canvas = (props) => { + const { act, data } = useBackend(); const [width, height] = getImageSize(data.grid); const scaled_width = width * data.px_per_unit; const scaled_height = height * data.px_per_unit; diff --git a/tgui/packages/tgui/interfaces/Cargo.jsx b/tgui/packages/tgui/interfaces/Cargo.jsx index 2e25dc9aa74..26d3a4a10f5 100644 --- a/tgui/packages/tgui/interfaces/Cargo.jsx +++ b/tgui/packages/tgui/interfaces/Cargo.jsx @@ -5,7 +5,7 @@ import { AnimatedNumber, Box, Button, Flex, Icon, Input, RestrictedInput, Labele import { formatMoney } from '../format'; import { Window } from '../layouts'; -export const Cargo = (props, context) => { +export const Cargo = (props) => { return ( @@ -15,9 +15,9 @@ export const Cargo = (props, context) => { ); }; -export const CargoContent = (props, context) => { - const { data } = useBackend(context); - const [tab, setTab] = useSharedState(context, 'tab', 'catalog'); +export const CargoContent = (props) => { + const { data } = useBackend(); + const [tab, setTab] = useSharedState('tab', 'catalog'); const { cart = [], requests = [], requestonly } = data; const cart_length = cart.reduce((total, entry) => total + entry.amount, 0); return ( @@ -65,8 +65,8 @@ export const CargoContent = (props, context) => { ); }; -const CargoStatus = (props, context) => { - const { act, data } = useBackend(context); +const CargoStatus = (props) => { + const { act, data } = useBackend(); const { department, grocery, @@ -149,9 +149,9 @@ const searchForSupplies = (supplies, search) => { ])(supplies); }; -export const CargoCatalog = (props, context) => { +export const CargoCatalog = (props) => { const { express } = props; - const { act, data } = useBackend(context); + const { act, data } = useBackend(); const { self_paid, app_cost } = data; @@ -159,16 +159,11 @@ export const CargoCatalog = (props, context) => { const { amount_by_name = [], max_order } = data; const [activeSupplyName, setActiveSupplyName] = useSharedState( - context, 'supply', supplies[0]?.name ); - const [searchText, setSearchText] = useSharedState( - context, - 'search_text', - '' - ); + const [searchText, setSearchText] = useSharedState('search_text', ''); const activeSupply = activeSupplyName === 'search_results' @@ -289,8 +284,8 @@ export const CargoCatalog = (props, context) => { ); }; -const CargoRequests = (props, context) => { - const { act, data } = useBackend(context); +const CargoRequests = (props) => { + const { act, data } = useBackend(); const { requestonly, can_send, can_approve_requests } = data; const requests = data.requests || []; // Labeled list reimplementation to squeeze extra columns out of it @@ -355,8 +350,8 @@ const CargoRequests = (props, context) => { ); }; -const CargoCartButtons = (props, context) => { - const { act, data } = useBackend(context); +const CargoCartButtons = (props) => { + const { act, data } = useBackend(); const { requestonly, can_send, can_approve_requests } = data; const cart = data.cart || []; const total = cart.reduce((total, entry) => total + entry.cost, 0); @@ -380,8 +375,8 @@ const CargoCartButtons = (props, context) => { ); }; -const CartHeader = (props, context) => { - const { data } = useBackend(context); +const CartHeader = (props) => { + const { data } = useBackend(); return (
@@ -397,8 +392,8 @@ const CartHeader = (props, context) => { ); }; -const CargoCart = (props, context) => { - const { act, data } = useBackend(context); +const CargoCart = (props) => { + const { act, data } = useBackend(); const { requestonly, away, @@ -484,7 +479,7 @@ const CargoCart = (props, context) => { ); }; -const CargoHelp = (props, context) => { +const CargoHelp = (props) => { return ( <>
diff --git a/tgui/packages/tgui/interfaces/CargoExpress.tsx b/tgui/packages/tgui/interfaces/CargoExpress.tsx index a4fb35edebc..72190181353 100644 --- a/tgui/packages/tgui/interfaces/CargoExpress.tsx +++ b/tgui/packages/tgui/interfaces/CargoExpress.tsx @@ -17,8 +17,8 @@ type Data = { message: string; }; -export const CargoExpress = (props, context) => { - const { data } = useBackend(context); +export const CargoExpress = (props) => { + const { data } = useBackend(); const { locked } = data; return ( @@ -31,8 +31,8 @@ export const CargoExpress = (props, context) => { ); }; -const CargoExpressContent = (props, context) => { - const { act, data } = useBackend(context); +const CargoExpressContent = (props) => { + const { act, data } = useBackend(); const { hasBeacon, message, diff --git a/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx b/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx index 7683ebfe274..0e11d6dd488 100644 --- a/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx +++ b/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx @@ -10,8 +10,8 @@ type Data = { status_report: string; }; -export const CargoHoldTerminal = (props, context) => { - const { act, data } = useBackend(context); +export const CargoHoldTerminal = (props) => { + const { act, data } = useBackend(); const { points, pad, sending, status_report } = data; return ( diff --git a/tgui/packages/tgui/interfaces/CellularEmporium.tsx b/tgui/packages/tgui/interfaces/CellularEmporium.tsx index 3bf67319181..0ee07cafbd0 100644 --- a/tgui/packages/tgui/interfaces/CellularEmporium.tsx +++ b/tgui/packages/tgui/interfaces/CellularEmporium.tsx @@ -24,10 +24,9 @@ type Ability = { dna_required: number; // Checks against dna_count }; -export const CellularEmporium = (props, context) => { - const { act, data } = useBackend(context); +export const CellularEmporium = (props) => { + const { act, data } = useBackend(); const [searchAbilities, setSearchAbilities] = useLocalState( - context, 'searchAbilities', '' ); @@ -78,9 +77,9 @@ export const CellularEmporium = (props, context) => { ); }; -const AbilityList = (props, context) => { - const { act, data } = useBackend(context); - const [searchAbilities] = useLocalState(context, 'searchAbilities', ''); +const AbilityList = (props) => { + const { act, data } = useBackend(); + const [searchAbilities] = useLocalState('searchAbilities', ''); const { abilities, owned_abilities, diff --git a/tgui/packages/tgui/interfaces/CentcomPodLauncher.jsx b/tgui/packages/tgui/interfaces/CentcomPodLauncher.jsx index 3b02ca03c21..17a79fa6b40 100644 --- a/tgui/packages/tgui/interfaces/CentcomPodLauncher.jsx +++ b/tgui/packages/tgui/interfaces/CentcomPodLauncher.jsx @@ -12,14 +12,14 @@ const pod_grey = { color: 'grey', }; -const useCompact = (context) => { - const [compact, setCompact] = useLocalState(context, 'compact', false); +const useCompact = () => { + const [compact, setCompact] = useLocalState('compact', false); const toggleCompact = () => setCompact(!compact); return [compact, toggleCompact]; }; -export const CentcomPodLauncher = (props, context) => { - const [compact] = useCompact(context); +export const CentcomPodLauncher = (props) => { + const [compact] = useCompact(); return ( { ); }; -const CentcomPodLauncherContent = (props, context) => { - const [compact] = useCompact(context); +const CentcomPodLauncherContent = (props) => { + const [compact] = useCompact(); return ( @@ -410,13 +410,9 @@ const EFFECTS_ALL = [ }, ]; -const ViewTabHolder = (props, context) => { - const { act, data } = useBackend(context); - const [tabPageIndex, setTabPageIndex] = useLocalState( - context, - 'tabPageIndex', - 1 - ); +const ViewTabHolder = (props) => { + const { act, data } = useBackend(); + const [tabPageIndex, setTabPageIndex] = useLocalState('tabPageIndex', 1); const { mapRef } = data; const TabPageComponent = TABPAGES[tabPageIndex].component(); return ( @@ -505,7 +501,7 @@ const ViewTabHolder = (props, context) => { ); }; -const TabPod = (props, context) => { +const TabPod = (props) => { return ( Note: You can right click on this @@ -515,8 +511,8 @@ const TabPod = (props, context) => { ); }; -const TabBay = (props, context) => { - const { act, data } = useBackend(context); +const TabBay = (props) => { + const { act, data } = useBackend(); return ( <>
@@ -107,8 +107,8 @@ const CrewTable = (props, context) => { ); }; -const CrewTableEntry = (props, context) => { - const { act, data } = useBackend(context); +const CrewTableEntry = (props) => { + const { act, data } = useBackend(); const { link_allowed } = data; const { sensor_data } = props; const { diff --git a/tgui/packages/tgui/interfaces/CrewManifest.jsx b/tgui/packages/tgui/interfaces/CrewManifest.jsx index fc439aac978..a3113834407 100644 --- a/tgui/packages/tgui/interfaces/CrewManifest.jsx +++ b/tgui/packages/tgui/interfaces/CrewManifest.jsx @@ -12,10 +12,10 @@ const commandJobs = [ 'Quartermaster', ]; -export const CrewManifest = (props, context) => { +export const CrewManifest = (props) => { const { data: { manifest, positions }, - } = useBackend(context); + } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/CrossingSignal.tsx b/tgui/packages/tgui/interfaces/CrossingSignal.tsx index 6fbda68c452..ec0ef268f50 100644 --- a/tgui/packages/tgui/interfaces/CrossingSignal.tsx +++ b/tgui/packages/tgui/interfaces/CrossingSignal.tsx @@ -10,12 +10,8 @@ type Data = { outboundPlatform: number; }; -type Props = { - context: any; -}; - -export const CrossingSignal = (props, context) => { - const { act, data } = useBackend(context); +export const CrossingSignal = (props) => { + const { data } = useBackend(); const { sensorStatus, operatingStatus, inboundPlatform, outboundPlatform } = data; diff --git a/tgui/packages/tgui/interfaces/Cryo.jsx b/tgui/packages/tgui/interfaces/Cryo.jsx index 3ea3d68729c..074ff6f67ef 100644 --- a/tgui/packages/tgui/interfaces/Cryo.jsx +++ b/tgui/packages/tgui/interfaces/Cryo.jsx @@ -32,8 +32,8 @@ export const Cryo = () => { ); }; -const CryoContent = (props, context) => { - const { act, data } = useBackend(context); +const CryoContent = (props) => { + const { act, data } = useBackend(); return ( <>
diff --git a/tgui/packages/tgui/interfaces/Crystallizer.tsx b/tgui/packages/tgui/interfaces/Crystallizer.tsx index e471480f73d..9c47b38f7bf 100644 --- a/tgui/packages/tgui/interfaces/Crystallizer.tsx +++ b/tgui/packages/tgui/interfaces/Crystallizer.tsx @@ -30,7 +30,7 @@ type Gas = { const logScale = (value) => Math.log2(16 + Math.max(0, value)) - 4; -export const Crystallizer = (props, context) => { +export const Crystallizer = (props) => { return ( @@ -42,8 +42,8 @@ export const Crystallizer = (props, context) => { ); }; -const Controls = (props, context) => { - const { act, data } = useBackend(context); +const Controls = (props) => { + const { act, data } = useBackend(); const { gas_input, on, selected, selected_recipes = [] } = data; return ( @@ -91,8 +91,8 @@ const Controls = (props, context) => { ); }; -const Requirements = (props, context) => { - const { act, data } = useBackend(context); +const Requirements = (props) => { + const { act, data } = useBackend(); const { requirements, internal_temperature, progress_bar } = data; return ( @@ -132,8 +132,8 @@ const Requirements = (props, context) => { ); }; -const Gases = (props, context) => { - const { data } = useBackend(context); +const Gases = (props) => { + const { data } = useBackend(); const { internal_gas_data = [] } = data; return ( diff --git a/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx b/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx index 67f46cf628e..270681f8408 100644 --- a/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx +++ b/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx @@ -33,8 +33,8 @@ const TOOLTIP_LAWSYNC = multiline` it's laws with it's master AI. `; -export const CyborgBootDebug = (props, context) => { - const { act, data } = useBackend(context); +export const CyborgBootDebug = (props) => { + const { act, data } = useBackend(); const { designation, master, lawsync, aisync, locomotion, panel } = data; return ( 26 ? 537 : 440} height={289}> diff --git a/tgui/packages/tgui/interfaces/DecalPainter.tsx b/tgui/packages/tgui/interfaces/DecalPainter.tsx index fb85f48c4ee..a9a7778eb2a 100644 --- a/tgui/packages/tgui/interfaces/DecalPainter.tsx +++ b/tgui/packages/tgui/interfaces/DecalPainter.tsx @@ -39,8 +39,8 @@ const filterBoxColor = (color: string) => { return color.substring(0, 7); }; -export const DecalPainter = (props, context) => { - const { act, data } = useBackend(context); +export const DecalPainter = (props) => { + const { act, data } = useBackend(); const custom_color_selected = !data.color_list.some( (color) => color.color === data.current_color @@ -137,8 +137,8 @@ type IconButtonParams = { selected: boolean; }; -const IconButton = (props: IconButtonParams, context) => { - const { act, data } = useBackend(context); +const IconButton = (props: IconButtonParams) => { + const { act, data } = useBackend(); const generateIconKey = (decal: string, dir: number, color: string) => `${data.icon_prefix} ${decal}_${dir}_${color.replace('#', '')}`; diff --git a/tgui/packages/tgui/interfaces/DepartmentOrders.tsx b/tgui/packages/tgui/interfaces/DepartmentOrders.tsx index 2da64fcdb71..d17d7971861 100644 --- a/tgui/packages/tgui/interfaces/DepartmentOrders.tsx +++ b/tgui/packages/tgui/interfaces/DepartmentOrders.tsx @@ -42,8 +42,8 @@ const CooldownEstimate = (props) => { ); }; -export const DepartmentOrders = (props, context) => { - const { data } = useBackend(context); +export const DepartmentOrders = (props) => { + const { data } = useBackend(); const { time_left } = data; return ( @@ -73,8 +73,8 @@ export const DepartmentOrders = (props, context) => { ); }; -const CooldownDimmer = (props, context) => { - const { act, data } = useBackend(context); +const CooldownDimmer = (props) => { + const { act, data } = useBackend(); const { can_override, time_left } = data; return ( @@ -106,14 +106,10 @@ const CooldownDimmer = (props, context) => { ); }; -const DepartmentCatalog = (props, context) => { - const { act, data } = useBackend(context); +const DepartmentCatalog = (props) => { + const { act, data } = useBackend(); const { supplies } = data; - const [tabCategory, setTabCategory] = useLocalState( - context, - 'tabName', - supplies[0] - ); + const [tabCategory, setTabCategory] = useLocalState('tabName', supplies[0]); return ( diff --git a/tgui/packages/tgui/interfaces/DestinationTagger.tsx b/tgui/packages/tgui/interfaces/DestinationTagger.tsx index f6b5048cc2a..d868e6d0c2b 100644 --- a/tgui/packages/tgui/interfaces/DestinationTagger.tsx +++ b/tgui/packages/tgui/interfaces/DestinationTagger.tsx @@ -33,8 +33,8 @@ const sortDestinations = (locations: string[]): DestinationInfo[] => { ])(locations); }; -export const DestinationTagger = (props, context) => { - const { act, data } = useBackend(context); +export const DestinationTagger = (props) => { + const { act, data } = useBackend(); const { locations, currentTag } = data; return ( diff --git a/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx b/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx index 5bfd7353cc7..3561058d79f 100644 --- a/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx +++ b/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx @@ -20,8 +20,8 @@ type NodeData = { node_hidden: BooleanLike; }; -export const DestructiveAnalyzer = (props, context) => { - const { act, data } = useBackend(context); +export const DestructiveAnalyzer = (props) => { + const { act, data } = useBackend(); const { server_connected, indestructible, diff --git a/tgui/packages/tgui/interfaces/DisposalUnit.jsx b/tgui/packages/tgui/interfaces/DisposalUnit.jsx index 3499d914b72..f163c3c1c2c 100644 --- a/tgui/packages/tgui/interfaces/DisposalUnit.jsx +++ b/tgui/packages/tgui/interfaces/DisposalUnit.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Button, LabeledList, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; -export const DisposalUnit = (props, context) => { - const { act, data } = useBackend(context); +export const DisposalUnit = (props) => { + const { act, data } = useBackend(); let stateColor; let stateText; if (data.full_pressure) { diff --git a/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleEnzymes.jsx b/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleEnzymes.jsx index 3b762ee9387..09ce1682c38 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleEnzymes.jsx +++ b/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleEnzymes.jsx @@ -3,9 +3,9 @@ import { Box, Button, Collapsible, Dimmer, Divider, Icon, LabeledList, NumberInp import { GeneticMakeupInfo } from './GeneticMakeupInfo'; import { PULSE_DURATION_MAX, PULSE_STRENGTH_MAX } from './constants'; -const GeneticMakeupBufferInfo = (props, context) => { +const GeneticMakeupBufferInfo = (props) => { const { index, makeup } = props; - const { act, data } = useBackend(context); + const { act, data } = useBackend(); const { isViableSubject, hasDisk, diskReadOnly, isInjectorReady } = data; // Type of the action for applying makeup const ACTION_MAKEUP_APPLY = isViableSubject ? 'makeup_apply' : 'makeup_delay'; @@ -133,8 +133,8 @@ const GeneticMakeupBufferInfo = (props, context) => { ); }; -const GeneticMakeupBuffers = (props, context) => { - const { data, act } = useBackend(context); +const GeneticMakeupBuffers = (props) => { + const { data, act } = useBackend(); const { diskHasMakeup, geneticMakeupCooldown, @@ -205,8 +205,8 @@ const GeneticMakeupBuffers = (props, context) => { ); }; -const PulseEmitterProbs = (props, context) => { - const { data } = useBackend(context); +const PulseEmitterProbs = (props) => { + const { data } = useBackend(); const { stdDevAcc, stdDevStr } = data; return (
@@ -225,8 +225,8 @@ const PulseEmitterProbs = (props, context) => { ); }; -const PulseBoard = (props, context) => { - const { act } = useBackend(context); +const PulseBoard = (props) => { + const { act } = useBackend(); const { subjectBlock = [], type, name } = props; // Build blocks of buttons of unique enzymes const blocks = []; @@ -268,8 +268,8 @@ const PulseBoard = (props, context) => { ); }; -const PulseSettings = (props, context) => { - const { data, act } = useBackend(context); +const PulseSettings = (props) => { + const { data, act } = useBackend(); const { pulseStrength, pulseDuration } = data; return (
@@ -309,8 +309,8 @@ const PulseSettings = (props, context) => { ); }; -export const DnaConsoleEnzymes = (props, context) => { - const { data, act } = useBackend(context); +export const DnaConsoleEnzymes = (props) => { + const { data, act } = useBackend(); const { isScannerConnected } = data; const { subjectBlock, type, name } = props; if (!isScannerConnected) { diff --git a/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleSequencer.jsx b/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleSequencer.jsx index bb46ece3348..5f187a10292 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleSequencer.jsx +++ b/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleSequencer.jsx @@ -5,7 +5,7 @@ import { Box, Button, Section, Stack } from '../../components'; import { MutationInfo } from './MutationInfo'; import { CLEAR_GENE, GENE_COLORS, MUT_NORMAL, NEXT_GENE, PREV_GENE, SUBJECT_DEAD, SUBJECT_TRANSFORMING } from './constants'; -const GenomeImage = (props, context) => { +const GenomeImage = (props) => { const { url, selected, onClick } = props; let outline; if (selected) { @@ -26,8 +26,8 @@ const GenomeImage = (props, context) => { ); }; -const GeneCycler = (props, context) => { - const { act } = useBackend(context); +const GeneCycler = (props) => { + const { act } = useBackend(); const { alias, gene, index, disabled, ...rest } = props; const color = (disabled && GENE_COLORS['X']) || GENE_COLORS[gene]; return ( @@ -67,7 +67,7 @@ const GeneCycler = (props, context) => { ); }; -const GenomeSequencer = (props, context) => { +const GenomeSequencer = (props) => { const { mutation } = props; if (!mutation) { return No genome selected for sequencing.; @@ -147,8 +147,8 @@ const GenomeSequencer = (props, context) => { ); }; -export const DnaConsoleSequencer = (props, context) => { - const { data, act } = useBackend(context); +export const DnaConsoleSequencer = (props) => { + const { data, act } = useBackend(); const mutations = data.storage?.occupant ?? []; const { isJokerReady, isMonkey, jokerSeconds, subjectStatus } = data; const { sequencerMutation, jokerActive } = data.view; diff --git a/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleStorage.jsx b/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleStorage.jsx index 89fa4bdbf6a..47677152483 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleStorage.jsx +++ b/tgui/packages/tgui/interfaces/DnaConsole/DnaConsoleStorage.jsx @@ -5,8 +5,8 @@ import { GeneticMakeupInfo } from './GeneticMakeupInfo'; import { MutationInfo } from './MutationInfo'; import { STORAGE_CONS_SUBMODE_CHROMOSOMES, STORAGE_CONS_SUBMODE_MUTATIONS, STORAGE_DISK_SUBMODE_ENZYMES, STORAGE_DISK_SUBMODE_MUTATIONS, STORAGE_MODE_ADVINJ, STORAGE_MODE_CONSOLE, STORAGE_MODE_DISK } from './constants'; -export const DnaConsoleStorage = (props, context) => { - const { data, act } = useBackend(context); +export const DnaConsoleStorage = (props) => { + const { data, act } = useBackend(); const { storageMode, storageConsSubMode, storageDiskSubMode } = data.view; const { diskMakeupBuffer, diskHasMakeup } = data; const mutations = data.storage[storageMode]; @@ -43,8 +43,8 @@ export const DnaConsoleStorage = (props, context) => { ); }; -const DnaConsoleAdvancedInjectors = (props, context) => { - const { act, data } = useBackend(context); +const DnaConsoleAdvancedInjectors = (props) => { + const { act, data } = useBackend(); const { maxAdvInjectors, isInjectorReady } = data; const advInjectors = data.storage.injector ?? []; @@ -102,8 +102,8 @@ const DnaConsoleAdvancedInjectors = (props, context) => { ); }; -const StorageButtons = (props, context) => { - const { data, act } = useBackend(context); +const StorageButtons = (props) => { + const { data, act } = useBackend(); const { hasDisk } = data; const { storageMode, storageConsSubMode, storageDiskSubMode } = data.view; @@ -190,8 +190,8 @@ const StorageButtons = (props, context) => { ); }; -const StorageChromosomes = (props, context) => { - const { data, act } = useBackend(context); +const StorageChromosomes = (props) => { + const { data, act } = useBackend(); const chromos = data.chromoStorage ?? []; const uniqueChromos = uniqBy((chromo) => chromo.Name)(chromos); const chromoName = data.view.storageChromoName; @@ -252,9 +252,9 @@ const StorageChromosomes = (props, context) => { ); }; -const StorageMutations = (props, context) => { +const StorageMutations = (props) => { const { customMode = '' } = props; - const { data, act } = useBackend(context); + const { data, act } = useBackend(); const mutations = props.mutations || []; const mode = data.view.storageMode + customMode; let mutationRef = data.view[`storage${mode}MutationRef`]; diff --git a/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx b/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx index 8846569c355..df3012fd320 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx +++ b/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../../backend'; import { Box, Button, Icon, LabeledList, ProgressBar, Section } from '../../components'; import { SUBJECT_CONCIOUS, SUBJECT_DEAD, SUBJECT_SOFT_CRIT, SUBJECT_TRANSFORMING, SUBJECT_UNCONSCIOUS } from './constants'; -const DnaScannerButtons = (props, context) => { - const { data, act } = useBackend(context); +const DnaScannerButtons = (props) => { + const { data, act } = useBackend(); const { hasDelayedAction, isPulsing, @@ -58,7 +58,7 @@ const DnaScannerButtons = (props, context) => { /** * Displays subject status based on the value of the status prop. */ -const SubjectStatus = (props, context) => { +const SubjectStatus = (props) => { const { status } = props; if (status === SUBJECT_CONCIOUS) { return ( @@ -98,8 +98,8 @@ const SubjectStatus = (props, context) => { return Unknown; }; -const DnaScannerContent = (props, context) => { - const { data, act } = useBackend(context); +const DnaScannerContent = (props) => { + const { data, act } = useBackend(); const { subjectName, isScannerConnected, @@ -153,7 +153,7 @@ const DnaScannerContent = (props, context) => { ); }; -export const DnaScanner = (props, context) => { +export const DnaScanner = (props) => { return (
}> diff --git a/tgui/packages/tgui/interfaces/DnaConsole/GeneticMakeupInfo.jsx b/tgui/packages/tgui/interfaces/DnaConsole/GeneticMakeupInfo.jsx index a53706e2211..4588b0167e0 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole/GeneticMakeupInfo.jsx +++ b/tgui/packages/tgui/interfaces/DnaConsole/GeneticMakeupInfo.jsx @@ -1,6 +1,6 @@ import { LabeledList, Section } from '../../components'; -export const GeneticMakeupInfo = (props, context) => { +export const GeneticMakeupInfo = (props) => { const { makeup } = props; return ( diff --git a/tgui/packages/tgui/interfaces/DnaConsole/MutationInfo.jsx b/tgui/packages/tgui/interfaces/DnaConsole/MutationInfo.jsx index 228d14977e5..3dbe49d3498 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole/MutationInfo.jsx +++ b/tgui/packages/tgui/interfaces/DnaConsole/MutationInfo.jsx @@ -13,9 +13,9 @@ const isSameMutation = (a, b) => { return a.Alias === b.Alias && a.AppliedChromo === b.AppliedChromo; }; -const ChromosomeInfo = (props, context) => { +const ChromosomeInfo = (props) => { const { mutation, disabled } = props; - const { data, act } = useBackend(context); + const { data, act } = useBackend(); if (mutation.CanChromo === CHROMOSOME_NEVER) { return No compatible chromosomes; } @@ -55,9 +55,9 @@ const ChromosomeInfo = (props, context) => { return null; }; -const MutationCombiner = (props, context) => { +const MutationCombiner = (props) => { const { mutations = [], source } = props; - const { act, data } = useBackend(context); + const { act, data } = useBackend(); const brefFromName = (name) => { return mutations.find((mutation) => mutation.Name === name)?.ByondRef; @@ -80,9 +80,9 @@ const MutationCombiner = (props, context) => { ); }; -export const MutationInfo = (props, context) => { +export const MutationInfo = (props) => { const { mutation } = props; - const { data, act } = useBackend(context); + const { data, act } = useBackend(); const { diskCapacity, diskReadOnly, diff --git a/tgui/packages/tgui/interfaces/DnaConsole/index.jsx b/tgui/packages/tgui/interfaces/DnaConsole/index.jsx index e922ea8eef8..633d475f225 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole/index.jsx +++ b/tgui/packages/tgui/interfaces/DnaConsole/index.jsx @@ -7,8 +7,8 @@ import { DnaConsoleStorage } from './DnaConsoleStorage'; import { DnaScanner } from './DnaScanner'; import { CONSOLE_MODE_ENZYMES, CONSOLE_MODE_FEATURES, CONSOLE_MODE_SEQUENCER, CONSOLE_MODE_STORAGE, STORAGE_MODE_CONSOLE } from './constants'; -export const DnaConsole = (props, context) => { - const { data } = useBackend(context); +export const DnaConsole = (props) => { + const { data } = useBackend(); const { isPulsing, timeToPulse, subjectUNI, subjectUF } = data; const { consoleMode } = data.view; @@ -54,8 +54,8 @@ export const DnaConsole = (props, context) => { ); }; -const DnaConsoleCommands = (props, context) => { - const { data, act } = useBackend(context); +const DnaConsoleCommands = (props) => { + const { data, act } = useBackend(); const { hasDisk, isInjectorReady, injectorSeconds } = data; const { consoleMode } = data.view; diff --git a/tgui/packages/tgui/interfaces/DnaVault.jsx b/tgui/packages/tgui/interfaces/DnaVault.jsx index 3974f0fa442..12a18f8baf6 100644 --- a/tgui/packages/tgui/interfaces/DnaVault.jsx +++ b/tgui/packages/tgui/interfaces/DnaVault.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Box, Button, Grid, LabeledList, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; -export const DnaVault = (props, context) => { - const { act, data } = useBackend(context); +export const DnaVault = (props) => { + const { act, data } = useBackend(); const { completed, used, diff --git a/tgui/packages/tgui/interfaces/DopplerArray.jsx b/tgui/packages/tgui/interfaces/DopplerArray.jsx index d510d16994c..c687f86b1c5 100644 --- a/tgui/packages/tgui/interfaces/DopplerArray.jsx +++ b/tgui/packages/tgui/interfaces/DopplerArray.jsx @@ -2,8 +2,8 @@ import { useBackend, useSharedState } from '../backend'; import { Box, Button, Flex, LabeledList, NoticeBox, Section, Stack, Tabs } from '../components'; import { Window } from '../layouts'; -export const DopplerArray = (props, context) => { - const { act, data } = useBackend(context); +export const DopplerArray = (props) => { + const { act, data } = useBackend(); return ( @@ -13,11 +13,10 @@ export const DopplerArray = (props, context) => { ); }; -const DopplerArrayContent = (props, context) => { - const { act, data } = useBackend(context); +const DopplerArrayContent = (props) => { + const { act, data } = useBackend(); const { records = [], disk, storage } = data; const [activeRecordName, setActiveRecordName] = useSharedState( - context, 'activeRecordrecord', records[0]?.name ); diff --git a/tgui/packages/tgui/interfaces/EightBallVote.tsx b/tgui/packages/tgui/interfaces/EightBallVote.tsx index 6c383441d87..499edaa7493 100644 --- a/tgui/packages/tgui/interfaces/EightBallVote.tsx +++ b/tgui/packages/tgui/interfaces/EightBallVote.tsx @@ -16,8 +16,8 @@ type Answer = { selected: BooleanLike; }; -export const EightBallVote = (props, context) => { - const { act, data } = useBackend(context); +export const EightBallVote = (props) => { + const { act, data } = useBackend(); const { shaking } = data; return ( @@ -30,8 +30,8 @@ export const EightBallVote = (props, context) => { ); }; -const EightBallVoteQuestion = (props, context) => { - const { act, data } = useBackend(context); +const EightBallVoteQuestion = (props) => { + const { act, data } = useBackend(); const { question, answers = [] } = data; return (
diff --git a/tgui/packages/tgui/interfaces/Electrolyzer.tsx b/tgui/packages/tgui/interfaces/Electrolyzer.tsx index 2a9e13241eb..34b457803d6 100644 --- a/tgui/packages/tgui/interfaces/Electrolyzer.tsx +++ b/tgui/packages/tgui/interfaces/Electrolyzer.tsx @@ -11,8 +11,8 @@ type Data = { powerLevel: number; }; -export const Electrolyzer = (props, context) => { - const { act, data } = useBackend(context); +export const Electrolyzer = (props) => { + const { act, data } = useBackend(); const { hasPowercell, on, open, anchored, powerLevel } = data; return ( diff --git a/tgui/packages/tgui/interfaces/Electropack.jsx b/tgui/packages/tgui/interfaces/Electropack.jsx index 0acc209483a..28314b47965 100644 --- a/tgui/packages/tgui/interfaces/Electropack.jsx +++ b/tgui/packages/tgui/interfaces/Electropack.jsx @@ -3,8 +3,8 @@ import { useBackend } from '../backend'; import { Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; -export const Electropack = (props, context) => { - const { act, data } = useBackend(context); +export const Electropack = (props) => { + const { act, data } = useBackend(); const { power, code, frequency, minFrequency, maxFrequency } = data; return ( diff --git a/tgui/packages/tgui/interfaces/ElevatorPanel.tsx b/tgui/packages/tgui/interfaces/ElevatorPanel.tsx index d214917665a..41c55de8729 100644 --- a/tgui/packages/tgui/interfaces/ElevatorPanel.tsx +++ b/tgui/packages/tgui/interfaces/ElevatorPanel.tsx @@ -28,8 +28,8 @@ type ElevatorPanelData = { all_floor_data: FloorData[]; }; -export const ElevatorPanel = (props, context) => { - const { data, act } = useBackend(context); +export const ElevatorPanel = (props) => { + const { data, act } = useBackend(); const { current_floor, @@ -149,8 +149,8 @@ const MovingDimmer = () => { ); }; -const FloorPanel = (props, context) => { - const { data } = useBackend(context); +const FloorPanel = (props) => { + const { data } = useBackend(); const { current_floor, currently_moving, currently_moving_to_floor } = data; return ( diff --git a/tgui/packages/tgui/interfaces/EmergencyShuttleConsole.jsx b/tgui/packages/tgui/interfaces/EmergencyShuttleConsole.jsx index 096ad9ff5a9..3d32b1e0380 100644 --- a/tgui/packages/tgui/interfaces/EmergencyShuttleConsole.jsx +++ b/tgui/packages/tgui/interfaces/EmergencyShuttleConsole.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Box, Button, Grid, Section } from '../components'; import { Window } from '../layouts'; -export const EmergencyShuttleConsole = (props, context) => { - const { act, data } = useBackend(context); +export const EmergencyShuttleConsole = (props) => { + const { act, data } = useBackend(); const { timer_str, enabled, diff --git a/tgui/packages/tgui/interfaces/EmotePanel.tsx b/tgui/packages/tgui/interfaces/EmotePanel.tsx index 81df0512362..f0b9e09386e 100644 --- a/tgui/packages/tgui/interfaces/EmotePanel.tsx +++ b/tgui/packages/tgui/interfaces/EmotePanel.tsx @@ -19,60 +19,48 @@ type EmotePanelData = { emotes: Emote[]; }; -export const EmotePanelContent = (props, context) => { - const { act, data } = useBackend(context); +export const EmotePanelContent = (props) => { + const { act, data } = useBackend(); const { emotes } = data; const [filterVisible, toggleVisualFilter] = useLocalState( - context, 'filterVisible', false ); const [filterAudible, toggleAudibleFilter] = useLocalState( - context, 'filterAudible', false ); const [filterSound, toggleSoundFilter] = useLocalState( - context, 'filterSound', false ); const [filterHands, toggleHandsFilter] = useLocalState( - context, 'filterHands', false ); const [filterUseParams, toggleUseParamsFilter] = useLocalState( - context, 'filterUseParams', false ); const [useParams, toggleUseParams] = useLocalState( - context, 'useParams', false ); - const [searchText, setSearchText] = useLocalState( - context, - 'search_text', - '' - ); + const [searchText, setSearchText] = useLocalState('search_text', ''); const [showNames, toggleShowNames] = useLocalState( - context, 'showNames', true ); const [showIcons, toggleShowIcons] = useLocalState( - context, 'showIcons', false ); @@ -233,7 +221,7 @@ export const EmotePanelContent = (props, context) => { ); }; -const EmoteIcons = (props, context) => { +const EmoteIcons = (props) => { const { visible, audible, sound, hands, use_params, margin } = props; return ( @@ -272,7 +260,7 @@ const EmoteIcons = (props, context) => { ); }; -export const EmotePanel = (props, context) => { +export const EmotePanel = (props) => { return ( diff --git a/tgui/packages/tgui/interfaces/EngravedMessage.jsx b/tgui/packages/tgui/interfaces/EngravedMessage.jsx index e3c247d5ff5..bc2cade7849 100644 --- a/tgui/packages/tgui/interfaces/EngravedMessage.jsx +++ b/tgui/packages/tgui/interfaces/EngravedMessage.jsx @@ -3,8 +3,8 @@ import { useBackend } from '../backend'; import { Box, Button, LabeledList, Section, Stack } from '../components'; import { Window } from '../layouts'; -export const EngravedMessage = (props, context) => { - const { act, data } = useBackend(context); +export const EngravedMessage = (props) => { + const { act, data } = useBackend(); const { admin_mode, creator_key, diff --git a/tgui/packages/tgui/interfaces/ExodroneConsole.tsx b/tgui/packages/tgui/interfaces/ExodroneConsole.tsx index 134032fb574..8bbde51d9c9 100644 --- a/tgui/packages/tgui/interfaces/ExodroneConsole.tsx +++ b/tgui/packages/tgui/interfaces/ExodroneConsole.tsx @@ -147,12 +147,11 @@ type ToolData = { icon: string; }; -export const ExodroneConsole = (props, context) => { - const { data } = useBackend(context); +export const ExodroneConsole = (props) => { + const { data } = useBackend(); const { signal_lost } = data; const [choosingTools, setChoosingTools] = useLocalState( - context, 'choosingTools', false ); @@ -168,8 +167,8 @@ export const ExodroneConsole = (props, context) => { ); }; -const SignalLostModal = (props, context) => { - const { act } = useBackend(context); +const SignalLostModal = (props) => { + const { act } = useBackend(); return ( { ); }; -const DroneSelectionSection = ( - props: { - all_drones: Array; - }, - context -) => { - const { act } = useBackend(context); +const DroneSelectionSection = (props: { + all_drones: Array; +}) => { + const { act } = useBackend(); const { all_drones } = props; return ( @@ -249,12 +245,11 @@ const DroneSelectionSection = ( ); }; -const ToolSelectionModal = (props, context) => { - const { act, data } = useBackend(context); +const ToolSelectionModal = (props) => { + const { act, data } = useBackend(); const { all_tools = {} } = data; const [choosingTools, setChoosingTools] = useLocalState( - context, 'choosingTools', false ); @@ -297,14 +292,8 @@ const ToolSelectionModal = (props, context) => { ); }; -const EquipmentBox = ( - props: { - cargo: CargoData; - drone: DroneData; - }, - context -) => { - const { act, data } = useBackend(context); +const EquipmentBox = (props: { cargo: CargoData; drone: DroneData }) => { + const { act, data } = useBackend(); const { all_tools = {} } = data; const { configurable } = props.drone; const cargo = props.cargo; @@ -382,16 +371,10 @@ const EquipmentBox = ( ); }; -const EquipmentGrid = ( - props: { - drone: ActiveDrone & DroneData; - }, - context -) => { - const { act } = useBackend(context); +const EquipmentGrid = (props: { drone: ActiveDrone & DroneData }) => { + const { act } = useBackend(); const { cargo, configurable } = props.drone; const [choosingTools, setChoosingTools] = useLocalState( - context, 'choosingTools', false ); @@ -453,13 +436,10 @@ const EquipmentGrid = ( ); }; -const DroneStatus = ( - props: { - drone_integrity: number; - drone_max_integrity: number; - }, - context -) => { +const DroneStatus = (props: { + drone_integrity: number; + drone_max_integrity: number; +}) => { const { drone_integrity, drone_max_integrity } = props; return ( @@ -501,15 +481,12 @@ const NoSiteDimmer = () => { ); }; -const TravelTargetSelectionScreen = ( - props: { - drone: (DroneExploration | DroneIdle | DroneTravel) & DroneData; - showCancelButton?: boolean; - }, - context -) => { +const TravelTargetSelectionScreen = (props: { + drone: (DroneExploration | DroneIdle | DroneTravel) & DroneData; + showCancelButton?: boolean; +}) => { // List of sites and eta travel times to each - const { act, data } = useBackend(context); + const { act, data } = useBackend(); const { drone } = props; const { all_bands } = data; const { can_travel, travel_error, drone_travel_coefficent } = drone; @@ -528,12 +505,10 @@ const TravelTargetSelectionScreen = ( } }; const [choosingTools, setChoosingTools] = useLocalState( - context, 'choosingTools', false ); const [TravelDimmerShown, setTravelDimmerShown] = useLocalState( - context, 'TravelDimmerShown', false ); @@ -632,12 +607,7 @@ const TravelTargetSelectionScreen = ( ); }; -const TravelDimmer = ( - props: { - drone: DroneTravel; - }, - context -) => { +const TravelDimmer = (props: { drone: DroneTravel }) => { const { travel_time_left } = props.drone; return (
@@ -674,18 +644,12 @@ const TimeoutScreen = (props: { drone: DroneBusy }) => { ); }; -const ExplorationScreen = ( - props: { - drone: DroneExploration & DroneData; - }, - context -) => { - const { act } = useBackend(context); +const ExplorationScreen = (props: { drone: DroneExploration & DroneData }) => { + const { act } = useBackend(); const { drone } = props; const { site } = drone; const [TravelDimmerShown, setTravelDimmerShown] = useLocalState( - context, 'TravelDimmerShown', false ); @@ -734,14 +698,8 @@ const ExplorationScreen = ( ); }; -const EventScreen = ( - props: { - drone: DroneData; - event: FullEventData; - }, - context -) => { - const { act } = useBackend(context); +const EventScreen = (props: { drone: DroneData; event: FullEventData }) => { + const { act } = useBackend(); const { drone, event } = props; return ( @@ -799,16 +757,13 @@ const EventScreen = ( ); }; -export const AdventureScreen = ( - props: { - adventure_data: AdventureData; - drone_integrity: number; - drone_max_integrity: number; - hide_status?: boolean; - }, - context -) => { - const { act } = useBackend(context); +export const AdventureScreen = (props: { + adventure_data: AdventureData; + drone_integrity: number; + drone_max_integrity: number; + hide_status?: boolean; +}) => { + const { act } = useBackend(); const { adventure_data, drone_integrity, drone_max_integrity } = props; const rawData = adventure_data.raw_image; const imgSource = rawData ? rawData : resolveAsset(adventure_data.image); @@ -890,8 +845,8 @@ const DroneScreen = (props: { drone: ActiveDrone & DroneData }) => { } }; -const ExodroneConsoleContent = (props, context) => { - const { data } = useBackend(context); +const ExodroneConsoleContent = (props) => { + const { data } = useBackend(); if (!data.drone) { return ; diff --git a/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx b/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx index d5aa9cf8120..8235ac9167f 100644 --- a/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx +++ b/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx @@ -21,8 +21,8 @@ type ScanData = { site_data: SiteData; }; -const ScanFailedModal = (props, context) => { - const { act } = useBackend(context); +const ScanFailedModal = (props) => { + const { act } = useBackend(); return ( @@ -37,8 +37,8 @@ const ScanFailedModal = (props, context) => { ); }; -const ScanSelectionSection = (props, context) => { - const { act, data } = useBackend(context); +const ScanSelectionSection = (props) => { + const { act, data } = useBackend(); const { scan_power, point_scan_eta, @@ -135,8 +135,8 @@ type ScanInProgressData = { scan_description: string; }; -const ScanInProgressModal = (props, context) => { - const { act, data } = useBackend(context); +const ScanInProgressModal = (props) => { + const { act, data } = useBackend(); const { scan_time, scan_power, scan_description } = data; return ( @@ -176,8 +176,8 @@ type ExoscannerConsoleData = { scan_conditions: Array; }; -export const ExoscannerConsole = (props, context) => { - const { act, data } = useBackend(context); +export const ExoscannerConsole = (props) => { + const { act, data } = useBackend(); const { scan_in_progress, scan_power, diff --git a/tgui/packages/tgui/interfaces/ExosuitControlConsole.jsx b/tgui/packages/tgui/interfaces/ExosuitControlConsole.jsx index 2b9c0f5eefd..d7153423603 100644 --- a/tgui/packages/tgui/interfaces/ExosuitControlConsole.jsx +++ b/tgui/packages/tgui/interfaces/ExosuitControlConsole.jsx @@ -3,8 +3,8 @@ import { useBackend } from '../backend'; import { AnimatedNumber, Box, Button, LabeledList, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; -export const ExosuitControlConsole = (props, context) => { - const { act, data } = useBackend(context); +export const ExosuitControlConsole = (props) => { + const { act, data } = useBackend(); const { mechs = [] } = data; return ( diff --git a/tgui/packages/tgui/interfaces/ExosuitFabricator.tsx b/tgui/packages/tgui/interfaces/ExosuitFabricator.tsx index 7b4c8d14056..3de25dd4af7 100644 --- a/tgui/packages/tgui/interfaces/ExosuitFabricator.tsx +++ b/tgui/packages/tgui/interfaces/ExosuitFabricator.tsx @@ -12,8 +12,8 @@ type ExosuitFabricatorData = FabricatorData & { processing: BooleanLike; }; -export const ExosuitFabricator = (props, context) => { - const { act, data } = useBackend(context); +export const ExosuitFabricator = (props) => { + const { act, data } = useBackend(); const { materials, SHEET_MATERIAL_AMOUNT } = data; const availableMaterials: MaterialMap = {}; @@ -83,8 +83,8 @@ type RecipeProps = { SHEET_MATERIAL_AMOUNT: number; }; -const Recipe = (props: RecipeProps, context) => { - const { act } = useBackend(context); +const Recipe = (props: RecipeProps) => { + const { act } = useBackend(); const { design, available, SHEET_MATERIAL_AMOUNT } = props; const canPrint = !Object.entries(design.cost).some( @@ -167,8 +167,8 @@ type QueueProps = { SHEET_MATERIAL_AMOUNT: number; }; -const Queue = (props: QueueProps, context) => { - const { act, data } = useBackend(context); +const Queue = (props: QueueProps) => { + const { act, data } = useBackend(); const { availableMaterials, SHEET_MATERIAL_AMOUNT } = props; const { designs, processing } = data; @@ -247,8 +247,8 @@ type QueueListProps = { SHEET_MATERIAL_AMOUNT: number; }; -const QueueList = (props: QueueListProps, context) => { - const { act, data } = useBackend(context); +const QueueList = (props: QueueListProps) => { + const { act, data } = useBackend(); const { availableMaterials, SHEET_MATERIAL_AMOUNT } = props; const queue = data.queue || []; diff --git a/tgui/packages/tgui/interfaces/ExperimentConfigure.jsx b/tgui/packages/tgui/interfaces/ExperimentConfigure.jsx index 02cc759dd7f..6c2ce4534a8 100644 --- a/tgui/packages/tgui/interfaces/ExperimentConfigure.jsx +++ b/tgui/packages/tgui/interfaces/ExperimentConfigure.jsx @@ -51,8 +51,8 @@ const ExperimentStageRow = (props) => { ); }; -export const TechwebServer = (props, context) => { - const { act, data } = useBackend(context); +export const TechwebServer = (props) => { + const { act, data } = useBackend(); const { techwebs } = props; return techwebs.map((server, index) => ( @@ -91,8 +91,8 @@ export const TechwebServer = (props, context) => { )); }; -export const ExperimentConfigure = (props, context) => { - const { act, data } = useBackend(context); +export const ExperimentConfigure = (props) => { + const { act, data } = useBackend(); const { always_active, has_start_callback } = data; let techwebs = data.techwebs ?? []; @@ -166,8 +166,8 @@ export const ExperimentConfigure = (props, context) => { ); }; -export const Experiment = (props, context) => { - const { act, data } = useBackend(context); +export const Experiment = (props) => { + const { act, data } = useBackend(); const { exp } = props; const { name, description, tag, selected, progress, performance_hint, ref } = exp; diff --git a/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx b/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx index 579c7c1a391..0f7cac72266 100644 --- a/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx +++ b/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx @@ -116,8 +116,7 @@ const BLACKLISTED_CATEGORIES: Record = { * resulting table is generated by the provided `buildRecipeElement` function. */ export const DesignBrowser = ( - props: DesignBrowserProps, - context + props: DesignBrowserProps ) => { const { designs, @@ -129,16 +128,11 @@ export const DesignBrowser = ( } = props; const [selectedCategory, setSelectedCategory] = useSharedState( - context, 'selected_category', ALL_CATEGORY ); - const [searchText, setSearchText] = useSharedState( - context, - 'search_text', - '' - ); + const [searchText, setSearchText] = useSharedState('search_text', ''); const onCategorySelected = (newCategory: string) => { if (newCategory === selectedCategory) { @@ -340,8 +334,7 @@ type DesignBrowserTabProps = { }; const DesignBrowserTab = ( - props: DesignBrowserTabProps, - context + props: DesignBrowserTabProps ) => { let { category, depth, maxDepth, selectedCategory, setSelectedCategory } = props; @@ -447,8 +440,7 @@ type CategoryViewProps = { }; const CategoryView = ( - props: CategoryViewProps, - context + props: CategoryViewProps ) => { let { depth, diff --git a/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx b/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx index 460bbf92078..fae39a64b09 100644 --- a/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx +++ b/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx @@ -49,7 +49,7 @@ const LABEL_FORMAT = (value: number) => formatSiUnit(value, 0); * the ore silo. Has pop-out docks for each material type for ejecting up to * fifty sheets. */ -export const MaterialAccessBar = (props: MaterialAccessBarProps, context) => { +export const MaterialAccessBar = (props: MaterialAccessBarProps) => { const { availableMaterials, SHEET_MATERIAL_AMOUNT, onEjectRequested } = props; return ( @@ -77,11 +77,10 @@ type MaterialCounterProps = { onEjectRequested: (quantity: number) => void; }; -const MaterialCounter = (props: MaterialCounterProps, context) => { +const MaterialCounter = (props: MaterialCounterProps) => { const { material, onEjectRequested, SHEET_MATERIAL_AMOUNT } = props; const [hovering, setHovering] = useLocalState( - context, `MaterialCounter__${material.name}`, false ); @@ -147,7 +146,7 @@ type EjectButtonProps = { onEject: (quantity: number) => void; }; -const EjectButton = (props: EjectButtonProps, context) => { +const EjectButton = (props: EjectButtonProps) => { const { amount, sheets, onEject } = props; return ( diff --git a/tgui/packages/tgui/interfaces/Fabrication/MaterialCostSequence.tsx b/tgui/packages/tgui/interfaces/Fabrication/MaterialCostSequence.tsx index 50c86952e7b..9801504c8de 100644 --- a/tgui/packages/tgui/interfaces/Fabrication/MaterialCostSequence.tsx +++ b/tgui/packages/tgui/interfaces/Fabrication/MaterialCostSequence.tsx @@ -52,10 +52,7 @@ export type MaterialCostSequenceProps = { * * Otherwise, the labels are white. */ -export const MaterialCostSequence = ( - props: MaterialCostSequenceProps, - context -) => { +export const MaterialCostSequence = (props: MaterialCostSequenceProps) => { const { design, amount, available, align, justify, SHEET_MATERIAL_AMOUNT } = props; let { costMap } = props; diff --git a/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx b/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx index 650e40b86cd..84ee15279b0 100644 --- a/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx +++ b/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx @@ -71,7 +71,7 @@ export type MaterialIconProps = { * A 32x32 material icon. Animates between different stack sizes of the given * material. */ -export const MaterialIcon = (props: MaterialIconProps, context) => { +export const MaterialIcon = (props: MaterialIconProps) => { const { materialName, sheets = 0 } = props; const icons = MATERIAL_ICONS[materialName]; diff --git a/tgui/packages/tgui/interfaces/Fabricator.tsx b/tgui/packages/tgui/interfaces/Fabricator.tsx index 9bb9d3f16d7..5c3a4730c8b 100644 --- a/tgui/packages/tgui/interfaces/Fabricator.tsx +++ b/tgui/packages/tgui/interfaces/Fabricator.tsx @@ -7,8 +7,8 @@ import { FabricatorData, Design, MaterialMap } from './Fabrication/Types'; import { classes } from 'common/react'; import { DesignBrowser } from './Fabrication/DesignBrowser'; -export const Fabricator = (props, context) => { - const { act, data } = useBackend(context); +export const Fabricator = (props) => { + const { act, data } = useBackend(); const { fabName, onHold, designs, busy, SHEET_MATERIAL_AMOUNT } = data; // Reduce the material count array to a map of actually available materials. @@ -65,8 +65,8 @@ type PrintButtonProps = { available: MaterialMap; }; -const PrintButton = (props: PrintButtonProps, context) => { - const { act } = useBackend(context); +const PrintButton = (props: PrintButtonProps) => { + const { act } = useBackend(); const { design, quantity, available, SHEET_MATERIAL_AMOUNT } = props; const canPrint = !Object.entries(design.cost).some( @@ -102,8 +102,8 @@ type CustomPrintProps = { available: MaterialMap; }; -const CustomPrint = (props: CustomPrintProps, context) => { - const { act } = useBackend(context); +const CustomPrint = (props: CustomPrintProps) => { + const { act } = useBackend(); const { design, available } = props; const canPrint = !Object.entries(design.cost).some( ([material, amount]) => @@ -137,8 +137,8 @@ type RecipeProps = { SHEET_MATERIAL_AMOUNT: number; }; -const Recipe = (props: RecipeProps, context) => { - const { act } = useBackend(context); +const Recipe = (props: RecipeProps) => { + const { act } = useBackend(); const { design, available, SHEET_MATERIAL_AMOUNT } = props; const canPrint = !Object.entries(design.cost).some( diff --git a/tgui/packages/tgui/interfaces/Fax.tsx b/tgui/packages/tgui/interfaces/Fax.tsx index 9b6fec09cc2..37c81e5ec18 100644 --- a/tgui/packages/tgui/interfaces/Fax.tsx +++ b/tgui/packages/tgui/interfaces/Fax.tsx @@ -35,9 +35,9 @@ type FaxSpecial = { emag_needed: boolean; }; -export const Fax = (props, context) => { - const { act } = useBackend(context); - const { data } = useBackend(context); +export const Fax = (props) => { + const { act } = useBackend(); + const { data } = useBackend(); const faxes = data.faxes ? sortBy((sortFax: FaxInfo) => sortFax.fax_name)( data.syndicate_network diff --git a/tgui/packages/tgui/interfaces/FilingCabinet.tsx b/tgui/packages/tgui/interfaces/FilingCabinet.tsx index 109ffc3dc3f..f2a03f71da1 100644 --- a/tgui/packages/tgui/interfaces/FilingCabinet.tsx +++ b/tgui/packages/tgui/interfaces/FilingCabinet.tsx @@ -8,8 +8,8 @@ type Data = { contents_ref: string; }; -export const FilingCabinet = (props, context) => { - const { act, data } = useBackend(context); +export const FilingCabinet = (props) => { + const { act, data } = useBackend(); const { cabinet_name, contents, contents_ref } = data; return ( diff --git a/tgui/packages/tgui/interfaces/Filteriffic.jsx b/tgui/packages/tgui/interfaces/Filteriffic.jsx index a967efafca9..dbeb3683898 100644 --- a/tgui/packages/tgui/interfaces/Filteriffic.jsx +++ b/tgui/packages/tgui/interfaces/Filteriffic.jsx @@ -5,9 +5,9 @@ import { useBackend, useLocalState } from '../backend'; import { Box, Button, Collapsible, ColorBox, Dropdown, Input, LabeledList, NoticeBox, NumberInput, Section } from '../components'; import { Window } from '../layouts'; -const FilterIntegerEntry = (props, context) => { +const FilterIntegerEntry = (props) => { const { value, name, filterName } = props; - const { act } = useBackend(context); + const { act } = useBackend(); return ( { ); }; -const FilterFloatEntry = (props, context) => { +const FilterFloatEntry = (props) => { const { value, name, filterName } = props; - const { act } = useBackend(context); - const [step, setStep] = useLocalState(context, `${filterName}-${name}`, 0.01); + const { act } = useBackend(); + const [step, setStep] = useLocalState(`${filterName}-${name}`, 0.01); return ( <> { ); }; -const FilterTextEntry = (props, context) => { +const FilterTextEntry = (props) => { const { value, name, filterName } = props; - const { act } = useBackend(context); + const { act } = useBackend(); return ( { ); }; -const FilterColorEntry = (props, context) => { +const FilterColorEntry = (props) => { const { value, filterName, name } = props; - const { act } = useBackend(context); + const { act } = useBackend(); return ( <>
@@ -282,8 +282,8 @@ const LoadingAnimation = () => { ); }; -export const GreyscaleModifyMenu = (props, context) => { - const { act, data } = useBackend(context); +export const GreyscaleModifyMenu = (props) => { + const { act, data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/GulagItemReclaimer.tsx b/tgui/packages/tgui/interfaces/GulagItemReclaimer.tsx index be5b2300bce..8698a0207ed 100644 --- a/tgui/packages/tgui/interfaces/GulagItemReclaimer.tsx +++ b/tgui/packages/tgui/interfaces/GulagItemReclaimer.tsx @@ -8,8 +8,8 @@ type Data = { mobs: { mob: string; name: string }[]; }; -export const GulagItemReclaimer = (props, context) => { - const { act, data } = useBackend(context); +export const GulagItemReclaimer = (props) => { + const { act, data } = useBackend(); const { can_reclaim, mobs = [] } = data; return ( diff --git a/tgui/packages/tgui/interfaces/GulagTeleporterConsole.jsx b/tgui/packages/tgui/interfaces/GulagTeleporterConsole.jsx index 09cdcf7313f..6a4b67b3535 100644 --- a/tgui/packages/tgui/interfaces/GulagTeleporterConsole.jsx +++ b/tgui/packages/tgui/interfaces/GulagTeleporterConsole.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; -export const GulagTeleporterConsole = (props, context) => { - const { act, data } = useBackend(context); +export const GulagTeleporterConsole = (props) => { + const { act, data } = useBackend(); const { teleporter, teleporter_lock, diff --git a/tgui/packages/tgui/interfaces/HighLuminosityEyesMenu.tsx b/tgui/packages/tgui/interfaces/HighLuminosityEyesMenu.tsx index 93877783c43..26131ac6bbc 100644 --- a/tgui/packages/tgui/interfaces/HighLuminosityEyesMenu.tsx +++ b/tgui/packages/tgui/interfaces/HighLuminosityEyesMenu.tsx @@ -22,8 +22,8 @@ enum ToUpdate { RightEye, } -const LightColorDisplay = (props, context) => { - const { act, data } = useBackend(context); +const LightColorDisplay = (props) => { + const { act, data } = useBackend(); const { lightColor } = data; return ( @@ -53,8 +53,8 @@ const LightColorDisplay = (props, context) => { ); }; -const RangeDisplay = (props, context) => { - const { act, data } = useBackend(context); +const RangeDisplay = (props) => { + const { act, data } = useBackend(); const { range } = data; return ( @@ -86,8 +86,8 @@ const RangeDisplay = (props, context) => { ); }; -const EyeColorDisplay = (props, context) => { - const { act, data } = useBackend(context); +const EyeColorDisplay = (props) => { + const { act, data } = useBackend(); const { eyeColor } = data; return ( <> @@ -160,8 +160,8 @@ const EyeColorDisplay = (props, context) => { ); }; -export const HighLuminosityEyesMenu = (props, context) => { - const { act, data } = useBackend(context); +export const HighLuminosityEyesMenu = (props) => { + const { act, data } = useBackend(); const { eyeColor } = data; return ( { - const { data } = useBackend(context); +export const HoloPay = (props) => { + const { data } = useBackend(); const { owner } = data; - const [setupMode, setSetupMode] = useLocalState(context, 'setupMode', false); + const [setupMode, setSetupMode] = useLocalState('setupMode', false); // User clicked the "Setup" or "Done" button. const onClick = () => { setSetupMode(!setupMode); @@ -56,8 +56,8 @@ export const HoloPay = (props, context) => { /** * Displays the current user's bank information (if any) */ -const AccountDisplay = (props, context) => { - const { data } = useBackend(context); +const AccountDisplay = (props) => { + const { data } = useBackend(); const { user } = data; if (!user) { return Error! No account detected.; @@ -88,8 +88,8 @@ const AccountDisplay = (props, context) => { * Displays the payment processor. This is the main display. * Shows icon, name, payment button. */ -const TerminalDisplay = (props, context) => { - const { act, data } = useBackend(context); +const TerminalDisplay = (props) => { + const { act, data } = useBackend(); const { description, force_fee, name, owner, user, shop_logo } = data; const { onClick } = props; const is_owner = owner === user?.name; @@ -168,8 +168,8 @@ const TerminalDisplay = (props, context) => { /** * User has clicked "setup" button. Changes vars on the holopay. */ -const SetupDisplay = (props, context) => { - const { act, data } = useBackend(context); +const SetupDisplay = (props) => { + const { act, data } = useBackend(); const { available_logos = [], force_fee, max_fee, name, shop_logo } = data; const { onClick } = props; diff --git a/tgui/packages/tgui/interfaces/Holodeck.jsx b/tgui/packages/tgui/interfaces/Holodeck.jsx index 60041734df3..a2ea28abb76 100644 --- a/tgui/packages/tgui/interfaces/Holodeck.jsx +++ b/tgui/packages/tgui/interfaces/Holodeck.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Button, Section } from '../components'; import { Window } from '../layouts'; -export const Holodeck = (props, context) => { - const { act, data } = useBackend(context); +export const Holodeck = (props) => { + const { act, data } = useBackend(); const { can_toggle_safety, emagged, program } = data; const default_programs = data.default_programs || []; const emag_programs = data.emag_programs || []; diff --git a/tgui/packages/tgui/interfaces/Holopad.jsx b/tgui/packages/tgui/interfaces/Holopad.jsx index 156f364c1d8..14b6f7b0689 100644 --- a/tgui/packages/tgui/interfaces/Holopad.jsx +++ b/tgui/packages/tgui/interfaces/Holopad.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Box, Button, Flex, Icon, LabeledList, Modal, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; -export const Holopad = (props, context) => { - const { act, data } = useBackend(context); +export const Holopad = (props) => { + const { act, data } = useBackend(); const { calling } = data; return ( @@ -33,8 +33,8 @@ export const Holopad = (props, context) => { ); }; -const HolopadContent = (props, context) => { - const { act, data } = useBackend(context); +const HolopadContent = (props) => { + const { act, data } = useBackend(); const { on_network, on_cooldown, diff --git a/tgui/packages/tgui/interfaces/HotkeysHelp.tsx b/tgui/packages/tgui/interfaces/HotkeysHelp.tsx index dc7f310c644..5493542c640 100644 --- a/tgui/packages/tgui/interfaces/HotkeysHelp.tsx +++ b/tgui/packages/tgui/interfaces/HotkeysHelp.tsx @@ -88,8 +88,8 @@ const KeyBinding = (props: KeyBindingBoxProps) => ( <>{processColorModifiers(props.keycode)} ); -export const HotkeysHelp = (props, context) => { - const { data } = useBackend(context); +export const HotkeysHelp = (props) => { + const { data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/Hypertorus/Controls.tsx b/tgui/packages/tgui/interfaces/Hypertorus/Controls.tsx index a937d88e929..6c41eebcccc 100644 --- a/tgui/packages/tgui/interfaces/Hypertorus/Controls.tsx +++ b/tgui/packages/tgui/interfaces/Hypertorus/Controls.tsx @@ -37,7 +37,7 @@ type WasteData = { * This module holds user interactable controls. Some may be good candidates * for generalizing and refactoring. */ -const ComboKnob = (props: ComboProps, context) => { +const ComboKnob = (props: ComboProps) => { const { color = false, defaultValue, @@ -52,7 +52,7 @@ const ComboKnob = (props: ComboProps, context) => { ...rest } = props; - const { act } = useBackend(context); + const { act } = useBackend(); const iconProps = { rotation: 0, @@ -118,8 +118,8 @@ const ComboKnob = (props: ComboProps, context) => { ); }; -export const HypertorusSecondaryControls = (props, context) => { - const { data } = useBackend(context); +export const HypertorusSecondaryControls = (props) => { + const { data } = useBackend(); const { cooling_volume, current_damper, @@ -188,8 +188,8 @@ export const HypertorusSecondaryControls = (props, context) => { ); }; -export const HypertorusWasteRemove = (props, context) => { - const { act, data } = useBackend(context); +export const HypertorusWasteRemove = (props) => { + const { act, data } = useBackend(); const { filter_types = [], waste_remove, mod_filtering_rate } = data; return ( diff --git a/tgui/packages/tgui/interfaces/Hypertorus/Gases.tsx b/tgui/packages/tgui/interfaces/Hypertorus/Gases.tsx index eab6af61047..665a94d6013 100644 --- a/tgui/packages/tgui/interfaces/Hypertorus/Gases.tsx +++ b/tgui/packages/tgui/interfaces/Hypertorus/Gases.tsx @@ -68,8 +68,8 @@ const ensure_gases = (gas_array: HypertorusGas[] = [], gasids) => { } }; -const GasList = (props: GasListProps, context) => { - const { act, data } = useBackend(context); +const GasList = (props: GasListProps) => { + const { act, data } = useBackend(); const { input_max, input_min, @@ -145,8 +145,8 @@ const GasList = (props: GasListProps, context) => { ); }; -export const HypertorusGases = (props, context) => { - const { data } = useBackend(context); +export const HypertorusGases = (props) => { + const { data } = useBackend(); const { fusion_gases = [], moderator_gases = [], diff --git a/tgui/packages/tgui/interfaces/Hypertorus/Parameters.tsx b/tgui/packages/tgui/interfaces/Hypertorus/Parameters.tsx index 6d9b93d72d6..b16e6e0b98c 100644 --- a/tgui/packages/tgui/interfaces/Hypertorus/Parameters.tsx +++ b/tgui/packages/tgui/interfaces/Hypertorus/Parameters.tsx @@ -26,8 +26,8 @@ type Data = { * Parameters with dangerous thresholds also display warnings at the * relevant levels. */ -export const HypertorusParameters = (props, context) => { - const { data } = useBackend(context); +export const HypertorusParameters = (props) => { + const { data } = useBackend(); const { apc_energy, energy_level, diff --git a/tgui/packages/tgui/interfaces/Hypertorus/Recipes.tsx b/tgui/packages/tgui/interfaces/Hypertorus/Recipes.tsx index 014d792ade1..d4a2868e43e 100644 --- a/tgui/packages/tgui/interfaces/Hypertorus/Recipes.tsx +++ b/tgui/packages/tgui/interfaces/Hypertorus/Recipes.tsx @@ -133,9 +133,9 @@ const GasCellItem = (props: GasCellProps) => { ); }; -export const HypertorusRecipes = (props: RecipeProps, context) => { +export const HypertorusRecipes = (props: RecipeProps) => { const { enableRecipeSelection, onRecipe, ...rest } = props; - const { data } = useBackend(context); + const { data } = useBackend(); const { selectable_fuel, selected } = data; return ( diff --git a/tgui/packages/tgui/interfaces/Hypertorus/Temperatures.tsx b/tgui/packages/tgui/interfaces/Hypertorus/Temperatures.tsx index 62187a92dc1..8c33572fe4d 100644 --- a/tgui/packages/tgui/interfaces/Hypertorus/Temperatures.tsx +++ b/tgui/packages/tgui/interfaces/Hypertorus/Temperatures.tsx @@ -76,8 +76,8 @@ const BarLabel = (props) => { ); }; -export const HypertorusTemperatures = (props, context) => { - const { data } = useBackend(context); +export const HypertorusTemperatures = (props) => { + const { data } = useBackend(); const { base_max_temperature, diff --git a/tgui/packages/tgui/interfaces/Hypertorus/index.tsx b/tgui/packages/tgui/interfaces/Hypertorus/index.tsx index 12e770b6ea9..9397df41484 100644 --- a/tgui/packages/tgui/interfaces/Hypertorus/index.tsx +++ b/tgui/packages/tgui/interfaces/Hypertorus/index.tsx @@ -44,8 +44,8 @@ export type HypertorusFuel = { temperature_multiplier: number; }; -const HypertorusMainControls = (props, context) => { - const { act, data } = useBackend(context); +const HypertorusMainControls = (props) => { + const { act, data } = useBackend(); const { start_power, start_cooling, @@ -124,7 +124,7 @@ const HypertorusLayout = () => { ); }; -export const Hypertorus = (props, context) => { +export const Hypertorus = (props) => { // The HFR has a ridiculous amount of knobs and information. // Ideally we'd display a large window for it all... const idealWidth = 850, diff --git a/tgui/packages/tgui/interfaces/HypnoChair.jsx b/tgui/packages/tgui/interfaces/HypnoChair.jsx index 6127e508631..1f6658d9a6d 100644 --- a/tgui/packages/tgui/interfaces/HypnoChair.jsx +++ b/tgui/packages/tgui/interfaces/HypnoChair.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Button, Icon, Input, LabeledList, Section } from '../components'; import { Window } from '../layouts'; -export const HypnoChair = (props, context) => { - const { act, data } = useBackend(context); +export const HypnoChair = (props) => { + const { act, data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/IVDrip.tsx b/tgui/packages/tgui/interfaces/IVDrip.tsx index 6a5b3a3165f..f713d05fc86 100644 --- a/tgui/packages/tgui/interfaces/IVDrip.tsx +++ b/tgui/packages/tgui/interfaces/IVDrip.tsx @@ -27,8 +27,8 @@ enum MODE { injecting, } -export const IVDrip = (props, context) => { - const { act, data } = useBackend(context); +export const IVDrip = (props) => { + const { act, data } = useBackend(); const { hasContainer, canRemoveContainer, diff --git a/tgui/packages/tgui/interfaces/ImplantChair.jsx b/tgui/packages/tgui/interfaces/ImplantChair.jsx index a7148da4527..ac9e576a620 100644 --- a/tgui/packages/tgui/interfaces/ImplantChair.jsx +++ b/tgui/packages/tgui/interfaces/ImplantChair.jsx @@ -2,8 +2,8 @@ import { useBackend } from '../backend'; import { Button, Icon, LabeledList, Section } from '../components'; import { Window } from '../layouts'; -export const ImplantChair = (props, context) => { - const { act, data } = useBackend(context); +export const ImplantChair = (props) => { + const { act, data } = useBackend(); return ( diff --git a/tgui/packages/tgui/interfaces/InfraredEmitter.tsx b/tgui/packages/tgui/interfaces/InfraredEmitter.tsx index 2eace819e11..9c6fe81811e 100644 --- a/tgui/packages/tgui/interfaces/InfraredEmitter.tsx +++ b/tgui/packages/tgui/interfaces/InfraredEmitter.tsx @@ -8,8 +8,8 @@ type Data = { visible: BooleanLike; }; -export const InfraredEmitter = (props, context) => { - const { act, data } = useBackend(context); +export const InfraredEmitter = (props) => { + const { act, data } = useBackend(); const { on, visible } = data; return ( diff --git a/tgui/packages/tgui/interfaces/InfuserBook.tsx b/tgui/packages/tgui/interfaces/InfuserBook.tsx index 20eeb8bc3a1..cd1364b103e 100644 --- a/tgui/packages/tgui/interfaces/InfuserBook.tsx +++ b/tgui/packages/tgui/interfaces/InfuserBook.tsx @@ -68,12 +68,11 @@ const TIER2TIERDATA: TierData[] = [ }, ]; -export const InfuserBook = (props, context) => { - const { data, act } = useBackend(context); +export const InfuserBook = (props) => { + const { data, act } = useBackend(); const { entries } = data; const [bookPosition, setBookPosition] = useLocalState( - context, 'bookPosition', { chapter: 0, @@ -194,7 +193,7 @@ export const InfuserBook = (props, context) => { ); }; -export const InfuserInstructions = (props, context) => { +export const InfuserInstructions = (props) => { return (
@@ -234,7 +233,7 @@ type InfuserEntryProps = { entry: Entry; }; -const InfuserEntry = (props: InfuserEntryProps, context) => { +const InfuserEntry = (props: InfuserEntryProps) => { const { entry } = props; const tierData = TIER2TIERDATA[entry.tier]; diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.jsx b/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.jsx index 4cc9de3e576..74cc9a2157f 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.jsx +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.jsx @@ -1,6 +1,6 @@ import { Stack, Button } from '../../components'; -export const BasicInput = (props, context) => { +export const BasicInput = (props) => { const { children, name, setValue, defaultValue, value } = props; return ( (value !== null && ( diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.jsx b/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.jsx index 99513cf4249..7e932c0eb9e 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.jsx +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.jsx @@ -1,6 +1,6 @@ import { Button, Stack, Box } from '../../components'; -export const CircuitInfo = (props, context) => { +export const CircuitInfo = (props) => { const { name, desc, notices, ...rest } = props; return ( diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayComponent.jsx b/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayComponent.jsx index 98ef2f1ac00..9f25a81f83b 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayComponent.jsx +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayComponent.jsx @@ -36,7 +36,7 @@ export class DisplayComponent extends Component { return false; } - render(props, context) { + render(props) { const { component, fixedSize, ...rest } = props; return ( diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.jsx b/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.jsx index 88b0b170afe..01bfef5957f 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.jsx +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.jsx @@ -1,7 +1,7 @@ import { Box, Button, Flex } from '../../components'; import { FUNDAMENTAL_DATA_TYPES, DATATYPE_DISPLAY_HANDLERS } from './FundamentalTypes'; -export const DisplayName = (props, context) => { +export const DisplayName = (props) => { const { port, isOutput, componentId, portIndex, act, ...rest } = props; const InputComponent = FUNDAMENTAL_DATA_TYPES[port.type || 'unknown']; diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.jsx b/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.jsx index 23615d80a15..b60546931c8 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.jsx +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.jsx @@ -3,7 +3,7 @@ import { NumberInput, Button, Stack, Input, Dropdown } from '../../components'; import { OPTION_DROPDOWN_LARGE_CHAR_AMOUNT } from './constants'; export const FUNDAMENTAL_DATA_TYPES = { - 'string': (props, context) => { + 'string': (props) => { const { name, value, setValue, color } = props; return ( @@ -16,7 +16,7 @@ export const FUNDAMENTAL_DATA_TYPES = { ); }, - 'number': (props, context) => { + 'number': (props) => { const { name, value, setValue, color } = props; return ( ); }, - 'entity': (props, context) => { + 'entity': (props) => { const { name, setValue } = props; return (
); -const LockedModule = (props, context) => { - const { act, data } = useBackend(context); +const LockedModule = (props) => { + const { act, data } = useBackend(); return ( @@ -257,7 +257,7 @@ const LockedModule = (props, context) => { ); }; -const ConfigureScreen = (props, context) => { +const ConfigureScreen = (props) => { const { configuration_data, module_ref, module_name } = props; const configuration_keys = Object.keys(configuration_data); return ( @@ -306,8 +306,8 @@ const radiationLevels = (param) => { } }; -const SuitStatusSection = (props, context) => { - const { act, data } = useBackend(context); +const SuitStatusSection = (props) => { + const { act, data } = useBackend(); const { core_name, cell_charge_current, @@ -437,8 +437,8 @@ const SuitStatusSection = (props, context) => { ); }; -const HardwareSection = (props, context) => { - const { act, data } = useBackend(context); +const HardwareSection = (props) => { + const { act, data } = useBackend(); const { control, helmet, chestplate, gauntlets, boots } = data; const { ai_name, core_name } = data.suit_status; return ( @@ -464,8 +464,8 @@ const HardwareSection = (props, context) => { ); }; -const UserStatusSection = (props, context) => { - const { act, data } = useBackend(context); +const UserStatusSection = (props) => { + const { act, data } = useBackend(); const { active } = data.suit_status; const { user_name, user_assignment } = data.user_status; const { @@ -627,12 +627,11 @@ const UserStatusSection = (props, context) => { ); }; -const ModuleSection = (props, context) => { - const { act, data } = useBackend(context); +const ModuleSection = (props) => { + const { act, data } = useBackend(); const { complexity_max, module_info } = data; const { complexity } = data.suit_status; const [configureState, setConfigureState] = useLocalState( - context, 'module_configuration', '' ); diff --git a/tgui/packages/tgui/interfaces/MafiaPanel.tsx b/tgui/packages/tgui/interfaces/MafiaPanel.tsx index 23b4b45a27a..7e3bfafe9d4 100644 --- a/tgui/packages/tgui/interfaces/MafiaPanel.tsx +++ b/tgui/packages/tgui/interfaces/MafiaPanel.tsx @@ -54,14 +54,10 @@ type MafiaData = { player_voted_up: BooleanLike; }; -export const MafiaPanelData = (props, context) => { - const { act, data } = useBackend(context); +export const MafiaPanelData = (props) => { + const { act, data } = useBackend(); const { phase, roleinfo, admin_controls, messages, player_voted_up } = data; - const [mafia_tab, setMafiaMode] = useLocalState( - context, - 'mafia_tab', - 'Role list' - ); + const [mafia_tab, setMafiaMode] = useLocalState('mafia_tab', 'Role list'); if (phase === 'No Game') { return ( @@ -156,8 +152,8 @@ export const MafiaPanelData = (props, context) => { ); }; -export const MafiaPanel = (props, context) => { - const { act, data } = useBackend(context); +export const MafiaPanel = (props) => { + const { act, data } = useBackend(); const { roleinfo } = data; return ( { ); }; -const MafiaChat = (props, context) => { - const { act, data } = useBackend(context); +const MafiaChat = (props) => { + const { act, data } = useBackend(); const { messages } = data; - const [message_to_send, setMessagingBox] = useLocalState(context, 'Chat', ''); + const [message_to_send, setMessagingBox] = useLocalState('Chat', ''); return ( {!!messages && ( @@ -216,8 +212,8 @@ const MafiaChat = (props, context) => { ); }; -const MafiaLobby = (props, context) => { - const { act, data } = useBackend(context); +const MafiaLobby = (props) => { + const { act, data } = useBackend(); const { lobbydata = [], is_observer } = data; const readyGhosts = lobbydata ? lobbydata.filter((player) => player.status === 'Ready') @@ -283,8 +279,8 @@ const MafiaLobby = (props, context) => { ); }; -const MafiaRole = (props, context) => { - const { act, data } = useBackend(context); +const MafiaRole = (props) => { + const { act, data } = useBackend(); const { phase, turn, roleinfo, timeleft } = data; return (
{ ); }; -const MafiaListOfRoles = (props, context) => { - const { act, data } = useBackend(context); +const MafiaListOfRoles = (props) => { + const { act, data } = useBackend(); const { all_roles } = data; return (
@@ -358,14 +354,10 @@ const MafiaListOfRoles = (props, context) => { ); }; -const MafiaNotesTab = (props, context) => { - const { act, data } = useBackend(context); +const MafiaNotesTab = (props) => { + const { act, data } = useBackend(); const { user_notes } = data; - const [note_message, setNotesMessage] = useLocalState( - context, - 'Notes', - user_notes - ); + const [note_message, setNotesMessage] = useLocalState('Notes', user_notes); return (