setHovering(true)}
@@ -90,7 +86,7 @@ const MaterialCounter = (props: MaterialCounterProps, context) => {
className={classes([
'MaterialDock',
hovering && 'MaterialDock--active',
- !canEject && 'MaterialDock--disabled',
+ !material.removable && 'MaterialDock--disabled',
])}>
{
-
+
{hovering && (
@@ -113,25 +112,21 @@ const MaterialCounter = (props: MaterialCounterProps, context) => {
@@ -145,15 +140,13 @@ const MaterialCounter = (props: MaterialCounterProps, context) => {
type EjectButtonProps = {
material: Material;
- available: number;
amount: number;
onEject: (quantity: number) => void;
};
const EjectButton = (props: EjectButtonProps, context) => {
- const { amount, available, material, onEject } = props;
- const { data } = useBackend(context);
- const { SHEET_MATERIAL_AMOUNT } = data;
+ const { amount, material, onEject } = props;
+ const { sheets } = material;
return (
diff --git a/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx b/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx
index ab855bd39e85b..650e40b86cde6 100644
--- a/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx
+++ b/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx
@@ -1,7 +1,5 @@
import { classes } from 'common/react';
import { Icon } from '../../components';
-import { Material } from './Types';
-import { useBackend } from '../../backend';
const MATERIAL_ICONS: Record = {
'iron': [
@@ -64,10 +62,9 @@ export type MaterialIconProps = {
materialName: string;
/**
- * The amount of material. One sheet is 100 units. By default, the icon
- * attempts to render a full stack (5,000 units).
+ * The number of sheets of the material.
*/
- amount?: number;
+ sheets?: number;
};
/**
@@ -75,10 +72,8 @@ export type MaterialIconProps = {
* material.
*/
export const MaterialIcon = (props: MaterialIconProps, context) => {
- const { materialName, amount } = props;
+ const { materialName, sheets = 0 } = props;
const icons = MATERIAL_ICONS[materialName];
- const { data } = useBackend(context);
- const { SHEET_MATERIAL_AMOUNT } = data;
if (!icons) {
return ;
@@ -86,11 +81,7 @@ export const MaterialIcon = (props: MaterialIconProps, context) => {
let activeIdx = 0;
- while (
- icons[activeIdx + 1] &&
- icons[activeIdx + 1][0] <=
- (amount ?? 50 * SHEET_MATERIAL_AMOUNT) / SHEET_MATERIAL_AMOUNT
- ) {
+ while (icons[activeIdx + 1] && icons[activeIdx + 1][0] <= sheets) {
activeIdx += 1;
}
diff --git a/tgui/packages/tgui/interfaces/Fabrication/Types.ts b/tgui/packages/tgui/interfaces/Fabrication/Types.ts
index c773dc43b96d8..ab6abec43878f 100644
--- a/tgui/packages/tgui/interfaces/Fabrication/Types.ts
+++ b/tgui/packages/tgui/interfaces/Fabrication/Types.ts
@@ -25,11 +25,6 @@ export type Material = {
*/
amount: number;
- /**
- * Definition of how much units 1 sheet has.
- */
- SHEET_MATERIAL_AMOUNT: number;
-
/**
* The number of sheets.
*/
diff --git a/tgui/packages/tgui/interfaces/LightController.tsx b/tgui/packages/tgui/interfaces/LightController.tsx
new file mode 100644
index 0000000000000..d12cbcc9b831f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/LightController.tsx
@@ -0,0 +1,344 @@
+import { useBackend, useLocalState } from '../backend';
+import { round } from '../../common/math';
+import { BooleanLike, classes } from '../../common/react';
+import { Box, Button, Knob, Section, Slider, Stack, Tabs } from '../components';
+import { Window } from '../layouts';
+
+enum Direction {
+ North = 1,
+ South = 2,
+ East = 4,
+ West = 8,
+}
+
+type LightDetails = {
+ name: string;
+ color: string;
+ power: number;
+ range: number;
+ angle: number;
+};
+
+type TemplateID = string;
+
+type LightTemplate = {
+ light_info: LightDetails;
+ description: string;
+ id: TemplateID;
+};
+
+interface CategoryList {
+ [key: string]: TemplateID[];
+}
+
+type Data = {
+ on: BooleanLike;
+ direction: number;
+ light_info: LightDetails;
+ templates: LightTemplate[];
+ default_id: string;
+ default_category: string;
+ category_ids: CategoryList;
+};
+
+export const LightController = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ light_info,
+ templates = [],
+ default_id,
+ default_category,
+ category_ids,
+ } = data;
+ const [currentTemplate, setCurrentTemplate] = useLocalState(
+ context,
+ 'currentTemplate',
+ default_id
+ );
+ const [currentCategory, setCurrentCategory] = useLocalState(
+ context,
+ 'currentCategory',
+ default_category
+ );
+
+ const category_keys = category_ids ? Object.keys(category_ids) : [];
+
+ return (
+
+
+
+
+
+
+ {category_keys.map((category, index) => (
+ setCurrentCategory(category)}>
+
+ {category}
+
+
+ ))}
+
+
+ {category_ids[currentCategory].map((id) => (
+ setCurrentTemplate(id)}>
+
+ {templates[id].light_info.name}
+
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+type LightControlProps = {
+ info: LightDetails;
+};
+
+const LightControl = (props: LightControlProps, context) => {
+ const { act, data } = useBackend(context);
+ const { on } = data;
+ const { info } = props;
+ return (
+
+
+
+
+
+
+ {info.name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ act('set_range', {
+ value: value,
+ })
+ }
+ step={0.1}
+ stepPixelSize={5}
+ />
+ round(value, 2)}
+ onChange={(e, value) =>
+ act('set_power', {
+ value: value,
+ })
+ }
+ step={0.1}
+ stepPixelSize={10}
+ />
+
+
+
+ );
+};
+
+type LightInfoProps = {
+ light: LightTemplate;
+};
+
+const LightInfo = (props: LightInfoProps, context) => {
+ const { act } = useBackend(context);
+ const { light } = props;
+ const { light_info } = light;
+ return (
+
+
+
+
+
+
+ Template: {light_info.name}
+
+
+ {light.description}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+// 3 vertical stacks, setup as columns
+const DirectionSelect = () => {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+type DirectedButtonProps = {
+ dir: number;
+ icon: string;
+};
+
+const DirectionButton = (props: DirectedButtonProps, context) => {
+ const { act, data } = useBackend(context);
+ const { direction } = data;
+ const { dir, icon } = props;
+ return (
+
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
index 6394b21b6bac7..9f417ad885f1c 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
@@ -1,4 +1,5 @@
-import { CheckboxInput, FeatureToggle, Feature, FeatureNumberInput } from '../base';
+import { multiline } from 'common/string';
+import { CheckboxInput, FeatureChoiced, FeatureDropdownInput, FeatureToggle, Feature, FeatureNumberInput } from '../base';
export const sound_ambience: FeatureToggle = {
name: 'Enable ambience',
@@ -34,19 +35,14 @@ export const sound_instruments: FeatureToggle = {
component: CheckboxInput,
};
-export const sound_tts: FeatureToggle = {
+export const sound_tts: FeatureChoiced = {
name: 'Enable TTS',
category: 'SOUND',
- description: 'When enabled, be able to hear text-to-speech sounds in game.',
- component: CheckboxInput,
-};
-
-export const sound_tts_blips: FeatureToggle = {
- name: 'Use Blips instead of TTS',
- category: 'SOUND',
- description:
- 'When enabled, text to speech will be replaced with blip sounds based on the voice. Does nothing if you disable TTS.',
- component: CheckboxInput,
+ description: multiline`
+ When enabled, be able to hear text-to-speech sounds in game.
+ When set to "Blips", text to speech will be replaced with blip sounds based on the voice.
+ `,
+ component: FeatureDropdownInput,
};
export const sound_tts_volume: Feature
= {
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts
index 668175c23262d..baac865559321 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts
@@ -7,22 +7,22 @@ export enum Gender {
export const GENDERS = {
[Gender.Male]: {
- icon: 'male',
+ icon: 'mars',
text: 'He/Him',
},
[Gender.Female]: {
- icon: 'female',
+ icon: 'venus',
text: 'She/Her',
},
[Gender.Other]: {
- icon: 'tg-non-binary',
+ icon: 'transgender',
text: 'They/Them',
},
[Gender.Other2]: {
- icon: 'tg-non-binary',
+ icon: 'neuter',
text: 'It/Its',
},
};
diff --git a/tgui/packages/tgui/interfaces/SimpleBot.tsx b/tgui/packages/tgui/interfaces/SimpleBot.tsx
index bdc606be73cfa..34c0a6ae84d4b 100644
--- a/tgui/packages/tgui/interfaces/SimpleBot.tsx
+++ b/tgui/packages/tgui/interfaces/SimpleBot.tsx
@@ -8,21 +8,19 @@ type SimpleBotContext = {
locked: number;
emagged: number;
has_access: number;
- pai: Pai;
settings: Settings;
custom_controls: Controls;
};
-type Pai = {
- allow_pai: number;
- card_inserted: number;
-};
-
type Settings = {
power: number;
airplane_mode: number;
maintenance_lock: number;
patrol_station: number;
+ allow_possession: number;
+ possession_enabled: number;
+ has_personality: number;
+ pai_inserted: boolean;
};
type Controls = {
@@ -59,13 +57,20 @@ export const SimpleBot = (props, context) => {
/** Creates a lock button at the top of the controls */
const TabDisplay = (props, context) => {
const { act, data } = useBackend(context);
- const { can_hack, has_access, locked, pai } = data;
- const { allow_pai } = pai;
+ const { can_hack, has_access, locked } = data;
+ const { allow_possession } = data.settings;
return (
<>
{!!can_hack && }
- {!!allow_pai && }
+ {!!allow_possession && }
+