@@ -58,7 +58,7 @@ const PaperPublishing = (props) => {
label="File (required)"
buttons={
}
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitContent.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitContent.tsx
index 91502644faade..24aab8eba74bc 100644
--- a/tgui/packages/tgui/interfaces/Orbit/OrbitContent.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitContent.tsx
@@ -15,7 +15,7 @@ type ContentSection = {
/**
* The primary content display for points of interest.
- * Renders a scrollable section replete collapsibles for each
+ * Renders a scrollable section replete with collapsibles for each
* observable group.
*/
export function OrbitContent(props) {
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx
index e162848bfc8fc..2361470e40bbe 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx
@@ -211,6 +211,7 @@ function QuirkPopper(props: QuirkPopperProps) {
placement="bottom-end"
onClickOutside={() => setCustomizationExpanded(false)}
isOpen={customizationExpanded}
+ baseZIndex={1}
content={
{!!customization_options && hasExpandableCustomization && (
diff --git a/tgui/packages/tgui/interfaces/QuantumConsole.tsx b/tgui/packages/tgui/interfaces/QuantumConsole.tsx
index 356a9eba99355..2a4da8cdac21c 100644
--- a/tgui/packages/tgui/interfaces/QuantumConsole.tsx
+++ b/tgui/packages/tgui/interfaces/QuantumConsole.tsx
@@ -1,6 +1,4 @@
import { BooleanLike } from 'common/react';
-
-import { useBackend, useSharedState } from '../backend';
import {
Button,
Collapsible,
@@ -12,7 +10,9 @@ import {
Table,
Tabs,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend, useSharedState } from '../backend';
import { TableCell, TableRow } from '../components/Table';
import { Window } from '../layouts';
import { LoadingScreen } from './common/LoadingToolbox';
diff --git a/tgui/packages/tgui/interfaces/Secrets.jsx b/tgui/packages/tgui/interfaces/Secrets.jsx
index ebd0b998d2c28..a0896ec750722 100644
--- a/tgui/packages/tgui/interfaces/Secrets.jsx
+++ b/tgui/packages/tgui/interfaces/Secrets.jsx
@@ -301,13 +301,13 @@ const FunTab = (props) => {
/>
-
- Your admin button here, coder!
-
+ content="Mass Heal everyone"
+ onClick={() => act('mass_heal')}
+ />
diff --git a/tgui/packages/tgui/interfaces/TankDispenser.jsx b/tgui/packages/tgui/interfaces/TankDispenser.jsx
deleted file mode 100644
index ea94a5f3148c1..0000000000000
--- a/tgui/packages/tgui/interfaces/TankDispenser.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useBackend } from '../backend';
-import { Button, LabeledList, Section } from '../components';
-import { Window } from '../layouts';
-
-export const TankDispenser = (props) => {
- const { act, data } = useBackend();
- return (
-
-
-
-
- act('plasma')}
- />
- }
- >
- {data.plasma}
-
- act('oxygen')}
- />
- }
- >
- {data.oxygen}
-
-
-
-
-
- );
-};
diff --git a/tgui/packages/tgui/interfaces/Vending.tsx b/tgui/packages/tgui/interfaces/Vending.tsx
index 2f8cd42dade95..6db6ec962d309 100644
--- a/tgui/packages/tgui/interfaces/Vending.tsx
+++ b/tgui/packages/tgui/interfaces/Vending.tsx
@@ -1,7 +1,6 @@
import { classes } from 'common/react';
import { capitalizeAll } from 'common/string';
import { useState } from 'react';
-import { useBackend } from 'tgui/backend';
import {
Box,
Button,
@@ -11,8 +10,10 @@ import {
Section,
Stack,
Table,
-} from 'tgui/components';
-import { Window } from 'tgui/layouts';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
+import { Window } from '../layouts';
type VendingData = {
onstation: boolean;
diff --git a/tgui/packages/tgui/interfaces/VotePanel.tsx b/tgui/packages/tgui/interfaces/VotePanel.tsx
index 2cb9c91ff8249..949751f2226db 100644
--- a/tgui/packages/tgui/interfaces/VotePanel.tsx
+++ b/tgui/packages/tgui/interfaces/VotePanel.tsx
@@ -1,6 +1,4 @@
import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -11,7 +9,9 @@ import {
NoticeBox,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
enum VoteConfig {
diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
index efe74af8123b0..a9ab77fac4526 100644
--- a/tgui/packages/tgui/package.json
+++ b/tgui/packages/tgui/package.json
@@ -16,6 +16,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-popper": "^2.3.0",
+ "tgui-core": "^1.0.18",
"tgui-dev-server": "workspace:*",
"tgui-polyfill": "workspace:*"
}
diff --git a/tgui/webpack.config.js b/tgui/webpack.config.js
index fa1782eb073b2..6ff3d1bf4a06a 100644
--- a/tgui/webpack.config.js
+++ b/tgui/webpack.config.js
@@ -60,7 +60,7 @@ module.exports = (env = {}, argv) => {
],
},
{
- test: /\.scss$/,
+ test: /\.(s)?css$/,
use: [
{
loader: ExtractCssPlugin.loader,
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index 1caeb0d24e853..5421adc80571b 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -8281,6 +8281,16 @@ __metadata:
languageName: unknown
linkType: soft
+"tgui-core@npm:^1.0.18":
+ version: 1.0.18
+ resolution: "tgui-core@npm:1.0.18"
+ peerDependencies:
+ react: ^18.2.0
+ react-dom: ^18.2.0
+ checksum: 10c0/f5fa9078649ba0aa052116cd3ecbbb3a38113e9c32e6875c233d074f38db6abdb4dbfc3fb846d3cd125d4572eaf999988a082c1650b94ae429ace90e56deaca9
+ languageName: node
+ linkType: hard
+
"tgui-dev-server@workspace:*, tgui-dev-server@workspace:packages/tgui-dev-server":
version: 0.0.0-use.local
resolution: "tgui-dev-server@workspace:packages/tgui-dev-server"
@@ -8389,6 +8399,7 @@ __metadata:
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
react-popper: "npm:^2.3.0"
+ tgui-core: "npm:^1.0.18"
tgui-dev-server: "workspace:*"
tgui-polyfill: "workspace:*"
languageName: unknown
diff --git a/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt b/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt
index 34c4c581f5266..bfedeb2406c31 100644
--- a/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt
+++ b/tools/UpdatePaths/Scripts/74651_apc_to_apc_helpers.txt
@@ -35,4 +35,4 @@
/obj/machinery/power/apc/@SUBTYPES{cell_type = /obj/item/stock_parts/cell/upgraded/plus} : @OLD{@OLD;cell_type=@SKIP}, /obj/effect/mapping_helpers/apc/cell_5k
/obj/machinery/power/apc/@SUBTYPES{cell_type = /obj/item/stock_parts/cell/high} : @OLD{@OLD;cell_type=@SKIP}, /obj/effect/mapping_helpers/apc/cell_10k
/obj/machinery/power/apc/@SUBTYPES{start_charge = 100} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/full_charge
-/obj/machinery/power/apc/@SUBTYPES{start_charge = 0} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/no_charge
\ No newline at end of file
+/obj/machinery/power/apc/@SUBTYPES{start_charge = 0} : @OLD{@OLD;start_charge=@SKIP}, /obj/effect/mapping_helpers/apc/no_charge
diff --git a/tools/UpdatePaths/Scripts/83861_firebots.txt b/tools/UpdatePaths/Scripts/83861_firebots.txt
new file mode 100644
index 0000000000000..152220c38b2d3
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/83861_firebots.txt
@@ -0,0 +1 @@
+/mob/living/simple_animal/bot/firebot/@SUBTYPES : /mob/living/basic/bot/firebot/@SUBTYPES{@OLD}
\ No newline at end of file
diff --git a/tools/UpdatePaths/Scripts/84079_cell_updates.txt b/tools/UpdatePaths/Scripts/84079_cell_updates.txt
new file mode 100644
index 0000000000000..ac792704f1baf
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/84079_cell_updates.txt
@@ -0,0 +1,2 @@
+/obj/item/stock_parts/cell : /obj/item/stock_parts/power_store/cell{@OLD}
+/obj/item/stock_parts/cell/@SUBTYPES : /obj/item/stock_parts/power_store/cell/@SUBTYPES{@OLD}
diff --git a/tools/UpdatePaths/Scripts/84143_vibebots.txt b/tools/UpdatePaths/Scripts/84143_vibebots.txt
new file mode 100644
index 0000000000000..e5474e517e350
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/84143_vibebots.txt
@@ -0,0 +1 @@
+/mob/living/simple_animal/bot/secbot/vibebot/@SUBTYPES : /mob/living/basic/bot/vibebot/@SUBTYPES{@OLD}
\ No newline at end of file
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index 8436073fe97cb..c78e8fecf7c87 100644
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -287,7 +287,7 @@ if [ "$pcre2_support" -eq 1 ]; then
st=1
fi
part "datum stockpart sanity"
- if $grep -P 'for\b.*/obj/item/stock_parts/(?!cell)(?![\w_]+ in )' $code_files; then
+ if $grep -P 'for\b.*/obj/item/stock_parts/(?!power_store)(?![\w_]+ in )' $code_files; then
echo
echo -e "${RED}ERROR: Should be using datum/stock_part instead"
st=1
diff --git a/tools/ci/od_lints.dm b/tools/ci/od_lints.dm
index e339f5acb2d72..710a13e2492c7 100644
--- a/tools/ci/od_lints.dm
+++ b/tools/ci/od_lints.dm
@@ -12,7 +12,6 @@
#pragma SoftReservedKeyword error
#pragma DuplicateVariable error
#pragma DuplicateProcDefinition error
-#pragma TooManyArguments error
#pragma PointlessParentCall error
#pragma PointlessBuiltinCall error
#pragma SuspiciousMatrixCall error
diff --git a/tools/maplint/lints/telescreen_varedits.yml b/tools/maplint/lints/telescreen_varedits.yml
new file mode 100644
index 0000000000000..37ea2d72b67c8
--- /dev/null
+++ b/tools/maplint/lints/telescreen_varedits.yml
@@ -0,0 +1,8 @@
+help: "Use the directional variants when possible."
+/obj/machinery/computer/security/telescreen:
+ banned_variables:
+ pixel_x:
+ pixel_y:
+ dir:
+ deny: [1, 2, 4, 8]
+ network: