Merge remote-tracking branch 'upstream/master' into Dispencer-UI-change

2025-12-09 16:07:40 +00:00 · 2021-01-08 00:29:05 +00:00
parent 00ed164a2c eeb4807d3f
commit e78b6a7b04
44 changed files with 401 additions and 310 deletions
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -3,7 +3,7 @@
  "name": "tgui-dev-server",
  "version": "4.2.0",
  "dependencies": {
-    "axios": "^0.19.2",
+    "axios": "^0.21.1",
    "common": "workspace:*",
    "esm": "^3.2.25",
    "glob": "^7.1.4",
--- a/tgui/packages/tgui/interfaces/Photocopier.js
+++ b/tgui/packages/tgui/interfaces/Photocopier.js
@@ -57,7 +57,6 @@ const Toner = (props, context) => {
      title="Toner"
      buttons={
        <Button
-          disabled={!current_toner}
          onClick={() => act('remove_toner')}
          icon="eject">
          Eject
--- a/tgui/public/tgui.bundle.js
+++ b/tgui/public/tgui.bundle.js