diff --git a/tgui/packages/tgui/interfaces/CloningConsole/types.ts b/tgui/packages/tgui/interfaces/CloningConsole/types.ts index 5621fd1055..1c82f25fcd 100644 --- a/tgui/packages/tgui/interfaces/CloningConsole/types.ts +++ b/tgui/packages/tgui/interfaces/CloningConsole/types.ts @@ -2,7 +2,7 @@ import { BooleanLike } from 'common/react'; export type Data = { menu: number; - scanner: string; + scanner: string | null; numberofpods: number | null; pods: { pod: string; diff --git a/tgui/packages/tgui/interfaces/ResearchConsole/index.tsx b/tgui/packages/tgui/interfaces/ResearchConsole/index.tsx index 81c576b9c7..af16487a36 100644 --- a/tgui/packages/tgui/interfaces/ResearchConsole/index.tsx +++ b/tgui/packages/tgui/interfaces/ResearchConsole/index.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import { useBackend, useSharedState } from '../../backend'; -import { Button, Section, Tabs } from '../../components'; +import { Box, Button, Section, Tabs } from '../../components'; import { Window } from '../../layouts'; import { menus } from './constants'; import { ResearchConsoleConstructor } from './ResearchConsoleConstructor'; @@ -45,58 +45,59 @@ export const ResearchConsole = (props) => { const tab: React.JSX.Element[] = []; - tab[0] = ( + tab[0] = (info && ( - ); - tab[1] = ( + )) || ; + + tab[1] = (info && ( - ); + )) || ; - tab[2] = ( + tab[2] = (info && ( - ); + )) || ; - tab[3] = ( + tab[3] = (info && ( - ); + )) || ; tab[4] = ; tab[5] = ; - tab[6] = ( + tab[6] = (info && ( - ); + )) || ; return (