From d79c1fe0704034ec19e7ee6cbe86e5bbddb50b2c Mon Sep 17 00:00:00 2001
From: ShiftyRail <31417754+ShiftyRail@users.noreply.github.com>
Date: Mon, 12 May 2025 06:50:25 +0100
Subject: [PATCH] Byond 516 v2.0 (#37553)
* The TGS thing
* Revert the 516 revert
* Further segment the world/New() proc
* Fixes an issue here
---
.github/workflows/ci.yml | 4 +-
.vscode/tasks.json | 9 +
__DEFINES/_macros.dm | 3 +
__DEFINES/cooldowns.dm | 6 +
__DEFINES/planes+layers.dm | 2 +-
__DEFINES/qdel.dm | 3 +
__DEFINES/setup.dm | 2 +-
__DEFINES/tgui.dm | 12 +
.../components/binary_devices/MSGS.dm | 6 +-
code/__HELPERS/cmp.dm | 3 +
code/__HELPERS/datum.dm | 1 +
code/__HELPERS/files.dm | 20 +
code/__HELPERS/icons.dm | 61 +
code/__HELPERS/math/ray/ray.dm | 38 +-
code/__HELPERS/math/ray/rayCastHit.dm | 4 +-
code/__HELPERS/math/ray/rayCastHitInfo.dm | 6 +-
code/__HELPERS/math/ray/ray_test_procs.dm | 4 +-
code/__HELPERS/math/vector/vector.dm | 58 +-
code/__HELPERS/math/vector/vector_procs.dm | 40 +-
code/__HELPERS/sorts/TimSort.dm | 2 +-
code/__HELPERS/text.dm | 11 +
code/__HELPERS/unsorted.dm | 5 +
code/_onclick/click.dm | 3 +
code/controllers/configuration.dm | 14 +
code/controllers/subsystem/assets.dm | 42 +
code/controllers/subsystem/init/assets.dm | 16 -
.../subsystem/init/persistence_misc.dm | 34 +-
code/controllers/subsystem/tgui.dm | 103 +-
code/controllers/subsystem/timer.dm | 2 +-
.../endgame/scoreboard/misc_score.dm | 4 +-
.../endgame/scoreboard/scoreboard.dm | 16 +-
code/game/gamemodes/highscores.dm | 26 +-
code/game/machinery/computer/camera.dm | 4 +-
code/game/machinery/computer/message.dm | 12 +-
code/game/machinery/computer/robot.dm | 30 +-
code/game/machinery/newscaster.dm | 2 +-
code/game/mecha/mecha_control_console.dm | 23 +-
.../objects/items/devices/PDA/PDA_types.dm | 4 +-
.../items/devices/PDA/apps/messenger.dm | 2 +-
.../objects/items/devices/PDA/cart/misc.dm | 2 +-
code/game/objects/items/devices/pcmc.dm | 6 +-
code/modules/admin/verbs/debug.dm | 3 +-
.../modules/asset_cache/asset_cache_client.dm | 53 +
code/modules/asset_cache/asset_cache_item.dm | 51 +
code/modules/asset_cache/asset_list.dm | 225 +
code/modules/asset_cache/assets/tgfont.dm | 6 +
code/modules/asset_cache/assets/tgui.dm | 35 +
code/modules/asset_cache/font_awesome.dm | 8 +
code/modules/asset_cache/icon_ref_map.dm | 28 +
code/modules/asset_cache/readme.md | 37 +
.../asset_cache/transports/asset_transport.dm | 171 +
.../transports/webroot_transport.dm | 87 +
code/modules/asset_cache/validate_assets.html | 29 +
code/modules/client/client defines.dm | 3 +
code/modules/client/client procs.dm | 23 +-
code/modules/client/global cache.dm | 26 +-
code/modules/client/preferences.dm | 9 +
.../mob/living/silicon/pai/software.dm | 2 +-
.../hostile/giant_spider/base_spider.dm | 2 +-
.../mob/living/simple_animal/hostile/grue.dm | 2 +-
code/modules/nano/nanoexternal.dm | 4 +-
code/modules/nano/nanomanager.dm | 70 +-
code/modules/organs/internal/eyes/eyes.dm | 4 +
code/modules/paperwork/paper.dm | 2 +-
code/modules/paperwork/photography.dm | 2 +-
code/modules/projectiles/projectile/beams.dm | 24 +-
.../reagent_containers/food/drinks.dm | 6 +-
code/modules/telesci/gps.dm | 3 +
code/modules/tgui/external.dm | 35 +-
code/modules/tgui/states.dm | 17 +-
code/modules/tgui/states/admin.dm | 19 +-
code/modules/tgui/states/debug.dm | 2 +-
code/modules/tgui/states/default.dm | 9 +-
code/modules/tgui/states/greyscale_menu.dm | 14 +
code/modules/tgui/states/hands.dm | 2 +-
code/modules/tgui/states/hold_or_view.dm | 12 +
code/modules/tgui/states/language_menu.dm | 21 +
code/modules/tgui/states/new_player.dm | 7 +-
code/modules/tgui/states/not_incapacitated.dm | 3 +-
code/modules/tgui/states/notcontained.dm | 3 +
code/modules/tgui/states/standing.dm | 15 +
code/modules/tgui/status_composers.dm | 32 +-
code/modules/tgui/tgui.dm | 77 +-
code/modules/tgui/tgui_alert.dm | 164 -
code/modules/tgui/tgui_input_list.dm | 186 -
code/modules/tgui/tgui_window.dm | 161 +-
code/modules/tgui_input/alert.dm | 142 +
code/modules/tgui_input/checkboxes.dm | 140 +
code/modules/tgui_input/keycombo.dm | 127 +
code/modules/tgui_input/list.dm | 160 +
code/modules/tgui_input/number.dm | 163 +
code/modules/tgui_input/text.dm | 166 +
code/modules/unit_tests/highscores.dm | 42 +-
code/modules/unit_tests/ray.dm | 22 +-
code/modules/unit_tests/vector.dm | 32 +-
code/tgs_event_handler.dm | 41 +
code/world.dm | 56 +-
dependencies.sh | 6 +-
goon/code/datums/browserOutput.dm | 3 +-
html/browser/chem_master.css | 2 +-
html/browser/common.css | 2 +-
html/browser/smartfridge.css | 4 +-
html/font-awesome/README.MD | 8 +-
html/font-awesome/css/all.min.css | 5 +-
html/font-awesome/css/v4-shims.min.css | 5 +-
html/font-awesome/webfonts/fa-regular-400.eot | Bin 34388 -> 0 bytes
html/font-awesome/webfonts/fa-regular-400.ttf | Bin 0 -> 68064 bytes
.../font-awesome/webfonts/fa-regular-400.woff | Bin 16804 -> 0 bytes
html/font-awesome/webfonts/fa-solid-900.eot | Bin 192116 -> 0 bytes
html/font-awesome/webfonts/fa-solid-900.ttf | Bin 0 -> 426112 bytes
html/font-awesome/webfonts/fa-solid-900.woff | Bin 98020 -> 0 bytes
.../webfonts/fa-v4compatibility.ttf | Bin 0 -> 10836 bytes
icons/blanks/32x32.dmi | Bin 0 -> 216 bytes
icons/blanks/96x96.dmi | Bin 0 -> 222 bytes
icons/blanks/blank_title.png | Bin 0 -> 181 bytes
tgui/.eslintignore | 13 +-
tgui/.eslintrc-sonar.yml | 27 +-
tgui/.eslintrc.yml | 82 +-
tgui/.gitignore | 7 +-
tgui/.prettierignore | 20 +
tgui/.prettierrc.yml | 16 +-
.../@yarnpkg/plugin-interactive-tools.cjs | 363 -
tgui/.yarn/releases/yarn-3.3.1.cjs | 823 -
tgui/.yarn/releases/yarn-4.8.1.cjs | 935 +
tgui/.yarn/sdks/eslint/bin/eslint.js | 4 +-
tgui/.yarn/sdks/eslint/lib/api.js | 10 +-
tgui/.yarn/sdks/eslint/lib/unsupported-api.js | 20 +
tgui/.yarn/sdks/eslint/package.json | 12 +-
tgui/.yarn/sdks/prettier/bin/prettier.cjs | 20 +
tgui/.yarn/sdks/prettier/index.cjs | 20 +
tgui/.yarn/sdks/prettier/package.json | 7 +
tgui/.yarn/sdks/typescript/bin/tsc | 4 +-
tgui/.yarn/sdks/typescript/bin/tsserver | 4 +-
tgui/.yarn/sdks/typescript/lib/tsc.js | 4 +-
tgui/.yarn/sdks/typescript/lib/tsserver.js | 96 +-
.../sdks/typescript/lib/tsserverlibrary.js | 96 +-
tgui/.yarn/sdks/typescript/lib/typescript.js | 10 +-
tgui/.yarn/sdks/typescript/package.json | 8 +-
tgui/.yarnrc.yml | 18 +-
tgui/LICENSE | 7 -
tgui/README.md | 157 +-
tgui/babel.config.js | 43 -
tgui/docs/chat-embedded-components.md | 82 +
tgui/docs/component-reference.md | 372 +-
tgui/docs/converting-old-tgui-interfaces.md | 2 +-
tgui/docs/state-usage.md | 30 +
tgui/docs/tgui-for-custom-html-popups.md | 281 +
tgui/docs/tutorial-and-examples.md | 4 +-
tgui/docs/writing-tests.md | 6 +-
tgui/global.d.ts | 105 +-
tgui/jest.config.js | 17 -
tgui/package.json | 82 +-
tgui/packages/common/collections.spec.ts | 22 +-
tgui/packages/common/collections.ts | 292 +-
tgui/packages/common/color.js | 67 -
tgui/packages/common/events.js | 42 -
tgui/packages/common/exhaustive.ts | 19 -
tgui/packages/common/fp.js | 47 -
tgui/packages/common/keycodes.js | 86 -
tgui/packages/common/math.ts | 100 -
tgui/packages/common/package.json | 5 +-
tgui/packages/common/{perf.js => perf.ts} | 52 +-
tgui/packages/common/react.spec.ts | 20 -
tgui/packages/common/react.ts | 76 -
tgui/packages/common/redux.js | 153 -
tgui/packages/common/redux.test.ts | 70 +
tgui/packages/common/redux.ts | 196 +
tgui/packages/common/storage.js | 195 -
tgui/packages/common/storage.ts | 131 +
tgui/packages/common/string.babel-plugin.cjs | 73 -
tgui/packages/common/string.js | 162 -
tgui/packages/common/timer.js | 38 -
tgui/packages/common/types.ts | 1 +
tgui/packages/common/uuid.js | 19 -
tgui/packages/common/vector.js | 48 -
tgui/packages/common/vector.ts | 51 +
tgui/packages/tgfont/README_ICON_TUTORIAL.txt | 13 +
tgui/packages/tgfont/config.cjs | 4 +
tgui/packages/tgfont/icons/bad-touch.svg | 61 +-
tgui/packages/tgfont/icons/non-binary.svg | 53 +-
.../packages/tgfont/icons/prosthetic-full.svg | 27 +
tgui/packages/tgfont/icons/prosthetic-leg.svg | 53 +-
tgui/packages/tgfont/icons/syndicate-logo.svg | 16 +-
tgui/packages/tgfont/mkdist.cjs | 3 +-
tgui/packages/tgfont/package.json | 2 +-
tgui/packages/tgfont/static/tgfont.css | 15 +-
tgui/packages/tgfont/static/tgfont.eot | Bin 4040 -> 4288 bytes
tgui/packages/tgfont/static/tgfont.woff2 | Bin 1824 -> 1980 bytes
tgui/packages/tgui-bench/entrypoint.tsx | 7 +-
tgui/packages/tgui-bench/index.js | 8 +-
tgui/packages/tgui-bench/lib/benchmark.d.ts | 2 +-
tgui/packages/tgui-bench/lib/benchmark.js | 1 +
tgui/packages/tgui-bench/package.json | 17 +-
.../packages/tgui-bench/tests/Button.test.tsx | 99 -
.../tgui-bench/tests/DisposalUnit.test.tsx | 27 +
tgui/packages/tgui-bench/tests/Flex.test.tsx | 18 -
tgui/packages/tgui-bench/tests/Stack.test.tsx | 18 -
.../tgui-bench/tests/Tooltip.test.tsx | 20 -
tgui/packages/tgui-dev-server/dreamseeker.js | 95 +-
tgui/packages/tgui-dev-server/index.js | 8 +-
tgui/packages/tgui-dev-server/link/client.cjs | 177 -
tgui/packages/tgui-dev-server/link/client.mjs | 169 +
tgui/packages/tgui-dev-server/link/retrace.js | 37 +-
tgui/packages/tgui-dev-server/link/server.js | 85 +-
tgui/packages/tgui-dev-server/logging.js | 40 +-
tgui/packages/tgui-dev-server/package.json | 13 +-
tgui/packages/tgui-dev-server/reloader.js | 59 +-
tgui/packages/tgui-dev-server/require.js | 2 +-
tgui/packages/tgui-dev-server/util.js | 28 +-
tgui/packages/tgui-dev-server/webpack.js | 40 +-
tgui/packages/tgui-dev-server/winreg.js | 39 +-
tgui/packages/tgui-panel/Notifications.js | 41 -
tgui/packages/tgui-panel/Notifications.tsx | 28 +
.../tgui-panel/{Panel.js => Panel.tsx} | 76 +-
.../tgui-panel/audio/NowPlayingWidget.js | 68 -
.../tgui-panel/audio/NowPlayingWidget.jsx | 111 +
.../tgui-panel/audio/{hooks.js => hooks.ts} | 9 +-
.../tgui-panel/audio/{index.js => index.ts} | 0
tgui/packages/tgui-panel/audio/middleware.js | 4 +-
tgui/packages/tgui-panel/audio/player.js | 117 -
tgui/packages/tgui-panel/audio/player.ts | 101 +
.../audio/{reducer.js => reducer.ts} | 0
.../{ping/selectors.js => audio/selectors.ts} | 2 +-
.../tgui-panel/chat/ChatPageSettings.js | 75 -
.../tgui-panel/chat/ChatPageSettings.jsx | 157 +
.../chat/{ChatPanel.js => ChatPanel.jsx} | 44 +-
.../chat/{ChatTabs.js => ChatTabs.jsx} | 49 +-
tgui/packages/tgui-panel/chat/actions.js | 4 +
.../chat/{constants.js => constants.ts} | 25 +-
.../tgui-panel/chat/{index.js => index.ts} | 0
tgui/packages/tgui-panel/chat/middleware.js | 136 -
tgui/packages/tgui-panel/chat/middleware.ts | 210 +
tgui/packages/tgui-panel/chat/model.js | 48 +-
.../chat/{reducer.js => reducer.ts} | 101 +-
.../chat/{renderer.js => renderer.jsx} | 357 +-
.../tgui-panel/chat/replaceInTextNode.js | 122 +-
tgui/packages/tgui-panel/chat/selectors.js | 21 -
tgui/packages/tgui-panel/chat/selectors.ts | 17 +
tgui/packages/tgui-panel/chat/types.ts | 9 +
.../game/{actions.js => actions.ts} | 0
.../game/{constants.js => constants.ts} | 2 +-
tgui/packages/tgui-panel/game/hooks.js | 12 -
tgui/packages/tgui-panel/game/hooks.ts | 13 +
.../tgui-panel/game/{index.js => index.ts} | 0
tgui/packages/tgui-panel/game/middleware.js | 25 +-
.../game/{reducer.js => reducer.ts} | 2 +-
.../{audio/selectors.js => game/selectors.ts} | 2 +-
.../tgui-panel/{index.js => index.tsx} | 90 +-
tgui/packages/tgui-panel/package.json | 15 +-
.../{panelFocus.js => panelFocus.ts} | 21 +-
.../packages/tgui-panel/ping/PingIndicator.js | 31 -
.../tgui-panel/ping/PingIndicator.tsx | 28 +
tgui/packages/tgui-panel/ping/actions.js | 25 -
tgui/packages/tgui-panel/ping/actions.ts | 25 +
.../ping/{constants.js => constants.ts} | 1 -
.../tgui-panel/ping/{index.js => index.ts} | 0
tgui/packages/tgui-panel/ping/middleware.js | 35 +-
.../ping/{reducer.js => reducer.ts} | 34 +-
.../{game/selectors.js => ping/selectors.ts} | 2 +-
tgui/packages/tgui-panel/reconnect.tsx | 40 +
.../tgui-panel/settings/SettingsGeneral.tsx | 218 +
.../tgui-panel/settings/SettingsPanel.js | 195 -
.../tgui-panel/settings/SettingsPanel.tsx | 53 +
.../tgui-panel/settings/SettingsStatPanel.tsx | 84 +
.../tgui-panel/settings/TextHighlight.tsx | 186 +
tgui/packages/tgui-panel/settings/actions.js | 13 -
tgui/packages/tgui-panel/settings/actions.ts | 34 +
.../settings/{constants.js => constants.ts} | 14 +-
tgui/packages/tgui-panel/settings/hooks.js | 20 -
tgui/packages/tgui-panel/settings/hooks.ts | 21 +
.../settings/{index.js => index.ts} | 0
.../tgui-panel/settings/middleware.js | 57 -
.../tgui-panel/settings/middleware.ts | 148 +
tgui/packages/tgui-panel/settings/model.ts | 20 +
tgui/packages/tgui-panel/settings/reducer.js | 76 -
tgui/packages/tgui-panel/settings/reducer.ts | 227 +
tgui/packages/tgui-panel/settings/scaling.ts | 57 +
.../packages/tgui-panel/settings/selectors.js | 8 -
.../packages/tgui-panel/settings/selectors.ts | 12 +
.../tgui-panel/settings/settingsImExport.ts | 55 +
.../tgui-panel/styles/components/Chat.scss | 28 +-
.../styles/components/Notifications.scss | 6 +-
.../tgui-panel/styles/components/Ping.scss | 20 +-
.../styles/components/UnreadCount.scss | 12 +
.../tgui-panel/styles/goon/chat-dark.scss | 887 -
.../tgui-panel/styles/goon/chat-light.scss | 925 -
tgui/packages/tgui-panel/styles/main.scss | 45 +-
.../tgui-panel/styles/tgchat/chat-dark.scss | 1271 +
.../tgui-panel/styles/tgchat/chat-light.scss | 1252 +
.../tgui-panel/styles/themes/light.scss | 83 +-
tgui/packages/tgui-panel/telemetry.js | 40 +-
tgui/packages/tgui-panel/themes.js | 134 -
tgui/packages/tgui-panel/themes.ts | 97 +
tgui/packages/tgui-polyfill/css-om.js | 44 -
tgui/packages/tgui-polyfill/dom4.js | 970 -
tgui/packages/tgui-polyfill/html5shiv.js | 330 -
tgui/packages/tgui-polyfill/ie8.js | 836 -
tgui/packages/tgui-polyfill/index.js | 17 -
tgui/packages/tgui-polyfill/inferno.js | 10 -
tgui/packages/tgui-polyfill/package.json | 10 -
.../packages/tgui-say/ChannelIterator.test.ts | 51 +
tgui/packages/tgui-say/ChannelIterator.ts | 50 +
tgui/packages/tgui-say/ChatHistory.test.ts | 52 +
tgui/packages/tgui-say/ChatHistory.ts | 59 +
tgui/packages/tgui-say/TguiSay.tsx | 328 +
tgui/packages/tgui-say/constants.ts | 34 +
tgui/packages/tgui-say/helpers.ts | 75 +
tgui/packages/tgui-say/index.tsx | 16 +
tgui/packages/tgui-say/package.json | 17 +
tgui/packages/tgui-say/styles/colors.scss | 43 +
tgui/packages/tgui-say/styles/main.scss | 45 +
tgui/packages/tgui-say/styles/styles.scss | 107 +
tgui/packages/tgui-say/timers.ts | 22 +
tgui/packages/tgui-setup/helpers.js | 521 +
tgui/packages/tgui-setup/ntos-error.css | 112 +
tgui/packages/tgui-setup/package.json | 14 +
tgui/packages/tgui/App.tsx | 14 +
tgui/packages/tgui/Icons.tsx | 30 +
tgui/packages/tgui/assets.js | 39 -
tgui/packages/tgui/assets.ts | 45 +
tgui/packages/tgui/assets/bg-cat.svg | 24 +
.../tgui/assets/bg-spookycomp-compressed.svg | 1 +
.../tgui/assets/bg-spookycomp-raw.svg | 485 +
tgui/packages/tgui/assets/bg-spookycomp.svg | 32 +
.../assets/bg-synthsunset-c-grid-size.svg | 49 +
.../tgui/assets/bg-synthsunset-c-grid.svg | 49 +
tgui/packages/tgui/backend.ts | 342 +-
.../tgui/components/AnimatedNumber.js | 83 -
tgui/packages/tgui/components/Autofocus.tsx | 19 -
tgui/packages/tgui/components/Blink.js | 65 -
tgui/packages/tgui/components/BlockQuote.js | 20 -
tgui/packages/tgui/components/Box.tsx | 286 -
tgui/packages/tgui/components/Button.js | 309 -
tgui/packages/tgui/components/ByondUi.js | 144 -
tgui/packages/tgui/components/Chart.js | 126 -
tgui/packages/tgui/components/Collapsible.js | 57 -
tgui/packages/tgui/components/ColorBox.js | 34 -
tgui/packages/tgui/components/Dimmer.js | 24 -
tgui/packages/tgui/components/Divider.js | 24 -
.../tgui/components/DraggableControl.js | 313 -
tgui/packages/tgui/components/Dropdown.js | 163 -
tgui/packages/tgui/components/FitText.tsx | 89 -
tgui/packages/tgui/components/Flex.tsx | 127 -
tgui/packages/tgui/components/Grid.js | 39 -
tgui/packages/tgui/components/Icon.js | 83 -
.../packages/tgui/components/InfinitePlane.js | 208 -
tgui/packages/tgui/components/Input.js | 161 -
tgui/packages/tgui/components/KeyListener.tsx | 39 -
tgui/packages/tgui/components/Knob.js | 146 -
.../tgui/components/LabeledControls.js | 55 -
tgui/packages/tgui/components/LabeledList.tsx | 117 -
tgui/packages/tgui/components/Modal.js | 30 -
tgui/packages/tgui/components/NoticeBox.js | 34 -
tgui/packages/tgui/components/NumberInput.js | 286 -
tgui/packages/tgui/components/Popper.tsx | 84 -
tgui/packages/tgui/components/ProgressBar.js | 66 -
tgui/packages/tgui/components/RoundGauge.js | 126 -
tgui/packages/tgui/components/Section.tsx | 89 -
tgui/packages/tgui/components/Slider.js | 135 -
tgui/packages/tgui/components/Stack.tsx | 78 -
tgui/packages/tgui/components/Table.js | 78 -
tgui/packages/tgui/components/Tabs.js | 81 -
tgui/packages/tgui/components/TextArea.js | 170 -
tgui/packages/tgui/components/TimeDisplay.js | 63 -
tgui/packages/tgui/components/Tooltip.tsx | 145 -
.../tgui/components/TrackOutsideClicks.tsx | 38 -
tgui/packages/tgui/components/index.js | 45 -
tgui/packages/tgui/constants.js | 284 -
tgui/packages/tgui/constants.test.ts | 77 +
tgui/packages/tgui/constants.ts | 370 +
tgui/packages/tgui/debug/KitchenSink.js | 62 -
tgui/packages/tgui/debug/KitchenSink.tsx | 60 +
.../tgui/debug/{actions.js => actions.ts} | 0
tgui/packages/tgui/debug/hooks.js | 10 -
tgui/packages/tgui/debug/hooks.ts | 12 +
.../tgui/debug/{index.js => index.ts} | 0
.../debug/{middleware.js => middleware.ts} | 54 +-
.../tgui/debug/{reducer.js => reducer.ts} | 11 +-
tgui/packages/tgui/debug/selectors.js | 7 -
tgui/packages/tgui/debug/selectors.ts | 9 +
tgui/packages/tgui/drag.js | 254 -
tgui/packages/tgui/drag.ts | 306 +
tgui/packages/tgui/events.js | 228 -
tgui/packages/tgui/{focus.js => focus.ts} | 2 +-
tgui/packages/tgui/format.js | 206 -
tgui/packages/tgui/hotkeys.ts | 218 -
tgui/packages/tgui/http.ts | 17 -
tgui/packages/tgui/index.js | 84 -
tgui/packages/tgui/index.tsx | 75 +
.../packages/tgui/interfaces/CameraConsole.js | 158 -
.../tgui/interfaces/CameraConsole.tsx | 233 +
.../tgui/interfaces/ChooseReligion.js | 308 -
.../tgui/interfaces/ChooseReligion.tsx | 376 +
.../packages/tgui/interfaces/DisposalUnit.jsx | 70 +
.../tgui/interfaces/{Gps.js => Gps.tsx} | 33 +-
.../tgui/interfaces/{MSGS.js => MSGS.tsx} | 54 +-
...trolConsole.js => MechaControlConsole.tsx} | 52 +-
.../tgui/interfaces/{Merch.js => Merch.tsx} | 41 +-
.../tgui/interfaces/{PCMC.js => PCMC.tsx} | 122 +-
.../{PowerMonitor.js => PowerMonitor.tsx} | 222 +-
...lConsole.js => RoboticsControlConsole.tsx} | 63 +-
...eraConsole.js => SpessTVCameraConsole.tsx} | 0
.../tgui/interfaces/{TEG.js => TEG.tsx} | 22 +-
.../tgui/interfaces/{Uplink.js => Uplink.tsx} | 136 +-
.../tgui/interfaces/common/LoadingScreen.tsx | 35 +
tgui/packages/tgui/layouts/Layout.js | 59 -
tgui/packages/tgui/layouts/Layout.tsx | 74 +
tgui/packages/tgui/layouts/NtosWindow.js | 132 -
tgui/packages/tgui/layouts/NtosWindow.tsx | 164 +
tgui/packages/tgui/layouts/Pane.js | 62 -
tgui/packages/tgui/layouts/Pane.tsx | 58 +
tgui/packages/tgui/layouts/TitleBar.tsx | 83 +
tgui/packages/tgui/layouts/Window.js | 225 -
tgui/packages/tgui/layouts/Window.tsx | 177 +
.../tgui/layouts/{index.js => index.ts} | 0
tgui/packages/tgui/links.test.ts | 85 +
tgui/packages/tgui/{links.js => links.ts} | 17 +-
tgui/packages/tgui/logging.js | 60 -
tgui/packages/tgui/logging.ts | 68 +
tgui/packages/tgui/package.json | 26 +-
tgui/packages/tgui/process.ts | 17 +
tgui/packages/tgui/renderer.ts | 67 +-
tgui/packages/tgui/routes.js | 77 -
tgui/packages/tgui/routes.tsx | 104 +
tgui/packages/tgui/sanitize.js | 49 -
tgui/packages/tgui/sanitize.test.ts | 44 +
tgui/packages/tgui/sanitize.ts | 82 +
tgui/packages/tgui/store.js | 98 -
tgui/packages/tgui/store.ts | 111 +
.../{Blink.stories.js => Blink.stories.tsx} | 10 +-
...uote.stories.js => BlockQuote.stories.tsx} | 7 +-
tgui/packages/tgui/stories/Box.stories.js | 43 -
tgui/packages/tgui/stories/Box.stories.tsx | 27 +
tgui/packages/tgui/stories/Button.stories.js | 82 -
tgui/packages/tgui/stories/Button.stories.tsx | 67 +
tgui/packages/tgui/stories/ByondUi.stories.js | 62 -
.../packages/tgui/stories/ByondUi.stories.tsx | 68 +
...ble.stories.js => Collapsible.stories.tsx} | 13 +-
tgui/packages/tgui/stories/Flex.stories.js | 80 -
tgui/packages/tgui/stories/Flex.stories.tsx | 68 +
.../{Input.stories.js => Input.stories.tsx} | 59 +-
.../tgui/stories/LabeledList.stories.tsx | 73 +
tgui/packages/tgui/stories/Popper.stories.js | 46 -
.../tgui/stories/ProgressBar.stories.js | 61 -
.../tgui/stories/ProgressBar.stories.tsx | 54 +
.../{Stack.stories.js => Stack.stories.tsx} | 50 +-
...Storage.stories.js => Storage.stories.tsx} | 21 +-
tgui/packages/tgui/stories/Tabs.stories.js | 124 -
tgui/packages/tgui/stories/Tabs.stories.tsx | 152 +
.../{Themes.stories.js => Themes.stories.tsx} | 13 +-
...Tooltip.stories.js => Tooltip.stories.tsx} | 35 +-
tgui/packages/tgui/stories/common.js | 22 -
tgui/packages/tgui/stories/common.tsx | 19 +
.../tgui/styles/atomic/candystripe.scss | 9 +-
tgui/packages/tgui/styles/atomic/color.scss | 13 +-
.../tgui/styles/atomic/debug-layout.scss | 10 +-
.../packages/tgui/styles/atomic/fit-text.scss | 6 +-
tgui/packages/tgui/styles/atomic/links.scss | 26 +-
tgui/packages/tgui/styles/atomic/outline.scss | 8 +-
tgui/packages/tgui/styles/base.scss | 15 +-
tgui/packages/tgui/styles/colors.scss | 116 +-
.../tgui/styles/components/BlockQuote.scss | 20 -
.../tgui/styles/components/Button.scss | 136 -
.../tgui/styles/components/ColorBox.scss | 12 -
.../tgui/styles/components/Dimmer.scss | 21 -
.../tgui/styles/components/Divider.scss | 27 -
.../tgui/styles/components/Dropdown.scss | 80 -
.../packages/tgui/styles/components/Flex.scss | 31 -
.../packages/tgui/styles/components/Icon.scss | 26 -
.../tgui/styles/components/Input.scss | 68 -
.../packages/tgui/styles/components/Knob.scss | 129 -
.../tgui/styles/components/LabeledList.scss | 49 -
.../tgui/styles/components/Modal.scss | 14 -
.../tgui/styles/components/NoticeBox.scss | 71 -
.../tgui/styles/components/NumberInput.scss | 76 -
.../tgui/styles/components/ProgressBar.scss | 61 -
.../tgui/styles/components/RoundGauge.scss | 83 -
.../tgui/styles/components/Section.scss | 123 -
.../tgui/styles/components/Slider.scss | 54 -
.../tgui/styles/components/Stack.scss | 35 -
.../tgui/styles/components/Table.scss | 44 -
.../packages/tgui/styles/components/Tabs.scss | 141 -
.../tgui/styles/components/TextArea.scss | 63 -
.../tgui/styles/components/Tooltip.scss | 24 -
tgui/packages/tgui/styles/css-variables.scss | 13 +
tgui/packages/tgui/styles/functions.scss | 60 +-
.../tgui/styles/interfaces/AlertModal.scss | 8 +-
.../tgui/styles/interfaces/Changelog.scss | 2 +-
.../tgui/styles/interfaces/CrewManifest.scss | 34 +-
.../styles/interfaces/DetectiveBoard.scss | 233 +
.../tgui/styles/interfaces/Emojipedia.scss | 8 +
.../interfaces/ExperimentConfigure.scss | 28 +-
.../tgui/styles/interfaces/Fabricator.scss | 209 +
.../tgui/styles/interfaces/HellishRunes.scss | 4 +-
.../tgui/styles/interfaces/HotKeysHelp.scss | 4 +
.../tgui/styles/interfaces/Hypertorus.scss | 158 +
.../styles/interfaces/IntegratedCircuit.scss | 110 +-
.../tgui/styles/interfaces/LibraryAdmin.scss | 18 +
.../styles/interfaces/LibraryComputer.scss | 11 +
.../tgui/styles/interfaces/ListInput.scss | 33 +-
.../tgui/styles/interfaces/Mecha.scss | 41 +
.../tgui/styles/interfaces/NtosMessenger.scss | 101 +
.../tgui/styles/interfaces/NtosNotepad.scss | 38 +
.../tgui/styles/interfaces/NuclearBomb.scss | 82 +-
.../tgui/styles/interfaces/Orbit.scss | 19 +
.../styles/interfaces/PreferencesMenu.scss | 121 +-
.../styles/interfaces/RequestManager.scss | 95 +-
.../tgui/styles/interfaces/Roulette.scss | 16 +-
.../packages/tgui/styles/interfaces/Safe.scss | 42 +-
.../tgui/styles/interfaces/Techweb.scss | 58 +-
.../tgui/styles/interfaces/Trophycase.scss | 5 +
.../tgui/styles/interfaces/Uplink.scss | 103 +
tgui/packages/tgui/styles/layouts/Layout.scss | 38 +-
.../tgui/styles/layouts/NtosHeader.scss | 28 +
.../tgui/styles/layouts/NtosWindow.scss | 8 +-
.../tgui/styles/layouts/TitleBar.scss | 174 +-
tgui/packages/tgui/styles/layouts/Window.scss | 58 +-
tgui/packages/tgui/styles/main.scss | 59 +-
tgui/packages/tgui/styles/reset.scss | 29 +-
.../packages/tgui/styles/themes/abductor.scss | 61 +-
tgui/packages/tgui/styles/themes/admin.scss | 38 +-
.../tgui/styles/themes/cardtable.scss | 55 +-
.../tgui/styles/themes/hackerman.scss | 58 +-
.../tgui/styles/themes/malfunction.scss | 61 +-
tgui/packages/tgui/styles/themes/neutral.scss | 49 +-
tgui/packages/tgui/styles/themes/ntOS95.scss | 127 +
tgui/packages/tgui/styles/themes/ntos.scss | 37 +-
.../packages/tgui/styles/themes/ntos_cat.scss | 52 +
.../tgui/styles/themes/ntos_darkmode.scss | 17 +
.../tgui/styles/themes/ntos_lightmode.scss | 25 +
.../tgui/styles/themes/ntos_spooky.scss | 22 +
.../tgui/styles/themes/ntos_synth.scss | 68 +
.../tgui/styles/themes/ntos_terminal.scss | 77 +
tgui/packages/tgui/styles/themes/paper.scss | 104 +-
tgui/packages/tgui/styles/themes/retro.scss | 80 +-
.../tgui/styles/themes/spookyconsole.scss | 22 +
.../tgui/styles/themes/syndicate.scss | 60 +-
tgui/packages/tgui/styles/themes/wizard.scss | 71 +-
tgui/public/helpers.min.js | 1 +
tgui/public/ntos-error.min.css | 1 +
tgui/public/tgui-panel.bundle.css | 3 +-
tgui/public/tgui-panel.bundle.js | 2 +-
tgui/public/tgui.bundle.css | 13 +-
tgui/public/tgui.bundle.js | 2 +-
tgui/public/tgui.html | 603 +-
tgui/rspack.config.cjs | 197 +
tgui/tsconfig.json | 11 +-
tgui/vitest.config.mts | 13 +
tgui/webpack.config.js | 173 -
tgui/yarn.lock | 22782 ++++++++++++----
tools/changelog/ss13_genchangelog.py | 2 +-
vgstation13.dme | 21 +-
552 files changed, 37857 insertions(+), 26434 deletions(-)
create mode 100644 __DEFINES/cooldowns.dm
create mode 100644 code/controllers/subsystem/assets.dm
delete mode 100644 code/controllers/subsystem/init/assets.dm
create mode 100644 code/modules/asset_cache/asset_cache_client.dm
create mode 100644 code/modules/asset_cache/asset_cache_item.dm
create mode 100644 code/modules/asset_cache/asset_list.dm
create mode 100644 code/modules/asset_cache/assets/tgfont.dm
create mode 100644 code/modules/asset_cache/assets/tgui.dm
create mode 100644 code/modules/asset_cache/font_awesome.dm
create mode 100644 code/modules/asset_cache/icon_ref_map.dm
create mode 100644 code/modules/asset_cache/readme.md
create mode 100644 code/modules/asset_cache/transports/asset_transport.dm
create mode 100644 code/modules/asset_cache/transports/webroot_transport.dm
create mode 100644 code/modules/asset_cache/validate_assets.html
create mode 100644 code/modules/tgui/states/greyscale_menu.dm
create mode 100644 code/modules/tgui/states/hold_or_view.dm
create mode 100644 code/modules/tgui/states/language_menu.dm
create mode 100644 code/modules/tgui/states/standing.dm
delete mode 100644 code/modules/tgui/tgui_alert.dm
delete mode 100644 code/modules/tgui/tgui_input_list.dm
create mode 100644 code/modules/tgui_input/alert.dm
create mode 100644 code/modules/tgui_input/checkboxes.dm
create mode 100644 code/modules/tgui_input/keycombo.dm
create mode 100644 code/modules/tgui_input/list.dm
create mode 100644 code/modules/tgui_input/number.dm
create mode 100644 code/modules/tgui_input/text.dm
create mode 100644 code/tgs_event_handler.dm
delete mode 100644 html/font-awesome/webfonts/fa-regular-400.eot
create mode 100644 html/font-awesome/webfonts/fa-regular-400.ttf
delete mode 100644 html/font-awesome/webfonts/fa-regular-400.woff
delete mode 100644 html/font-awesome/webfonts/fa-solid-900.eot
create mode 100644 html/font-awesome/webfonts/fa-solid-900.ttf
delete mode 100644 html/font-awesome/webfonts/fa-solid-900.woff
create mode 100644 html/font-awesome/webfonts/fa-v4compatibility.ttf
create mode 100644 icons/blanks/32x32.dmi
create mode 100644 icons/blanks/96x96.dmi
create mode 100644 icons/blanks/blank_title.png
create mode 100644 tgui/.prettierignore
delete mode 100644 tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
delete mode 100755 tgui/.yarn/releases/yarn-3.3.1.cjs
create mode 100644 tgui/.yarn/releases/yarn-4.8.1.cjs
create mode 100644 tgui/.yarn/sdks/eslint/lib/unsupported-api.js
create mode 100644 tgui/.yarn/sdks/prettier/bin/prettier.cjs
create mode 100644 tgui/.yarn/sdks/prettier/index.cjs
create mode 100644 tgui/.yarn/sdks/prettier/package.json
delete mode 100644 tgui/LICENSE
delete mode 100644 tgui/babel.config.js
create mode 100644 tgui/docs/chat-embedded-components.md
create mode 100644 tgui/docs/state-usage.md
create mode 100644 tgui/docs/tgui-for-custom-html-popups.md
delete mode 100644 tgui/jest.config.js
delete mode 100644 tgui/packages/common/color.js
delete mode 100644 tgui/packages/common/events.js
delete mode 100644 tgui/packages/common/exhaustive.ts
delete mode 100644 tgui/packages/common/fp.js
delete mode 100644 tgui/packages/common/keycodes.js
delete mode 100644 tgui/packages/common/math.ts
rename tgui/packages/common/{perf.js => perf.ts} (50%)
delete mode 100644 tgui/packages/common/react.spec.ts
delete mode 100644 tgui/packages/common/react.ts
delete mode 100644 tgui/packages/common/redux.js
create mode 100644 tgui/packages/common/redux.test.ts
create mode 100644 tgui/packages/common/redux.ts
delete mode 100644 tgui/packages/common/storage.js
create mode 100644 tgui/packages/common/storage.ts
delete mode 100644 tgui/packages/common/string.babel-plugin.cjs
delete mode 100644 tgui/packages/common/string.js
delete mode 100644 tgui/packages/common/timer.js
delete mode 100644 tgui/packages/common/uuid.js
delete mode 100644 tgui/packages/common/vector.js
create mode 100644 tgui/packages/common/vector.ts
create mode 100644 tgui/packages/tgfont/README_ICON_TUTORIAL.txt
create mode 100644 tgui/packages/tgfont/icons/prosthetic-full.svg
delete mode 100644 tgui/packages/tgui-bench/tests/Button.test.tsx
create mode 100644 tgui/packages/tgui-bench/tests/DisposalUnit.test.tsx
delete mode 100644 tgui/packages/tgui-bench/tests/Flex.test.tsx
delete mode 100644 tgui/packages/tgui-bench/tests/Stack.test.tsx
delete mode 100644 tgui/packages/tgui-bench/tests/Tooltip.test.tsx
delete mode 100644 tgui/packages/tgui-dev-server/link/client.cjs
create mode 100644 tgui/packages/tgui-dev-server/link/client.mjs
delete mode 100644 tgui/packages/tgui-panel/Notifications.js
create mode 100644 tgui/packages/tgui-panel/Notifications.tsx
rename tgui/packages/tgui-panel/{Panel.js => Panel.tsx} (61%)
delete mode 100644 tgui/packages/tgui-panel/audio/NowPlayingWidget.js
create mode 100644 tgui/packages/tgui-panel/audio/NowPlayingWidget.jsx
rename tgui/packages/tgui-panel/audio/{hooks.js => hooks.ts} (51%)
rename tgui/packages/tgui-panel/audio/{index.js => index.ts} (100%)
delete mode 100644 tgui/packages/tgui-panel/audio/player.js
create mode 100644 tgui/packages/tgui-panel/audio/player.ts
rename tgui/packages/tgui-panel/audio/{reducer.js => reducer.ts} (100%)
rename tgui/packages/tgui-panel/{ping/selectors.js => audio/selectors.ts} (57%)
delete mode 100644 tgui/packages/tgui-panel/chat/ChatPageSettings.js
create mode 100644 tgui/packages/tgui-panel/chat/ChatPageSettings.jsx
rename tgui/packages/tgui-panel/chat/{ChatPanel.js => ChatPanel.jsx} (57%)
rename tgui/packages/tgui-panel/chat/{ChatTabs.js => ChatTabs.jsx} (50%)
rename tgui/packages/tgui-panel/chat/{constants.js => constants.ts} (78%)
rename tgui/packages/tgui-panel/chat/{index.js => index.ts} (100%)
delete mode 100644 tgui/packages/tgui-panel/chat/middleware.js
create mode 100644 tgui/packages/tgui-panel/chat/middleware.ts
rename tgui/packages/tgui-panel/chat/{reducer.js => reducer.ts} (59%)
rename tgui/packages/tgui-panel/chat/{renderer.js => renderer.jsx} (55%)
delete mode 100644 tgui/packages/tgui-panel/chat/selectors.js
create mode 100644 tgui/packages/tgui-panel/chat/selectors.ts
create mode 100644 tgui/packages/tgui-panel/chat/types.ts
rename tgui/packages/tgui-panel/game/{actions.js => actions.ts} (100%)
rename tgui/packages/tgui-panel/game/{constants.js => constants.ts} (61%)
delete mode 100644 tgui/packages/tgui-panel/game/hooks.js
create mode 100644 tgui/packages/tgui-panel/game/hooks.ts
rename tgui/packages/tgui-panel/game/{index.js => index.ts} (100%)
rename tgui/packages/tgui-panel/game/{reducer.js => reducer.ts} (94%)
rename tgui/packages/tgui-panel/{audio/selectors.js => game/selectors.ts} (58%)
rename tgui/packages/tgui-panel/{index.js => index.tsx} (54%)
rename tgui/packages/tgui-panel/{panelFocus.js => panelFocus.ts} (60%)
delete mode 100644 tgui/packages/tgui-panel/ping/PingIndicator.js
create mode 100644 tgui/packages/tgui-panel/ping/PingIndicator.tsx
delete mode 100644 tgui/packages/tgui-panel/ping/actions.js
create mode 100644 tgui/packages/tgui-panel/ping/actions.ts
rename tgui/packages/tgui-panel/ping/{constants.js => constants.ts} (87%)
rename tgui/packages/tgui-panel/ping/{index.js => index.ts} (100%)
rename tgui/packages/tgui-panel/ping/{reducer.js => reducer.ts} (56%)
rename tgui/packages/tgui-panel/{game/selectors.js => ping/selectors.ts} (58%)
create mode 100644 tgui/packages/tgui-panel/reconnect.tsx
create mode 100644 tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
delete mode 100644 tgui/packages/tgui-panel/settings/SettingsPanel.js
create mode 100644 tgui/packages/tgui-panel/settings/SettingsPanel.tsx
create mode 100644 tgui/packages/tgui-panel/settings/SettingsStatPanel.tsx
create mode 100644 tgui/packages/tgui-panel/settings/TextHighlight.tsx
delete mode 100644 tgui/packages/tgui-panel/settings/actions.js
create mode 100644 tgui/packages/tgui-panel/settings/actions.ts
rename tgui/packages/tgui-panel/settings/{constants.js => constants.ts} (67%)
delete mode 100644 tgui/packages/tgui-panel/settings/hooks.js
create mode 100644 tgui/packages/tgui-panel/settings/hooks.ts
rename tgui/packages/tgui-panel/settings/{index.js => index.ts} (100%)
delete mode 100644 tgui/packages/tgui-panel/settings/middleware.js
create mode 100644 tgui/packages/tgui-panel/settings/middleware.ts
create mode 100644 tgui/packages/tgui-panel/settings/model.ts
delete mode 100644 tgui/packages/tgui-panel/settings/reducer.js
create mode 100644 tgui/packages/tgui-panel/settings/reducer.ts
create mode 100644 tgui/packages/tgui-panel/settings/scaling.ts
delete mode 100644 tgui/packages/tgui-panel/settings/selectors.js
create mode 100644 tgui/packages/tgui-panel/settings/selectors.ts
create mode 100644 tgui/packages/tgui-panel/settings/settingsImExport.ts
create mode 100644 tgui/packages/tgui-panel/styles/components/UnreadCount.scss
delete mode 100644 tgui/packages/tgui-panel/styles/goon/chat-dark.scss
delete mode 100644 tgui/packages/tgui-panel/styles/goon/chat-light.scss
create mode 100644 tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
create mode 100644 tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
delete mode 100644 tgui/packages/tgui-panel/themes.js
create mode 100644 tgui/packages/tgui-panel/themes.ts
delete mode 100644 tgui/packages/tgui-polyfill/css-om.js
delete mode 100644 tgui/packages/tgui-polyfill/dom4.js
delete mode 100644 tgui/packages/tgui-polyfill/html5shiv.js
delete mode 100644 tgui/packages/tgui-polyfill/ie8.js
delete mode 100644 tgui/packages/tgui-polyfill/index.js
delete mode 100644 tgui/packages/tgui-polyfill/inferno.js
delete mode 100644 tgui/packages/tgui-polyfill/package.json
create mode 100644 tgui/packages/tgui-say/ChannelIterator.test.ts
create mode 100644 tgui/packages/tgui-say/ChannelIterator.ts
create mode 100644 tgui/packages/tgui-say/ChatHistory.test.ts
create mode 100644 tgui/packages/tgui-say/ChatHistory.ts
create mode 100644 tgui/packages/tgui-say/TguiSay.tsx
create mode 100644 tgui/packages/tgui-say/constants.ts
create mode 100644 tgui/packages/tgui-say/helpers.ts
create mode 100644 tgui/packages/tgui-say/index.tsx
create mode 100644 tgui/packages/tgui-say/package.json
create mode 100644 tgui/packages/tgui-say/styles/colors.scss
create mode 100644 tgui/packages/tgui-say/styles/main.scss
create mode 100644 tgui/packages/tgui-say/styles/styles.scss
create mode 100644 tgui/packages/tgui-say/timers.ts
create mode 100644 tgui/packages/tgui-setup/helpers.js
create mode 100644 tgui/packages/tgui-setup/ntos-error.css
create mode 100644 tgui/packages/tgui-setup/package.json
create mode 100644 tgui/packages/tgui/App.tsx
create mode 100644 tgui/packages/tgui/Icons.tsx
delete mode 100644 tgui/packages/tgui/assets.js
create mode 100644 tgui/packages/tgui/assets.ts
create mode 100644 tgui/packages/tgui/assets/bg-cat.svg
create mode 100644 tgui/packages/tgui/assets/bg-spookycomp-compressed.svg
create mode 100644 tgui/packages/tgui/assets/bg-spookycomp-raw.svg
create mode 100644 tgui/packages/tgui/assets/bg-spookycomp.svg
create mode 100644 tgui/packages/tgui/assets/bg-synthsunset-c-grid-size.svg
create mode 100644 tgui/packages/tgui/assets/bg-synthsunset-c-grid.svg
delete mode 100644 tgui/packages/tgui/components/AnimatedNumber.js
delete mode 100644 tgui/packages/tgui/components/Autofocus.tsx
delete mode 100644 tgui/packages/tgui/components/Blink.js
delete mode 100644 tgui/packages/tgui/components/BlockQuote.js
delete mode 100644 tgui/packages/tgui/components/Box.tsx
delete mode 100644 tgui/packages/tgui/components/Button.js
delete mode 100644 tgui/packages/tgui/components/ByondUi.js
delete mode 100644 tgui/packages/tgui/components/Chart.js
delete mode 100644 tgui/packages/tgui/components/Collapsible.js
delete mode 100644 tgui/packages/tgui/components/ColorBox.js
delete mode 100644 tgui/packages/tgui/components/Dimmer.js
delete mode 100644 tgui/packages/tgui/components/Divider.js
delete mode 100644 tgui/packages/tgui/components/DraggableControl.js
delete mode 100644 tgui/packages/tgui/components/Dropdown.js
delete mode 100644 tgui/packages/tgui/components/FitText.tsx
delete mode 100644 tgui/packages/tgui/components/Flex.tsx
delete mode 100644 tgui/packages/tgui/components/Grid.js
delete mode 100644 tgui/packages/tgui/components/Icon.js
delete mode 100644 tgui/packages/tgui/components/InfinitePlane.js
delete mode 100644 tgui/packages/tgui/components/Input.js
delete mode 100644 tgui/packages/tgui/components/KeyListener.tsx
delete mode 100644 tgui/packages/tgui/components/Knob.js
delete mode 100644 tgui/packages/tgui/components/LabeledControls.js
delete mode 100644 tgui/packages/tgui/components/LabeledList.tsx
delete mode 100644 tgui/packages/tgui/components/Modal.js
delete mode 100644 tgui/packages/tgui/components/NoticeBox.js
delete mode 100644 tgui/packages/tgui/components/NumberInput.js
delete mode 100644 tgui/packages/tgui/components/Popper.tsx
delete mode 100644 tgui/packages/tgui/components/ProgressBar.js
delete mode 100644 tgui/packages/tgui/components/RoundGauge.js
delete mode 100644 tgui/packages/tgui/components/Section.tsx
delete mode 100644 tgui/packages/tgui/components/Slider.js
delete mode 100644 tgui/packages/tgui/components/Stack.tsx
delete mode 100644 tgui/packages/tgui/components/Table.js
delete mode 100644 tgui/packages/tgui/components/Tabs.js
delete mode 100644 tgui/packages/tgui/components/TextArea.js
delete mode 100644 tgui/packages/tgui/components/TimeDisplay.js
delete mode 100644 tgui/packages/tgui/components/Tooltip.tsx
delete mode 100644 tgui/packages/tgui/components/TrackOutsideClicks.tsx
delete mode 100644 tgui/packages/tgui/components/index.js
delete mode 100644 tgui/packages/tgui/constants.js
create mode 100644 tgui/packages/tgui/constants.test.ts
create mode 100644 tgui/packages/tgui/constants.ts
delete mode 100644 tgui/packages/tgui/debug/KitchenSink.js
create mode 100644 tgui/packages/tgui/debug/KitchenSink.tsx
rename tgui/packages/tgui/debug/{actions.js => actions.ts} (100%)
delete mode 100644 tgui/packages/tgui/debug/hooks.js
create mode 100644 tgui/packages/tgui/debug/hooks.ts
rename tgui/packages/tgui/debug/{index.js => index.ts} (100%)
rename tgui/packages/tgui/debug/{middleware.js => middleware.ts} (57%)
rename tgui/packages/tgui/debug/{reducer.js => reducer.ts} (67%)
delete mode 100644 tgui/packages/tgui/debug/selectors.js
create mode 100644 tgui/packages/tgui/debug/selectors.ts
delete mode 100644 tgui/packages/tgui/drag.js
create mode 100644 tgui/packages/tgui/drag.ts
delete mode 100644 tgui/packages/tgui/events.js
rename tgui/packages/tgui/{focus.js => focus.ts} (90%)
delete mode 100644 tgui/packages/tgui/format.js
delete mode 100644 tgui/packages/tgui/hotkeys.ts
delete mode 100644 tgui/packages/tgui/http.ts
delete mode 100644 tgui/packages/tgui/index.js
create mode 100644 tgui/packages/tgui/index.tsx
delete mode 100644 tgui/packages/tgui/interfaces/CameraConsole.js
create mode 100644 tgui/packages/tgui/interfaces/CameraConsole.tsx
delete mode 100644 tgui/packages/tgui/interfaces/ChooseReligion.js
create mode 100644 tgui/packages/tgui/interfaces/ChooseReligion.tsx
create mode 100644 tgui/packages/tgui/interfaces/DisposalUnit.jsx
rename tgui/packages/tgui/interfaces/{Gps.js => Gps.tsx} (78%)
rename tgui/packages/tgui/interfaces/{MSGS.js => MSGS.tsx} (59%)
rename tgui/packages/tgui/interfaces/{MechaControlConsole.js => MechaControlConsole.tsx} (76%)
rename tgui/packages/tgui/interfaces/{Merch.js => Merch.tsx} (80%)
rename tgui/packages/tgui/interfaces/{PCMC.js => PCMC.tsx} (65%)
rename tgui/packages/tgui/interfaces/{PowerMonitor.js => PowerMonitor.tsx} (64%)
rename tgui/packages/tgui/interfaces/{RoboticsControlConsole.js => RoboticsControlConsole.tsx} (79%)
rename tgui/packages/tgui/interfaces/{SpessTVCameraConsole.js => SpessTVCameraConsole.tsx} (100%)
rename tgui/packages/tgui/interfaces/{TEG.js => TEG.tsx} (89%)
rename tgui/packages/tgui/interfaces/{Uplink.js => Uplink.tsx} (62%)
create mode 100644 tgui/packages/tgui/interfaces/common/LoadingScreen.tsx
delete mode 100644 tgui/packages/tgui/layouts/Layout.js
create mode 100644 tgui/packages/tgui/layouts/Layout.tsx
delete mode 100644 tgui/packages/tgui/layouts/NtosWindow.js
create mode 100644 tgui/packages/tgui/layouts/NtosWindow.tsx
delete mode 100644 tgui/packages/tgui/layouts/Pane.js
create mode 100644 tgui/packages/tgui/layouts/Pane.tsx
create mode 100644 tgui/packages/tgui/layouts/TitleBar.tsx
delete mode 100644 tgui/packages/tgui/layouts/Window.js
create mode 100644 tgui/packages/tgui/layouts/Window.tsx
rename tgui/packages/tgui/layouts/{index.js => index.ts} (100%)
create mode 100644 tgui/packages/tgui/links.test.ts
rename tgui/packages/tgui/{links.js => links.ts} (72%)
delete mode 100644 tgui/packages/tgui/logging.js
create mode 100644 tgui/packages/tgui/logging.ts
create mode 100644 tgui/packages/tgui/process.ts
delete mode 100644 tgui/packages/tgui/routes.js
create mode 100644 tgui/packages/tgui/routes.tsx
delete mode 100644 tgui/packages/tgui/sanitize.js
create mode 100644 tgui/packages/tgui/sanitize.test.ts
create mode 100644 tgui/packages/tgui/sanitize.ts
delete mode 100644 tgui/packages/tgui/store.js
create mode 100644 tgui/packages/tgui/store.ts
rename tgui/packages/tgui/stories/{Blink.stories.js => Blink.stories.tsx} (58%)
rename tgui/packages/tgui/stories/{BlockQuote.stories.js => BlockQuote.stories.tsx} (76%)
delete mode 100644 tgui/packages/tgui/stories/Box.stories.js
create mode 100644 tgui/packages/tgui/stories/Box.stories.tsx
delete mode 100644 tgui/packages/tgui/stories/Button.stories.js
create mode 100644 tgui/packages/tgui/stories/Button.stories.tsx
delete mode 100644 tgui/packages/tgui/stories/ByondUi.stories.js
create mode 100644 tgui/packages/tgui/stories/ByondUi.stories.tsx
rename tgui/packages/tgui/stories/{Collapsible.stories.js => Collapsible.stories.tsx} (57%)
delete mode 100644 tgui/packages/tgui/stories/Flex.stories.js
create mode 100644 tgui/packages/tgui/stories/Flex.stories.tsx
rename tgui/packages/tgui/stories/{Input.stories.js => Input.stories.tsx} (70%)
create mode 100644 tgui/packages/tgui/stories/LabeledList.stories.tsx
delete mode 100644 tgui/packages/tgui/stories/Popper.stories.js
delete mode 100644 tgui/packages/tgui/stories/ProgressBar.stories.js
create mode 100644 tgui/packages/tgui/stories/ProgressBar.stories.tsx
rename tgui/packages/tgui/stories/{Stack.stories.js => Stack.stories.tsx} (53%)
rename tgui/packages/tgui/stories/{Storage.stories.js => Storage.stories.tsx} (72%)
delete mode 100644 tgui/packages/tgui/stories/Tabs.stories.js
create mode 100644 tgui/packages/tgui/stories/Tabs.stories.tsx
rename tgui/packages/tgui/stories/{Themes.stories.js => Themes.stories.tsx} (65%)
rename tgui/packages/tgui/stories/{Tooltip.stories.js => Tooltip.stories.tsx} (54%)
delete mode 100644 tgui/packages/tgui/stories/common.js
create mode 100644 tgui/packages/tgui/stories/common.tsx
delete mode 100644 tgui/packages/tgui/styles/components/BlockQuote.scss
delete mode 100644 tgui/packages/tgui/styles/components/Button.scss
delete mode 100644 tgui/packages/tgui/styles/components/ColorBox.scss
delete mode 100644 tgui/packages/tgui/styles/components/Dimmer.scss
delete mode 100644 tgui/packages/tgui/styles/components/Divider.scss
delete mode 100644 tgui/packages/tgui/styles/components/Dropdown.scss
delete mode 100644 tgui/packages/tgui/styles/components/Flex.scss
delete mode 100644 tgui/packages/tgui/styles/components/Icon.scss
delete mode 100644 tgui/packages/tgui/styles/components/Input.scss
delete mode 100644 tgui/packages/tgui/styles/components/Knob.scss
delete mode 100644 tgui/packages/tgui/styles/components/LabeledList.scss
delete mode 100644 tgui/packages/tgui/styles/components/Modal.scss
delete mode 100644 tgui/packages/tgui/styles/components/NoticeBox.scss
delete mode 100644 tgui/packages/tgui/styles/components/NumberInput.scss
delete mode 100644 tgui/packages/tgui/styles/components/ProgressBar.scss
delete mode 100644 tgui/packages/tgui/styles/components/RoundGauge.scss
delete mode 100644 tgui/packages/tgui/styles/components/Section.scss
delete mode 100644 tgui/packages/tgui/styles/components/Slider.scss
delete mode 100644 tgui/packages/tgui/styles/components/Stack.scss
delete mode 100644 tgui/packages/tgui/styles/components/Table.scss
delete mode 100644 tgui/packages/tgui/styles/components/Tabs.scss
delete mode 100644 tgui/packages/tgui/styles/components/TextArea.scss
delete mode 100644 tgui/packages/tgui/styles/components/Tooltip.scss
create mode 100644 tgui/packages/tgui/styles/css-variables.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/DetectiveBoard.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/Emojipedia.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/Fabricator.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/HotKeysHelp.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/Hypertorus.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/LibraryAdmin.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/LibraryComputer.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/Mecha.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/NtosMessenger.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/NtosNotepad.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/Orbit.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/Trophycase.scss
create mode 100644 tgui/packages/tgui/styles/interfaces/Uplink.scss
create mode 100644 tgui/packages/tgui/styles/themes/ntOS95.scss
create mode 100644 tgui/packages/tgui/styles/themes/ntos_cat.scss
create mode 100644 tgui/packages/tgui/styles/themes/ntos_darkmode.scss
create mode 100644 tgui/packages/tgui/styles/themes/ntos_lightmode.scss
create mode 100644 tgui/packages/tgui/styles/themes/ntos_spooky.scss
create mode 100644 tgui/packages/tgui/styles/themes/ntos_synth.scss
create mode 100644 tgui/packages/tgui/styles/themes/ntos_terminal.scss
create mode 100644 tgui/packages/tgui/styles/themes/spookyconsole.scss
create mode 100644 tgui/public/helpers.min.js
create mode 100644 tgui/public/ntos-error.min.css
create mode 100644 tgui/rspack.config.cjs
create mode 100644 tgui/vitest.config.mts
delete mode 100644 tgui/webpack.config.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ac1639098e..427aff55d4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ on:
workflow_dispatch:
env:
- BYOND_MAJOR: 515
- BYOND_MINOR: 1603
+ BYOND_MAJOR: 516
+ BYOND_MINOR: 1659
#This can be declared here because build.py will ignore it if DM_UNIT_TESTS is true.
ALL_MAPS: tgstation metaclub defficiency packedstation roidstation test_tiny test_vault snaxi tgstation-sec tgstation-snow LampreyStation xoq synergy bagelstation lowfatbagel Dorfstation waystation line horizon wheelstation
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 3a28d0a346f..21a5f2b1c3f 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -89,6 +89,15 @@
],
"group": "build",
"label": "tgui: sonar"
+ },
+ {
+ "type": "npm",
+ "script": "install",
+ "path": "tgui",
+ "group": "clean",
+ "problemMatcher": [],
+ "label": "npm: install - tgui",
+ "detail": "install dependencies from package"
}
]
}
diff --git a/__DEFINES/_macros.dm b/__DEFINES/_macros.dm
index c492549e0c9..fad3dc9d8b6 100644
--- a/__DEFINES/_macros.dm
+++ b/__DEFINES/_macros.dm
@@ -439,3 +439,6 @@ var/global/list/visible_spaces = list(/turf/simulated/open, /turf/simulated/floo
#define OMNI_LINK(A,B) isliving(A) && A:omnitool_connect(B)
#define is_real_champion(A) ismob(A) && A.is_wearing_item(/obj/item/weapon/storage/belt/champion) && A.is_wearing_item(/obj/item/clothing/mask/luchador)
+
+// Call by name proc references, checks if the proc exists on either this type () (AND ONLY THIS TYPE) or as a global proc.
+#define PROC_REF(X) (nameof(.proc/##X))
diff --git a/__DEFINES/cooldowns.dm b/__DEFINES/cooldowns.dm
new file mode 100644
index 00000000000..2d678a60bdc
--- /dev/null
+++ b/__DEFINES/cooldowns.dm
@@ -0,0 +1,6 @@
+//Returns true if the cooldown has run its course, false otherwise
+#define COOLDOWN_FINISHED(cd_source, cd_index) (cd_source.cd_index <= world.time)
+
+#define COOLDOWN_TIMELEFT(cd_source, cd_index) (max(0, cd_source.cd_index - world.time))
+
+#define COOLDOWN_START(cd_source, cd_index, cd_time) (cd_source.cd_index = world.time + (cd_time))
diff --git a/__DEFINES/planes+layers.dm b/__DEFINES/planes+layers.dm
index 4ccc6d6e89f..989a087b326 100644
--- a/__DEFINES/planes+layers.dm
+++ b/__DEFINES/planes+layers.dm
@@ -368,7 +368,7 @@ var/obj/abstract/screen/plane_master/overdark_planemaster/overdark_planemaster =
appearance_flags = 0
plane = BASE_PLANE
mouse_opacity = 0
- screen_loc = "CENTER,CENTER"
+ screen_loc = "SOUTHWEST,SOUTHWEST"
render_source = "*overdark"
var/obj/abstract/screen/plane_master/overdark_planemaster_target/overdark_planemaster_target = new()
diff --git a/__DEFINES/qdel.dm b/__DEFINES/qdel.dm
index 7c62cb74936..8d8cb49f7f1 100644
--- a/__DEFINES/qdel.dm
+++ b/__DEFINES/qdel.dm
@@ -6,3 +6,6 @@
#define QDEL_LIST_ASSOC_NULL(L) QDEL_LIST_ASSOC(L); L = null
#define QDEL_LIST_CUT(L) QDEL_LIST(L); L.Cut()
#define QDEL_LIST_ASSOC_CUT(L) QDEL_LIST_ASSOC(L); L.Cut()
+
+// QDEL macros borrowed from TG
+#define QDELETED(X) (!X || X.gcDestroyed)
diff --git a/__DEFINES/setup.dm b/__DEFINES/setup.dm
index 6ea59399a38..81b432587be 100644
--- a/__DEFINES/setup.dm
+++ b/__DEFINES/setup.dm
@@ -1,5 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-#if DM_VERSION < 513
+#if DM_VERSION < 516
#error Your version of byond is too old, you need version 513 or higher
#endif
#define RUNWARNING // disable if they re-enable run() in 507 or newer.
diff --git a/__DEFINES/tgui.dm b/__DEFINES/tgui.dm
index a5a5940243c..8bbe9578da4 100644
--- a/__DEFINES/tgui.dm
+++ b/__DEFINES/tgui.dm
@@ -19,6 +19,9 @@
/// Maximum ping timeout allowed to detect zombie windows
#define TGUI_PING_TIMEOUT 4 SECONDS
+/// Used for rate-limiting to prevent DoS by excessively refreshing a TGUI window
+#define TGUI_REFRESH_FULL_UPDATE_COOLDOWN (1 SECONDS)
+
/// Window does not exist
#define TGUI_WINDOW_CLOSED 0
/// Window was just opened, but is still not ready to be sent data
@@ -38,3 +41,12 @@
#define TGUI_CREATE_MESSAGE(type, payload) ( \
"%7b%22type%22%3a%22[type]%22%2c%22payload%22%3a[url_encode(json_encode(payload))]%7d" \
)
+
+/**
+ * NAMEOF: Compile time checked variable name to string conversion
+ * evaluates to a string equal to "X", but compile errors if X isn't a var on datum.
+ **/
+#define NAMEOF(datum, X) (#X || ##datum.##X)
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
+#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X))
diff --git a/code/ATMOSPHERICS/components/binary_devices/MSGS.dm b/code/ATMOSPHERICS/components/binary_devices/MSGS.dm
index 6acb34ed9e5..034837fee21 100644
--- a/code/ATMOSPHERICS/components/binary_devices/MSGS.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/MSGS.dm
@@ -14,7 +14,7 @@
var/internal_volume = 10000
var/max_pressure = 10000
- var/target_pressure = 4500 //Output pressure.
+ var/target_pressure = 2500 //Output pressure.
var/datum/gas_mixture/air //Internal tank.
@@ -102,7 +102,7 @@
))
return data
-/obj/machinery/atmospherics/binary/msgs/ui_act(action, list/params)
+/obj/machinery/atmospherics/binary/msgs/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -110,9 +110,11 @@
if("toggle_power")
on = !on
update_icon()
+ SStgui.try_update_ui(ui.user, src, ui)
return TRUE
if("set_pressure")
target_pressure = round(clamp(text2num(params["new_pressure"]), 0, 4500))
+ SStgui.try_update_ui(ui.user, src, ui)
update_icon()
return TRUE
diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index 95940d35a9c..703ab5e0d7c 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -29,6 +29,9 @@ var/cmp_field = "name"
/proc/cmp_records_dsc(datum/data/record/a, datum/data/record/b)
return sorttext(a.fields[cmp_field], b.fields[cmp_field])
+/proc/cmp_records_numerically(datum/data/record/a, datum/data/record/b)
+ return b.fields[cmp_field] - a.fields[cmp_field]
+
/proc/cmp_ckey_asc(client/a, client/b)
return sorttext(b.ckey, a.ckey)
diff --git a/code/__HELPERS/datum.dm b/code/__HELPERS/datum.dm
index 51b8f29d72d..27a5980942b 100644
--- a/code/__HELPERS/datum.dm
+++ b/code/__HELPERS/datum.dm
@@ -1,6 +1,7 @@
/datum
var/list/datum_components
var/list/active_timers
+ var/list/open_uis
/datum/proc/initialize()
return TRUE
diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm
index 4e0076a64b5..409a76408f6 100644
--- a/code/__HELPERS/files.dm
+++ b/code/__HELPERS/files.dm
@@ -59,3 +59,23 @@
fileaccess_timer = world.time + FTPDELAY
return 0
#undef FTPDELAY
+
+// Similar to clamp but the bottom rolls around to the top and vice versa. min is inclusive, max is exclusive
+#define WRAP(val, min, max) clamp(( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ),min,max)
+
+
+/// Save file as an external file then md5 it.
+/// Used because md5ing files stored in the rsc sometimes gives incorrect md5 results.
+/// https://www.byond.com/forum/post/2611357
+/proc/md5asfile(file)
+ var/static/notch = 0
+ // its importaint this code can handle md5filepath sleeping instead of hard blocking, if it's converted to use rust_g.
+ var/filename = "tmp/md5asfile.[world.realtime].[world.timeofday].[world.time].[world.tick_usage].[notch]"
+ notch = WRAP(notch+1, 0, 2**15)
+ fcopy(file, filename)
+ . = md5filepath(filename)
+ fdel(filename)
+
+/// Returns the md5 of a file at a given path.
+/proc/md5filepath(path)
+ . = md5(file(path))
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 64b6924fd5a..1e0f451baa8 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -210,3 +210,64 @@
return HSVtoRGB(hsv(hsv_list[1], hsv_list[2], hsv_list[3], hsv_list[4]))
return HSVtoRGB(hsv(hsv_list[1], hsv_list[2], hsv_list[3]))
+/// given an icon object, dmi file path, or atom/image/mutable_appearance, attempts to find and return an associated dmi file path.
+/// a weird quirk about dm is that /icon objects represent both compile-time or dynamic icons in the rsc,
+/// but stringifying rsc references returns a dmi file path
+/// ONLY if that icon represents a completely unchanged dmi file from when the game was compiled.
+/// so if the given object is associated with an icon that was in the rsc when the game was compiled, this returns a path. otherwise it returns ""
+/proc/get_icon_dmi_path(icon/icon)
+ /// the dmi file path we attempt to return if the given object argument is associated with a stringifiable icon
+ /// if successful, this looks like "icons/path/to/dmi_file.dmi"
+ var/icon_path = ""
+
+ if(isatom(icon) || istype(icon, /image) || istype(icon, /mutable_appearance))
+ var/atom/atom_icon = icon
+ icon = atom_icon.icon
+ //atom icons compiled in from 'icons/path/to/dmi_file.dmi' are weird and not really icon objects that you generate with icon().
+ //if they're unchanged dmi's then they're stringifiable to "icons/path/to/dmi_file.dmi"
+
+ if(isicon(icon) && isfile(icon))
+ //icons compiled in from 'icons/path/to/dmi_file.dmi' at compile time are weird and aren't really /icon objects,
+ ///but they pass both isicon() and isfile() checks. they're the easiest case since stringifying them gives us the path we want
+ var/icon_ref = ref(icon)
+ var/locate_icon_string = "[locate(icon_ref)]"
+
+ icon_path = locate_icon_string
+
+ else if(isicon(icon) && "[icon]" == "/icon")
+ // icon objects generated from icon() at runtime are icons, but they AREN'T files themselves, they represent icon files.
+ // if the files they represent are compile time dmi files in the rsc, then
+ // the rsc reference returned by fcopy_rsc() will be stringifiable to "icons/path/to/dmi_file.dmi"
+ var/rsc_ref = fcopy_rsc(icon)
+
+ var/icon_ref = ref(rsc_ref)
+
+ var/icon_path_string = "[locate(icon_ref)]"
+
+ icon_path = icon_path_string
+
+ else if(istext(icon))
+ var/rsc_ref = fcopy_rsc(icon)
+ //if its the text path of an existing dmi file, the rsc reference returned by fcopy_rsc() will be stringifiable to a dmi path
+
+ var/rsc_ref_ref = ref(rsc_ref)
+ var/rsc_ref_string = "[locate(rsc_ref_ref)]"
+
+ icon_path = rsc_ref_string
+
+ if(is_valid_dmi_file(icon_path))
+ return icon_path
+
+ return FALSE
+
+///given a text string, returns whether it is a valid dmi icons folder path
+/proc/is_valid_dmi_file(icon_path)
+ if(!istext(icon_path) || !length(icon_path))
+ return FALSE
+
+ var/is_in_icon_folder = findtextEx(icon_path, "icons/")
+ var/is_dmi_file = findtextEx(icon_path, ".dmi")
+
+ if(is_in_icon_folder && is_dmi_file)
+ return TRUE
+ return FALSE
\ No newline at end of file
diff --git a/code/__HELPERS/math/ray/ray.dm b/code/__HELPERS/math/ray/ray.dm
index ec77ee2fa24..7f9e07b689f 100644
--- a/code/__HELPERS/math/ray/ray.dm
+++ b/code/__HELPERS/math/ray/ray.dm
@@ -18,9 +18,9 @@
/ray
var/z //the z-level we are casting our ray in
- var/vector/origin //the origin of the ray
- var/vector/origin_floored //the floored origin vector
- var/vector/direction //direction of the ray
+ var/_vector/origin //the origin of the ray
+ var/_vector/origin_floored //the floored origin vector
+ var/_vector/direction //direction of the ray
var/original_damage //original damage of the ray when applicable
var/turf/final_turf
var/turf/previous_turf
@@ -29,7 +29,7 @@
return "\[Ray\](\n- origin = " + origin.toString() + "\n- origin_floored = "+ origin_floored.toString() + "\n- direction = " + direction.toString() + "\n- z-level = " + num2text(z) + "\n)"
//use atom2vector for the origin, atoms2vector for the direction
-/ray/New(var/vector/p_origin, var/vector/p_direction, var/z)
+/ray/New(var/_vector/p_origin, var/_vector/p_direction, var/z)
origin = p_origin
origin_floored = origin.floored() //to save us from calculating it all over again
direction = p_direction.chebyshev_normalized()
@@ -53,7 +53,7 @@
return hitsPoint(other_ray.origin)
//returns true if point is on our ray (can be called with a max distance)
-/ray/proc/hitsPoint(var/vector/point, var/max_distance = 0)
+/ray/proc/hitsPoint(var/_vector/point, var/max_distance = 0)
if(origin.equals(point)) //the easy way out
return TRUE
@@ -73,23 +73,23 @@
// wrong?
/ray/proc/getReboundOnAtom(var/rayCastHit/hit)
//calc where we hit the atom
- var/vector/hit_point = hit.point_raw
+ var/_vector/hit_point = hit.point_raw
var/atom/movable/resolved_hit_atom = hit.hit_atom?.get()
- var/vector/hit_atom_loc = atom2vector(resolved_hit_atom) + new /vector(0.5, 0.5)
+ var/_vector/hit_atom_loc = atom2vector(resolved_hit_atom) + new /_vector(0.5, 0.5)
- var/vector/hit_vector = hit_point - hit_atom_loc
+ var/_vector/hit_vector = hit_point - hit_atom_loc
//we assume every atom is a octogonal, hence we use all_vectors
//here we calculate the "face" of the octagonal atom we want to rebound on
var/entry_byond_dir = vector2ClosestDir(hit_vector)
- var/vector/entry_dir = dir2vector(entry_byond_dir)
+ var/_vector/entry_dir = dir2vector(entry_byond_dir)
return src.direction.mirrorWithNormal(entry_dir)
//gets a point along the ray
/ray/proc/getPoint(var/distance)
- var/vector/path = direction * distance
+ var/_vector/path = direction * distance
return origin + path
//inherit and override this for costum logic
@@ -101,15 +101,15 @@
//returns list of raycasthits
/ray/proc/cast(var/max_distance = RAY_CAST_DEFAULT_MAX_DISTANCE, var/max_hits = RAY_CAST_UNLIMITED_HITS, var/ignore_origin = TRUE)
//calculating a step and its distance to use in the loop
- var/vector/a_step = direction * RAY_CAST_STEP
+ var/_vector/a_step = direction * RAY_CAST_STEP
var/step_distance = a_step.chebyshev_norm()
//setting up our pointer and distance to track where we are
- var/vector/pointer = new /vector(0,0)
+ var/_vector/pointer = new /_vector(0,0)
var/distance = 0
//positions list to easier check if we already found this position (since we are moving in tiny steps, not full numbers)
- var/list/vector/positions = list()
+ var/list/_vector/positions = list()
//our result
var/list/rayCastHit/hits = list()
@@ -124,12 +124,12 @@
distance += step_distance
//calculating our current position in world space (its two lines cause byond)
- var/vector/new_position_unfloored = origin + pointer
- var/vector/new_position = new_position_unfloored.floored()
+ var/_vector/new_position_unfloored = origin + pointer
+ var/_vector/new_position = new_position_unfloored.floored()
//check if we already checked this (floored) vector
var/exists = FALSE
- for(var/vector/V in positions)
+ for(var/_vector/V in positions)
if(V.equals(new_position))
exists = TRUE
if(exists)
@@ -191,14 +191,14 @@ var/list/ray_draw_icon_cache = list()
var/angle = direction.toAngle()
var/max_distance = draw_distance - distance_from_endpoint
while(distance_pointer < max_distance)
- var/vector/point
+ var/_vector/point
if(distance_pointer > max_distance - step_size) //last loop
point = getPoint(max_distance - step_size)
else
point = getPoint(distance_pointer)
- var/vector/point_floored = point.floored()
+ var/_vector/point_floored = point.floored()
- var/vector/pixels = (point - point_floored - new /vector(0.5, 0.5)) * WORLD_ICON_SIZE
+ var/_vector/pixels = (point - point_floored - new /_vector(0.5, 0.5)) * WORLD_ICON_SIZE
var/turf/T = locate(point_floored.x, point_floored.y, z)
diff --git a/code/__HELPERS/math/ray/rayCastHit.dm b/code/__HELPERS/math/ray/rayCastHit.dm
index cdc5f22a316..5a06d161a13 100644
--- a/code/__HELPERS/math/ray/rayCastHit.dm
+++ b/code/__HELPERS/math/ray/rayCastHit.dm
@@ -1,8 +1,8 @@
/rayCastHit
var/ray/used_ray
var/datum/weakref/hit_atom
- var/vector/point
- var/vector/point_raw
+ var/_vector/point
+ var/_vector/point_raw
var/distance
var/hit_type // see defines in ray.dm
diff --git a/code/__HELPERS/math/ray/rayCastHitInfo.dm b/code/__HELPERS/math/ray/rayCastHitInfo.dm
index ba44ac8a0c4..9fe0f976eb0 100644
--- a/code/__HELPERS/math/ray/rayCastHitInfo.dm
+++ b/code/__HELPERS/math/ray/rayCastHitInfo.dm
@@ -1,11 +1,11 @@
/rayCastHitInfo
var/ray/used_ray
var/datum/weakref/hit_atom
- var/vector/point
- var/vector/point_raw
+ var/_vector/point
+ var/_vector/point_raw
var/distance
-/rayCastHitInfo/New(var/ray/used_ray, var/datum/weakref/hit_atom, var/vector/point, var/vector/point_raw, var/distance)
+/rayCastHitInfo/New(var/ray/used_ray, var/datum/weakref/hit_atom, var/_vector/point, var/_vector/point_raw, var/distance)
src.used_ray = used_ray
src.hit_atom = hit_atom
src.point = point
diff --git a/code/__HELPERS/math/ray/ray_test_procs.dm b/code/__HELPERS/math/ray/ray_test_procs.dm
index f1c439afcf1..a4314ca32b9 100644
--- a/code/__HELPERS/math/ray/ray_test_procs.dm
+++ b/code/__HELPERS/math/ray/ray_test_procs.dm
@@ -1,7 +1,7 @@
/proc/raycast_test(var/x = 1, var/y = 1, var/dist)
- var/vector/origin = new /vector(usr.x, usr.y)
- var/vector/direction = new /vector(x, y)
+ var/_vector/origin = new /_vector(usr.x, usr.y)
+ var/_vector/direction = new /_vector(x, y)
var/ray/our_ray = new /ray(origin, direction, usr.z)
var/list/res = our_ray.cast(dist)
diff --git a/code/__HELPERS/math/vector/vector.dm b/code/__HELPERS/math/vector/vector.dm
index f3e0057eac9..c9eb2a07d49 100644
--- a/code/__HELPERS/math/vector/vector.dm
+++ b/code/__HELPERS/math/vector/vector.dm
@@ -1,50 +1,50 @@
// Basic geometry things.
-/vector
+/_vector
var/x = 0
var/y = 0
-/vector/New(var/x, var/y)
+/_vector/New(var/x, var/y)
src.x = x
src.y = y
-/vector/proc/duplicate()
- return new /vector(x, y)
+/_vector/proc/duplicate()
+ return new /_vector(x, y)
-/vector/proc/euclidian_norm()
+/_vector/proc/euclidian_norm()
return sqrt(x*x + y*y)
-/vector/proc/squared_norm()
+/_vector/proc/squared_norm()
return x*x + y*y
-/vector/proc/normalized()
+/_vector/proc/normalized()
var/norm = euclidian_norm()
- return new /vector(x/norm, y/norm)
+ return new /_vector(x/norm, y/norm)
-/vector/proc/floored()
- return new /vector(Floor(x), Floor(y))
+/_vector/proc/floored()
+ return new /_vector(Floor(x), Floor(y))
//use this one
-/vector/proc/chebyshev_norm()
+/_vector/proc/chebyshev_norm()
return max(abs(x), abs(y))
//use this one
-/vector/proc/chebyshev_normalized()
+/_vector/proc/chebyshev_normalized()
var/norm = chebyshev_norm()
- return new /vector(x/norm, y/norm)
+ return new /_vector(x/norm, y/norm)
-/vector/proc/is_integer()
+/_vector/proc/is_integer()
return IS_INT(x) && IS_INT(y)
-/vector/proc/is_null()
+/_vector/proc/is_null()
return chebyshev_norm() == 0
-/vector/proc/toString()
+/_vector/proc/toString()
return "\[Vector\]([x],[y])"
//returns angle from 0 to 360
//-1 if vector is (0,0)
//angle calculated on north
-/vector/proc/toAngle()
+/_vector/proc/toAngle()
if(x == 0)
if(y == 0)
return -1
@@ -58,30 +58,30 @@
else if(x < 0)
return 270
- var/vector/src_norm = src.chebyshev_normalized()
+ var/_vector/src_norm = src.chebyshev_normalized()
var/angle = arctan(src_norm.y,src_norm.x) - 360 * -1 //this is broken
return (angle >= 360) ? angle - 360 : angle
-/vector/proc/dot(var/vector/B)
+/_vector/proc/dot(var/_vector/B)
return src.x * B.x + src.y * B.y
-/vector/proc/mirrorWithNormal(var/vector/N)
- var/vector/n_norm = N.normalized()
+/_vector/proc/mirrorWithNormal(var/_vector/N)
+ var/_vector/n_norm = N.normalized()
return src - n_norm * ( 2 * ( src * n_norm ))
//operator overloading
-/vector/proc/operator+(var/vector/B)
- return new /vector(x + B.x, y + B.y)
+/_vector/proc/operator+(var/_vector/B)
+ return new /_vector(x + B.x, y + B.y)
-/vector/proc/operator-(var/vector/B)
- return new /vector(x - B.x, y - B.y)
+/_vector/proc/operator-(var/_vector/B)
+ return new /_vector(x - B.x, y - B.y)
-/vector/proc/operator*(var/mult)
- if(istype(mult, /vector))
+/_vector/proc/operator*(var/mult)
+ if(istype(mult, /_vector))
return dot(mult)
- return new /vector(x * mult, y * mult)
+ return new /_vector(x * mult, y * mult)
-/vector/proc/equals(var/vector/vectorB)
+/_vector/proc/equals(var/_vector/vectorB)
return (x == vectorB.x && y == vectorB.y)
diff --git a/code/__HELPERS/math/vector/vector_procs.dm b/code/__HELPERS/math/vector/vector_procs.dm
index 24c3a49b7c3..458c8df9823 100644
--- a/code/__HELPERS/math/vector/vector_procs.dm
+++ b/code/__HELPERS/math/vector/vector_procs.dm
@@ -1,7 +1,7 @@
-/atom/movable/proc/vector_translate(var/vector/V, var/delay)
+/atom/movable/proc/vector_translate(var/_vector/V, var/delay)
var/turf/T = get_turf(src)
var/turf/destination = locate(T.x + V.x, T.y + V.y, z)
- var/vector/V_norm = V.chebyshev_normalized()
+ var/_vector/V_norm = V.chebyshev_normalized()
if (!V_norm.is_integer())
return
var/turf/destination_temp
@@ -11,61 +11,61 @@
T = get_turf(src)
sleep(delay + world.tick_lag) // Shortest possible time to sleep
-/atom/proc/get_translated_turf(var/vector/V)
+/atom/proc/get_translated_turf(var/_vector/V)
var/turf/T = get_turf(src)
return locate(T.x + V.x, T.y + V.y, z)
//Vector representing world-pos of A
/proc/atom2vector(var/atom/A)
- return new /vector(A.x, A.y)
+ return new /_vector(A.x, A.y)
//Vector from A -> B
/proc/atoms2vector(var/atom/A, var/atom/B)
- return new /vector((B.x - A.x), (B.y - A.y))
+ return new /_vector((B.x - A.x), (B.y - A.y))
/proc/dir2vector(var/dir)
switch(dir)
if(NORTH)
- return new /vector(0,1)
+ return new /_vector(0,1)
if(NORTHEAST)
- return new /vector(1,1)
+ return new /_vector(1,1)
if(EAST)
- return new /vector(1,0)
+ return new /_vector(1,0)
if(SOUTHEAST)
- return new /vector(1,-1)
+ return new /_vector(1,-1)
if(SOUTH)
- return new /vector(0,-1)
+ return new /_vector(0,-1)
if(SOUTHWEST)
- return new /vector(-1,-1)
+ return new /_vector(-1,-1)
if(WEST)
- return new /vector(-1,0)
+ return new /_vector(-1,0)
if(NORTHWEST)
- return new /vector(-1,1)
+ return new /_vector(-1,1)
//defaults to north
-/proc/vector2ClosestDir(var/vector/V)
- var/vector/V_norm = V.chebyshev_normalized()
+/proc/vector2ClosestDir(var/_vector/V)
+ var/_vector/V_norm = V.chebyshev_normalized()
var/smallest_dist = 2 //since all vectors are normalized, the biggest possible distance is 2
var/closestDir = NORTH
for(var/d in alldirs)
- var/vector/dir = dir2vector(d)
- var/vector/delta = dir.chebyshev_normalized() - V_norm
+ var/_vector/dir = dir2vector(d)
+ var/_vector/delta = dir.chebyshev_normalized() - V_norm
var/dist = delta.chebyshev_norm()
if(dist < smallest_dist)
smallest_dist = dist
closestDir = d
return closestDir
-/proc/drawLaser(var/vector/A, var/vector/B, var/icon='icons/obj/projectiles.dmi', var/icon_state = "laser")
- var/vector/delta = (B - A)
+/proc/drawLaser(var/_vector/A, var/_vector/B, var/icon='icons/obj/projectiles.dmi', var/icon_state = "laser")
+ var/_vector/delta = (B - A)
var/ray/laser_ray = new /ray(A, delta)
var/distance = delta.chebyshev_norm()
laser_ray.draw(distance, icon, icon_state)
-/proc/vector2turf(var/vector/V, var/z)
+/proc/vector2turf(var/_vector/V, var/z)
var/turf/T = locate(V.x, V.y, z)
return T
diff --git a/code/__HELPERS/sorts/TimSort.dm b/code/__HELPERS/sorts/TimSort.dm
index 4aa51263656..cfa55f0dfa3 100644
--- a/code/__HELPERS/sorts/TimSort.dm
+++ b/code/__HELPERS/sorts/TimSort.dm
@@ -14,4 +14,4 @@
sortInstance.timSort(fromIndex, toIndex)
- return L
\ No newline at end of file
+ return L
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 8ee9a32513c..e36b5c14634 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -2,6 +2,8 @@
#define UTF_LIMIT (1 << 20) + (1 << 16) - 1
#define string2charlist(string) (splittext(string, regex("(.)")) - splittext(string, ""))
+#define PREVENT_CHARACTER_TRIM_LOSS(length) (length + 1)
+
/*
* Holds procs designed to help with filtering text
* Contains groups:
@@ -128,6 +130,15 @@ var/list/whitelist_name_diacritics_min = list(
"à", "á", "â", "ã", "ä", "ä", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "ö", "ø", "ù", "ú", "û", "ü", "ý",
)
+/proc/stripped_multiline_input(mob/user, message = "", title = "", default = "", max_length=MAX_MESSAGE_LEN, no_trim=FALSE)
+ var/user_input = input(user, message, title, default) as message|null
+ if(isnull(user_input)) // User pressed cancel
+ return
+ if(no_trim)
+ return copytext_char(html_encode(user_input), 1, max_length)
+ else
+ return trim(html_encode(user_input), max_length)
+
/proc/reject_bad_name(var/t_in, var/allow_numbers=0, var/max_length=MAX_NAME_LEN)
if(!t_in || length(t_in) > max_length)
return //Rejects the input if it is null or if it is longer then the max length allowed
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index f392548e149..c58dfff03f3 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -8,6 +8,11 @@
return x!=0?x/abs(x):0
#endif
+/// Return html to load a url.
+/// for use inside of browse() calls to html assets that might be loaded on a cdn.
+/proc/url2htmlloader(url)
+ return {""}
+
/proc/getline(atom/M,atom/N)//Ultra-Fast Bresenham Line-Drawing Algorithm
var/px=M.x //starting x
var/py=M.y
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 9405e9849a9..83a0e3c937a 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -97,6 +97,9 @@
if(modifiers["right"])
RightClickOn(A)
return
+ // Equivalent to button M4/M5 on gaming mouses.
+ if(modifiers["xbutton1"] || modifiers["xbutton2"])
+ return
if(attempt_crawling(A))
return
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 5e19b78cc42..b4e2a654d32 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -218,6 +218,20 @@
var/rsclist = ""
var/rscstring = ""
+ // TGUI & tg asset thing
+ var/tgui_max_chunk_count = 32
+ var/tg_asset_transport = "simple" // simple or "webroot". Webroot is via CDN.
+ var/cache_assets = 1 // Disabled during dev, enabled during prod
+ var/smart_cache_assets = 1
+ var/save_spritesheets = 0 // Disabled by default.
+
+ var/asset_simple_preload = 0 // Disabled by default
+
+ // tg asset cdn via webroot systme. Currently unused.
+ var/asset_cdn_webroot = ""
+ var/asset_cdn_url = ""
+
+
/datum/configuration/New()
. = ..()
var/list/L = subtypesof(/datum/gamemode)-/datum/gamemode/cult
diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm
new file mode 100644
index 00000000000..c196e149b4a
--- /dev/null
+++ b/code/controllers/subsystem/assets.dm
@@ -0,0 +1,42 @@
+var/datum/subsystem/assets/SSassets
+
+/datum/subsystem/assets
+ name = "Assets"
+ flags = SS_NO_FIRE
+ var/list/datum/asset_cache_item/cache = list()
+ var/list/preload = list()
+ var/datum/asset_transport/transport = new()
+
+/datum/subsystem/assets/New()
+ NEW_SS_GLOBAL(SSassets)
+
+/datum/subsystem/assets/Initialize()
+
+ // -- FIXME ASSETS:.
+ // -- Old, crusty /vg/ style of populating assets (relying on 'global cache.dm')
+ // TOFIX asap!!! Having two concurrent, parralel & independant asset delivery system is BAD
+ populate_asset_cache()
+
+ var/newtransporttype = /datum/asset_transport
+ switch (config.tg_asset_transport)
+ if ("webroot")
+ newtransporttype = /datum/asset_transport/webroot
+
+ if (newtransporttype == transport.type)
+ return
+
+ var/datum/asset_transport/newtransport = new newtransporttype ()
+ if (newtransport.validate_config())
+ transport = newtransport
+ transport.Load()
+
+ for(var/type in typesof(/datum/tg_asset))
+ var/datum/tg_asset/A = type
+ if (type != initial(A._abstract))
+ load_asset_datum(type)
+
+ transport.Initialize(cache)
+
+/datum/subsystem/assets/Recover()
+ cache = SSassets.cache
+ preload = SSassets.preload
diff --git a/code/controllers/subsystem/init/assets.dm b/code/controllers/subsystem/init/assets.dm
deleted file mode 100644
index e1e7174b381..00000000000
--- a/code/controllers/subsystem/init/assets.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-var/datum/subsystem/assets/SSassets
-
-
-/datum/subsystem/assets
- name = "Asset Cache"
- init_order = SS_INIT_ASSETS
- flags = SS_NO_FIRE
-
-
-/datum/subsystem/assets/New()
- NEW_SS_GLOBAL(SSassets)
-
-
-/datum/subsystem/assets/Initialize(timeofday)
- populate_asset_cache()
- ..()
diff --git a/code/controllers/subsystem/init/persistence_misc.dm b/code/controllers/subsystem/init/persistence_misc.dm
index 5668770b573..ec90ad7fe5a 100644
--- a/code/controllers/subsystem/init/persistence_misc.dm
+++ b/code/controllers/subsystem/init/persistence_misc.dm
@@ -232,37 +232,37 @@ var/datum/subsystem/persistence_misc/SSpersistence_misc
log_debug("[name] task found an empty file on [file_path]")
return
for(var/list/L in to_read)
- var/datum/record/money/record = new(L["ckey"], L["role"], L["cash"], L["shift_duration"], L["date"])
+ var/datum/data/record/money/record = new(L["ckey"], L["role"], L["cash"], L["shift_duration"], L["date"])
data += record
/datum/persistence_task/highscores/on_shutdown()
var/list/L = list()
- for(var/datum/record/money/record in data)
+ for(var/datum/data/record/money/record in data)
L += list(record.vars)
write_file(L)
/datum/persistence_task/highscores/proc/insert_records(list/records)
data += records
- cmp_field = "cash"
- sortTim(data, /proc/cmp_list_by_element_desc)
+ global.cmp_field = "cash"
+ sortTim(data, /proc/cmp_records_numerically)
if (data.len > 5)
data.Cut(6) // we only store the top 5
- for(var/datum/record/money/record in data)
+ for(var/datum/data/record/money/record in data)
if(record in records)
if(data[1] == record)
announce_new_highest_record(record)
else
announce_new_record(record)
-/datum/persistence_task/highscores/proc/announce_new_highest_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/proc/announce_new_highest_record(var/datum/data/record/money/record)
var/name = "Richest escape ever"
- var/desc = "You broke the record of the richest escape! $[record.cash] chips accumulated."
- give_award(record.ckey, /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
+ var/desc = "You broke the record of the richest escape! $[record.fields["cash"]] chips accumulated."
+ give_award(record.fields["ckey"], /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
-/datum/persistence_task/highscores/proc/announce_new_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/proc/announce_new_record(var/datum/data/record/money/record)
var/name = "Good rich escape"
- var/desc = "You made it to the top 5! You accumulated $[record.cash]."
- give_award(record.ckey, /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
+ var/desc = "You made it to the top 5! You accumulated $[record.fields["cash"]]."
+ give_award(record.fields["ckey"], /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
/datum/persistence_task/highscores/proc/clear_records()
data = list()
@@ -273,15 +273,15 @@ var/datum/subsystem/persistence_misc/SSpersistence_misc
name = "Trader shoal highscores"
file_path = "data/persistence/trader_highscores.json"
-/datum/persistence_task/highscores/trader/announce_new_highest_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/trader/announce_new_highest_record(var/datum/data/record/money/record)
var/name = "Richest shoal haul ever"
- var/desc = "You broke the record of the richest shoal haul! $[record.cash] chips accumulated."
- give_award(record.ckey, /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
+ var/desc = "You broke the record of the richest shoal haul! $[record.fields["cash"]] chips accumulated."
+ give_award(record.fields["ckey"], /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
-/datum/persistence_task/highscores/trader/announce_new_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/trader/announce_new_record(var/datum/data/record/money/record)
var/name = "Good rich shoal haul"
- var/desc = "You made it to the top 5! You accumulated $[record.cash]."
- give_award(record.ckey, /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
+ var/desc = "You made it to the top 5! You accumulated $[record.fields["cash"]]."
+ give_award(record.fields["ckey"], /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
//stores map votes for code/modules/html_interface/voting/voting.dm
/datum/persistence_task/vote
diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm
index 04c8e0c7c57..b7635837b75 100644
--- a/code/controllers/subsystem/tgui.dm
+++ b/code/controllers/subsystem/tgui.dm
@@ -13,8 +13,10 @@ var/datum/subsystem/tgui/SStgui
/// A list of UIs scheduled to process
var/list/current_run = list()
- /// A list of open UIs
- var/list/open_uis = list()
+ /// A list of all UIs
+ var/list/all_uis = list()
+ /// All curent open UIs
+ open_uis = list()
/// A list of open UIs, grouped by src_object.
var/list/open_uis_by_src = list()
/// The HTML base used for all UIs.
@@ -25,17 +27,30 @@ var/datum/subsystem/tgui/SStgui
/datum/subsystem/tgui/Initialize(timeofday)
basehtml = file2text('tgui/public/tgui.html')
- ..()
+
+ // Inject inline helper functions
+ var/helpers = file2text('tgui/public/helpers.min.js')
+ helpers = ""
+ basehtml = replacetextEx(basehtml, "", helpers)
+
+ // Inject inline ntos-error styles
+ var/ntos_error = file2text('tgui/public/ntos-error.min.css')
+ ntos_error = ""
+ basehtml = replacetextEx(basehtml, "", ntos_error)
+
+ basehtml = replacetextEx(basehtml, "", "Nanotrasen (c) 2525-[game_year]")
+
/datum/subsystem/tgui/Shutdown()
close_all_uis()
-/datum/subsystem/tgui/stat_entry()
- ..("P:[length(open_uis)]")
+/datum/subsystem/tgui/stat_entry(msg)
+ msg = "P:[length(all_uis)]"
+ return ..()
/datum/subsystem/tgui/fire(resumed = FALSE)
if(!resumed)
- src.current_run = open_uis.Copy()
+ src.current_run = all_uis.Copy()
// Cache for sanic speed (lists are references anyways)
var/list/current_run = src.current_run
while(current_run.len)
@@ -45,7 +60,7 @@ var/datum/subsystem/tgui/SStgui
if(ui?.user && ui.src_object)
ui.process(wait * 0.1)
else
- open_uis.Remove(ui)
+ ui.close(0)
if(MC_TICK_CHECK)
return
@@ -56,7 +71,7 @@ var/datum/subsystem/tgui/SStgui
* Returns null if pool was exhausted.
*
* required user mob
- * return datum/tgui
+ * return datum/tgui_window
*/
/datum/subsystem/tgui/proc/request_pooled_window(mob/user)
if(!user.client)
@@ -116,8 +131,6 @@ var/datum/subsystem/tgui/SStgui
for(var/datum/tgui/ui in user.tgui_open_uis)
if(ui.window && ui.window.id == window_id)
ui.close(can_be_suspended = FALSE)
- // Unset machine just to be sure.
- user.unset_machine()
// Close window directly just to be sure.
user << browse(null, "window=[window_id]")
@@ -164,11 +177,10 @@ var/datum/subsystem/tgui/SStgui
* return datum/tgui The found UI.
*/
/datum/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object)
- var/key = "[ref(src_object)]"
// No UIs opened for this src_object
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
+ if(!(src_object?.open_uis?.len))
return null
- for(var/datum/tgui/ui in open_uis_by_src[key])
+ for(var/datum/tgui/ui in src_object.open_uis)
// Make sure we have the right user
if(ui.user == user)
return ui
@@ -184,15 +196,14 @@ var/datum/subsystem/tgui/SStgui
* return int The number of UIs updated.
*/
/datum/subsystem/tgui/proc/update_uis(datum/src_object)
- var/count = 0
- var/key = "[ref(src_object)]"
// No UIs opened for this src_object
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
- return count
- for(var/datum/tgui/ui in open_uis_by_src[key])
+ if(!(src_object?.open_uis?.len))
+ return 0
+ var/count = 0
+ for(var/datum/tgui/ui in src_object.open_uis)
// Check if UI is valid.
if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
- ui.process(wait * 0.1, force = 1)
+ ui.process(wait * 0.1, TRUE)
count++
return count
@@ -206,12 +217,11 @@ var/datum/subsystem/tgui/SStgui
* return int The number of UIs closed.
*/
/datum/subsystem/tgui/proc/close_uis(datum/src_object)
- var/count = 0
- var/key = "[ref(src_object)]"
// No UIs opened for this src_object
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
- return count
- for(var/datum/tgui/ui in open_uis_by_src[key])
+ if(!(src_object?.open_uis?.len))
+ return 0
+ var/count = 0
+ for(var/datum/tgui/ui in src_object.open_uis)
// Check if UI is valid.
if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
ui.close()
@@ -227,12 +237,11 @@ var/datum/subsystem/tgui/SStgui
*/
/datum/subsystem/tgui/proc/close_all_uis()
var/count = 0
- for(var/key in open_uis_by_src)
- for(var/datum/tgui/ui in open_uis_by_src[key])
- // Check if UI is valid.
- if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
- ui.close()
- count++
+ for(var/datum/tgui/ui in all_uis)
+ // Check if UI is valid.
+ if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
+ ui.close()
+ count++
return count
/**
@@ -288,8 +297,16 @@ var/datum/subsystem/tgui/SStgui
open_uis_by_src[key] = list()
ui.user.tgui_open_uis |= ui
var/list/uis = open_uis_by_src[key]
+
+ // this feels a bit silly
+ if (ui.src_object.open_uis)
+ ui.src_object.open_uis += ui
+ else
+ ui.src_object.open_uis = list(ui)
+
uis |= ui
open_uis |= ui
+ all_uis |= ui
/**
* private
@@ -301,18 +318,24 @@ var/datum/subsystem/tgui/SStgui
* return bool If the UI was removed or not.
*/
/datum/subsystem/tgui/proc/on_close(datum/tgui/ui)
- var/key = "[ref(ui.src_object)]"
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
- return FALSE
// Remove it from the list of processing UIs.
- open_uis.Remove(ui)
+ all_uis -= ui
+ open_uis -= ui
+ var/key = "[ref(ui.src_object)]"
+ open_uis_by_src[key] -= ui
+ if (!length(open_uis_by_src[key]))
+ open_uis_by_src -= key
+ current_run -= ui
// If the user exists, remove it from them too.
if(ui.user)
- ui.user.tgui_open_uis.Remove(ui)
- var/list/uis = open_uis_by_src[key]
- uis.Remove(ui)
- if(length(uis) == 0)
- open_uis_by_src.Remove(key)
+ ui.user.tgui_open_uis -= ui
+
+ // basically a lazy remove
+ if(ui.src_object.open_uis)
+ ui.src_object.open_uis -= ui
+ if (!length(ui.src_object.open_uis))
+ ui.src_object.open_uis = null
+
return TRUE
/**
@@ -347,7 +370,7 @@ var/datum/subsystem/tgui/SStgui
for(var/datum/tgui/ui in source.tgui_open_uis)
// Inform the UIs of their new owner.
ui.user = target
- target.tgui_open_uis.Add(ui)
+ target.tgui_open_uis += ui
// Clear the old list.
source.tgui_open_uis.Cut()
return TRUE
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 5f0ba75939c..3fff31be29f 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -60,7 +60,7 @@ var/timer_id = 1
// Optimization or waste of time?
// If a datum has many timers it may be beneficial to check whether thing_to_call.gcDestroyed has been set,
// indicating there's no need to remove this timer from its active_timers list, as the list will be nulled right afterwards.
- if(thing_to_call != GLOBAL_PROC && !thing_to_call.gcDestroyed)
+ if(thing_to_call != GLOBAL_PROC && (isclient(thing_to_call) || !thing_to_call.gcDestroyed))
thing_to_call.active_timers -= src
if(!thing_to_call.active_timers.len)
thing_to_call.active_timers = null
diff --git a/code/game/gamemodes/endgame/scoreboard/misc_score.dm b/code/game/gamemodes/endgame/scoreboard/misc_score.dm
index b9c52480167..581d9ea6a9a 100644
--- a/code/game/gamemodes/endgame/scoreboard/misc_score.dm
+++ b/code/game/gamemodes/endgame/scoreboard/misc_score.dm
@@ -71,7 +71,7 @@
for(var/obj/item/weapon/spacecash/C2 in get_contents_in_object(player, /obj/item/weapon/spacecash))
cashscore += (C2.amount * C2.worth)
- var/datum/record/money/record = new(player.key, player.job, cashscore)
+ var/datum/data/record/money/record = new(player.key, player.job, cashscore)
rich_escapes += record
if(cashscore > score.richestcash)
@@ -91,7 +91,7 @@
if(TR.source_name == player.real_name)
shoal_amount += text2num(TR.amount)
if(shoal_amount > 0)
- var/datum/record/money/record = new(player.key, player.job, shoal_amount)
+ var/datum/data/record/money/record = new(player.key, player.job, shoal_amount)
rich_shoals += record
if(shoal_amount > score.biggestshoalcash)
score.biggestshoalcash = shoal_amount
diff --git a/code/game/gamemodes/endgame/scoreboard/scoreboard.dm b/code/game/gamemodes/endgame/scoreboard/scoreboard.dm
index 8acbc3fc2b7..624f2412047 100644
--- a/code/game/gamemodes/endgame/scoreboard/scoreboard.dm
+++ b/code/game/gamemodes/endgame/scoreboard/scoreboard.dm
@@ -312,27 +312,27 @@ var/global/datum/controller/gameticker/scoreboard/score = new()
var/datum/persistence_task/highscores/leaderboard = score.money_leaderboard
dat += "MONTHLY TOP 5 RICHEST ESCAPEES:
"
var/i = 1
- for(var/datum/record/money/entry in leaderboard.data)
- var/cash = num2text(entry.cash, 12)
- var/list/split_date = splittext(entry.date, "-")
+ for(var/datum/data/record/money/entry in leaderboard.data)
+ var/cash = num2text(entry.fields["cash"], 12)
+ var/list/split_date = splittext(entry.fields["date"], "-")
if(text2num(split_date[2]) != text2num(time2text(world.timeofday, "MM")))
leaderboard.clear_records()
dat += "No rich escapees yet!"
break
else
- dat += "[i++]) $[cash] by [entry.ckey] ([entry.role]). That shift lasted [entry.shift_duration]. Date: [entry.date]
"
+ dat += "[i++]) $[cash] by [entry.fields["ckey"]] ([entry.fields["role"]]). That shift lasted [entry.fields["shift_duration"]]. Date: [entry.fields["date"]]
"
var/datum/persistence_task/highscores/trader/leaderboard2 = score.shoal_leaderboard
dat += "
MONTHLY TOP 5 RICHEST TRADERS:
"
i = 1
- for(var/datum/record/money/entry in leaderboard2.data)
- var/cash = num2text(entry.cash, 12)
- var/list/split_date = splittext(entry.date, "-")
+ for(var/datum/data/record/money/entry in leaderboard2.data)
+ var/cash = num2text(entry.fields["cash"], 12)
+ var/list/split_date = splittext(entry.fields["date"], "-")
if(text2num(split_date[2]) != text2num(time2text(world.timeofday, "MM")))
leaderboard2.clear_records()
dat += "No rich traders yet!"
break
else
- dat += "[i++]) $[cash] by [entry.ckey]. That shift lasted [entry.shift_duration]. Date: [entry.date]
"
+ dat += "[i++]) $[cash] by [entry.fields["ckey"]]. That shift lasted [entry.fields["shift_duration"]]. Date: [entry.fields["date"]]
"
return dat
/mob/proc/display_round_end_scoreboard()
diff --git a/code/game/gamemodes/highscores.dm b/code/game/gamemodes/highscores.dm
index 2d5e65cec7c..8bc1ac78140 100644
--- a/code/game/gamemodes/highscores.dm
+++ b/code/game/gamemodes/highscores.dm
@@ -1,13 +1,15 @@
-/datum/record/money
- var/ckey
- var/role
- var/cash
- var/shift_duration
- var/date
+/datum/data/record/money
+ fields = list(
+ "ckey" = "",
+ "role" = "",
+ "cash" = -999999,
+ "shift_duration" = -999999,
+ "date" = "0000-00-00",
+ )
-/datum/record/money/New(ckey, role, cash, shift_duration = worldtime2text(), date = SQLtime())
- src.ckey = ckey
- src.role = role
- src.cash = cash
- src.shift_duration = shift_duration
- src.date = date
+/datum/data/record/money/New(ckey, role, cash, shift_duration = worldtime2text(), date = SQLtime())
+ fields["ckey"] = ckey
+ fields["role"] = role
+ fields["cash"] = cash
+ fields["shift_duration"]= shift_duration
+ fields["date"] = date
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index e7296f888a1..46d82b87c32 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -132,7 +132,6 @@ var/list/obj/machinery/camera/cyborg_cams = list(
/obj/machinery/computer/security/ui_static_data()
var/list/data = list()
- data["title"] = name
data["mapRef"] = map_name
var/list/cameras = get_available_cameras()
data["cameras"] = list()
@@ -140,17 +139,20 @@ var/list/obj/machinery/camera/cyborg_cams = list(
var/obj/machinery/camera/C = cameras[i]
data["cameras"] += list(list(
name = C.c_tag,
+ ref = ref(C),
))
return data
/obj/machinery/computer/security/ui_act(action, params)
. = ..()
+ message_admins("Active camera change")
if(.)
return
if(action == "switch_camera")
var/c_tag = params["name"]
+ message_admins("Act = switch_camera, [c_tag]")
var/list/cameras = get_available_cameras()
var/obj/machinery/camera/selected_camera = cameras[c_tag]
active_camera = selected_camera
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index f98a3c249f5..fafe5e62846 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -44,7 +44,7 @@ var/list/message_monitors = list()
..()
switchboard_headset = new /obj/item/telephone/switchboard (src)
message_monitors += src
-
+
/obj/machinery/computer/message_monitor/Destroy()
message_monitors -= src
if(switchboard_headset)
@@ -118,7 +118,7 @@ var/list/message_monitors = list()
dat += {" \[Unauthenticated\] /
Server Power: [src.linkedServer && src.linkedServer.is_functioning() ? "\[On\]":"\[Off\]"]"}
dat += {" Landline auto-routing: [src.linkedServer && src.linkedServer.landlines_functioning() ? "\[On\]":"\[Off\]"]
"}
-
+
if(hacking || emagged)
screen = 2
if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN|FORCEDISABLE)))
@@ -151,7 +151,7 @@ var/list/message_monitors = list()
dat += "
"
dat += "
Landline Switchboard
"
//TODO add exclamation marks here if someone's calling
-
+
//Bottom message
if(!auth)
dat += "
Please authenticate with the server in order to show additional options."
@@ -176,7 +176,7 @@ var/list/message_monitors = list()
var/imgdat = ""
if(pda.img_sent)
user << browse_rsc(pda.img_sent, "tmp_photo_[index].png")
- imgdat = "
"
+ imgdat = ""
dat += "| X | [pda.sender] | [pda.recipient] | [pda.message] | [imgdat] |
|---|
"
dat += ""
//Hacking screen.
@@ -282,7 +282,7 @@ var/list/message_monitors = list()
callconnector = "o"
else
callconnector = " "
-
+
var/b = RC.landline.get_status()
if(b)
shortname = "[shortname]"
@@ -558,7 +558,7 @@ var/list/message_monitors = list()
playsound(L.calling.linked_phone, switchboard_sound2, 100, 1)
L.last_call_log += text("call disconnected by operator
")
if(L.linked_phone)
- playsound(L.linked_phone, switchboard_sound2, 100, 1)
+ playsound(L.linked_phone, switchboard_sound2, 100, 1)
L.calling = null
updateUsrDialog()
playsound(src, switchboard_sound2, 100, 1)
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 2aeb3ced10f..8b859668852 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -71,26 +71,28 @@
if(!can_control(R,user))
continue
var/list/cyborg_data = list(
- name = R.name,
- locked_down = R.lockdown,
- status = R.stat,
- charge = R.cell ? R.cell.percent() : null,
- module = R.module ? "[R.modtype] Module" : "No Module Installed",
- master = R.connected_ai,
- emagged = R.emagged,
- borgimage = iconsouth2base64(getFlatIconDeluxe(sort_image_datas(get_content_image_datas(R)), override_dir = SOUTH)),
- ref = ref(R)
+ "name" = R.name,
+ "locked_down" = R.lockdown,
+ "status" = R.stat,
+ "charge" = R.cell ? R.cell.percent() : null,
+ "module" = R.module ? "[R.modtype] Module" : "No Module Installed",
+ "master" = R.connected_ai,
+ "emagged" = R.emagged,
+ "borgimage" = iconsouth2base64(getFlatIconDeluxe(sort_image_datas(get_content_image_datas(R)), override_dir = SOUTH)),
+ "ref" = ref(R)
)
data["cyborgs"] += list(cyborg_data)
return data
-/obj/machinery/computer/robotics/ui_act(action, params)
+/obj/machinery/computer/robotics/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ message_admins("ui_act called on robotborg")
. = ..()
if(.)
+ message_admins("uuuh didn't work :)")
return
-
+ message_admins("action: [action], params: [json_encode(params)]")
switch(action)
if("killbot")
if(allowed(usr))
@@ -106,7 +108,7 @@
to_chat(R.connected_ai, "\[ALERT\] Slaved Cyborg [R.name] detonated. Signal traced to [get_area(src).name].")
R.connected_ai << 'sound/machines/twobeep.ogg'
R.self_destruct()
-
+ SStgui.try_update_ui(ui.user, src, ui)
else
to_chat(usr, "Access Denied.")
@@ -128,6 +130,7 @@
else
to_chat(R.connected_ai, "\[INFO\] The lockdown on cyborg [R.name] has been lifted. Signal traced to [get_area(src).name]")
R.connected_ai << 'sound/misc/notice2.ogg'
+ SStgui.try_update_ui(ui.user, src, ui)
else
to_chat(usr, "Access Denied.")
if("hack")
@@ -137,6 +140,7 @@
log_game("[key_name(usr)] emagged [key_name(R)] using a robotics console!")
message_admins("[key_name(usr)] emagged [key_name(R)] using a robotics console!")
R.SetEmagged(TRUE)
+ SStgui.try_update_ui(ui.user, src, ui)
if(can_control(R, usr) && ismalf(usr))
if (!hacking)
hacking = 1
@@ -148,6 +152,7 @@
to_chat(usr, "\[ERROR\] [R.name]: SAFETIES DISABLED.")
usr << 'sound/misc/notice2.ogg'
hacking = 0
+ SStgui.try_update_ui(ui.user, src, ui)
else
to_chat(usr, "You are already hacking a cyborg.")
if("sequence")
@@ -159,6 +164,7 @@
stop_sequence()
message_admins("[key_name_admin(usr)] [formatJumpTo(usr)] has halted the global cyborg killswitch!")
log_game("[key_name(usr)] has halted the global cyborg killswitch!")
+ SStgui.try_update_ui(ui.user, src, ui)
return TRUE
/obj/machinery/computer/robotics/proc/can_control(var/mob/living/silicon/robot/robot, var/mob/controller)
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 0de2be67c31..a5e2fe0f8ba 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -432,7 +432,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(MESSAGE.img)
usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png")
- dat+="
"
+ dat+="
"
dat+="
\[Story by [MESSAGE.author]\]
"
dat += {"Refresh
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 6658e6f9422..e13214eddb8 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -33,23 +33,24 @@
var/area/A = get_area(M)
if(!M)
continue
+ var/icon/mech_icon = getFlatIconDeluxe(sort_image_datas(get_content_image_datas(M)), override_dir = SOUTH)
var/list/mecha_data = list(
- name = M.name,
- health = round((M.health/initial(M.health))*100),
- charge = M.cell ? round(M.cell.percent()) : null,
- pilot = M.occupant || "None",
- location = A.name || "Unknown",
- active = M.selected ? M.selected.name : "None",
- status = M.state,
- mechaimage = iconsouth2base64(getFlatIconDeluxe(sort_image_datas(get_content_image_datas(M)), override_dir = SOUTH)),
- log = TR.get_mecha_log(),
- ref = ref(M)
+ "name" = M.name,
+ "health" = round((M.health/initial(M.health))*100),
+ "charge" = M.cell ? round(M.cell.percent()) : null,
+ "pilot" = M.occupant || "None",
+ "location" = A.name || "Unknown",
+ "active" = M.selected ? M.selected.name : "None",
+ "status" = M.state,
+ "mechaimage" = iconsouth2base64(mech_icon),
+ "log" = TR.get_mecha_log(),
+ "ref" = ref(M)
)
data["mechas"] += list(mecha_data)
return data
-/obj/machinery/computer/mecha/ui_act(action, params)
+/obj/machinery/computer/mecha/ui_act(action, list/params)
. = ..()
if(.)
return
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index d7aedd293c8..f34427212d8 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -557,7 +557,7 @@
var/icon/img = app.imglist[note]
if(img)
usr << browse_rsc(img, "tmp_photo_[note].png")
- dat += "
"
+ dat += "
"
dat += "