;
type PointData = {
@@ -45,6 +46,7 @@ class PaintCanvas extends Component
{
onCanvasDropper: (x: number, y: number) => void;
drawing: boolean;
drawing_color: string;
+ zoom: number;
constructor(props) {
super(props);
@@ -52,6 +54,7 @@ class PaintCanvas extends Component {
this.modifiedElements = [];
this.is_grid_shown = false;
this.drawing = false;
+ this.zoom = props.zoom;
this.onCanvasModified = props.onCanvasModifiedHandler;
this.onCanvasDropper = props.onCanvasDropperHandler;
@@ -67,8 +70,12 @@ class PaintCanvas extends Component {
}
componentDidUpdate() {
+ if (this.zoom !== this.props.zoom) {
+ this.prepareCanvas();
+ this.syncCanvas();
+ }
// eslint-disable-next-line max-len
- if (
+ else if (
(this.props.value !== undefined &&
JSON.stringify(this.baseImageData) !==
JSON.stringify(fromDM(this.props.value))) ||
@@ -79,6 +86,7 @@ class PaintCanvas extends Component {
}
prepareCanvas() {
+ this.zoom = this.props.zoom as number;
const canvas = this.canvasRef.current!;
const ctx = canvas.getContext('2d');
const width = this.props.width || canvas.width || 360;
@@ -242,22 +250,24 @@ type CanvasData = {
date: string | null;
show_plaque: boolean;
show_grid: boolean;
+ zoom: number;
+ max_zoom: number;
};
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;
+ const scaled_width = width * data.px_per_unit * data.zoom;
+ const scaled_height = height * data.px_per_unit * data.zoom;
const average_plaque_height = 90;
- const palette_height = 44;
+ const palette_height = 38;
const griddy = !!data.show_grid && !!data.editable && !!data.paint_tool_color;
return (
{
{
/>
)}
+
+ act('zoom_out')}
+ m={0.5}
+ />
+
+
+ = data.max_zoom}
+ onClick={() => act('zoom_in')}
+ m={0.5}
+ />
+
-
- act('paint', { data: toMassPaintFormat(changed) })
- }
- onCanvasDropperHandler={(x, y) =>
- act('select_color_from_coords', { px: x, py: y })
- }
- editable={data.editable}
- has_palette={!!data.paint_tool_palette}
- />
+
+
+ act('paint', { data: toMassPaintFormat(changed) })
+ }
+ onCanvasDropperHandler={(x, y) =>
+ act('select_color_from_coords', { px: x, py: y })
+ }
+ editable={data.editable}
+ has_palette={!!data.paint_tool_palette}
+ />
+
{!!data.editable && !!data.paint_tool_palette && (
{data.paint_tool_palette.map((element, index) => (
diff --git a/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx b/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
index 821f3713a2db..af5bddf4d5bd 100644
--- a/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
+++ b/tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
@@ -492,6 +492,7 @@ const CategoryView = (
{body}
diff --git a/tgui/packages/tgui/interfaces/Newscaster.jsx b/tgui/packages/tgui/interfaces/Newscaster.jsx
index a15fc8ef9ba1..431e7d606e62 100644
--- a/tgui/packages/tgui/interfaces/Newscaster.jsx
+++ b/tgui/packages/tgui/interfaces/Newscaster.jsx
@@ -6,7 +6,6 @@
*/
import { decodeHtmlEntities } from 'common/string';
-import { marked } from 'marked';
import { useState } from 'react';
import { useBackend, useSharedState } from '../backend';
@@ -23,7 +22,7 @@ import {
Tabs,
TextArea,
} from '../components';
-import { sanitizeText } from '../sanitize';
+import { processedText } from '../process';
import { BountyBoardContent } from './BountyBoard';
import { UserDetails } from './Vending';
@@ -90,8 +89,8 @@ const NewscasterChannelCreation = (props) => {
Enter channel name here:
{
setLockedmode(false)}
- />
+ >
+ Public
+
setLockedmode(true)}
- />
+ >
+ Private
+
act('createChannel', {
lockedmode: lockedmode,
})
}
- />
+ >
+ Submit Channel
+
@@ -181,9 +183,9 @@ const NewscasterCommentCreation = (props) => {
Enter comment:
act('cancelCreation')}
@@ -208,13 +210,14 @@ const NewscasterCommentCreation = (props) => {
act('createComment', {
messageID: viewing_message,
})
}
- />
+ >
+ Submit Comment
+
@@ -236,7 +239,7 @@ const NewscasterWantedScreen = (props) => {
return null;
}
return (
-
+
{wanted.map((activeWanted) => (
<>
@@ -246,22 +249,27 @@ const NewscasterWantedScreen = (props) => {
? 'Active Wanted Issue:'
: 'Dismissed Wanted Issue:'}
act('cancelCreation')}
/>
-
- {activeWanted.criminal}
- {activeWanted.crime}
-
-
- Posted by {activeWanted.author ? activeWanted.author : 'N/A'}
-
+ {!!activeWanted.criminal && (
+ <>
+
+ {activeWanted.criminal}
+ {activeWanted.crime}
+
+
+ Posted by{' '}
+ {activeWanted.author ? activeWanted.author : 'N/A'}
+
+
+ )}
act('setCriminalName')}
- />
+ >
+ {criminal_name ? criminal_name : ' N/A'}
+
act('setCrimeData')}
- />
+ >
+ {crime_description ? crime_description : ' N/A'}
+
@@ -293,22 +303,25 @@ const NewscasterWantedScreen = (props) => {
icon="camera"
selected={photo_data}
disabled={!security_mode}
- content={photo_data ? 'Remove photo' : 'Attach photo'}
onClick={() => act('togglePhoto')}
- />
+ >
+ {photo_data ? 'Remove photo' : 'Attach photo'}
+
act('submitWantedIssue')}
- />
+ >
+ Set Wanted Issue
+
act('clearWantedIssue')}
- />
+ >
+ Clear Wanted
+
) : (
@@ -392,28 +405,29 @@ const NewscasterChannelBox = (props) => {
act('createStory', { current: viewing_channel })}
mt={1}
- />
+ >
+ Submit Story
+
act('togglePhoto')}
- />
+ >
+ Select Photo
+
{!!admin_mode && (
{
channel: viewing_channel,
})
}
- />
+ >
+ D-Notice
+
)}
act('printNewspaper')}
- />
+ >
+ Print Newspaper
+
@@ -493,20 +510,6 @@ const NewscasterChannelSelector = (props) => {
);
};
-const processedText = (value) => {
- const textHtml = {
- __html: sanitizeText(
- marked(value, {
- breaks: true,
- smartypants: true,
- smartLists: true,
- baseUrl: 'thisshouldbreakhttp',
- }),
- ),
- };
- return textHtml;
-};
-
/** This is where the channels comments get spangled out (tm) */
const NewscasterChannelMessages = (props) => {
const { act, data } = useBackend();
diff --git a/tgui/packages/tgui/interfaces/Newspaper.tsx b/tgui/packages/tgui/interfaces/Newspaper.tsx
new file mode 100644
index 000000000000..2629a398c953
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Newspaper.tsx
@@ -0,0 +1,166 @@
+import { BooleanLike } from '../../common/react';
+import { useBackend } from '../backend';
+import { Box, Button, Divider, Image, Section } from '../components';
+import { Window } from '../layouts';
+import { processedText } from '../process';
+
+type Data = {
+ current_page: number;
+ scribble_message: string | null;
+ channel_has_messages: BooleanLike;
+ channels: ChannelNames[];
+ channel_data: ChannelData[];
+ wanted_criminal: string | null;
+ wanted_body: string | null;
+ wanted_photo: string | null;
+};
+
+type ChannelNames = {
+ name: string | null;
+ page_number: number;
+};
+
+type ChannelData = {
+ channel_name: string | null;
+ author_name: string | null;
+ is_censored: BooleanLike;
+ channel_messages: ChannelMessages[];
+};
+
+type ChannelMessages = {
+ message: string | null;
+ photo: string | null;
+ author: string | null;
+};
+
+export const Newspaper = (props) => {
+ const { act, data } = useBackend();
+ const { channels = [], current_page, scribble_message } = data;
+
+ return (
+
+
+ {current_page === channels.length + 1 ? (
+
+ {scribble_message}
+
+ )}
+
+ act('prev_page')}
+ >
+ Previous Page
+
+ act('next_page')}
+ >
+ Next Page
+
+
+
+
+ );
+};
+
+const NewspaperIntro = (props) => {
+ const { act, data } = useBackend();
+ const { channels = [], wanted_criminal = [] } = data;
+
+ return (
+
+
+ The Griffon
+
+
+ For use on Space Facilities only!
+
+ Table of Contents:
+ {channels.map((channel) => (
+
+ Page {channel.page_number || 0}: {channel.name}
+
+ ))}
+ {!!wanted_criminal && (
+ Last Page: Important Security Announcement
+ )}
+
+ );
+};
+
+const NewspaperChannel = (props) => {
+ const { act, data } = useBackend();
+ const { channel_has_messages, channel_data = [] } = data;
+
+ return (
+
+ {channel_data.map((individual_channel) => (
+
+
+ {individual_channel.channel_name}
+
+
+ Channel made by: {individual_channel.author_name}
+
+ {channel_has_messages ? (
+ <>
+ {individual_channel.channel_messages.map((message) => (
+ <>
+
+ Written by: {message.author}
+
+
+ ))}
+
+ );
+};
+
+const NewspaperEnding = (props) => {
+ const { act, data } = useBackend();
+ const { wanted_criminal, wanted_body, wanted_photo } = data;
+
+ return (
+
+ {wanted_criminal ? (
+ <>
+
+ Wanted Issue
+
+ Criminal Name: {wanted_criminal}
+ Description: {wanted_body}
+ {!!wanted_photo &&
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/NtosCursor.tsx b/tgui/packages/tgui/interfaces/NtosCursor.tsx
new file mode 100644
index 000000000000..6c62df26a176
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/NtosCursor.tsx
@@ -0,0 +1,63 @@
+import { useState } from 'react';
+
+import { useBackend } from '../backend';
+import { Button, DmIcon, NoticeBox, Section, Stack } from '../components';
+import { NtosWindow } from '../layouts';
+
+type Data = {
+ dmi: {
+ icon: string;
+ icon_state: string;
+ };
+};
+
+export const NtosCursor = () => {
+ const { data } = useBackend();
+
+ const { dmi } = data;
+
+ const [numClicked, incrementClicked] = useState(0);
+
+ const NoticeBoxText = () => {
+ if (numClicked <= 2) {
+ return `There's only one option... It's the sword.`;
+ } else if (numClicked === 3) {
+ return `You clicked the sword. It's still the sword.`;
+ } else if (numClicked === 4) {
+ return `You clicked the sword again. It's still the sword.`;
+ } else if (numClicked === 5) {
+ return `Trying to click the sword again? It's still the sword.`;
+ }
+ return `You clicked the sword ${numClicked} times... It's still the sword.`;
+ };
+
+ return (
+
+
+
+
+
+ = 1 ? 'green' : null}
+ onClick={() => incrementClicked(numClicked + 1)}
+ >
+
+
+
+ {NoticeBoxText()}
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/DepartmentOrders.tsx b/tgui/packages/tgui/interfaces/NtosDeptOrder.tsx
similarity index 63%
rename from tgui/packages/tgui/interfaces/DepartmentOrders.tsx
rename to tgui/packages/tgui/interfaces/NtosDeptOrder.tsx
index 5fb8853cdb8a..46f52887a44d 100644
--- a/tgui/packages/tgui/interfaces/DepartmentOrders.tsx
+++ b/tgui/packages/tgui/interfaces/NtosDeptOrder.tsx
@@ -3,6 +3,7 @@ import { useState } from 'react';
import { useBackend } from '../backend';
import {
+ Blink,
Box,
Button,
Dimmer,
@@ -13,17 +14,18 @@ import {
Tabs,
Tooltip,
} from '../components';
-import { Window } from '../layouts';
+import { NtosWindow } from '../layouts';
// 15x crate value
const COST_UPPER_BOUND = 3000;
+type typePath = string;
+
type Pack = {
name: string;
- cost: number;
- id: string;
desc: string;
- goody: string;
+ cost: number;
+ id: typePath;
};
type Category = {
@@ -33,8 +35,10 @@ type Category = {
type Info = {
can_override: BooleanLike;
- time_left: number;
+ time_left: string | null;
supplies: Category[];
+ no_link: BooleanLike;
+ id_inside: BooleanLike;
};
const CooldownEstimate = (props) => {
@@ -54,45 +58,60 @@ const CooldownEstimate = (props) => {
);
};
-export const DepartmentOrders = (props) => {
+export const DepartmentOrderContent = (props) => {
const { data } = useBackend();
- const { time_left } = data;
+ const { no_link, time_left } = data;
+ if (!data) {
+ return null;
+ }
+
+ if (no_link) {
+ return
-
- {(!!time_left &&
-
-
-
-
- As employees of Nanotrasen, the selection of orders here are
- completely free of charge, only incurring a cooldown on the
- service. Cheaper items will make you wait for less time
- before Nanotrasen allows another purchase, to encourage
- tasteful spending.
-
-
-
-
-
-
-
- )}
-
-
+
+
+
+
+
+ As employees of Nanotrasen, the selection of orders here are
+ completely free of charge, only incurring a cooldown on the
+ service. Cheaper items will make you wait for less time before
+ Nanotrasen allows another purchase, to encourage tasteful
+ spending.
+
+
+
+
+
+
+
+ );
+};
+
+export const NtosDeptOrder = () => {
+ return (
+
+
+
+
);
};
-const CooldownDimmer = (props) => {
+const CooldownDimmer = () => {
const { act, data } = useBackend();
const { can_override, time_left } = data;
return (
-
Ready for another order in {time_left}...
@@ -119,7 +138,31 @@ const CooldownDimmer = (props) => {
);
};
-const DepartmentCatalog = (props) => {
+const NoLinkDimmer = () => {
+ const { act, data } = useBackend();
+ const { id_inside } = data;
+ return (
+
+
+
+
+
+
+
+ Unlinked!
+
+
+ act('link')}>
+ Please insert a silver Head of Staff ID and press to continue.
+
+
+
+
+ );
+};
+
+const DepartmentCatalog = () => {
const { act, data } = useBackend();
const { supplies } = data;
const [tabCategory, setTabCategory] = useState(supplies[0]);
diff --git a/tgui/packages/tgui/interfaces/QuantumConsole.tsx b/tgui/packages/tgui/interfaces/QuantumConsole.tsx
index 8730220dff14..162d1d316e4d 100644
--- a/tgui/packages/tgui/interfaces/QuantumConsole.tsx
+++ b/tgui/packages/tgui/interfaces/QuantumConsole.tsx
@@ -28,6 +28,8 @@ type Data =
ready: BooleanLike;
retries_left: number;
scanner_tier: number;
+ broadcasting: BooleanLike;
+ broadcasting_on_cd: BooleanLike;
}
| {
connected: 0;
@@ -108,11 +110,13 @@ const AccessView = (props) => {
const {
available_domains = [],
+ broadcasting,
+ broadcasting_on_cd,
generated_domain,
- ready,
occupants,
points,
randomized,
+ ready,
} = data;
const sorted = available_domains.sort((a, b) => a.cost - b.cost);
@@ -132,6 +136,15 @@ const AccessView = (props) => {
+ act('broadcast')}
+ tooltip="Toggles whether you broadcast your
+ bitrun to station Entertainment Monitors."
+ >
+ Broadcast
+
0 || points < 1 || !!generated_domain
@@ -139,7 +152,8 @@ const AccessView = (props) => {
icon="random"
onClick={() => act('random_domain')}
mr={1}
- tooltip="Get a random domain for more rewards. Weighted towards your current points. Minimum: 1 point."
+ tooltip="Get a random domain for more rewards.
+ Weighted towards your current points. Minimum: 1 point."
>
Randomize
diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx
index 9ac2ebdcb59b..aff026da0e16 100644
--- a/tgui/packages/tgui/interfaces/StripMenu.tsx
+++ b/tgui/packages/tgui/interfaces/StripMenu.tsx
@@ -72,6 +72,11 @@ const ALTERNATE_ACTIONS: Record = {
icon: 'tshirt',
text: 'Adjust jumpsuit',
},
+
+ adjust_sensor: {
+ icon: 'microchip',
+ text: 'Adjust sensors',
+ },
};
const SLOTS: Record<
@@ -236,7 +241,7 @@ type StripMenuItem =
| {
icon: string;
name: string;
- alternate?: string;
+ alternate?: string[];
}
| {
obscured: ObscuringLevel;
@@ -283,18 +288,13 @@ export const StripMenu = (props) => {
const item = data.items[keyAtSpot];
const slot = SLOTS[keyAtSpot];
- let alternateAction: AlternateAction | undefined;
-
- let content;
- let tooltip;
+ let content: JSX.Element | undefined;
+ let alternateActions: JSX.Element[] | undefined;
+ let tooltip: string | undefined;
if (item === null) {
tooltip = slot.displayName;
} else if ('name' in item) {
- if (item.alternate) {
- alternateAction = ALTERNATE_ACTIONS[item.alternate];
- }
-
content = (
{
);
tooltip = item.name;
+ if (item.alternate) {
+ alternateActions = item.alternate.map(
+ (alternateKey, idx) => {
+ const alternateAction =
+ ALTERNATE_ACTIONS[alternateKey];
+
+ const alternateActionStyle = {
+ background: 'rgba(0, 0, 0, 0.6)',
+ position: 'absolute',
+ overflow: 'hidden',
+ margin: '0px',
+ maxWidth: '22px', // yes I know its not 20 or 25; they look bad. 22px is perfect
+ zIndex: '2',
+ left: `${idx === 0 ? '0' : undefined}`,
+ right: `${idx === 1 ? '0' : undefined}`,
+ bottom: '0',
+ };
+ return (
+ {
+ act('alt', {
+ key: keyAtSpot,
+ alternate_action: alternateKey,
+ });
+ }}
+ tooltip={alternateAction.text}
+ style={alternateActionStyle}
+ >
+
+ );
+ },
+ );
+ }
} else if ('obscured' in item) {
content = (
{
{slot.additionalComponent}
-
- {alternateAction !== undefined && (
- {
- act('alt', {
- key: keyAtSpot,
- });
- }}
- tooltip={alternateAction.text}
- style={{
- background: 'rgba(0, 0, 0, 0.6)',
- position: 'absolute',
- bottom: '0',
- right: '0',
- zIndex: '2',
- }}
- >
-
- )}
+ {alternateActions}
);
diff --git a/tgui/packages/tgui/interfaces/Vending.tsx b/tgui/packages/tgui/interfaces/Vending.tsx
index d3e9071a8f26..9c1e958c9795 100644
--- a/tgui/packages/tgui/interfaces/Vending.tsx
+++ b/tgui/packages/tgui/interfaces/Vending.tsx
@@ -1,20 +1,21 @@
import { classes } from 'common/react';
import { capitalizeAll } from 'common/string';
import { useState } from 'react';
-import { useBackend } from 'tgui/backend';
+
+import { createSearch } from '../../common/string';
+import { useBackend } from '../backend';
import {
Box,
Button,
+ DmIcon,
Icon,
+ Input,
LabeledList,
NoticeBox,
Section,
Stack,
Table,
-} from 'tgui/components';
-
-import { createSearch } from '../../common/string';
-import { Input } from '../components';
+} from '../components';
import { Window } from '../layouts';
type VendingData = {
@@ -45,6 +46,8 @@ type ProductRecord = {
max_amount: number;
ref: string;
category: string;
+ icon?: string;
+ icon_state?: string;
};
type CoinRecord = ProductRecord & {
@@ -288,20 +291,22 @@ const VendingRow = (props) => {
(discount ? redPrice : product.price) > user?.cash);
return (
-
-
+
+
- {capitalizeAll(product.name)}
-
+
+ {capitalizeAll(product.name)}
+
+
{!!productStock?.colorable && (
-
+
-
+
{
const ProductImage = (props) => {
const { product } = props;
- return product.img ? (
-
+ {product.img ? (
+
);
};
@@ -347,6 +362,7 @@ const ProductColorSelect = (props) => {
act('select_colors', { ref: product.ref })}
/>
diff --git a/tgui/packages/tgui/process.ts b/tgui/packages/tgui/process.ts
new file mode 100644
index 000000000000..62b992d16fbd
--- /dev/null
+++ b/tgui/packages/tgui/process.ts
@@ -0,0 +1,17 @@
+import { marked } from 'marked';
+
+import { sanitizeText } from './sanitize';
+
+export const processedText = (value) => {
+ const textHtml = {
+ __html: sanitizeText(
+ marked(value, {
+ breaks: true,
+ smartypants: true,
+ smartLists: true,
+ baseUrl: 'thisshouldbreakhttp',
+ }),
+ ),
+ };
+ return textHtml;
+};
diff --git a/tools/UpdatePaths/Scripts/84819_replace_flat_white_catwalks.txt b/tools/UpdatePaths/Scripts/84819_replace_flat_white_catwalks.txt
new file mode 100644
index 000000000000..3d957e815f42
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/84819_replace_flat_white_catwalks.txt
@@ -0,0 +1,5 @@
+# replaces redundant flat_white catwalk tiles with iron_white
+
+/turf/open/floor/catwalk_floor/flat_white : /turf/open/floor/catwalk_floor/iron_white{@OLD}
+/turf/open/floor/catwalk_floor/flat_white/@SUBTYPES : /turf/open/floor/catwalk_floor/iron_white/@SUBTYPES{@OLD}
+/obj/item/stack/tile/catwalk_tile/flat_white : /obj/item/stack/tile/catwalk_tile/iron_white{@OLD}
"
- else
- dat+="None"
- else
- dat+="Apart from some uninteresting classified ads, there's nothing on this page..."
- if(scribble_page == curr_page)
- dat+="