@@ -337,7 +345,10 @@ export const DropshipWeaponsConsole = () => {
-
+
@@ -356,7 +367,10 @@ export const DropshipWeaponsConsole = () => {
-
+
diff --git a/tgui/packages/tgui/interfaces/HiveStatus.jsx b/tgui/packages/tgui/interfaces/HiveStatus.jsx
index 048eb1f6df7b..caecf087579f 100644
--- a/tgui/packages/tgui/interfaces/HiveStatus.jsx
+++ b/tgui/packages/tgui/interfaces/HiveStatus.jsx
@@ -113,6 +113,7 @@ const GeneralInformation = (props, context) => {
total_xenos,
burrowed_larva,
evilution_level,
+ pylon_status,
} = data;
return (
@@ -142,6 +143,11 @@ const GeneralInformation = (props, context) => {
Evilution: {evilution_level}
+ {pylon_status && (
+
+ {pylon_status}
+
+ )}
);
};
diff --git a/tgui/packages/tgui/interfaces/IcMedalsPanel.js b/tgui/packages/tgui/interfaces/IcMedalsPanel.js
new file mode 100644
index 000000000000..a873ab5368df
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/IcMedalsPanel.js
@@ -0,0 +1,170 @@
+import { useBackend, useLocalState } from '../backend';
+import { Window } from '../layouts';
+import { classes } from 'common/react';
+import { NoticeBox, Section, Box, Button, Stack, Flex } from '../components';
+
+export const IcMedalsPanel = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const CONDUCT_MEDAL = 'distinguished conduct medal';
+ const BRONZE_HEART_MEDAL = 'bronze heart medal';
+ const VALOR_MEDAL = 'medal of valor';
+ const HEROISM_MEDAL = 'medal of exceptional heroism';
+
+ const [recommendationMedalTypes, setRecommendationMedalTypes] = useLocalState(
+ context,
+ 'recommendation_types',
+ []
+ );
+
+ return (
+
+
+
+
+
+ {data.recommendations.map((recommendation, index) => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Recommender: {recommendation.recommender_name} (
+ {recommendation.recommender_rank})
+
+ Reason: {recommendation.reason}
+
+
+
+
+
+ ))}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/CameraPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/CameraPanel.tsx
index f3a1197e9802..8bf5807b9fcd 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/CameraPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/CameraPanel.tsx
@@ -11,9 +11,9 @@ export const CameraMfdPanel = (props: MfdProps, context) => {
return (
act('nvg-enable') },
- { children: 'nvgoff', onClick: () => act('nvg-disable') },
+ leftButtons={[
+ { children: 'NV-ON', onClick: () => act('nvg-enable') },
+ { children: 'NV-OFF', onClick: () => act('nvg-disable') },
]}
bottomButtons={[{ children: 'EXIT', onClick: () => setPanelState('') }]}>
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/EquipmentPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/EquipmentPanel.tsx
index 05a500563b52..8f2cff9f1842 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/EquipmentPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/EquipmentPanel.tsx
@@ -314,16 +314,6 @@ export const EquipmentMfdPanel = (props: MfdProps, context) => {
return (
setPanelState('firemission'),
- },
- {},
- {},
- ]}
leftButtons={[
weap2 ? generateButton(weap2) : {},
weap1 ? generateButton(weap1) : {},
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/FiremissionPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/FiremissionPanel.tsx
index fd71dab8f045..0eaa43f53478 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/FiremissionPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/FiremissionPanel.tsx
@@ -67,11 +67,7 @@ const FiremissionMfdHomePage = (props: MfdProps, context) => {
const firemission =
data.firemission_data.length > x ? data.firemission_data[x] : undefined;
return {
- children: firemission ? (
-
- FM {x + 1}
{firemission?.name}
-
- ) : undefined,
+ children: firemission ? FM {x + 1}
: undefined,
onClick: () => setSelectedFm(firemission?.name),
};
};
@@ -95,7 +91,6 @@ const FiremissionMfdHomePage = (props: MfdProps, context) => {
leftButtons={left_firemissions}
rightButtons={right_firemissions}
topButtons={[
- {},
{},
{},
fmName
@@ -110,10 +105,11 @@ const FiremissionMfdHomePage = (props: MfdProps, context) => {
},
}
: {},
+ {},
{
- children: ,
+ children: fmOffset > 0 ? : undefined,
onClick: () => {
- if (fmOffset >= 1) {
+ if (fmOffset > 0) {
setFmOffset(fmOffset - 1);
}
},
@@ -128,9 +124,12 @@ const FiremissionMfdHomePage = (props: MfdProps, context) => {
{},
{},
{
- children: ,
+ children:
+ fmOffset + 10 < data.firemission_data?.length ? (
+
+ ) : undefined,
onClick: () => {
- if (fmOffset + 8 < data.firemission_data.length) {
+ if (fmOffset + 10 < data.firemission_data?.length) {
setFmOffset(fmOffset + 1);
}
},
@@ -212,7 +211,10 @@ const ViewFiremissionMfdPanel = (
bottomButtons={[
{
children: 'EXIT',
- onClick: () => setPanelState(''),
+ onClick: () => {
+ setSelectedFm(undefined);
+ setPanelState('');
+ },
},
]}
rightButtons={editFm === true ? rightButtons : []}>
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/FultonPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/FultonPanel.tsx
index 05d33e51a8d1..5bb2f462d1a2 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/FultonPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/FultonPanel.tsx
@@ -55,7 +55,7 @@ export const FultonMfdPanel = (props: MfdProps, context) => {
{
children: ,
onClick: () => {
- if (fulltonOffset >= 1) {
+ if (fulltonOffset > 0) {
setFultonOffset(fulltonOffset - 1);
}
},
@@ -70,6 +70,9 @@ export const FultonMfdPanel = (props: MfdProps, context) => {
},
},
]}
+ topButtons={[
+ { children: 'EQUIP', onClick: () => setPanelState('equipment') },
+ ]}
bottomButtons={[
{
children: 'EXIT',
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/MGPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/MGPanel.tsx
index dc6df25e17c1..fac34ef3e49a 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/MGPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/MGPanel.tsx
@@ -7,6 +7,7 @@ import { EquipmentContext, MGSpec } from './types';
const MgPanel = (props: DropshipEquipment) => {
const mgData = props.data as MGSpec;
+
return (
@@ -44,6 +45,8 @@ export const MgMfdPanel = (props: MfdProps, context) => {
const { setPanelState } = mfdState(context, props.panelStateId);
const { equipmentState } = useEquipmentState(context, props.panelStateId);
const mg = data.equipment_data.find((x) => x.mount_point === equipmentState);
+ const deployLabel = (mg?.data?.deployed ?? 0) === 1 ? 'RETRACT' : 'DEPLOY';
+
return (
{
]}
leftButtons={[
{
- children: 'DEPLOY',
+ children: deployLabel,
onClick: () =>
act('deploy-equipment', { equipment_id: mg?.mount_point }),
},
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/MedevacPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/MedevacPanel.tsx
index 634b4ef2a52e..a804b4d92e59 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/MedevacPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/MedevacPanel.tsx
@@ -48,6 +48,7 @@ const MedevacOccupant = (props: { data: MedevacTargets }) => (
);
export const MedevacMfdPanel = (props: MfdProps, context) => {
+ const { data, act } = useBackend(context);
const [medevacOffset, setMedevacOffset] = useLocalState(
context,
`${props.panelStateId}_medevacoffset`,
@@ -56,8 +57,6 @@ export const MedevacMfdPanel = (props: MfdProps, context) => {
const { setPanelState } = mfdState(context, props.panelStateId);
const { equipmentState } = useEquipmentState(context, props.panelStateId);
- const { data, act } = useBackend(context);
-
const result = data.equipment_data.find(
(x) => x.mount_point === equipmentState
);
@@ -85,6 +84,7 @@ export const MedevacMfdPanel = (props: MfdProps, context) => {
const all_targets = range(medevacOffset, medevacOffset + 8)
.map((x) => data.medevac_targets[x])
.filter((x) => x !== undefined);
+
return (
{
{
children: ,
onClick: () => {
- if (medevacOffset >= 1) {
+ if (medevacOffset > 0) {
setMedevacOffset(medevacOffset - 1);
}
},
@@ -109,10 +109,7 @@ export const MedevacMfdPanel = (props: MfdProps, context) => {
},
]}
topButtons={[
- {
- children: 'EQUIP',
- onClick: () => setPanelState('equipment'),
- },
+ { children: 'EQUIP', onClick: () => setPanelState('equipment') },
]}
bottomButtons={[
{
@@ -168,7 +165,7 @@ export const MedevacMfdPanel = (props: MfdProps, context) => {
{all_targets.map((x) => (
<>
-
+
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx b/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx
index 9df7eaffcde4..35f81b45ed3e 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx
@@ -13,6 +13,7 @@ export interface MfdProps {
rightButtons?: Array;
bottomButtons?: Array;
children?: InfernoNode;
+ otherPanelStateId?: string;
}
export const MfdButton = (props: ButtonProps, context) => {
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/SentryPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/SentryPanel.tsx
index d8ea220ec986..c5f9bd04c1b0 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/SentryPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/SentryPanel.tsx
@@ -57,6 +57,7 @@ export const SentryMfdPanel = (props: MfdProps, context) => {
);
const deployLabel =
(sentry?.data?.deployed ?? 0) === 1 ? 'RETRACT' : 'DEPLOY';
+
return (
{
act('deploy-equipment', { equipment_id: sentry?.mount_point }),
},
{
- children: 'CAMERA',
+ children: sentry?.data?.camera_available ? 'CAMERA' : undefined,
onClick: () =>
act('set-camera-sentry', { equipment_id: sentry?.mount_point }),
},
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/SpotlightPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/SpotlightPanel.tsx
index ce241420497e..f3a5884f89ca 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/SpotlightPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/SpotlightPanel.tsx
@@ -33,6 +33,9 @@ export const SpotlightMfdPanel = (props: MfdProps, context) => {
const spotlight = data.equipment_data.find(
(x) => x.mount_point === equipmentState
);
+ const deployLabel =
+ (spotlight?.data?.deployed ?? 0) === 1 ? 'DISABLE' : 'ENABLE';
+
return (
{
]}
leftButtons={[
{
- children: 'DEPLOY',
+ children: deployLabel,
onClick: () =>
act('deploy-equipment', { equipment_id: spotlight?.mount_point }),
},
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx
index 1eca123173b0..5767b4960840 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx
@@ -36,6 +36,9 @@ export const SupportMfdPanel = (props: MfdProps, context) => {
return (
setPanelState('equipment') },
+ ]}
bottomButtons={[
{
children: 'EXIT',
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx b/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx
index 49f22db18104..ebaacfb90337 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx
@@ -59,7 +59,7 @@ const useTargetFiremissionSelect = (context) => {
};
};
-const useTargetOffset = (context, panelId: string) => {
+export const useTargetOffset = (context, panelId: string) => {
const [data, set] = useLocalState(context, `${panelId}_targetOffset`, 0);
return {
targetOffset: data,
@@ -79,7 +79,7 @@ const useTargetSubmenu = (context, panelId: string) => {
};
};
-const TargetLines = (props: { panelId: string }, context) => {
+export const TargetLines = (props: { panelId: string }, context) => {
const { data } = useBackend<
EquipmentContext & FiremissionContext & TargetContext
>(context);
@@ -140,6 +140,34 @@ const leftButtonGenerator = (context, panelId: string) => {
useTargetFiremissionSelect(context);
const { weaponSelected, setWeaponSelected } = useWeaponSelectedState(context);
const weapons = data.equipment_data.filter((x) => x.is_weapon);
+ const [fmOffset] = useLocalState(
+ context,
+ `${panelId}_fm_strike_select_offset`,
+ 0
+ );
+ const firemission_mapper = (x: number) => {
+ if (x === 0) {
+ return {
+ children: 'CANCEL',
+ onClick: () => {
+ setFiremissionSelected(undefined);
+ setStrikeMode(undefined);
+ setLeftButtonMode(undefined);
+ },
+ };
+ }
+ x -= 1;
+ const firemission =
+ data.firemission_data.length > x ? data.firemission_data[x] : undefined;
+ return {
+ children: firemission ? FM {x + 1}
: undefined,
+ onClick: () => {
+ setFiremissionSelected(data.firemission_data[x]);
+ setLeftButtonMode(undefined);
+ },
+ };
+ };
+
if (leftButtonMode === undefined) {
return [
{
@@ -154,26 +182,30 @@ const leftButtonGenerator = (context, panelId: string) => {
}
if (leftButtonMode === 'STRIKE') {
if (strikeMode === 'weapon' && weaponSelected === undefined) {
- return weapons.map((x) => {
- return {
- children: x.shorthand,
+ const cancelButton = [
+ {
+ children: 'CANCEL',
onClick: () => {
- setWeaponSelected(x.mount_point);
+ setFiremissionSelected(undefined);
+ setStrikeMode(undefined);
setLeftButtonMode(undefined);
},
- };
- });
+ },
+ ];
+ return cancelButton.concat(
+ weapons.map((x) => {
+ return {
+ children: x.shorthand,
+ onClick: () => {
+ setWeaponSelected(x.eqp_tag);
+ setLeftButtonMode(undefined);
+ },
+ };
+ })
+ );
}
if (strikeMode === 'firemission' && firemissionSelected === undefined) {
- return data.firemission_data.map((x) => {
- return {
- children: x.name,
- onClick: () => {
- setFiremissionSelected(x);
- setLeftButtonMode(undefined);
- },
- };
- });
+ return range(fmOffset, fmOffset + 5).map(firemission_mapper);
}
return [
{ children: 'CANCEL', onClick: () => setLeftButtonMode(undefined) },
@@ -230,7 +262,7 @@ const leftButtonGenerator = (context, panelId: string) => {
return [];
};
-const lazeMapper = (context, offset) => {
+export const lazeMapper = (context, offset) => {
const { act, data } = useBackend(context);
const { setSelectedTarget } = useLazeTarget(context);
@@ -271,6 +303,21 @@ const lazeMapper = (context, offset) => {
};
};
+export const getLastTargetName = (data) => {
+ const target = data.targets_data[data.targets_data.length - 1] ?? undefined;
+ const isDebug = target?.target_name.includes('debug');
+ if (isDebug) {
+ return 'debug ' + target.target_name.split(' ')[3];
+ }
+ const label = target?.target_name.split(' ')[0] ?? '';
+ const squad = label[0] ?? undefined;
+ const number = label.split('-')[1] ?? undefined;
+
+ return squad !== undefined && number !== undefined
+ ? `${squad}-${number}`
+ : target?.target_name;
+};
+
export const TargetAquisitionMfdPanel = (props: MfdProps, context) => {
const { panelStateId } = props;
@@ -288,45 +335,37 @@ export const TargetAquisitionMfdPanel = (props: MfdProps, context) => {
context,
panelStateId
);
+ const [fmOffset, setFmOffset] = useLocalState(
+ context,
+ `${props.panelStateId}_fm_strike_select_offset`,
+ 0
+ );
+ const { leftButtonMode } = useTargetSubmenu(context, props.panelStateId);
const { fmXOffsetValue } = useFiremissionXOffsetValue(context);
const { fmYOffsetValue } = useFiremissionYOffsetValue(context);
- const lazes = range(0, 5).map((x) =>
- x > data.targets_data.length ? undefined : data.targets_data[x]
- );
-
const strikeConfigLabel =
strikeMode === 'weapon'
- ? data.equipment_data.find((x) => x.mount_point === weaponSelected)?.name
+ ? data.equipment_data.find((x) => x.eqp_tag === weaponSelected)?.name
: firemissionSelected !== undefined
? data.firemission_data.find(
(x) => x.mission_tag === firemissionSelected.mission_tag
)?.name
: 'NONE';
- const lazeIndex = lazes.findIndex((x) => x?.target_tag === selectedTarget);
- const strikeReady = strikeMode !== undefined && lazeIndex !== -1;
+ const strikeReady =
+ selectedTarget !== undefined &&
+ strikeDirection !== undefined &&
+ ((strikeMode === 'weapon' &&
+ weaponSelected !== undefined &&
+ data.equipment_data.find((x) => x.eqp_tag === weaponSelected)) ||
+ (strikeMode === 'firemission' && firemissionSelected !== undefined));
const targets = range(targetOffset, targetOffset + 5).map((x) =>
lazeMapper(context, x)
);
- const getLastName = () => {
- const target = data.targets_data[data.targets_data.length - 1] ?? undefined;
- const isDebug = target?.target_name.includes('debug');
- if (isDebug) {
- return 'debug ' + target.target_name.split(' ')[3];
- }
- const label = target?.target_name.split(' ')[0] ?? '';
- const squad = label[0] ?? undefined;
- const number = label.split('-')[1] ?? undefined;
-
- return squad !== undefined && number !== undefined
- ? `${squad}-${number}`
- : target?.target_name;
- };
-
if (
selectedTarget &&
data.targets_data.find((x) => `${x.target_tag}` === `${selectedTarget}`) ===
@@ -361,7 +400,20 @@ export const TargetAquisitionMfdPanel = (props: MfdProps, context) => {
}
},
},
- {},
+ {
+ children:
+ leftButtonMode === 'STRIKE' &&
+ strikeMode === 'firemission' &&
+ firemissionSelected === undefined &&
+ fmOffset > 0 ? (
+
+ ) : undefined,
+ onClick: () => {
+ if (fmOffset > 0) {
+ setFmOffset(fmOffset - 1);
+ }
+ },
+ },
{},
{},
{
@@ -378,16 +430,29 @@ export const TargetAquisitionMfdPanel = (props: MfdProps, context) => {
children: 'EXIT',
onClick: () => setPanelState(''),
},
- {},
+ {
+ children:
+ leftButtonMode === 'STRIKE' &&
+ strikeMode === 'firemission' &&
+ firemissionSelected === undefined &&
+ fmOffset + 4 < data.firemission_data?.length ? (
+
+ ) : undefined,
+ onClick: () => {
+ if (fmOffset + 4 < data.firemission_data?.length) {
+ setFmOffset(fmOffset + 1);
+ }
+ },
+ },
{},
{},
{
children:
- targetOffset < lazes.length ? (
+ targetOffset + 5 < data.targets_data?.length ? (
) : undefined,
onClick: () => {
- if (targetOffset < lazes.length) {
+ if (targetOffset + 5 < data.targets_data?.length) {
setTargetOffset(targetOffset + 1);
}
},
@@ -443,8 +508,9 @@ export const TargetAquisitionMfdPanel = (props: MfdProps, context) => {
Target selected:{' '}
- {lazes.find((x) => x?.target_tag === selectedTarget)
- ?.target_name ?? 'NONE'}
+ {data.targets_data.find(
+ (x) => x?.target_tag === selectedTarget
+ )?.target_name ?? 'NONE'}
@@ -502,7 +568,7 @@ export const TargetAquisitionMfdPanel = (props: MfdProps, context) => {
LATEST
- {getLastName()}
+ {getLastTargetName(data)}
)}
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/WeaponPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/WeaponPanel.tsx
index 090001aa3ac9..cec542fdc3d1 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/WeaponPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/WeaponPanel.tsx
@@ -1,10 +1,11 @@
import { range } from 'common/collections';
import { useBackend } from '../../backend';
-import { Box, Stack } from '../../components';
+import { Box, Icon, Stack } from '../../components';
import { DropshipEquipment } from '../DropshipWeaponsConsole';
import { MfdProps, MfdPanel } from './MultifunctionDisplay';
import { mfdState, useWeaponState } from './stateManagers';
import { LazeTarget } from './types';
+import { getLastTargetName, lazeMapper, TargetLines, useTargetOffset } from './TargetAquisition';
const EmptyWeaponPanel = (props, context) => {
return Nothing Listed
;
@@ -14,30 +15,12 @@ interface EquipmentContext {
targets_data: Array;
}
-const getLazeButtonProps = (context) => {
- const { act, data } = useBackend(context);
- const lazes = range(0, 5).map((x) =>
- x > data.targets_data.length ? undefined : data.targets_data[x]
- );
- const get_laze = (index: number) => {
- const laze = lazes.find((_, i) => i === index);
- if (laze === undefined) {
- return {
- children: '',
- onClick: () => act('set-camera', { equipment_id: null }),
- };
- }
- return {
- children: laze?.target_name.split(' ')[0] ?? 'NONE',
- onClick: laze
- ? () => act('set-camera', { 'equipment_id': laze.target_tag })
- : undefined,
- };
- };
- return [get_laze(0), get_laze(1), get_laze(2), get_laze(3), get_laze(4)];
-};
+const WeaponPanel = (
+ props: { panelId: string; equipment: DropshipEquipment },
+ context
+) => {
+ const { data } = useBackend(context);
-const WeaponPanel = (props: { equipment: DropshipEquipment }, context) => {
return (
@@ -45,7 +28,7 @@ const WeaponPanel = (props: { equipment: DropshipEquipment }, context) => {
ACTIONS
- {false && (
+ {true && (
{
-
@@ -146,7 +135,14 @@ export const WeaponMfdPanel = (props: MfdProps, context) => {
const { setPanelState } = mfdState(context, props.panelStateId);
const { weaponState } = useWeaponState(context, props.panelStateId);
const { data, act } = useBackend(context);
+ const { targetOffset, setTargetOffset } = useTargetOffset(
+ context,
+ props.panelStateId
+ );
const weap = data.equipment_data.find((x) => x.mount_point === weaponState);
+ const targets = range(targetOffset, targetOffset + 5).map((x) =>
+ lazeMapper(context, x)
+ );
return (
{
onClick: () => setPanelState(''),
},
{},
+ {},
+ {},
+ {
+ children:
+ targetOffset + 5 < data.targets_data?.length ? (
+
+ ) : undefined,
+ onClick: () => {
+ if (targetOffset + 5 < data.targets_data?.length) {
+ setTargetOffset(targetOffset + 1);
+ }
+ },
+ },
]}
topButtons={[
+ { children: 'EQUIP', onClick: () => setPanelState('equipment') },
+ {},
+ {},
+ {},
{
- children: 'EQUIP',
- onClick: () => setPanelState('equipment'),
+ children: targetOffset > 0 ? : undefined,
+ onClick: () => {
+ if (targetOffset > 0) {
+ setTargetOffset(targetOffset - 1);
+ }
+ },
},
]}
- rightButtons={getLazeButtonProps(context)}>
+ rightButtons={targets}>
- {weap ? : }
+ {weap ? (
+
+ ) : (
+
+ )}
);
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/stateManagers.ts b/tgui/packages/tgui/interfaces/MfdPanels/stateManagers.ts
index e639938eabf8..4b1729dce0f7 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/stateManagers.ts
+++ b/tgui/packages/tgui/interfaces/MfdPanels/stateManagers.ts
@@ -60,6 +60,17 @@ export const mfdState = (context, panelId: string) => {
};
};
+export const otherMfdState = (context, otherPanelId: string | undefined) => {
+ const [data] = useSharedState(
+ context,
+ `${otherPanelId}_panelstate`,
+ ''
+ );
+ return {
+ otherPanelState: data,
+ };
+};
+
export const useWeaponState = (context, panelId: string) => {
const [data, set] = useSharedState(
context,
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/types.ts b/tgui/packages/tgui/interfaces/MfdPanels/types.ts
index 78e7c3314b30..c20449ece428 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/types.ts
+++ b/tgui/packages/tgui/interfaces/MfdPanels/types.ts
@@ -66,7 +66,7 @@ export type SentrySpec = {
kills: number;
iff_status: string[];
camera_available: number;
- deployed: number;
+ deployed: 0 | 1;
};
export type SpotlightSpec = {
diff --git a/tgui/packages/tgui/interfaces/NoticeBoard.tsx b/tgui/packages/tgui/interfaces/NoticeBoard.tsx
new file mode 100644
index 000000000000..6cc761c0fb6f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/NoticeBoard.tsx
@@ -0,0 +1,56 @@
+import { BooleanLike } from 'common/react';
+
+import { useBackend } from '../backend';
+import { Box, Button, Section, Stack } from '../components';
+import { Window } from '../layouts';
+
+type Data = {
+ allowed: BooleanLike;
+ items: { ref: string; name: string }[];
+};
+
+export const NoticeBoard = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { allowed, items = [] } = data;
+
+ return (
+
+
+ {!items.length ? (
+
+
+ The notice board is empty!
+
+
+ ) : (
+ items.map((item) => (
+
+
+ {item.name}
+
+
+
+
+ ))
+ )}
+
+
+ );
+};