diff --git a/.github/actions/setup_bun/action.yml b/.github/actions/setup_bun/action.yml new file mode 100644 index 00000000000..727596ed3ab --- /dev/null +++ b/.github/actions/setup_bun/action.yml @@ -0,0 +1,17 @@ +# This action is a wrapper around `oven-sh/setup-bun` to use the version specified in +# `dependencies.sh`. +name: Setup Bun +description: Install Bun using the version specified in `dependencies.sh` + +runs: + using: composite + steps: + - name: Configure Bun version + shell: bash + run: | + source dependencies.sh + echo "BUN_VERSION_REQUIRED=$BUN_VERSION" >> $GITHUB_ENV + - name: Install Bun + uses: oven-sh/setup-bun@v2 + with: + bun-version: ${{ env.BUN_VERSION_REQUIRED }} diff --git a/.github/actions/setup_node/action.yml b/.github/actions/setup_node/action.yml new file mode 100644 index 00000000000..d017766117f --- /dev/null +++ b/.github/actions/setup_node/action.yml @@ -0,0 +1,26 @@ +# This action is a wrapper around `actions/setup-node`, to use the version specified in +# `dependencies.sh`. +name: Setup Node +description: Install Node using the version specified in `dependencies.sh`; additionally, restores the Yarn cache if one exists + +inputs: + restore-yarn-cache: + description: "If `true`, restores the Yarn cache alongside installing node." + required: false + type: boolean + default: false + +runs: + using: composite + steps: + - name: Configure Node version + shell: bash + run: | + source dependencies.sh + echo "NODE_VERSION_REQUIRED=$NODE_VERSION_LTS" >> $GITHUB_ENV + - name: Install Node + uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION_REQUIRED }} + cache: ${{ fromJSON(inputs.restore-yarn-cache) && 'yarn' || '' }} + cache-dependency-path: ${{ fromJSON(inputs.restore-yarn-cache) && 'tgui/yarn.lock' || '' }} diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml index 3c0012a9ce5..1e89d02d09a 100644 --- a/.github/workflows/byond.yml +++ b/.github/workflows/byond.yml @@ -69,6 +69,7 @@ jobs: bash tools/ci/check_filedirs.sh aurorastation.dme bash tools/ci/check_changelogs.sh bash tools/ci/check_grep.sh $PWD + bash tools/ci/check_shell_scripts.sh awk -f tools/indentation.awk **/*.dm - name: "Check if running CI" @@ -281,18 +282,14 @@ jobs: - name: Set ENV variables run: bash dependencies.sh - #Setup NodeJS using YARN as cache - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION_LTS }} - cache: "yarn" - cache-dependency-path: tgui/yarn.lock + #Setup bun + - name: Setup Bun + uses: ./.github/actions/setup_bun #Lint TGUI - name: Check Tgui run: | - tools/build/build --ci lint tgui-test + tools/build/build.sh --ci lint tgui-test ########################################### ############### MISC LINTING ############## diff --git a/.github/workflows/update_tgui.yml b/.github/workflows/update_tgui.yml new file mode 100644 index 00000000000..a023a52b467 --- /dev/null +++ b/.github/workflows/update_tgui.yml @@ -0,0 +1,31 @@ +name: "Build TGUI" +on: + workflow_dispatch: + +jobs: + update-tgui: + concurrency: tgui + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-24.04 + steps: + - name: Install Bun + uses: ./.github/actions/setup_bun + + - name: Update TGUI + run: | + tools/bootstrap/javascript tools/build/build.sh tgui + + - name: Commit TGUI + run: | + git pull origin master + git config --local user.email "action@github.com" + git config --local user.name "AuroraBuildBot" + git add --force tgui/public/* + git commit -m "Automatic TGUI compile [ci skip]" -a || true + + - name: Push + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.BOT_TOKEN_AURORA }} diff --git a/.gitignore b/.gitignore index e8f27065444..e24b8fa4900 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,6 @@ define_sanity_output.txt # Tracy dumps *.utracy + +# JavaScript tools +**/node_modules diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d0ecf1ccc9a..6a81025a513 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -6,7 +6,9 @@ "dbaeumer.vscode-eslint", "vscode.typescript-language-features", "redhat.vscode-yaml", - "esbenp.prettier-vscode", - "rome.rome" + "rome.rome", + "dbaeumer.vscode-eslint", + "editorconfig.editorconfig", + "biomejs.biome" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 4a44976f9ca..1e74c4aca2f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,25 +1,27 @@ { - "eslint.nodePath": "./tgui/.yarn/sdks", - "eslint.workingDirectories": ["./tgui"], - "prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.cjs", - "typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib", "typescript.enablePromptUseWorkspaceTsdk": true, "search.exclude": { "**/.yarn": true, "**/.pnp.*": true }, "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" + "source.organizeImports.biome": "explicit", + "source.fixAll.biome": "explicit" }, "editor.insertSpaces": false, "files.eol": "\n", "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, "gitlens.advanced.blame.customArguments": ["-w"], - "[javascript][typescript][typescriptreact][javascriptreact][html][scss][css][json][jsonc][markdown][yaml]": { - "editor.rulers": [80], + "[javascript][typescript][javascriptreact][typescriptreact][css][json][jsonc]": { + "editor.defaultFormatter": "biomejs.biome", + "editor.formatOnSave": true, + "editor.rulers": [80] + }, + "[yaml][markdown][html][scss]": { "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true + "editor.formatOnSave": true, + "editor.rulers": [80] }, "workbench.editorAssociations": { "*.dmi": "dmiEditor.dmiEditor" diff --git a/.vscode/tasks.json b/.vscode/tasks.json index defa41d9ba9..1f7c9117e5e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -16,8 +16,7 @@ }, "problemMatcher": [ "$dreammaker", - "$tsc", - "$eslint-stylish" + "$tsc" ], "group": { "kind": "build", @@ -61,8 +60,7 @@ "command": ".\\bin\\tgui-build.cmd" }, "problemMatcher": [ - "$tsc", - "$eslint-stylish" + "$tsc" ], "group": "build", "label": "tgui: build" @@ -74,38 +72,11 @@ "command": ".\\bin\\tgui-dev.cmd" }, "problemMatcher": [ - "$tsc", - "$eslint-stylish" + "$tsc" ], "group": "build", "label": "tgui: dev server" }, - { - "type": "shell", - "command": "bin/tgui-bench", - "windows": { - "command": ".\\bin\\tgui-bench.cmd" - }, - "problemMatcher": [ - "$tsc", - "$eslint-stylish" - ], - "group": "build", - "label": "tgui: bench" - }, - { - "type": "shell", - "command": "bin/tgui-sonar", - "windows": { - "command": ".\\bin\\tgui-sonar.cmd" - }, - "problemMatcher": [ - "$tsc", - "$eslint-stylish" - ], - "group": "build", - "label": "tgui: sonar" - }, { "type": "shell", "command": "bin/tgfont", @@ -113,8 +84,7 @@ "command": ".\\bin\\tgfont.cmd" }, "problemMatcher": [ - "$tsc", - "$eslint-stylish" + "$tsc" ], "group": "build", "label": "tgui: rebuild tgfont" diff --git a/aurorastation.dme b/aurorastation.dme index 8b5ecd1d2a2..a43de7cdd45 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -155,6 +155,7 @@ #include "code\__DEFINES\targeting.dm" #include "code\__DEFINES\technomancer.dm" #include "code\__DEFINES\text.dm" +#include "code\__DEFINES\tgs.config.dm" #include "code\__DEFINES\tgs.dm" #include "code\__DEFINES\tgui.dm" #include "code\__DEFINES\time.dm" @@ -184,6 +185,7 @@ #include "code\__DEFINES\dcs\signals\signals_record.dm" #include "code\__DEFINES\dcs\signals\signals_spatial_grid.dm" #include "code\__DEFINES\dcs\signals\signals_subsystem.dm" +#include "code\__DEFINES\dcs\signals\signals_tgui.dm" #include "code\__DEFINES\dcs\signals\signals_tools.dm" #include "code\__DEFINES\dcs\signals\signals_turf.dm" #include "code\__DEFINES\dcs\signals\signals_weather.dm" @@ -404,6 +406,7 @@ #include "code\controllers\subsystems\stickyban.dm" #include "code\controllers\subsystems\sun.dm" #include "code\controllers\subsystems\sunlight.dm" +#include "code\controllers\subsystems\tgui.dm" #include "code\controllers\subsystems\throwing.dm" #include "code\controllers\subsystems\ticker.dm" #include "code\controllers\subsystems\time_track.dm" @@ -448,7 +451,6 @@ #include "code\controllers\subsystems\processing\electronics.dm" #include "code\controllers\subsystems\processing\fast_process.dm" #include "code\controllers\subsystems\processing\modifiers.dm" -#include "code\controllers\subsystems\processing\nanoui.dm" #include "code\controllers\subsystems\processing\ntsl2.dm" #include "code\controllers\subsystems\processing\obj_tab_items.dm" #include "code\controllers\subsystems\processing\odyssey.dm" @@ -457,7 +459,6 @@ #include "code\controllers\subsystems\processing\projectiles.dm" #include "code\controllers\subsystems\processing\psi.dm" #include "code\controllers\subsystems\processing\shuttle.dm" -#include "code\controllers\subsystems\processing\tgui.dm" #include "code\datums\ai_law_sets.dm" #include "code\datums\ai_laws.dm" #include "code\datums\beam.dm" @@ -465,6 +466,7 @@ #include "code\datums\callback.dm" #include "code\datums\cargo.dm" #include "code\datums\category.dm" +#include "code\datums\chat_payload.dm" #include "code\datums\computerfiles.dm" #include "code\datums\datum.dm" #include "code\datums\datumvars.dm" @@ -616,6 +618,7 @@ #include "code\datums\outfits\event\outfit_killers.dm" #include "code\datums\outfits\event\outfit_megacorps.dm" #include "code\datums\outfits\event\outfit_nanotrasen.dm" +#include "code\datums\outfits\event\outfit_oe.dm" #include "code\datums\outfits\event\outfit_scc.dm" #include "code\datums\outfits\event\outfit_siib.dm" #include "code\datums\outfits\event\outfit_tfcl.dm" @@ -3166,13 +3169,6 @@ #include "code\modules\multiz\zmimic\mimic_common.dm" #include "code\modules\multiz\zmimic\mimic_movable.dm" #include "code\modules\multiz\zmimic\mimic_turf.dm" -#include "code\modules\nano\nanoexternal.dm" -#include "code\modules\nano\nanomapgen.dm" -#include "code\modules\nano\nanoui.dm" -#include "code\modules\nano\modules\follow_menu.dm" -#include "code\modules\nano\modules\human_appearance.dm" -#include "code\modules\nano\modules\nano_module.dm" -#include "code\modules\nano\modules\narrate_panel.dm" #include "code\modules\ntsl2\guide.dm" #include "code\modules\ntsl2\ntsl2_program.dm" #include "code\modules\ntsl2\ntsl2_types.dm" @@ -3935,8 +3931,11 @@ #include "code\modules\tgui\modules\armor_values.dm" #include "code\modules\tgui\modules\faction_select.dm" #include "code\modules\tgui\modules\flavor_text.dm" +#include "code\modules\tgui\modules\follow_menu.dm" #include "code\modules\tgui\modules\hivenet_manifest.dm" +#include "code\modules\tgui\modules\human_appearance.dm" #include "code\modules\tgui\modules\ipc_diagnostic.dm" +#include "code\modules\tgui\modules\narrate_panel.dm" #include "code\modules\tgui\modules\neural_configuration.dm" #include "code\modules\tgui\states\admin.dm" #include "code\modules\tgui\states\always.dm" @@ -3959,6 +3958,8 @@ #include "code\modules\tgui\states\self.dm" #include "code\modules\tgui\states\zlevel.dm" #include "code\modules\tgui_input\alert.dm" +#include "code\modules\tgui_input\checkboxes.dm" +#include "code\modules\tgui_input\keycombo.dm" #include "code\modules\tgui_input\list.dm" #include "code\modules\tgui_input\number.dm" #include "code\modules\tgui_input\text.dm" diff --git a/biome.json b/biome.json new file mode 100644 index 00000000000..77ea1bef89f --- /dev/null +++ b/biome.json @@ -0,0 +1,75 @@ +{ + "$schema": "https://biomejs.dev/schemas/2.1.2/schema.json", + "assist": { + "actions": { + "source": { + "organizeImports": "on" + } + }, + "enabled": true + }, + "css": { + "formatter": { + "quoteStyle": "double" + } + }, + "files": { + "ignoreUnknown": false, + "includes": [ + "**", + "!**/node_modules", + "!tgui/public", + "tgui/public/tgui.html", + "!tgui/packages/tgui-setup/helpers.js" + ] + }, + "formatter": { + "enabled": true, + "indentStyle": "tab", + "lineEnding": "lf" + }, + "javascript": { + "formatter": { + "indentStyle": "space", + "quoteStyle": "single" + } + }, + "linter": { + "enabled": true, + "rules": { + "recommended": true, + "a11y": "off", + "correctness": { + "noUnusedImports": "warn", + "noUnusedVariables": "off", + "useExhaustiveDependencies": "off", + "noUnusedFunctionParameters": "off", + "useHookAtTopLevel": "off" + }, + "security": { + "noDangerouslySetInnerHtml": "off" + }, + "style": { + "noNonNullAssertion": "off", + "useSelfClosingElements": "error", + "useTemplate": "off", + "useNodejsImportProtocol": "off" + }, + "suspicious": { + "noArrayIndexKey": "off", + "noExplicitAny": "off", + "noImplicitAnyLet": "off", + "noShadowRestrictedNames": "off" + }, + "complexity": { + "noImportantStyles": "off", + "useOptionalChain": "off" + } + } + }, + "vcs": { + "clientKind": "git", + "enabled": false, + "useIgnoreFile": false + } +} diff --git a/bun.lock b/bun.lock new file mode 100644 index 00000000000..779e0ce9801 --- /dev/null +++ b/bun.lock @@ -0,0 +1,32 @@ +{ + "lockfileVersion": 1, + "workspaces": { + "": { + "devDependencies": { + "@biomejs/biome": "^2.1.2", + "prettier": "^3.6.2", + }, + }, + }, + "packages": { + "@biomejs/biome": ["@biomejs/biome@2.4.15", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.4.15", "@biomejs/cli-darwin-x64": "2.4.15", "@biomejs/cli-linux-arm64": "2.4.15", "@biomejs/cli-linux-arm64-musl": "2.4.15", "@biomejs/cli-linux-x64": "2.4.15", "@biomejs/cli-linux-x64-musl": "2.4.15", "@biomejs/cli-win32-arm64": "2.4.15", "@biomejs/cli-win32-x64": "2.4.15" }, "bin": { "biome": "bin/biome" } }, "sha512-j5VH3a/h/HXTKBM50MDMxRCzkeLv9S2XJcW2WgnZT1+xyisi+0bISrXR82gCX+8S9lvK0skEvHJRN+3Ktr2hlw=="], + + "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.4.15", "", { "os": "darwin", "cpu": "arm64" }, "sha512-rF3PPqLq1yoST79zaQbDjVJwsuIeci/O+9bgNmC5QpgOqz6aqYuzA4abyAGx+mgyiDXn4A049xAN8gijbuR1Qg=="], + + "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.4.15", "", { "os": "darwin", "cpu": "x64" }, "sha512-/5KHXYMfSJs1fNXiX30xFtI8JcCFV6zaVVLxOa0M2sfqBKHkpQhRTv94yxQWxeTY2lzo2OuTlNvPC+hDQt2wcQ=="], + + "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.4.15", "", { "os": "linux", "cpu": "arm64" }, "sha512-owaAMZD/T4LrD0ELNCk0Km3qrRHuM0X6EAyVE1FSqGY0rbLoiDLrO4Us2tllm6cAeB2Ioa9C2C08NZPdr8+0Ug=="], + + "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.4.15", "", { "os": "linux", "cpu": "arm64" }, "sha512-ZPcxznxm0pogHBLZhYntyR3sR+MrZjqJIKEr7ZqVen0Rl+P/4upVmfYXjftizi9RoqZntg33fv/1fbdhbYXpEQ=="], + + "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.4.15", "", { "os": "linux", "cpu": "x64" }, "sha512-0jj7THz12GbUOLmMibktK6DZjqz2zV64KFxyBtcFTKPiiOIY0a7vns1elpO1dERvxpsZ5ik0oFfz0oGwFde1+g=="], + + "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.4.15", "", { "os": "linux", "cpu": "x64" }, "sha512-CNq/9W38SYSH023lfcQ4KKU8K0YX8T//FZUhcgtMMRABDojx5XsMV7jlweAvGSl389wJQB29Qo6Zb/a+jdvt+w=="], + + "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.4.15", "", { "os": "win32", "cpu": "arm64" }, "sha512-ouhkYdlhp/1GghEJPdWwD/Vi3gQ1nFxuSpMolWsbq3Lsq3QUR4jl6UdhhscdCugKU5vOEuMiJhvKj66O0OCq+w=="], + + "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.4.15", "", { "os": "win32", "cpu": "x64" }, "sha512-zBrGq5mx5wwpnow4+2BxUvleDM+GNd4sLbPaMapsSLQLD0NGRCquqPBTgN+7XkUteHvj7M+BstuI8tmnV7+HgQ=="], + + "prettier": ["prettier@3.8.3", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw=="], + } +} diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 132f34f96b5..766f5810afc 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -2,7 +2,6 @@ Contains helper procs for airflow, handled in /connection_group. */ -/mob/var/tmp/last_airflow_stun = 0 /mob/proc/airflow_stun() if(stat == 2) return 0 @@ -60,11 +59,6 @@ Contains helper procs for airflow, handled in /connection_group. if(4,5) if(n < GLOB.vsc.airflow_medium_pressure) return 0 -/atom/movable/var/tmp/turf/airflow_dest -/atom/movable/var/tmp/airflow_speed = 0 -/atom/movable/var/tmp/airflow_time = 0 -/atom/movable/var/tmp/last_airflow = 0 - /atom/movable/proc/AirflowCanMove(n) return 1 diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index d554c7a9d33..bb76edb4c62 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -20,8 +20,6 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contaminat ///Does being in sleeping gas cause you to hallucinate? var/N2O_HALLUCINATION = TRUE -/obj/var/contaminated = 0 - /obj/item/proc/can_contaminate() if(item_flags & ITEM_FLAG_PHORON_GUARD) return FALSE diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index 79d9e700376..fecfb93bb32 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -56,6 +56,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define PASSDOORHATCH (1<<15) #define PASSTRACE (1<<16) //Used by turrets in the check_trajectory proc to target mobs hiding behind certain things (such as closets) #define PASSRAILING (1<<17) +/// Allows you to pass over energy shields, these also have additional handling for blocking projectiles in their on_hit(). +#define PASSSHIELD (1<<18) //Movement Types #define GROUND (1<<0) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index d8f8e0ac04d..dfca0aed569 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -32,3 +32,24 @@ #define BULLET_ACT_FORCE_PIERCE "PIERCE" //It pierces through the object regardless of the bullet being piercing by default. #define NICE_SHOT_RICOCHET_BONUS 10 //if the shooter has the NICE_SHOT trait and they fire a ricocheting projectile, add this to the ricochet chance and auto aim angle + +//attack visual effects +#define ATTACK_EFFECT_PUNCH "punch" +#define ATTACK_EFFECT_KICK "kick" +#define ATTACK_EFFECT_SMASH "smash" +#define ATTACK_EFFECT_CLAW "claw" +#define ATTACK_EFFECT_SLASH "slash" +#define ATTACK_EFFECT_DISARM "disarm" +#define ATTACK_EFFECT_BITE "bite" +#define ATTACK_EFFECT_MECHFIRE "mech_fire" +#define ATTACK_EFFECT_MECHTOXIN "mech_toxin" +#define ATTACK_EFFECT_BOOP "boop" //Honk +#define ATTACK_EFFECT_VOID "void" +#define ATTACK_EFFECT_CPR "cpr" + +/// Attack animation for sharp items +#define ATTACK_ANIMATION_SLASH "slash" +/// Attack animation for pointy items +#define ATTACK_ANIMATION_PIERCE "pierce" +/// Animation for blunt attacks +#define ATTACK_ANIMATION_BLUNT "blunt" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm index f5d03812dcd..2d526bf5c34 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm @@ -9,6 +9,8 @@ #define COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON "atom_init_success_on" ///from base of atom/examine(): (/mob, list/examine_text) #define COMSIG_ATOM_EXAMINE "atom_examine" +///from base of atom/examine_tags(): (/mob, list/examine_tags) +#define COMSIG_ATOM_EXAMINE_TAGS "atom_examine_tags" ///from base of atom/Entered(): (atom/movable/arrived, atom/old_loc, list/atom/old_locs) #define COMSIG_ATOM_ENTERED "atom_entered" /// Sent from the atom that just Entered src. From base of atom/Entered(): (/atom/destination, atom/old_loc, list/atom/old_locs) diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm index e3f7e76ecf7..e692d92b97f 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -46,6 +46,9 @@ /// Sent when a mob rests. #define COMSIG_MOB_RESTED "mob_rested" +/// Sent from /mob/proc/update_canmove() when the mob transitions into lying down. +#define COMSIG_MOB_LYING_DOWN "mob_lying_down" + /// From /obj/item/organ/external/take_damage. Updates the limb's colour matrix. Very laggy, so we do it on reaction to stuff. #define COMSIG_UPDATE_LIMB_IMAGE "update_limb_image" diff --git a/code/__DEFINES/dcs/signals/signals_object/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object/signals_object.dm index f3ec1a99257..846f51b5939 100644 --- a/code/__DEFINES/dcs/signals/signals_object/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_object/signals_object.dm @@ -24,6 +24,8 @@ #define COMSIG_ITEM_ATTACK_SELF "item_attack_self" //from base of obj/item/attack_self_secondary(): (/mob) #define COMSIG_ITEM_ATTACK_SELF_SECONDARY "item_attack_self_secondary" +/// Sent from /obj/item/proc/animate_attack() : (atom/movable/attacker, atom/attacked_atom, animation_type, list/image_override, list/animation_override, list/angle_override) +#define COMSIG_ITEM_ATTACK_ANIMATION "item_attack_animation" ///from base of [obj/item/attack()]: (atom/target, mob/user, proximity_flag, click_parameters) #define COMSIG_ITEM_AFTERATTACK "item_afterattack" diff --git a/code/__DEFINES/dcs/signals/signals_tgui.dm b/code/__DEFINES/dcs/signals/signals_tgui.dm new file mode 100644 index 00000000000..67b979be780 --- /dev/null +++ b/code/__DEFINES/dcs/signals/signals_tgui.dm @@ -0,0 +1,2 @@ +/// Window is fully visible and we can make fragile calls +#define COMSIG_TGUI_WINDOW_VISIBLE "tgui_window_visible" diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 4a832647a1d..cfb9545b8c3 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -51,8 +51,6 @@ #define LEFT 1 #define RIGHT 2 -#define FIST_ATTACK_ANIMATION -1 - // Pulse levels, very simplified. #define PULSE_NONE 0 // So !M.pulse checks would be possible. #define PULSE_SLOW 1 // <60 bpm diff --git a/code/__DEFINES/modular_guns.dm b/code/__DEFINES/modular_guns.dm index 8a268ea1c14..162908f45b2 100644 --- a/code/__DEFINES/modular_guns.dm +++ b/code/__DEFINES/modular_guns.dm @@ -8,9 +8,9 @@ ///The maximum improvement that can be applied to a weapon component. #define IMPROVEMENT_CAP 100 ///The maximum increase an individual variable can recieve over it's initial value. -#define INCREASE_CAP 2 +#define INCREASE_CAP 1.5 ///The maximum decrease an individual variable can recieve under it's initial value. -#define DECREASE_CAP 0.2 +#define DECREASE_CAP 0.5 ///All improvements are multiplied by this value, tweak down if they are too strong, up if they are too weak. #define IMPROVEMENT_MULTIPLIER 1 diff --git a/code/__DEFINES/organs.dm b/code/__DEFINES/organs.dm index 7aaf62e4086..33aecdde263 100644 --- a/code/__DEFINES/organs.dm +++ b/code/__DEFINES/organs.dm @@ -49,8 +49,8 @@ */ #define COMSIG_GRAVITY_WEAKNESS_EVENT "gravity_weakness_event" -/// Raised external organ (a limb) takes damage. Used for the synthetic endoskeleton at the moment. Must supply damage. -#define COMSIG_EXTERNAL_ORGAN_DAMAGE "machine_internal_damage" +/// This is raised when you want to send damage to the synthetic endoskeleton. Must supply a damage number. +#define COMSIG_DAMAGE_TO_ENDOSKELETON "machine_internal_damage" /// Sent when the burst damage is cleared by the posibrain. #define COMSIG_SYNTH_EMP_DAMAGE_CLEARED "emp_damage_cleared" diff --git a/code/__DEFINES/ship_weapons.dm b/code/__DEFINES/ship_weapons.dm index 0d9035029bf..4e3726744aa 100644 --- a/code/__DEFINES/ship_weapons.dm +++ b/code/__DEFINES/ship_weapons.dm @@ -23,6 +23,7 @@ #define SHIP_AMMO_IMPACT_HE "high explosive" #define SHIP_AMMO_IMPACT_PROBE "sensor probe" #define SHIP_AMMO_IMPACT_FMJ "full metal jacket" +#define SHIP_AMMO_IMPACT_FRAG "fragmentation" #define SHIP_AMMO_IMPACT_AP "armour-piercing" #define SHIP_AMMO_IMPACT_LASER "laser" #define SHIP_AMMO_IMPACT_BUNKERBUSTER "bunker-buster" diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 3ccaa9294d5..61c79492ecd 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -24,6 +24,7 @@ #define SPAN_COLOR(color, str) SPAN_STYLE("color: [color]", "[str]") #define SPAN_CAUTION(str) ("" + str + "") #define SPAN_STORYTELLER(str) ("" + str + "") +#define SPAN_BOLDANNOUNCE(str) ("" + str + "") #define SPAN_MACHINE_WARNING(str) ("" + str + "") #define SPAN_MACHINE_DANGER(str) ("" + str + "") @@ -42,6 +43,9 @@ #define SPAN_BOLDNOTICE(str) ("" + str + "") #define SPAN_BOLDWARNING(X) "[X]" +// Spans that use embedded tgui components: +#define SPAN_TOOLTIP(tip, main_text) ("" + main_text + "") + /* ##################### Font sizes diff --git a/code/__DEFINES/subsystem-priority.dm b/code/__DEFINES/subsystem-priority.dm index 572c39c4edb..2ec6f3aadcf 100644 --- a/code/__DEFINES/subsystem-priority.dm +++ b/code/__DEFINES/subsystem-priority.dm @@ -36,7 +36,6 @@ #define SS_PRIORITY_STATPANELS 25 // Statpanels. #define SS_PRIORITY_LIGHTING 25 // Queued lighting engine updates. #define SS_PRIORITY_MACHINERY 25 // Machinery + powernet ticks. -#define SS_PRIORITY_NANOUI 25 // UI updates. #define SS_PRIORITY_ELECTRONICS 20 // Integrated Electronics processing. #define SS_PRIORITY_CALAMITY 20 // Singularity, Tesla, Nar'sie, blob, etc. #define SS_PRIORITY_EVENT 20 diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 864b8941fd4..9a3bb4d4ce8 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -277,6 +277,7 @@ #define FIRE_PRIORITY_SPACEDRIFT 30 #define FIRE_PRIORITY_DEFAULT 50 #define FIRE_PRIORITY_MOBS 100 +#define FIRE_PRIORITY_TGUI 110 #define FIRE_PRIORITY_STATPANEL 390 #define FIRE_PRIORITY_CHAT 400 #define FIRE_PRIORITY_RUNECHAT 410 diff --git a/code/__DEFINES/text.dm b/code/__DEFINES/text.dm index 63bafbaa4c4..d0a991f5ca1 100644 --- a/code/__DEFINES/text.dm +++ b/code/__DEFINES/text.dm @@ -50,7 +50,7 @@ #define CHAT_MESSAGE_WIDTH 112 // Setting this much higher than 1024 could allow spammers to DOS the server easily. -#define MAX_MESSAGE_LEN 1024 +#define MAX_MESSAGE_LEN 4096 #define MAX_PAPER_MESSAGE_LEN 3072 #define MAX_BOOK_MESSAGE_LEN 9216 #define MAX_LNAME_LEN 64 diff --git a/code/__DEFINES/tgs.config.dm b/code/__DEFINES/tgs.config.dm new file mode 100644 index 00000000000..4f6ba1af61c --- /dev/null +++ b/code/__DEFINES/tgs.config.dm @@ -0,0 +1,11 @@ +#define TGS_EXTERNAL_CONFIGURATION +#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) GLOBAL_VAR_INIT(##Name, ##Value); GLOBAL_PROTECT(##Name) +#define TGS_READ_GLOBAL(Name) GLOB.##Name +#define TGS_WRITE_GLOBAL(Name, Value) GLOB.##Name = ##Value +#define TGS_WORLD_ANNOUNCE(message) to_chat(world, SPAN_BOLDANNOUNCE("[html_encode(##message)]")) +#define TGS_INFO_LOG(message) log_world("TGS Info: [##message]") +#define TGS_WARNING_LOG(message) log_world("TGS Warn: [##message]") +#define TGS_ERROR_LOG(message) stack_trace("TGS Error: [##message]") +#define TGS_NOTIFY_ADMINS(event) message_admins(##event) +#define TGS_CLIENT_COUNT GLOB.clients.len +#define TGS_PROTECT_DATUM(Path) GENERAL_PROTECT_DATUM(##Path) diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index ef53d466e84..24887137230 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,55 +1,68 @@ // tgstation-server DMAPI +// The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in IETF RFC 2119. -#define TGS_DMAPI_VERSION "6.6.2" +#define TGS_DMAPI_VERSION "7.3.3" // All functions and datums outside this document are subject to change with any version and should not be relied on. // CONFIGURATION -/// Create this define if you want to do TGS configuration outside of this file. +/// Consumers SHOULD create this define if you want to do TGS configuration outside of this file. #ifndef TGS_EXTERNAL_CONFIGURATION -// Comment this out once you've filled in the below. -//#error TGS API unconfigured +// Consumers MUST comment this out once you've filled in the below and are not using [TGS_EXTERNAL_CONFIGURATION]. +// #error TGS API unconfigured -// Uncomment this if you wish to allow the game to interact with TGS 3.. +// Consumers MUST uncomment this if you wish to allow the game to interact with TGS version 3. // This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()(). //#define TGS_V3_API // Required interfaces (fill in with your codebase equivalent): /// Create a global variable named `Name` and set it to `Value`. -#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) var/global/##Name = ##Value +#define TGS_DEFINE_AND_SET_GLOBAL(Name, Value) /// Read the value in the global variable `Name`. -#define TGS_READ_GLOBAL(Name) global.##Name +#define TGS_READ_GLOBAL(Name) /// Set the value in the global variable `Name` to `Value`. -#define TGS_WRITE_GLOBAL(Name, Value) global.##Name = ##Value +#define TGS_WRITE_GLOBAL(Name, Value) /// Disallow ANYONE from reflecting a given `path`, security measure to prevent in-game use of DD -> TGS capabilities. #define TGS_PROTECT_DATUM(Path) /// Display an announcement `message` from the server to all players. -#define TGS_WORLD_ANNOUNCE(message) world << "TGS Notification: [html_encode(##message)]" +#define TGS_WORLD_ANNOUNCE(message) /// Notify current in-game administrators of a string `event`. -#define TGS_NOTIFY_ADMINS(event) message_admins(##event) +#define TGS_NOTIFY_ADMINS(event) /// Write an info `message` to a server log. -#define TGS_INFO_LOG(message) log_tgs("[##message]") +#define TGS_INFO_LOG(message) /// Write an warning `message` to a server log. -#define TGS_WARNING_LOG(message) log_tgs("[##message]", SEVERITY_WARNING) +#define TGS_WARNING_LOG(message) /// Write an error `message` to a server log. -#define TGS_ERROR_LOG(message) log_tgs("[##message]", SEVERITY_ERROR) +#define TGS_ERROR_LOG(message) /// Get the number of connected /clients. -#define TGS_CLIENT_COUNT clients.len +#define TGS_CLIENT_COUNT #endif +#ifndef TGS_FILE2TEXT_NATIVE +#ifdef file2text +#error Your codebase is re-defining the BYOND proc file2text. The DMAPI requires the native version to read the result of world.Export(). You SHOULD fix this by adding "#define TGS_FILE2TEXT_NATIVE file2text" before your override of file2text to allow the DMAPI to use the native version. This will only be used for world.Export(), not regular file accesses +#endif +#define TGS_FILE2TEXT_NATIVE file2text +#endif + +// SpacemanDMM compatibility +#ifndef CAN_BE_REDEFINED +#define CAN_BE_REDEFINED(X) +#endif + // EVENT CODES /// Before a reboot mode change, extras parameters are the current and new reboot mode enums. @@ -73,12 +86,12 @@ #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3 /// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path. #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4 -/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND. -#define TGS_EVENT_BYOND_INSTALL_START 5 -/// When a BYOND install operation fails. Parameters: Error message -#define TGS_EVENT_BYOND_INSTALL_FAIL 6 -/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND. -#define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7 +/// Before a engine install operation begins. Parameters: Version string of the installing engine. +#define TGS_EVENT_ENGINE_INSTALL_START 5 +/// When a engine install operation fails. Parameters: Error message +#define TGS_EVENT_ENGINE_INSTALL_FAIL 6 +/// When the active engine version changes. Parameters: (Nullable) Version string of the current engine, version string of the new engine. +#define TGS_EVENT_ENGINE_ACTIVE_VERSION_CHANGE 7 /// When the compiler starts running. Parameters: Game directory path, origin commit SHA. #define TGS_EVENT_COMPILE_START 8 /// When a compile is cancelled. No parameters. @@ -108,7 +121,7 @@ // #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22 /// After a single submodule update is performed. Parameters: Updated submodule name. #define TGS_EVENT_REPO_SUBMODULE_UPDATE 23 -/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version. +/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, version string of the used engine. #define TGS_EVENT_PRE_DREAM_MAKER 24 /// Whenever a deployment folder is deleted from disk. Parameters: Game directory path. #define TGS_EVENT_DEPLOYMENT_CLEANUP 25 @@ -122,6 +135,7 @@ /// The watchdog will restart on reboot. #define TGS_REBOOT_MODE_RESTART 2 +// Note that security levels are currently meaningless in OpenDream /// DreamDaemon Trusted security level. #define TGS_SECURITY_TRUSTED 0 /// DreamDaemon Safe security level. @@ -136,20 +150,26 @@ /// DreamDaemon invisible visibility level. #define TGS_VISIBILITY_INVISIBLE 2 +/// The Build Your Own Net Dream engine. +#define TGS_ENGINE_TYPE_BYOND 0 +/// The OpenDream engine. +#define TGS_ENGINE_TYPE_OPENDREAM 1 + //REQUIRED HOOKS /** - * Call this somewhere in [/world/proc/New] that is always run. This function may sleep! + * Consumers MUST call this somewhere in [/world/proc/New] that is always run. This function may sleep! * * * event_handler - Optional user defined [/datum/tgs_event_handler]. * * minimum_required_security_level: The minimum required security level to run the game in which the DMAPI is integrated. Can be one of [TGS_SECURITY_ULTRASAFE], [TGS_SECURITY_SAFE], or [TGS_SECURITY_TRUSTED]. + * * http_handler - Optional user defined [/datum/tgs_http_handler]. */ -/world/proc/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE) +/world/proc/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE, datum/tgs_http_handler/http_handler) CAN_BE_REDEFINED(TRUE) return /** - * Call this when your initializations are complete and your game is ready to play before any player interactions happen. + * Consumers MUST call this when world initializations are complete and the game is ready to play before any player interactions happen. * * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running. * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184 @@ -159,12 +179,10 @@ CAN_BE_REDEFINED(TRUE) return -/// Put this at the start of [/world/proc/Topic]. +/// Consumers MUST run this macro at the start of [/world/proc/Topic]. #define TGS_TOPIC var/tgs_topic_return = TgsTopic(args[1]); if(tgs_topic_return) return tgs_topic_return -/** - * Call this as late as possible in [world/proc/Reboot] (BEFORE ..()). - */ +/// Consumers MUST call this as late as possible in [world/proc/Reboot] (BEFORE ..()). /world/proc/TgsReboot() CAN_BE_REDEFINED(TRUE) return @@ -261,7 +279,7 @@ /// The [/datum/tgs_chat_channel] the user was from. var/datum/tgs_chat_channel/channel -/// User definable handler for TGS events. +/// User definable handler for TGS events This abstract version SHOULD be overridden to be used. /datum/tgs_event_handler /// If the handler receieves [TGS_EVENT_HEALTH_CHECK] events. var/receive_health_checks = FALSE @@ -275,7 +293,41 @@ set waitfor = FALSE return -/// User definable chat command. +/// User definable handler for HTTP calls. This abstract version MUST be overridden to be used. +/datum/tgs_http_handler + +/** + * User definable callback for executing HTTP GET requests. + * MUST perform BYOND sleeps while the request is in flight. + * MUST return a [/datum/tgs_http_result]. + * SHOULD log its own errors + * + * url - The full URL to execute the GET request for including query parameters. + */ +/datum/tgs_http_handler/proc/PerformGet(url) + CRASH("[type]/PerformGet not implemented!") + +/// Result of a [/datum/tgs_http_handler] call. MUST NOT be overridden. +/datum/tgs_http_result + /// HTTP response as text + var/response_text + /// Boolean request success flag. Set for any 2XX response code. + var/success + +/** + * Create a [/datum/tgs_http_result]. + * + * * response_text - HTTP response as text. Must be provided in New(). + * * success - Boolean request success flag. Set for any 2XX response code. Must be provided in New(). + */ +/datum/tgs_http_result/New(response_text, success) + if(response_text && !istext(response_text)) + CRASH("response_text was not text!") + + src.response_text = response_text + src.success = success + +/// User definable chat command. This abstract version MUST be overridden to be used. /datum/tgs_chat_command /// The string to trigger this command on a chat bot. e.g `@bot name ...` or `!tgs name ...`. var/name = "" @@ -288,29 +340,36 @@ /** * Process command activation. Should return a [/datum/tgs_message_content] to respond to the issuer with. + * MUST be implemented * - * sender - The [/datum/tgs_chat_user] who issued the command. - * params - The trimmed string following the command `/datum/tgs_chat_command/var/name]. + * * sender - The [/datum/tgs_chat_user] who issued the command. + * * params - The trimmed string following the command `/datum/tgs_chat_command/var/name]. */ /datum/tgs_chat_command/proc/Run(datum/tgs_chat_user/sender, params) CRASH("[type] has no implementation for Run()") -/// User definable chat message. +/// User definable chat message. MUST NOT be overridden. /datum/tgs_message_content - /// The tring content of the message. Must be provided in New(). + /// The string content of the message. Must be provided in New(). var/text /// The [/datum/tgs_chat_embed] to embed in the message. Not supported on all chat providers. var/datum/tgs_chat_embed/structure/embed +/** + * Create a [/datum/tgs_message_content]. + * + * * text - The string content of the message. + */ /datum/tgs_message_content/New(text) + ..() if(!istext(text)) TGS_ERROR_LOG("[/datum/tgs_message_content] created with no text!") text = null src.text = text -/// User definable chat embed. Currently mirrors Discord chat embeds. See https://discord.com/developers/docs/resources/channel#embed-object-embed-structure for details. +/// User definable chat embed. Currently mirrors Discord chat embeds. See https://discord.com/developers/docs/resources/message#embed-object for details. /datum/tgs_chat_embed/structure var/title var/description @@ -322,13 +381,13 @@ /// Colour must be #AARRGGBB or #RRGGBB hex string. var/colour - /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure for details. + /// See https://discord.com/developers/docs/resources/message#embed-object-embed-image-structure for details. var/datum/tgs_chat_embed/media/image - /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-thumbnail-structure for details. + /// See https://discord.com/developers/docs/resources/message#embed-object-embed-thumbnail-structure for details. var/datum/tgs_chat_embed/media/thumbnail - /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure for details. + /// See https://discord.com/developers/docs/resources/message#embed-object-embed-video-structure for details. var/datum/tgs_chat_embed/media/video var/datum/tgs_chat_embed/footer/footer @@ -337,7 +396,7 @@ var/list/datum/tgs_chat_embed/field/fields -/// Common datum for similar discord embed medias. +/// Common datum for similar Discord embed medias. /datum/tgs_chat_embed/media /// Must be set in New(). var/url @@ -345,48 +404,58 @@ var/height var/proxy_url +/// Create a [/datum/tgs_chat_embed]. /datum/tgs_chat_embed/media/New(url) + ..() if(!istext(url)) CRASH("[/datum/tgs_chat_embed/media] created with no url!") src.url = url -/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure for details. +/// See https://discord.com/developers/docs/resources/message#embed-object-embed-footer-structure for details. /datum/tgs_chat_embed/footer /// Must be set in New(). var/text var/icon_url var/proxy_icon_url +/// Create a [/datum/tgs_chat_embed/footer]. /datum/tgs_chat_embed/footer/New(text) + ..() if(!istext(text)) CRASH("[/datum/tgs_chat_embed/footer] created with no text!") src.text = text -/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-provider-structure for details. +/// See https://discord.com/developers/docs/resources/message#embed-object-embed-provider-structure for details. /datum/tgs_chat_embed/provider var/name var/url -/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure for details. Must have name set in New(). +/// See https://discord.com/developers/docs/resources/message#embed-object-embed-author-structure for details. Must have name set in New(). /datum/tgs_chat_embed/provider/author var/icon_url var/proxy_icon_url +/// Create a [/datum/tgs_chat_embed/footer]. /datum/tgs_chat_embed/provider/author/New(name) + ..() if(!istext(name)) CRASH("[/datum/tgs_chat_embed/provider/author] created with no name!") src.name = name -/// See https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure for details. Must have name and value set in New(). +/// See https://discord.com/developers/docs/resources/message#embed-object-embed-field-structure for details. /datum/tgs_chat_embed/field + /// Must be set in New(). var/name + /// Must be set in New(). var/value var/is_inline +/// Create a [/datum/tgs_chat_embed/field]. /datum/tgs_chat_embed/field/New(name, value) + ..() if(!istext(name)) CRASH("[/datum/tgs_chat_embed/field] created with no name!") @@ -429,6 +498,7 @@ /** * Send a message to connected chats. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies. @@ -439,6 +509,7 @@ /** * Send a private message to a specific user. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * user: The [/datum/tgs_chat_user] to PM. @@ -449,6 +520,7 @@ /** * Send a message to connected chats that are flagged as game-related in TGS. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to. @@ -462,6 +534,11 @@ CAN_BE_REDEFINED(TRUE) return +/// Returns the running engine type +/world/proc/TgsEngine() + CAN_BE_REDEFINED(TRUE) + return + /// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsApiVersion() CAN_BE_REDEFINED(TRUE) @@ -497,10 +574,21 @@ CAN_BE_REDEFINED(TRUE) return +/** + * Trigger an event in TGS. Requires TGS version >= 6.3.0. Returns [TRUE] if the event was triggered successfully, [FALSE] otherwise. This function may sleep! + * + * event_name - The name of the event to trigger + * parameters - Optional list of string parameters to pass as arguments to the event script. The first parameter passed to a script will always be the running game's directory followed by these parameters. + * wait_for_completion - If set, this function will not return until the event has run to completion. + */ +/world/proc/TgsTriggerEvent(event_name, list/parameters, wait_for_completion = FALSE) + CAN_BE_REDEFINED(TRUE) + return + /* The MIT License -Copyright (c) 2017-2023 Jordan Brown +Copyright (c) 2017-2024 Jordan Brown Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/code/__DEFINES/tgui.dm b/code/__DEFINES/tgui.dm index db68d7089a6..b0cd0a979d4 100644 --- a/code/__DEFINES/tgui.dm +++ b/code/__DEFINES/tgui.dm @@ -24,6 +24,16 @@ /// Window is free and ready to receive data #define TGUI_WINDOW_READY 2 +/// Though not the maximum renderable ByondUis within tgui, this is the maximum that the server will manage per-UI +#define TGUI_MANAGED_BYONDUI_LIMIT 10 + +// These are defines instead of being inline, as they're being sent over +// from tgui-core, so can't be easily played with +#define TGUI_MANAGED_BYONDUI_TYPE_RENDER "renderByondUi" +#define TGUI_MANAGED_BYONDUI_TYPE_UNMOUNT "unmountByondUi" + +#define TGUI_MANAGED_BYONDUI_PAYLOAD_ID "renderByondUi" + /// Get a window id based on the provided pool index #define TGUI_WINDOW_ID(index) "tgui-window-[index]" /// Get a pool index of the provided window id diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index e5e7fba837d..18edf8f24b0 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -94,6 +94,9 @@ /proc/is_shuttle_area(var/area/A) . = istype(A,/area/horizon/shuttle) +/proc/is_shieldless_exterior(var/area/A) + . = istype(A,/area/horizon/exterior/no_shields) + /proc/is_area_with_turf(var/area/A) . = isnum(A.x) diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index d40e4f19849..9d001ba9f93 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -274,7 +274,7 @@ /** * Blend atoms */ -/atom/proc/handle_blending(adjacencies, var/list/dir_mods) +/atom/proc/handle_blending(adjacencies, list/dir_mods) SHOULD_NOT_SLEEP(TRUE) LAZYINITLIST(dir_mods) @@ -282,10 +282,10 @@ var/walls_found = 0 for(var/adjacency in list(N_NORTH, N_EAST, N_SOUTH, N_WEST)) if(adjacencies & adjacency) - var/turf/T = get_step(src, REVERSE_DIR(adjacency)) + var/turf/T = get_step(src, GLOB.ndir_to_dir[adjacency]) // get_step() expects byond native directions, so we convert N_* bitfields if(is_type_in_list(T, can_blend_with)) if(attach_overlay) - AddOverlays("[REVERSE_DIR(adjacency)]_[attach_overlay]") + AddOverlays("[GLOB.ndir_to_dir[adjacency]]_[attach_overlay]") walls_found |= adjacency dir_mods["[adjacency]"] = "-[blend_overlay]" for(var/adjacency in list(N_NORTH, N_SOUTH)) @@ -297,7 +297,7 @@ var/has_adjacency = walls_found & adjacency var/has_diagonal = walls_found & diagonal - if(((adjacencies & adjacency) && (adjacencies && diagonal)) && (has_adjacency || has_diagonal)) + if(((adjacencies & adjacency) && (adjacencies & diagonal)) && (has_adjacency || has_diagonal)) dir_mods["[adjacency][diagonal]"] = "-[prefix][has_adjacency ? "wall" : "win"]-[suffix][has_diagonal ? "wall" : "win"]" if(attach_overlay) AddOverlays("[prefix][suffix]_[attach_overlay]") @@ -305,10 +305,15 @@ #undef ndir_to_initial -/atom/proc/cardinal_smooth(adjacencies) +/atom/proc/cardinal_smooth(adjacencies, list/dir_mods) SHOULD_NOT_SLEEP(TRUE) + /** + * Below here we evaluate an object by their 4 corners and tell them how they're supposed to smooth depending on its adjacencies. + * The adjacencies we care about is the things that the atom can smooth with, determined in 'calculate_adjacencies()'. + * Think this as mapping an icon, every 16x16 corner counts. + */ - //NW CORNER + // NW CORNER var/nw = "1-i" if((adjacencies & N_NORTH) && (adjacencies & N_WEST)) if(adjacencies & N_NORTHWEST) @@ -321,7 +326,7 @@ else if(adjacencies & N_WEST) nw = "1-w" - //NE CORNER + // NE CORNER var/ne = "2-i" if((adjacencies & N_NORTH) && (adjacencies & N_EAST)) if(adjacencies & N_NORTHEAST) @@ -334,7 +339,7 @@ else if(adjacencies & N_EAST) ne = "2-e" - //SW CORNER + // SW CORNER var/sw = "3-i" if((adjacencies & N_SOUTH) && (adjacencies & N_WEST)) if(adjacencies & N_SOUTHWEST) @@ -347,7 +352,7 @@ else if(adjacencies & N_WEST) sw = "3-w" - //SE CORNER + // SE CORNER var/se = "4-i" if((adjacencies & N_SOUTH) && (adjacencies & N_EAST)) if(adjacencies & N_SOUTHEAST) @@ -360,6 +365,36 @@ else if(adjacencies & N_EAST) se = "4-e" + /** + * Here we handle blend overlays. This is an extra step if we want our icons to take account whatever is defined in their 'can_blend_with' list + * and apply a different smooth overlay for them. An example to this is windows, they'll smooth regularly among themselves but if there's + * a wall next to them they'll apply a junction part. See 'handle_blending()' for blending direction modifiers (dir_mods). + */ + if(length(dir_mods)) + + nw += LAZYACCESS(dir_mods, "[N_NORTH][N_WEST][N_NORTHWEST]") \ + || LAZYACCESS(dir_mods, "[N_NORTH][N_WEST]") \ + || LAZYACCESS(dir_mods, "[N_NORTH]") \ + || LAZYACCESS(dir_mods, "[N_WEST]") + + ne += LAZYACCESS(dir_mods, "[N_NORTH][N_EAST][N_NORTHEAST]") \ + || LAZYACCESS(dir_mods, "[N_NORTH][N_EAST]") \ + || LAZYACCESS(dir_mods, "[N_NORTH]") \ + || LAZYACCESS(dir_mods, "[N_EAST]") + + sw += LAZYACCESS(dir_mods, "[N_SOUTH][N_WEST][N_SOUTHWEST]") \ + || LAZYACCESS(dir_mods, "[N_SOUTH][N_WEST]") \ + || LAZYACCESS(dir_mods, "[N_SOUTH]") \ + || LAZYACCESS(dir_mods, "[N_WEST]") + + se += LAZYACCESS(dir_mods, "[N_SOUTH][N_EAST][N_SOUTHEAST]") \ + || LAZYACCESS(dir_mods, "[N_SOUTH][N_EAST]") \ + || LAZYACCESS(dir_mods, "[N_SOUTH]") \ + || LAZYACCESS(dir_mods, "[N_EAST]") + + /** + * Here we apply all the 4 corners we calculated and clean the cached corners. + */ var/list/New var/list/Old var/cut_f = smoothing_hints & SMOOTHHINT_CUT_F diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 8b6897358a6..d0baafa1094 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -912,3 +912,31 @@ /proc/endswith(input_text, ending) var/input_length = LAZYLEN(ending) return !!findtext(input_text, ending, -input_length) + +///Returns a string based on the weight class define used as argument +/proc/weight_class_to_text(w_class) + switch(w_class) + if(WEIGHT_CLASS_TINY) + . = "tiny" + if(WEIGHT_CLASS_SMALL) + . = "small" + if(WEIGHT_CLASS_NORMAL) + . = "normal-sized" + if(WEIGHT_CLASS_BULKY) + . = "bulky" + if(WEIGHT_CLASS_HUGE) + . = "huge" + if(WEIGHT_CLASS_GIGANTIC) + . = "gigantic" + else + . = "" + +/proc/weight_class_to_tooltip(w_class) + switch(w_class) + if(WEIGHT_CLASS_TINY to WEIGHT_CLASS_SMALL) + return "This item can fit into pockets, boxes and backpacks." + if(WEIGHT_CLASS_NORMAL) + return "This item can fit into backpacks." + if(WEIGHT_CLASS_BULKY to WEIGHT_CLASS_GIGANTIC) + return "This item is too large to fit into any standard storage." + return "" diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm index f93e5bbdc31..5e7be94c355 100644 --- a/code/__HELPERS/turfs.dm +++ b/code/__HELPERS/turfs.dm @@ -50,6 +50,8 @@ turfs += T if(turfs.len) return pick(turfs) + else + return null ///Returns a turf based on text inputs, original turf and viewing client /proc/parse_caught_click_modifiers(list/modifiers, turf/origin, client/viewing_client) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 0f1515c4ffd..9fc9da65ddd 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -623,11 +623,6 @@ Turf and target are seperate in case you want to teleport some distance from a t if (progbar) qdel(progbar) -/// Integer. Unique sequential ID from the `do_after` proc used to validate `DO_USER_UNIQUE_ACT` flag checks. -/mob/var/do_unique_user_handle = 0 -/// The mob currently interacting with the atom during a `do_after` timer. Used to validate `DO_TARGET_UNIQUE_ACT` flag checks. -/atom/var/mob/do_unique_target_user - /** * Timed actions involving one mob user and (optionally) one target. * diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm index 7a406477291..a130b776b1c 100644 --- a/code/_globalvars/lists/mapping.dm +++ b/code/_globalvars/lists/mapping.dm @@ -93,6 +93,18 @@ GLOBAL_LIST_INIT(alldirs, list( SOUTHWEST, )) +/// Used in N_* directions (defined in \code\_DEFINES\icon_smoothing.dm) to Byond native conversions +GLOBAL_LIST_INIT(ndir_to_dir, alist( + N_NORTH = NORTH, + N_SOUTH = SOUTH, + N_EAST = EAST, + N_WEST = WEST, + N_NORTHEAST = NORTHEAST, + N_NORTHWEST = NORTHWEST, + N_SOUTHEAST = SOUTHEAST, + N_SOUTHWEST = SOUTHWEST +)) + /// Just a list of all the area objects in the game /// Note, areas can have duplicate types GLOBAL_LIST_EMPTY(areas) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index da088571bec..ae783d2aa6a 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -3,10 +3,6 @@ ~Sayu */ -// 1 decisecond click delay (above and beyond mob/next_move) -/mob/var/next_click = 0 - - /** * Before anything else, defer these calls to a per-mobtype handler. This allows us to * remove istype() spaghetti code, but requires the addition of other handler procs to simplify it. diff --git a/code/_onclick/click_handling.dm b/code/_onclick/click_handling.dm index 286905a12e9..5098404d7f6 100644 --- a/code/_onclick/click_handling.dm +++ b/code/_onclick/click_handling.dm @@ -11,15 +11,6 @@ if(!click_handlers) { \ click_handlers += new/datum/click_handler/default(src) \ } -/** - * LAZYLIST (Instances of `/datum/click_handler`). Click handlers for this mob that should intercept and handle click - * calls. - * - * The 'topmost'/'active' click handler for the mob is the handler currently at index `1`. By default, this will be - * `/datum/click_handler/default`. - */ -/mob/var/list/click_handlers - // In the mob code, because otherwise it's a redefinition // /mob/Destroy() // QDEL_LIST(click_handlers) diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index 69e323792aa..a5eb04343f3 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -284,6 +284,22 @@ check_flags = AB_CHECK_STUNNED|AB_CHECK_ALIVE|AB_CHECK_INSIDE button_icon_state = "night_eyes" +/datum/action/item_action/organ/night_eyes/Trigger() + if(!Checks()) + return + var/obj/item/organ/internal/eyes/night/target_eyes = target + target_eyes.night_vision() + +/datum/action/item_action/organ/extended_eyes + check_flags = AB_CHECK_STUNNED|AB_CHECK_ALIVE|AB_CHECK_INSIDE + button_icon_state = "night_eyes" + +/datum/action/item_action/organ/extended_eyes/Trigger() + if(!Checks()) + return + var/obj/item/organ/internal/eyes/night/target_eyes = target + target_eyes.extended_vision() + /datum/action/item_action/organ/night_eyes/rev check_flags = AB_CHECK_ALIVE|AB_CHECK_INSIDE button_icon_state = "rev_eyes" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index b097111884d..14c1882fa69 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -5,11 +5,6 @@ GLOBAL_DATUM_INIT(global_hud, /datum/global_hud, new) GLOBAL_LIST(global_huds) -/datum/hud/var/atom/movable/screen/grab_intent -/datum/hud/var/atom/movable/screen/hurt_intent -/datum/hud/var/atom/movable/screen/disarm_intent -/datum/hud/var/atom/movable/screen/help_intent - /datum/global_hud var/atom/movable/screen/vr_control var/atom/movable/screen/druggy @@ -111,12 +106,11 @@ GLOBAL_LIST(global_huds) O.layer = IMPAIRED_LAYER O.mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/* - The hud datum - Used to show and hide huds for all the different mob types, - including inventories and item quick actions. -*/ - +/** + * The hud datum + * Used to show and hide huds for all the different mob types, + * including inventories and item quick actions. + */ /datum/hud ///The mob that possesses the HUD var/mob/mymob @@ -136,12 +130,21 @@ GLOBAL_LIST(global_huds) ///Boolean, if the action buttons are hidden var/action_buttons_hidden = FALSE + /* + STOP ADDING SNOWFLAKE HUD ELEMENTS LIKE /datum/hud/var/atom/movable/screen/help_intent + IN DIFFERENT FILES ENTIRELY. IF YOU ARE ADDING A NEW HUD ELEMENT TO THIS, PUT IT IN THIS FILE UNDER THIS LIST, + AND INCLUDE A QDEL_NULL() FOR IT IN THE DESTROY PROC. + */ var/atom/movable/screen/blobpwrdisplay var/atom/movable/screen/blobhealthdisplay var/atom/movable/screen/r_hand_hud_object var/atom/movable/screen/l_hand_hud_object var/atom/movable/screen/action_intent var/atom/movable/screen/movement_intent/move_intent + var/atom/movable/screen/grab_intent + var/atom/movable/screen/hurt_intent + var/atom/movable/screen/disarm_intent + var/atom/movable/screen/help_intent var/list/adding var/list/other @@ -177,26 +180,27 @@ GLOBAL_LIST(global_huds) ..() /datum/hud/Destroy() - grab_intent = null - hurt_intent = null - disarm_intent = null - help_intent = null - blobpwrdisplay = null - blobhealthdisplay = null - r_hand_hud_object = null - l_hand_hud_object = null - action_intent = null - move_intent = null - adding = null - other = null - hotkeybuttons = null -// item_action_list = null // ? mymob = null + QDEL_NULL(blobpwrdisplay) + QDEL_NULL(blobhealthdisplay) + QDEL_NULL(r_hand_hud_object) + QDEL_NULL(l_hand_hud_object) + QDEL_NULL(action_intent) + QDEL_NULL(move_intent) + QDEL_NULL(grab_intent) + QDEL_NULL(hurt_intent) + QDEL_NULL(disarm_intent) + QDEL_NULL(help_intent) + + adding?.Cut() + other?.Cut() + QDEL_LIST(hotkeybuttons) QDEL_LIST_ASSOC_VAL(plane_masters) QDEL_LIST_ASSOC_VAL(plane_master_controllers) + QDEL_NULL(hide_actions_toggle) - . = ..() + return ..() /datum/hud/proc/hidden_inventory_update() if(!mymob) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index d3725ee8186..5e8fe70050f 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -26,10 +26,10 @@ /atom/movable/screen/Destroy(force = FALSE) master = null screen_loc = null - if(hud?.mymob?.client) + if(length(hud?.mymob?.client?.screen)) hud.mymob.client.screen -= src hud = null - . = ..() + return ..() /// Screen elements are always on top of the players screen and don't move so yes they are adjacent /atom/movable/screen/Adjacent(atom/neighbor, atom/target, atom/movable/mover) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 6ee66f8150f..de3344d68d6 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -150,7 +150,7 @@ This calls [atom/proc/tool_act], among others. return 0 user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.do_attack_animation(target_mob, src) + user.do_attack_animation(target_mob, used_item = src) if(!user.aura_check(AURA_TYPE_WEAPON, src, user)) return FALSE diff --git a/code/controllers/subsystems/chat.dm b/code/controllers/subsystems/chat.dm index d76ce698d6f..2d227a07ed9 100644 --- a/code/controllers/subsystems/chat.dm +++ b/code/controllers/subsystems/chat.dm @@ -10,31 +10,82 @@ SUBSYSTEM_DEF(chat) flags = SS_TICKER | SS_NO_INIT wait = 1 priority = FIRE_PRIORITY_CHAT - init_order = INIT_ORDER_CHAT + init_order = INITSTAGE_MAX - var/list/payload_by_client = list() + /// Assosciates a ckey with a list of messages to send to them. + var/list/list/datum/chat_payload/client_to_payloads = list() + + /// Associates a ckey with an assosciative list of their last CHAT_RELIABILITY_HISTORY_SIZE messages. + var/list/list/datum/chat_payload/client_to_reliability_history = list() + + /// Assosciates a ckey with their next sequence number. + var/list/client_to_sequence_number = list() + +/datum/controller/subsystem/chat/proc/generate_payload(client/target, message_data) + var/sequence = client_to_sequence_number[target.ckey] + client_to_sequence_number[target.ckey] += 1 + + var/datum/chat_payload/payload = new + payload.sequence = sequence + payload.content = message_data + + if(!(target.ckey in client_to_reliability_history)) + client_to_reliability_history[target.ckey] = list() + var/list/client_history = client_to_reliability_history[target.ckey] + client_history["[sequence]"] = payload + + if(length(client_history) > 5) + var/oldest = text2num(client_history[1]) + for(var/index in 2 to length(client_history)) + var/test = text2num(client_history[index]) + if(test < oldest) + oldest = test + client_history -= "[oldest]" + return payload + +/datum/controller/subsystem/chat/proc/send_payload_to_client(client/target, datum/chat_payload/payload) + target.tgui_panel.window.send_message("chat/message", payload.into_message()) + SEND_TEXT(target, payload.get_content_as_html()) /datum/controller/subsystem/chat/fire() - for(var/key in payload_by_client) - var/client/client = key - var/payload = payload_by_client[key] - payload_by_client -= key - if(client) - // Send to tgchat - client.tgui_panel?.window.send_message("chat/message", payload) - // Send to old chat - for(var/message in payload) - to_target(client, message_to_html(message)) + for(var/ckey in client_to_payloads) + var/client/target = GLOB.directory[ckey] + if(isnull(target)) // verify client still exists + LAZYREMOVE(client_to_payloads, ckey) + continue + + for(var/datum/chat_payload/payload as anything in client_to_payloads[ckey]) + send_payload_to_client(target, payload) + LAZYREMOVE(client_to_payloads, ckey) + if(MC_TICK_CHECK) return -/datum/controller/subsystem/chat/proc/queue(target, message) - if(islist(target)) - for(var/_target in target) - var/client/client = CLIENT_FROM_VAR(_target) - if(client) - LAZYADD(payload_by_client[client], list(message)) +/datum/controller/subsystem/chat/proc/queue(queue_target, list/message_data) + var/list/targets = islist(queue_target) ? queue_target : list(queue_target) + for(var/target in targets) + var/client/client = CLIENT_FROM_VAR(target) + if(isnull(client)) + continue + LAZYADDASSOCLIST(client_to_payloads, client.ckey, generate_payload(client, message_data)) + +/datum/controller/subsystem/chat/proc/send_immediate(send_target, list/message_data) + var/list/targets = islist(send_target) ? send_target : list(send_target) + for(var/target in targets) + var/client/client = CLIENT_FROM_VAR(target) + if(isnull(client)) + continue + send_payload_to_client(client, generate_payload(client, message_data)) + +/datum/controller/subsystem/chat/proc/handle_resend(client/client, sequence) + var/list/client_history = client_to_reliability_history[client.ckey] + sequence = "[sequence]" + if(isnull(client_history) || !(sequence in client_history)) return - var/client/client = CLIENT_FROM_VAR(target) - if(client) - LAZYADD(payload_by_client[client], list(message)) + + var/datum/chat_payload/payload = client_history[sequence] + if(payload.resends > 3) + return // we tried but byond said no + + payload.resends += 1 + send_payload_to_client(client, client_history[sequence]) diff --git a/code/controllers/subsystems/garbage.dm b/code/controllers/subsystems/garbage.dm index 37e9b91fa51..9ec3886daa6 100644 --- a/code/controllers/subsystems/garbage.dm +++ b/code/controllers/subsystems/garbage.dm @@ -306,6 +306,18 @@ SUBSYSTEM_DEF(garbage) if (time > 0.1 SECONDS) postpone(time) + + // Standard sentry logging for hard dels other than the two subsystems that will always hard del every round + var/sentry_threshold = 0.25 SECONDS + if (time > sentry_threshold && SSsentry) + SSsentry.capture_message( + "Hard delete: [type]", + "warning", + "garbage", + tags = list("datum_type" = "[type]"), + extra = list("ref_id" = refID, "time_ms" = tick_usage, "details" = detail) + ) + var/threshold = 0.5 // Used to be CONFIG_GET(number/hard_deletes_overrun_threshold) if (threshold && (time > threshold SECONDS)) if (!(type_info.qdel_flags & QDEL_ITEM_ADMINS_WARNED)) @@ -318,7 +330,7 @@ SUBSYSTEM_DEF(garbage) "warning", "garbage", tags = list("datum_type" = "[type]"), - extra = list("ref_id" = refID, "time_ms" = tick_usage) + extra = list("ref_id" = refID, "time_ms" = tick_usage, "details" = detail) ) type_info.hard_deletes_over_threshold++ var/overrun_limit = 0 // Used to be CONFIG_GET(number/hard_deletes_overrun_limit) diff --git a/code/controllers/subsystems/initialization/atlas.dm b/code/controllers/subsystems/initialization/atlas.dm index 3f0eae924bf..d14a5adab22 100644 --- a/code/controllers/subsystems/initialization/atlas.dm +++ b/code/controllers/subsystems/initialization/atlas.dm @@ -23,37 +23,50 @@ SUBSYSTEM_DEF(atlas) /** * Note that the dirs here are REVERSE because they're used for entry points, so it'd be the dir facing starboard for example. * These are strings because otherwise the list indexes would be out of bounds. Thanks BYOND. + * + * SOUTH = 1, NORTH = 2, WEST = 4, EAST = 8, + * NORTH-EAST = 5, SOUTH-EAST = 6, NORTH-WEST = 9, SOUTH-WEST = 10, */ var/list/naval_to_dir = list( - "1" = list( + "1" = list( //Ship Fore is facing North. (These are reversed, a shot travelling south would enter from the north.) "starboard" = WEST, "port" = EAST, "fore" = SOUTH, - "aft" = NORTH + "aft" = NORTH, + "aft-starboard" = NORTH|WEST, + "fore-starboard" = SOUTH|WEST, + "aft-port" = NORTH|EAST, + "fore-port" = SOUTH|EAST ), - "2" = list( + "2" = list( //Ship Fore is facing South. "starboard" = EAST, "port" = WEST, "fore" = NORTH, - "aft" = SOUTH + "aft" = SOUTH, + "aft-starboard" = SOUTH|EAST, + "fore-starboard" = NORTH|EAST, + "aft-port" = SOUTH|WEST, + "fore-port" = NORTH|WEST ), - "4" = list( + "4" = list( //Ship Fore is facing West. "starboard" = NORTH, "port" = SOUTH, "fore" = WEST, - "aft" = EAST + "aft" = EAST, + "aft-starboard" = EAST|NORTH, + "fore-starboard" = WEST|NORTH, + "aft-port" = EAST|SOUTH, + "fore-port" = WEST|SOUTH ), - "4" = list( - "starboard" = NORTH, - "port" = SOUTH, - "fore" = WEST, - "aft" = EAST - ), - "8" = list( + "8" = list( //Ship Fore is facing East. "starboard" = SOUTH, "port" = NORTH, "fore" = EAST, - "aft" = WEST + "aft" = WEST, + "aft-starboard" = WEST|SOUTH, + "fore-starboard" = EAST|SOUTH, + "aft-port" = WEST|NORTH, + "fore-port" = EAST|NORTH ) ) @@ -62,49 +75,49 @@ SUBSYSTEM_DEF(atlas) "1" = "aft", "2" = "fore", "4" = "port", - "5" = "port", - "6" = "port", + "5" = "aft-port", + "6" = "fore-port", "8" = "starboard", - "9" = "starboard", - "10" = "starboard" + "9" = "aft-starboard", + "10" = "fore-starboard" ), "2" = list( "1" = "fore", "2" = "aft", "4" = "starboard", - "5" = "starboard", - "6" = "starboard", + "5" = "fore-starboard", + "6" = "aft-starboard", "8" = "port", - "9" = "port", - "10" = "port" + "9" = "fore-port", + "10" = "aft-port" ), "4" = list( "1" = "starboard", "2" = "port", "4" = "aft", - "5" = "starboard", - "6" = "port", + "5" = "starboard-aft", + "6" = "port-aft", "8" = "fore", - "9" = "starboard", - "10" = "port" + "9" = "starboard-fore", + "10" = "port-fore" ), "5" = list( //northeast - "1" = "starboard", - "2" = "port", - "4" = "port", + "1" = "aft-starboard", + "2" = "fore-port", + "4" = "aft-port", "5" = "aft", "6" = "port", - "8" = "starboard", + "8" = "fore-starboard", "9" = "starboard", "10" = "fore" ), "6" = list( //southeast - "1" = "starboard", - "2" = "port", - "4" = "starboard", + "1" = "fore-starboard", + "2" = "aft-port", + "4" = "aft-starboard", "5" = "starboard", "6" = "aft", - "8" = "port", + "8" = "fore-port", "9" = "fore", "10" = "port" ), @@ -112,31 +125,31 @@ SUBSYSTEM_DEF(atlas) "1" = "port", "2" = "starboard", "4" = "fore", - "5" = "port", - "6" = "starboard", + "5" = "port-fore", + "6" = "starboard-fore", "8" = "aft", - "9" = "port", - "10" = "starboard" + "9" = "port-aft", + "10" = "starboard-aft" ), "9" = list( //northwest - "1" = "port", - "2" = "starboard", - "4" = "port", + "1" = "aft-port", + "2" = "fore-starboard", + "4" = "fore-port", "5" = "port", - "6" = "fore", - "8" = "starboard", + "6" = "aft-starboard", + "8" = "fore", "9" = "aft", "10" = "starboard" ), "10" = list( //southwest - "1" = "port", - "2" = "starboard", - "4" = "starboard", + "1" = "fore-port", + "2" = "aft-starboard", + "4" = "fore-starboard", "5" = "fore", "6" = "starboard", - "8" = "port", - "9" = "port", - "10" = "aft" + "8" = "aft-port", + "9" = "aft", + "10" = "port" ) ) diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index ae9441b7b63..58f5246fc9e 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -410,9 +410,6 @@ SUBSYSTEM_DEF(jobs) Debug("ER/([H]): Completed.") return H -/mob/living/carbon/human - var/tmp/centcomm_despawn_timer - /mob/living/proc/centcomm_timeout() if (!istype(get_area(src), /area/centcom/spawning)) return FALSE diff --git a/code/controllers/subsystems/mob_ai.dm b/code/controllers/subsystems/mob_ai.dm index fff49cc8e96..2f13e380797 100644 --- a/code/controllers/subsystems/mob_ai.dm +++ b/code/controllers/subsystems/mob_ai.dm @@ -66,9 +66,6 @@ SUBSYSTEM_DEF(mob_ai) mutexes -= mob_weakref -/mob - var/thinking_enabled = FALSE - /** * Perform AI logic for a mob, called by the AI subsystem * diff --git a/code/controllers/subsystems/night_lighting.dm b/code/controllers/subsystems/night_lighting.dm index 9780477bf75..625269650d4 100644 --- a/code/controllers/subsystems/night_lighting.dm +++ b/code/controllers/subsystems/night_lighting.dm @@ -50,12 +50,16 @@ SUBSYSTEM_DEF(nightlight) /datum/controller/subsystem/nightlight/proc/get_apc_list(var/whitelisted_only = 1) var/list/obj/structure/machinery/power/apc/lighting_apcs = list() - for (var/A in get_sorted_areas()) - var/area/B = A - if (B.no_light_control || (!(B.allow_nightmode) && whitelisted_only)) + for (var/obj/structure/machinery/power/apc/APC in SSmachinery.apc_units) + if (QDELETED(APC) || APC.aidisabled) continue - if (B.apc && !B.apc.aidisabled) - lighting_apcs += B.apc + + var/area/apc_area = APC.area || get_area(APC) + if (!apc_area) + continue + if (apc_area.no_light_control || (!(apc_area.allow_nightmode) && whitelisted_only)) + continue + lighting_apcs += APC CHECK_TICK diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm index 78747e967e7..60ef691e6a0 100644 --- a/code/controllers/subsystems/plants.dm +++ b/code/controllers/subsystems/plants.dm @@ -12,6 +12,8 @@ SUBSYSTEM_DEF(plants) var/list/seeds = list() /// Gene obfuscation for delicious trial and error goodness. var/list/gene_tag_masks = list() + /// Reverse lookup for gene_tag_masks, keyed by real gene tag. + var/list/gene_masks_by_tag = list() /// Stores images of growth, fruits and seeds. var/list/plant_icon_cache = list() /// List of all harvested product sprites. @@ -83,6 +85,7 @@ SUBSYSTEM_DEF(plants) used_masks += gene_mask plant_traits -= gene_tag gene_tag_masks[gene_mask] = gene_tag + gene_masks_by_tag[gene_tag] = gene_mask plant_gene_datums[gene_mask] = G gene_masked_list += (list(list("tag" = gene_tag, "mask" = gene_mask))) @@ -93,6 +96,7 @@ SUBSYSTEM_DEF(plants) src.product_descs = SSplants.product_descs src.seeds = SSplants.seeds src.gene_tag_masks = SSplants.gene_tag_masks + src.gene_masks_by_tag = SSplants.gene_masks_by_tag src.plant_icon_cache = SSplants.plant_icon_cache src.plant_sprites = SSplants.plant_sprites src.plant_product_sprites = SSplants.plant_product_sprites @@ -146,6 +150,9 @@ SUBSYSTEM_DEF(plants) SET_SEED_TRAIT(seed, TRAIT_HIGHKPA_TOLERANCE, 200) return seed +/datum/controller/subsystem/plants/proc/get_gene_mask(var/gene_tag) + return gene_masks_by_tag[gene_tag] || gene_tag + /// Debug for testing seed genes. /client/proc/show_plant_genes() set category = "Debug" diff --git a/code/controllers/subsystems/processing/nanoui.dm b/code/controllers/subsystems/processing/nanoui.dm deleted file mode 100644 index ee84adf78be..00000000000 --- a/code/controllers/subsystems/processing/nanoui.dm +++ /dev/null @@ -1,241 +0,0 @@ -PROCESSING_SUBSYSTEM_DEF(nanoui) - // Subsystem stuff. - name = "NanoUI" - flags = SS_NO_INIT - priority = SS_PRIORITY_NANOUI - stat_tag = "A" - - // NanoUI stuff. - var/list/open_nanouis = list() - -/** - * Get an open /nanoui ui for the current user, src_object and ui_key and try to update it with data - * - * * user - /mob The mob who opened/owns the ui - * * src_object - /obj|/mob The obj or mob which the ui belongs to - * * ui_key - A string key used for the ui - * * data - List, the data to be passed to the ui, if it exists - * * force_open - Boolean, the ui is being forced to (re)open, so close ui if it exists (instead of updating) - * - * Returns the `/nanoui` found ui, for null if none exists - */ -/datum/controller/subsystem/processing/nanoui/proc/try_update_ui(mob/user, src_object, ui_key, datum/nanoui/ui, data, force_open = FALSE) - if (!ui) // no ui has been passed, so we'll search for one - ui = get_open_ui(user, src_object, ui_key) - - if (ui) - // The UI is already open - if (!force_open) - ui.push_data(data) - return ui - else - ui.reinitialise(new_initial_data=data) - return ui - - return null - -/** - * Get an open /nanoui ui for the current user, src_object and ui_key - * - * * user - The `/mob` who opened/owns the ui - * * src_object - The `/obj` or `/mob` which the ui belongs to - * * ui_key - A string key used for the ui - */ -/datum/controller/subsystem/processing/nanoui/proc/get_open_ui(mob/user, src_object, ui_key) - var/src_object_key = REF(src_object) - if (!LAZYLEN(open_nanouis[src_object_key]) || !LAZYLEN(open_nanouis[src_object_key][ui_key])) - return null - - for (var/datum/nanoui/ui in open_nanouis[src_object_key][ui_key]) - if (ui.user == user) - return ui - - //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found") - return null - -/** - * Update all `/nanoui` uis attached to src_object - * - * * src_object - The `/obj` or `/mob` which the uis are attached to - * - * Returns the number of UIs updated - */ -/datum/controller/subsystem/processing/nanoui/proc/update_uis(src_object) - var/src_object_key = REF(src_object) - if (!LAZYLEN(open_nanouis[src_object_key])) - return 0 - - . = 0 - var/list/obj_uis = open_nanouis[src_object_key] - for (var/ui_key in obj_uis) - for (var/thing in obj_uis[ui_key]) - var/datum/nanoui/ui = thing - if(ui && ui.src_object && ui.user && ui.src_object.ui_host()) - ui.process(1) - .++ - -/** - * Close all `/nanoui` uis attached to src_object - * - * * src_object - The `/obj` or `/mob` which the uis are attached to - * - * Returns the number of UIs closed - */ -/datum/controller/subsystem/processing/nanoui/proc/close_uis(src_object) - var/src_object_key = REF(src_object) - if (!open_nanouis[src_object_key] || !islist(open_nanouis[src_object_key])) - return 0 - - . = 0 - var/list/obj_uis = open_nanouis[src_object_key] - for (var/ui_key in obj_uis) - for (var/thing in obj_uis[ui_key]) - var/datum/nanoui/ui = thing - if(ui && ui.src_object && ui.user && ui.src_object.ui_host()) - ui.close() - .++ - -/** - * Update /nanoui uis belonging to user - * - * * user - The `/mob` who owns the uis - * * src_object - An `/obj` or `/mob` that, if is provided, only update uis which are attached to it (optional) - * * ui_key - A string, if ui_key is provided, only update uis with a matching ui_key (optional) - * - * Returns the number of UIs updated - */ -/datum/controller/subsystem/processing/nanoui/proc/update_user_uis(mob/user, src_object, ui_key) - if (!LAZYLEN(user.open_nanouis)) - return 0 // has no open uis - - . = 0 - for (var/thing in user.open_nanouis) - var/datum/nanoui/ui = thing - if (NULL_OR_EQUAL(src_object, ui.src_object) && NULL_OR_EQUAL(ui_key, ui.ui_key)) - ui.process(1) - .++ - -/datum/controller/subsystem/processing/nanoui/proc/close_user_uis(mob/user, src_object, ui_key) - if (!LAZYLEN(user.open_nanouis)) - return 0 - - for (var/thing in user.open_nanouis) - var/datum/nanoui/ui = thing - if (NULL_OR_EQUAL(src_object, ui.src_object) && NULL_OR_EQUAL(ui_key, ui.ui_key)) - ui.close() - .++ - - //testing("nanomanager/close_user_uis mob [user.name] closed [open_nanouis.len] of [.] uis") - -/** - * Add a /nanoui ui to the list of open uis - * This is called by the /nanoui open() proc - * - * * ui - The `/nanoui` ui to add - */ -/datum/controller/subsystem/processing/nanoui/proc/ui_opened(datum/nanoui/ui) - var/src_object_key = REF(ui.src_object) - LAZYINITLIST(open_nanouis[src_object_key]) - - LAZYADD(ui.user.open_nanouis, ui) - LAZYADD(open_nanouis[src_object_key][ui.ui_key], ui) - START_PROCESSING(SSnanoui, ui) - //testing("nanomanager/ui_opened mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_nanouis [ui.user.open_nanouis.len] | uis [uis.len] | processing_uis [processing_uis.len]") - -/** - * Remove a /nanoui ui from the list of open uis - * This is called by the /nanoui close() proc - * - * * ui - A `/nanoui` to remove - * - * Returns FALSE if no ui was removed, TRUE if removed successfully - */ -/datum/controller/subsystem/processing/nanoui/proc/ui_closed(datum/nanoui/ui) - var/src_object_key = REF(ui.src_object) - var/ui_key = ui.ui_key - var/list/obj_uis = open_nanouis[src_object_key] - - if (!LAZYLEN(obj_uis) || !obj_uis[ui_key]) - return 0 // Wasn't open. - - STOP_PROCESSING(SSnanoui, ui) - if(ui.user) // Sanity check in case a user has been deleted (say a blown up borg watching the alarm interface) - LAZYREMOVE(ui.user.open_nanouis, ui) - - obj_uis[ui_key] -= ui - - if (!LAZYLEN(obj_uis[ui_key])) - obj_uis -= ui_key - - if (!LAZYLEN(obj_uis)) - open_nanouis -= src_object_key - - //testing("nanomanager/ui_closed mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_nanouis [ui.user.open_nanouis.len] | uis [uis.len] | processing_uis [processing_uis.len]") - - return 1 - -/** - * This is called on user logout - * Closes/clears all uis attached to the user's `/mob` - * - * * user - The user's `/mob` - */ -/datum/controller/subsystem/processing/nanoui/proc/user_logout(mob/user) - return close_user_uis(user) - -/** - * This is called when a player transfers from one mob to another - * Transfers all open UIs to the new mob - * - * * oldMob - The user's old `/mob` - * * newMob - The user's new `/mob` - */ -/datum/controller/subsystem/processing/nanoui/proc/user_transferred(mob/oldMob, mob/newMob) - //testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]") - if (!oldMob || !LAZYLEN(oldMob.open_nanouis) || !LAZYLEN(open_nanouis)) - //testing("nanomanager/user_transferred mob [oldMob.name] has no open uis") - return 0 // has no open uis - - for (var/thing in oldMob.open_nanouis) - var/datum/nanoui/ui = thing - ui.user = newMob - LAZYADD(newMob.open_nanouis, ui) - - oldMob.open_nanouis = null - - return 1 // success - -/datum/asset/nanoui - var/list/common = list() - - var/list/common_dirs = list( - "nano/css/", - "nano/js/", - "nano/images/", - "nano/images/status_icons/", - "nano/templates/" - ) - var/list/uncommon_dirs = list() - -/datum/asset/nanoui/register() - // Crawl the directories to find files. - for (var/path in common_dirs) - var/list/filenames = flist(path) - for(var/filename in filenames) - if(copytext(filename, length(filename)) != "/") // Ignore directories. - if(fexists(path + filename)) - common[filename] = fcopy_rsc(path + filename) - SSassets.transport.register_asset(filename, common[filename]) - for (var/path in uncommon_dirs) - var/list/filenames = flist(path) - for(var/filename in filenames) - if(copytext(filename, length(filename)) != "/") // Ignore directories. - if(fexists(path + filename)) - SSassets.transport.register_asset(filename, fcopy_rsc(path + filename)) - -/datum/asset/nanoui/send(client, uncommon) - if(!islist(uncommon)) - uncommon = list(uncommon) - - SSassets.transport.send_assets(client, uncommon) - SSassets.transport.send_assets(client, common) diff --git a/code/controllers/subsystems/records.dm b/code/controllers/subsystems/records.dm index 07679c4e122..d20e39211f5 100644 --- a/code/controllers/subsystems/records.dm +++ b/code/controllers/subsystems/records.dm @@ -213,7 +213,7 @@ SUBSYSTEM_DEF(records) return GLOB.always_state /datum/controller/subsystem/records/ui_status(mob/user, datum/ui_state/state) - return (isnewplayer(user) || isghost(user) || issilicon(user)) ? UI_INTERACTIVE : UI_CLOSE + return (isnewplayer(user) || isghost(user) || tgui_silicon_user(user)) ? UI_INTERACTIVE : UI_CLOSE /datum/controller/subsystem/records/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() diff --git a/code/controllers/subsystems/statpanel.dm b/code/controllers/subsystems/statpanel.dm index 465c6fad443..575d914a0db 100644 --- a/code/controllers/subsystems/statpanel.dm +++ b/code/controllers/subsystems/statpanel.dm @@ -186,6 +186,11 @@ SUBSYSTEM_DEF(statpanels) atoms_to_display += turf_content /// Set the atoms we're meant to display + // Lazy-init: SSstatpanels can fire for a client whose obj_window was never + // created (mob transfer / relogin) or was nulled by /datum/object_window_info/Destroy() + // while mob.listed_turf survived. Without this guard we'd null-deref atoms_to_show. + if(!target.obj_window) + target.obj_window = new /datum/object_window_info(target) var/datum/object_window_info/obj_window = target.obj_window obj_window.atoms_to_show = atoms_to_display START_PROCESSING(SSobj_tab_items, obj_window) @@ -210,6 +215,9 @@ SUBSYSTEM_DEF(statpanels) // No turf? go away if(!load_from.mob?.listed_turf) return list() + // Lazy-init for the same lifecycle reasons as set_turf_examine_tab + if(!load_from.obj_window) + load_from.obj_window = new /datum/object_window_info(load_from) var/datum/object_window_info/obj_window = load_from.obj_window var/list/already_seen = obj_window.atoms_to_images var/list/to_make = obj_window.atoms_to_imagify diff --git a/code/controllers/subsystems/processing/tgui.dm b/code/controllers/subsystems/tgui.dm similarity index 71% rename from code/controllers/subsystems/processing/tgui.dm rename to code/controllers/subsystems/tgui.dm index 77186dbf75b..563730f6b77 100644 --- a/code/controllers/subsystems/processing/tgui.dm +++ b/code/controllers/subsystems/tgui.dm @@ -10,11 +10,11 @@ * */ -PROCESSING_SUBSYSTEM_DEF(tgui) +SUBSYSTEM_DEF(tgui) name = "tgui" wait = 9 flags = SS_NO_INIT - priority = SS_PRIORITY_NANOUI + priority = FIRE_PRIORITY_TGUI runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT /// A list of UIs scheduled to process @@ -24,54 +24,39 @@ PROCESSING_SUBSYSTEM_DEF(tgui) /// The HTML base used for all UIs. var/basehtml -/datum/controller/subsystem/processing/tgui/PreInit() - basehtml = file2text('tgui/public/tgui.html') - // Inject inline polyfills - var/polyfill = file2text('tgui/public/tgui-polyfill.min.js') - polyfill = "" - basehtml = replacetextEx(basehtml, "", polyfill) - basehtml = replacetextEx(basehtml, "", "NanoTrasen © 2457-[text2num(time2text(world.realtime, "YYYY")) + 442]") +/datum/controller/subsystem/tgui/PreInit() + basehtml = file2text("tgui/public/tgui.html") - basehtml = replacetext(basehtml, "tgui:stylesheet", MAP_STYLESHEET) + // Inject inline helper functions + var/helpers = file2text("tgui/public/helpers.min.js") + helpers = "" + basehtml = replacetextEx(basehtml, "", helpers) -/datum/controller/subsystem/processing/tgui/OnConfigLoad() - var/storage_iframe = GLOB.config.storage_cdn_iframe - if(storage_iframe && storage_iframe != /datum/configuration::storage_cdn_iframe) - basehtml = replacetextEx(basehtml, "tgui:storagecdn", storage_iframe) - return + // Inject inline ntos-error styles + var/ntos_error = file2text("tgui/public/ntos-error.min.css") + ntos_error = "" + basehtml = replacetextEx(basehtml, "", ntos_error) - if(GLOB.config.asset_transport == "webroot") - var/datum/asset_transport/webroot/webroot = SSassets.transport + basehtml = replacetextEx(basehtml, "", "Nanotrasen (c) 2395-[num2text(GLOB.game_year)]") - var/datum/asset_cache_item/item = webroot.register_asset("iframe.html", file("tgui/public/iframe.html")) - basehtml = replacetext(basehtml, "tgui:storagecdn", webroot.get_asset_url("iframe.html", item)) - return - - if(!storage_iframe) - return - - basehtml = replacetextEx(basehtml, "tgui:storagecdn", storage_iframe) - -/datum/controller/subsystem/processing/tgui/Shutdown() +/datum/controller/subsystem/tgui/Shutdown() close_all_uis() -/datum/controller/subsystem/processing/tgui/stat_entry(msg) +/datum/controller/subsystem/tgui/stat_entry(msg) msg = "P:[length(all_uis)]" return ..() -/datum/controller/subsystem/processing/tgui/fire(resumed = FALSE) - CAN_BE_REDEFINED(TRUE) +/datum/controller/subsystem/tgui/fire(resumed = FALSE) if(!resumed) src.current_run = all_uis.Copy() // Cache for sanic speed (lists are references anyways) var/list/current_run = src.current_run - var/seconds_per_tick = wait * 0.1 while(current_run.len) var/datum/tgui/ui = current_run[current_run.len] current_run.len-- // TODO: Move user/src_object check to process() if(ui?.user && ui.src_object) - ui.process(seconds_per_tick) + ui.process(wait * 0.1) else ui.close(0) if(MC_TICK_CHECK) @@ -84,9 +69,9 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * Returns null if pool was exhausted. * * required user mob - * return datum/tgui + * return datum/tgui_window */ -/datum/controller/subsystem/processing/tgui/proc/request_pooled_window(mob/user) +/datum/controller/subsystem/tgui/proc/request_pooled_window(mob/user) if(!user.client) return null var/list/windows = user.client.tgui_windows @@ -122,7 +107,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * required user mob */ -/datum/controller/subsystem/processing/tgui/proc/force_close_all_windows(mob/user) +/datum/controller/subsystem/tgui/proc/force_close_all_windows(mob/user) log_tgui(user, context = "SStgui/force_close_all_windows") if(user.client) user.client.tgui_windows = list() @@ -138,14 +123,12 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * required user mob * required window_id string */ -/datum/controller/subsystem/processing/tgui/proc/force_close_window(mob/user, window_id) +/datum/controller/subsystem/tgui/proc/force_close_window(mob/user, window_id) log_tgui(user, context = "SStgui/force_close_window") // Close all tgui datums based on window_id. 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]") @@ -161,7 +144,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return datum/tgui The found UI. */ -/datum/controller/subsystem/processing/tgui/proc/try_update_ui( +/datum/controller/subsystem/tgui/proc/try_update_ui( mob/user, datum/src_object, datum/tgui/ui) @@ -191,7 +174,8 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return datum/tgui The found UI. */ -/datum/controller/subsystem/processing/tgui/proc/get_open_ui(mob/user, datum/src_object) +/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object) + // No UIs opened for this src_object if(!LAZYLEN(src_object?.open_uis)) return null for(var/datum/tgui/ui in src_object.open_uis) @@ -209,15 +193,15 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return int The number of UIs updated. */ -/datum/controller/subsystem/processing/tgui/proc/update_uis(datum/src_object) +/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object) + // No UIs opened for this src_object if(!LAZYLEN(src_object?.open_uis)) return 0 var/count = 0 - var/seconds_per_tick = wait * 0.1 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)) - INVOKE_ASYNC(ui, TYPE_PROC_REF(/datum/tgui, process), seconds_per_tick, TRUE) + INVOKE_ASYNC(ui, TYPE_PROC_REF(/datum/tgui, process), wait * 0.1, TRUE) count++ return count @@ -230,7 +214,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return int The number of UIs closed. */ -/datum/controller/subsystem/processing/tgui/proc/close_uis(datum/src_object) +/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object) // No UIs opened for this src_object if(!LAZYLEN(src_object?.open_uis)) return 0 @@ -249,7 +233,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return int The number of UIs closed. */ -/datum/controller/subsystem/processing/tgui/proc/close_all_uis() +/datum/controller/subsystem/tgui/proc/close_all_uis() var/count = 0 for(var/datum/tgui/ui in all_uis) // Check if UI is valid. @@ -268,14 +252,13 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return int The number of UIs updated. */ -/datum/controller/subsystem/processing/tgui/proc/update_user_uis(mob/user, datum/src_object) +/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object) var/count = 0 if(length(user?.tgui_open_uis) == 0) return count - var/seconds_per_tick = wait * 0.1 for(var/datum/tgui/ui in user.tgui_open_uis) if(isnull(src_object) || ui.src_object == src_object) - ui.process(seconds_per_tick, force = 1) + ui.process(wait * 0.1, force = 1) count++ return count @@ -289,7 +272,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return int The number of UIs closed. */ -/datum/controller/subsystem/processing/tgui/proc/close_user_uis(mob/user, datum/src_object) +/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object) var/count = 0 if(length(user?.tgui_open_uis) == 0) return count @@ -306,7 +289,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * required ui datum/tgui The UI to be added. */ -/datum/controller/subsystem/processing/tgui/proc/on_open(datum/tgui/ui) +/datum/controller/subsystem/tgui/proc/on_open(datum/tgui/ui) ui.user?.tgui_open_uis |= ui LAZYOR(ui.src_object.open_uis, ui) all_uis |= ui @@ -320,7 +303,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return bool If the UI was removed or not. */ -/datum/controller/subsystem/processing/tgui/proc/on_close(datum/tgui/ui) +/datum/controller/subsystem/tgui/proc/on_close(datum/tgui/ui) // Remove it from the list of processing UIs. all_uis -= ui current_run -= ui @@ -340,7 +323,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return int The number of UIs closed. */ -/datum/controller/subsystem/processing/tgui/proc/on_logout(mob/user) +/datum/controller/subsystem/tgui/proc/on_logout(mob/user) close_user_uis(user) /** @@ -353,7 +336,7 @@ PROCESSING_SUBSYSTEM_DEF(tgui) * * return bool If the UIs were transferred. */ -/datum/controller/subsystem/processing/tgui/proc/on_transfer(mob/source, mob/target) +/datum/controller/subsystem/tgui/proc/on_transfer(mob/source, mob/target) // The old mob had no open UIs. if(length(source?.tgui_open_uis) == 0) return FALSE diff --git a/code/controllers/subsystems/virtual_reality.dm b/code/controllers/subsystems/virtual_reality.dm index 6a818b22028..be73e30bdae 100644 --- a/code/controllers/subsystems/virtual_reality.dm +++ b/code/controllers/subsystems/virtual_reality.dm @@ -55,11 +55,6 @@ SUBSYSTEM_DEF(virtualreality) if(bound && network) bounded[network].Remove(bound) - -/mob - var/mob/living/vr_mob = null // In which mob is our mind - var/mob/living/old_mob = null // Which mob is our old mob - /// Return to original body /mob/proc/body_return() set name = "Return to Body" diff --git a/code/datums/chat_payload.dm b/code/datums/chat_payload.dm new file mode 100644 index 00000000000..fd35bbc4eec --- /dev/null +++ b/code/datums/chat_payload.dm @@ -0,0 +1,16 @@ +/// Stores information about a chat payload +/datum/chat_payload + /// Sequence number of this payload + var/sequence = 0 + /// Message we are sending + var/list/content + /// Resend count + var/resends = 0 + +/// Converts the chat payload into a JSON string +/datum/chat_payload/proc/into_message() + return "{\"sequence\":[sequence],\"content\":[json_encode(content)]}" + +/// Returns an HTML-encoded message from our contents. +/datum/chat_payload/proc/get_content_as_html() + return message_to_html(content) diff --git a/code/datums/components/armor/synthetic_armor.dm b/code/datums/components/armor/synthetic_armor.dm index f7b24768494..79d01d71ed6 100644 --- a/code/datums/components/armor/synthetic_armor.dm +++ b/code/datums/components/armor/synthetic_armor.dm @@ -23,7 +23,7 @@ var/key = get_armor_key(damage_type, damage_flags) var/damage_taken if(blocked) - damage_taken = round(damage * blocked) + damage_taken = damage * (1 - blocked) else damage_taken = damage var/new_armor = max(0, get_value(key) - armor_degradation_coef * damage_taken) diff --git a/code/datums/components/leanable.dm b/code/datums/components/leanable.dm index 96edea51472..55b590793b9 100644 --- a/code/datums/components/leanable.dm +++ b/code/datums/components/leanable.dm @@ -95,7 +95,9 @@ shift_pixel_x = 10 animate(src, pixel_x = shift_pixel_x, pixel_y = shift_pixel_y, time = 1) if(direction == NORTH) - src.add_filter("cutout", 1, alpha_mask_filter(icon = icon('icons/effects/effects.dmi', "cutout"))) + src.appearance_flags |= KEEP_TOGETHER + src.add_filter("cutout", 1, alpha_mask_filter(y = 0, icon = icon('icons/effects/effects.dmi', "white"))) + animate(src.get_filter("cutout"), y = 10, time = 1, flags = ANIMATION_PARALLEL) if(direction == SOUTH) src.layer = ABOVE_DOOR_LAYER set_density(FALSE) @@ -105,7 +107,7 @@ SPAN_NOTICE("[src] leans against [lean_target]."), SPAN_NOTICE("You lean against [lean_target]."), ) - RegisterSignals(src, list(COMSIG_MOVABLE_MOVED, COMSIG_MOB_RESISTED), PROC_REF(stop_leaning), src) + RegisterSignals(src, list(COMSIG_MOVABLE_MOVED, COMSIG_MOB_RESISTED, COMSIG_MOB_LYING_DOWN), PROC_REF(stop_leaning), src) /mob/living/proc/stop_leaning() SIGNAL_HANDLER @@ -116,11 +118,13 @@ UnregisterSignal(src, list( COMSIG_MOVABLE_MOVED, COMSIG_MOB_RESISTED, + COMSIG_MOB_LYING_DOWN, )) SEND_SIGNAL(src, COMSIG_LIVING_STOPPED_LEANING) to_chat(src, SPAN_NOTICE("You stop leaning on the wall.")) REMOVE_TRAIT(src, TRAIT_UNDENSE, TRAIT_SOURCE_WALL_LEANING) REMOVE_TRAIT(src, TRAIT_LEANING, TRAIT_SOURCE_WALL_LEANING) + appearance_flags &= ~KEEP_TOGETHER remove_filter("cutout") /datum/component/leanable/proc/stopped_leaning(datum/source) diff --git a/code/datums/components/local_network.dm b/code/datums/components/local_network.dm index fdce8aa8a49..3064a4176a0 100644 --- a/code/datums/components/local_network.dm +++ b/code/datums/components/local_network.dm @@ -47,11 +47,6 @@ lan = null return lan -/datum/component/local_network_member/nano_host() - if(parent) - return parent.nano_host() - . = ..() - /datum/component/local_network_member/proc/get_new_tag(mob/user) var/new_ident = input(user, "Enter a new ident tag.", "[parent]", id_tag) as null|text if(new_ident && parent && user.Adjacent(parent) && CanInteract(user, GLOB.physical_state)) diff --git a/code/datums/components/medical/medicalAnalyzer.dm b/code/datums/components/medical/medicalAnalyzer.dm index 6fdb128836c..7a8ef7fb81c 100644 --- a/code/datums/components/medical/medicalAnalyzer.dm +++ b/code/datums/components/medical/medicalAnalyzer.dm @@ -84,6 +84,15 @@ reagent_results = list() return TRUE +/datum/component/health_analyzer/ui_status(mob/user, datum/ui_state/state) + var/obj/item/rig_module/containing_rig_module = owner?.loc + if(!containing_rig_module) + return ..() + else if(containing_rig_module) + return UI_INTERACTIVE + + return UI_CLOSE + /datum/component/health_analyzer/proc/attack(mob/living/target_mob, mob/living/user, target_zone) sound_scan = TRUE @@ -104,6 +113,8 @@ user.visible_message("\The [user] stops scanning \the [target_mob].") /datum/component/health_analyzer/proc/attack_self(mob/user) + if(scan_title == "" || scan_title == null) + health_scan_mob(user, user, FALSE, sound_scan = sound_scan) ui_interact(user) owner.add_fingerprint(user) diff --git a/code/datums/components/overhead_emote/overhead_emote_singleton.dm b/code/datums/components/overhead_emote/overhead_emote_singleton.dm index 8a89597efce..cc7a187d031 100644 --- a/code/datums/components/overhead_emote/overhead_emote_singleton.dm +++ b/code/datums/components/overhead_emote/overhead_emote_singleton.dm @@ -39,8 +39,8 @@ ABSTRACT_TYPE(/singleton/overhead_emote) var/self_message = SPAN_NOTICE("You lift your hand to meet [original]'s, delivering a stunning [emote_description]!") reciprocator.visible_message(others_message, self_message) - INVOKE_ASYNC(reciprocator, TYPE_PROC_REF(/atom/movable, do_attack_animation), original, FIST_ATTACK_ANIMATION) - INVOKE_ASYNC(original, TYPE_PROC_REF(/atom/movable, do_attack_animation), reciprocator, FIST_ATTACK_ANIMATION) + INVOKE_ASYNC(reciprocator, TYPE_PROC_REF(/atom/movable, do_attack_animation), original) + INVOKE_ASYNC(original, TYPE_PROC_REF(/atom/movable, do_attack_animation), reciprocator) if(emote_sound) playsound(reciprocator.loc, emote_sound, 30, 1) @@ -54,8 +54,8 @@ ABSTRACT_TYPE(/singleton/overhead_emote) var/self_message = SPAN_NOTICE("You lift your hand to meet [original]'s, who was expecting a [original_emote.emote_description], but received a [fail_emote.emote_description] instead.") reciprocator.visible_message(others_message, self_message) - INVOKE_ASYNC(reciprocator, TYPE_PROC_REF(/atom/movable, do_attack_animation), original, FIST_ATTACK_ANIMATION) - INVOKE_ASYNC(original, TYPE_PROC_REF(/atom/movable, do_attack_animation), reciprocator, FIST_ATTACK_ANIMATION) + INVOKE_ASYNC(reciprocator, TYPE_PROC_REF(/atom/movable, do_attack_animation), original) + INVOKE_ASYNC(original, TYPE_PROC_REF(/atom/movable, do_attack_animation), reciprocator) playsound(reciprocator.loc, SFX_PUNCH_MISS, 30, 1) diff --git a/code/datums/components/psionics/psiblock_drugs.dm b/code/datums/components/psionics/psiblock_drugs.dm index 5d94738764b..9d385adb854 100644 --- a/code/datums/components/psionics/psiblock_drugs.dm +++ b/code/datums/components/psionics/psiblock_drugs.dm @@ -63,7 +63,7 @@ return to_chat(minister, SPAN_BAD("Why should you care how [ministree] feels?")) - *moodlet_value = 0 + *moodlet_value = *moodlet_value * 0.5 /datum/component/timed_life/psiblock_drugs/proc/modify_ministry_receiving(ministree, minister, moodlet_value) SIGNAL_HANDLER @@ -71,7 +71,7 @@ return to_chat(ministree, SPAN_BAD("You feel nothing from [minister]'s words.")) - *moodlet_value = 0 + *moodlet_value = *moodlet_value * 0.5 /datum/component/timed_life/psiblock_drugs/proc/modify_leadership_empathy(leader, moodlet_value) SIGNAL_HANDLER @@ -79,7 +79,7 @@ return to_chat(leader, SPAN_BAD("Why should you care about how others feel?")) - *moodlet_value = 0 + *moodlet_value = *moodlet_value * 0.5 /datum/component/timed_life/psiblock_drugs/process(seconds_per_tick) diff --git a/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm b/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm index b7415dd7cd9..ad8bd423cf8 100644 --- a/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm +++ b/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm @@ -23,7 +23,7 @@ log_debug("Synthetic endoskeleton component spawned on non-IPC. Deleting.") qdel_self() - RegisterSignal(owner, COMSIG_EXTERNAL_ORGAN_DAMAGE, PROC_REF(receive_damage)) + RegisterSignal(owner, COMSIG_DAMAGE_TO_ENDOSKELETON, PROC_REF(receive_damage)) RegisterSignal(owner, COMSIG_SYNTH_ENDOSKELETON_REPAIR, PROC_REF(heal_damage)) RegisterSignal(owner, COMSIG_SYNTH_ENDOSKELETON_FULL_REPAIR, PROC_REF(full_repair)) @@ -55,6 +55,7 @@ owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1) if(0.75 to 1) owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1.5) + SEND_SIGNAL(owner, COMSIG_SYNTH_SET_SELF_PRESERVATION, FALSE) if(!damage) STOP_PROCESSING(SSprocessing, src) diff --git a/code/datums/langchat/langchat.dm b/code/datums/langchat/langchat.dm index 213e2c13fe3..12e231581af 100644 --- a/code/datums/langchat/langchat.dm +++ b/code/datums/langchat/langchat.dm @@ -27,17 +27,6 @@ #define langchat_client_enabled(M) (M && M.client && M.client.prefs && (M.client.prefs.toggles_secondary & FLOATING_MESSAGES)) -/* - * Duplicate vars and logic created for untranslated images for the sake of getting an untranslated langchat to display for listeners who do not understand - * the language being spoken. Someone could certainly think of cleaner ways to do this, but for want of a better solution right now, it has been implemented - * in this rote manner to make it easier to strip out in future if it needs replaced. - */ - -/atom/var/image/langchat_image -/atom/var/image/langchat_image_untranslated -/atom/var/list/mob/langchat_listeners -/atom/var/list/mob/langchat_listeners_untranslated - /// Hides the images, if they exist. Do not null the langchat images; they are rotated when the mob is buckled or proned to maintain text orientation. /atom/proc/langchat_drop_images() if(langchat_listeners) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index db9b0457e9d..1f1423f6e6e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -94,7 +94,6 @@ current.remove_vampire_powers() current.mind = null - SSnanoui.user_transferred(current, new_character) SStgui.on_transfer(current, new_character) if(current.client && GLOB.ticket_panels[current.client]) var/datum/ticket_panel/tp = GLOB.ticket_panels[current.client] diff --git a/code/datums/outfits/event/outfit_oe.dm b/code/datums/outfits/event/outfit_oe.dm new file mode 100644 index 00000000000..1369e236d6a --- /dev/null +++ b/code/datums/outfits/event/outfit_oe.dm @@ -0,0 +1,23 @@ +/obj/outfit/admin/oe_enforcer + name = "Outer Eyes Enforcer" + + uniform = /obj/item/clothing/under/color/purple + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/black + suit = /obj/item/clothing/suit/space/void/outereyes + suit_store = /obj/item/gun/projectile/automatic/rifle/dnac + mask = /obj/item/clothing/mask/balaclava + belt = /obj/item/storage/belt/military + l_ear = /obj/item/radio/headset/raider + head = /obj/item/clothing/head/helmet/space/void/outereyes + r_pocket = /obj/item/melee/energy/sword/knife + l_pocket = /obj/item/coin/phoron + + accessory = /obj/item/clothing/accessory/holster/hip + accessory_contents = list(/obj/item/gun/projectile/xanupistol = 1) + + belt_contents = list( + /obj/item/grenade/flashbang = 2, + /obj/item/ammo_magazine/a65 = 3, + /obj/item/ammo_magazine/c46m/extended = 2 + ) diff --git a/code/datums/skills/occupational/medical.dm b/code/datums/skills/occupational/medical.dm index c749937dd0c..2b2010142bb 100644 --- a/code/datums/skills/occupational/medical.dm +++ b/code/datums/skills/occupational/medical.dm @@ -69,12 +69,38 @@ /singleton/skill/anatomy name = "Anatomy" - description = "Not currently implemented." + description = "Governs the speed at which you can check yourself for injuries, as well as the quality of the information obtained when doing so." maximum_level = SKILL_LEVEL_PROFESSIONAL - uneducated_skill_cap = SKILL_LEVEL_TRAINED + uneducated_skill_cap = SKILL_LEVEL_PROFESSIONAL category = /singleton/skill_category/occupational subcategory = SKILL_SUBCATEGORY_MEDICAL component_type = ANATOMY_SKILL_COMPONENT + skill_level_descriptions = alist( + SKILL_LEVEL_UNFAMILIAR = "You have zero training or knowledge of anatomy.
" \ + + " - You can only distinguish visible damage like cuts and burns.", + SKILL_LEVEL_FAMILIAR = "You have minimal training on the basics of anatomy.
" \ + + "You can diagnose the following conditions:
" \ + + " - External injuries.
" \ + + " - Limb dislocation.
" \ + + " - Simple bleeds.", + SKILL_LEVEL_TRAINED = "You have years of formal training and experience with anatomy.
" \ + + "You can diagnose the following conditions:
" \ + + " - External injuries at a high level of detail.
" \ + + " - Limb dislocation.
" \ + + " - Broken bones.
" \ + + " - Distinguish between simple bleeds and severed arteries.
" \ + + " - Limb necrosis.
" \ + + " - Tag injuries by triage priority.", + SKILL_LEVEL_PROFESSIONAL = "You have extensive training and experience with anatomy.
" \ + + "You can diagnose the following conditions at the highest level of detail:
" \ + + " - External injuries at a high level of detail.
" \ + + " - Limb dislocation.
" \ + + " - Broken bones.
" \ + + " - Distinguish between simple bleeds and severed arteries.
" \ + + " - Limb necrosis.
" \ + + " - Tag injuries by triage priority." + ) + required = TRUE /singleton/skill/forensics name = "Forensics" diff --git a/code/datums/underwear/undershirt.dm b/code/datums/underwear/undershirt.dm index 8867673f887..f3fd7e0d348 100644 --- a/code/datums/underwear/undershirt.dm +++ b/code/datums/underwear/undershirt.dm @@ -38,11 +38,6 @@ icon_state = "tank_midriff" has_color = TRUE -/datum/category_item/underwear/undershirt/tank_top_midriff_short - name = "Tank Top, Midriff Short" - icon_state = "tank_midriff_short" - has_color = TRUE - /datum/category_item/underwear/undershirt/tank_top_expedition name = "Tank Top, Expedition" icon_state = "tank_expedition" @@ -59,14 +54,6 @@ name = "Tank Top, Fleet Feminine" icon_state = "tank_fleet_fem" -/datum/category_item/underwear/undershirt/tank_top_fire - name = "Tank Top, Fire" - icon_state = "tank_fire" - -/datum/category_item/underwear/undershirt/tank_top_fire_fem - name = "Tank Top, Fire Feminine" - icon_state = "tank_fire_fem" - /datum/category_item/underwear/undershirt/tank_top_stripes name = "Tank Top, Stripes" icon_state = "tank_stripes" @@ -83,22 +70,6 @@ name = "Tank Top, Stripes Alt Feminine" icon_state = "tank_stripes_alt_fem" -/datum/category_item/underwear/undershirt/tank_top_sun - name = "Tank Top, Sun" - icon_state = "tank_sun" - -/datum/category_item/underwear/undershirt/tank_top_sun_fem - name = "Tank Top, Sun Feminine" - icon_state = "tank_sun_fem" - -/datum/category_item/underwear/undershirt/tank_top_sun_alt - name = "Tank Top, Sun Alt" - icon_state = "tank_sun_alt" - -/datum/category_item/underwear/undershirt/tank_top_sun_alt_fem - name = "Tank Top, Sun Alt Feminine" - icon_state = "tank_sun_alt_fem" - /datum/category_item/underwear/undershirt/tank_top_tight name = "Tank Top, Tight" icon_state = "tank_tight" @@ -137,95 +108,11 @@ icon_state = "undershirt_fem" has_color = TRUE -/datum/category_item/underwear/undershirt/undershirt_heart - name = "Undershirt, Heart" - icon_state = "heart" - -/datum/category_item/underwear/undershirt/undershirt_heart_fem - name = "Undershirt, Heart Feminine" - icon_state = "heart_fem" - -/datum/category_item/underwear/undershirt/undershirt_heart_echelon - name = "Undershirt, Heart Echelon" - icon_state = "heart_echelon" - -/datum/category_item/underwear/undershirt/undershirt_heart_echelon_fem - name = "Undershirt, Heart Echelon Feminine" - icon_state = "heart_echelon_fem" - -/datum/category_item/underwear/undershirt/shirt_love_nt - name = "Undershirt, I<3NT" - icon_state = "ilovent" - -/datum/category_item/underwear/undershirt/shirt_love_nt_fem - name = "Undershirt, I<3NT Feminine" - icon_state = "ilovent_fem" - /datum/category_item/underwear/undershirt/shirt name = "Shirt" icon_state = "shirt" has_color = TRUE -/datum/category_item/underwear/undershirt/shirt_alien - name = "Shirt, Alien" - icon_state = "shirt_alien" - -/datum/category_item/underwear/undershirt/shirt_band - name = "Shirt, Band" - icon_state = "shirt_band" - -/datum/category_item/underwear/undershirt/shirt_clown - name = "Shirt, Clown" - icon_state = "shirt_clown" - -/datum/category_item/underwear/undershirt/shirt_ian - name = "Shirt, Ian" - icon_state = "shirt_ian" - -/datum/category_item/underwear/undershirt/shirt_jersey - name = "Shirt, Blue Jersey" - icon_state = "shirt_jersey" - -/datum/category_item/underwear/undershirt/shirt_jersey_red - name = "Shirt, Red Jersey" - icon_state = "shirt_jersey_red" - -/datum/category_item/underwear/undershirt/shirt_meat - name = "Shirt, Meat" - icon_state = "shirt_meat" - -/datum/category_item/underwear/undershirt/shirt_scc - name = "Shirt, SCC" - icon_state = "shirt_scc" - -/datum/category_item/underwear/undershirt/shirt_scc_fem - name = "Shirt, SCC feminine" - icon_state = "shirt_scc_fem" - -/datum/category_item/underwear/undershirt/shirt_nt - name = "Shirt, NT" - icon_state = "shirt_nano" - -/datum/category_item/underwear/undershirt/shirt_nt_red - name = "Shirt, NT Red" - icon_state = "shirt_nano_red" - -/datum/category_item/underwear/undershirt/shirt_peace - name = "Shirt, Peace" - icon_state = "shirt_peace" - -/datum/category_item/underwear/undershirt/shirt_question - name = "Shirt, Question" - icon_state = "shirt_question" - -/datum/category_item/underwear/undershirt/shirt_skull - name = "Shirt, Skull" - icon_state = "shirt_skull" - -/datum/category_item/underwear/undershirt/shirt_ss13 - name = "Shirt, SS13" - icon_state = "shirt_ss13" - /datum/category_item/underwear/undershirt/shirt_blue_striped name = "Shirt, Blue Stripes" icon_state = "shirt_stripes" @@ -234,34 +121,10 @@ name = "Shirt, Blue Stripes Alt" icon_state = "shirt_stripes_alt" -/datum/category_item/underwear/undershirt/shirt_tiedye - name = "Shirt, Tiedye" - icon_state = "shirt_tiedye" - /datum/category_item/underwear/undershirt/shirt_tight name = "Shirt, Tight" icon_state = "tight" -/datum/category_item/underwear/undershirt/shirt_wing - name = "Shirt, Wing" - icon_state = "wing_shirt" - -/datum/category_item/underwear/undershirt/shirt_pinkblack - name = "Shirt, Pink-Black" - icon_state = "pinkblack_tshirt" - -/datum/category_item/underwear/undershirt/sport_shirt_blue - name = "Sport Shirt, Blue" - icon_state = "sportblue" - -/datum/category_item/underwear/undershirt/sport_shirt_green - name = "Sport Shirt, Green" - icon_state = "sportgreen" - -/datum/category_item/underwear/undershirt/sport_shirt_red - name = "Sport Shirt, Red" - icon_state = "sportred" - /datum/category_item/underwear/undershirt/shirt_army name = "Shirt, Army" icon_state = "shirt_army" @@ -286,38 +149,6 @@ name = "Shirt, Fleet Feminine" icon_state = "shirt_fleet_fem" -/datum/category_item/underwear/undershirt/shirt_zavodskoi - name = "Shirt, Zavodskoi Interstellar" - icon_state = "shirt_necropolis" - -/datum/category_item/underwear/undershirt/shirt_zavodskoi_fem - name = "Shirt, Zavodskoi Interstellar Feminine" - icon_state = "shirt_necropolis_fem" - -/datum/category_item/underwear/undershirt/shirt_epmc - name = "Shirt, EPMC" - icon_state = "shirt_epmc" - -/datum/category_item/underwear/undershirt/shirt_epmc_fem - name = "Shirt, EPMC Feminine" - icon_state = "shirt_epmc_fem" - -/datum/category_item/underwear/undershirt/bowlinga - name = "Bowling Shirt, Aqua" - icon_state = "bowlinga" - -/datum/category_item/underwear/undershirt/bowlingp - name = "Bowling Shirt, Pink" - icon_state = "bowlingp" - -/datum/category_item/underwear/undershirt/bowlingr - name = "Bowling Shirt, Red" - icon_state = "bowlingr" - -/datum/category_item/underwear/undershirt/bowlingw - name = "Bowling Shirt, White" - icon_state = "bowlingw" - /datum/category_item/underwear/undershirt/longjon name = "Long John Shirt" icon_state = "ljont" diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 3d4fa95a9be..c20e75fb3eb 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -123,11 +123,11 @@ path = /obj/item/ammo_magazine/super_heavy desc = "A spare magazine, for the super heavy K2557 pistol." -/datum/uplink_item/item/ammo/shotgun_slug - name = "Shotgun Slug" - telecrystal_cost = 1 - path = /obj/item/ammo_casing/shotgun - desc = "A shotgun slug." +/datum/uplink_item/item/ammo/shotgun_slugs + name = "Box of Slug Shells" + telecrystal_cost = 2 + path = /obj/item/storage/box/shells/slugs + desc = "Contains eight shotgun slug shells." /datum/uplink_item/item/ammo/tungsten_ammo_box name = "Tungsten Ammo Box" @@ -137,13 +137,13 @@ /datum/uplink_item/item/ammo/slug_magazine name = "Slug Magazine" - telecrystal_cost = 8 + telecrystal_cost = 2 path = /obj/item/ammo_magazine/assault_shotgun desc = "A magazine for an assault shotgun, loaded with slug shells." /datum/uplink_item/item/ammo/buckshot_magazine name = "Buckshot Magazine" - telecrystal_cost = 4 + telecrystal_cost = 1 path = /obj/item/ammo_magazine/assault_shotgun/shells desc = "A magazine for an assault shotgun, loaded with buckshot shells." diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm index 70a5a081736..9b39dacc46c 100644 --- a/code/datums/uplink/announcements.dm +++ b/code/datums/uplink/announcements.dm @@ -54,7 +54,7 @@ record.sex = I.sex record.employer = I.employer_faction var/datum/faction/id_faction = SSjobs.name_factions[I.employer_faction] - var/faction_abbreviation = id_faction.title_suffix + var/faction_abbreviation = id_faction?.title_suffix var/assignment = "[I.assignment][ faction_abbreviation ? " ([faction_abbreviation])" : ""]" record.rank = assignment record.real_rank = assignment diff --git a/code/datums/uplink/hardsuits_and_modules.dm b/code/datums/uplink/hardsuits_and_modules.dm index b2458049dd3..faf5c820eaa 100644 --- a/code/datums/uplink/hardsuits_and_modules.dm +++ b/code/datums/uplink/hardsuits_and_modules.dm @@ -104,13 +104,6 @@ path = /obj/item/rig_module/storage desc = "A small hardsuit mounted storage unit, capable of holding a few items." -/datum/uplink_item/item/hardsuit_modules/vitalscanner - name = "Vitals Tracker Module" - telecrystal_cost = 1 - bluecrystal_cost = 1 - path = /obj/item/rig_module/device/healthscanner/vitalscanner - desc = "A module that allows a hardsuit to scan the users vitals, and give readouts of them." - /datum/uplink_item/item/hardsuit_modules/basicinjector name = "Emergency Chemical Injector" telecrystal_cost = 2 diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index 27946fa12ae..ac75f7c0057 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -6,7 +6,8 @@ wires = list( WIRE_POWER, WIRE_IDSCAN, WIRE_AI, - WIRE_PANIC, WIRE_ALARM + WIRE_PANIC, WIRE_ALARM, + WIRE_RCON ) add_duds(3) ..() @@ -24,6 +25,7 @@ . += A.locked ? "The air alarm is locked." : "The air alarm is unlocked." . += (A.shorted || (A.stat & (NOPOWER|BROKEN))) ? "The Air Alarm is offline." : "The Air Alarm is working properly!" . += A.aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on." + . += A.rcon_setting ? "The remote control link is enabled." : "The remote control link is disabled." /datum/wires/alarm/on_cut(wire, mend, source) var/obj/structure/machinery/alarm/A = holder @@ -51,6 +53,12 @@ A.post_alert(2) A.update_icon() + if(WIRE_RCON) + if(!mend) + A.rcon_setting = FALSE + else + A.rcon_setting = TRUE + /datum/wires/alarm/on_pulse(wire) var/obj/structure/machinery/alarm/A = holder switch(wire) @@ -67,7 +75,6 @@ A.shorted = 0 A.update_icon() - if (WIRE_AI) if (A.aidisabled == 0) A.aidisabled = 1 @@ -83,7 +90,7 @@ A.mode = 1 // AALARM_MODE_SCRUB A.apply_mode() - if(WIRE_ALARM) + if(WIRE_ALARM, WIRE_RCON) if (A.alarm_area.atmosalert(0, A)) A.post_alert(0) A.update_icon() diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index 02c2284958d..c234334c2f0 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -31,7 +31,7 @@ if(WIRE_TRANSMIT) R.set_broadcasting(!R.get_broadcasting() && !is_cut(WIRE_SIGNAL)) - SSnanoui.update_uis(holder) + SStgui.update_uis(holder) /datum/wires/radio/on_cut(wire, mend, source) var/obj/item/radio/R = holder @@ -45,4 +45,4 @@ if(WIRE_TRANSMIT) R.set_broadcasting(mend && !is_cut(WIRE_SIGNAL)) - SSnanoui.update_uis(holder) + SStgui.update_uis(holder) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index cf44b2ff2e2..6a64545f853 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -215,7 +215,7 @@ target_mob.standard_weapon_hit_effects(src, user, damageamount, armorpercent, target_zone) user.visible_message("[endmessage3rd][punct]", "[endmessage1st][punct]") - user.do_attack_animation(target_mob) + user.do_attack_animation(target_mob, used_item = src) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(soundname) diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm index 7d222ab3698..a5237effb0f 100644 --- a/code/game/atom/_atom.dm +++ b/code/game/atom/_atom.dm @@ -138,19 +138,31 @@ /// This atom's cache of overlays that can only be removed explicitly, like C4. Do not manipulate directly- See SSoverlays. var/list/atom_protected_overlay_cache + /// The mob currently interacting with the atom during a `do_after` timer. Used to validate `DO_TARGET_UNIQUE_ACT` flag checks. + var/mob/do_unique_target_user + + /* + * Duplicate vars and logic created for untranslated images for the sake of getting an untranslated langchat to display for listeners who do not understand + * the language being spoken. Someone could certainly think of cleaner ways to do this, but for want of a better solution right now, it has been implemented + * in this rote manner to make it easier to strip out in future if it needs replaced. + */ + + var/image/langchat_image + var/image/langchat_image_untranslated + var/list/mob/langchat_listeners + var/list/mob/langchat_listeners_untranslated + /atom/Destroy(force) if(opacity) updateVisibility(src) - if(reagents) - QDEL_NULL(reagents) + QDEL_NULL(reagents) // Checking length(overlays) before cutting has significant speed benefits if(length(overlays)) overlays.Cut() - if(light) - QDEL_NULL(light) + QDEL_NULL(light) if(smoothing_flags & SMOOTH_QUEUED) SSicon_smooth.remove_from_queues(src) @@ -167,8 +179,12 @@ // The component is attached to us normaly and will be deleted elsewhere orbiters = null - - . = ..() + do_unique_target_user = null + QDEL_NULL(langchat_image) + QDEL_NULL(langchat_image_untranslated) + langchat_listeners?.Cut() + langchat_listeners_untranslated?.Cut() + return ..() /atom/proc/handle_ricochet(obj/projectile/ricocheting_projectile) var/turf/p_turf = get_turf(ricocheting_projectile) diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm index 3f4a3d6a249..ab8d049536d 100644 --- a/code/game/atom/atom_examine.dm +++ b/code/game/atom/atom_examine.dm @@ -87,6 +87,15 @@ if(src.desc) . += src.desc + var/list/tags_list = examine_tags(user) + if(length(tags_list)) + var/tag_string = list() + for (var/atom_tag in tags_list) + tag_string += (isnull(tags_list[atom_tag]) ? atom_tag : SPAN_TOOLTIP(tags_list[atom_tag], atom_tag)) + // some regex to ensure that we don't add another "and" if the final element's main text (not tooltip) has one + tag_string = english_list(tag_string, and_text = (findtext(tag_string[length(tag_string)], regex(@">.*?and .*?<"))) ? " " : " and ") + . += "It is a [tag_string] [examine_descriptor(user)]." + // Returns a SPAN_* based on health, if configured. var/list/condition_hints = src.condition_hints() if(length(condition_hints)) @@ -145,6 +154,35 @@ if(H.glasses) H.glasses.glasses_examine_atom(src, H) +/// What this atom should be called in examine tags +/atom/proc/examine_descriptor(mob/user) + return "object" + +/** + * A list of "tags" displayed after atom's description in examine. + * This should return an assoc list of tags -> tooltips for them. If item is null, then no tooltip is assigned. + * + * * TGUI tooltips (not the main text) in chat cannot use HTML stuff at all, so + * trying something like `ffff` will not work for tooltips. + * + * For example: + * ```byond + * . = list() + * .["small"] = "It is a small item." + * .["fireproof"] = "It is made of fire-retardant materials." + * .["and conductive"] = "It's made of conductive materials and whatnot. Blah blah blah." // having "and " in the end tag's main text/key works too! + * ``` + * will result in + * + * It is a *small*, *fireproof* *and conductive* item. + * + * where "item" is pulled from [/atom/proc/examine_descriptor] + */ +/atom/proc/examine_tags(mob/user) + . = list() + + SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE_TAGS, user, .) + /** * Used to check if "examine_fluff" from the HTML link in examine() is true, i.e. if it was clicked. */ diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 13fcc2b8e92..72ba517426e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -543,6 +543,18 @@ if(src.z == H.z && get_dist(src, H) <= range) H.intent_listen(src, message) +/proc/get_intent_listeners(var/atom/source, var/range = 7, var/list/hearers = list()) + SHOULD_NOT_SLEEP(TRUE) + var/list/listeners = list() + if(air_sound(source)) + if(!length(hearers)) + hearers = get_hearers_in_view(range, source) + for(var/mob/living/carbon/human/H as anything in GLOB.intent_listener) + if((H in hearers)) + if(source.z == H.z && get_dist(source, H) <= range) + listeners += H + return listeners + /atom/movable/proc/dropInto(var/atom/destination) while(istype(destination)) var/atom/drop_destination = destination.onDropInto(src) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 8332eef368b..ec9f6c8cd35 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -87,6 +87,11 @@ /// Whether this atom should have its dir automatically changed when it moves. Setting this to FALSE allows for things such as directional windows to retain dir on moving without snowflake code all of the place. var/set_dir_on_move = TRUE + var/tmp/turf/airflow_dest + var/tmp/airflow_speed = 0 + var/tmp/airflow_time = 0 + var/tmp/last_airflow = 0 + /atom/movable/Initialize(mapload, ...) . = ..() update_emissive_blocker() @@ -114,14 +119,11 @@ QDEL_LAZYLIST(contained_mobs) - . = ..() - for(var/movable_content in contents) qdel(movable_content) //Pretend this is moveToNullspace() moveToNullspace() - loc = null //This absolutely must be after moveToNullspace() //We rely on Entered and Exited to manage this list, and the copy of this list that is on any /atom/movable "Containers" @@ -150,6 +152,9 @@ QDEL_NULL(light) QDEL_NULL(static_light) + airflow_dest = null + loc = null + return ..() /atom/movable/proc/moveToNullspace() . = TRUE @@ -577,11 +582,19 @@ /* END Spatial grid stuffs */ for(var/datum/dynamic_light_source/light as anything in hybrid_light_sources) + if(!light) // datum was deleted but list entry not yet pruned + LAZYREMOVE(hybrid_light_sources, light) + continue + if(!light.source_atom) + continue light.source_atom.update_light() if(!isturf(loc)) light.find_containing_atom() for(var/datum/static_light_source/L as anything in static_light_sources) // Cycle through the light sources on this atom and tell them to update. - L.source_atom.static_update_light() + if(!L) // datum was deleted but list entry not yet pruned + LAZYREMOVE(static_light_sources, L) + continue + L.source_atom?.static_update_light() /atom/movable/Exited(atom/movable/gone, direction) . = ..() @@ -817,6 +830,192 @@ // This is instant on byond's end, but to our clients this looks like a quick drop animate(src, alpha = old_alpha, pixel_x = old_x, pixel_y = old_y, transform = old_transform, time = 3, easing = CUBIC_EASING) +/atom/movable/proc/do_item_attack_animation(atom/attacked_atom, visual_effect_icon, obj/item/used_item, animation_type) + if (!visual_effect_icon) + if (used_item) + used_item.animate_attack(src, attacked_atom, animation_type) + return + + var/image/attack_image = image(icon = 'icons/effects/effects.dmi', icon_state = visual_effect_icon) + attack_image.plane = attacked_atom.plane + 1 + // Scale the icon. + attack_image.transform *= 0.4 + // The icon should not rotate. + attack_image.appearance_flags = APPEARANCE_UI + var/atom/movable/flick_visual/attack = attacked_atom.flick_overlay_view(attack_image, 1 SECONDS) + var/matrix/copy_transform = new(transform) + animate(attack, alpha = 175, transform = copy_transform.Scale(0.75), time = 0.3 SECONDS) + animate(time = 0.1 SECONDS) + animate(alpha = 0, time = 0.3 SECONDS, easing = CIRCULAR_EASING|EASE_OUT) + +/obj/item/proc/animate_attack(atom/movable/attacker, atom/attacked_atom, animation_type) + var/list/image_override = list() + var/list/animation_override = list() + var/used_icon_angle = icon_angle + var/list/angle_override = list() + SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_ANIMATION, attacker, attacked_atom, animation_type, image_override, animation_override, angle_override) + var/image/attack_image = null + if (!length(image_override)) + attack_image = isnull(attack_icon) ? image(icon = src) : image(icon = attack_icon, icon_state = attack_icon_state) + else + attack_image = image_override[1] + + if (length(animation_override)) + animation_type = animation_override[1] + else if (!animation_type) + var/damage_flags = damage_flags() + if(damage_flags & DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE) + animation_type = pick(ATTACK_ANIMATION_SLASH, ATTACK_ANIMATION_PIERCE) + else if(damage_flags & DAMAGE_FLAG_SHARP) + animation_type = ATTACK_ANIMATION_SLASH + else if (damage_flags & DAMAGE_FLAG_EDGE) + animation_type = ATTACK_ANIMATION_PIERCE + else + animation_type = ATTACK_ANIMATION_BLUNT + + if (length(angle_override)) + used_icon_angle = angle_override[1] + + attack_image.plane = attacked_atom.plane + 1 + attack_image.pixel_w = attacker.get_standard_pixel_x() + attacker.pixel_w - attacked_atom.get_standard_pixel_x() - attacked_atom.pixel_w + attack_image.pixel_z = attacker.get_standard_pixel_y() + attacker.pixel_z - attacked_atom.get_standard_pixel_y() - attacked_atom.pixel_z + // Scale the icon. + attack_image.transform *= 0.5 + // The icon should not rotate. + attack_image.appearance_flags = APPEARANCE_UI + + var/atom/movable/flick_visual/attack = attacked_atom.flick_overlay_view(attack_image, 1 SECONDS) + var/matrix/copy_transform = new(attacker.transform) + var/x_sign = 0 + var/y_sign = 0 + var/direction = get_dir(attacker, attacked_atom) + if (direction & NORTH) + y_sign = -1 + else if (direction & SOUTH) + y_sign = 1 + + if (direction & EAST) + x_sign = -1 + else if (direction & WEST) + x_sign = 1 + + // Attacking self, or something on the same turf as us + if (!direction) + y_sign = 1 + // Not a fan of this, but its the "cleanest" way to animate this + x_sign = 0.25 * (prob(50) ? 1 : -1) + // For piercing attacks + direction = SOUTH + + // And animate the attack! + switch (animation_type) + if (ATTACK_ANIMATION_BLUNT) + attack.pixel_x = 14 * x_sign + attack.pixel_y = 12 * y_sign + animate(attack, alpha = 175, transform = copy_transform.Scale(0.75), pixel_x = 4 * x_sign, pixel_y = 3 * y_sign, time = 0.2 SECONDS) + animate(time = 0.1 SECONDS) + animate(alpha = 0, time = 0.1 SECONDS, easing = CIRCULAR_EASING|EASE_OUT) + + if (ATTACK_ANIMATION_PIERCE) + var/attack_angle = dir2angle(direction) + rand(-7, 7) + // Deducting 90 because we're assuming that icon_angle of 0 means an east-facing sprite + var/anim_angle = attack_angle - 90 - used_icon_angle + var/angle_mult = 1 + if (x_sign && y_sign) + angle_mult = 1.4 + attack.pixel_x = 22 * x_sign * angle_mult + attack.pixel_y = 18 * y_sign * angle_mult + attack.transform = attack.transform.Turn(anim_angle) + copy_transform = copy_transform.Turn(anim_angle) + animate( + attack, + pixel_x = (22 * x_sign - 12 * sin(attack_angle)) * angle_mult, + pixel_y = (18 * y_sign - 8 * cos(attack_angle)) * angle_mult, + time = 0.1 SECONDS, + easing = CUBIC_EASING|EASE_IN, + ) + animate( + attack, + alpha = 175, + transform = copy_transform.Scale(0.75), + pixel_x = (22 * x_sign + 26 * sin(attack_angle)) * angle_mult, + pixel_y = (18 * y_sign + 22 * cos(attack_angle)) * angle_mult, + time = 0.3 SECONDS, + easing = CUBIC_EASING|EASE_OUT, + ) + animate( + alpha = 0, + pixel_x = -3 * -(x_sign + sin(attack_angle)), + pixel_y = -2 * -(y_sign + cos(attack_angle)), + time = 0.1 SECONDS, + easing = CIRCULAR_EASING|EASE_OUT + ) + + if (ATTACK_ANIMATION_SLASH) + attack.pixel_x = 18 * x_sign + attack.pixel_y = 14 * y_sign + var/x_rot_sign = 0 + var/y_rot_sign = 0 + var/attack_dir = (prob(50) ? 1 : -1) + var/anim_angle = dir2angle(direction) - 90 - used_icon_angle + + if (x_sign) + y_rot_sign = attack_dir + if (y_sign) + x_rot_sign = attack_dir + + // Animations are flipped, so flip us too! + if (x_sign > 0 || y_sign < 0) + attack_dir *= -1 + + // We're swinging diagonally, use separate logic + var/anim_dir = attack_dir + if (x_sign && y_sign) + if (attack_dir < 0) + x_rot_sign = -x_sign * 1.4 + y_rot_sign = 0 + else + x_rot_sign = 0 + y_rot_sign = -y_sign * 1.4 + + // Flip us if we've been flipped *unless* we're flipped due to both axis + if ((x_sign < 0 && y_sign > 0) || (x_sign > 0 && y_sign < 0)) + anim_dir *= -1 + + attack.pixel_x += 10 * x_rot_sign + attack.pixel_y += 8 * y_rot_sign + attack.transform = attack.transform.Turn(anim_angle - 45 * anim_dir) + copy_transform = copy_transform.Scale(0.75) + animate(attack, alpha = 175, time = 0.3 SECONDS, flags = ANIMATION_PARALLEL) + animate(time = 0.1 SECONDS) + animate(alpha = 0, time = 0.1 SECONDS, easing = CIRCULAR_EASING|EASE_OUT) + + animate(attack, transform = copy_transform.Turn(anim_angle + 45 * anim_dir), time = 0.3 SECONDS, flags = ANIMATION_PARALLEL) + + var/x_return = 10 * -x_rot_sign + var/y_return = 8 * -y_rot_sign + + if (!x_rot_sign) + x_return = 18 * x_sign + if (!y_rot_sign) + y_return = 14 * y_sign + + var/angle_mult = 1 + if (x_sign && y_sign) + angle_mult = 1.4 + if (attack_dir > 0) + x_return = 8 * x_sign + y_return = 14 * y_sign + else + x_return = 18 * x_sign + y_return = 6 * y_sign + + animate(attack, pixel_x = 4 * x_sign * angle_mult, time = 0.2 SECONDS, easing = CIRCULAR_EASING | EASE_IN, flags = ANIMATION_PARALLEL) + animate(pixel_x = x_return, time = 0.2 SECONDS, easing = CIRCULAR_EASING | EASE_OUT) + + animate(attack, pixel_y = 3 * y_sign * angle_mult, time = 0.2 SECONDS, easing = CIRCULAR_EASING | EASE_IN, flags = ANIMATION_PARALLEL) + animate(pixel_y = y_return, time = 0.2 SECONDS, easing = CIRCULAR_EASING | EASE_OUT) + /atom/movable/proc/get_floating_chat_x_offset() return 0 diff --git a/code/game/gamemodes/cult/cultify/mob.dm b/code/game/gamemodes/cult/cultify/mob.dm index 7a303018c70..b519ab7e836 100644 --- a/code/game/gamemodes/cult/cultify/mob.dm +++ b/code/game/gamemodes/cult/cultify/mob.dm @@ -1,8 +1,3 @@ -/mob - //thou shall always be able to see the Geometer of Blood - var/image/narsimage = null - var/image/narglow = null - /mob/proc/cultify() return diff --git a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm index e4f45ab6fe4..1f8f63d9361 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm @@ -54,11 +54,6 @@ spawn (0) AM.singularity_pull(src, src.current_size) - -/mob - //thou shall always be able to see the rift - var/image/riftimage = null - /mob/proc/see_rift(var/obj/singularity/narsie/large/exit/R) var/turf/T_mob = get_turf(src) if((R.z == T_mob.z) && (get_dist(R,T_mob) <= (R.consume_range+10)) && !(R in view(T_mob))) diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm index 9357fefb54f..c8ba4c842d5 100644 --- a/code/game/gamemodes/technomancer/instability.dm +++ b/code/game/gamemodes/technomancer/instability.dm @@ -8,13 +8,6 @@ #define TECHNOMANCER_INSTABILITY_PRECISION 0.1 // Instability is rounded to this. #define TECHNOMANCER_INSTABILITY_MIN_GLOW 10 // When above this number, the entity starts glowing, affecting others. - -/mob/living - atom_flags = CRITICAL_ATOM - var/instability = 0 - var/last_instability = 0 // Used to calculate instability delta. - var/last_instability_event = null // most recent world.time that something bad happened due to instability. - // Proc: adjust_instability() // Parameters: 0 // Description: Does nothing, because inheritance. diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm index 8d89eed11dc..6b93e7f42e3 100644 --- a/code/game/objects/effects/chem/foam.dm +++ b/code/game/objects/effects/chem/foam.dm @@ -180,7 +180,7 @@ /obj/structure/foamedmetal/attack_hand(var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.do_attack_animation(src, FIST_ATTACK_ANIMATION) + user.do_attack_animation(src) if ((user.mutations & HULK) || (prob(75 - metal * 25))) user.visible_message(SPAN_WARNING("[user] smashes through the foamed metal."), SPAN_NOTICE("You smash through the metal foam wall.")) qdel(src) @@ -238,7 +238,7 @@ qdel(src) return TRUE - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) if(prob(attacking_item.force * 20 - metal * 25)) user.visible_message(SPAN_WARNING("[user] smashes through the foamed metal."), SPAN_NOTICE("You smash through the foamed metal with \the [attacking_item].")) qdel(src) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 751f1ed62a0..068eccaa700 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -14,10 +14,6 @@ would spawn and follow the beaker, even if it is carried or thrown. pass_flags = PASSTABLE | PASSGRILLE blocks_emissive = EMISSIVE_BLOCK_GENERIC -/obj/effect/Destroy() - QDEL_NULL(reagents) - return ..() - /datum/effect/effect/system var/number = 3 var/cardinals = 0 diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 2a643f5cf43..da1c89c007e 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -1,25 +1,24 @@ -/proc/gibs(atom/location, var/list/viruses, var/datum/dna/MobDNA, gibber_type = /obj/effect/gibspawner/generic, var/fleshcolor, var/bloodcolor) - new gibber_type(location,viruses,MobDNA,fleshcolor,bloodcolor) +/proc/gibs(atom/location, var/datum/dna/MobDNA, gibber_type = /obj/effect/gibspawner/generic, var/fleshcolor, var/bloodcolor) + new gibber_type(location,MobDNA,fleshcolor,bloodcolor) /obj/effect/gibspawner icon = 'icons/effects/map_effects.dmi' icon_state = "gibspawner" var/sparks = 0 //whether sparks spread on Gib() - var/virusProb = 20 //the chance for viruses to spread on the gibs var/list/gibtypes = list() var/list/gibamounts = list() var/list/gibdirections = list() //of lists var/fleshcolor //Used for gibbed humans. var/bloodcolor //Used for gibbed humans. -/obj/effect/gibspawner/Initialize(mapload, list/viruses, datum/dna/MobDNA, fleshcolor, bloodcolor) +/obj/effect/gibspawner/Initialize(mapload, datum/dna/MobDNA, fleshcolor, bloodcolor) . = ..() if(fleshcolor) src.fleshcolor = fleshcolor if(bloodcolor) src.bloodcolor = bloodcolor - Gib(loc,viruses,MobDNA) + Gib(loc,MobDNA) -/obj/effect/gibspawner/proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) +/obj/effect/gibspawner/proc/Gib(atom/location, var/datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) to_world(SPAN_WARNING("Gib list length mismatch!")) return diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 361339ec34b..a7eec14b0ab 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -136,6 +136,8 @@ var/zoomdevicename /// Boolean, `TRUE` if item is actively being used to zoom. For scoped guns and binoculars. var/zoom = FALSE + /// The message used when stopping looking through a pair of binoculars/scope + var/zoom_out_message /// Boolean, if item_state, lefthand, righthand, and worn sprite are all in one dmi var/contained_sprite = FALSE @@ -205,6 +207,13 @@ /// Used to override hardcoded clothing dmis in human clothing pr var/icon_override + /// Angle of the icon, used for piercing and slashing attack animations, clockwise from *east-facing* sprites + var/icon_angle = 0 + ///icon file for an alternate attack icon + var/attack_icon + ///icon state for an alternate attack icon + var/attack_icon_state + var/charge_failure_message = " cannot be recharged." var/held_maptext @@ -259,8 +268,16 @@ var/mob/m = loc m.drop_from_inventory(src, null) - if(!QDELETED(action)) + if(islist(action)) + var/list/action_list = action + for(var/i in 1 to action_list.len) + var/datum/action/A = action_list[i] + if(!QDELETED(A)) + QDEL_NULL(A) + action_list.Cut() + else if(!QDELETED(action)) QDEL_NULL(action) // /mob/living/proc/handle_actions() creates it, for ungodly reasons + action = null if(!QDELETED(hidden_uplink)) @@ -327,23 +344,22 @@ I.forceMove(T) -/obj/item/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended = FALSE) - var/size - switch(src.w_class) - if (WEIGHT_CLASS_HUGE to INFINITY) - size = "huge" - if (WEIGHT_CLASS_BULKY to WEIGHT_CLASS_HUGE) - size = "bulky" - if (WEIGHT_CLASS_NORMAL to WEIGHT_CLASS_BULKY) - size = "normal-sized" - if (WEIGHT_CLASS_SMALL to WEIGHT_CLASS_NORMAL) - size = "small" - if (0 to WEIGHT_CLASS_SMALL) - size = "tiny" - //Changed this switch to ranges instead of tiered values, to cope with granularity and also - //things outside its range ~Nanako +/obj/item/examine_descriptor(mob/user) + return "item" - . = ..(user, distance, is_adjacent, "It is a [size] item.", get_extended = get_extended) +/obj/item/examine_tags(mob/user) + var/list/parent_tags = ..() + parent_tags.Insert(1, weight_class_to_text(w_class)) // To make size display first, otherwise it looks goofy + . = parent_tags + .[weight_class_to_text(w_class)] = weight_class_to_tooltip(w_class) + + if (siemens_coefficient == 0) + .["insulated"] = "It is made from a robust electrical insulator and will block any electricity passing through it!" + else if (siemens_coefficient <= 0.5) + .["partially insulated"] = "It is made from a poor insulator that will dampen (but not fully block) electric shocks passing through it." + +/obj/item/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended = FALSE) + . = ..(user, distance, is_adjacent, get_extended = get_extended) var/datum/component/armor/armor_component = GetComponent(/datum/component/armor) if(armor_component && !armor_component.hidden) . += FONT_SMALL(SPAN_NOTICE("\[?\] This item has armor values. \[Show Armor Values\]")) @@ -1005,9 +1021,11 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. M.client.pixel_x = 0 M.client.pixel_y = 0 - if(!cannotzoom) - if(show_zoom_message) + if(!cannotzoom && show_zoom_message) + if(!zoom_out_message) M.visible_message("[zoomdevicename ? "[M] looks up from \the [src.name]" : "[M] lowers \the [src.name]"].") + else + M.visible_message("[zoomdevicename ? "[M][zoom_out_message] \the [src.name]." : "[M][zoom_out_message]"]") if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -1328,10 +1346,10 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. . = ..() if(in_inventory || in_storage) var/mob/user = usr - if(!(user.client.prefs.toggles_secondary & HIDE_ITEM_TOOLTIPS)) - tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), 8, TIMER_STOPPABLE) if(QDELETED(src)) return + if(!(user.client.prefs.toggles_secondary & HIDE_ITEM_TOOLTIPS)) + tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), 8, TIMER_STOPPABLE) if(!(user.client.prefs.toggles_secondary & SEE_ITEM_OUTLINES)) return var/mob/living/L = user diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index dbc3600e5dd..b1b07164e57 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -4,7 +4,7 @@ pixel_y = 20; #define PRESET_SOUTH \ dir = SOUTH; \ -pixel_y = -6; +pixel_y = -2; #define PRESET_WEST \ dir = WEST; \ diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 5a1930c7385..11bec517459 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -1,7 +1,7 @@ /obj/item/suit_cooling_unit name = "portable suit cooling unit" desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling." - w_class = WEIGHT_CLASS_BULKY + w_class = WEIGHT_CLASS_NORMAL icon = 'icons/obj/item/suitcooler.dmi' icon_state = "suitcooler0" item_state = "coolingpack" @@ -17,14 +17,25 @@ origin_tech = list(TECH_MAGNET = 2, TECH_MATERIAL = 2) - var/celltype = /obj/item/cell/high + // Type of cell the IPC cooling unit starts with. + var/celltype = /obj/item/cell/apc matter = list(MATERIAL_ALUMINIUM = 25000, MATERIAL_GLASS = 3500) - var/on = 0 //is it turned on? - var/cover_open = 0 //is the cover open? + + // Is it turned on? + var/on = 0 + // Is the cover open? + var/cover_open = 0 + var/obj/item/cell/cell - var/max_cooling = 24 //in degrees kelvin per second - probably don't need to mess with heat capacity here - var/charge_consumption = 8.3 //charge per second at max_cooling + + // In degrees kelvin per second - probably don't need to mess with heat capacity here + var/max_cooling = 24 + + // Base charge consumption per second. Modified by how much cooling work the cooler is doing. + var/charge_consumption = 15.4 + + // Target to cool an IPC to. var/thermostat = T20C //TODO: make it heat up the surroundings when not in space @@ -241,3 +252,6 @@ /obj/item/suit_cooling_unit/no_cell celltype = null + +/obj/item/suit_cooling_unit/hyper_cell // Mostly for special spawns, events, etc., so they don't have to worry about cell charge. + celltype = /obj/item/cell/hyper diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 7eb77201608..09f5eafce0d 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -42,7 +42,7 @@ else if(crystal_type == CRYSTAL_TYPE_BLUECRYSTAL) I.hidden_uplink.bluecrystals += amount I.hidden_uplink.update_tgui_data() - SSnanoui.update_uis(I.hidden_uplink) + SStgui.update_uis(I.hidden_uplink) use(amount) to_chat(user, SPAN_NOTICE("You slot \the [src] into \the [I] and charge its internal uplink.")) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm index 99848dc4245..cdd3219aa4a 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm @@ -4,7 +4,9 @@ build_path = /obj/structure/machinery/shield_gen/external origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) req_components = list( - "/obj/item/stock_parts/manipulator/pico" = 2, + "/obj/item/stock_parts/manipulator" = 2, + "/obj/item/stock_parts/micro_laser" = 2, + "/obj/item/stock_parts/capacitor" = 2, "/obj/item/stock_parts/subspace/transmitter" = 1, "/obj/item/stock_parts/subspace/crystal" = 1, "/obj/item/stock_parts/subspace/amplifier" = 1, @@ -17,7 +19,9 @@ build_path = /obj/structure/machinery/shield_gen origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) req_components = list( - "/obj/item/stock_parts/manipulator/pico" = 2, + "/obj/item/stock_parts/manipulator" = 2, + "/obj/item/stock_parts/micro_laser" = 2, + "/obj/item/stock_parts/capacitor" = 2, "/obj/item/stock_parts/subspace/transmitter" = 1, "/obj/item/stock_parts/subspace/crystal" = 1, "/obj/item/stock_parts/subspace/amplifier" = 1, @@ -30,7 +34,8 @@ build_path = /obj/structure/machinery/shield_capacitor origin_tech = list(TECH_MAGNET = 3, TECH_POWER = 4) req_components = list( - "/obj/item/stock_parts/manipulator/pico" = 2, + "/obj/item/stock_parts/capacitor" = 4, + "/obj/item/stock_parts/micro_laser" = 1, "/obj/item/stock_parts/subspace/filter" = 1, "/obj/item/stock_parts/subspace/treatment" = 1, "/obj/item/stock_parts/subspace/analyzer" = 1, diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index cd749b4f00e..b04398747aa 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -36,13 +36,21 @@ if(M.flash_act(ignore_inherent = TRUE)) M.Weaken(10) - // 1 - 9x/70 gives us 100% at zero, 87% at 1 turf, all the way to 10% at 7 - var/bang_intensity = 1 - (9 * get_dist(T, M) / 70) - M.noise_act(intensity = EAR_PROTECTION_MODERATE, damage_pwr = 10 * bang_intensity, deafen_pwr = 15 * (1 - bang_intensity)) + var/distance_to_grenade = get_dist(T, M) - if(M.get_hearing_sensitivity()) // we only stun if they've got sensitive ears + // 1 - 9x/70 gives us 100% at zero, 87% at 1 turf, all the way to 10% at 7 + var/bang_intensity = 1 - (9 * distance_to_grenade / 70) + + var/ear_damage = 10 * bang_intensity + var/deafen_damage = 15 * (1 - bang_intensity) + + + // we only stun if they've got sensitive ears and got it active as well as if it is close enough. + if(M.get_hearing_sensitivity() && astype(M, /mob/living/carbon/human)?.is_listening() && distance_to_grenade < 5) // checking for protection is handled by noise_act - M.noise_act(intensity = EAR_PROTECTION_MAJOR, stun_pwr = 2) + M.noise_act(intensity = EAR_PROTECTION_MAJOR, stun_pwr = 2, damage_pwr = ear_damage, deafen_pwr = deafen_damage) + else + M.noise_act(intensity = EAR_PROTECTION_MODERATE, damage_pwr = ear_damage, deafen_pwr = deafen_damage) M.disable_cloaking_device() M.update_icon() diff --git a/code/game/objects/items/weapons/grenades/fragmentation.dm b/code/game/objects/items/weapons/grenades/fragmentation.dm index bb12f49253d..cc87cc1be8d 100644 --- a/code/game/objects/items/weapons/grenades/fragmentation.dm +++ b/code/game/objects/items/weapons/grenades/fragmentation.dm @@ -1,8 +1,29 @@ -/proc/fragem(var/source,var/fragx,var/fragy,var/light_dam,var/flash_dam,var/p_dam,var/p_range,var/can_cover=TRUE,var/shard_range = 50) +/** + * Fragem works by shooting a projectile containing fragments at every tile in a circle around it. + * + * Source is the tile the projectiles spawn on. + * + * fragx and fragy are the upper and lower bounds of the random number of fragments produced. + * + * light_dam and flash_dam are the parameters for the explosion produced by the grenade. light_dam is the radius of minor explosive damage, flash_dam is the radius of the flash effect. + * + * p_dam is the damage of each individual fragments. + * + * p_range is the distance each projectile travels before losing a fragment. When a projectile loses all of its fragments, it is deleted. + * + * can_cover determines if a mob can lie on the source turf to absorb most of the fragments. + * + * shard_range is the maximum range of the projectiles produced by the fragem. This is separate from p_range to allow for projectiles that lose fragments over distance but have a hard maximum range. Default 50 + * + * spread_range is the radius of the circle used to launch projectiles. Lower values mean less projectiles are used but if set too low gaps may appear in the spread pattern. Default 7 + * + * maim_rate is the bonus for projectiles to decapitate or gib limbs. Negative values reduce this chance, positive values increase it. There is a minimum maim multiplier of 0.1, see handle_limb_gibbing for details. + */ +/proc/fragem(var/source,var/fragx,var/fragy,var/light_dam,var/flash_dam,var/p_dam,var/p_range,var/can_cover=TRUE,var/shard_range = 50,var/spread_range = 7,var/maim_rate) var/turf/O = get_turf(source) var/fragger = rand(fragx,fragy) explosion(O, -1, -1, light_dam, flash_dam) - var/list/target_turfs = getcircle(O, 7) + var/list/target_turfs = getcircle(O, spread_range) var/fragments_per_projectile = round(fragger/target_turfs.len) for(var/turf/T in target_turfs) @@ -12,9 +33,10 @@ P.damage = p_dam P.pellets = fragments_per_projectile P.range_step = p_range + if (maim_rate) + P.maim_rate = maim_rate P.range = shard_range P.name = "shrapnel" - P.preparePixelProjectile(T, get_turf(source)) P.firer = source P.fired_from = source diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 2303abaf704..94d48999bd5 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -106,6 +106,11 @@ /obj/item/material/shard/shrapnel/Initialize(newloc, material_key) . = ..(loc, MATERIAL_STEEL) +/obj/item/material/shard/shrapnel/large/Initialize(newloc, material_key) //Shrapnel large enough to be removed by hand. Used by ship weapons. + . = ..(loc, MATERIAL_STEEL) + icon_state = "large" + w_class = WEIGHT_CLASS_NORMAL + /obj/item/material/shard/shrapnel/flechette/Initialize(newloc, material_key) . = ..(loc, MATERIAL_TITANIUM) diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 31ac7e91371..3eba17f35fc 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -200,11 +200,12 @@ /obj/item/material/twohanded/fireaxe // DEM AXES MAN, marker -Agouri icon_state = "fireaxe0" base_icon = "fireaxe" + icon_angle = -180 name = "fire axe" desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?" unwielded_force_divisor = 0.25 force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor - sharp = 1 + sharp = FALSE edge = TRUE w_class = WEIGHT_CLASS_BULKY slot_flags = SLOT_BACK @@ -243,6 +244,7 @@ /obj/item/material/twohanded/spear icon_state = "spearglass0" base_icon = "spearglass" + icon_angle = -45 name = "spear" desc = "A haphazardly-constructed yet still deadly weapon of ancient design." force = 15 diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 11120702657..bccb17704f2 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -33,6 +33,7 @@ use_sound = 'sound/items/storage/toolbox.ogg' drop_sound = 'sound/items/drop/toolbox.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' + rustle_sound = 'sound/items/rustle/toolbox.ogg' /obj/item/storage/briefcase/nt name = "\improper NT briefcase" diff --git a/code/game/objects/items/weapons/storage/pill_bottle.dm b/code/game/objects/items/weapons/storage/pill_bottle.dm index 378401015ee..30b6da75758 100644 --- a/code/game/objects/items/weapons/storage/pill_bottle.dm +++ b/code/game/objects/items/weapons/storage/pill_bottle.dm @@ -13,6 +13,7 @@ use_sound = 'sound/items/storage/pillbottle.ogg' drop_sound = 'sound/items/drop/pillbottle.ogg' pickup_sound = 'sound/items/pickup/pillbottle.ogg' + rustle_sound = 'sound/items/pickup/pillbottle.ogg' max_storage_space = DEFAULT_BOX_STORAGE /obj/item/storage/pill_bottle/attack_self(mob/living/user) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index a11c21edc2f..2a2d98f02f5 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -89,7 +89,7 @@ /obj/effect/energy_net/attack_hand(var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.do_attack_animation(src, FIST_ATTACK_ANIMATION) + user.do_attack_animation(src) if(user == affecting) to_chat(user, SPAN_WARNING("You can't claw at \the [src] while trapped inside it! You need to use a weapon.")) return @@ -110,7 +110,7 @@ /obj/effect/energy_net/attackby(obj/item/attacking_item, mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) var/attack_force = attacking_item.force if(user == affecting) attack_force /= 2 diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 2107d72de22..73dbb9594dc 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -108,6 +108,15 @@ var/persistant_objects_expiration_time_days = PERSISTENT_DEFAULT_EXPIRATION_DAYS /* END PERSISTENCE VARS */ + /// for easy reference of talking atoms + var/datum/talking_atom/talking_atom + + /// Whether this object has been contaminated by atmos gasses like chlorine or phoron. + var/contaminated = FALSE + + /// Allow overriding rad resistance. + var/rad_resistance_modifier = 1 + /obj/Initialize(mapload, ...) . = ..() if(maxhealth) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index fb2705f1b10..766a38cd711 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -6,16 +6,20 @@ pass_flags_self = PASSSTRUCTURE should_use_health = TRUE - var/material_alteration = MATERIAL_ALTERATION_ALL // Overrides for material shit. Set them manually if you don't want colors etc. See wood chairs/office chairs. + /// Overrides for material shit. Set them manually if you don't want colors etc. See wood chairs/office chairs. + var/material_alteration = MATERIAL_ALTERATION_ALL var/climbable var/parts var/list/climbers - var/list/footstep_sound //footstep sounds when stepped on + /// Footstep sounds when stepped on + var/list/footstep_sound var/material/material - var/build_amt = 2 // used by some structures to determine into how many pieces they should disassemble into or be made with + /// Used by some structures to determine into how many pieces they should disassemble into or be made with + var/build_amt = 2 - var/slowdown = 0 //amount that pulling mobs have their movement delayed by + /// Amount that pulling mobs have their movement delayed by + var/slowdown = 0 /obj/structure/Initialize(mapload) . = ..() @@ -40,6 +44,14 @@ material = null return ..() +/obj/structure/examine_descriptor(mob/user) + return "structure" + +/obj/structure/examine_tags(atom/source, mob/user, list/examine_list) + . = ..() + if(climbable) + .["climbable"] = "It can be climbed on, either by dragging your mob onto it or middle-clicking it." + /obj/structure/attackby(obj/item/attacking_item, mob/user, params) . = ..() if(user?.a_intent == I_HURT && maxhealth) @@ -95,9 +107,13 @@ else dismantle_material = get_material() if(should_use_health && health <= 0) - build_amt /= rand(2, 4) //if the structure is destroyed by damage, it will yield less materials - for(var/i = 1 to build_amt) - dismantle_material.place_sheet(loc) + build_amt /= rand(2, 4) //if the structure is destroyed by damage, it will yield less materials. + build_amt = max(1, min(build_amt, 5)) //Bound between 5 and 1, as shards don't stack into sheets. + for(var/i = 1 to build_amt) + dismantle_material.place_shard(loc) + else + for(var/i = 1 to build_amt) + dismantle_material.place_sheet(loc) qdel(src) /obj/structure/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) diff --git a/code/game/objects/structures/_machinery.dm b/code/game/objects/structures/_machinery.dm index f08c063abce..574e007f162 100644 --- a/code/game/objects/structures/_machinery.dm +++ b/code/game/objects/structures/_machinery.dm @@ -250,12 +250,17 @@ Class Procs: for(var/i = 1 to 2) if(prob(50)) metal_to_spawn++ + else + new /obj/item/material/shard(current_turf, DEFAULT_WALL_MATERIAL) if(metal_to_spawn) new /obj/item/stack/material/steel(get_turf(src), metal_to_spawn) if(!should_use_health) return FALSE qdel(src) +/obj/structure/machinery/examine_descriptor(mob/user) + return "machine" + // /obj/structure/machinery/proc/process_all() // /* Uncomment this if/when you need component processing // if(processing_flags & MACHINERY_PROCESS_COMPONENTS) @@ -641,5 +646,5 @@ Class Procs: /obj/structure/machinery/ui_status(mob/user, datum/ui_state/state) . = ..() if(. < UI_INTERACTIVE) - if(user.machine) + if(user?.machine) user.unset_machine() diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index d6d8e773ffd..0d12a0c4f41 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -1498,6 +1498,10 @@ new /obj/item/coin/phoron(src) new /obj/item/coin/phoron(src) new /obj/item/coin/phoron(src) + new /obj/item/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) /obj/structure/closet/crate/secure/gear_loadout/outereyes/single/fill() new /obj/item/clothing/head/helmet/space/void/outereyes(src) @@ -1514,6 +1518,7 @@ new /obj/item/ammo_magazine/c46m/extended(src) new /obj/item/melee/energy/sword/knife(src) new /obj/item/coin/phoron(src) + new /obj/item/modkit/multi_species(src) /obj/structure/closet/crate/secure/gear_loadout/zavodskoi/fill() new /obj/item/rig/combat/zavod_heavy(src) diff --git a/code/game/objects/structures/full_window_frame.dm b/code/game/objects/structures/full_window_frame.dm index dbe0d2a3ee4..9e4e414d438 100644 --- a/code/game/objects/structures/full_window_frame.dm +++ b/code/game/objects/structures/full_window_frame.dm @@ -6,6 +6,7 @@ maxhealth = OBJECT_HEALTH_MEDIUM color = COLOR_GRAY20 build_amt = 4 + pass_flags_self = PASSRAILING layer = WINDOW_FRAME_LAYER anchored = TRUE density = TRUE @@ -59,6 +60,11 @@ return TRUE return FALSE +/obj/structure/window_frame/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) + . = ..() + if(. != BULLET_ACT_HIT) + return . + /obj/structure/window_frame/attackby(obj/item/attacking_item, mob/user) if((attacking_item.tool_behaviour == TOOL_SCREWDRIVER) && (istype(loc, /turf/simulated) || anchored)) if(has_glass_installed) diff --git a/code/game/objects/structures/gore/wall.dm b/code/game/objects/structures/gore/wall.dm index 4b8a45cdfc9..29e55ffb443 100644 --- a/code/game/objects/structures/gore/wall.dm +++ b/code/game/objects/structures/gore/wall.dm @@ -30,7 +30,7 @@ /obj/structure/gore/resin/attack_hand(var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.do_attack_animation(src, FIST_ATTACK_ANIMATION) + user.do_attack_animation(src) if((user.mutations & HULK)) visible_message(SPAN_DANGER("\The [user] destroys \the [src]!")) add_damage(maxhealth) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index f02cea9d467..65a82cc687e 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -159,6 +159,9 @@ var/damage = hitting_projectile.get_structure_damage() var/passthrough = 0 + if(piercing_hit) + return BULLET_ACT_FORCE_PIERCE //Shots that would have penetrated anyway don't get the damage reduction or chance to not penetrate. + if(!damage) return BULLET_ACT_BLOCK @@ -181,7 +184,7 @@ passthrough = 1 if(passthrough) - . = BULLET_ACT_HIT + . = BULLET_ACT_FORCE_PIERCE damage = between(0, (damage - hitting_projectile.damage)*(hitting_projectile.damage_type == DAMAGE_BRUTE? 0.4 : 1), 10) //if the bullet passes through then the grille avoids most of the damage add_damage(damage * 0.2) diff --git a/code/game/objects/structures/machinery/alarm.dm b/code/game/objects/structures/machinery/alarm.dm index a58c2b3518d..a34f6978d47 100644 --- a/code/game/objects/structures/machinery/alarm.dm +++ b/code/game/objects/structures/machinery/alarm.dm @@ -118,9 +118,8 @@ pixel_x = 10; var/breach_detection = 1 //var/skipprocess = 0 //Experimenting var/alarm_frequency = 1437 - var/remote_control = 0 - var/rcon_setting = 2 - var/rcon_time = 0 + /// If true, RCON is enabled. If false, RCON has been disabled. + var/rcon_setting = TRUE var/locked = 1 var/aidisabled = 0 var/shorted = 0 @@ -475,18 +474,6 @@ pixel_x = 10; mode=AALARM_MODE_FILL apply_mode() - //atmos computer remote controll stuff - switch(rcon_setting) - if(RCON_NO) - remote_control = 0 - if(RCON_AUTO) - if(danger_level == 2) - remote_control = 1 - else - remote_control = 0 - if(RCON_YES) - remote_control = 1 - return /obj/structure/machinery/alarm/proc/handle_heating_cooling(datum/gas_mixture/environment, seconds_per_tick) @@ -698,6 +685,22 @@ pixel_x = 10; frequency.post_signal(src, alert_signal) +/obj/structure/machinery/alarm/proc/is_alarming() + return max(danger_level, alarm_area?.atmosalm) > 0 + +/obj/structure/machinery/alarm/proc/is_remote_user(mob/user) + if(!user) + return FALSE + for(var/datum/tgui/open_tgui in user.tgui_open_uis) + if(open_tgui.interface == "AtmosAlarmControl") + return TRUE + return FALSE + +/obj/structure/machinery/alarm/proc/is_unlocked_for(mob/user) + if(is_remote_user(user) && rcon_setting) + return TRUE + return !locked || issilicon(user) + /obj/structure/machinery/alarm/attack_ai(mob/user) if(!ai_can_interact(user)) return @@ -751,7 +754,8 @@ pixel_x = 10; data["target_temperature"] = round(target_temperature - T0C, 0.1) // Access - data["locked"] = locked && !issilicon(user) + data["locked"] = !is_unlocked_for(user) + data["remote_view"] = is_remote_user(user) data["shorted"] = shorted data["rcon"] = rcon_setting @@ -848,14 +852,6 @@ pixel_x = 10; // Actions available without unlocking switch(action) - if("rcon") - var/new_rcon = text2num(params["value"]) - switch(new_rcon) - if(RCON_NO) rcon_setting = RCON_NO - if(RCON_AUTO) rcon_setting = RCON_AUTO - if(RCON_YES) rcon_setting = RCON_YES - return TRUE - if("temperature") var/list/tlv = TLV["temperature"] var/max_temperature = min(tlv[3] - T0C, MAX_TEMPERATURE) @@ -871,7 +867,7 @@ pixel_x = 10; return TRUE // Actions that require the alarm to be unlocked - if(locked && !issilicon(usr)) + if(!is_unlocked_for(usr)) return switch(action) @@ -962,11 +958,10 @@ pixel_x = 10; apply_mode() return TRUE -/// Snowflake proc to make it so users of the Atmosphere Control app (having the UI open) have full access to an alarm. +/// Lets Atmosphere Control users remotely view alarms. /obj/structure/machinery/alarm/ui_status(mob/user) - for(var/datum/tgui/open_tgui in user.tgui_open_uis) - if(open_tgui.interface == "AtmosAlarmControl") - return UI_INTERACTIVE + if(is_remote_user(user) && rcon_setting) + return UI_INTERACTIVE return ..() /** diff --git a/code/game/objects/structures/machinery/atmo_control.dm b/code/game/objects/structures/machinery/atmo_control.dm index 69fcdca9d06..09becf19622 100644 --- a/code/game/objects/structures/machinery/atmo_control.dm +++ b/code/game/objects/structures/machinery/atmo_control.dm @@ -141,7 +141,7 @@ var/list/sensor_information = list() var/datum/radio_frequency/radio_connection - var/ui_type = "AtmosControl" + ui_type = "AtmosControl" circuit = /obj/item/circuitboard/air_management /obj/structure/machinery/computer/general_air_control/Destroy() diff --git a/code/game/objects/structures/machinery/atmoalter/canister.dm b/code/game/objects/structures/machinery/atmoalter/canister.dm index 486db49bb92..2a2093a19f3 100644 --- a/code/game/objects/structures/machinery/atmoalter/canister.dm +++ b/code/game/objects/structures/machinery/atmoalter/canister.dm @@ -441,7 +441,7 @@ update_flag if(attacking_item.item_flags & ITEM_FLAG_NO_BLUDGEON) return TRUE visible_message(SPAN_WARNING("\The [user] hits \the [src] with \the [attacking_item]!"), SPAN_NOTICE("You hit \the [src] with \the [attacking_item].")) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) playsound(src, 'sound/weapons/smash.ogg', 60, 1) add_damage(attacking_item.force) if(!istype(attacking_item, /obj/item/forensics)) diff --git a/code/game/objects/structures/machinery/biogenerator.dm b/code/game/objects/structures/machinery/biogenerator.dm index 42824879b73..e9b97eff581 100644 --- a/code/game/objects/structures/machinery/biogenerator.dm +++ b/code/game/objects/structures/machinery/biogenerator.dm @@ -124,7 +124,8 @@ FOODSTUFFS /singleton/biorecipe/food/bio_vitamin name = "Flavored Vitamin" object = /obj/item/reagent_containers/pill/bio_vitamin - amount = list(1,5,10,25,50) + // Pill bottles can at most hold 14 pills + amount = list(1,3,5,10,14) /singleton/biorecipe/food/liquidfood name = "Food Ration" diff --git a/code/game/objects/structures/machinery/computer/buildandrepair.dm b/code/game/objects/structures/machinery/computer/buildandrepair.dm index 6a394a3ac97..9a863b95b79 100644 --- a/code/game/objects/structures/machinery/computer/buildandrepair.dm +++ b/code/game/objects/structures/machinery/computer/buildandrepair.dm @@ -8,6 +8,8 @@ icon_state = "0" build_amt = 5 var/state = 0 + maxhealth = OBJECT_HEALTH_MEDIUM + var/obj/item/circuitboard/circuit = null /obj/structure/computerframe/attackby(obj/item/attacking_item, mob/user) diff --git a/code/game/objects/structures/machinery/computer/computer.dm b/code/game/objects/structures/machinery/computer/computer.dm index b84ecef4389..abd74c754e3 100644 --- a/code/game/objects/structures/machinery/computer/computer.dm +++ b/code/game/objects/structures/machinery/computer/computer.dm @@ -32,6 +32,9 @@ /// The access cable inserted into this computer, if any. var/obj/item/access_cable/inserted_cable + /// Contains the name of the TGUI interface file opened when using this computer. If null, + var/ui_type = "" + /obj/structure/machinery/computer/Initialize() . = ..() overlay_layer = layer @@ -45,11 +48,6 @@ inserted_cable = null return ..() -/obj/structure/machinery/computer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = TRUE) - if(!operable() || !is_station_level(z) || user.stat) - user.unset_machine() - return - /obj/structure/machinery/computer/emp_act(severity) . = ..() diff --git a/code/game/objects/structures/machinery/dna_machines.dm b/code/game/objects/structures/machinery/dna_machines.dm index 8d5c7f08ae6..f86c9de109f 100644 --- a/code/game/objects/structures/machinery/dna_machines.dm +++ b/code/game/objects/structures/machinery/dna_machines.dm @@ -248,10 +248,7 @@ /obj/structure/machinery/computer/scan_consolenew/attackby(obj/item/attacking_item, mob/user) if (istype(attacking_item, /obj/item/disk/data)) //INSERT SOME diskS if (!src.disk) - user.drop_from_inventory(attacking_item, src) - src.disk = attacking_item - to_chat(user, "You insert [attacking_item].") - SSnanoui.update_uis(src) // update all UIs attached to src + to_chat(user, "You try to insert [attacking_item], but the drive seems jammed.") return TRUE else return ..() diff --git a/code/game/objects/structures/machinery/doors/airlock.dm b/code/game/objects/structures/machinery/doors/airlock.dm index 2047a7b7cdb..9a7530daa70 100644 --- a/code/game/objects/structures/machinery/doors/airlock.dm +++ b/code/game/objects/structures/machinery/doors/airlock.dm @@ -1089,13 +1089,13 @@ About the new airlock wires panel: stripe_overlay = new(stripe_file) stripe_overlay.Blend(stripe_color, ICON_MULTIPLY) SSicon_cache.airlock_icon_cache["[ikey]"] = stripe_overlay - if(!glass) - var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe" - stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"] - if(!stripe_filling_overlay) - stripe_filling_overlay = new(stripe_fill_file) - stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY) - SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay + + var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe" + stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"] + if(!stripe_filling_overlay) + stripe_filling_overlay = new(stripe_fill_file) + stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY) + SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay if(arePowerSystemsOn()) switch(state) @@ -1434,7 +1434,7 @@ About the new airlock wires panel: return if(H.default_attack?.attack_door && !(stat & (BROKEN|NOPOWER))) user.visible_message(SPAN_DANGER("\The [user] forcefully strikes \the [src] with their [H.default_attack.attack_name]!")) - user.do_attack_animation(src, null) + user.do_attack_animation(src, H.default_attack.attack_effect) playsound(loc, hitsound, 60, TRUE) add_damage(H.default_attack.attack_door) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/objects/structures/machinery/doors/door.dm b/code/game/objects/structures/machinery/doors/door.dm index 74a8e74cbfc..1de42cda807 100644 --- a/code/game/objects/structures/machinery/doors/door.dm +++ b/code/game/objects/structures/machinery/doors/door.dm @@ -256,7 +256,7 @@ // Emitter Blasts - these will eventually completely destroy the door, given enough time. if (damage > 90) - destroy_hits-- + destroy_hits -= (1 * hitting_projectile.anti_materiel_potential) if (destroy_hits <= 0) visible_message(SPAN_DANGER("\The [src.name] disintegrates!")) switch (hitting_projectile.damage_type) diff --git a/code/game/objects/structures/machinery/embedded_controller/docking_program.dm b/code/game/objects/structures/machinery/embedded_controller/docking_program.dm index fa992ccddb2..6eb60977af2 100644 --- a/code/game/objects/structures/machinery/embedded_controller/docking_program.dm +++ b/code/game/objects/structures/machinery/embedded_controller/docking_program.dm @@ -274,7 +274,6 @@ signal.data["dock_status"] = get_docking_status() post_signal(signal) -//this is mostly for NanoUI /datum/computer/file/embedded_program/docking/proc/get_docking_status() switch (dock_state) if (STATE_UNDOCKED) return "undocked" diff --git a/code/game/objects/structures/machinery/portable_turret.dm b/code/game/objects/structures/machinery/portable_turret.dm index ed3072241a1..567db53276d 100644 --- a/code/game/objects/structures/machinery/portable_turret.dm +++ b/code/game/objects/structures/machinery/portable_turret.dm @@ -26,8 +26,8 @@ req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS) - light_range = 3 - light_power = 2 + light_range = 2 + light_power = 1 armor = list( MELEE = ARMOR_MELEE_KEVLAR, diff --git a/code/game/objects/structures/machinery/telecomms/broadcasting.dm b/code/game/objects/structures/machinery/telecomms/broadcasting.dm index 64b37ce6f9b..271aaff621a 100644 --- a/code/game/objects/structures/machinery/telecomms/broadcasting.dm +++ b/code/game/objects/structures/machinery/telecomms/broadcasting.dm @@ -151,11 +151,9 @@ if (TRANSMISSION_SUBSPACE) // Reach any radios on the levels var/list/all_radios_of_our_frequency = SSradio.get_devices(frequency, RADIO_CHAT) - radios = all_radios_of_our_frequency.Copy() - - for (var/obj/item/radio/subspace_radio in radios) - if(!subspace_radio.can_receive(frequency, signal_reaches_every_z_level)) - radios -= subspace_radio + for (var/obj/item/radio/subspace_radio in all_radios_of_our_frequency) + if(subspace_radio.can_receive(frequency, signal_reaches_every_z_level)) + radios += subspace_radio // Cool antag radios can hear all Horizon comms for (var/antag_freq in list(SYND_FREQ, RAID_FREQ, NINJ_FREQ)) diff --git a/code/game/objects/structures/machinery/telecomms/machine_interactions.dm b/code/game/objects/structures/machinery/telecomms/machine_interactions.dm index f0e0c473ba6..5cedd20603f 100644 --- a/code/game/objects/structures/machinery/telecomms/machine_interactions.dm +++ b/code/game/objects/structures/machinery/telecomms/machine_interactions.dm @@ -29,7 +29,7 @@ if(!istype(user, /mob/living/silicon)) if(user.a_intent == I_HURT) user.visible_message(SPAN_DANGER("\The [user] strikes [src]!")) - user.do_attack_animation(user, attacking_item) + user.do_attack_animation(user, used_item = attacking_item) playsound(loc, hitsound, 60, TRUE) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) integrity = between(0, integrity - round(attacking_item.force / 3), initial(integrity)) diff --git a/code/game/objects/structures/machinery/vending/_vending.dm b/code/game/objects/structures/machinery/vending/_vending.dm index a91013fcf10..a2534f3f8f3 100644 --- a/code/game/objects/structures/machinery/vending/_vending.dm +++ b/code/game/objects/structures/machinery/vending/_vending.dm @@ -63,6 +63,7 @@ density = 1 clicksound = SFX_BUTTON manufacturer = "idris" + maxhealth = OBJECT_HEALTH_HIGH // Every vending machine has one of these. /// `icon_state` when off. Defined on init. @@ -96,7 +97,7 @@ var/categories = CAT_NORMAL /// What we're requesting payment for right now var/datum/data/vending_product/currently_vending = null - /// Status screen messages like "insufficient funds", displayed in NanoUI + /// Status screen messages like "insufficient funds", displayed in UI var/status_message = "" /// Set to 1 if status_message is an error var/status_error = 0 @@ -358,6 +359,24 @@ return return +/obj/structure/machinery/vending/on_death(damage, damage_flags, damage_type, armor_penetration, obj/weapon) + var/turf/current_turf = get_turf(src) + if(current_turf) + var/list/stocked_products = list() + for(var/datum/data/vending_product/product in product_records) + if(product.amount > 0) + stocked_products += product + + var/items_to_drop = rand(1, 5) + while(items_to_drop-- > 0 && length(stocked_products)) + var/datum/data/vending_product/product = pick(stocked_products) + new product.product_path(current_turf) + product.amount-- + if(product.amount < 1) + stocked_products -= product + + . = ..() + /obj/structure/machinery/vending/emag_act(var/remaining_charges, var/mob/user) if (!emagged) src.emagged = 1 @@ -751,7 +770,6 @@ sel_key = params["vendItem"] var/datum/data/vending_product/R = product_records[key] - // This should not happen unless the request from NanoUI was bad if(!(R.category & categories)) return diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 2f7e84d50e9..927e6c22348 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -90,8 +90,7 @@ if(href_list["read"]) var/obj/item/paper/P = locate(href_list["read"]) if((P && P.loc == src)) - usr << browse("[P.name][P.info]", "window=[P.name]") - onclose(usr, "[P.name]") + P.show_content(usr) return /obj/structure/noticeboard/command diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index ae4bd4de385..2cad8a5c5a4 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -114,7 +114,7 @@ if(. != BULLET_ACT_HIT) return . - add_damage(proj_damage) + add_damage(proj_damage, hitting_projectile.damage_flags(), hitting_projectile.damage_type, hitting_projectile.armor_penetration, hitting_projectile) /obj/structure/window/ex_act(severity) switch(severity) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index ff981c97dbe..b86db50919a 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -26,6 +26,9 @@ /// If the turf should generate details. Default: TRUE var/has_edge_icon = TRUE +/turf/simulated/floor/examine_descriptor(mob/user) + return "floor" + /turf/simulated/floor/disassembly_hints(mob/user, distance, is_adjacent) . += ..() if(flooring) diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index ae52c41ae6e..467fbb568f9 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -139,7 +139,7 @@ WR.scrape(user) return else if(attacking_item.force >= 10) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) to_chat(user, SPAN_NOTICE("\The [src] crumbles away under the force of your [attacking_item].")) dismantle_wall(TRUE) return diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 104a39b4f84..6ada1a0b148 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -62,6 +62,9 @@ state = SPAN_NOTICE("\The [src] seems completely intact.") . = state +/turf/simulated/wall/examine_descriptor(mob/user) + return "wall" + /turf/simulated/wall/mechanics_hints(mob/user, distance, is_adjacent) . += ..() if(locate(/obj/effect/overlay/wallrot) in src) diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index 4f2a2740e20..ebce3c7ba98 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -3,6 +3,9 @@ icon = 'icons/turf/flooring/tiles.dmi' icon_state = "tiled_preview" +/turf/unsimulated/floor/examine_descriptor(mob/user) + return "floor" + /turf/unsimulated/floor/monotile icon_state = "monotile_preview" diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm index 1467831b41c..844df462165 100644 --- a/code/game/turfs/unsimulated/walls.dm +++ b/code/game/turfs/unsimulated/walls.dm @@ -7,6 +7,9 @@ blocks_air = TRUE pass_flags_self = PASSCLOSEDTURF +/turf/unsimulated/wall/examine_descriptor(mob/user) + return "wall" + /turf/unsimulated/wall/fakeglass name = "window" icon = 'icons/turf/walls.dmi' diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 972aa5519d3..32f5789b9b2 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -265,14 +265,6 @@ else //Delayed to avoid wingets from Login calls. addtimer(CALLBACK(src, VERB_REF(fit_viewport), 1 SECONDS)) -/client/verb/refresh_tgui() - set name = "Refresh TGUI" - set category = "OOC.Debug" - - for(var/window_id in tgui_windows) - var/datum/tgui_window/window = tgui_windows[window_id] - window.reinitialize() - /client/verb/fix_stat_panel() set name = "Fix-Stat-Panel" set hidden = TRUE diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 285bc8ea8ac..86bc426af60 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1453,3 +1453,10 @@ var/global/enabled_spooking = 0 to_world(FONT_LARGE(EXAMINE_BLOCK_ODYSSEY(SPAN_NOTICE("The scenario canonicity has been changed to [SPAN_BOLD(canonicity)] by an administrator.")))) log_and_message_admins("has set the Odyssey canonicity to [canonicity]", usr) feedback_add_details("admin_verb","SEOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/datum/admins/proc/open_narrate_panel() + set category = "Special Verbs.Narration/Messaging" + set name = "Narrate Panel" + + var/datum/tgui_module/narrate_panel/NP = new /datum/tgui_module/narrate_panel(usr) + NP.ui_interact(usr) diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm index e1c1ba975fa..60c835a286b 100644 --- a/code/modules/admin/admin_attack_log.dm +++ b/code/modules/admin/admin_attack_log.dm @@ -1,7 +1,3 @@ -/mob/var/mob/lastattacker = null -/mob/var/mob/lastattacked = null -/mob/var/attack_log = list() - /proc/log_and_message_admins(var/message as text, var/mob/user = usr, var/turf/location) var/turf/T = location ? location : (user ? get_turf(user) : null) if(T) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 080c60966ce..916fe9716a4 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -106,7 +106,8 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list( /client/proc/toggle_aooc, /client/proc/force_away_mission, /client/proc/alooc, - /client/proc/create_portal + /client/proc/create_portal, + /datum/admins/proc/open_narrate_panel )) GLOBAL_LIST_INIT(admin_verbs_ban, list( @@ -179,7 +180,6 @@ GLOBAL_LIST_INIT(admin_verbs_server, list( /datum/admins/proc/toggle_round_spookyness, /datum/admins/proc/toggle_space_ninja, /client/proc/toggle_random_events, - /client/proc/nanomapgen_DumpImage, /client/proc/toggle_recursive_explosions, /client/proc/restart_controller, /client/proc/cmd_ss_panic, @@ -354,7 +354,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list( /datum/admins/proc/adjump, /datum/admins/proc/toggle_space_ninja, /client/proc/toggle_random_events, - /client/proc/nanomapgen_DumpImage, /client/proc/play_local_sound, /client/proc/play_sound, /client/proc/play_server_sound, @@ -430,6 +429,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list( /client/proc/force_away_mission, /client/proc/profiler_start, /client/proc/create_portal, + /datum/admins/proc/open_narrate_panel )) GLOBAL_LIST_INIT(admin_verbs_mod, list( @@ -473,7 +473,6 @@ GLOBAL_LIST_INIT(admin_verbs_dev, list( //will need to be altered - Ryan784 /client/proc/jumptoship, /client/proc/jumptosector, /client/proc/cmd_dev_say, - /client/proc/nanomapgen_DumpImage, /client/proc/admin_ghost, /client/proc/air_report, /client/proc/enable_debug_verbs, diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 37afb399f1b..91f00a7dc2f 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -139,7 +139,7 @@ /datum/tgui_module/moderator/shared/player_panel/ui_interact(mob/user, var/datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "PlayerPanel", "Player Panel", 960, 600) + ui = new(user, src, "PlayerPanel", "Player Panel", 1080, 720) ui.open() /datum/tgui_module/moderator/shared/player_panel/ui_data(mob/user) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index fde6a515bfc..603011407f8 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -463,21 +463,6 @@ usr << browse(HTML_SKELETON(replacetext(SSatoms.InitLog(), "\n", "
")), "window=initlog") -/client/proc/reload_nanoui_resources() - set category = "Debug" - set name = "Reload NanoUI Resources" - set desc = "Force the client to redownload NanoUI Resources" - - // Close open NanoUIs. - SSnanoui.close_user_uis(usr) - - // Re-load the assets. - var/datum/asset/assets = get_asset_datum(/datum/asset/nanoui) - assets.register() - - // Clear the user's cache so they get resent. - usr.client.sent_assets = list() - /** * Used to generate lag and load the MC to test how things work under live server stress */ diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e8c058e2929..cc6fd7814fe 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -782,7 +782,7 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]", 1) if(isobserver(M)) - gibs(M.loc, M.viruses) + gibs(M.loc) return M.gib() diff --git a/code/modules/atmospherics/components/unary/vent_pump.dm b/code/modules/atmospherics/components/unary/vent_pump.dm index 0e7fac74aed..845eb2e1de6 100644 --- a/code/modules/atmospherics/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/components/unary/vent_pump.dm @@ -407,13 +407,13 @@ to_chat(user, SPAN_WARNING("\The [attacking_item] can only be used to tear open welded air vents!")) return TRUE user.visible_message(SPAN_WARNING("\The [user] starts using \the [attacking_item] to hack open \the [src]!"), SPAN_NOTICE("You start hacking open \the [src] with \the [attacking_item]...")) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) playsound(loc, 'sound/weapons/smash.ogg', 60, TRUE) var/cut_amount = 3 for(var/i = 0; i <= cut_amount; i++) if(!attacking_item || !do_after(user, 30, src)) return TRUE - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) user.visible_message(SPAN_WARNING("\The [user] smashes \the [attacking_item] into \the [src]!"), SPAN_NOTICE("You smash \the [attacking_item] into \the [src].")) playsound(loc, 'sound/weapons/smash.ogg', 60, TRUE) if(i == cut_amount) diff --git a/code/modules/atmospherics/components/unary/vent_scrubber.dm b/code/modules/atmospherics/components/unary/vent_scrubber.dm index 88c426d5893..040cfab61b8 100644 --- a/code/modules/atmospherics/components/unary/vent_scrubber.dm +++ b/code/modules/atmospherics/components/unary/vent_scrubber.dm @@ -412,13 +412,13 @@ to_chat(user, SPAN_WARNING("\The [attacking_item] can only be used to tear open welded scrubbers!")) return TRUE user.visible_message(SPAN_WARNING("\The [user] starts using \the [attacking_item] to hack open \the [src]!"), SPAN_NOTICE("You start hacking open \the [src] with \the [attacking_item]...")) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) playsound(loc, 'sound/weapons/smash.ogg', 60, TRUE) var/cut_amount = 3 for(var/i = 0; i <= cut_amount; i++) if(!attacking_item || !do_after(user, 30, src)) return TRUE - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) user.visible_message(SPAN_WARNING("\The [user] smashes \the [attacking_item] into \the [src]!"), SPAN_NOTICE("You smash \the [attacking_item] into \the [src].")) playsound(loc, 'sound/weapons/smash.ogg', 60, TRUE) if(i == cut_amount) diff --git a/code/modules/atmospherics/vent_passive.dm b/code/modules/atmospherics/vent_passive.dm index 923c79fd50e..abc063626c1 100644 --- a/code/modules/atmospherics/vent_passive.dm +++ b/code/modules/atmospherics/vent_passive.dm @@ -128,13 +128,13 @@ to_chat(user, SPAN_WARNING("\The [attacking_item] can only be used to tear open welded air vents!")) return TRUE user.visible_message(SPAN_WARNING("\The [user] starts using \the [attacking_item] to hack open \the [src]!"), SPAN_NOTICE("You start hacking open \the [src] with \the [attacking_item]...")) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) playsound(loc, 'sound/weapons/smash.ogg', 60, TRUE) var/cut_amount = 3 for(var/i = 0; i <= cut_amount; i++) if(!attacking_item || !do_after(user, 30, src)) return TRUE - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) user.visible_message(SPAN_WARNING("\The [user] smashes \the [attacking_item] into \the [src]!"), SPAN_NOTICE("You smash \the [attacking_item] into \the [src].")) playsound(loc, 'sound/weapons/smash.ogg', 60, TRUE) if(i == cut_amount) diff --git a/code/modules/client/client_color.dm b/code/modules/client/client_color.dm index d844bada8fb..f7ae91979d9 100644 --- a/code/modules/client/client_color.dm +++ b/code/modules/client/client_color.dm @@ -4,11 +4,6 @@ var/override = FALSE //If set to override we will stop multiplying the moment we get here. NOTE: Priority remains, if your override is on position 4, the other 3 will still have a say. var/disability = FALSE -/mob - var/list/client_colors = list() - - - /* Adds an instance of color_type to the mob's client_colors list color_type - a typepath (subtyped from /datum/client_color) diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm index 8bb41cc3706..3e89a876196 100644 --- a/code/modules/client/preference_setup/global/01_ui.dm +++ b/code/modules/client/preference_setup/global/01_ui.dm @@ -6,7 +6,6 @@ S["UI_style"] >> pref.UI_style S["UI_style_color"] >> pref.UI_style_color S["UI_style_alpha"] >> pref.UI_style_alpha - S["tgui_fancy"] >> pref.tgui_fancy S["tgui_lock"] >> pref.tgui_lock S["ooccolor"] >> pref.ooccolor S["clientfps"] >> pref.clientfps @@ -21,7 +20,6 @@ S["UI_style"] << pref.UI_style S["UI_style_color"] << pref.UI_style_color S["UI_style_alpha"] << pref.UI_style_alpha - S["tgui_fancy"] << pref.tgui_fancy S["tgui_lock"] << pref.tgui_lock S["ooccolor"] << pref.ooccolor S["clientfps"] << pref.clientfps @@ -39,7 +37,6 @@ "UI_style", "UI_style_color", "UI_style_alpha", - "tgui_fancy", "tgui_lock", "ooccolor", "clientfps", @@ -63,7 +60,6 @@ "UI_style", "UI_style_color", "UI_style_alpha", - "tgui_fancy", "tgui_lock", "ooccolor", "clientfps", @@ -83,7 +79,6 @@ "UI_style_alpha" = pref.UI_style_alpha, "UI_style_color" = pref.UI_style_color, "UI_style" = pref.UI_style, - "tgui_fancy" = pref.tgui_fancy, "tgui_lock" = pref.tgui_lock, "ooccolor" = pref.ooccolor, "clientfps" = pref.clientfps, @@ -100,7 +95,6 @@ pref.UI_style_color = sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color)) pref.UI_style_alpha = sanitize_integer(text2num(pref.UI_style_alpha), 0, 255, initial(pref.UI_style_alpha)) pref.clientfps = sanitize_integer(text2num(pref.clientfps), 0, 1000, initial(pref.clientfps)) - pref.tgui_fancy = sanitize_bool(pref.tgui_fancy, TRUE) pref.tgui_lock = sanitize_bool(pref.tgui_lock, FALSE) pref.tgui_inputs = sanitize_bool(pref.tgui_inputs, TRUE) pref.tgui_buttons_large = sanitize_bool(pref.tgui_buttons_large, FALSE) @@ -116,7 +110,6 @@ dat += "-Color: [pref.UI_style_color] [HTML_RECT(pref.UI_style_color)] - reset
" dat += "-Alpha(transparency): [pref.UI_style_alpha] - reset
" dat += "Tooltip Style: [pref.tooltip_style]
" - dat += "TGUI Fancy: [pref.tgui_fancy ? "ON" : "OFF"]
" dat += "TGUI Lock: [pref.tgui_lock ? "ON" : "OFF"]
" dat += "TGUI Inputs: [pref.tgui_inputs ? "ON" : "OFF"]
" dat += "TGUI Input Large Buttons: [pref.tgui_buttons_large ? "ON" : "OFF"]
" @@ -152,10 +145,6 @@ pref.UI_style_alpha = UI_style_alpha_new return TOPIC_REFRESH - else if(href_list["select_tguif"]) - pref.tgui_fancy = !pref.tgui_fancy - return TOPIC_REFRESH - else if(href_list["select_tguil"]) pref.tgui_lock = !pref.tgui_lock return TOPIC_REFRESH diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm index 998ac37606b..825bbb91554 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -58,7 +58,7 @@ Color adjustment ..() /datum/gear_tweak/color/get_contents(var/metadata) - return "Color: ⚫" + return "Color: ●" /datum/gear_tweak/color/get_default() return valid_colors ? valid_colors[1] : COLOR_GRAY @@ -104,7 +104,7 @@ Alpha adjustment GLOBAL_DATUM_INIT(gear_tweak_accent_color, /datum/gear_tweak/color/accent, new()) /datum/gear_tweak/color/accent/get_contents(var/metadata) - return "Accent Color: ⚫" + return "Accent Color: ●" /datum/gear_tweak/color/accent/tweak_item(var/obj/item/I, var/metadata, var/mob/living/carbon/human/H) if(valid_colors && !(metadata in valid_colors)) diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index 75c69436e4d..83d8ea9f12a 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -51,6 +51,8 @@ path = /obj/item/organ/internal/augment/tool/combitool cost = 5 flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + // Vaurca get a vaurca specific version of this + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_UNATHI) /datum/gear/augment/combitool/New() ..() diff --git a/code/modules/client/preference_setup/loadout/items/shirts.dm b/code/modules/client/preference_setup/loadout/items/shirts.dm index 602dc228224..68ea6ca44b6 100644 --- a/code/modules/client/preference_setup/loadout/items/shirts.dm +++ b/code/modules/client/preference_setup/loadout/items/shirts.dm @@ -46,6 +46,9 @@ ABSTRACT_TYPE(/datum/gear/shirts) shirt["halter top"] = /obj/item/clothing/under/dressshirt/haltertop shirt["tank top"] = /obj/item/clothing/under/dressshirt/tanktop shirt["tank top, feminine"] = /obj/item/clothing/under/dressshirt/tanktop/feminine + shirt["tank top, cropped"] = /obj/item/clothing/under/dressshirt/tanktop/cropped + shirt["tank top, feminine cropped"] = /obj/item/clothing/under/dressshirt/tanktop/cropped/feminine + shirt["tank top, midriff"] = /obj/item/clothing/under/dressshirt/tanktop/midriff gear_tweaks += new /datum/gear_tweak/path(shirt) /datum/gear/shirts/stripes @@ -75,3 +78,40 @@ ABSTRACT_TYPE(/datum/gear/shirts) shirts["red silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/red shirts["random colored silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/random gear_tweaks += new /datum/gear_tweak/path(shirts) + +/datum/gear/shirts/precoloured + display_name = "pre-coloured shirt selection" + description = "A selection of pre-coloured and graphic shirts." + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + path = /obj/item/clothing/under/dressshirt/corgi + +/datum/gear/shirts/precoloured/New() + ..() + var/list/colouredshirts = list() + colouredshirts["corgi t-shirt"] = /obj/item/clothing/under/dressshirt/corgi + colouredshirts["heart t-shirt"] = /obj/item/clothing/under/dressshirt/heart + colouredshirts["heart t-shirt, alt"] = /obj/item/clothing/under/dressshirt/heart/alt + colouredshirts["I love NT t-shirt"] = /obj/item/clothing/under/dressshirt/lovent + colouredshirts["band t-shirt"] = /obj/item/clothing/under/dressshirt/band + colouredshirts["alien t-shirt"] = /obj/item/clothing/under/dressshirt/alien + colouredshirts["tie-dye t-shirt"] = /obj/item/clothing/under/dressshirt/tiedye + colouredshirts["skull t-shirt"] = /obj/item/clothing/under/dressshirt/skull + colouredshirts["sports t-shirt, blue"] = /obj/item/clothing/under/dressshirt/sport + colouredshirts["sports t-shirt, green"] = /obj/item/clothing/under/dressshirt/sport/green + colouredshirts["sports t-shirt, red"] = /obj/item/clothing/under/dressshirt/sport/red + colouredshirts["wing t-shirt"] = /obj/item/clothing/under/dressshirt/wing + colouredshirts["peace t-shirt"] = /obj/item/clothing/under/dressshirt/peace + colouredshirts["steak t-shirt"] = /obj/item/clothing/under/dressshirt/meat + colouredshirts["question mark t-shirt"] = /obj/item/clothing/under/dressshirt/questionmark + colouredshirts["white bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling + colouredshirts["aqua bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling/aqua + colouredshirts["purple bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling/purple + colouredshirts["red bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling/red + colouredshirts["blue jersey"] = /obj/item/clothing/under/dressshirt/jersey + colouredshirts["red jersey"] = /obj/item/clothing/under/dressshirt/jersey/red + colouredshirts["pink and black t-shirt"] = /obj/item/clothing/under/dressshirt/pinkblack + colouredshirts["blue NanoTrasen t-shirt"] = /obj/item/clothing/under/dressshirt/nanotrasen + colouredshirts["red NanoTrasen t-shirt"] = /obj/item/clothing/under/dressshirt/nanotrasen/red + colouredshirts["fire tank top"] = /obj/item/clothing/under/dressshirt/tanktop/fire + colouredshirts["sun tank top"] = /obj/item/clothing/under/dressshirt/tanktop/sun + gear_tweaks += new /datum/gear_tweak/path(colouredshirts) diff --git a/code/modules/client/preference_setup/origin/origin.dm b/code/modules/client/preference_setup/origin/origin.dm index 292fe98f2cf..4dbf1e70907 100644 --- a/code/modules/client/preference_setup/origin/origin.dm +++ b/code/modules/client/preference_setup/origin/origin.dm @@ -1,7 +1,3 @@ -/mob/living/carbon/human - var/singleton/origin_item/culture/culture - var/singleton/origin_item/origin/origin - /datum/category_item/player_setup_item/origin name = "Origin" sort_order = 1 diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm index 46f4ef5d959..e677108ab8b 100644 --- a/code/modules/client/preference_setup/preference_setup.dm +++ b/code/modules/client/preference_setup/preference_setup.dm @@ -9,7 +9,7 @@ #define SQL_PREFERENCES 0x2 // General-purpose helper for drawing a colored box. -#define HTML_RECT(color) " 
 " +#define HTML_RECT(color) " 
 " // A bit of a hack to allow unit testing of category items. #ifdef UNIT_TEST diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4287ce1c510..ed3d511060a 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -26,7 +26,6 @@ GLOBAL_LIST_EMPTY_TYPED(preferences_datums, /datum/preferences) var/sfx_toggles = ASFX_DEFAULT var/UI_style_color = "#ffffff" var/UI_style_alpha = 255 - var/tgui_fancy = TRUE var/tgui_lock = FALSE var/tgui_inputs = TRUE var/tgui_buttons_large = FALSE diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1bdba12895a..e55047a1a7b 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -77,6 +77,16 @@ QDEL_LIST(accessories) return ..() +/obj/item/clothing/examine_descriptor(mob/user) + return "clothing" + +/obj/item/clothing/examine_tags(mob/user) + . = ..() + if(item_flags & ITEM_FLAG_THICK_MATERIAL) + .["thick"] = "Stops or slows minor piercing effects, such as from injectors." + if(item_flags & ITEM_FLAG_INJECTION_PORT) + .["port-enabled"] = "Has a dedicated injection port for syringes and hypo-sprays to be used on the wearer." + //Updates the icons of the mob wearing the clothing item, if any. /obj/item/clothing/proc/update_clothing_icon() return diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index c0cd8b186a3..660eb4a610f 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -5,6 +5,7 @@ icon_state = "hardhat_yellow" item_state = "hardhat_yellow" light_overlay = "hardhat_light" + item_flags = ITEM_FLAG_THICK_MATERIAL contained_sprite = TRUE action_button_name = "Toggle Headlamp" light_range = 4 //luminosity when on diff --git a/code/modules/clothing/head/wide_hats.dm b/code/modules/clothing/head/wide_hats.dm index 9d924c4440f..be1c803c7a2 100644 --- a/code/modules/clothing/head/wide_hats.dm +++ b/code/modules/clothing/head/wide_hats.dm @@ -52,11 +52,13 @@ item_state = "boonie" build_from_parts = TRUE worn_overlay = "over" + sprite_sheets = null /obj/item/clothing/head/bucket/boonie/camo icon_state = "camo_boonie" item_state = "camo_boonie" has_accents = TRUE + sprite_sheets = null /obj/item/clothing/head/fedora name = "fedora" diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index a4f6736deca..dbbb30a26ae 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -25,9 +25,6 @@ module.holder.ui_interact(usr) -/mob - var/get_rig_stats = 0 - /obj/item/rig_module/ai_container name = "IIS module" desc = "An integrated intelligence system module suitable for most hardsuits." diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index f81510d7289..6d76f923b3d 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -42,6 +42,15 @@ . = ..() +/obj/item/rig_module/device/proc/handle_device_engage(atom/target, mob/user) + var/resolved = target.attackby(device, user) + if(!resolved && device && target) + if(device.afterattack(target, user, TRUE)) + return TRUE + else + return FALSE + return TRUE + /obj/item/rig_module/device/healthscanner name = "health scanner module" desc = "A hardsuit-mounted health scanner." @@ -51,19 +60,25 @@ construction_cost = list("$glass" = 5250, DEFAULT_WALL_MATERIAL = 2500) construction_time = 300 - engage_string = "Run Self-Diagnostic" + engage_string = "Run Diagnostic" device_type = /obj/item/healthanalyzer category = MODULE_MEDICAL -/obj/item/rig_module/device/healthscanner/vitalscanner - name = "integrated vitals tracker" - desc = "A hardsuit-mounted vitals tracker." - interface_name = "vitals tracker" - interface_desc = "Shows an informative health readout of the user." +/obj/item/rig_module/device/healthscanner/engage(atom/target, mob/user) + if(!..() || !device) + return FALSE - category = MODULE_GENERAL + if(!target.Adjacent(user)) + return FALSE + + var/obj/item/healthanalyzer/our_device = device + if(!target || user == target) + our_device.attack_self(user) + return TRUE + + return handle_device_engage(target, user) /obj/item/rig_module/device/drill name = "hardsuit diamond drill mount" @@ -158,15 +173,6 @@ if("rfd_settings") our_device.attack_self(user) -/obj/item/rig_module/device/rfd_c/handle_device_engage(atom/target, mob/user) - var/resolved = target.attackby(device, user) - if(!resolved && device && target) - if(device.afterattack(target, user, TRUE)) - return TRUE - else - return FALSE - return TRUE - /obj/item/rig_module/device/rfd_c/engage(atom/target, mob/user) if(!..() || !device) return FALSE @@ -186,12 +192,6 @@ return handle_device_engage(target, user) -/obj/item/rig_module/device/proc/handle_device_engage(atom/target, mob/user) - var/resolved = target.attackby(device, user) - if(!resolved && device && target) - device.afterattack(target, user, TRUE) - return TRUE - /obj/item/rig_module/chem_dispenser name = "mounted chemical dispenser" desc = "A complex web of tubing and needles suitable for hardsuit use." @@ -477,9 +477,6 @@ construction_cost = list(DEFAULT_WALL_MATERIAL = 15000, MATERIAL_GLASS = 4250, MATERIAL_SILVER = 4250, MATERIAL_URANIUM = 5250) construction_time = 300 - suit_overlay_active = "maneuvering_active" - suit_overlay_inactive = "maneuvering_inactive" - interface_name = "maneuvering jets" interface_desc = "An inbuilt EVA maneuvering system that runs off the hardsuit air supply." diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index c2787e31c82..4a70736f1ab 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -100,6 +100,8 @@ var/malfunctioning = 0 var/malfunction_delay = 0 var/electrified = 0 + /// Ensures that you can't queue up multiple piece toggle commands at once and bug anything out. + var/piece_being_deployed = FALSE /// Rate at which the suit cell will passively use power when online. var/cell_draw_rate = CHARGE_DRAIN_DEFAULT @@ -842,6 +844,8 @@ return TRUE /obj/item/rig/proc/toggle_piece(var/piece, var/mob/initiator, var/deploy_mode) + if(piece_being_deployed) + return if(!usr || sealing || !cell || !cell.charge) return @@ -877,6 +881,7 @@ use_obj = chest check_slot = wearer.wear_suit + piece_being_deployed = TRUE if(use_obj) // Handle retracting the piece, if possible. if(check_slot == use_obj && deploy_mode != ONLY_DEPLOY) @@ -890,6 +895,7 @@ if(use_obj == boots && chest_slot == chest_obj) to_chat(wearer, SPAN_WARNING("The chest piece of the hardsuit must be retracted before you can retract your boots!")) sound_to(wearer, 'sound/machines/terminal/terminal_error.ogg') + piece_being_deployed = FALSE return if(check_slot == use_obj) @@ -904,16 +910,21 @@ // Handle deploying the piece, if possible. else if (deploy_mode != ONLY_RETRACT) if(check_slot && check_slot == use_obj) + piece_being_deployed = FALSE return TRUE if(!do_after(wearer, 8)) if(wearer) to_chat(wearer, SPAN_WARNING("You must remain still while the suit deploys its parts.")) + piece_being_deployed = FALSE return FALSE // If we're deploying the chest, we also try to deploy boots. If we can't also deploy boots, the entire thing fails. if(use_obj == chest) - if(!toggle_piece("boots", initiator, ONLY_DEPLOY)) + var/obj/item/boots_slot = wearer.shoes + var/obj/item/boots_obj = boots + if(boots_slot != boots_obj) to_chat(initiator, SPAN_DANGER("You are unable to deploy \the [piece] as the boots were unable to also deploy!")) playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) + piece_being_deployed = FALSE return FALSE use_obj.forceMove(wearer) if(src.color) @@ -923,6 +934,7 @@ if(check_slot) to_chat(initiator, SPAN_DANGER("You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.")) playsound(src, 'sound/items/rfd_empty.ogg', 20, FALSE) + piece_being_deployed = FALSE return FALSE else to_chat(wearer, SPAN_NOTICE("Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.")) @@ -933,10 +945,42 @@ update_icon(TRUE) + piece_being_deployed = FALSE return TRUE /obj/item/rig/proc/deploy(mob/M,var/sealed) + var/mob/living/carbon/human/H = M + if(!H || !istype(H)) return + + if(H.back != src) + return + + if(sealed) + if(H.head) + var/obj/item/garbage = H.head + H.head = null + qdel(garbage) + + if(H.gloves) + var/obj/item/garbage = H.gloves + H.gloves = null + qdel(garbage) + + if(H.shoes) + var/obj/item/garbage = H.shoes + H.shoes = null + qdel(garbage) + + if(H.wear_suit) + var/obj/item/garbage = H.wear_suit + H.wear_suit = null + qdel(garbage) + + for(var/piece in list("helmet","gauntlets","boots",BP_CHEST)) + toggle_piece(piece, H, ONLY_DEPLOY) + +/obj/item/rig/proc/retract(mob/M,var/sealed) var/mob/living/carbon/human/H = M if(!H || !istype(H)) return @@ -966,7 +1010,7 @@ qdel(garbage) for(var/piece in list("helmet","gauntlets",BP_CHEST,"boots")) - toggle_piece(piece, H, ONLY_DEPLOY) + toggle_piece(piece, H, ONLY_RETRACT) /obj/item/rig/proc/null_wearer(var/mob/user) for(var/piece in list("helmet","gauntlets",BP_CHEST,"boots")) diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index 42e6d4303e0..b5ed0d6e5ef 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -130,6 +130,27 @@ deploy(wearer) +/obj/item/rig/verb/retract_suit() + set name = "Retract All Hardsuit Parts" + set desc = "Retracts helmet, gloves and boots." + set category = "Hardsuit.Core Functions" + set src = usr.contents + + if(!istype(wearer) || !wearer.back == src) + to_chat(usr, SPAN_WARNING("The hardsuit is not being worn.")) + return + + if(use_check_and_message(usr)) + return + + if(!check_suit_access(usr)) + return + + if(!check_power_cost(usr)) + return + + deploy(wearer) + /obj/item/rig/verb/toggle_seals_verb() set name = "Engage/Disengage Hardsuit" set desc = "Activates or deactivates your hardsuit." diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index c0e55fe7fc3..208a5e9c053 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -223,7 +223,7 @@ boot_type = null initial_modules = list( - /obj/item/rig_module/device/healthscanner/vitalscanner, + /obj/item/rig_module/device/healthscanner, /obj/item/rig_module/chem_dispenser/offworlder, /obj/item/rig_module/storage ) @@ -278,7 +278,7 @@ ) initial_modules = list( - /obj/item/rig_module/device/healthscanner/vitalscanner, + /obj/item/rig_module/device/healthscanner, /obj/item/rig_module/chem_dispenser/offworlder, /obj/item/rig_module/actuators/combat, /obj/item/rig_module/chem_dispenser/combat @@ -293,7 +293,7 @@ /obj/item/rig/light/offworlder/frontier/equipped initial_modules = list( - /obj/item/rig_module/device/healthscanner/vitalscanner, + /obj/item/rig_module/device/healthscanner, /obj/item/rig_module/chem_dispenser/offworlder, /obj/item/rig_module/actuators/combat, /obj/item/rig_module/fabricator/energy_net, @@ -302,7 +302,7 @@ ) /obj/item/rig/light/offworlder/frontier/ninja initial_modules = list( - /obj/item/rig_module/device/healthscanner/vitalscanner, + /obj/item/rig_module/device/healthscanner, /obj/item/rig_module/chem_dispenser/offworlder, /obj/item/rig_module/actuators/combat, /obj/item/rig_module/fabricator/energy_net, diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 4935f9246ac..352afe66cfd 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -165,23 +165,31 @@ /obj/item/clothing/accessory/badge/officer name = "security officer's badge" desc = "A bronze security badge." - icon_state = "bronzebadge" - overlay_state = "bronzebadge" - slot_flags = SLOT_TIE + icon_state = "officerbadge" + item_state = "officerbadge" + overlay_state = "officerbadge" /obj/item/clothing/accessory/badge/warden name = "warden's badge" desc = "A silver security badge." - icon_state = "silverbadge" - overlay_state = "silverbadge" - slot_flags = SLOT_TIE + icon_state = "wardenbadge" + item_state = "wardenbadge" + overlay_state = "wardenbadge" /obj/item/clothing/accessory/badge/hos name = "head of security's badge" desc = "An immaculately polished gold security badge." - icon_state = "goldbadge" - overlay_state = "goldbadge" - slot_flags = SLOT_TIE + icon_state = "hosbadge" + item_state = "hosbadge" + overlay_state = "hosbadge" + +/obj/item/clothing/accessory/badge/investigator + name = "\improper investigator badge" + desc = "This badge marks the holder as an investigative agent." + icon_state = "invbadge" + overlay_state = "invbadge" + badge_string = "Corporate Investigator" + /obj/item/clothing/accessory/badge/bssb name = "\improper BSSB agent's badge" @@ -252,13 +260,6 @@ icon_state = "marshalbadge" badge_string = "Federal Marshal" -/obj/item/clothing/accessory/badge/investigator - name = "\improper investigator badge" - desc = "This badge marks the holder as an investigative agent." - icon_state = "invbadge" - overlay_state = "invbadge" - badge_string = "Corporate Investigator" - /obj/item/clothing/accessory/badge/idbadge name = "\improper ID badge" desc = "A descriptive identification badge with the holder's credentials." diff --git a/code/modules/clothing/under/shirts/shirts.dm b/code/modules/clothing/under/shirts/shirts.dm index f09e4c2ab9c..e26756aba28 100644 --- a/code/modules/clothing/under/shirts/shirts.dm +++ b/code/modules/clothing/under/shirts/shirts.dm @@ -175,6 +175,22 @@ icon_state = "tanktop_fem" item_state = "tanktop_fem" +/obj/item/clothing/under/dressshirt/tanktop/cropped + name = "cropped tank top" + desc = "A short, simple, cheap tank top." + icon_state = "tanktop_crop" + item_state = "tanktop_crop" + +/obj/item/clothing/under/dressshirt/tanktop/cropped/feminine + icon_state = "tanktop_crop_fem" + item_state = "tanktop_crop_fem" + +/obj/item/clothing/under/dressshirt/tanktop/midriff + name = "midriff tank top" + desc = "A very short tank top that only covers the chest." + icon_state = "tanktop_midriff" + item_state = "tanktop_midriff" + // Polo Shirts /obj/item/clothing/under/dressshirt/polo @@ -233,3 +249,153 @@ if(prob(50)) icon_state = "hawaii_red" color = color_rotation(rand(-11,12)*15) + + +//pre-coloured shirts + +/obj/item/clothing/under/dressshirt/corgi + name = "corgi t-shirt" + desc = "A t-shirt with a corgi on it, cute!" + icon_state = "tshirt_corgi" + item_state = "tshirt_corgi" + +/obj/item/clothing/under/dressshirt/heart + name = "heart t-shirt" + desc = "A t-shirt with a cartoon heart on it." + icon_state = "tshirt_heart" + item_state = "tshirt_heart" + +/obj/item/clothing/under/dressshirt/heart/alt + icon_state = "tshirt_heart_alt" + item_state = "tshirt_heart_alt" + +/obj/item/clothing/under/dressshirt/lovent + name = "\improper I love NT t-shirt" + desc = "A white t-shirt with the text \"I ❤ NT\" on it. Another way to show your love of NanoTrasen!" + icon_state = "tshirt_lovent" + item_state = "tshirt_lovent" + +/obj/item/clothing/under/dressshirt/band + name = "band t-shirt" + desc = "A t-shirt with the logo of a band on it." + icon_state = "tshirt_band" + item_state = "tshirt_band" + +/obj/item/clothing/under/dressshirt/alien + name = "alien t-shirt" + desc = "A t-shirt with a cartoon alien head on it. Doesn't really look like any known species." + icon_state = "tshirt_alien" + item_state = "tshirt_alien" + +/obj/item/clothing/under/dressshirt/tiedye + name = "tie-dye t-shirt" + desc = "A tie-dyed t-shirt with a rainbow swirl on it." + icon_state = "tshirt_tiedye" + item_state = "tshirt_tiedye" + +/obj/item/clothing/under/dressshirt/skull + name = "skull t-shirt" + desc = "A red t-shirt featuring a human skull, badass?" + icon_state = "tshirt_skull" + item_state = "tshirt_skull" + +/obj/item/clothing/under/dressshirt/sport + name = "blue sports t-shirt" + desc = "A t-shirt for sports. Takes you back to school PE days." + icon_state = "tshirt_sportblue" + item_state = "tshirt_sportblue" + +/obj/item/clothing/under/dressshirt/sport/green + name = "green sports t-shirt" + icon_state = "tshirt_sportgreen" + item_state = "tshirt_sportgreen" + +/obj/item/clothing/under/dressshirt/sport/red + name = "red sports t-shirt" + icon_state = "tshirt_sportred" + item_state = "tshirt_sportred" + +/obj/item/clothing/under/dressshirt/wing + name = "wing t-shirt" + desc = "A t-shirt with a cartoon wing printed on it." + icon_state = "tshirt_wing" + item_state = "tshirt_wing" + +/obj/item/clothing/under/dressshirt/peace + name = "peace t-shirt" + desc = "A white t-shirt with the symbol of peace on the front and back." + icon_state = "tshirt_peace" + item_state = "tshirt_peace" + +/obj/item/clothing/under/dressshirt/meat + name = "steak t-shirt" + desc = "A t-shirt with a cartoon steak on it. Tasty." + icon_state = "tshirt_meat" + item_state = "tshirt_meat" + +/obj/item/clothing/under/dressshirt/questionmark + name = "question mark t-shirt" + desc = "A t-shirt with a question mark on it? For some reason?" + icon_state = "tshirt_question" + item_state = "tshirt_question" + +/obj/item/clothing/under/dressshirt/bowling + name = "white bowling t-shirt" + desc = "A t-shirt for bowling." + icon_state = "tshirt_bowlingw" + item_state = "tshirt_bowlingw" + +/obj/item/clothing/under/dressshirt/bowling/aqua + name = "aqua bowling t-shirt" + icon_state = "tshirt_bowlinga" + item_state = "tshirt_bowlinga" + +/obj/item/clothing/under/dressshirt/bowling/purple + name = "purple bowling t-shirt" + icon_state = "tshirt_bowlingp" + item_state = "tshirt_bowlingp" + +/obj/item/clothing/under/dressshirt/bowling/red + name = "red bowling t-shirt" + icon_state = "tshirt_bowlingr" + item_state = "tshirt_bowlingr" + +/obj/item/clothing/under/dressshirt/jersey + name = "blue jersey" + desc = "A sports shirt with numbers on the back." + icon_state = "shirt_jersey" + item_state = "shirt_jersey" + +/obj/item/clothing/under/dressshirt/jersey/red + name = "red jersey" + icon_state = "shirt_jersey_red" + item_state = "shirt_jersey_red" + +/obj/item/clothing/under/dressshirt/pinkblack + name = "pink and black t-shirt" + desc = "A pink t-shirt with black sleeves." + icon_state = "tshirt_pinkblack" + item_state = "tshirt_pinkblack" + +/obj/item/clothing/under/dressshirt/nanotrasen + name = "blue NanoTrasen t-shirt" + desc = "A t-shirt with the letters \"NT\" printed on it." + icon_state = "tshirt_nt_blue" + item_state = "tshirt_nt_blue" + +/obj/item/clothing/under/dressshirt/nanotrasen/red + name = "red NanoTrasen t-shirt" + icon_state = "tshirt_nt_red" + item_state = "tshirt_nt_red" + +/obj/item/clothing/under/dressshirt/tanktop/fire + name = "fire tank top" + desc = "A tank top with a flame decal on it." + icon_state = "tanktop_fire" + item_state = "tanktop_fire" + +/obj/item/clothing/under/dressshirt/tanktop/sun + name = "sun tank top" + desc = "A tank top with a sun decal on it." + icon_state = "tanktop_sun" + item_state = "tanktop_sun" diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm index 2b4d4a7957f..d79ce2aff3a 100644 --- a/code/modules/detectivework/tools/crimekit.dm +++ b/code/modules/detectivework/tools/crimekit.dm @@ -11,6 +11,7 @@ use_sound = 'sound/items/storage/toolbox.ogg' drop_sound = 'sound/items/drop/toolbox.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' + rustle_sound = 'sound/items/rustle/toolbox.ogg' /obj/item/storage/briefcase/crimekit/fill() ..() diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index c56c604b5d5..70a6b591f14 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -1,11 +1,3 @@ -/mob - var/bloody_hands = null - var/datum/weakref/bloody_hands_mob - var/track_footprint = 0 - var/list/feet_blood_DNA - var/track_footprint_type - var/footprint_color - /obj/item/clothing/gloves var/transfer_blood = 0 var/datum/weakref/bloody_hands_mob diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm index 9e33236aa5f..32b359b13d8 100644 --- a/code/modules/emotes/definitions/_mob.dm +++ b/code/modules/emotes/definitions/_mob.dm @@ -1,7 +1,3 @@ -/mob - var/list/default_emotes = list() - var/list/usable_emotes = list() - /mob/proc/update_emotes(var/skip_sort) usable_emotes.Cut() for(var/emote in default_emotes) diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index 2143ccb6b3f..11909b383b7 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -159,9 +159,9 @@ if (message) log_emote("[name]/[key] : [message]") - message = process_chat_markup(message, list("~", "_")) - var/langchat_message = message + var/langchat_message = process_chat_markup(message, list("~", "_")) message = format_emote(src, message) + message = process_chat_markup(message, list("~", "_")) var/list/emote_viewers = list() if(m_type == VISIBLE_MESSAGE) visible_message(message, show_observers = do_show_observers) diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 0b9d55b9fac..9fc6e562778 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -205,7 +205,7 @@ cards -= cards[1] H.concealed = TRUE H.update_icon() - user.do_attack_animation(src, null) + user.do_attack_animation(src) balloon_alert_to_viewers("deals a card") H.throw_at(get_step(target,target.dir), 10, 1, user, FALSE) if(!length(cards)) diff --git a/code/modules/ghostroles/spawner/human/human.dm b/code/modules/ghostroles/spawner/human/human.dm index 13152e9e5dc..fbbd7971199 100644 --- a/code/modules/ghostroles/spawner/human/human.dm +++ b/code/modules/ghostroles/spawner/human/human.dm @@ -200,7 +200,3 @@ M.ghost_spawner = WEAKREF(src) return M - -/// Used for cryo to free up a slot when a ghost cryos. -/mob/living/carbon/human - var/datum/weakref/ghost_spawner diff --git a/code/modules/hallucinations/mob.dm b/code/modules/hallucinations/mob.dm index c9c9b12e069..cdcefd5cd83 100644 --- a/code/modules/hallucinations/mob.dm +++ b/code/modules/hallucinations/mob.dm @@ -1,7 +1,3 @@ -/mob/living/carbon - var/next_hallucination = 0 //Hallucination spam limit var - var/list/hallucinations = list() //Hallucinations currently affecting the mob. Not to be confused with singular "hallucination" which is a NUM variable like confused/drowsy/eye_blind etc - //Hallucinated Hearing /mob/living/carbon/hear_say(var/message, var/verb = "says", var/datum/language/language, var/alt_name = "",var/italics = 0, var/mob/speaker, var/sound/speech_sound, var/sound_vol) if(hallucination >= 60 && prob(1)) diff --git a/code/modules/heavy_vehicle/mecha.dm b/code/modules/heavy_vehicle/mecha.dm index c6644c32ace..cab3572e6fa 100644 --- a/code/modules/heavy_vehicle/mecha.dm +++ b/code/modules/heavy_vehicle/mecha.dm @@ -325,9 +325,6 @@ if(istype(exosuit) && exosuit.head && exosuit.head.radio && exosuit.head.radio.is_functional()) return ..() -/obj/item/radio/exosuit/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/ui_state/state = GLOB.mech_state) - . = ..() - /mob/living/heavy_vehicle/proc/become_remote() for(var/mob/user in pilots) eject(user, FALSE) diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index fd5f1f98c40..1b04dcaaf21 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -245,6 +245,7 @@ var/gene_tag = params["gene"] if(!gene_tag) return TRUE + var/gene_label = params["gene_label"] || SSplants.get_gene_mask(gene_tag) last_action = world.time active = TRUE @@ -259,8 +260,8 @@ if(!genetics.roundstart) loaded_disk.genesource += " (variety #[genetics.uid])" - loaded_disk.name += " ([SSplants.gene_tag_masks[gene_tag]], #[genetics.uid])" - loaded_disk.desc += " The label reads 'gene [SSplants.gene_tag_masks[gene_tag]], sampled from [genetics.display_name]'." + loaded_disk.name += " ([gene_label], #[genetics.uid])" + loaded_disk.desc += " The label reads 'gene [gene_label], sampled from [genetics.display_name]'." eject_disk = TRUE degradation += rand(20,60) @@ -312,7 +313,7 @@ for(var/datum/plantgene/P in loaded_disk.genes) if(data["locus"] != "") data["locus"] += ", " - data["locus"] += "[SSplants.gene_tag_masks[P.genetype]]" + data["locus"] += "[SSplants.get_gene_mask(P.genetype)]" data["loadedseed"] = seed ? "[seed.name]" : null diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 734e5b201e4..9dc331b4afe 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -188,15 +188,17 @@ SHOULD_NOT_SLEEP(TRUE) overlays.Cut() - var/growth = 0 - if(growth_threshold) - growth = min(max_growth, round(health/growth_threshold)) + var/effective_max = max_growth var/at_fringe = get_dist(src,parent) if(spread_distance > 5) if(at_fringe >= (spread_distance-3)) - max_growth-- + effective_max-- if(at_fringe >= (spread_distance-2)) - max_growth-- + effective_max-- + + var/growth = 0 + if(growth_threshold) + growth = min(effective_max, round(health/growth_threshold)) var/image/our_icon = seed.get_icon(growth) @@ -205,7 +207,7 @@ AddOverlays(our_icon) - if(growth>2 && growth == max_growth) + if(growth>2 && growth == effective_max) layer = (seed && seed.force_layer) ? seed.force_layer : 5 if(growth_type in list(GROWTH_VINES,GROWTH_BIOMASS)) opacity = 1 diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 1f0b08dd98b..c9703e275a6 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -166,7 +166,7 @@ /datum/martial_art/proc/simple_animal_basic_disarm(var/mob/living/carbon/human/A, var/mob/living/simple_animal/D) if(A.a_intent == I_DISARM) A.visible_message("[SPAN_BOLD("\The [A]")] [D.response_disarm] \the [D]") - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_DISARM) D.poke(1) D.handle_attack_by(A) diff --git a/code/modules/martial_arts/revenant.dm b/code/modules/martial_arts/revenant.dm index e00e6c79d2a..c24350b58d2 100644 --- a/code/modules/martial_arts/revenant.dm +++ b/code/modules/martial_arts/revenant.dm @@ -21,7 +21,7 @@ return TRUE /datum/martial_art/revenant/proc/bash_slash(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_CLAW) D.visible_message(SPAN_DANGER("[A] bashes [D] away!"), SPAN_DANGER("[A] bashes you away!")) D.apply_damage(rand(5, 10), DAMAGE_BRUTE, damage_flags = DAMAGE_FLAG_SHARP) var/throw_range = rand(1, 2) diff --git a/code/modules/martial_arts/skrell.dm b/code/modules/martial_arts/skrell.dm index f0accb2d89a..7eec629c40f 100644 --- a/code/modules/martial_arts/skrell.dm +++ b/code/modules/martial_arts/skrell.dm @@ -22,7 +22,7 @@ return 0 /datum/martial_art/karak_virul/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_KICK) if(D.stat || D.weakened) return 0 D.visible_message(SPAN_WARNING("[A] leg sweeps [D]!")) diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index f8a2e4d6ed7..5dda83f04dc 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -37,7 +37,7 @@ /datum/martial_art/the_sleeping_carp/proc/wristWrench(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!D.stat && !D.stunned && !D.weakened) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_DISARM) D.visible_message(SPAN_WARNING("[A] grabs [D]'s wrist and wrenches it sideways!")) playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) D.drop_item() @@ -48,7 +48,7 @@ /datum/martial_art/the_sleeping_carp/proc/backKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(A.dir == D.dir && !D.stat && !D.weakened) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_KICK) D.visible_message(SPAN_WARNING("[A] kicks [D] in the back!")) step_to(D,get_step(D,D.dir),1) D.Weaken(4) @@ -59,7 +59,7 @@ /datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!D.stat && !D.weakened) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_KICK) D.visible_message(SPAN_WARNING("[A] knees [D] in the stomach!"), \ SPAN_DANGER("[A] winds you with a knee in the stomach!")) D.audible_message("[D] gags!") @@ -73,7 +73,7 @@ /datum/martial_art/the_sleeping_carp/proc/headKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!D.stat && !D.weakened) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_KICK) D.visible_message(SPAN_WARNING("[A] kicks [D] in the head!"), \ SPAN_DANGER("[A] kicks you in the jaw!")) D.apply_damage(20, DAMAGE_BRUTE, BP_HEAD) @@ -86,7 +86,7 @@ /datum/martial_art/the_sleeping_carp/proc/elbowDrop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(D.weakened || D.resting || D.stat) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_SMASH) D.visible_message(SPAN_DANGER("[A] elbow drops [D]!")) if(D.shock_stage >= 60) D.death() //FINISH HIM! diff --git a/code/modules/martial_arts/sol_combat.dm b/code/modules/martial_arts/sol_combat.dm index a96a11da2cf..5efb5a62546 100644 --- a/code/modules/martial_arts/sol_combat.dm +++ b/code/modules/martial_arts/sol_combat.dm @@ -49,7 +49,7 @@ AM.throw_at(sweeptarget, ((clamp((1 - (clamp(distfromcaster - 2, 0, distfromcaster))), 1, 1))), 1) /datum/martial_art/sol_combat/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_SMASH) A.visible_message(SPAN_WARNING("[A] pounds [D] on the chest!")) playsound(get_turf(A), "punch", 50, 1, -1) if(!(D.species.flags & NO_BREATHE)) @@ -75,12 +75,16 @@ if(check_streak(A,D)) return 1 add_logs(A, D, "punched") - A.do_attack_animation(D) + var/picked_hit_type = pick("punched", "kicked") + var/attack_animation = ATTACK_EFFECT_PUNCH + if(picked_hit_type == "kicked") + attack_animation = ATTACK_EFFECT_KICK + A.do_attack_animation(D, attack_animation) var/bonus_damage = 10 if(D.weakened || D.resting || D.lying) bonus_damage += 5 - picked_hit_type = "stomped on" + picked_hit_type = "stomped" D.apply_damage(bonus_damage, DAMAGE_BRUTE) if(picked_hit_type == "kicked" || picked_hit_type == "stomped") playsound(get_turf(D), SFX_SWING_HIT, 50, 1, -1) @@ -96,7 +100,7 @@ /datum/martial_art/sol_combat/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) add_to_streak("D",D) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_DISARM) if(check_streak(A,D)) return 1 diff --git a/code/modules/martial_arts/tajara.dm b/code/modules/martial_arts/tajara.dm index 50a276879de..fb74e9598b0 100644 --- a/code/modules/martial_arts/tajara.dm +++ b/code/modules/martial_arts/tajara.dm @@ -24,7 +24,7 @@ /datum/martial_art/baghrar/proc/eye_rake(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!istajara(A)) return 0 - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_CLAW) playsound(get_turf(A), 'sound/weapons/slice.ogg', 50, 1, -1) if(!D.species.has_limbs[BP_HEAD]) @@ -53,7 +53,7 @@ return 1 /datum/martial_art/baghrar/proc/claw_punch(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_CLAW) A.visible_message(SPAN_DANGER("[A] lunges forwards and strikes [D] with their claws!")) playsound(get_turf(A), 'sound/weapons/slice.ogg', 50, 1, -1) var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_sel.selecting)) @@ -65,7 +65,7 @@ /datum/martial_art/baghrar/proc/rraknar_stab(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!istajara(A)) return 0 - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_CLAW) var/obj/item/organ/external/organ = D.get_organ(A.zone_sel.selecting) A.visible_message(SPAN_DANGER("[A] stabs [D]'s [organ.name] with their claws!")) D.apply_damage(organ.brute_dam, DAMAGE_BRUTE, organ, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE) diff --git a/code/modules/martial_arts/unathi.dm b/code/modules/martial_arts/unathi.dm index 1ff7c171d6e..7bb55bf7363 100644 --- a/code/modules/martial_arts/unathi.dm +++ b/code/modules/martial_arts/unathi.dm @@ -54,7 +54,7 @@ /datum/martial_art/kis_khan/simple_animal_basic_disarm(var/mob/living/carbon/human/A, var/mob/living/simple_animal/D) if(!D.paralysis) A.visible_message("[SPAN_BOLD("[A]")] delivers a blow to \the [SPAN_BOLD("[D]")]'s head, making [D.get_pronoun("him")] fall unconscious!") - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_DISARM) playsound(D.loc, SFX_PUNCH, 25, TRUE, MEDIUM_RANGE_SOUND_EXTRARANGE+4) D.AdjustParalysis(5) else @@ -74,7 +74,7 @@ return 1 /datum/martial_art/kis_khan/proc/swift_disarm(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_DISARM) if(prob(80)) if(D.hand) if(istype(D.l_hand, /obj/item)) @@ -94,7 +94,7 @@ return 1 /datum/martial_art/kis_khan/proc/hammering_strike(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_SMASH) A.visible_message(SPAN_DANGER("[A] slams [D] away!")) playsound(D.loc, "punch", 50, 1, -1) D.apply_effect(2, WEAKEN) diff --git a/code/modules/martial_arts/vaurca.dm b/code/modules/martial_arts/vaurca.dm index fba6b1822af..7ab7efcfb3b 100644 --- a/code/modules/martial_arts/vaurca.dm +++ b/code/modules/martial_arts/vaurca.dm @@ -45,7 +45,7 @@ /datum/martial_art/vkutet/proc/piercing_strike(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) if(!isvaurca(A)) return 0 - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_CLAW) var/atk_verb = pick("slices", "pinches", "chops", "bites", "claws") D.visible_message(SPAN_DANGER("[A] [atk_verb] [D]!"), \ SPAN_DANGER("[A] [atk_verb] you!")) diff --git a/code/modules/martial_arts/zombie.dm b/code/modules/martial_arts/zombie.dm index f14177fc07c..126ddf13428 100644 --- a/code/modules/martial_arts/zombie.dm +++ b/code/modules/martial_arts/zombie.dm @@ -28,7 +28,7 @@ /datum/martial_art/zombie/proc/strong_bite(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - A.do_attack_animation(D) + A.do_attack_animation(D, ATTACK_EFFECT_BITE) var/atk_verb = pick("chomps", "bites") D.visible_message(SPAN_DANGER("[A] [atk_verb] down hard on [D]!"), SPAN_DANGER("[A] [atk_verb] down hard on you!")) D.apply_damage(rand(5, 10), DAMAGE_BRUTE, damage_flags = DAMAGE_FLAG_SHARP, armor_pen = 100) diff --git a/code/modules/mob/abstract/freelook/eye.dm b/code/modules/mob/abstract/freelook/eye.dm index 0e95bf88024..45d637a6955 100644 --- a/code/modules/mob/abstract/freelook/eye.dm +++ b/code/modules/mob/abstract/freelook/eye.dm @@ -122,9 +122,6 @@ return return loc -/mob - var/mob/abstract/eye/eyeobj - /mob/proc/EyeMove(n, direct) if(!eyeobj) return diff --git a/code/modules/mob/abstract/ghost/ghost.dm b/code/modules/mob/abstract/ghost/ghost.dm index d06f26e5afe..21470976270 100644 --- a/code/modules/mob/abstract/ghost/ghost.dm +++ b/code/modules/mob/abstract/ghost/ghost.dm @@ -6,7 +6,7 @@ /// This variable generally controls whether a ghost has restrictions on where it can go or not (ex. if the ghost can bypass holy places). var/has_ghost_restrictions = TRUE /// If the ghost has antagHUD. - var/antagHUD = 0 + var/antagHUD = FALSE /// Necessary for seeing wires. var/obj/item/multitool/ghost_multitool /// The POI we're orbiting. @@ -22,6 +22,7 @@ /mob/abstract/ghost/Destroy() QDEL_NULL(ghost_multitool) + orbiting_ref = null return ..() /mob/abstract/ghost/Topic(href, href_list) diff --git a/code/modules/mob/abstract/ghost/observer/observer.dm b/code/modules/mob/abstract/ghost/observer/observer.dm index 23d974a1f3f..4a29695a996 100644 --- a/code/modules/mob/abstract/ghost/observer/observer.dm +++ b/code/modules/mob/abstract/ghost/observer/observer.dm @@ -22,17 +22,17 @@ /// This variable is set to 1 when you enter the game as an observer. Remains null if you died in the game and are a ghost. Not reliable for admins; they change mobs a lot. var/started_as_observer /// If the ghost has enabled antagHUD. - var/has_enabled_antagHUD = 0 + var/has_enabled_antagHUD = FALSE /// If the ghost has enabled medHUD. - var/medHUD = 0 + var/medHUD = FALSE /// If this is an adminghost. - var/admin_ghosted = 0 + var/admin_ghosted = FALSE /// If this ghost has enabled chat anonymization. - var/anonsay = 0 + var/anonsay = FALSE /// If the ghost can be seen through cult shenanigans. - var/is_manifest = 0 + var/is_manifest = FALSE /// Cooldown for ghost abilities, such as move_item(). - var/ghost_cooldown = 0 + var/ghost_cooldown = FALSE /mob/abstract/ghost/observer/Initialize(mapload, mob/body) . = ..() @@ -87,12 +87,21 @@ src.LoadComponent(/datum/component/health_analyzer/observer) /mob/abstract/ghost/observer/Destroy() - if(client) + // Handling client images + if(client && length(client.images)) for(var/image/I in client.images) - if(I.loc == src) - qdel(I) + // Something deleted the image, clear it and move on. + if (!istype(I) || QDELETED(I)) + client.images -= I + continue + + if(I.loc != src) + continue + + qdel(I) + client.images -= I + QDEL_NULL(hud) - mind = null return ..() /mob/abstract/ghost/observer/proc/initialise_postkey(set_timers = TRUE) diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm index 2a66bc58a38..7c8105019fb 100644 --- a/code/modules/mob/animations.dm +++ b/code/modules/mob/animations.dm @@ -7,10 +7,6 @@ currently only humans get dizzy value of dizziness ranges from 0 to 1000 below 100 is not dizzy */ - -/mob/var/dizziness = 0//Carbon -/mob/var/is_dizzy = 0 - /mob/proc/make_dizzy(var/amount) if(!istype(src, /mob/living/carbon/human)) // for the moment, only humans get dizzy return @@ -43,8 +39,6 @@ note dizziness decrements automatically in the mob's Life() proc. client.pixel_y = 0 // jitteriness - copy+paste of dizziness -/mob/var/is_jittery = 0 -/mob/var/jitteriness = 0//Carbon /mob/proc/make_jittery(var/amount) return @@ -69,10 +63,6 @@ note dizziness decrements automatically in the mob's Life() proc. pixel_x = old_x pixel_y = old_y - -//handles up-down floaty effect in space and zero-gravity -/mob/var/is_floating = FALSE - /mob/proc/update_floating() if(anchored || buckled_to) set_floating(FALSE) @@ -129,39 +119,23 @@ note dizziness decrements automatically in the mob's Life() proc. //reset the pixel offsets to defaults is_floating = FALSE -/atom/movable/proc/do_attack_animation(atom/A, atom/movable/weapon, var/image/attack_image, var/initial_pixel_x = 0, var/initial_pixel_y = 0) +/atom/movable/proc/do_attack_animation(atom/attacked_atom, visual_effect_icon, obj/item/used_item, no_effect, fov_effect = TRUE, item_animation_override = null) + if(!no_effect && (visual_effect_icon || used_item)) + do_item_attack_animation(attacked_atom, visual_effect_icon, used_item, animation_type = item_animation_override) + + if(attacked_atom == src) + return //don't do an animation if attacking self var/pixel_x_diff = 0 var/pixel_y_diff = 0 var/turn_dir = 1 - var/direction = get_dir(src, A) - switch(direction) - if(NORTH) - pixel_y_diff = 8 - if(SOUTH) - pixel_y_diff = -8 - if(EAST) - pixel_x_diff = 8 - if(WEST) - pixel_x_diff = -8 - if(NORTHEAST) - pixel_x_diff = 8 - pixel_y_diff = 8 - if(NORTHWEST) - pixel_x_diff = -8 - pixel_y_diff = 8 - if(SOUTHEAST) - pixel_x_diff = 8 - pixel_y_diff = -8 - if(SOUTHWEST) - pixel_x_diff = -8 - pixel_y_diff = -8 + var/direction = get_dir(src, attacked_atom) if(direction & NORTH) pixel_y_diff = 8 - turn_dir = rand(50) ? -1 : 1 + turn_dir = prob(50) ? -1 : 1 else if(direction & SOUTH) pixel_y_diff = -8 - turn_dir = rand(50) ? -1 : 1 + turn_dir = prob(50) ? -1 : 1 if(direction & EAST) pixel_x_diff = 8 @@ -169,80 +143,10 @@ note dizziness decrements automatically in the mob's Life() proc. pixel_x_diff = -8 turn_dir = -1 - if(!initial_pixel_x) - initial_pixel_x = initial(pixel_x) - if(!initial_pixel_y) - initial_pixel_y = initial(pixel_y) - - animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2) - animate(pixel_x = initial_pixel_x, pixel_y = initial_pixel_y, time = 2) var/matrix/initial_transform = matrix(transform) var/matrix/rotated_transform = transform.Turn(15 * turn_dir) - - animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, transform = rotated_transform, time = 2, easing = BACK_EASING | EASE_IN) - animate(pixel_x = initial_pixel_x, pixel_y = initial_pixel_y, transform = initial_transform, time = 2, easing = SINE_EASING) - -// either attack_item OR attack_image should be used. if both are used, attack_image will be the one chosen -/mob/do_attack_animation(atom/A, var/atom/attack_item, var/image/attack_image) - set waitfor = FALSE - - var/initial_pixel_x = get_standard_pixel_x() - var/initial_pixel_y = get_standard_pixel_y() - ..(A, attack_item, attack_image, initial_pixel_x, initial_pixel_y) - - if(is_floating) - addtimer(CALLBACK(src, PROC_REF(start_floating)), 4) - - if(attack_item == FIST_ATTACK_ANIMATION) // only play the physical movement - return - // What icon do we use for the attack? - var/image/I - if(attack_image) - I = attack_image - else if(attack_item) - I = image(attack_item.icon, A, attack_item.icon_state, A.layer + 1) - else - if(hand && l_hand) // Attacked with item in left hand. - I = image(l_hand.icon, A, l_hand.icon_state, A.layer + 1) - else if (!hand && r_hand) // Attacked with item in right hand. - I = image(r_hand.icon, A, r_hand.icon_state, A.layer + 1) - else // Attacked with a fist? - return - - // Who can see the attack? - var/list/viewing = list() - for (var/mob/M in viewers(A)) - if (M.client) - viewing |= M.client - flick_overlay(I, viewing, 5) // 5 ticks/half a second - - // Scale the icon. - I.transform *= 0.75 - // Set the direction of the icon animation. - var/direction = get_dir(src, A) - if(direction & NORTH) - I.pixel_y = -16 - else if(direction & SOUTH) - I.pixel_y = 16 - - if(direction & EAST) - I.pixel_x = -16 - else if(direction & WEST) - I.pixel_x = 16 - - if(!direction) // Attacked self?! - I.pixel_z = 16 - - var/matrix/M = new - M.Turn(pick(-20, 20)) - // And animate the attack! - animate(I, alpha = 175, pixel_x = initial_pixel_x, pixel_y = initial_pixel_y, pixel_z = 0, time = 2, easing = CUBIC_EASING) - sleep(2) - animate(I, transform = M, time = 1) // apply the fancy matrix - sleep(1) - animate(I, transform = matrix(), time = 1) // back to a default matrix - sleep(1) - animate(I, alpha = 0, time = 1) + animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, transform=rotated_transform, time = 1, easing=BACK_EASING|EASE_IN, flags = ANIMATION_PARALLEL) + animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, transform=initial_transform, time = 2, easing=SINE_EASING, flags = ANIMATION_PARALLEL) /mob/proc/spin(spintime, speed) spawn() diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index 66416bfd8cf..b634e3d6ff4 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -18,7 +18,7 @@ flick(anim, animation) if(do_gibs) - gibs(loc, viruses, dna, get_gibs_type()) + gibs(loc, dna, get_gibs_type()) QDEL_IN(animation, 15) QDEL_IN(src, 15) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 0cfb28f2fe0..7cd76b21f25 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -144,6 +144,7 @@ new /obj/effect/decal/cleanable/blood/gibs(get_turf(src)) set_cradle_state(STATE_EMPTY) update_name() + return ..() /obj/item/mmi/attack_self(mob/user) if(cradle_state == STATE_BRAIN) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 1e11b4f98eb..de5fa482c8c 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -7,6 +7,10 @@ origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2, TECH_DATA = 4) req_access = list(ACCESS_ROBOTICS) can_be_ipc = TRUE + + should_use_health = TRUE + maxhealth = OBJECT_HEALTH_MEDIUM + var/searching = FALSE /obj/item/mmi/digital/posibrain/Initialize() @@ -15,6 +19,13 @@ brainmob.name = L.get_random_name() brainmob.real_name = brainmob.name +/obj/item/mmi/digital/posibrain/on_death(damage, damage_flags, damage_type, armor_penetration, obj/weapon) + playsound(src, SFX_BREAK_GLASS, 100, 1) + visible_message(SPAN_DANGER("\The [src] shatters spectacularly into a million pieces!")) + to_chat(brainmob, SPAN_DANGER("Your vision goes dark as your posibrain is destroyed, and your consciousness ceases to be.")) + new /obj/effect/decal/cleanable/blood/gibs/robot(get_turf(src)) + . = ..() + /obj/item/mmi/digital/posibrain/update_icon() if(brainmob.ckey) icon_state = "[initial(icon_state)]-occupied" @@ -23,9 +34,6 @@ else icon_state = initial(icon_state) -/obj/item/mmi/digital/posibrain/attackby(obj/item/attacking_item, mob/user) - return - /obj/item/mmi/digital/posibrain/attack_self(mob/user) if(brainmob.ckey) to_chat(user, SPAN_WARNING("\The [src] already has an active occupant!")) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index ad677045d20..08d6660d9fd 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -39,14 +39,19 @@ . = 1 /mob/living/carbon/Destroy() - QDEL_NULL(touching) + species = null + QDEL_NULL(handcuffed) + QDEL_NULL(legcuffed) + QDEL_NULL(op_stage) + chem_doses?.Cut() QDEL_NULL(bloodstr) - QDEL_NULL(dna) + QDEL_NULL(touching) QDEL_NULL(breathing) // Delete and null a direct list of references to our internal organs (such as brain, lungs, heart, etc). QDEL_LIST(internal_organs) // Null an Associative list of String = Reference to the same organs. - internal_organs_by_name = null + internal_organs_by_name?.Cut() + QDEL_LIST(hallucinations) return ..() /mob/living/carbon/rejuvenate() @@ -215,52 +220,118 @@ var/mob/living/carbon/human/H = src src.visible_message( SPAN_NOTICE("[src] examines [src.get_pronoun("himself")]."), \ - SPAN_NOTICE("You check yourself for injuries.") \ + SPAN_NOTICE("You start checking yourself for injuries.") \ ) + var/anatomy = GET_SKILL_LEVEL(M, ANATOMY_SKILL_COMPONENT) + if (!do_after(M, 5 SECONDS * (1 / (anatomy ? anatomy : 1)))) + to_chat(M, SPAN_WARNING("You must stand still to examine yourself for injuries.")) + return + + // Set to vanilla-equivalent for people without the skill. + if(!anatomy) + anatomy = 2 + var/painful_check = FALSE for(var/obj/item/organ/external/org in H.organs) var/list/status = list() var/brutedamage = org.brute_dam var/burndamage = org.burn_dam + + // Basic Anatomy 1: All the obvious stuff + // Damaged and missing limbs switch(brutedamage) - if(1 to 20) - status += "bruised" - if(20 to 40) - status += "wounded" - if(40 to INFINITY) - status += "mangled" + if(1 to 10) + status += (anatomy < 3 ? "bruised" : "superficially cut") + if(10 to 25) + status += (anatomy < 3 ? "wounded" : "moderately injured") + if(25 to 50) + status += (anatomy < 3 ? "badly injured" : "significantly injured") + if(50 to 75) + status += (anatomy < 3 ? "severely injured" : "mangled and difficult to move") + if(75 to 100) + status += (anatomy < 3 ? "extremely injured" : SPAN_DANGER("horribly mangled, and it feels like it may give out at any moment")) + if(100 to INFINITY) + status += (anatomy < 3 ? "critically injured" : SPAN_DANGER("ruined beyond recognition, and you can barely feel it at all")) switch(burndamage) if(1 to 10) - status += "numb" - if(10 to 40) - status += "blistered" - if(40 to INFINITY) - status += "peeling away" + status += (anatomy < 3 ? "numb" : "lightly burned") + if(10 to 25) + status += (anatomy < 3 ? "blistered" : "moderately burned") + if(25 to 50) + status += (anatomy < 3 ? "peeling away" : "marked by notable partial-thickness burns") + if(50 to 75) + status += (anatomy < 3 ? "visibly charred" : "covered in extensive partial-thickness burns") + if(75 to 100) + status += (anatomy < 3 ? "like black leather" : SPAN_DANGER("burned down to deadened, leathery tissue and looks close to being unrecoverable")) + if(100 to INFINITY) + status += (anatomy < 3 ? "like charcoal" : SPAN_DANGER("charred beyond recognition and may be beyond saving")) if(org.is_stump()) status += SPAN_DANGER("MISSING") if(org.status & ORGAN_MUTATED) status += "weirdly shapen" - if(org.dislocated == 2) - status += "dislocated" - if(org.status & ORGAN_BROKEN) - status += "hurts when touched" - if(org.status & ORGAN_DEAD) - status += "is necrotic" if(!org.is_usable()) status += "dangling uselessly" - if(org.status & ORGAN_BLEEDING) - status += SPAN_DANGER("bleeding") + // End of basic Anatomy 1. + + // Advanced Anatomy 1: Slightly harder. + // Dislocation + // Broken limbs + // Regular and arterial bleeding are vague + // Necrotic is vague + if(org.dislocated == 2) + status += (anatomy >= 2 ? "dislocated" : "hanging oddly") + if(org.status & ORGAN_BROKEN) + status += (anatomy < 3 ? "hurts when touched" : "broken") + painful_check = TRUE + // Anatomy 2 can't distinguish between regular bleeding and arterial. + // Bleeding without arterial + if(anatomy < 3 && ((org.status & ORGAN_BLEEDING) && !(org.status & ORGAN_ARTERY_CUT))) + status += "bleeding" + // Bleeding and arterial + else if(anatomy < 3 && ((org.status & ORGAN_BLEEDING) && (org.status & ORGAN_ARTERY_CUT))) + status += SPAN_DANGER("gushing with blood") + // Arterial without bleeding + else if(anatomy < 3 && (!(org.status & ORGAN_BLEEDING) && (org.status & ORGAN_ARTERY_CUT))) + if(!(org.status & (ORGAN_DEAD | ORGAN_BROKEN))) + status += "hurts when touched" + painful_check = TRUE + status += "swelled and has darkly discolored spots" + + if(anatomy < 3 && (org.status & ORGAN_DEAD)) + status += "feels numb and pale" + // End of advanced Anatomy 1. + + // Anatomy 3: Descriptions start to get more medical. + // Necrotic and arterials are plainly visible + // Bleeding gets an extra description + if(anatomy >= 3) + if(org.status & ORGAN_DEAD) + status += (anatomy < 4 ? "possibly necrotic" : "visible discoloration of skin that indicates tissue necrosis") + // Bleeding & arterial + if((org.status & ORGAN_BLEEDING) && (org.status & ORGAN_ARTERY_CUT)) + status += SPAN_DANGER("spraying blood from a severed artery") + // bleeding and no arterial + else if((org.status & ORGAN_BLEEDING) && !(org.status & ORGAN_ARTERY_CUT)) + status += "bandage-ably cut" + // arterial and no bleeding + else if(!(org.status & ORGAN_BLEEDING) && (org.status & ORGAN_ARTERY_CUT)) + status += SPAN_DANGER("swollen from an internal arterial bleed") + // End of Anatomy 3 + var/output = "" if(length(status)) output = "My [org.name] is [SPAN_WARNING("[english_list(status)].")]" else - output = "My [org.name] feels [SPAN_NOTICE("OK.")]" + output = (anatomy < 3 ? "My [org.name] feels [SPAN_NOTICE("OK.")]" : "My [org.name] has [SPAN_NOTICE("no visible signs of injuries.")]") if(length(org.implants)) output += " [SPAN_WARNING("I can feel something inside it.")]" to_chat(src, output) + if(painful_check) + custom_pain("Pain jolts through your body", 10, FALSE, null, TRUE) + if((isskeleton(H)) && (!H.w_uniform) && (!H.wear_suit)) H.play_xylophone() else diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 5835789e1e1..12f41aec587 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -50,7 +50,9 @@ /// Map organ names to organs. var/list/organs_by_name = list() - /// So internal organs have less ickiness too. + /// List of references to all internal organs + var/list/internal_organs = list() + /// Associative List of "name" = ref var/list/internal_organs_by_name = list() var/list/stasis_sources = list() @@ -58,3 +60,8 @@ /// For special cases where something permanently removes a mob's ability to feel pain. var/pain_immune = FALSE + /// Hallucination spam limit var + var/next_hallucination = 0 + /// Hallucinations currently affecting the mob. Not to be confused with singular "hallucination" which is a NUM variable like confused/drowsy/eye_blind etc + var/list/hallucinations = list() + var/shock_stage = 0 diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 09568fad545..51e77e580c7 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -14,7 +14,7 @@ I.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)), rand(1,3), round(30/I.w_class)) ..(species.gibbed_anim) - gibs(loc, viruses, dna, null, species.flesh_color, get_blood_color()) + gibs(loc, dna, null, species.flesh_color, get_blood_color()) /mob/living/carbon/human/dust() vr_disconnect() diff --git a/code/modules/mob/living/carbon/human/diona_gestalt.dm b/code/modules/mob/living/carbon/human/diona_gestalt.dm index 1f6085d19e0..ed09e03829e 100644 --- a/code/modules/mob/living/carbon/human/diona_gestalt.dm +++ b/code/modules/mob/living/carbon/human/diona_gestalt.dm @@ -7,10 +7,6 @@ #define COLD_DAMAGE_LEVEL_2 1.5 #define COLD_DAMAGE_LEVEL_3 3 -/mob/living/carbon/human - var/datum/dionastats/DS - - /mob/living/carbon/human/proc/setup_gestalt() composition_reagent = /singleton/reagent/nutriment //Dionae aren't animals, so eating them doesn't give animal protein setup_dionastats() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index e706b97817f..363485acba8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -4,21 +4,12 @@ voice_name = "unknown" icon = 'icons/mob/human.dmi' icon_state = "body_m_s" - mob_size = 9 //Based on average weight of a human - - var/pronouns = NEUTER - - /// Used so species that need special items (autoinhalers for vaurca/RMT for offworlders) don't get them twice when they shouldn't. - var/species_items_equipped - - var/list/hud_list[11] - /// To check if we've need to roll for damage on movement while an item is imbedded in us. - var/embedded_flag - /// This is very not good, but it's much much better than calling get_rig() every update_canmove() call. - var/obj/item/rig/wearing_rig - /// Pref holder for the speech bubble style. - var/speech_bubble_type + mob_bump_flag = HUMAN + mob_push_flags = ~HEAVY + mob_swap_flags = ~HEAVY + light_system = MOVABLE_LIGHT + blocks_emissive = EMISSIVE_BLOCK_NONE /mob/living/carbon/human/Initialize(mapload, var/new_species = null) if(!dna) @@ -118,9 +109,9 @@ // It's actually the set of all Limbs (left arm, head, leg leg, etc) we have. We Qdel and null the set of all limbs, which is unique to /human. QDEL_LIST(organs) // Then also null the associative list of those same limbs, which contains the same references. - organs_by_name = null - bad_internal_organs = null - bad_external_organs = null + QDEL_LIST_ASSOC_VAL(organs_by_name) + bad_internal_organs?.Cut() + bad_external_organs?.Cut() QDEL_NULL(vessel) @@ -150,13 +141,14 @@ //Yes this is shit, but since someone had the brillant mind to use images for this, we must suffer if(length(hud_list)) for(var/image/hud_overlay/an_hud_overlay in hud_list) - if(an_hud_overlay.owner) - an_hud_overlay.owner.client?.images -= an_hud_overlay + if(length(an_hud_overlay.owner?.client?.images)) + an_hud_overlay.owner.client.images -= an_hud_overlay an_hud_overlay.owner = null qdel(an_hud_overlay) - hud_list = null + hud_list.Cut() - . = ..() + wearing_rig = null + return ..() /mob/living/carbon/human/can_devour(atom/movable/victim, var/silent = FALSE) if(!should_have_organ(BP_STOMACH)) @@ -1437,14 +1429,15 @@ blood_color = null return 1 -/mob/living/carbon/human/get_visible_implants(var/class = 0) +/mob/living/carbon/human/get_visible_implants(var/class = 0) //Default class 0, class 1 is tiny objects, so class 0 will show everything. var/list/visible_implants = list() for(var/obj/item/organ/external/organ in src.organs) for(var/obj/item/O in organ.implants) if(!istype(O,/obj/item/implant) && (O.w_class > class) && !istype(O,/obj/item/material/shard/shrapnel)) visible_implants += O - + if(istype(O,/obj/item/material/shard/shrapnel) && (O.w_class > class + 2)) //If the shrapnel is larger than class 2 (small), it is visible. + visible_implants += O return(visible_implants) /mob/living/carbon/human/embedded_needs_process() diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 88e28965ed0..4560ef1e660 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -255,7 +255,7 @@ if(!attack) return 0 - H.do_attack_animation(src) + H.do_attack_animation(src, attack.attack_effect) if(!attack_message) attack.show_attack(H, src, hit_zone, rand_damage) else @@ -363,7 +363,7 @@ src.attack_log += "\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])" msg_admin_attack("[key_name(M)] disarmed [src.name] ([src.ckey]) (JMP)",ckey=key_name(M),ckey_target=key_name(src)) - M.do_attack_animation(src) + M.do_attack_animation(src, ATTACK_EFFECT_DISARM) if(w_uniform) w_uniform.add_fingerprint(M) @@ -512,7 +512,7 @@ to_chat(H, cpr_attempt_message) - H.do_attack_animation(src, null, image('icons/hud/mob/generic.dmi', src, "cpr", src.layer + 1)) + H.do_attack_animation(src, ATTACK_EFFECT_CPR) var/starting_pixel_y = pixel_y animate(src, pixel_y = starting_pixel_y + 4, time = 2) animate(src, pixel_y = starting_pixel_y, time = 2) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index fc14e29f070..1b8abf87e12 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -1,8 +1,4 @@ /mob/living/carbon/human - light_system = MOVABLE_LIGHT - - blocks_emissive = EMISSIVE_BLOCK_NONE - // Tail Style var/tail_style = null @@ -103,10 +99,6 @@ var/list/gunshot_residue var/pulling_punches // Are you trying not to hurt your opponent? - mob_bump_flag = HUMAN - mob_push_flags = ~HEAVY - mob_swap_flags = ~HEAVY - var/flash_protection = 0 // Total level of flash protection var/equipment_tint_total = 0 // Total level of visualy impairing items var/equipment_darkness_modifier // Darkvision modifier from equipped items @@ -134,3 +126,48 @@ var/triage_tag = TRIAGE_NONE var/lobotomized = FALSE //additional check for isAdvancedToolUser that can be set manually by things + + var/list/organs = list() + + ///Container for blood and BLOOD ONLY. Do not transfer other chems here. + var/datum/reagents/vessel + + /// Used for cryo to free up a slot when a ghost cryos. + var/datum/weakref/ghost_spawner + + var/next_stance_collapse = 0 + + var/datum/dionastats/DS + + var/oxygen_alert = 0 + var/phoron_alert = 0 + var/co2_alert = 0 + var/fire_alert = 0 + var/pressure_alert = 0 + var/temperature_alert = 0 + + var/datum/weakref/srom_pulled_by + var/datum/weakref/srom_pulling + + /// Our set of "raw" overlays that can be modified, but cannot be directly applied to the mob without preprocessing. + var/list/overlays_raw[TOTAL_LAYERS] + /// store what the body last looked like, so we only have to update it if something changed + var/previous_damage_appearance + + var/singleton/origin_item/culture/culture + var/singleton/origin_item/origin/origin + + var/tmp/centcomm_despawn_timer + + var/pronouns = NEUTER + + /// Used so species that need special items (autoinhalers for vaurca/RMT for offworlders) don't get them twice when they shouldn't. + var/species_items_equipped + + var/list/hud_list[11] + /// To check if we've need to roll for damage on movement while an item is imbedded in us. + var/embedded_flag + /// This is very not good, but it's much much better than calling get_rig() every update_canmove() call. + var/obj/item/rig/wearing_rig + /// Pref holder for the speech bubble style. + var/speech_bubble_type diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index d16844dd3fd..5b69458befd 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -4,10 +4,6 @@ eyes.update_colour() regenerate_icons() -/mob/living/carbon/var/list/internal_organs = list() -/mob/living/carbon/var/shock_stage = 0 -/mob/living/carbon/human/var/list/organs = list() - /mob/living/carbon/human/proc/recheck_bad_external_organs() var/damage_this_tick = getToxLoss() var/arterial_check = 0 @@ -57,9 +53,6 @@ if (W.infection_check()) W.germ_level += 1 -/mob/living/carbon/human - var/next_stance_collapse = 0 - /mob/living/carbon/human/proc/handle_stance() // Don't need to process any of this if they aren't standing anyways // unless their stance is damaged, and we want to check if they should stay down diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 8b94f6fe909..d117a220282 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -541,7 +541,7 @@ sleep(10) playsound(src, 'sound/items/countdown.ogg', 125, 1) sleep(20) - explosion(src, -1, 1, 5) + explosion(get_turf(src), -1, 1, 5) src.gib() /mob/living/carbon/human/proc/hivenet() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0f0ee6832ac..c830fca13f2 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -45,14 +45,6 @@ ///The maximum dose that can be received, above this level all further radiation is taken as damage directly to the body, ignoring armor. Very rapidly fatal. #define RADIATION_MAX_DOSE 1000 -/mob/living/carbon/human - var/oxygen_alert = 0 - var/phoron_alert = 0 - var/co2_alert = 0 - var/fire_alert = 0 - var/pressure_alert = 0 - var/temperature_alert = 0 - /mob/living/carbon/human/Life(seconds_per_tick, times_fired) if (transforming) return @@ -1595,7 +1587,7 @@ stamina = min(max_stamina, stamina+regen) adjustNutritionLoss(stamina_recovery*0.09) adjustHydrationLoss(stamina_recovery*0.32) - if (client) + if (client && hud_used && hud_used.move_intent) hud_used.move_intent.update_move_icon(src) /mob/living/carbon/human/proc/update_oxy_overlay() diff --git a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm index b0b020a15e5..2a38a09bc5a 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm @@ -166,6 +166,7 @@ icon_state = "revenant_eyes" eye_emote = null vision_color = null + action_button_name = list("Activate Low Light Vision") default_action_type = /datum/action/item_action/organ/night_eyes/rev /obj/item/organ/internal/eyes/night/revenant/flash_act() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 7c3d6f250a5..6301f9c2334 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -471,6 +471,9 @@ /// Controls whether this species spawns with a Morale Component. var/has_morale = TRUE + /// A list of species components that should only EVER apply to this species. This is because some components must be removed if the species changes (imagine changing from IPC to human as a merc). + var/list/species_components + /datum/species/proc/get_eyes(var/mob/living/carbon/human/H) return @@ -625,7 +628,11 @@ for(var/spell/spell in H.spell_list) if(istype(spell, spell_path)) H.remove_spell(spell) - return + + if(length(species_components)) + for(var/comp_type in species_components) + for(var/datum/component/comp in H.GetComponents(comp_type)) + qdel(comp) /datum/species/proc/add_inherent_verbs(var/mob/living/carbon/human/H) if(inherent_verbs) @@ -660,6 +667,10 @@ if(has_psionics) H.set_psi_rank(has_psionics) + if(length(species_components)) + for(var/comp_type in species_components) + H.AddComponent(comp_type) + /datum/species/proc/handle_death(var/mob/living/carbon/human/H, var/gibbed = 0) //Handles any species-specific death events (such as dionaea nymph spawns). return diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm index b3b26a3ec9c..fc8b49c97f7 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack.dm @@ -7,6 +7,7 @@ edge = TRUE damage = 5 attack_name = "sharp bite" + attack_effect = ATTACK_EFFECT_BITE /datum/unarmed_attack/diona attack_verb = list("lashed", "bludgeoned") @@ -28,6 +29,7 @@ edge = TRUE damage = 5 attack_name = "claws" + attack_effect = ATTACK_EFFECT_CLAW /datum/unarmed_attack/claws/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) @@ -124,6 +126,7 @@ attack_name = "heavy fist" shredding = TRUE sparring_variant_type = /datum/unarmed_attack/pain_strike/heavy + attack_effect = ATTACK_EFFECT_SMASH /datum/unarmed_attack/industrial/heavy damage = 9 @@ -140,6 +143,7 @@ attack_sound = 'sound/weapons/beartrap_shut.ogg' attack_name = "power fist" shredding = TRUE + attack_effect = ATTACK_EFFECT_SMASH /datum/unarmed_attack/terminator/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armor,var/attack_damage,var/zone) ..() @@ -225,6 +229,7 @@ attack_sound = 'sound/weapons/heavysmash.ogg' attack_name = "crushing fist" shredding = TRUE + attack_effect = ATTACK_EFFECT_SMASH /datum/unarmed_attack/shocking attack_verb = list("prodded", "touched") @@ -265,6 +270,7 @@ attack_door = 20 crowbar_door = TRUE sparring_variant_type = /datum/unarmed_attack/pain_strike/heavy + attack_effect = ATTACK_EFFECT_SMASH /datum/unarmed_attack/vaurca_bulwark/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armor,var/zone) ..() @@ -290,6 +296,7 @@ attack_sound = 'sound/weapons/beartrap_shut.ogg' attack_name = "industrial claw" shredding = TRUE + attack_effect = ATTACK_EFFECT_SMASH /datum/unarmed_attack/tesla_body/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armor,var/attack_damage,var/zone) ..() diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm index 0c5dccdfe32..7930b942fcf 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm @@ -163,6 +163,8 @@ melee = ARMOR_MELEE_KNIVES ) + species_components = list(/datum/component/synthetic_endoskeleton) + // Special snowflake machine vars. var/sprint_temperature_factor = 1.05 /// Species-based multiplier to movement power costs in the power core. @@ -217,7 +219,6 @@ /datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H) . = ..() - H.AddComponent(/datum/component/synthetic_endoskeleton) check_tag(H, H.client) var/obj/item/organ/internal/machine/power_core/C = H.internal_organs_by_name[BP_CELL] if(C) diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm index 5b58a8692a2..3ab0ac68452 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm @@ -5,8 +5,8 @@ category_name = "Tajara" bodytype = BODYTYPE_TAJARA species_height = HEIGHT_CLASS_SHORT - height_min = 150 - height_max = 190 + height_min = 145 // human default: 145 + height_max = 180 // human default: 203 icobase = 'icons/mob/human_races/tajara/r_tajaran.dmi' deform = 'icons/mob/human_races/tajara/r_def_tajaran.dmi' preview_icon = 'icons/mob/human_races/tajara/tajaran_preview.dmi' @@ -27,7 +27,7 @@ darksight = 8 slowdown = -0.4 - brute_mod = 1.2 + brute_mod = 1.1 fall_mod = 0.5 grab_mod = 1.25 // Fur easy to cling onto diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm index deed857b277..bc6b87ed4e9 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm @@ -10,6 +10,8 @@ an easy path to education. Zhan-Khazan are in a transformative state in modern Tajaran society, \ but still deal with the many barriers from centuries of the caste system." species_height = HEIGHT_CLASS_TALL + height_min = 160 // taj default: 145 + height_max = 195 // taj default: 180 secondary_langs = list(LANGUAGE_SIIK_TAJR, LANGUAGE_DELVAHII) @@ -17,7 +19,7 @@ sprint_speed_factor = 0.55 standing_jump_range = 2 stamina = 100 // As opposed to 90 - brute_mod = 1.1 // Less Brute Damage + brute_mod = 1.05 // Less Brute Damage ethanol_resistance = 1 // Default value climb_coeff = 1.1 @@ -59,12 +61,14 @@ When these roles were shrunken down however, the M'sai commonly found themselves taking \ similar work to the Zhan-Khazan. As a result, the two races share much in common with their culture." species_height = HEIGHT_CLASS_AVERAGE + height_min = 155 // taj default: 145 + height_max = 175 // taj default: 180 slowdown = -0.6 sprint_speed_factor = 0.75 standing_jump_range = 3 stamina = 80 // As opposed to 90 - brute_mod = 1.3 // More Brute Damage + brute_mod = 1.15 // More Brute Damage ethanol_resistance = 0.7 // Species Default 0.9 maneuvers = list( diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 8fbc25dd476..04f68afd103 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -9,6 +9,8 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) var/armor_penetration = 0 var/attack_sound = SFX_PUNCH var/miss_sound = SFX_PUNCH_MISS + /// The attack effect played with this attack. + var/attack_effect = ATTACK_EFFECT_PUNCH var/shredding = 0 // Calls the old attack_alien() behavior on objects/mobs when on harm intent. var/attack_door = 0 // Whether the attack can damage airlocks and how much damage it does var/crowbar_door = FALSE @@ -166,6 +168,7 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) sharp = 0 edge = FALSE attack_name = "bite" + attack_effect = ATTACK_EFFECT_BITE /datum/unarmed_attack/bite/is_usable(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone) if(user.incapacitated()) @@ -254,6 +257,7 @@ GLOBAL_LIST_EMPTY(sparring_attack_cache) desc = "A high risk, pretty low reward move. It could be useful if your shoes has a knife sticking out the front, or if you're a trained martial arts master. Make sure to target the lower parts of the body, or else you won't be able to reach!" damage = 0 attack_name = "kick" + attack_effect = ATTACK_EFFECT_KICK /datum/unarmed_attack/kick/is_usable(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone) if(user.legcuffed || user.incapacitated()) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 8dc14551d51..d4b4ee2e3b2 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -100,10 +100,6 @@ There are several things that need to be remembered: ret.layer = layer return ret -/mob/living/carbon/human - var/list/overlays_raw[TOTAL_LAYERS] // Our set of "raw" overlays that can be modified, but cannot be directly applied to the mob without preprocessing. - var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed - // Updates overlays from overlays_raw. /mob/living/carbon/human/update_icon() if (QDELETED(src)) diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index f44357ea871..28b082eb80c 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -1,6 +1,3 @@ -/mob/living - var/datum/language/default_language - /mob/living/verb/set_default_language_verb() set name = "Set Default Language" set category = "IC.Language" diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 69d198e9096..3de7757607b 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -196,9 +196,6 @@ /mob/living/proc/handle_hud_icons_health() return -/mob/living - var/datum/weakref/last_weather - /mob/living/proc/is_outside() var/turf/T = loc return istype(T) && T.is_outside() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 88c13c7835e..b4faa5b04eb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -53,9 +53,6 @@ default behaviour is: return TRUE return FALSE -/mob/living - var/tmp/last_push_notif - /mob/living/Collide(atom/movable/target_movable_atom) if(now_pushing || !loc) return @@ -745,10 +742,6 @@ default behaviour is: to_chat(src, SPAN_NOTICE("You can't move...")) return var/resisting = 0 - for(var/obj/O in requests) - requests.Remove(O) - qdel(O) - resisting++ var/resist_power = get_resist_power() // How easily the mob can break out of a grab for(var/obj/item/grab/G in grabbed_by) resisting++ @@ -926,19 +919,17 @@ default behaviour is: AddElement(/datum/element/connect_loc, loc_connections) /mob/living/Destroy() + cameraFollow = null + if (length(actions)) + for (var/datum/action/action in actions) + action.Remove(src) + actions -= action - //Aiming overlay - QDEL_NULL(aiming) - QDEL_LIST(aimed_at_by) - - //Psi complexus + QDEL_NULL(stamina_bar) + QDEL_LIST(auras) QDEL_NULL(psi) - - if(vr_mob) - vr_mob = null - if(old_mob) - old_mob = null - + QDEL_NULL(aiming) + aimed_at_by?.Cut() //Remove contained mobs if(loc) for(var/mob/M in contents) @@ -947,12 +938,11 @@ default behaviour is: for(var/mob/M in contents) qdel(M) - QDEL_NULL(reagents) - - if(auras) - for(var/a in auras) - remove_aura(a) - + prepared_maneuver = null + available_maneuvers?.Cut() + default_language = null + QDEL_NULL(z_eye) + last_weather = null return ..() /mob/living/proc/nervous_system_failure() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 47edd11ff1d..65cddec66bb 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -503,19 +503,50 @@ A.Remove(src) for(var/obj/item/I in src) - if(I.action_button_name) + if(!I.action_button_name) + continue - //If the item_action object does not exist, try to create it + var/list/action_names = islist(I.action_button_name) ? I.action_button_name : list(I.action_button_name) + var/list/action_types = islist(I.default_action_type) ? I.default_action_type : list(I.default_action_type) + + if(action_names.len > 1) + if(!islist(I.action)) + I.action = I.action ? list(I.action) : list() + + var/list/actions_list = I.action + + for(var/i in 1 to action_names.len) + var/action_name = action_names[i] + if(!action_name) + continue + + var/datum/action/item_action = (i <= actions_list.len) ? actions_list[i] : null + + if(!item_action) + var/action_type = action_types.len >= i ? action_types[i] : action_types[1] + if(!action_type) + continue + + item_action = new action_type + actions_list.Add(item_action) + + item_action.name = action_name + item_action.SetTarget(I) + item_action.Grant(src) + + else if(!I.action) - //Try to use the default action type, if there is none, skip this implant - if(I.default_action_type) - I.action = new I.default_action_type + var/action_type = action_types.len ? action_types[1] : null + if(action_type) + I.action = new action_type else continue - I.action.name = I.action_button_name - I.action.SetTarget(I) - I.action.Grant(src) + var/datum/action/item_action = I.action + item_action.name = action_names[1] + item_action.SetTarget(I) + item_action.Grant(src) + return /mob/living/update_action_buttons() diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 032446b4ad7..a7c659175c0 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -86,6 +86,9 @@ var/burn_mod = 1 var/brute_mod = 1 + /// Override for the visual attack effect shown on 'do_attack_animation()'. + var/attack_vis_effect + /// used to limit people from queuing up limb-breaks var/limb_breaking = FALSE /// Basically a catch-all aura/force-field thing. @@ -102,3 +105,27 @@ /// Time since last weather effect var/weather_cooldown_time = 0 + + var/datum/psi_complexus/psi + + ///The obj to overlay on the aim target + var/obj/aiming_overlay/aiming + + ///A list of mobs the target is being aimed at by + var/list/aimed_at_by + + var/singleton/maneuver/prepared_maneuver + var/list/available_maneuvers = list() + + var/datum/language/default_language + + var/atom/movable/z_observer/z_eye + + atom_flags = CRITICAL_ATOM + var/instability = 0 + var/last_instability = 0 // Used to calculate instability delta. + var/last_instability_event = null // most recent world.time that something bad happened due to instability. + + var/datum/weakref/last_weather + + var/tmp/last_push_notif diff --git a/code/modules/mob/living/living_maneuvers.dm b/code/modules/mob/living/living_maneuvers.dm index 75bc69d6bfb..42cc448b7d4 100644 --- a/code/modules/mob/living/living_maneuvers.dm +++ b/code/modules/mob/living/living_maneuvers.dm @@ -1,7 +1,3 @@ -/mob/living - var/singleton/maneuver/prepared_maneuver - var/list/available_maneuvers = list() - /mob/living/begin_falling(var/lastloc, var/below) if(throwing) return diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 5658b3ed41d..caf2a24e2ba 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -330,6 +330,9 @@ var/list/channel_to_radio_key = new listening = get_hearers_in_view(message_range, src) + var/sensitive_listener = get_intent_listeners(src, message_range + 1) + listening = mergelists(listening, sensitive_listener, TRUE) + if(client) for (var/mob/player_mob in GLOB.player_list) if(!player_mob || player_mob.stat != DEAD || (player_mob in listening)) diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm index 51aa3051f9d..05d311f355d 100644 --- a/code/modules/mob/living/silicon/death.dm +++ b/code/modules/mob/living/silicon/death.dm @@ -1,6 +1,6 @@ /mob/living/silicon/gib() ..("gibbed-r") - gibs(loc, viruses, null, /obj/effect/gibspawner/robot) + gibs(loc, null, /obj/effect/gibspawner/robot) /mob/living/silicon/dust() ..(/obj/effect/decal/remains/robot) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 2ec1a6b9c04..fee86ea65df 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -238,7 +238,7 @@ held_item = null eject_brain() - gibs(loc, viruses, null, /obj/effect/gibspawner/robot) //TODO: use gib() or refactor spiderbots into synthetics. + gibs(loc, null, /obj/effect/gibspawner/robot) //TODO: use gib() or refactor spiderbots into synthetics. qdel(src) return diff --git a/code/modules/mob/living/simple_animal/hostile/adhomai.dm b/code/modules/mob/living/simple_animal/hostile/adhomai.dm index e49647b5a7d..bcbd53a258d 100644 --- a/code/modules/mob/living/simple_animal/hostile/adhomai.dm +++ b/code/modules/mob/living/simple_animal/hostile/adhomai.dm @@ -21,6 +21,7 @@ melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' environment_smash = 1 @@ -57,6 +58,7 @@ melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' faction = "Adhomai" @@ -177,4 +179,4 @@ /obj/projectile/beam/tesla/plasmageist/on_hit(atom/target, blocked, def_zone) . = ..() if(isliving(target)) - explosion(target, -1, 0, 2) + explosion(get_turf(target), -1, 0, 2) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index c8fd579102a..1872876f7a4 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -13,6 +13,7 @@ melee_damage_lower = 5 melee_damage_upper = 15 attacktext = "mauls" + attack_vis_effect = ATTACK_EFFECT_CLAW cold_damage_per_tick = 0 speak_chance = 5 speak = list("Hruuugh!","Hrunnph") @@ -34,6 +35,7 @@ melee_damage_lower = 1 melee_damage_upper = 8 attacktext = "gouges" + attack_vis_effect = ATTACK_EFFECT_SLASH cold_damage_per_tick = 0 speak_chance = 5 speak = list("Awrr?","Aowrl!","Worrl") @@ -59,6 +61,7 @@ melee_damage_lower = 3 melee_damage_upper = 12 attacktext = "gouges" + attack_vis_effect = ATTACK_EFFECT_SLASH cold_damage_per_tick = 0 speak_chance = 5 speak = list("Shuhn","Shrunnph?","Shunpf") diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm index d7ef9f3e938..eb278ca8b02 100644 --- a/code/modules/mob/living/simple_animal/hostile/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/bat.dm @@ -24,6 +24,7 @@ melee_damage_upper = 10 resist_mod = 10 // can't grab a cloud of bats easily attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' //Space carp aren't affected by atmos. diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 8747f50abb2..2396d3ce6c8 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -35,6 +35,7 @@ var/turns_since_hit = 0//If the bear chases someone too long without hitting them, it will try to change to another nearby target instead attacktext = null//This allows custom attacking emotes + attack_vis_effect = ATTACK_EFFECT_CLAW var/quiet_sounds = list('sound/effects/creatures/bear_quiet_1.ogg', 'sound/effects/creatures/bear_quiet_2.ogg', diff --git a/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm b/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm index 89df833f51c..885925b6c2c 100644 --- a/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm +++ b/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm @@ -31,6 +31,7 @@ mob_size = 25 environment_smash = 2 attacktext = "mangles" + attack_vis_effect = ATTACK_EFFECT_SLASH attack_sound = 'sound/weapons/bloodyslice.ogg' lighting_alpha = LIGHTING_PLANE_ALPHA_SOMEWHAT_INVISIBLE diff --git a/code/modules/mob/living/simple_animal/hostile/changeling.dm b/code/modules/mob/living/simple_animal/hostile/changeling.dm index e4df40d8bf1..b67081bd65d 100644 --- a/code/modules/mob/living/simple_animal/hostile/changeling.dm +++ b/code/modules/mob/living/simple_animal/hostile/changeling.dm @@ -34,6 +34,7 @@ mob_size = 25 environment_smash = 2 attacktext = "mangles" + attack_vis_effect = ATTACK_EFFECT_SLASH attack_sound = 'sound/weapons/bloodyslice.ogg' emote_sounds = list('sound/effects/creatures/bear_loud_1.ogg', 'sound/effects/creatures/bear_loud_2.ogg', 'sound/effects/creatures/bear_loud_3.ogg', 'sound/effects/creatures/bear_loud_4.ogg') @@ -165,6 +166,7 @@ mob_size = 15 attacktext = "mangles" attack_sound = 'sound/weapons/bloodyslice.ogg' + attack_vis_effect = ATTACK_EFFECT_SLASH lighting_alpha = LIGHTING_PLANE_ALPHA_SOMEWHAT_INVISIBLE diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/bear_companion.dm b/code/modules/mob/living/simple_animal/hostile/commanded/bear_companion.dm index e282387782f..15e48a034c9 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/bear_companion.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/bear_companion.dm @@ -39,6 +39,8 @@ butchering_products = list(/obj/item/clothing/head/bearpelt = 1) meat_amount = 5 + attack_vis_effect = ATTACK_EFFECT_CLAW + /mob/living/simple_animal/hostile/commanded/bear/hit_with_weapon(obj/item/O, mob/living/user, var/effective_force, var/hit_zone) . = ..() if(.) diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm index babcdee9adf..25adb384d55 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm @@ -45,6 +45,7 @@ destroy_surroundings = FALSE attack_emote = "growls at" + attack_vis_effect = ATTACK_EFFECT_BITE butchering_products = list(/obj/item/stack/material/animalhide = 2) diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm index 420a9f07bf7..43ef278efdf 100644 --- a/code/modules/mob/living/simple_animal/hostile/creature.dm +++ b/code/modules/mob/living/simple_animal/hostile/creature.dm @@ -11,6 +11,7 @@ melee_damage_upper = 30 organ_names = list("meaty core") attacktext = "chomps" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' faction = "creature" speed = 4 diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index 6e437761dca..79046d965ee 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -21,6 +21,7 @@ melee_damage_lower = 15 melee_damage_upper = 15 attacktext = "grips" + attack_vis_effect = ATTACK_EFFECT_SLASH attack_sound = 'sound/hallucinations/growl1.ogg' min_oxy = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index ae18acf0980..31f17feaf23 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -46,6 +46,7 @@ smart_melee = FALSE attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE attack_emote = "skitters toward" attack_sound = 'sound/weapons/bite.ogg' emote_sounds = list('sound/effects/creatures/spider_critter.ogg') diff --git a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm index b6a483b22b8..f106ba7fba5 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm @@ -43,6 +43,8 @@ psi_pingable = FALSE sample_data = null + attack_vis_effect = ATTACK_EFFECT_SLASH + /// Weakref to the beacon that potentially spawned us. var/datum/weakref/parent_beacon diff --git a/code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm b/code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm index 0933467441a..c05d3f75802 100644 --- a/code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/ipc_zombie.dm @@ -12,6 +12,7 @@ armor_penetration = 20 attack_sound = 'sound/weapons/smash.ogg' attacktext = "smashes" + attack_vis_effect = ATTACK_EFFECT_SMASH faction = "hivebot" min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/moghes.dm b/code/modules/mob/living/simple_animal/hostile/moghes.dm index 3a372249719..6a38c625698 100644 --- a/code/modules/mob/living/simple_animal/hostile/moghes.dm +++ b/code/modules/mob/living/simple_animal/hostile/moghes.dm @@ -29,6 +29,7 @@ mob_size = 30 environment_smash = 2 attacktext = "chomps" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bloodyslice.ogg' lighting_alpha = LIGHTING_PLANE_ALPHA_SOMEWHAT_INVISIBLE @@ -159,6 +160,7 @@ melee_damage_lower = 5 melee_damage_upper = 8 attacktext = "rams" + attack_vis_effect = ATTACK_EFFECT_SLASH attack_sound = 'sound/weapons/punch4_bass.ogg' environment_smash = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm b/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm index b6c41c4fb09..8820fe979ae 100644 --- a/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm +++ b/code/modules/mob/living/simple_animal/hostile/phoron_worm.dm @@ -24,6 +24,7 @@ mob_size = 30 environment_smash = 2 attacktext = "chomps" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' faction = "worm" diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index fffc98ea875..49bc034362d 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -20,6 +20,7 @@ melee_damage_lower = 30 melee_damage_upper = 30 attacktext = "slashes" + attack_vis_effect = ATTACK_EFFECT_SLASH attack_sound = 'sound/weapons/bladeslice.ogg' min_oxy = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/pra.dm b/code/modules/mob/living/simple_animal/hostile/pra.dm index 22e30716ab8..0a98e152bf4 100644 --- a/code/modules/mob/living/simple_animal/hostile/pra.dm +++ b/code/modules/mob/living/simple_animal/hostile/pra.dm @@ -36,6 +36,7 @@ mob_size = 5 attacktext = "slashes" + attack_vis_effect = ATTACK_EFFECT_SLASH attack_sound = 'sound/weapons/bladeslice.ogg' speed = 2 @@ -174,6 +175,7 @@ melee_damage_upper = 5 attacktext = "smashed" attack_sound = 'sound/weapons/genhit1.ogg' + attack_vis_effect = ATTACK_EFFECT_SMASH speed = 1 ranged = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/aquatic.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/aquatic.dm index 4d7c3df37a1..0b4b851cdf8 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/aquatic.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/aquatic.dm @@ -47,6 +47,7 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile/retaliate/aquatic) melee_damage_lower = 40 melee_damage_upper = 70 armor_penetration = 80 + attack_vis_effect = ATTACK_EFFECT_BITE //Admin shark for admin fun because why not, not meant for normal gameplay /mob/living/simple_animal/hostile/retaliate/aquatic/thresher/deep_water diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm index ca019a5cea9..162e1d5e6b0 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm @@ -24,6 +24,7 @@ melee_damage_lower = 10 melee_damage_upper = 10 attacktext = "chomps" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' speed = 4 projectiletype = /obj/projectile/beam/cavern diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index bb43982057b..5a85f93d886 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -27,6 +27,7 @@ ) emote_see = list("skitters","oozes liquid from its mouth", "scratches at the ground", "clicks its claws") + attack_vis_effect = ATTACK_EFFECT_CLAW /mob/living/simple_animal/hostile/retaliate/beast/charbaby name = "charbaby" @@ -66,5 +67,6 @@ icon_state = "lavadog" icon_living = "lavadog" icon_dead = "lavadog_dead" + attack_vis_effect = ATTACK_EFFECT_BITE speak = list("Karuph!", "Karump!") diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm index 3e0e1da202f..01f49ea1f7a 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm @@ -21,6 +21,7 @@ melee_damage_upper = 30 armor_penetration = 20 attacktext = "claws" + attack_vis_effect = ATTACK_EFFECT_CLAW attack_sound = 'sound/weapons/slice.ogg' meat_amount = 8 diff --git a/code/modules/mob/living/simple_animal/hostile/rogue_maint_drone.dm b/code/modules/mob/living/simple_animal/hostile/rogue_maint_drone.dm index 7713e2f0bcc..984a48196b6 100644 --- a/code/modules/mob/living/simple_animal/hostile/rogue_maint_drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/rogue_maint_drone.dm @@ -15,6 +15,7 @@ melee_damage_upper = 8 armor_penetration = 5 attacktext = "slices" + attack_vis_effect = ATTACK_EFFECT_SLASH faction = "silicon" min_oxy = 0 minbodytemp = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm index b639175bcee..cea4f67c70e 100644 --- a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm +++ b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm @@ -135,9 +135,8 @@ /mob/living/simple_animal/hostile/greatworm/Destroy() SSmobs.greatworms -= src - if(sarlacc) - qdel(sarlacc) - sarlacc = null + QDEL_NULL(sarlacc) + QDEL_LIST(active_tentacles) return ..() /mob/living/simple_animal/hostile/greatworm/Life(seconds_per_tick, times_fired) @@ -289,6 +288,7 @@ /mob/living/simple_animal/hostile/lesserworm/Destroy() if(originator) originator.active_tentacles -= src + originator = null return ..() /mob/living/simple_animal/hostile/lesserworm/proc/Penetrate() diff --git a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm index ed8cef6a75c..a20d846f789 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm @@ -34,6 +34,7 @@ armor_penetration = 5 attack_flags = DAMAGE_FLAG_EDGE attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' //Space carp aren't affected by atmos. @@ -254,7 +255,7 @@ return /mob/living/simple_animal/hostile/carp/bloater/proc/explode() - explosion(src, -1, 1, 2) + explosion(get_turf(src), -1, 1, 2) src.gib() /mob/living/simple_animal/hostile/carp/old @@ -299,6 +300,7 @@ melee_damage_lower = 5 melee_damage_upper = 5 attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' min_oxy = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm index a1f945e356e..ffc05470e29 100644 --- a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm @@ -38,6 +38,7 @@ mob_push_flags = ALLMOBS attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE attack_sound = 'sound/weapons/bite.ogg' pass_flags = PASSTABLE|PASSRAILING diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 7e8a0173bf5..8d280d8a78f 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -24,6 +24,7 @@ melee_damage_lower = 8 melee_damage_upper = 12 attacktext = "bites" + attack_vis_effect = ATTACK_EFFECT_BITE //what how attack_sound = 'sound/weapons/bite.ogg' //Space carp aren't affected by atmos. diff --git a/code/modules/mob/living/simple_animal/hostile/vannatusk.dm b/code/modules/mob/living/simple_animal/hostile/vannatusk.dm index 466ec6629c2..7c1987a4ca5 100644 --- a/code/modules/mob/living/simple_animal/hostile/vannatusk.dm +++ b/code/modules/mob/living/simple_animal/hostile/vannatusk.dm @@ -25,6 +25,7 @@ mob_size = 15 environment_smash = 2 attacktext = "mangles" + attack_vis_effect = ATTACK_EFFECT_CLAW attack_emote = "charges toward" attack_sound = 'sound/effects/creatures/vannatusk_attack.ogg' emote_sounds = list('sound/effects/creatures/vannatusk_sound.ogg', 'sound/effects/creatures/vannatusk_sound_2.ogg') diff --git a/code/modules/mob/living/simple_animal/hostile/viscerator.dm b/code/modules/mob/living/simple_animal/hostile/viscerator.dm index 66adfb761cf..af617c7ee7c 100644 --- a/code/modules/mob/living/simple_animal/hostile/viscerator.dm +++ b/code/modules/mob/living/simple_animal/hostile/viscerator.dm @@ -12,6 +12,7 @@ armor_penetration = 20 density = 0 attacktext = "cuts" + attack_vis_effect = ATTACK_EFFECT_SLASH attack_sound = 'sound/weapons/bladeslice.ogg' blood_overlay_icon = null faction = "syndicate" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 8c63785dac7..b1f58f52965 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -620,14 +620,14 @@ if(!actual_damage) actual_damage = harm_intent_damage ? rand(1, harm_intent_damage) : 0 apply_damage(actual_damage, attack.damage_type) - user.do_attack_animation(src, FIST_ATTACK_ANIMATION) + user.do_attack_animation(src) return simple_harm_attack(user) /mob/living/simple_animal/proc/simple_harm_attack(var/mob/living/user) apply_damage(harm_intent_damage, damage_type, used_weapon = "Attack by [user.name]") user.visible_message(SPAN_WARNING("\The [user] [response_harm] \the [src]!"), SPAN_WARNING("You [response_harm] \the [src]!")) - user.do_attack_animation(src, FIST_ATTACK_ANIMATION) + user.do_attack_animation(src) poke(TRUE) /mob/living/simple_animal/attackby(obj/item/attacking_item, mob/user) @@ -1142,6 +1142,16 @@ return TRUE return FALSE +/mob/living/simple_animal/do_attack_animation(atom/attacked_atom, visual_effect_icon, used_item, no_effect) + if(!no_effect && !visual_effect_icon && melee_damage_upper) + if(attack_vis_effect && !iswall(attacked_atom)) // override the standard visual effect. + visual_effect_icon = attack_vis_effect + else if(melee_damage_upper < 10) + visual_effect_icon = ATTACK_EFFECT_PUNCH + else + visual_effect_icon = ATTACK_EFFECT_SMASH + ..() + #undef BLOOD_NONE #undef BLOOD_LIGHT #undef BLOOD_MEDIUM diff --git a/code/modules/mob/living/whisper.dm b/code/modules/mob/living/whisper.dm index 07a75cf42a5..cc5e294edf2 100644 --- a/code/modules/mob/living/whisper.dm +++ b/code/modules/mob/living/whisper.dm @@ -60,11 +60,14 @@ var/list/observers = list() var/list/all_in_range = hearers(watching_range, src) for(var/mob/M as anything in all_in_range) - if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) //Preventing duplicate messages to ghostear'd observers + // If they got sensitive hearing enabled, increase the whisper hearing range by one + var/sensitive = astype(M, /mob/living/carbon/human)?.is_listening() ? 1 : 0 + //Preventing duplicate messages to ghostear'd observers + if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) continue - if(get_dist(src, M) <= message_range) //In range to hear + if(get_dist(src, M) <= (message_range + sensitive)) //In range to hear continue - else if(get_dist(src, M) <= eavesdropping_range) + else if(get_dist(src, M) <= (eavesdropping_range + sensitive)) if(M.stat == DEAD && M.client) observers += M else diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 1c03b4b14f7..13db1a0ba53 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -25,9 +25,6 @@ message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). "), 1) log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).") -/mob - var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled - /** * Currently marked as SHOULD_NOT_OVERRIDE. * diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm index d63394c3b8b..8a9d9ec4258 100644 --- a/code/modules/mob/logout.dm +++ b/code/modules/mob/logout.dm @@ -5,7 +5,6 @@ //TGUI remove_all_indicators() - SSnanoui.user_logout(src) // this is used to clean up (remove) this user's Nano UIs GLOB.player_list -= src disconnect_time = world.realtime log_access("Logout: [key_name(src)]") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d2810c76e82..452ccef59c9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1,36 +1,89 @@ /mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game. MOB_STOP_THINKING(src) - // Tell any mobs touching us that they're not pulling us anymore. - stop_pulling() + pulling?.pulledby = null + pulling = null + pullin?.icon_state = "pull0" + pullin = null // Delete and null the grab objects that are touching this mob. QDEL_LIST(grabbed_by) GLOB.mob_list -= src GLOB.dead_mob_list -= src GLOB.living_mob_list -= src GLOB.player_list -= src - unset_machine() QDEL_NULL(hud_used) + QDEL_NULL(cells) + QDEL_NULL(flash) + QDEL_NULL(blind) + QDEL_NULL(hands) + QDEL_NULL(pullin) + QDEL_NULL(purged) + QDEL_NULL(internals) + QDEL_NULL(oxygen) + QDEL_NULL(paralysis_indicator) + QDEL_NULL(i_select) + QDEL_NULL(m_select) + QDEL_NULL(toxin) + QDEL_NULL(bodytemp) + QDEL_NULL(healths) + QDEL_NULL(throw_icon) + QDEL_NULL(nutrition_icon) + QDEL_NULL(hydration_icon) + QDEL_NULL(pressure) + QDEL_NULL(damageoverlay) + QDEL_NULL(pain) + QDEL_NULL(item_use_icon) + QDEL_NULL(radio_use_icon) + QDEL_NULL(gun_move_icon) + QDEL_NULL(gun_setting_icon) + QDEL_NULL(unique_action_icon) + QDEL_NULL(toggle_firing_mode) + QDEL_NULL(energy_display) + QDEL_NULL(instability_display) + QDEL_NULL(up_hint) + QDEL_NULL(robot_pain) QDEL_LIST(spell_masters) - remove_screen_obj_references() - if(client) for(var/atom/movable/AM in client.screen) - qdel(AM) + if (!QDELING(AM)) + qdel(AM) client.screen = list() - if (mind) - mind.handle_mob_deletion(src) + mind?.handle_mob_deletion(src) + mind = null - for(var/infection in viruses) - qdel(infection) - - for(var/cc in client_colors) - qdel(cc) + QDEL_NULL(ability_master) + QDEL_NULL(zone_sel) + machine = null client_colors = null - viruses.Cut() + additional_vision_handlers?.Cut() + pinned?.Cut() + QDEL_LIST(embedded) + languages?.Cut() + holo = null + l_hand = null + r_hand = null + back = null + internal = null + s_active = null + wear_mask = null + QDEL_NULL(dna) + LAssailant = null + spell_list?.Cut() + lastarea = null + control_object = null + teleop = null + listed_turf = null item_verbs = null + // This is a nested assoc list, which must be cleared outside-in + if (length(progressbars)) + for (var/location in progressbars) + for (var/ref in progressbars[location]) + qdel(ref) + progressbars.Cut() + + QDEL_NULL(typing_indicator) //Added this to prevent nonliving mobs from ghostising //The only non 'living' mobs are: @@ -48,11 +101,21 @@ var/atom/movable/AM = src.loc LAZYREMOVE(AM.contained_mobs, src) - QDEL_NULL(ability_master) - - if(click_handlers) - QDEL_LIST(click_handlers) - + QDEL_LIST(click_handlers) + vr_mob = null + old_mob = null + lastattacker = null + lastattacked = null + QDEL_NULL(pointing_effect) + QDEL_LIST(open_nanouis) + QDEL_LIST(tgui_open_uis) + QDEL_NULL(narsimage) + QDEL_NULL(narglow) + QDEL_NULL(riftimage) + bloody_hands_mob = null + QDEL_NULL(eyeobj) + QDEL_NULL(bg) + my_client = null return ..() /mob/New() @@ -60,32 +123,6 @@ GenerateTag() return ..() -/mob/proc/remove_screen_obj_references() - flash = null - blind = null - hands = null - pullin = null - purged = null - internals = null - oxygen = null - i_select = null - m_select = null - toxin = null - bodytemp = null - healths = null - throw_icon = null - nutrition_icon = null - hydration_icon = null - pressure = null - damageoverlay = null - pain = null - item_use_icon = null - gun_move_icon = null - gun_setting_icon = null - spell_masters = null - zone_sel = null - -/mob/var/should_add_to_mob_list = TRUE /mob/Initialize(mapload) . = ..() if(should_add_to_mob_list) @@ -404,8 +441,6 @@ if(!. && iscarbon(loc) && isturf(loc.loc)) // We're inside someone, let us examine still. return TRUE -/mob/var/obj/effect/decal/point/pointing_effect = null//Spam control, can only point when the previous pointer qdels - /mob/verb/pointed(atom/A as mob|obj|turf in view()) set name = "Point To" set category = "Object" @@ -734,8 +769,8 @@ if(pulling) pulling.pulledby = null pulling = null - if(pullin) - pullin.icon_state = "pull0" + if(pullin) + pullin.icon_state = "pull0" /mob/proc/start_pulling(var/atom/movable/AM) @@ -916,6 +951,8 @@ if( lying != lying_prev ) update_icon() + if(lying) + SEND_SIGNAL(src, COMSIG_MOB_LYING_DOWN) return canmove @@ -1446,7 +1483,7 @@ if(. && LAZYLEN(spell_list)) for(var/spell/S in spell_list) - if((!S.connected_button) || !statpanel(S.panel)) + if(!S.connected_button) continue //Not showing the noclothes spell switch(S.charge_type) if(Sp_RECHARGE) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index fd63e192e41..b908ced793a 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -176,7 +176,6 @@ var/datum/hud/hud_used = null var/list/grabbed_by = list( ) - var/list/requests = list( ) var/list/mapobjs = list() @@ -186,10 +185,6 @@ var/job = null//Living - var/const/blindness = 1//Carbon - var/const/deafness = 2//Carbon - var/const/muteness = 4//Carbon - var/can_pull_size = 10 // Maximum w_class the mob can pull. var/can_pull_mobs = MOB_PULL_LARGER // Whether or not the mob can pull other mobs. @@ -224,13 +219,6 @@ //Wizard mode, but can be used in other modes thanks to the brand new "Give Spell" badmin button var/list/spell/spell_list -//List of active diseases - - var/list/viruses = list() // replaces var/datum/disease/virus - -//Monkey/infected mode - var/list/resistances = list() - mouse_drag_pointer = MOUSE_ACTIVE_POINTER var/update_icon = 1 //Set to 1 to trigger update_icon() at the next life() call @@ -288,3 +276,82 @@ /// A assoc lazylist of to_chat notifications, key = string message, value = world time integer var/list/message_notifications + + var/mob/living/vr_mob = null // In which mob is our mind + var/mob/living/old_mob = null // Which mob is our old mob + + /** + * LAZYLIST (Instances of `/datum/click_handler`). Click handlers for this mob that should intercept and handle click + * calls. + * + * The 'topmost'/'active' click handler for the mob is the handler currently at index `1`. By default, this will be + * `/datum/click_handler/default`. + */ + var/list/click_handlers + + var/should_add_to_mob_list = TRUE + + /// Integer. Unique sequential ID from the `do_after` proc used to validate `DO_USER_UNIQUE_ACT` flag checks. + var/do_unique_user_handle = 0 + + var/mob/lastattacker = null + var/mob/lastattacked = null + var/attack_log = list() + + /// Spam control, can only point when the previous pointer qdels + var/obj/effect/decal/point/pointing_effect = null + + /// 1 decisecond click delay (above and beyond mob/next_move) + var/next_click = 0 + + var/dizziness = 0//Carbon + var/is_dizzy = 0 + var/is_jittery = 0 + var/jitteriness = 0//Carbon + + //handles up-down floaty effect in space and zero-gravity + var/is_floating = FALSE + + // Used by the Nano UI Manager (/datum/SSnanoui) to track UIs opened by this mob + var/list/open_nanouis = list() + + var/last_pain_message = "" + var/next_pain_time = 0 + + /** + * global + * + * Tracks open UIs for a user. + */ + var/list/tgui_open_uis = list() + + var/tmp/last_airflow_stun = 0 + + //thou shall always be able to see the Geometer of Blood + var/image/narsimage = null + var/image/narglow = null + + //thou shall always be able to see the rift + var/image/riftimage = null + + var/list/client_colors = list() + + var/bloody_hands = null + var/datum/weakref/bloody_hands_mob + var/track_footprint = 0 + var/list/feet_blood_DNA + var/track_footprint_type + var/footprint_color + + var/mob/abstract/eye/eyeobj + + var/mob/living/brain_ghost/bg + + var/list/default_emotes = list() + var/list/usable_emotes = list() + + var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled + + var/get_rig_stats = 0 + + var/thinking_enabled = FALSE diff --git a/code/modules/modular_computers/_description.dm b/code/modules/modular_computers/_description.dm index 5d551a1549a..407c5f5cf9a 100644 --- a/code/modules/modular_computers/_description.dm +++ b/code/modules/modular_computers/_description.dm @@ -45,8 +45,7 @@ if one is destroyed the second will take over. If all relays are gone it stops w possible to enable/disable Software Downloading, P2P file transfers and Communication (IC version of IRC, PDA messages for more than two people) 5. Software -Software would almost exclusively use NanoUI modules. Few exceptions are text editor (uses similar screen as TCS IDE used for editing and classic HTML for previewing as Nano looks differently) -and similar programs which for some reason require HTML UI. Most software will be highly dependent on NTNet to work as laptops are not physically connected to the station's network. +Software would almost exclusively use TGUI modules. Most software will be highly dependent on NTNet to work as laptops are not physically connected to the station's network. What i plan to add: Note: XXXXDB programs will use ingame_manuals to display basic help for players, similar to how books, etc. do diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm index 7d5bc187dd7..77c8a4bad2e 100644 --- a/code/modules/modular_computers/computers/modular_computer/core.dm +++ b/code/modules/modular_computers/computers/modular_computer/core.dm @@ -416,13 +416,10 @@ /obj/item/modular_computer/proc/update_uis() if(active_program) //Should we update program ui or computer ui? - SSnanoui.update_uis(active_program) - SStgui.update_uis(src) - if(active_program.NM) - SSnanoui.update_uis(active_program.NM) + if(active_program) + SStgui.update_uis(active_program) else SStgui.update_uis(src) - SSnanoui.update_uis(src) /obj/item/modular_computer/proc/check_update_ui_need() var/ui_update_needed = FALSE @@ -458,18 +455,6 @@ if(ui_update_needed) update_uis() -// Used by camera monitor program -/obj/item/modular_computer/check_eye(var/mob/user) - if(active_program) - return active_program.check_eye(user) - return ..() - -// Used by camera monitor program -/obj/item/modular_computer/grants_equipment_vision(var/mob/user) - if(active_program) - return active_program.grants_equipment_vision(user) - return ..() - /obj/item/modular_computer/get_cell() return battery_module ? battery_module.get_cell() : DEVICE_NO_CELL diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index 7652f8dc84e..51af5ce2a2d 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -37,9 +37,9 @@ /obj/item/modular_computer/proc/get_header_data(list/data) LAZYINITLIST(data) - data["PC_batteryicon"] = get_battery_icon() + data["PC_batteryicon"] = battery_module ? get_battery_icon() : null data["PC_showbatteryicon"] = !!battery_module - data["PC_batterypercent"] = battery_module ? "[round(battery_module.battery.percent())] %" : "N/C" + data["PC_batterypercent"] = battery_module ? "[round(battery_module.battery.percent())] %" : null data["PC_apclinkicon"] = (tesla_link?.enabled && apc_powered) ? "charging.gif" : "" data["PC_device_theme"] = active_program ? active_program.tgui_theme : "scc" data["PC_ntneticon"] = get_ntnet_status_icon() @@ -206,5 +206,15 @@ return UI_INTERACTIVE . = ..() if(. < UI_INTERACTIVE) - if(user.machine) + if(user?.machine) user.unset_machine() + +/obj/item/modular_computer/check_eye(mob/user) + if(active_program) + return active_program.check_eye(user) + return ..() + +/obj/item/modular_computer/grants_equipment_vision(mob/user) + if(active_program) + return active_program.grants_equipment_vision(user) + return ..() diff --git a/code/modules/modular_computers/computers/subtypes/dev_silicon.dm b/code/modules/modular_computers/computers/subtypes/dev_silicon.dm index 6721a1b8222..bfa09170fb8 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_silicon.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_silicon.dm @@ -19,6 +19,9 @@ /obj/item/modular_computer/silicon/ui_host() . = computer_host +/obj/item/modular_computer/silicon/ui_state(mob/user) + return GLOB.self_state + /obj/item/modular_computer/silicon/Initialize(mapload) if(istype(loc, /mob/living/silicon)) computer_host = loc diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 08787f46ac7..dfb0d78d0f2 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -84,11 +84,7 @@ ABSTRACT_TYPE(/datum/computer_file/program) var/tgui_theme = "scc" /// If this TGUI should autoupdate or not. - var/ui_auto_update = TRUE - - // TO BE DEPRECATED: - var/datum/nano_module/NM // If the program uses NanoModule, put it here and it will be automagically opened. Otherwise implement ui_interact. - var/nanomodule_path // Path to nanomodule, make sure to set this if implementing new program. + var/ui_auto_update = TRUE // Path to nanomodule, make sure to set this if implementing new program. /datum/computer_file/program/New(obj/item/modular_computer/comp) ..() @@ -136,7 +132,6 @@ ABSTRACT_TYPE(/datum/computer_file/program) var/datum/computer_file/program/temp = ..(rename, computer) temp.required_access_run = required_access_run temp.required_access_download = required_access_download - temp.nanomodule_path = nanomodule_path temp.filedesc = filedesc temp.program_icon_state = program_icon_state temp.requires_ntnet = requires_ntnet @@ -200,6 +195,14 @@ ABSTRACT_TYPE(/datum/computer_file/program) return computer.get_ntnet_status(specific_action) return FALSE +/// Allows active programs to preserve non-standard user views, such as camera monitors. +/datum/computer_file/program/proc/check_eye(mob/user) + return -1 + +/// Allows active programs to grant equipment vision while controlling the user's view. +/datum/computer_file/program/proc/grants_equipment_vision(mob/user) + return FALSE + // Called by Process() on device that runs us, once every tick. /datum/computer_file/program/proc/process_tick() return TRUE @@ -307,31 +310,12 @@ ABSTRACT_TYPE(/datum/computer_file/program) else // Should never happen - So fail silently return FALSE -// This attempts to retrieve header data for NanoUIs. If implementing completely new device of different type than existing ones +// This attempts to retrieve header data for UIs. If implementing completely new device of different type than existing ones // always include the device here in this proc. This proc basically relays the request to whatever is running the program. /datum/computer_file/program/proc/get_header_data() if(computer) return computer.get_header_data() - -/datum/computer_file/program/Topic(href, href_list) - if(..()) - return TRUE - if(computer) - return computer.Topic(href, href_list) - -// Relays the call to nano module, if we have one -/datum/computer_file/program/proc/check_eye(var/mob/user) - if(NM) - return NM.check_eye(user) - else - return -1 - -/// Relays the call to nano module, if we have one -/datum/computer_file/program/proc/grants_equipment_vision(var/mob/user) - if(NM) - return NM.grants_equipment_vision(user) - /datum/computer_file/program/proc/message_dead(var/message) for(var/mob/M in GLOB.player_list) if(M.stat == DEAD && (M.client && M.client.prefs.toggles & CHAT_GHOSTEARS)) diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm index 9b03b8d6369..f49a38a1355 100644 --- a/code/modules/modular_computers/file_system/program_events.dm +++ b/code/modules/modular_computers/file_system/program_events.dm @@ -5,8 +5,6 @@ // When implementing new program based device, use this to run the program. /datum/computer_file/program/proc/run_program(var/mob/user) if(can_run(user, 1) || !requires_access_to_run) - if(nanomodule_path) - NM = new nanomodule_path(src, new /datum/topic_manager/program(src), src) if(requires_ntnet && network_destination) generate_network_log("Connection opened to [network_destination].") program_state = PROGRAM_STATE_ACTIVE @@ -18,9 +16,6 @@ program_state = PROGRAM_STATE_KILLED if(network_destination) generate_network_log("Connection to [network_destination] closed.") - if(NM) - qdel(NM) - NM = null return TRUE // Is called when program service is being activated diff --git a/code/modules/modular_computers/file_system/programs/_program.dm b/code/modules/modular_computers/file_system/programs/_program.dm index 72030a2d2d1..c0293bdc125 100644 --- a/code/modules/modular_computers/file_system/programs/_program.dm +++ b/code/modules/modular_computers/file_system/programs/_program.dm @@ -1,39 +1,5 @@ -/obj/item/modular_computer/initial_data() +/obj/item/modular_computer/proc/initial_data() return list("_PC" = get_header_data()) -/datum/computer_file/program/initial_data() +/datum/computer_file/program/proc/initial_data() return list("_PC" = get_header_data()) - -/obj/item/modular_computer/update_layout() - return TRUE - -/datum/computer_file/program/update_layout() - return TRUE - -/datum/nano_module/program - available_to_ai = FALSE - var/datum/computer_file/program/program // Program-Based computer program that runs this nano module. Defaults to null. - -/datum/nano_module/program/New(var/host, var/topic_manager, var/program) - ..() - src.program = program - -/datum/nano_module/program/Destroy() - program = null - return ..() - -/datum/topic_manager/program - var/datum/program - -/datum/topic_manager/program/New(var/datum/program) - ..() - src.program = program - -/datum/topic_manager/program/Destroy() - program = null - return ..() - -// Calls forwarded to PROGRAM itself should begin with "PRG_" -// Calls forwarded to COMPUTER running the program should begin with "PC_" -/datum/topic_manager/program/Topic(href, href_list) - return program && program.Topic(href, href_list) diff --git a/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm b/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm index 6d619a3de26..e87234b0b31 100644 --- a/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm +++ b/code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm @@ -9,7 +9,6 @@ available_on_ntnet = TRUE usage_flags = PROGRAM_ALL tgui_id = "CargoOrder" - ui_auto_update = FALSE var/page = "main" //main - Main Menu, order - Order Page, item_details - Item Details Page, tracking - Tracking Page var/selected_category = null // Category that is currently selected diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 4c6aa651443..e60bb5daa69 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -11,7 +11,6 @@ size = 8 color = LIGHT_COLOR_BLUE tgui_id = "IDCardModification" - ui_auto_update = FALSE var/is_centcom = FALSE var/show_assignments = FALSE diff --git a/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm b/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm index 6eebe6b56e8..fe77a3024bf 100644 --- a/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm +++ b/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm @@ -12,7 +12,6 @@ network_destination = "station long-range communication array" color = LIGHT_COLOR_BLUE tgui_id = "CommandCommunications" - ui_auto_update = FALSE var/datum/comm_message_listener/message_core var/intercept = FALSE var/can_call_shuttle = FALSE //If calling the shuttle should be available from this console @@ -272,7 +271,12 @@ GLOBAL_VAR_INIT(last_message_id, 0) /datum/comm_message_listener/proc/Add(var/list/message) messages[++messages.len] = message -/datum/comm_message_listener/proc/Remove(var/list/message) +/datum/comm_message_listener/proc/Remove(var/message) + if(isnum(message)) + for(var/list/stored_message in messages) + if(stored_message["id"] == message) + message = stored_message + break messages -= list(message) /* Command action procs diff --git a/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm b/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm index 74702b4e2bf..ac416d91793 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/atmoscontrol.dm @@ -48,7 +48,7 @@ // Opens the interface for the given air alarm. if("alarm") var/obj/structure/machinery/alarm/alarm = locate(params["alarm"]) in (monitored_alarms.len ? monitored_alarms : SSmachinery.processing) - if(alarm) + if(alarm?.rcon_setting) alarm.ui_interact(usr) return TRUE // Manually clear and repopulate the alarm list. @@ -65,6 +65,8 @@ var/alarms = list() for(var/obj/structure/machinery/alarm/alarm in monitored_alarms) + if(!alarm.rcon_setting) + continue alarms += list(list( "deck" = alarm.alarm_area.horizon_deck, "dept" = alarm.alarm_area.department, @@ -77,4 +79,3 @@ data["alarms"] = alarms return data - diff --git a/code/modules/modular_computers/file_system/programs/engineering/lightingcontrol.dm b/code/modules/modular_computers/file_system/programs/engineering/lightingcontrol.dm index 21fc2d4aa53..7f6dc3333a8 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/lightingcontrol.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/lightingcontrol.dm @@ -23,7 +23,9 @@ ..() lstate = SSnightlight.is_active() ? "dark" : "full" -/datum/computer_file/program/lighting_control/proc/update_lighting() +/datum/computer_file/program/lighting_control/proc/update_lighting(var/new_context = context, var/new_lstate = lstate) + context = new_context + lstate = new_lstate // whether to only select areas explicitly marked for nightlighting var/wl_only = context == "all" ? 0 : 1 @@ -48,7 +50,8 @@ lstate = params["mode"] . = TRUE if ("set") - update_lighting() + update_lighting(params["context"] || context, params["mode"] || lstate) + . = TRUE /datum/computer_file/program/lighting_control/ui_data(mob/user) var/list/data = initial_data() diff --git a/code/modules/modular_computers/file_system/programs/engineering/rcon.dm b/code/modules/modular_computers/file_system/programs/engineering/rcon.dm index 54a3aa6213a..764093378b8 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/rcon.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/rcon.dm @@ -14,7 +14,6 @@ color = LIGHT_COLOR_YELLOW tgui_id = "RCON" tgui_theme = "hephaestus" - ui_auto_update = FALSE /datum/computer_file/program/rcon_console/New() ..() diff --git a/code/modules/modular_computers/file_system/programs/security/camera.dm b/code/modules/modular_computers/file_system/programs/security/camera.dm index 4744ee06a01..ee2a08d1700 100644 --- a/code/modules/modular_computers/file_system/programs/security/camera.dm +++ b/code/modules/modular_computers/file_system/programs/security/camera.dm @@ -162,9 +162,10 @@ return FALSE set_current(C) - user.set_machine(ui_host()) + var/obj/host = ui_host() + if(host) + user.set_machine(host) user.reset_view(current_camera) - check_eye(user) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -172,6 +173,22 @@ return TRUE +/datum/computer_file/program/camera_monitor/check_eye(mob/user) + if(user.stat || user.blinded) + return -1 + if(!current_camera) + return 0 + + var/viewflag = current_camera.check_eye(user) + if(viewflag < 0) + reset_current() + return viewflag + +/datum/computer_file/program/camera_monitor/grants_equipment_vision(mob/user) + if(user.stat || user.blinded || !current_camera) + return FALSE + return current_camera.grants_equipment_vision(user) + /datum/computer_file/program/camera_monitor/proc/set_current(var/obj/structure/machinery/camera/C) if(current_camera == C) return @@ -192,44 +209,14 @@ L.tracking_cancelled() current_camera = null -/datum/computer_file/program/camera_monitor/check_eye(var/mob/user as mob) - var/obj/item/modular_computer/MC = user.machine - if(istype(MC) && ui_host() == MC) - if(!MC.working || user.blinded || user.stat) - user.unset_machine() - return -1 - if(!current_camera) - return 0 - var/viewflag = current_camera.check_eye(user) - if ( viewflag < 0 ) //camera doesn't work - reset_current() - return viewflag - -/datum/computer_file/program/camera_monitor/grants_equipment_vision(mob/user) - var/obj/item/modular_computer/MC = user.machine - if(istype(MC) && ui_host() == MC) - if(!MC.working || user.blinded || user.stat) - return FALSE - if(!current_camera) - return FALSE - var/viewflag = current_camera.check_eye(user) - if (viewflag < 0) //camera doesn't work - return FALSE - return TRUE - // ERT Variant of the program /datum/computer_file/program/camera_monitor/ert filename = "ntcammon" filedesc = "Advanced Camera Monitoring" extended_desc = "This program allows remote access to station's camera system. Some camera networks may have additional access requirements. This version has an integrated database with additional encrypted keys." size = 14 - nanomodule_path = /datum/nano_module/camera_monitor/ert available_on_ntnet = FALSE -/datum/nano_module/camera_monitor/ert - name = "Advanced Camera Monitoring Program" - available_to_ai = FALSE - // The ERT variant has access to ERT and crescent cams, but still checks for accesses. ERT members should be able to use it. /datum/computer_file/program/camera_monitor/ert/modify_networks_list(var/list/networks) ..() @@ -242,13 +229,9 @@ filedesc = "Journalism Camera Monitoring" extended_desc = "This program allows remote access to station's camera system. Some camera networks may have additional access requirements. This version has has a connection to news networks." size = 2 - nanomodule_path = /datum/nano_module/camera_monitor/news required_access_download = null usage_flags = PROGRAM_ALL -/datum/nano_module/camera_monitor/news - name = "Journalism Camera Monitoring Program" - /datum/computer_file/program/camera_monitor/news/modify_networks_list(var/list/networks) networks = list() networks.Add(list(list("tag" = NETWORK_NEWS, "has_access" = 1))) diff --git a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm index c7d137bcd98..2def9c74337 100644 --- a/code/modules/modular_computers/file_system/programs/security/penalmechs.dm +++ b/code/modules/modular_computers/file_system/programs/security/penalmechs.dm @@ -128,7 +128,6 @@ set_current(C) user.machine = ui_host() user.reset_view(current_camera) - check_eye(user) return TRUE /datum/computer_file/program/penal_mechs/proc/set_current(var/obj/structure/machinery/camera/C) @@ -150,11 +149,3 @@ if(istype(L)) L.tracking_cancelled() current_camera = null - -/datum/computer_file/program/penal_mechs/check_eye(var/mob/user) - if(!current_camera) - return FALSE - var/viewflag = current_camera.check_eye(user) - if(viewflag < 0) //camera doesn't work - reset_current() - return viewflag diff --git a/code/modules/modular_computers/file_system/programs/system/file_browser.dm b/code/modules/modular_computers/file_system/programs/system/file_browser.dm index 336156123ec..0d993f0e4a4 100644 --- a/code/modules/modular_computers/file_system/programs/system/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/system/file_browser.dm @@ -12,6 +12,7 @@ undeletable = TRUE tgui_id = "FileManager" var/open_file + var/open_file_is_usb = FALSE var/error /datum/computer_file/program/filemanager/ui_data(mob/user) @@ -27,7 +28,11 @@ if(!computer || !computer.hard_drive) data["error"] = "I/O ERROR: Unable to access hard drive." else - HDD = computer.hard_drive + HDD = open_file_is_usb ? computer.portable_drive : computer.hard_drive + data["file_is_usb"] = open_file_is_usb + if(!HDD) + data["error"] = "I/O ERROR: Unable to open file." + return data file = HDD.find_file_by_name(open_file) script = file if(!istype(file)) @@ -45,6 +50,7 @@ else data["scriptdata"] = null data["filedata"] = null + data["file_is_usb"] = FALSE data["filename"] = null HDD = computer.hard_drive RHDD = computer.portable_drive @@ -85,10 +91,23 @@ return if(F.can_access_file(usr)) open_file = params["PRG_openfile"] + open_file_is_usb = FALSE + + if("PRG_usbopenfile") + . = TRUE + var/obj/item/computer_hardware/hard_drive/RHDD = computer.portable_drive + if(!RHDD) + return + var/datum/computer_file/F = RHDD.find_file_by_name(params["PRG_usbopenfile"]) + if(!F) + return + if(F.can_access_file(usr)) + open_file = params["PRG_usbopenfile"] + open_file_is_usb = TRUE if("PRG_newtextfile") . = TRUE - var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename")) + var/newname = sanitize_filename(tgui_input_text(usr, "Enter file name or leave blank to cancel:", "File rename")) if(!newname) return TRUE var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive @@ -97,7 +116,9 @@ var/datum/computer_file/data/F = new/datum/computer_file/data() F.filename = newname F.filetype = "TXT" - HDD.store_file(F) + if(!HDD.store_file(F)) + qdel(F) + error = "I/O ERROR: Unable to create file. The hard drive may be full, read-only, or contain a conflicting file." if("PRG_deletefile") . = TRUE @@ -122,6 +143,7 @@ if("PRG_closefile") . = TRUE open_file = null + open_file_is_usb = FALSE error = null if("PRG_clone") @@ -132,8 +154,13 @@ var/datum/computer_file/F = HDD.find_file_by_name(params["PRG_clone"]) if(!F || !istype(F)) return TRUE + if(istype(F, /datum/computer_file/program)) + error = "I/O ERROR: Executable programs cannot be cloned from File Manager." + return TRUE var/datum/computer_file/C = F.clone(1) - HDD.store_file(C) + if(!HDD.store_file(C)) + qdel(C) + error = "I/O ERROR: Unable to clone file. The hard drive may be full, read-only, or contain a conflicting file." if("PRG_rename") . = TRUE @@ -143,7 +170,7 @@ var/datum/computer_file/file = HDD.find_file_by_name(params["PRG_rename"]) if(!file || !istype(file)) return TRUE - var/newname = sanitize(input(usr, "Enter new file name:", "File rename", file.filename)) + var/newname = sanitize_filename(tgui_input_text(usr, "Enter new file name or leave blank to cancel:", "File rename", file.filename)) if(file && newname) file.filename = newname @@ -163,7 +190,7 @@ var/oldtext = html_decode(F.stored_data) oldtext = replacetext(oldtext, "\[editorbr\]", "\n") - var/newtext = sanitize(replacetext(input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[editorbr\]"), MAX_TEXTFILE_LENGTH) + var/newtext = sanitize_filename(replacetext(tgui_input_text(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext), "\n", "\[editorbr\]"), MAX_TEXTFILE_LENGTH) if(!newtext) return @@ -185,10 +212,10 @@ return TRUE var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive if(!HDD) - return TRUE + return FALSE if(!computer.nano_printer) error = "Missing Hardware: Your computer does not have required hardware to complete this operation." - return TRUE + return FALSE var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) var/datum/computer_file/script/S = F if(!F) @@ -196,21 +223,21 @@ if(istype(F)) if(!computer.nano_printer.print_text(F.stored_data)) error = "Hardware error: Printer was unable to print the file. It may be out of paper." - return TRUE + return FALSE else if(istype(S)) if(!computer.nano_printer.print_text(S.code)) error = "Hardware error: Printer was unable to print the file. It may be out of paper." - return TRUE + return FALSE if("PRG_copytousb") . = TRUE var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive if(!HDD || !RHDD) - return TRUE + return FALSE var/datum/computer_file/F = HDD.find_file_by_name(params["PRG_copytousb"]) if(!F || !istype(F)) - return TRUE + return FALSE var/is_usr_tech_support = FALSE if(ishuman(usr)) var/mob/living/carbon/human/H = usr @@ -270,7 +297,7 @@ return if(F.password) return - F.password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File")) + F.password = sanitize_filename(tgui_input_text(usr, "Enter an encryption key:", "Encrypt File")) if("PRG_decrypt") . = TRUE diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 7545f3b0fba..d548bbc22e3 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -782,9 +782,6 @@ /mob/fall_get_specs(levels_fallen) return list(mob_size, throw_range) -/mob/living - var/atom/movable/z_observer/z_eye - /atom/movable/z_observer name = "" simulated = FALSE diff --git a/code/modules/nano/modules/nano_module.dm b/code/modules/nano/modules/nano_module.dm deleted file mode 100644 index 9cf703ec89c..00000000000 --- a/code/modules/nano/modules/nano_module.dm +++ /dev/null @@ -1,63 +0,0 @@ -/datum/nano_module - var/name - var/datum/host - var/available_to_ai = TRUE - var/datum/topic_manager/topic_manager - -/datum/nano_module/New(var/datum/host, var/topic_manager) - ..() - src.host = host - src.topic_manager = topic_manager - -/datum/nano_module/Destroy() - host = null - topic_manager = null - return ..() - -/datum/nano_module/ui_host() - return host ? host.ui_host() : src - -/datum/nano_module/proc/can_still_topic(var/datum/ui_state/state = GLOB.default_state) - return CanUseTopic(usr, state) == STATUS_INTERACTIVE - -/datum/nano_module/proc/check_eye(var/mob/user) - return -1 - -/datum/nano_module/proc/grants_equipment_vision(var/mob/user) - return FALSE - -/datum/nano_module/proc/check_access(var/mob/user, var/access) - if(!access) - return 1 - - if(!istype(user)) - return 0 - - var/obj/item/card/id/I = user.GetIdCard() - if(!I) - return 0 - - if(access in I.access) - return 1 - - return 0 - -/datum/nano_module/Topic(href, href_list) - if(topic_manager && topic_manager.Topic(href, href_list)) - return TRUE - . = ..() - -/datum/nano_module/nano_host() - return host ? host : src - -/datum/nano_module/proc/get_host_z() - return GET_Z(nano_host()) - -/datum/proc/initial_data() - return list() - -/datum/proc/update_layout() - return FALSE - -/datum/proc/nano_host() - return src diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm deleted file mode 100644 index 23987d4af75..00000000000 --- a/code/modules/nano/nanoexternal.dm +++ /dev/null @@ -1,40 +0,0 @@ -// This file contains all Nano procs/definitions for external classes/objects - -/** - * Called when a Nano UI window is closed - * This is how Nano handles closed windows - * It must be a verb so that it can be called using winset - */ -/client/verb/nanoclose(var/uiref as text) - set hidden = 1 // hide this verb from the user's panel - set name = "nanoclose" - - var/datum/nanoui/ui = locate(uiref) - - if (istype(ui)) - ui.close() - - if(ui.ref) - var/href = "close=1" - src.Topic(href, params2list(href), ui.ref) // this will direct to the atom's Topic() proc via client.Topic() - else if (ui.on_close_logic) - // no atomref specified (or not found) - // so just reset the user mob's machine var - if(src && src.mob) - src.mob.unset_machine() - -/** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable - * - * @param user /mob The mob who is interacting with this ui - * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") - * @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui - * @param force_open boolean Force the UI to (re)open, even if it's already open - */ -/datum/proc/nanoui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/nanoui/master_ui = null, var/datum/ui_state/state = GLOB.default_state) - return - -// Used by the Nano UI Manager (/datum/SSnanoui) to track UIs opened by this mob -/mob/var/list/open_nanouis = list() diff --git a/code/modules/nano/nanomapgen.dm b/code/modules/nano/nanomapgen.dm deleted file mode 100644 index 90088c1d624..00000000000 --- a/code/modules/nano/nanomapgen.dm +++ /dev/null @@ -1,90 +0,0 @@ -// This file is a modified version of https://raw2.github.com/Baystation12/OldCode-BS12/master/code/TakePicture.dm - -#define NANOMAP_ICON_SIZE 4 -#define NANOMAP_MAX_ICON_DIMENSION 1024 - -#define NANOMAP_TILES_PER_IMAGE (NANOMAP_MAX_ICON_DIMENSION / NANOMAP_ICON_SIZE) - -#define NANOMAP_TERMINALERR 5 -#define NANOMAP_INPROGRESS 2 -#define NANOMAP_BADOUTPUT 2 -#define NANOMAP_SUCCESS 1 -#define NANOMAP_WATCHDOGSUCCESS 4 -#define NANOMAP_WATCHDOGTERMINATE 3 - - -//Call these procs to dump your world to a series of image files (!!) -//NOTE: Does not explicitly support non 32x32 icons or stuff with large pixel_* values, so don't blame me if it doesn't work perfectly - -/client/proc/nanomapgen_DumpImage() - set name = "Generate NanoUI Map" - set category = "Server" - - if(holder) - nanomapgen_DumpTile(1, 1, text2num(input(usr,"Enter the Z level to generate"))) - -/client/proc/nanomapgen_DumpTile(var/startX = 1, var/startY = 1, var/currentZ = 1, var/endX = -1, var/endY = -1) - - if (endX < 0 || endX > world.maxx) - endX = world.maxx - - if (endY < 0 || endY > world.maxy) - endY = world.maxy - - if (currentZ < 0 || currentZ > world.maxz) - to_chat(usr, "NanoMapGen: ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]") - - sleep(3) - return NANOMAP_TERMINALERR - - if (startX > endX) - to_chat(usr, "NanoMapGen: ERROR: startX ([startX]) cannot be greater than endX ([endX])") - - sleep(3) - return NANOMAP_TERMINALERR - - if (startY > endX) - to_chat(usr, "NanoMapGen: ERROR: startY ([startY]) cannot be greater than endY ([endY])") - sleep(3) - return NANOMAP_TERMINALERR - - var/icon/Tile = icon(file("nano/mapbase1024.png")) - if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION) - log_world("ERROR: NanoMapGen: ERROR: BASE IMAGE DIMENSIONS ARE NOT [NANOMAP_MAX_ICON_DIMENSION]x[NANOMAP_MAX_ICON_DIMENSION]") - sleep(3) - return NANOMAP_TERMINALERR - - LOG_DEBUG("NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") - to_chat(usr, "NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") - - var/count = 0; - for(var/WorldX = startX, WorldX <= endX, WorldX++) - for(var/WorldY = startY, WorldY <= endY, WorldY++) - - var/atom/Turf = locate(WorldX, WorldY, currentZ) - - var/icon/TurfIcon = new(Turf.icon, Turf.icon_state, dir = Turf.dir) - TurfIcon.Scale(NANOMAP_ICON_SIZE, NANOMAP_ICON_SIZE) - - Tile.Blend(TurfIcon, ICON_OVERLAY, ((WorldX - 1) * NANOMAP_ICON_SIZE), ((WorldY - 1) * NANOMAP_ICON_SIZE)) - - count++ - - if (count % 8000 == 0) - LOG_DEBUG("NanoMapGen: [count] tiles done") - sleep(1) - - var/mapFilename = "new_Aurora[currentZ]" - - LOG_DEBUG("NanoMapGen: sending [mapFilename] to client") - - usr << browse(Tile, "window=picture;file=[mapFilename];display=0") - - LOG_DEBUG("NanoMapGen: Done.") - - to_chat(usr, "NanoMapGen: Done. File [mapFilename] uploaded to your cache.") - - if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION) - return NANOMAP_BADOUTPUT - - return NANOMAP_SUCCESS diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm deleted file mode 100644 index c441af104f2..00000000000 --- a/code/modules/nano/nanoui.dm +++ /dev/null @@ -1,537 +0,0 @@ -/********************************************************** -NANO UI FRAMEWORK - -nanoui class (or whatever Byond calls classes) - -nanoui is used to open and update nano browser uis -**********************************************************/ - -/datum/nanoui - // the user who opened this ui - var/mob/user - // the object this ui "belongs" to - var/datum/src_object - // the title of this ui - var/title - // the key of this ui, this is to allow multiple (different) uis for each src_object - var/ui_key - // window_id is used as the window name/identifier for browse and onclose - var/window_id - // the browser window width - var/width = 0 - // the browser window height - var/height = 0 - // whether to use extra logic when window closes - var/on_close_logic = 1 - // an extra ref to use when the window is closed, usually null - var/atom/ref = null - // options for modifying window behaviour - var/window_options = "focus=0;can_close=1;can_minimize=1;can_maximize=0;can_resize=1;titlebar=1;" // window option is set using window_id - // the list of stylesheets to apply to this ui - var/list/stylesheets = list() - // the list of javascript scripts to use for this ui - var/list/scripts = list() - // a list of templates which can be used with this ui - var/templates[0] - // the layout key for this ui (this is used on the frontend, leave it as "default" unless you know what you're doing) - var/layout_key = "default" - // this sets whether to re-render the ui layout with each update (default 0, turning on will break the map ui if it's in use) - var/auto_update_layout = 0 - // this sets whether to re-render the ui content with each update (default 1) - var/auto_update_content = 1 - // the default state to use for this ui (this is used on the frontend, leave it as "default" unless you know what you're doing) - var/state_key = "default" - // show the map ui, this is used by the default layout - var/show_map = 0 - // the map z level to display - var/map_z_level = 3 - // initial data, containing the full data structure, must be sent to the ui (the data structure cannot be extended later on) - var/list/initial_data[0] - // set to 1 to update the ui automatically every master_controller tick - var/is_auto_updating = 0 - // the current status/visibility of the ui - var/status = STATUS_INTERACTIVE - - // Relationship between a master interface and its children. Used in update_status - var/datum/nanoui/master_ui - var/list/datum/nanoui/children = list() - var/datum/ui_state/state = null - -/** - * Create a new nanoui instance. - * - * @param nuser /mob The mob who has opened/owns this ui - * @param nsrc_object /obj|/mob The obj or mob which this ui belongs to - * @param nui_key string A string key to use for this ui. Allows for multiple unique uis on one src_oject - * @param ntemplate string The filename of the template file from /nano/templates (e.g. "my_template.tmpl") - * @param ntitle string The title of this ui - * @param nwidth int the width of the ui window - * @param nheight int the height of the ui window - * @param nref /atom A custom ref to use if "on_close_logic" is set to 1 - * - * @return /nanoui new nanoui object - */ -/datum/nanoui/New(nuser, nsrc_object, nui_key, ntemplate_filename, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null, var/datum/nanoui/master_ui = null, var/datum/ui_state/state = GLOB.default_state) - user = nuser - src_object = nsrc_object - ui_key = nui_key - window_id = "[ui_key][REF(src_object)]" - - src.master_ui = master_ui - if(master_ui) - master_ui.children += src - src.state = state - - // add the passed template filename as the "main" template, this is required - add_template("main", ntemplate_filename) - - if (ntitle) - title = sanitize(ntitle) - if (nwidth) - width = nwidth - if (nheight) - height = nheight - if (nref) - ref = nref - - add_common_assets() - - var/datum/asset/assets = get_asset_datum(/datum/asset/nanoui) - assets.send(user, assets) - - - -/** - * Use this proc to add assets which are common to (and required by) all nano uis - * - * @return nothing - */ -/datum/nanoui/proc/add_common_assets() - add_script("https://cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js") - add_script("https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.min.js") - add_script("libraries.min.js") // A JS file comprising of jQuery, doT.js and jQuery Timer libraries (compressed together) - add_script("nano_utility.js") // The NanoUtility JS, this is used to store utility functions. - add_script("nano_template.js") // The NanoTemplate JS, this is used to render templates. - add_script("nano_state_manager.js") // The NanoStateManager JS, it handles updates from the server and passes data to the current state - add_script("nano_state.js") // The NanoState JS, this is the base state which all states must inherit from - add_script("nano_state_default.js") // The NanoStateDefault JS, this is the "default" state (used by all UIs by default), which inherits from NanoState - add_script("nano_base_callbacks.js") // The NanoBaseCallbacks JS, this is used to set up (before and after update) callbacks which are common to all UIs - add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all UIs - add_stylesheet("shared.css") // this CSS sheet is common to all UIs - add_stylesheet("icons.css") // this CSS sheet is common to all UIs - -/** - * Set the current status (also known as visibility) of this ui. - * - * @param state int The status to set, see the defines at the top of this file - * @param push_update int (bool) Push an update to the ui to update it's status (an update is always sent if the status has changed to red (0)) - * - * @return nothing - */ -/datum/nanoui/proc/set_status(state, push_update) - if (state != status) // Only update if it is different - if (status == STATUS_DISABLED) - status = state - if (push_update) - update() - else - status = state - if (push_update || status == 0) - push_data(null, 1) // Update the UI, force the update in case the status is 0, data is null so that previous data is used - -/** - * Update the status (visibility) of this ui based on the user's status - * - * @param push_update int (bool) Push an update to the ui to update it's status. This is set to 0/false if an update is going to be pushed anyway (to avoid unnessary updates) - * - * @return nothing - */ -/datum/nanoui/proc/update_status(var/push_update = 0) - var/obj/host = src_object.ui_host() - var/new_status = host.CanUseTopic(user, state) - if(master_ui) - new_status = min(new_status, master_ui.status) - - set_status(new_status, push_update) - if(new_status == STATUS_CLOSE) - close() - -/** - * Set the ui to auto update (every master_controller tick) - * - * @param state int (bool) Set auto update to 1 or 0 (true/false) - * - * @return nothing - */ -/datum/nanoui/proc/set_auto_update(nstate = 1) - is_auto_updating = nstate - -/** - * Set the initial data for the ui. This is vital as the data structure set here cannot be changed when pushing new updates. - * - * @param data /list The list of data for this ui - * - * @return nothing - */ -/datum/nanoui/proc/set_initial_data(list/data) - initial_data = data - -/** - * Get config data to sent to the ui. - * - * @return /list config data - */ -/datum/nanoui/proc/get_config_data() - var/name = "[src_object]" - name = sanitize(name) - var/list/config_data = list( - "title" = title, - "srcObject" = list("name" = name), - "stateKey" = state_key, - "status" = status, - "autoUpdateLayout" = auto_update_layout, - "autoUpdateContent" = auto_update_content, - "showMap" = show_map, - "mapName" = "Aurora", - "mapZLevel" = map_z_level, - "mapZLevels" = SSatlas.current_map.map_levels, - "user" = list("name" = user.name) - ) - return config_data - -/** - * Get data to sent to the ui. - * - * @param data /list The list of general data for this ui (can be null to use previous data sent) - * - * @return /list data to send to the ui - */ -/datum/nanoui/proc/get_send_data(var/list/data) - var/list/config_data = get_config_data() - - var/list/send_data = list("config" = config_data) - - if (!isnull(data)) - send_data["data"] = data - - return send_data - -/** - * Set the browser window options for this ui - * - * @param nwindow_options string The new window options - * - * @return nothing - */ -/datum/nanoui/proc/set_window_options(nwindow_options) - window_options = nwindow_options - -/** - * Add a CSS stylesheet to this UI - * These must be added before the UI has been opened, adding after that will have no effect - * - * @param file string The name of the CSS file from /nano/css (e.g. "my_style.css") - * - * @return nothing - */ -/datum/nanoui/proc/add_stylesheet(file) - stylesheets.Add(file) - -/** - * Add a JavsScript script to this UI - * These must be added before the UI has been opened, adding after that will have no effect - * - * @param file string The name of the JavaScript file from /nano/js (e.g. "my_script.js") - * - * @return nothing - */ -/datum/nanoui/proc/add_script(file) - scripts.Add(file) - -/** - * Add a template for this UI - * Templates are combined with the data sent to the UI to create the rendered view - * These must be added before the UI has been opened, adding after that will have no effect - * - * @param key string The key which is used to reference this template in the frontend - * @param filename string The name of the template file from /nano/templates (e.g. "my_template.tmpl") - * - * @return nothing - */ -/datum/nanoui/proc/add_template(key, filename) - templates[key] = filename - -/** - * Set the layout key for use in the frontend Javascript - * The layout key is the basic layout key for the page - * Two files are loaded on the client based on the layout key varable: - * -> a template in /nano/templates with the filename "layout_.tmpl - * -> a CSS stylesheet in /nano/css with the filename "layout_.css - * - * @param nlayout string The layout key to use - * - * @return nothing - */ -/datum/nanoui/proc/set_layout_key(nlayout_key) - layout_key = lowertext(nlayout_key) - -/** - * Set the ui to update the layout (re-render it) on each update, turning this on will break the map ui (if it's being used) - * - * @param state int (bool) Set update to 1 or 0 (true/false) (default 0) - * - * @return nothing - */ -/datum/nanoui/proc/set_auto_update_layout(nstate) - auto_update_layout = nstate - -/** - * Set the ui to update the main content (re-render it) on each update - * - * @param state int (bool) Set update to 1 or 0 (true/false) (default 1) - * - * @return nothing - */ -/datum/nanoui/proc/set_auto_update_content(nstate) - auto_update_content = nstate - -/** - * Set the state key for use in the frontend Javascript - * - * @param nstate_key string The key of the state to use - * - * @return nothing - */ -/datum/nanoui/proc/set_state_key(nstate_key) - state_key = nstate_key - -/** - * Toggle showing the map ui - * - * @param nstate_key boolean 1 to show map, 0 to hide (default is 0) - * - * @return nothing - */ -/datum/nanoui/proc/set_show_map(nstate) - show_map = nstate - -/** - * Toggle showing the map ui - * - * @param nstate_key boolean 1 to show map, 0 to hide (default is 0) - * - * @return nothing - */ -/datum/nanoui/proc/set_map_z_level(nz) - map_z_level = nz - -/** - * Set whether or not to use the "old" on close logic (mainly unset_machine()) - * - * @param state int (bool) Set on_close_logic to 1 or 0 (true/false) - * - * @return nothing - */ -/datum/nanoui/proc/use_on_close_logic(state) - on_close_logic = state - -/** - * Return the HTML for this UI - * - * @return string HTML for the UI - */ -/datum/nanoui/proc/get_html() - - // before the UI opens, add the layout files based on the layout key - add_stylesheet("layout_[layout_key].css") - add_template("layout", "layout_[layout_key].tmpl") - - var/head_content = "" - - for (var/filename in scripts) - head_content += " " - - for (var/filename in stylesheets) - head_content += " " - - var/template_data_json = "{}" // An empty JSON object - if (templates.len > 0) - template_data_json = strip_improper(json_encode(templates)) - - var/list/send_data = get_send_data(initial_data) - var/initial_data_json = replacetext(replacetext(json_encode(send_data), """, "&#34;"), "'", "'") - initial_data_json = strip_improper(initial_data_json); - - var/url_parameters_json = json_encode(list("src" = "[REF(src)]")) - - return {" - - - - - - [head_content] - - -
-
- - - - "} - -/** - * Open this UI - * - * @return nothing - */ -/datum/nanoui/proc/open() - if(!user.client) - return - - // An attempted fix to UIs sometimes locking up spamming runtime errors due to src_object being null for whatever reason. - // This hard-deletes the UI, preventing the device that uses the UI from being locked up permanently. - if(!src_object) - del(src) - - var/window_size = "" - if (width && height) - window_size = "size=[width]x[height];" - update_status(0) - if(status == STATUS_CLOSE) - return - - user << browse(get_html(), "window=[window_id];[window_size][window_options]") - winset(user, "mapwindow.map", "focus=true") // return keyboard focus to map - on_close_winset() - //onclose(user, window_id) - SSnanoui.ui_opened(src) - -/** - * Reinitialise this UI, potentially with a different template and/or initial data - * - * @return nothing - */ -/datum/nanoui/proc/reinitialise(template, new_initial_data) - if(template) - add_template("main", template) - if(new_initial_data) - set_initial_data(new_initial_data) - open() - -/** - * Close this UI - * - * @return nothing - */ -/datum/nanoui/proc/close() - is_auto_updating = 0 - SSnanoui.ui_closed(src) - user << browse(null, "window=[window_id]") - for(var/datum/nanoui/child in children) - child.close() - children.Cut() - state = null - master_ui = null - - if(istype(user)) - user.unset_machine() - -/** - * Set the UI window to call the nanoclose verb when the window is closed - * This allows Nano to handle closed windows - * - * @return nothing - */ -/datum/nanoui/proc/on_close_winset() - if(!user.client) - return - var/params = "[REF(src)]" - - winset(user, window_id, "on-close=\"nanoclose [params]\"") - -/** - * Push data to an already open UI window - * - * @return nothing - */ -/datum/nanoui/proc/push_data(data, force_push = 0) - update_status(0) - if (status == STATUS_DISABLED && !force_push) - return // Cannot update UI, no visibility - - var/list/send_data = get_send_data(data) - - //to_chat(user, list2json(data) // used for debugging) - send_output(user, list2params(list(json_encode(send_data))),"[window_id].browser:receiveUpdateData") - -/** - * This Topic() proc is called whenever a user clicks on a link within a Nano UI - * If the UI status is currently STATUS_INTERACTIVE then call the src_object Topic() - * If the src_object Topic() returns 1 (true) then update all UIs attached to src_object - * - * @return nothing - */ -/datum/nanoui/Topic(href, href_list) - update_status(0) // update the status - if (status != STATUS_INTERACTIVE || user != usr) // If UI is not interactive or usr calling Topic is not the UI user - return - - // This is used to toggle the nano map ui - var/map_update = 0 - if(href_list["showMap"]) - set_show_map(text2num(href_list["showMap"])) - map_update = 1 - - if(href_list["mapZLevel"]) - var/map_z = (text2num(href_list["mapZLevel"])) - if(map_z in SSatlas.current_map.map_levels) - set_map_z_level(map_z) - map_update = 1 - else - return - - if ((src_object && src_object.Topic(href, href_list, state)) || map_update) - SSnanoui.update_uis(src_object) // update all UIs attached to src_object - -/** - * Process this UI, updating the entire UI or just the status (aka visibility) - * This process proc is called by the master_controller - * - * @param update string For this UI to update - * - * @return nothing - */ -/datum/nanoui/process(update = 0) - if (QDELETED(src_object) || QDELETED(user)) - close() - return - - if (status && (update || is_auto_updating)) - update() // Update the UI (update_status() is called whenever a UI is updated) - else - update_status(1) // Not updating UI, so lets check here if status has changed - -/** - * Update the UI - * - * @return nothing - */ -/datum/nanoui/proc/update(var/force_open = 0) - src_object.ui_interact(user, ui_key, src, force_open, master_ui, state) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index ef21e37f1fa..a6e31aeb2c0 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -2,8 +2,6 @@ BLOOD SYSTEM ****************************************************/ -/mob/living/carbon/human/var/datum/reagents/vessel //Container for blood and BLOOD ONLY. Do not transfer other chems here. - //Initializes blood vessels /mob/living/carbon/human/proc/make_blood() if(vessel) diff --git a/code/modules/organs/internal/species/machine/_generic.dm b/code/modules/organs/internal/species/machine/_generic.dm index 00e5c71a49e..bb6e4df0934 100644 --- a/code/modules/organs/internal/species/machine/_generic.dm +++ b/code/modules/organs/internal/species/machine/_generic.dm @@ -62,6 +62,11 @@ electronics.heal_damage(electronics.max_integrity) integrity_event_cooldown = initial(integrity_event_cooldown) +/obj/item/organ/internal/machine/heal_damage(amount) + . = ..() + if(initial(diagnostics_suite_visible) && !diagnostics_suite_visible) + diagnostics_suite_visible = TRUE + /obj/item/organ/internal/machine/process(seconds_per_tick) ..() if(!owner) @@ -107,11 +112,17 @@ /obj/item/organ/internal/machine/emp_act(severity) . = ..() + var/damage_taken switch(severity) if(EMP_HEAVY) - take_internal_damage(4 * emp_coeff) + damage_taken = 15 * emp_coeff + take_internal_damage(damage_taken) if(EMP_LIGHT) - take_internal_damage(2 * emp_coeff) + damage_taken = 10 * emp_coeff + take_internal_damage(damage_taken) + + if(damage_taken) + SEND_SIGNAL(owner, COMSIG_DAMAGE_TO_ENDOSKELETON, damage_taken) /** * Called when prefs are synced to the organ to set the proper synthetic organ preset. Turns the pref into a preset singleton. diff --git a/code/modules/organs/internal/species/machine/access_port.dm b/code/modules/organs/internal/species/machine/access_port.dm index 62001dfa307..303da885afe 100644 --- a/code/modules/organs/internal/species/machine/access_port.dm +++ b/code/modules/organs/internal/species/machine/access_port.dm @@ -77,11 +77,13 @@ SIGNAL_HANDLER if(internal_port) crash_with("Insert_item with [jack] on access port called with [internal_port] of [owner] already present!") + return FALSE internal_port = jack jack.forceMove(src) RegisterSignal(internal_port, COMSIG_QDELETING, PROC_REF(clear_port)) to_chat(owner, SPAN_MACHINE_WARNING("Internal firewall notice: [internal_port] inserted into [src].")) + return TRUE /** * This proc is called whenever the access cable is, for some reason, qdeleted (like with an explosion). @@ -111,9 +113,16 @@ /obj/item/organ/internal/machine/access_port/insert_cable(obj/item/access_cable/cable, mob/user) . = ..() - insert_item(cable) + if (!insert_item(cable)) + return + cable.create_cable(owner) +/obj/item/organ/internal/machine/access_port/remove_cable(obj/item/access_cable/cable) + . = ..() + if(internal_port == cable) + clear_port() + /obj/item/organ/internal/machine/access_port/cable_interact(obj/item/access_cable/cable, mob/user) var/obj/item/organ/internal/machine/internal_diagnostics/diagnostics_unit = owner.internal_organs_by_name[BP_DIAGNOSTICS_SUITE] if(!diagnostics_unit) @@ -277,6 +286,15 @@ user.visible_message(SPAN_WARNING("[user] tries to jack \the [src] into [human]'s access port...")) if(!do_mob(user, human, 2 SECONDS)) return + // Re-check after the delay: port state may have changed during consent/wait window + var/obj/item/organ/internal/machine/access_port/fresh_port = human.internal_organs_by_name[BP_ACCESS_PORT] + if(!fresh_port) + to_chat(user, SPAN_WARNING("[human] no longer has an access port!")) + return + if(fresh_port.internal_port) + to_chat(user, SPAN_WARNING("The access port is now occupied by [fresh_port.internal_port]!")) + return + access_port = fresh_port user.visible_message(SPAN_WARNING("[user] jacks \the [src] into [human]'s access port!")) else diff --git a/code/modules/organs/internal/species/machine/posibrain.dm b/code/modules/organs/internal/species/machine/posibrain.dm index 58d4b6897be..bf1e8f715a0 100644 --- a/code/modules/organs/internal/species/machine/posibrain.dm +++ b/code/modules/organs/internal/species/machine/posibrain.dm @@ -7,7 +7,6 @@ parent_organ = BP_HEAD vital = TRUE robotic_sprite = FALSE - diagnostics_suite_visible = FALSE emp_coeff = 0.5 @@ -15,6 +14,9 @@ relative_size = 85 + maxhealth = OBJECT_HEALTH_MEDIUM + should_use_health = TRUE + /// The type of 'robotic brain'. Must be a subtype of /obj/item/mmi/digital. var/robotic_brain_type = /obj/item/mmi/digital/posibrain /// The stored MMI object. @@ -61,6 +63,13 @@ QDEL_NULL(sizzle) return ..() +/obj/item/organ/internal/machine/posibrain/on_death(damage, damage_flags, damage_type, armor_penetration, obj/weapon) + playsound(src, SFX_BREAK_GLASS, 100, 1) + visible_message(SPAN_DANGER("\The [src] shatters spectacularly into a million pieces!")) + to_chat(owner, SPAN_DANGER("Your vision goes dark as your posibrain is destroyed, and your consciousness ceases to be.")) + new /obj/effect/decal/cleanable/blood/gibs/robot(get_turf(src)) + . = ..() + /obj/item/organ/internal/machine/posibrain/rejuvenate() . = ..() SEND_SIGNAL(owner, COMSIG_SYNTH_ENDOSKELETON_FULL_REPAIR) diff --git a/code/modules/organs/internal/species/machine/wireless_access.dm b/code/modules/organs/internal/species/machine/wireless_access.dm index 39ee7808597..373eab72814 100644 --- a/code/modules/organs/internal/species/machine/wireless_access.dm +++ b/code/modules/organs/internal/species/machine/wireless_access.dm @@ -75,6 +75,11 @@ else crash_with("Something terrible happened in synthetic internal PDA init! Loc: [loc]") +/obj/item/modular_computer/handheld/pda/synthetic_internal/GetID() + var/obj/item/organ/internal/machine/wireless_access/access_point = loc + if(access_point.owner) + return access_point.owner.GetIdCard() + /obj/item/modular_computer/handheld/pda/synthetic_internal/Destroy() if(access_point) access_point.internal_pda = null diff --git a/code/modules/organs/internal/species/tajara.dm b/code/modules/organs/internal/species/tajara.dm index 061fa190cab..48bc6617370 100644 --- a/code/modules/organs/internal/species/tajara.dm +++ b/code/modules/organs/internal/species/tajara.dm @@ -2,14 +2,16 @@ name = "light sensitive eyes" desc = "A pair of Tajaran eyes accustomed to the low light conditions of Adhomai." icon = 'icons/obj/organs/tajara_organs.dmi' - action_button_name = "Activate Low Light Vision" - default_action_type = /datum/action/item_action/organ/night_eyes + action_button_name = list("Activate Low Light Vision", "Extend vision") + default_action_type = list(/datum/action/item_action/organ/night_eyes, /datum/action/item_action/organ/extended_eyes) relative_size = 8 var/night_vision = FALSE var/datum/client_color/vision_color = /datum/client_color/monochrome var/datum/client_color/vision_mechanical_color = /datum/client_color/monochrome var/eye_emote = "'s eyes dilate!" var/allowed_model = PROSTHETIC_TESLA //what robotic model allows this eyes to use the night vision + var/cooldown = 30 + zoom_out_message = "'s eyes widens as they stop focusing ahead." /obj/item/organ/internal/eyes/night/Destroy() disable_night_vision() @@ -25,25 +27,49 @@ /obj/item/organ/internal/eyes/night/attack_self(var/mob/user) . = ..() + +/obj/item/organ/internal/eyes/night/proc/ability_check() if(owner.last_special > world.time) - return + return FALSE if(owner.stat || owner.paralysis || owner.stunned || owner.weakened) - return + return FALSE if(is_broken()) - return + return FALSE if(status & ORGAN_ROBOT) if(!robotic_check()) - return + return FALSE + owner.last_special = world.time + 20 + return TRUE + +/obj/item/organ/internal/eyes/night/proc/night_vision() + if(attack_self()) + return + if(!ability_check()) + return if(!night_vision) enable_night_vision() else disable_night_vision() - owner.last_special = world.time + 20 +/obj/item/organ/internal/eyes/night/proc/extended_vision() + if(attack_self()) + return + if(!ability_check()) + return + if(zoom) + owner.visible_message("[SPAN_BOLD("\The [owner]")]'s eyes widens as they stop focusing ahead.", range = 3) + else + owner.visible_message("[SPAN_BOLD("\The [owner]")]'s eyes begins to narrow as they focus on something in the distance.", range = 3) + if(!do_after(owner, 1.5 SECONDS)) + owner.visible_message("[SPAN_BOLD("\The [owner]")]'s eyes stop focusing.", range = 3) + return + owner.visible_message("[SPAN_BOLD("\The [owner]")]'s eyes narrows as their lenses shift to focus ahead.", range = 3) + + zoom(owner, 3, 7, FALSE, FALSE) /obj/item/organ/internal/eyes/night/proc/robotic_check(var/mob/user) if(robotize_type == allowed_model) @@ -89,7 +115,7 @@ show_message = FALSE break if(show_message && eye_emote) - owner.visible_message("[owner][eye_emote]") + owner.visible_message("[SPAN_BOLD("\The [owner]")][eye_emote]") night_vision = TRUE if(can_change_invisible()) diff --git a/code/modules/organs/internal/species/vaurca.dm b/code/modules/organs/internal/species/vaurca.dm index 5a2aa355f9f..aa38e35f771 100644 --- a/code/modules/organs/internal/species/vaurca.dm +++ b/code/modules/organs/internal/species/vaurca.dm @@ -3,6 +3,8 @@ desc = "A set of four vaurcaesian eyes, adapted to the low or no light tunnels of Sedantis." icon = 'icons/obj/organs/vaurca_organs.dmi' robotic_sprite = FALSE + action_button_name = list("Activate Low Light Vision") + default_action_type = list(/datum/action/item_action/organ/night_eyes) vision_color = /datum/client_color/vaurca vision_mechanical_color = /datum/client_color/monochrome eye_emote = "'s eyes gently shift." diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 1f8acb92216..bab91b6c150 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -505,7 +505,7 @@ add_pain(0.6 * burn + 0.4 * brute) if(owner) - SEND_SIGNAL(owner, COMSIG_EXTERNAL_ORGAN_DAMAGE, burn + brute) + SEND_SIGNAL(owner, COMSIG_DAMAGE_TO_ENDOSKELETON, burn + brute) //If there are still hurties to dispense if (spillover) @@ -594,13 +594,13 @@ if(W.w_class >= w_class && (dam_flags & DAMAGE_FLAG_EDGE)) edge_eligible = TRUE - if(!blunt_eligible && edge_eligible && (brute >= max_damage / (DROPLIMB_THRESHOLD_EDGE + maim_bonus_to_add))) + if(!blunt_eligible && edge_eligible && (brute >= max_damage / max((DROPLIMB_THRESHOLD_EDGE + maim_bonus_to_add), 0.1))) droplimb(0, DROPLIMB_EDGE) - else if(burn >= max_damage / ((dam_flags & DAMAGE_FLAG_LASER ? DROPLIMB_THRESHOLD_DESTROY_PROJECTILE : DROPLIMB_THRESHOLD_DESTROY) + maim_bonus_to_add)) + else if(burn >= max_damage / max((dam_flags & DAMAGE_FLAG_LASER ? DROPLIMB_THRESHOLD_DESTROY_PROJECTILE : DROPLIMB_THRESHOLD_DESTROY) + maim_bonus_to_add, 0.1)) droplimb(0, DROPLIMB_BURN) - else if(blunt_eligible && brute >= max_damage / ((dam_flags & DAMAGE_FLAG_BULLET ? DROPLIMB_THRESHOLD_DESTROY_PROJECTILE : DROPLIMB_THRESHOLD_DESTROY) + maim_bonus_to_add)) + else if(blunt_eligible && brute >= max_damage / max((dam_flags & DAMAGE_FLAG_BULLET ? DROPLIMB_THRESHOLD_DESTROY_PROJECTILE : DROPLIMB_THRESHOLD_DESTROY) + maim_bonus_to_add, 0.1)) droplimb(0, DROPLIMB_BLUNT) - else if(brute >= max_damage / (DROPLIMB_THRESHOLD_TEAROFF + maim_bonus_to_add)) + else if(brute >= max_damage / max((DROPLIMB_THRESHOLD_TEAROFF + maim_bonus_to_add), 0.1)) droplimb(0, DROPLIMB_EDGE) /obj/item/organ/external/heal_damage(brute, burn, internal = 0, robo_repair = 0) diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index e9171af43c5..135c4e9264f 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -3,9 +3,6 @@ animate(pain, alpha = target, time = 15, easing = ELASTIC_EASING) animate(pain, alpha = 0, time = 20) -/mob/var/last_pain_message = "" -/mob/var/next_pain_time = 0 - // message is the custom message to be displayed // power decides how much painkillers will stop the message // force means it ignores anti-spam timer diff --git a/code/modules/organs/subtypes/augment/augments/mind_blanker.dm b/code/modules/organs/subtypes/augment/augments/mind_blanker.dm index d431215c6fb..a6f2cff8e91 100644 --- a/code/modules/organs/subtypes/augment/augments/mind_blanker.dm +++ b/code/modules/organs/subtypes/augment/augments/mind_blanker.dm @@ -64,7 +64,7 @@ return to_chat(minister, SPAN_BAD("Why should you care how [ministree] feels?")) - *moodlet_value = 0 + *moodlet_value = *moodlet_value * 0.5 /obj/item/organ/internal/augment/bioaug/mind_blanker/proc/modify_ministry_receiving(ministree, minister, moodlet_value) SIGNAL_HANDLER @@ -72,7 +72,7 @@ return to_chat(ministree, SPAN_BAD("You feel nothing from [minister]'s words.")) - *moodlet_value = 0 + *moodlet_value = *moodlet_value * 0.5 /obj/item/organ/internal/augment/bioaug/mind_blanker/proc/modify_leadership_empathy(leader, moodlet_value) SIGNAL_HANDLER @@ -80,7 +80,7 @@ return to_chat(leader, SPAN_BAD("Why should you care about how others feel?")) - *moodlet_value = 0 + *moodlet_value = *moodlet_value * 0.5 /obj/item/organ/internal/augment/bioaug/mind_blanker_lethal name = "lethal mind blanker" diff --git a/code/modules/organs/subtypes/autakh.dm b/code/modules/organs/subtypes/autakh.dm index bbb66b5d8c8..afcf7616c9c 100644 --- a/code/modules/organs/subtypes/autakh.dm +++ b/code/modules/organs/subtypes/autakh.dm @@ -190,6 +190,7 @@ action_button_icon = "hunterseye" cooldown = 30 activable = TRUE + zoom_out_message = " eyes whirrs loudly as the zoom lenses retract." /obj/item/organ/internal/augment/farseer_eye/attack_self(var/mob/user) . = ..() diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm index ff4c59b0eae..f4b418495f3 100644 --- a/code/modules/organs/subtypes/vaurca.dm +++ b/code/modules/organs/subtypes/vaurca.dm @@ -399,17 +399,34 @@ ui_interact(user) -/obj/item/organ/internal/vaurca/preserve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/item/organ/internal/vaurca/preserve/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Tank", ui_x=400, ui_y=180) + ui.open() + +/obj/item/organ/internal/vaurca/preserve/ui_host(mob/user) + . = ..() + if(istype(loc,/obj/item/transfer_valve)) + return loc + +/obj/item/organ/internal/vaurca/preserve/ui_data(mob/user) var/mob/living/carbon/location = null + if(istype(loc, /obj/item/rig)) + if(istype(loc.loc, /mob/living/carbon)) + location = loc.loc + else if(istype(loc, /mob/living/carbon)) + location = loc + var/using_internal if(istype(location)) if(location.internal==src) using_internal = 1 - // this is the data which will be sent to the ui - var/data[0] - data["tankPressure"] = round(SAFE_XGM_PRESSURE(air_contents)) + var/list/data = list() + + data["tankPressure"] = round(XGM_PRESSURE(air_contents)) data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0) data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE) data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE) @@ -437,36 +454,13 @@ if(H.head && (H.head.item_flags & ITEM_FLAG_AIRTIGHT)) data["maskConnected"] = 1 - // update the ui if it exists, returns null if no ui is passed/found - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "tanks.tmpl", "Tank", 500, 300) - // when the ui is first opened this is the data it will use - ui.set_initial_data(data) - // open the new ui window - ui.open() - // auto update every Master Controller tick - ui.set_auto_update(1) + return data -/obj/item/organ/internal/vaurca/preserve/Topic(href, href_list) - ..() - if (usr.stat|| usr.restrained()) - return 0 - if (src.loc != usr) - return 0 - - if (href_list["dist_p"]) - if (href_list["dist_p"] == "reset") - src.distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE - else if (href_list["dist_p"] == "max") - src.distribute_pressure = TANK_MAX_RELEASE_PRESSURE - else - var/cp = text2num(href_list["dist_p"]) - src.distribute_pressure += cp - src.distribute_pressure = min(max(round(src.distribute_pressure), 0), TANK_MAX_RELEASE_PRESSURE) - if (href_list["stat"]) +/obj/item/organ/internal/vaurca/preserve/ui_act(action,params) + . = ..() + if(.) + return + if(action=="toggleReleaseValve") if(istype(loc,/mob/living/carbon)) var/mob/living/carbon/location = loc if(location.internal == src) @@ -476,7 +470,6 @@ if (location.internals) location.internals.icon_state = "internal0" else - var/can_open_valve if(location.wear_mask && (location.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT)) can_open_valve = 1 @@ -491,11 +484,12 @@ if (location.internals) location.internals.icon_state = "internal1" else - to_chat(usr, SPAN_NOTICE("You need something to connect to \the [src].")) - - src.add_fingerprint(usr) - return 1 - + to_chat(usr, SPAN_WARNING("You need something to connect to \the [src].")) + . = TRUE + update_icon() + if(action=="setReleasePressure") + distribute_pressure = min(max(round(text2num(params["release_pressure"])), 0), TANK_MAX_RELEASE_PRESSURE) + . = TRUE /obj/item/organ/internal/vaurca/preserve/remove_air(amount) return air_contents.remove(amount) diff --git a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm index b55b125dd2b..25c7efec515 100644 --- a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm +++ b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm @@ -66,8 +66,11 @@ /obj/item/ship_ammunition/attackby(obj/item/attacking_item, mob/user) if(attacking_item.force > 10 && (ammunition_flags & SHIP_AMMO_FLAG_VERY_FRAGILE)) - log_and_message_admins("[user] has caused the cookoff of [src] by attacking it with [attacking_item]!", user) - cookoff(FALSE) + if(istype(attacking_item, /obj/item/mecha_equipment/clamp)) + return ..() + else + log_and_message_admins("[user] has caused the cookoff of [src] by attacking it with [attacking_item]!", user) + cookoff(FALSE) else if(attacking_item.tool_behaviour == TOOL_PEN) var/obj/item/pen/P = attacking_item @@ -208,7 +211,7 @@ P.dir = S.dir P.icon_state = overmap_icon_state P.speed = get_speed() - P.entry_target = entry_point + P.submap_target = entry_point forceMove(P) log_and_message_admins("A projectile ([name]) has entered the Overmap! (JMP)") return TRUE @@ -224,11 +227,87 @@ anti_materiel_potential = 3 impact_sounds = list(BULLET_IMPACT_MEAT = SOUNDS_BULLET_MEAT, BULLET_IMPACT_METAL = SOUNDS_BULLET_METAL) accuracy = 100 - projectile_piercing = PASSMOB|PASSDOORS|PASSGLASS|PASSCLOSEDTURF|PASSWINDOW|PASSMACHINE|PASSBLOB|PASSFLAPS|PASSVEHICLE //It's a ship weapon let it try to penetrate everything. + projectile_piercing = PASSGLASS|PASSGRILLE|PASSBLOB|PASSMOB|PASSCLOSEDTURF|PASSMACHINE|PASSSTRUCTURE|PASSFLAPS|PASSDOORS|PASSVEHICLE|PASSWINDOW|PASSSHIELD //It's a ship weapon let it try to penetrate everything. pierce_decay_damage = 0.95 //Ship weapon projectiles don't lose much damage on pierce by default, but this can be set per projectile. + ///This is passed to explosion(), it is stored here for when projectiles hit shields and need to damage the shield as if they had exploded. + var/list/explosion_strength = list(0, 0, 0) + ///The last thing this projectile pierced. Used for spalling effects in on_hit() + var/atom/last_thing_pierced = null var/obj/item/ship_ammunition/ammo var/primed = FALSE - var/hit_target = FALSE //First target we hit. Used to report if a hit was successful. + ///First target we hit. Used to report if a hit was successful. + var/hit_target = FALSE + +/obj/projectile/ship_ammo/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) //When the projectile moves from a dense tile to a non-dense tile. + . = ..() + if(last_thing_pierced) + var/turf/entered_turf = isturf(loc) ? loc : get_turf(loc) + if(!(entered_turf.check_density(FALSE, TRUE))) //Checks for mobs so we don't spawn spalling inside the poor bridge crew, getting hit by the shell is bad enough. + handle_spalling(entered_turf, movement_dir, last_thing_pierced) + last_thing_pierced = null + +/** + * This creates a cone of shrapnel whenever a projectile pierces something dense and then crosses into a non-dense turf. + * This means that it won't spawn all the shrapnel inside the next thing it penetrates, to simulate spalling. + * All of of the projectile stats are set custom here, in future it might be good to set them dynmically based on the material of the thing pierced. + * Too many things don't have a material set, so that will have to wait. + */ +/obj/projectile/ship_ammo/proc/handle_spalling(atom/source, shrapnel_dir, thing_pierced) + set waitfor = FALSE + + src.visible_message(SPAN_DANGER("Huge chunks of shrapnel spray out from \the [thing_pierced] as \the [src] punches through!")) + + var/turf/O = get_turf(src) + var/list/target_turfs = list() + target_turfs += get_step(O, shrapnel_dir) + target_turfs += get_step(O, turn(shrapnel_dir, -45)) + target_turfs += get_step(O, turn(shrapnel_dir, 45)) + target_turfs += get_step(get_step(O, turn(shrapnel_dir, -45)), shrapnel_dir) + target_turfs += get_step(get_step(O, turn(shrapnel_dir, 45)), shrapnel_dir) + + for(var/turf/T in target_turfs) + var/obj/projectile/bullet/pellet/fragment/spall/P + if(istype(thing_pierced, /obj/structure/window)) + P = new /obj/projectile/bullet/pellet/fragment/spall/glass(O) + else if(istype(thing_pierced, /obj/structure/grille) || istype(thing_pierced, /obj/structure/window_frame)) + P = new /obj/projectile/bullet/pellet/fragment/spall/metalrod(O) + else if(istype(thing_pierced, /obj/structure/machinery/door/airlock)) + var/obj/structure/machinery/door/airlock/D = thing_pierced + if(D.window_material && D.window_material == SSmaterials.get_material_by_name(MATERIAL_GLASS)) + P = new /obj/projectile/bullet/pellet/fragment/spall/glass(O) + else + P = new /obj/projectile/bullet/pellet/fragment/spall(O) + else + P = new /obj/projectile/bullet/pellet/fragment/spall(O) + P.preparePixelProjectile(T, src) + P.firer = src + P.fired_from = thing_pierced + P.fire() + return TRUE + +/obj/projectile/bullet/pellet/fragment/spall + damage = 2 //Between 30 and 3 damage, depending on how close you are. Pilot suits are 30 ballistic armour, so they should survive a lot of spall. + pellets = 15 + armor_penetration = 10 + range_step = 1 + range = 15 + embed_chance = 80 //Make the people hit pull big chunks of shrapnel out by hand. + maim_rate = -1 //We don't want this to decapitate people in the unlucky event they get hit by the shell (or shell explosion) directly, then more shrapnel afterwards. + anti_materiel_potential = 2 //Enough to break windows. + name = "spall" + shrapnel_type = /obj/item/material/shard/shrapnel/large + +/obj/projectile/bullet/pellet/fragment/spall/glass + damage = 1 + armor_penetration = 5 + name = "glass" + shrapnel_type = /obj/item/material/shard + +/obj/projectile/bullet/pellet/fragment/spall/metalrod + damage = 3 + armor_penetration = 15 + name = "metal rod" + shrapnel_type = /obj/item/stack/rods /obj/projectile/ship_ammo/Destroy() ammo = null @@ -258,6 +337,14 @@ ) if(ammo && ammo.origin) ammo.origin.signal_hit(hit_data) + + if(istype(target, /turf/simulated/wall) || istype(target, /obj/structure/machinery/door)) //Stores the last thing we pierced for spalling purposes. + last_thing_pierced = target + else if (istype(target, /obj/structure)) //If it is a structure on a dense turf, that uses health, + if (target.should_use_health) + var/turf/T = get_turf(target) + if (T.check_density(FALSE, TRUE)) + last_thing_pierced = target return ..() /obj/projectile/ship_ammo/proc/on_translate(var/turf/entry_turf, var/target_turf) //This proc is called when the projectile enters a new ship's overmap zlevel. @@ -270,6 +357,5 @@ pellet.ammo.origin = ammo.origin pellet.ammo.impact_type = ammo.impact_type pellet.dir = dir - var/turf/front_turf = get_step(pellet, pellet.dir) - pellet.preparePixelProjectile(target_turf, front_turf) + pellet.preparePixelProjectile(target_turf, pellet, deviation = 3) //Deviation can be tuned. These spawn at the map edge so small deviations matter a lot. pellet.fire() diff --git a/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm b/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm index 271d704536c..49d6243b9cc 100644 --- a/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm +++ b/code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm @@ -9,8 +9,8 @@ var/obj/item/ship_ammunition/ammunition /// The target is the actual overmap object we're hitting. var/atom/target - /// The entry target is where the projectile itself is going to spawn in world. - var/obj/entry_target + /// The submap target is passed by the targetting console, it is the landmark selected on that console. This is the point on the submap (eg. The Horizon's Bridge) that the projectile will aim for when it enters. + var/obj/submap_target var/range = OVERMAP_PROJECTILE_RANGE_MEDIUM var/current_range_counter = 0 // A projectile with 0 speed does not move. Note that this is the 'lag' variable on walk_towards! Lower speed is better. @@ -65,81 +65,132 @@ /obj/effect/overmap/projectile/Destroy() ammunition = null target = null - entry_target = null - walk(src, 0) + submap_target = null return ..() +///Gets the turf the projectile should enter on. If it's diagnonal it spawns in the corner, if it's orthogonal it spawns on the map edge relative to the target landmark. +/obj/effect/overmap/projectile/proc/get_entry_turf(atom/target_landmark, direction) + var/turf/target = locate(target_landmark.x, target_landmark.y, target_landmark.z) + if(!target_landmark || !target) + return 0 + + switch(direction) + if(NORTH|WEST) + target = get_ranged_target_turf(locate(1, world.maxy, target.z), direction, max(8, 2 * ammunition.burst)) //We offset the target turf from the edge by 8 (one screen), or twice the burst size. Bursts get their positions randomized up to twice the burst size. + if(NORTH|EAST) + target = get_ranged_target_turf(locate(world.maxx, world.maxy, target.z), direction, max(8, 2 * ammunition.burst)) + if(SOUTH|WEST) + target = get_ranged_target_turf(locate(1, 1, target.z), direction, max(8, 2 * ammunition.burst)) + if(SOUTH|EAST) + target = get_ranged_target_turf(locate(world.maxx, 1, target.z), direction, max(8, 2 * ammunition.burst)) + if(NORTH) + target = get_ranged_target_turf(locate(target.x, world.maxy, target.z), direction, max(8, 2 * ammunition.burst)) + if(SOUTH) + target = get_ranged_target_turf(locate(target.x, 1, target.z), direction, max(8, 2 * ammunition.burst)) + if(EAST) + target = get_ranged_target_turf(locate(world.maxx, target.y, target.z), direction, max(8, 2 * ammunition.burst)) + if(WEST) + target = get_ranged_target_turf(locate(1, target.y, target.z), direction, max(8, 2 * ammunition.burst)) + return target + /obj/effect/overmap/projectile/proc/prepare_for_entry() moving = FALSE entering = FALSE walk(src, 0) +///Checks if we can hit the thing we just bumped into. If we can, do the initial setup for the projectile entering the submab and continue. /obj/effect/overmap/projectile/proc/check_entry() . = FALSE if(!ammunition) return var/turf/T = get_turf(src) for(var/obj/effect/overmap/A in T) - if(ammunition && A == ammunition.origin) + if(ammunition && A == ammunition.origin) //Don't collide with the thing that fired us. continue if(istype(A, /obj/effect/overmap/visitable)) var/obj/effect/overmap/visitable/V = A - if((V.check_ownership(entry_target)) || (V == target)) //Target spotted! + if((V.check_ownership(submap_target)) || (V == target)) //If the visitable is owned by the target landmark, or is the target itself, we can hit it. + var/turf/target_turf = get_turf(submap_target) + var/obj/projectile/ship_ammo/widowmaker = new ammunition.original_projectile.type + prepare_for_entry() + widowmaker.ammo = ammunition + qdel(ammunition.original_projectile) //No longer needed. + ammunition.original_projectile = widowmaker + widowmaker.primed = TRUE + if(istype(V, /obj/effect/overmap/visitable/sector/exoplanet) && (ammunition.overmap_behaviour & SHIP_AMMO_CAN_HIT_PLANETS)) - . = TRUE - //Manually stopping because this proc needs to sleep for a bit. - prepare_for_entry() - var/obj/projectile/ship_ammo/widowmaker = new ammunition.original_projectile.type - widowmaker.ammo = ammunition - qdel(ammunition.original_projectile) //No longer needed. - var/turf/laze = get_turf(entry_target) - ammunition.original_projectile = widowmaker - playsound(laze, 'sound/weapons/gunshot/ship_weapons/orbital_travel.ogg', 60) - laze.visible_message(SPAN_DANGER("A bright star is getting closer from the sky...!")) - sleep(11 SECONDS) //Let the sound play! - widowmaker.primed = TRUE - widowmaker.forceMove(entry_target) - widowmaker.on_hit(laze, is_landmark_hit = TRUE) - log_and_message_admins("A projectile ([name]) has entered a z-level at [entry_target.name]! (JMP)") - say_dead_direct("A projectile ([name]) has entered a z-level at [entry_target.name]!") - qdel(widowmaker) - qdel(src) - else if(istype(V, /obj/effect/overmap/visitable) && (ammunition.overmap_behaviour & SHIP_AMMO_CAN_HIT_VISITABLES)) - . = TRUE - if(istype(V, /obj/effect/overmap/visitable/ship)) - var/obj/effect/overmap/visitable/ship/VS = V - if(istype(ammunition.origin, /obj/effect/overmap/visitable/ship)) - var/naval_heading = SSatlas.headings_to_naval["[VS.dir]"]["[ammunition.heading]"] - var/corrected_heading = SSatlas.naval_to_dir["[VS.fore_dir]"][naval_heading] - ammunition.heading = corrected_heading - else //if it's not a ship it doesn't have a fore direction, so we need to autocorrect - ammunition.heading = entry_target.dir - prepare_for_entry() - var/obj/projectile/ship_ammo/widowmaker = new ammunition.original_projectile.type - widowmaker.ammo = ammunition - qdel(ammunition.original_projectile) //No longer needed. - ammunition.original_projectile = widowmaker - widowmaker.primed = TRUE - var/turf/entry_turf_initial = get_ranged_target_turf(entry_target, REVERSE_DIR(entry_target.dir), 20) - var/entry_dir_choice = (dir & NORTH) || (dir & SOUTH) ? list(EAST, WEST) : list(NORTH, SOUTH) - var/turf/entry_turf = get_ranged_target_turf(entry_turf_initial, entry_dir_choice, 5) - widowmaker.forceMove(entry_turf) - widowmaker.dir = ammunition.heading - var/turf/target_turf = get_step(widowmaker, widowmaker.dir) - widowmaker.on_translate(entry_turf, target_turf) - log_and_message_admins("A projectile ([widowmaker.name]) has entered a z-level at [entry_target.name], with direction [dir2text(widowmaker.dir)]! (JMP)") - say_dead_direct("A projectile ([widowmaker.name]) has entered a z-level at [entry_target.name], with direction [dir2text(widowmaker.dir)]!") - widowmaker.preparePixelProjectile(target_turf, entry_turf) - widowmaker.fired_from = src - widowmaker.fire() - qdel(src) - if(istype(A, /obj/effect/overmap/event)) + return check_entry_exoplanet(widowmaker, target_turf, target_turf) + else if(istype(V, /obj/effect/overmap/visitable/ship) && (ammunition.overmap_behaviour & SHIP_AMMO_CAN_HIT_VISITABLES)) + return check_entry_ship(widowmaker, target_turf, V) + else if(ammunition.overmap_behaviour & SHIP_AMMO_CAN_HIT_VISITABLES) + return check_entry_visitable(widowmaker, target_turf) + + if(istype(A, /obj/effect/overmap/event)) //Check hazards last, in case a ship is hiding in a hazard. var/obj/effect/overmap/event/EV = A if(EV.can_be_destroyed && (ammunition.overmap_behaviour & SHIP_AMMO_CAN_HIT_HAZARDS)) . = TRUE qdel(EV) qdel(src) +///Handle bombardment of planets. Spawn the shot in a random open tile near the target and fire the projectile at it. If there is no open tile, call on_hit directly. This allows non-explosive weapons to strafe targets. +/obj/effect/overmap/projectile/proc/check_entry_exoplanet(obj/projectile/ship_ammo/widowmaker, turf/entry_turf, turf/laze) + . = TRUE + playsound(laze, 'sound/weapons/gunshot/ship_weapons/orbital_travel.ogg', 60) + laze.visible_message(SPAN_DANGER("A bright star is getting closer from the sky...!")) + sleep(11 SECONDS) //Let the sound play! + var/turf/nearest_valid_turf + + if (!(nearest_valid_turf = get_random_turf_in_range(entry_turf, 1, 5, TRUE, FALSE))) //Get a random empty turf between 1 and 5 tiles away from the target, if this fails call on_hit directly on the target turf. + widowmaker.forceMove(submap_target) + widowmaker.on_hit(laze, is_landmark_hit = TRUE) + log_and_message_admins("A ([widowmaker.name]) landed at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name]! (JMP)") + say_dead_direct("A ([widowmaker.name]) landed at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name]!") + qdel(widowmaker) + qdel(src) + + else //If there's an empty turf, spawn our projectile there and aim it at the target. + widowmaker.on_translate(entry_turf, nearest_valid_turf) + log_and_message_admins("A ([widowmaker.name]) landed at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name]! (JMP)") + say_dead_direct("A ([widowmaker.name]) landed at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name]!") + widowmaker.preparePixelProjectile(nearest_valid_turf, entry_turf) + widowmaker.fired_from = src + widowmaker.fire() + qdel(src) + +//Handle hitting ships. This requires translating the projectile's direction to account for the relative rotation of the ship. The projectile then spawns at the edge of the map, aimed at the target landmark. +/obj/effect/overmap/projectile/proc/check_entry_ship(obj/projectile/ship_ammo/widowmaker, turf/target_turf, obj/effect/overmap/visitable/ship/VS) + var/shot_direction = src.dir + var/naval_heading = SSatlas.headings_to_naval["[VS.dir]"]["[shot_direction]"] + var/corrected_heading = SSatlas.naval_to_dir["[VS.fore_dir]"][naval_heading] + shot_direction = corrected_heading + + var/turf/entry_turf = get_entry_turf(submap_target, REVERSE_DIR(shot_direction)) + widowmaker.forceMove(entry_turf) + widowmaker.dir = shot_direction + widowmaker.on_translate(entry_turf, target_turf) + log_and_message_admins("A ([widowmaker.name]) arrived [naval_heading] of \the [target] at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name], with direction [dir2text(shot_direction)]! (JMP)") + say_dead_direct("A ([widowmaker.name]) arrived [naval_heading] of \the [target] at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name], with direction [dir2text(shot_direction)]! (JMP)") + widowmaker.preparePixelProjectile(target_turf, entry_turf) + widowmaker.fired_from = src + widowmaker.fire() + qdel(src) + return TRUE + +///Handle hitting visitables that can't spin, such as asteroids and stations. Otherwise identical to hitting a ship. +/obj/effect/overmap/projectile/proc/check_entry_visitable(obj/projectile/ship_ammo/widowmaker, turf/target_turf) + var/shot_direction = src.dir + var/turf/entry_turf = get_entry_turf(submap_target, REVERSE_DIR(shot_direction)) + widowmaker.forceMove(entry_turf) + widowmaker.dir = shot_direction + widowmaker.on_translate(entry_turf, target_turf) + log_and_message_admins("A ([widowmaker.name]) flew in at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name], with direction [dir2text(shot_direction)]! (JMP)") + say_dead_direct("A ([widowmaker.name]) flew in at ([entry_turf.x], [entry_turf.y], [entry_turf.z]) aimed at [submap_target.name], with direction [dir2text(shot_direction)]! (JMP)") + widowmaker.preparePixelProjectile(target_turf, entry_turf) + widowmaker.fired_from = src + widowmaker.fire() + qdel(src) + return TRUE + /obj/effect/overmap/projectile/proc/move_to() if(isnull(target) || !speed) walk(src, 0) diff --git a/code/modules/overmap/ship_weaponry/weaponry/autocannon.dm b/code/modules/overmap/ship_weaponry/weaponry/autocannon.dm index 89102b085c0..bb0263de5d0 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/autocannon.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/autocannon.dm @@ -47,7 +47,7 @@ icon = 'icons/obj/guns/ship/ship_ammo_autocannon.dmi' icon_state = "autocannon_frag" overmap_icon_state = "cannon_salvo" - impact_type = SHIP_AMMO_IMPACT_HE + impact_type = SHIP_AMMO_IMPACT_FRAG ammunition_flags = SHIP_AMMO_FLAG_INFLAMMABLE|SHIP_AMMO_FLAG_VERY_HEAVY caliber = SHIP_CALIBER_60MM burst = 8 @@ -59,7 +59,8 @@ icon_state = "small" damage = 100 armor_penetration = 60 - penetrating = 3 + penetrating = 8 + anti_materiel_potential = 6 /obj/projectile/ship_ammo/autocannon/he name = "60mm HE shell" @@ -67,6 +68,7 @@ damage = 80 armor_penetration = 30 penetrating = 0 // Explodes on the hull. + explosion_strength = list(0, 2, 3) /obj/projectile/ship_ammo/autocannon/frag name = "60mm fragmentation shell" @@ -77,8 +79,8 @@ /obj/projectile/ship_ammo/autocannon/he/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() - explosion(target, 0, 2, 3) + explosion(get_turf(target), explosion_strength[1], explosion_strength[2], explosion_strength[3]) /obj/projectile/ship_ammo/autocannon/frag/on_hit(atom/target, blocked, def_zone, is_landmark_hit) - fragem(target, 70, 70, 1, 2, 15, 5, TRUE) - ..() + fragem(src, 70, 70, 1, 2, 12, 4, TRUE, spread_range = 5) //Targets 5 tiles around the impact site and shoots a projectile at them. + . = ..() diff --git a/code/modules/overmap/ship_weaponry/weaponry/blaster.dm b/code/modules/overmap/ship_weaponry/weaponry/blaster.dm index 0cc3a9036f9..1b3895c9daa 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/blaster.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/blaster.dm @@ -27,14 +27,16 @@ damage = 10000 armor_penetration = 1000 penetrating = 1 + explosion_strength = list(2, 5, 7) /obj/projectile/ship_ammo/blaster/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() + var/turf/epicenter = get_turf(target) if(ismob(target)) var/mob/M = target M.visible_message(SPAN_DANGER("\The [src] disintegrates [M]'s chest and blasts them into pieces!")) if(isturf(target) || isobj(target)) - explosion(target, 2, 5, 7) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) /obj/structure/machinery/ammunition_loader/blaster name = "mining blaster loader" diff --git a/code/modules/overmap/ship_weaponry/weaponry/bruiser.dm b/code/modules/overmap/ship_weaponry/weaponry/bruiser.dm index 5fe533279db..8768efada21 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/bruiser.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/bruiser.dm @@ -119,10 +119,11 @@ damage = 150 armor_penetration = 75 penetrating = 0 + explosion_strength = list(1, 3, 6) /obj/projectile/ship_ammo/bruiser/he/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() - explosion(target, 1, 3, 6) + explosion(get_turf(target), explosion_strength[1], explosion_strength[2], explosion_strength[3]) /obj/projectile/ship_ammo/bruiser/real/he name = "178mm shell" @@ -130,6 +131,7 @@ damage = 350 armor_penetration = 125 penetrating = 0 + explosion_strength = list(3, 6, 8) /obj/projectile/ship_ammo/bruiser/real/ap name = "178mm shell" @@ -137,6 +139,7 @@ damage = 250 armor_penetration = 250 penetrating = 2 + explosion_strength = list(0, 2, 4) /obj/projectile/ship_ammo/bruiser/real/canister damage = 40 @@ -157,10 +160,11 @@ /obj/projectile/ship_ammo/bruiser/real/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() + var/turf/epicenter = get_turf(target) if(ammo.impact_type == SHIP_AMMO_IMPACT_HE) - explosion(target, 3, 6, 8) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) if(ammo.impact_type == SHIP_AMMO_IMPACT_AP) - explosion(target, 0, 2, 4) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) /obj/projectile/ship_ammo/bruiser/real/beehive/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() diff --git a/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm b/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm index 0de2ab9bebf..1e5f9f88a9b 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm @@ -27,14 +27,16 @@ damage = 10000 armor_penetration = 1000 penetrating = 50 + explosion_strength = list(1, 5, 3) /obj/projectile/ship_ammo/coilgun/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() + var/turf/epicenter = get_turf(target) if(ismob(target)) var/mob/M = target M.visible_message(SPAN_DANGER("\The [src] blows [M]'s chest apart and punches straight through!")) if(isturf(target) || isobj(target)) - explosion(target, 1, 5, 3) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) /obj/structure/machinery/ammunition_loader/sol icon_state = "ammo_loader_sol" diff --git a/code/modules/overmap/ship_weaponry/weaponry/francisca.dm b/code/modules/overmap/ship_weaponry/weaponry/francisca.dm index 128686d24e2..26f8660a9d9 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/francisca.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/francisca.dm @@ -42,7 +42,7 @@ name_override = "40mm FRAG burst" desc = "A box of fragmentation shells for use in a Francisca rotary gun." icon_state = "box_inc" - impact_type = SHIP_AMMO_IMPACT_HE + impact_type = SHIP_AMMO_IMPACT_FRAG projectile_type_override = /obj/projectile/ship_ammo/francisca/frag /obj/projectile/ship_ammo/francisca @@ -50,20 +50,24 @@ icon_state = "small" damage = 50 armor_penetration = 50 - penetrating = 2 + penetrating = 3 + anti_materiel_potential = 10 /obj/projectile/ship_ammo/francisca/ap name = "40mm AP shell" damage = 30 armor_penetration = 100 - penetrating = 4 + penetrating = 8 + anti_materiel_potential = 8 /obj/projectile/ship_ammo/francisca/frag name = "40mm FRAG shell" + icon_state = "small" damage = 30 armor_penetration = 50 penetrating = 1 + anti_materiel_potential = 6 /obj/projectile/ship_ammo/francisca/frag/on_hit(atom/target, blocked, def_zone, is_landmark_hit) - fragem(src, 70, 70, 1, 2, 10, 4, TRUE) + fragem(src, 70, 70, 1, 2, 12, 4, TRUE, spread_range = 5) //Targets 5 tiles around the impact site and shoots a projectile at them. . = ..() diff --git a/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm b/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm index d9d26b16b43..058a128c32e 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm @@ -36,16 +36,21 @@ damage = 100 armor_penetration = 50 penetrating = 0 + anti_materiel_potential = 6 + explosion_strength = list(0, 2, 4) /obj/projectile/ship_ammo/grauwolf/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() + var/turf/epicenter = get_turf(target) if(ammo && ammo.impact_type == SHIP_AMMO_IMPACT_HE) - explosion(target, 0, 2, 4) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) else - explosion(target, 0, 1, 2) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) /obj/projectile/ship_ammo/grauwolf/ap name = "armor-piercing flak" damage = 50 armor_penetration = 50 - penetrating = 2 + penetrating = 8 + anti_materiel_potential = 8 + explosion_strength = list(0, 1, 2) diff --git a/code/modules/overmap/ship_weaponry/weaponry/lammergeier.dm b/code/modules/overmap/ship_weaponry/weaponry/lammergeier.dm index 73d858354bf..8ffe1792590 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/lammergeier.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/lammergeier.dm @@ -26,14 +26,16 @@ damage = 10000 armor_penetration = 1000 penetrating = 1 + explosion_strength = list(3, 6, 8) /obj/projectile/ship_ammo/lammergeier/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() + var/turf/epicenter = get_turf(target) if(ismob(target)) var/mob/M = target M.visible_message(SPAN_DANGER("\The [src] blows [M]'s chest apart and punches straight through!")) if(isturf(target) || isobj(target)) - explosion(target, 3, 6, 8) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) /obj/structure/machinery/ammunition_loader/lammergeier name = "typhoon cannon loader" diff --git a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm index 98dc9afa324..cd8dc95be6a 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/leviathan.dm @@ -159,10 +159,10 @@ M.visible_message(SPAN_DANGER("[M] evaporates as they are engulfed by the beam!")) M.dust() return - explosion(target, 6, 6, 6) + explosion(get_turf(target), 6, 6, 6) else target.visible_message(SPAN_DANGER("A giant, purple laser descends from the sky!")) - explosion(target, 30, 30, 30) + explosion(get_turf(target), 30, 30, 30) /obj/structure/machinery/zat_lever name = "activation lever" diff --git a/code/modules/overmap/ship_weaponry/weaponry/light_coilgun.dm b/code/modules/overmap/ship_weaponry/weaponry/light_coilgun.dm index f3d9e570948..e60ba2924c8 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/light_coilgun.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/light_coilgun.dm @@ -28,11 +28,13 @@ damage = 10000 armor_penetration = 1000 penetrating = 1 + explosion_strength = list(2, 3, 4) /obj/projectile/ship_ammo/coilgun/light/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() + var/turf/epicenter = get_turf(target) if(ismob(target)) var/mob/M = target M.visible_message(SPAN_DANGER("\The [src] blows [M]'s chest apart and punches straight through!")) if(isturf(target) || isobj(target)) - explosion(target, 2, 3, 4) + explosion(epicenter, explosion_strength[1], explosion_strength[2], explosion_strength[3]) diff --git a/code/modules/overmap/ship_weaponry/weaponry/longbow.dm b/code/modules/overmap/ship_weaponry/weaponry/longbow.dm index 02a7815b8f9..51d469aa739 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/longbow.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/longbow.dm @@ -26,6 +26,7 @@ /obj/projectile/ship_ammo/longbow/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() + var/turf/epicenter = get_turf(target) if(ismob(target)) var/mob/M = target M.visible_message(SPAN_DANGER("\The [src] blows [M] apart and punches straight through!")) @@ -39,13 +40,13 @@ qdel(target) penetrated = TRUE else - explosion(target, 4, 8, 12) + explosion(epicenter, 4, 8, 12) qdel(src) if(SHIP_AMMO_IMPACT_HE) - explosion(target, 6, 8, 10) + explosion(epicenter, 6, 8, 10) if(SHIP_AMMO_IMPACT_BUNKERBUSTER) target.visible_message(SPAN_DANGER("\The [src] punches straight through \the [target]!")) - explosion(target, 1, 2, 4) + explosion(epicenter, 1, 2, 4) target.ex_act(1) if(!QDELING(target) && target.density) qdel(target) diff --git a/code/modules/overmap/ship_weaponry/weaponry/nephilim.dm b/code/modules/overmap/ship_weaponry/weaponry/nephilim.dm index f7eab092117..2d910fc41c8 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/nephilim.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/nephilim.dm @@ -50,6 +50,7 @@ damage = 40 armor_penetration = 40 penetrating = 0 + explosion_strength = list(0, 2, 3) /obj/projectile/ship_ammo/nephilim/ap @@ -60,4 +61,4 @@ /obj/projectile/ship_ammo/nephilim/he/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() - explosion(target, 0, 2, 3) + explosion(get_turf(target), explosion_strength[1], explosion_strength[2], explosion_strength[3]) diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm index 209ffb05373..5a7a41f5999 100644 --- a/code/modules/overmap/ships/computers/engine_control.dm +++ b/code/modules/overmap/ships/computers/engine_control.dm @@ -30,7 +30,7 @@ /obj/structure/machinery/computer/ship/engines/ui_interact(mob/user, datum/tgui/ui) if(!connected) - display_reconnect_dialog(user, "ship control systems") + balloon_alert(user, "no connection!") return ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index cd9fc3fbff8..3d75449f8ff 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -117,6 +117,10 @@ return 1 /obj/structure/machinery/computer/ship/helm/ui_interact(mob/user, datum/tgui/ui) + if(!connected) + balloon_alert(user, "no connection!") + return + ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Helm", capitalize_first_letters(name)) @@ -126,55 +130,52 @@ /obj/structure/machinery/computer/ship/helm/ui_data(mob/user) var/list/data = list() - if(!connected) - display_reconnect_dialog(user, "helm") - else - var/turf/T = get_turf(connected) - var/obj/effect/overmap/visitable/sector/current_sector = locate() in T + var/turf/T = get_turf(connected) + var/obj/effect/overmap/visitable/sector/current_sector = locate() in T - data["sector"] = current_sector ? current_sector.name : "Deep Space" - data["sector_info"] = current_sector ? current_sector.desc : "Not Available" - data["landed"] = connected.get_landed_info() - data["ship_coord_x"] = connected.x - data["ship_coord_y"] = connected.y - data["dest"] = dy && dx - data["autopilot_x"] = dx - data["autopilot_y"] = dy - data["speedlimit"] = speedlimit ? speedlimit*1000 : "Halted" - data["accel"] = get_acceleration() - data["heading"] = connected.get_heading() ? dir2angle(connected.get_heading()) : 0 - data["direction"] = dir2angle(connected.dir) - data["autopilot"] = autopilot - data["manual_control"] = viewing_overmap(user) - data["canburn"] = connected.can_burn() - data["canturn"] = connected.can_turn() - data["cancombatroll"] = connected.can_combat_roll() - data["cancombatturn"] = connected.can_combat_turn() - data["accellimit"] = accellimit*1000 + data["sector"] = current_sector ? current_sector.name : "Deep Space" + data["sector_info"] = current_sector ? current_sector.desc : "Not Available" + data["landed"] = connected.get_landed_info() + data["ship_coord_x"] = connected.x + data["ship_coord_y"] = connected.y + data["dest"] = dy && dx + data["autopilot_x"] = dx + data["autopilot_y"] = dy + data["speedlimit"] = speedlimit ? speedlimit*1000 : "Halted" + data["accel"] = get_acceleration() + data["heading"] = connected.get_heading() ? dir2angle(connected.get_heading()) : 0 + data["direction"] = dir2angle(connected.dir) + data["autopilot"] = autopilot + data["manual_control"] = viewing_overmap(user) + data["canburn"] = connected.can_burn() + data["canturn"] = connected.can_turn() + data["cancombatroll"] = connected.can_combat_roll() + data["cancombatturn"] = connected.can_combat_turn() + data["accellimit"] = accellimit*1000 - var/speed = round(connected.get_speed()*1000, 0.01) - data["speed"] = speed - if(connected.get_speed() < SHIP_SPEED_SLOW) - data["speed_slow"] = TRUE - if(connected.get_speed() > SHIP_SPEED_FAST) - data["speed_fast"] = TRUE - var/list/speed_xy = connected.get_speed_xy() - data["ship_speed_x"] = speed_xy[1] - data["ship_speed_y"] = speed_xy[2] + var/speed = round(connected.get_speed()*1000, 0.01) + data["speed"] = speed + if(connected.get_speed() < SHIP_SPEED_SLOW) + data["speed_slow"] = TRUE + if(connected.get_speed() > SHIP_SPEED_FAST) + data["speed_fast"] = TRUE + var/list/speed_xy = connected.get_speed_xy() + data["ship_speed_x"] = speed_xy[1] + data["ship_speed_y"] = speed_xy[2] - data["ETAnext"] = get_eta() + data["ETAnext"] = get_eta() - var/list/locations[0] - for (var/key in known_sectors) - var/datum/computer_file/data/waypoint/R = known_sectors[key] - var/list/rdata[0] - rdata["name"] = R.fields["name"] - rdata["x"] = R.fields["x"] - rdata["y"] = R.fields["y"] - rdata["reference"] = "[REF(R)]" - locations.Add(list(rdata)) + var/list/locations[0] + for (var/key in known_sectors) + var/datum/computer_file/data/waypoint/R = known_sectors[key] + var/list/rdata[0] + rdata["name"] = R.fields["name"] + rdata["x"] = R.fields["x"] + rdata["y"] = R.fields["y"] + rdata["reference"] = "[REF(R)]" + locations.Add(list(rdata)) - data["locations"] = locations + data["locations"] = locations return data @@ -367,6 +368,10 @@ ui_interact(user) /obj/structure/machinery/computer/ship/navigation/ui_interact(mob/user, datum/tgui/ui) + if(!connected) + balloon_alert(user, "no connection!") + return + ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Nav", capitalize_first_letters(name), ui_x=470, ui_y=320) @@ -376,25 +381,22 @@ /obj/structure/machinery/computer/ship/navigation/ui_data(mob/user) var/list/data = list() - if(!connected) - display_reconnect_dialog(user, "navigation") - else - var/turf/T = get_turf(connected) - var/obj/effect/overmap/visitable/sector/current_sector = locate() in T + var/turf/T = get_turf(connected) + var/obj/effect/overmap/visitable/sector/current_sector = locate() in T - data["sector"] = current_sector ? current_sector.name : "Deep Space" - data["sector_info"] = current_sector ? current_sector.desc : "Not Available" - data["ship_coord_x"] = connected.x - data["ship_coord_y"] = connected.y - data["speed"] = round(connected.get_speed()*1000, 0.01) - data["accel"] = round(connected.get_acceleration()*1000, 0.01) - var/list/speed_xy = connected.get_speed_xy() - data["ship_speed_x"] = speed_xy[1] - data["ship_speed_y"] = speed_xy[2] - data["direction"] = dir2angle(connected.dir) - data["heading"] = connected.get_heading() ? dir2angle(connected.get_heading()) : 0 - data["ETAnext"] = get_eta() - data["viewing"] = viewing_overmap(user) + data["sector"] = current_sector ? current_sector.name : "Deep Space" + data["sector_info"] = current_sector ? current_sector.desc : "Not Available" + data["ship_coord_x"] = connected.x + data["ship_coord_y"] = connected.y + data["speed"] = round(connected.get_speed()*1000, 0.01) + data["accel"] = round(connected.get_acceleration()*1000, 0.01) + var/list/speed_xy = connected.get_speed_xy() + data["ship_speed_x"] = speed_xy[1] + data["ship_speed_y"] = speed_xy[2] + data["direction"] = dir2angle(connected.dir) + data["heading"] = connected.get_heading() ? dir2angle(connected.get_heading()) : 0 + data["ETAnext"] = get_eta() + data["viewing"] = viewing_overmap(user) return data diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index 1962a5b64c3..687797f4e1e 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -22,11 +22,6 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov . += "Consoles like these are typically access-locked." . += "You can remove this lock with wirecutters, but it would take awhile! Alternatively, you can also use a cryptographic sequencer (emag) for instant removal." -/obj/structure/machinery/computer/ship/proc/display_reconnect_dialog(var/mob/user, var/flavor) - var/datum/browser/popup = new (user, "[src]", "[src]") - popup.set_content("
Error
Unable to connect to [flavor].
Reconnect
") - popup.open() - /obj/structure/machinery/computer/ship/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_CABLECOIL) // Repair from hotwire var/obj/item/stack/cable_coil/C = attacking_item diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm index 9184fea260e..8b2f5ee41c3 100644 --- a/code/modules/power/sensors/powernet_sensor.dm +++ b/code/modules/power/sensors/powernet_sensor.dm @@ -5,7 +5,6 @@ // Powernet sensors are devices which relay information about connected powernet. This information may be relayed // via two procs. Proc return_reading_text will return fully HTML styled string which contains all information. This // may be used in PDAs or similar applications. Second proc, return_reading_data will return list containing needed data. -// This is used in NanoUI, for example. /obj/structure/machinery/power/sensor name = "Powernet Sensor" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index eea1678057d..ee43a4339f2 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -461,7 +461,7 @@ ABSTRACT_TYPE(/obj/item/gun) break var/acc = burst_accuracy[min(i, burst_accuracy.len)] - accuracy_decrease - var/disp = dispersion[min(i, dispersion.len)] + dispersion_increase + var/disp = max(0, dispersion[min(i, dispersion.len)] + dispersion_increase) process_accuracy(projectile, user, target, acc, disp) if(pointblank) diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm index fb2ed61252a..9d3c7701d3c 100644 --- a/code/modules/projectiles/guns/energy/modular.dm +++ b/code/modules/projectiles/guns/energy/modular.dm @@ -387,9 +387,12 @@ while(improvement_potential > 0 && damaged_components.len) var/list/upgradable_components = list() - for(var/obj/item/laser_components/component in damaged_components) - if(component.total_improved < IMPROVEMENT_CAP) - upgradable_components += component + for(var/obj/item/laser_components/component in damaged_components) //Only give it improvement potential if it's damaged. + if((component.total_improved + component.improvement_potential) < IMPROVEMENT_CAP) //Only give it improvement potential if it doesn't have enough to hit cap. + if(component.increasable_stats.len || component.decreaseable_stats.len) //Don't give it to components with nothing to improve. + upgradable_components += component + else + damaged_components.Remove(component) //If a component has reached the improvement cap, it can't be improved anymore. if(!upgradable_components.len) to_chat(user, SPAN_WARNING("There's nothing to improve on the components of this gun.")) @@ -527,10 +530,55 @@ return 1 /obj/item/gun/energy/laser/prototype/get_print_info() - . = ..(FALSE) + . = "" + + var/l_modified_damage = 1 / max(1, burst - 1) + var/l_modified_max_shots = 1 + for(var/i in list(capacitor, focusing_lens, modulator) + gun_mods) + var/obj/item/laser_components/l_component = i + if(!l_component) + continue + + if(l_component.damage != 0) + l_modified_damage *= l_component.damage + if(l_component.shots != 0) + l_modified_max_shots *= l_component.shots + + var/obj/projectile/P = new projectile_type + . += "Max Shots: [round(l_modified_max_shots)]
" + . += "Recharge Type: [self_recharge ? "self recharging" : "not self recharging"]
" + if(self_recharge) + . += "Recharge Time: [initial(recharge_time)]
" + . += "
Primary Projectile
" + . += "Damage: [round(min(60, l_modified_damage), 1)]
" + . += "Damage Type: [initial(P.damage_type)]
" + . += "Blocked by Armor Type: [initial(P.check_armor)]
" + . += "Stuns: [initial(P.stun) ? "true" : "false"]
" + if(initial(P.shrapnel_type)) + var/obj/shrapnel = new P.shrapnel_type + . += "Shrapnel Type: [shrapnel.name]
" + . += "Armor Penetration: [initial(P.armor_penetration)]%
" + . += "Burst: [burst]
" + . += "Reliability: [reliability]
" + + if(secondary_projectile_type) + var/obj/projectile/P_second = new secondary_projectile_type + . += "
Secondary Projectile
" + . += "Damage: [initial(P_second.damage)]
" + . += "Damage Type: [initial(P_second.damage_type)]
" + . += "Blocked by Armor Type: [initial(P_second.check_armor)]
" + . += "Stuns: [initial(P_second.stun) ? "true" : "false"]
" + if(initial(P_second.shrapnel_type)) + var/obj/shrapnel_second = new P_second.shrapnel_type + . += "Shrapnel Type: [shrapnel_second.name]
" + . += "Armor Penetration: [initial(P_second.armor_penetration)]%
" + + . += "
" for(var/i in list(capacitor, focusing_lens, modulator) + gun_mods) var/obj/item/laser_components/l_component = i + if(!l_component) + continue . += "
Component Name: [initial(l_component.name)]

" var/l_repair_name = initial(l_component.repair_item.name) ? initial(l_component.repair_item.name) : "nothing" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index ecddd1499a9..a6399f6af36 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -60,6 +60,8 @@ var/obj/projectile/energy/floramut/gene/projectile = . projectile.gene = gene +//*ADMIN SPAWN ONLY*/ + /obj/item/gun/energy/meteorgun name = "meteor gun" desc = "For the love of god, make sure you're aiming this the right way!" @@ -88,6 +90,105 @@ slot_flags = SLOT_BELT can_turret = FALSE +/obj/item/gun/energy/admin_ship_weapon + name = "ship artillery testing gun" + desc = "If you are holding this, admin-help, this fires ship-weapon bullets for testing purposes." + icon = 'icons/obj/guns/meteor_gun.dmi' + icon_state = "meteor_gun" + item_state = "meteor_gun" + slot_flags = SLOT_BELT + fire_sound='sound/weapons/gunshot/ship_weapons/flak_fire.ogg' + projectile_type = /obj/projectile/ship_ammo/autocannon + sel_mode = 1 + accuracy = 1 + max_shots = 1000 + self_recharge = TRUE + recharge_time = 5 + charge_meter = 0 + can_switch_modes = FALSE + + firemodes = list( + // Autocannon + list(mode_name="autocannon", burst=1, projectile_type=/obj/projectile/ship_ammo/autocannon), + list(mode_name="autocannon frag", burst=1, projectile_type=/obj/projectile/ship_ammo/autocannon/frag), + list(mode_name="autocannon he", burst=1, projectile_type=/obj/projectile/ship_ammo/autocannon/he), + // Blaster + list(mode_name="blaster", burst=1, projectile_type=/obj/projectile/ship_ammo/blaster), + // Bruiser + list(mode_name="bruiser canister", burst=1, projectile_type=/obj/projectile/ship_ammo/bruiser), + list(mode_name="bruiser flechette", burst=1, projectile_type=/obj/projectile/ship_ammo/bruiser/flechette), + list(mode_name="bruiser he", burst=1, projectile_type=/obj/projectile/ship_ammo/bruiser/he), + // Coilgun + list(mode_name="coilgun", burst=1, projectile_type=/obj/projectile/ship_ammo/coilgun), + list(mode_name="light coilgun", burst=1, projectile_type=/obj/projectile/ship_ammo/coilgun/light), + // Francisca + list(mode_name="francisca fmj", burst=1, projectile_type=/obj/projectile/ship_ammo/francisca), + list(mode_name="francisca ap", burst=1, projectile_type=/obj/projectile/ship_ammo/francisca/ap), + list(mode_name="francisca frag", burst=1, projectile_type=/obj/projectile/ship_ammo/francisca/frag), + // Grauwolf + list(mode_name="grauwolf he", burst=1, projectile_type=/obj/projectile/ship_ammo/grauwolf), + list(mode_name="grauwolf ap", burst=1, projectile_type=/obj/projectile/ship_ammo/grauwolf/ap), + // Lammergeier + list(mode_name="lammergeier", burst=1, projectile_type=/obj/projectile/ship_ammo/lammergeier), + // Leviathan + list(mode_name="leviathan", burst=1, projectile_type=/obj/projectile/ship_ammo/leviathan), + // Longbow + list(mode_name="longbow ap", burst=1, projectile_type=/obj/projectile/ship_ammo/longbow), + list(mode_name="longbow he", burst=1, projectile_type=/obj/projectile/ship_ammo/longbow), + list(mode_name="longbow bunkerbuster", burst=1, projectile_type=/obj/projectile/ship_ammo/longbow), + // Nephilim + list(mode_name="nephilim he", burst=1, projectile_type=/obj/projectile/ship_ammo/nephilim), + list(mode_name="nephilim ap", burst=1, projectile_type=/obj/projectile/ship_ammo/nephilim/ap), + ) + +/obj/item/gun/energy/admin_ship_weapon/consume_next_projectile() //Longbow ammo has warhead data that can't simply be set in the firemodes. + var/obj/projectile/ship_ammo/projectile = ..() + if(!projectile) + return projectile + + var/datum/firemode/current_mode = firemodes[sel_mode] + var/obj/item/ship_ammunition/loaded_ammo + switch(current_mode?.name) + if("longbow ap") + loaded_ammo = new /obj/item/ship_ammunition/longbow/preset_ap() + projectile.penetrating = 1 + if("longbow he") + loaded_ammo = new /obj/item/ship_ammunition/longbow/preset_he() + if("longbow bunkerbuster") + loaded_ammo = new /obj/item/ship_ammunition/longbow/preset_bb() + projectile.penetrating = 3 + + if(!loaded_ammo) + return projectile + + loaded_ammo.forceMove(projectile) + projectile.ammo = loaded_ammo + projectile.name = loaded_ammo.name + projectile.desc = loaded_ammo.desc + return projectile + +/obj/item/gun/energy/admin_ship_weapon/attack_self(mob/user) //So admins can shoot this at the ship from out of sight. + toggle_scope(2.0, user) + +/obj/item/gun/energy/admin_ship_weapon/crew + name = "horizon artillery testing gun" + desc = "If you are holding this, admin-help, this fires the horizon's guns" + + firemodes = list( + // Francisca + list(mode_name="francisca fmj", burst=1, projectile_type=/obj/projectile/ship_ammo/francisca), + list(mode_name="francisca ap", burst=1, projectile_type=/obj/projectile/ship_ammo/francisca/ap), + list(mode_name="francisca frag", burst=1, projectile_type=/obj/projectile/ship_ammo/francisca/frag), + // Grauwolf + list(mode_name="grauwolf he", burst=1, projectile_type=/obj/projectile/ship_ammo/grauwolf), + list(mode_name="grauwolf ap", burst=1, projectile_type=/obj/projectile/ship_ammo/grauwolf/ap), + // Longbow + list(mode_name="longbow ap", burst=1, projectile_type=/obj/projectile/ship_ammo/longbow), + list(mode_name="longbow he", burst=1, projectile_type=/obj/projectile/ship_ammo/longbow), + list(mode_name="longbow bunkerbuster", burst=1, projectile_type=/obj/projectile/ship_ammo/longbow), + ) + +//*END OF ADMIN SPAWN ONLY*// /obj/item/gun/energy/mindflayer name = "mind flayer" diff --git a/code/modules/projectiles/modular/laser_base.dm b/code/modules/projectiles/modular/laser_base.dm index 971e88cc41e..f960a7cbf5c 100644 --- a/code/modules/projectiles/modular/laser_base.dm +++ b/code/modules/projectiles/modular/laser_base.dm @@ -42,7 +42,13 @@ condition = reliability /obj/item/laser_components/proc/handle_improvement(var/skill_level, var/mob/user) - while (improvement_potential > 0) + + if (total_improved >= IMPROVEMENT_CAP) + to_chat(user, SPAN_NOTICE("You don't see any way to improve \the [src] any further.")) + improvement_potential = 0 + return + + while (improvement_potential > 0 && total_improved < IMPROVEMENT_CAP) var/improvement = min(abs(improvement_potential / 100), 0.2) //Caps improvement from a single repair to 20%. This spreads the effect out across multiple stats var/stat_direction = 1 @@ -66,8 +72,20 @@ break //No stats to improve, it shouldn't be possible to have improvement potential and no stats to improve, but just in case. if (stat_name in src.vars) + var/initial_value = initial(src.vars[stat_name]) improvement_potential -= improvement * 100 //Decreases improvement potential before any skill modifiers. + if (initial_value < 0) //If the stat begins negative, such as base_malus for heat vents, handle comparisons by sign. + if (stat_direction > 0 && src.vars[stat_name] >= (initial_value * DECREASE_CAP)) + continue + if (stat_direction < 0 && src.vars[stat_name] <= (initial_value * INCREASE_CAP)) + continue + else + if (src.vars[stat_name] >= (initial_value * INCREASE_CAP) && stat_direction > 0) //It is possible to waste improvement potential by hitting the cap on a stat, this is fine, it should be harder to improve a component that's already of high quality. + continue + if (src.vars[stat_name] <= (initial_value * DECREASE_CAP) && stat_direction < 0) + continue + switch(skill_level ? skill_level : 6) if(-INFINITY to 2) improvement *= (rand(-5, -1) / 10) //Always damage it. @@ -80,21 +98,37 @@ if(6 to INFINITY) improvement *= (rand(8, 12) / 10) - if (src.vars[stat_name] > (initial(src.vars[stat_name]) * INCREASE_CAP) && stat_direction > 0) //It is possible to waste improvement potential by hitting the cap on a stat, this is fine, it should be harder to improve a component that's already of high quality. - continue - if (src.vars[stat_name] < (initial(src.vars[stat_name]) * DECREASE_CAP) && stat_direction < 0) - continue - - src.vars[stat_name] += stat_direction * abs(initial(src.vars[stat_name]) * improvement) //Adds improvement % of the initial value to the stat. + src.vars[stat_name] += stat_direction * abs(initial_value * improvement) //Adds improvement % of the initial value to the stat. if (improvement > 0) - to_chat(user, SPAN_NOTICE("Your careful repairs to \the [src] [stat_direction > 0 ? "increase" : "decrease"] its [replacetext(stat_name, "_", " ")] by [improvement * 100] percent!")) - total_improved += improvement + total_improved += improvement * 100 + if (initial_value < 0) + if (stat_direction > 0 && src.vars[stat_name] >= initial_value * DECREASE_CAP) + to_chat(user, SPAN_NOTICE("Your repairs to \the [src] have improved its [replacetext(stat_name, "_", " ")] as far as you think is possible.")) + else if (stat_direction < 0 && src.vars[stat_name] <= initial_value * INCREASE_CAP) + to_chat(user, SPAN_NOTICE("Your repairs to \the [src] have improved its [replacetext(stat_name, "_", " ")] as far as you think is possible.")) + else + to_chat(user, SPAN_NOTICE("Your careful repairs to \the [src] [stat_direction > 0 ? "increase" : "decrease"] its [replacetext(stat_name, "_", " ")] by [improvement * 100] percent!")) + else + if(src.vars[stat_name] >= initial_value * INCREASE_CAP && stat_direction > 0) + to_chat(user, SPAN_NOTICE("Your repairs to \the [src] have improved its [replacetext(stat_name, "_", " ")] as far as you think is possible.")) + else if(src.vars[stat_name] <= initial_value * DECREASE_CAP && stat_direction < 0) + to_chat(user, SPAN_NOTICE("Your repairs to \the [src] have improved its [replacetext(stat_name, "_", " ")] as far as you think is possible.")) + else + to_chat(user, SPAN_NOTICE("Your careful repairs to \the [src] [stat_direction > 0 ? "increase" : "decrease"] its [replacetext(stat_name, "_", " ")] by [improvement * 100] percent!")) + else if (improvement == 0) to_chat(user, SPAN_NOTICE("Your repairs to \the [src], don't seem to improve it, but at least you didn't make it worse.")) else to_chat(user, SPAN_WARNING("Your repairs to \the [src] end up damaging it!")) + else + break //The stat to improve isn't on this component, something went wrong with the lists of stats or the component itself. + + if (total_improved > IMPROVEMENT_CAP) + improvement_potential = 0 + to_chat(user, SPAN_NOTICE("You have improved \the [src] as much as you can.")) + /obj/item/laser_components/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(distance > 1) @@ -150,9 +184,21 @@ if (condition == 0 && malus == base_malus) to_chat(user, SPAN_WARNING("\The [src] is not damaged.")) return ..() - to_chat(user, SPAN_WARNING("You begin repairing \the [src].")) + var/skill_level = (GET_SKILL_LEVEL(user, FIREARMS_SKILL_COMPONENT) + GET_SKILL_LEVEL(user, RESEARCH_SKILL_COMPONENT)) - if(do_after(user, rand(2 SECONDS, 6 SECONDS), src, DO_UNIQUE) && repair_module(attacking_item, skill_level, user)) + + if(attacking_item.tool_behaviour == TOOL_WELDER) + var/obj/item/weldingtool/WT = attacking_item + if(WT.isOn() && WT.use_tool(src, user, rand(2 SECONDS, (10 - skill_level) SECONDS), volume = 50) && WT.use(0, user) && repair_module(attacking_item, skill_level, user)) + user.visible_message( + SPAN_WARNING("[user] begins repairing \the [src]."), + SPAN_NOTICE("You begin repairing \the [src]."), + "You hear a welding torch on metal." + ) + else + to_chat(user, SPAN_WARNING("You fail to repair \the [src].")) + + else if(do_after(user, rand(2 SECONDS, (10 - skill_level) SECONDS), src, DO_UNIQUE) && repair_module(attacking_item, skill_level, user)) //Used if the repair item is not a tool. to_chat(user, SPAN_NOTICE("You repair \the [src].")) else to_chat(user, SPAN_WARNING("You fail to repair \the [src].")) @@ -189,7 +235,7 @@ return if(malus == base_malus) return 0 - if(W.use(2)) + if(W.use(1)) //Welders burn fuel while active handle_improvement(skill_level, user) malus = max(malus - 5, base_malus) return 1 @@ -332,8 +378,10 @@ var/success = FALSE if(!istype(A)) return ..() - if(!ready_to_craft) - to_chat(user, SPAN_WARNING("You cannot modify \the [src] by hand, you need to use a weapons analyzer.")) + + var/skill_level = (GET_SKILL_LEVEL(user, FIREARMS_SKILL_COMPONENT) + GET_SKILL_LEVEL(user, RESEARCH_SKILL_COMPONENT)) + if(!ready_to_craft && skill_level < 5) + to_chat(user, SPAN_WARNING("You cannot modify \the [src] by hand at your current skill level, you need to use a weapons analyzer.")) return if(ismodifier(A) && gun_mods.len < modifier_cap) @@ -389,9 +437,7 @@ /obj/item/laser_assembly/proc/finish() - var/obj/structure/machinery/r_n_d/weapons_analyzer/an = analyzer.resolve() - if(!an) - return FALSE + var/obj/structure/machinery/r_n_d/weapons_analyzer/an = analyzer ? analyzer.resolve() : null var/obj/item/gun/energy/laser/prototype/A = new /obj/item/gun/energy/laser/prototype A.icon_state = icon_state @@ -410,9 +456,13 @@ mod.forceMove(A) if(mod.gun_overlay) A.underlays += mod.gun_overlay - A.forceMove(an) - an.item = A + if(an) + A.forceMove(an) + an.item = A + else + A.forceMove(get_turf(src)) A.updatetype() + A.try_recharge() A.pin = null gun_mods = null focusing_lens = null diff --git a/code/modules/projectiles/modular/laser_components.dm b/code/modules/projectiles/modular/laser_components.dm index f0483690043..3d22b02e776 100644 --- a/code/modules/projectiles/modular/laser_components.dm +++ b/code/modules/projectiles/modular/laser_components.dm @@ -303,7 +303,7 @@ accuracy = -1 icon_state = "rotating_lens" increasable_stats = list() - decreaseable_stats = list("fire_delay", "chargetime") + decreaseable_stats = list("burst_delay", "chargetime") /obj/item/laser_components/modifier/scope name = "telescopic sight" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 07fe18585a0..8a012fcc23e 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -78,7 +78,7 @@ var/pierce_chance = 0 /// 0-1 multiplier, the projectile's damage is modified by multiplying this after each pierce. var/pierce_decay_damage = 0.7 - ///Used to determine whether or not to apply embed chances on hit. + ///Used to determine whether or not to apply embed chances on hit, also used in ship weapons for spalling. var/last_hit_pierced = FALSE /// If objects are below this layer, we pass through them. var/hit_threshhold = PROJECTILE_HIT_THRESHHOLD_LAYER @@ -1220,8 +1220,8 @@ var/obj/item/SP = new shrapnel_type(organ) SP.edge = TRUE SP.sharp = TRUE - SP.name = (name != "shrapnel") ? "[initial(name)] shrapnel" : "shrapnel" - SP.desc += " It looks like it was fired from [fired_from]." + SP.name = (name != "shrapnel") ? "[name] shrapnel" : "shrapnel" + SP.desc += " It looks like it came from from \a [fired_from]." SP.forceMove(organ) organ.embed(SP) return SP diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 7ce3d1727d5..f0f945fb636 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -397,7 +397,7 @@ M.emitter_blasts_taken += 1 else if(prob(33)) M.emitter_blasts_taken += 1 - explosion(target, -1, 0, 2) + explosion(get_turf(target), -1, 0, 2) . = ..() /obj/projectile/beam/thermaldrill diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index be1db6e3506..4d2a7d12837 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -481,7 +481,7 @@ /obj/projectile/bullet/gauss/highex/on_hit(atom/target, blocked, def_zone) . = ..() - explosion(target, -1, 0, 2) + explosion(get_turf(target), -1, 0, 2) if(ismovable(target)) var/atom/movable/T = target var/throwdir = get_dir(firer,target) @@ -502,7 +502,7 @@ armor_penetration = 5 /obj/projectile/bullet/cannonball/explosive/on_hit(atom/target, blocked, def_zone) - explosion(target, -1, 1, 2) + explosion(get_turf(target), -1, 1, 2) . = ..() /obj/projectile/bullet/nuke @@ -518,7 +518,7 @@ if(ishuman(mob)) mob.apply_damage(250, DAMAGE_RADIATION, damage_flags = DAMAGE_FLAG_DISPERSED) new /obj/effect/temp_visual/nuke(target.loc) - explosion(target,2,5,9) + explosion(get_turf(target),2,5,9) . = ..() /obj/projectile/bullet/shard @@ -542,7 +542,7 @@ var/heavy_impact_range = 1 /obj/projectile/bullet/recoilless_rifle/on_hit(atom/target, blocked, def_zone) - explosion(target, -1, heavy_impact_range, 2) + explosion(get_turf(target), -1, heavy_impact_range, 2) . = ..() /obj/projectile/bullet/peac @@ -562,7 +562,7 @@ /obj/projectile/bullet/peac/on_hit(atom/target, blocked, def_zone) . = ..() - explosion(target, devastation_range, heavy_impact_range, light_impact_range) + explosion(get_turf(target), devastation_range, heavy_impact_range, light_impact_range) /obj/projectile/bullet/peac/he name = "high-explosive missile" diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 091df069b5d..a19652b52be 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -115,7 +115,7 @@ if(ismob(target)) var/mob/M = target M.gib() - explosion(target, -1, 0, 5) + explosion(get_turf(target), -1, 0, 5) . = ..() /obj/projectile/energy/bfg/New() diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index bab1b6e2fcb..8c9d8bd4c8b 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -76,7 +76,7 @@ edge = TRUE /obj/projectile/bullet/gyro/on_hit(atom/target, blocked, def_zone) - explosion(target, -1, 0, 2) + explosion(get_turf(target), -1, 0, 2) . = ..() /obj/projectile/bullet/gyro/law @@ -87,7 +87,7 @@ /obj/projectile/bullet/gyro/law/on_hit(atom/target, blocked, def_zone) . = ..() - explosion(target, -1, 0, 2) + explosion(get_turf(target), -1, 0, 2) var/obj/T = target var/throwdir = get_dir(firer,target) T.throw_at(get_edge_target_turf(target, throwdir),3,3) @@ -215,7 +215,7 @@ edge = TRUE /obj/projectile/bullet/trod/on_hit(atom/target, blocked, def_zone) - explosion(target, 0, 0, 4) + explosion(get_turf(target), 0, 0, 4) . = ..() /obj/projectile/chameleon @@ -235,7 +235,7 @@ penetrating = 1 /obj/projectile/bullet/cannon/on_hit(atom/target, blocked, def_zone) - explosion(target, 1, 2, 3, 3) + explosion(get_turf(target), 1, 2, 3, 3) . = ..() //magic @@ -256,7 +256,7 @@ damage_type = DAMAGE_BURN /obj/projectile/magic/fireball/on_hit(atom/target, blocked, def_zone) - explosion(target, 0, 0, 4) + explosion(get_turf(target), 0, 0, 4) . = ..() /obj/projectile/magic/teleport //literaly bluespace crystal code, because i am lazy and it seems to work @@ -301,7 +301,7 @@ /obj/item/missile/throw_impact(atom/hit_atom) if(primed) - explosion(hit_atom, 0, 1, 2, 4) + explosion(get_turf(hit_atom), 0, 1, 2, 4) qdel(src) else ..() diff --git a/code/modules/projectiles/targeting/targeting_mob.dm b/code/modules/projectiles/targeting/targeting_mob.dm index 564d9ecd876..1a8792e439e 100644 --- a/code/modules/projectiles/targeting/targeting_mob.dm +++ b/code/modules/projectiles/targeting/targeting_mob.dm @@ -1,10 +1,3 @@ -/mob/living - ///The obj to overlay on the aim target - var/obj/aiming_overlay/aiming - - ///A list of mobs the target is being aimed at by - var/list/aimed_at_by - /mob/verb/toggle_gun_mode() set name = "Toggle Gun Mode" set desc = "Begin or stop aiming." diff --git a/code/modules/psionics/abilities/hollow_purple.dm b/code/modules/psionics/abilities/hollow_purple.dm index 75cf907b339..5bf9f9a8f85 100644 --- a/code/modules/psionics/abilities/hollow_purple.dm +++ b/code/modules/psionics/abilities/hollow_purple.dm @@ -77,7 +77,7 @@ if(target != firer) var/mob/M = target M.gib() - explosion(target, 5, 5, 5) + explosion(get_turf(target), 5, 5, 5) . = ..() // /obj/projectile/hollow_purple/after_move() diff --git a/code/modules/psionics/mob/mob.dm b/code/modules/psionics/mob/mob.dm index dddb4da3b50..336ce6a444e 100644 --- a/code/modules/psionics/mob/mob.dm +++ b/code/modules/psionics/mob/mob.dm @@ -1,6 +1,3 @@ -/mob/living - var/datum/psi_complexus/psi - /mob/living/proc/set_psi_rank(var/rank, var/defer_update, var/temporary) if(HAS_TRAIT(src, TRAIT_PSIONICALLY_DEAF)) to_chat(src, SPAN_WARNING("Something tingles in your head.")) diff --git a/code/modules/radiation/radiation.dm b/code/modules/radiation/radiation.dm index 9e52c54b5a2..f913946eeb3 100644 --- a/code/modules/radiation/radiation.dm +++ b/code/modules/radiation/radiation.dm @@ -58,10 +58,6 @@ SSradiation.resistance_cache[src] = (length(contents) + 1) cached_rad_resistance = (density ? material.weight / RADIATION_MATERIAL_RESISTANCE_DIVISOR : 0) -/obj - /// Allow overriding rad resistance. - var/rad_resistance_modifier = 1 - /** * Retrieves the atom's current radiation level. By default, this will return `loc.get_rads()`. * diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 7ca35691a6f..20beaa5d926 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -12,6 +12,7 @@ var/capacity = 1000 var/can_tamper = TRUE var/is_leaking = FALSE + maxhealth = OBJECT_HEALTH_HIGH /obj/structure/reagent_dispensers/mechanics_hints(mob/user, distance, is_adjacent) . += ..() @@ -97,6 +98,15 @@ var/splash_amount = min(amount_per_transfer_from_this,60) //Hard limit of 60 per process reagents.trans_to_turf(get_turf(src),splash_amount) +/obj/structure/reagent_dispensers/on_death(damage, damage_flags, damage_type, armor_penetration, obj/weapon) + if(!should_use_health) + return FALSE + if(reagents.total_volume > 0) + var/splash_area = max(1, round(sqrt(reagents.total_volume / 60.0))) //Splash roughly 60u on every turf. + reagents.splash_area(get_turf(src), splash_area, reagents.total_volume) + visible_message(SPAN_WARNING("As \the [src] is destroyed, it spills [reagents.get_primary_reagent_name()] everywhere!")) + dismantle() + //Fire extinguisher tank /obj/structure/reagent_dispensers/extinguisher @@ -255,6 +265,8 @@ amount_per_transfer_from_this = 45 can_tamper = FALSE reagents_to_add = list(/singleton/reagent/capsaicin/condensed = 1000) + maxhealth = OBJECT_HEALTH_VERY_LOW //Made of glass. + material = MATERIAL_GLASS /obj/structure/reagent_dispensers/virusfood name = "virus food dispenser" @@ -265,6 +277,8 @@ density = 0 can_tamper = FALSE reagents_to_add = list(/singleton/reagent/nutriment/virusfood = 1000) + maxhealth = OBJECT_HEALTH_VERY_LOW //Made of glass. + material = MATERIAL_GLASS /obj/structure/reagent_dispensers/acid name = "sulphuric acid dispenser" @@ -275,6 +289,8 @@ density = 0 can_tamper = FALSE reagents_to_add = list(/singleton/reagent/acid = 1000) + maxhealth = OBJECT_HEALTH_VERY_LOW //Made of glass. + material = MATERIAL_GLASS /obj/structure/reagent_dispensers/peppertank/luminol name = "luminol dispenser" @@ -282,6 +298,8 @@ icon_state = "luminoltank" amount_per_transfer_from_this = 50 reagents_to_add = list(/singleton/reagent/luminol = 1000) + maxhealth = OBJECT_HEALTH_VERY_LOW //Made of glass. + material = MATERIAL_GLASS /obj/structure/reagent_dispensers/peppertank/spacecleaner name = "cleaner dispenser" @@ -289,6 +307,8 @@ icon_state = "cleanertank" amount_per_transfer_from_this = 250 reagents_to_add = list(/singleton/reagent/spacecleaner = 1000) + maxhealth = OBJECT_HEALTH_VERY_LOW //Made of glass. + material = MATERIAL_GLASS //Water Cooler @@ -305,6 +325,8 @@ reagents_to_add = list(/singleton/reagent/water = 500) var/cups = 12 var/cup_type = /obj/item/reagent_containers/food/drinks/sillycup + maxhealth = OBJECT_HEALTH_LOW //Made of plastic. + material = MATERIAL_PLASTIC /obj/structure/reagent_dispensers/water_cooler/attack_hand(var/mob/user) if(cups > 0) @@ -348,6 +370,8 @@ desc = "An empty keg." icon_state = "keg" amount_per_transfer_from_this = 10 + maxhealth = OBJECT_HEALTH_LOW //Made of wood + material = MATERIAL_WOOD /obj/structure/reagent_dispensers/keg/attackby(obj/item/attacking_item, mob/user) if (istype(attacking_item, /obj/item/stack/rods)) @@ -479,6 +503,8 @@ icon_state = "chemical_barrel" amount_per_transfer_from_this = 300 reagents_to_add = list(/singleton/reagent/radioactive_waste = 1000) + maxhealth = OBJECT_HEALTH_VERY_HIGH //Made of plasteel, because it's dangerous to break. + material = MATERIAL_PLASTEEL /obj/structure/reagent_dispensers/antagonist_hints(mob/user, distance, is_adjacent) . += ..() diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b07a7d4dc5b..6c872ca91ac 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -716,9 +716,9 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "

  • [last_category]

    " var/temp_dat for(var/M in D.materials) - temp_dat += ", [D.materials[M]*linked_imprinter.mat_efficiency] [CallMaterialName(M)]" + temp_dat += ", [D.materials[M]*linked_lathe.mat_efficiency] [CallMaterialName(M)]" for(var/T in D.chemicals) - temp_dat += ", [D.chemicals[T]*linked_imprinter.mat_efficiency] [CallReagentName(T)]" + temp_dat += ", [D.chemicals[T]*linked_lathe.mat_efficiency] [CallReagentName(T)]" if(temp_dat) temp_dat = " \[[copytext(temp_dat, 3)]\]" if(linked_lathe.canBuild(D)) diff --git a/code/modules/research/weaponsanalyzer.dm b/code/modules/research/weaponsanalyzer.dm index 1f0421a5e15..8b30ceee471 100644 --- a/code/modules/research/weaponsanalyzer.dm +++ b/code/modules/research/weaponsanalyzer.dm @@ -23,6 +23,13 @@ var/mob/living/carbon/human/H = user + if(default_deconstruction_screwdriver(user, attacking_item)) + return TRUE + if(default_deconstruction_crowbar(user, attacking_item)) + return TRUE + if(default_part_replacement(user, attacking_item)) + return TRUE + if(istype(attacking_item, /obj/item/gun)) check_swap(user, attacking_item) item = attacking_item @@ -55,7 +62,8 @@ addtimer(CALLBACK(src, PROC_REF(reset)), 15) process = TRUE update_icon() - + else if(istype(attacking_item, /obj/item/combitool)) + return else if(attacking_item) check_swap(user, attacking_item) item = attacking_item @@ -120,7 +128,7 @@ if(istype(item, /obj/item/laser_assembly)) var/obj/item/laser_assembly/A = item A.update_icon() - icon_state = process ? "[icon_state]_working" : "[icon_state]_on" + icon_state = process ? "[icon_state]_working" : "[icon_state]_on" Icon_used = new /icon(item.icon, item.icon_state) else if(item) icon_state = "[icon_state]_on" diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm index 11282354d88..955b891d8be 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm @@ -4,9 +4,6 @@ // This could be extended to atoms, but it's bad enough as is // I genuinely tried to Add and Remove them from var and proc lists, but just couldn't get it working -//for easy reference -/obj/var/datum/talking_atom/talking_atom - /datum/talking_atom var/list/heard_words = list() var/last_talk_time = 0 diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index fbc5cde3290..39aaeeb4556 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -70,4 +70,3 @@ /obj/structure/machinery/alarm/monitor/isolation req_one_access = list(ACCESS_RESEARCH, ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP) locked = 0 - remote_control = 1 diff --git a/code/modules/shareddream/dream_entry.dm b/code/modules/shareddream/dream_entry.dm index a9a11bbae60..b22259c5d57 100644 --- a/code/modules/shareddream/dream_entry.dm +++ b/code/modules/shareddream/dream_entry.dm @@ -1,13 +1,6 @@ ///A list of `/turf` where the Srom is located, and people entering the shared dream (presumably Skrells sleeping) will be casted to GLOBAL_LIST_EMPTY_TYPED(dream_entries, /turf) -/mob - var/mob/living/brain_ghost/bg - -/mob/living/carbon/human - var/datum/weakref/srom_pulled_by - var/datum/weakref/srom_pulling - /mob/living/carbon/human/proc/handle_shared_dreaming(var/force_wakeup = FALSE) SHOULD_NOT_SLEEP(TRUE) if(is_psi_blocked(src)) // Can't enter the dream if the caster is blocked from RECEIVING. It's a two-way street. diff --git a/code/modules/shieldgen/_energy_field.dm b/code/modules/shieldgen/_energy_field.dm index bf74e5c8f50..4040952b431 100644 --- a/code/modules/shieldgen/_energy_field.dm +++ b/code/modules/shieldgen/_energy_field.dm @@ -5,11 +5,11 @@ /// The actual strength of the field. var/field_strength = 0 /// Current strengthening rate of a single field. - var/strengthen_rate = 0.2 - /// Maximum rate by which an energy field can be strengthened. - var/max_strengthen_rate = 0.5 - /// The percentage of the shield strength that needs to be replaced each second - var/dissipation_rate = 0.030 + var/strengthen_rate = 0.1 + /// Maximum rate by which an energy field can be strengthened. This is set by shield components in RefreshComponents, the initial rate with standard components is 0.5 (2 Manipulators, Rating 1: give 0.1 each) + var/max_strengthen_rate = 0.3 + /// The percentage of the shield strength that needs to be replaced each second. This is modified by shield components in RefreshComponents, the initial rate with standard components is 0.030. (2 Micro Lasers, Rating 1: subtract 0.003 each) + var/dissipation_rate = 0.036 /// An energy field will dissipate by at least this rate in renwicks per field tile (otherwise field would never dissipate completely as dissipation is a percentage) var/min_dissipation = 0.01 /// Our target field strength. @@ -18,8 +18,8 @@ var/max_field_strength = 10 /// The time passed since the last "fail", AKA losing charge faster than you can replenish it. var/time_since_fail = 100 - /// How many renwicks per watt. - var/energy_conversion_rate = 0.00006 + /// How many renwicks per watt. This is modified by shield components in RefreshComponents, the initial rate with standard components is 0.00005 (2 Capacitors, Rating 1: give 0.00001 each) + var/energy_conversion_rate = 0.00003 /// If the field is strong, then the energy field objects will turn dense. var/strong_field = FALSE @@ -32,6 +32,7 @@ * @assumed_charge: the charge that is given to this energy field. You have to get the required energy first, if you want a balanced field. */ /datum/energy_field/proc/handle_strength(assumed_charge = 0) + assumed_charge = max(assumed_charge, 0) if(length(field)) time_since_fail++ //the amount of renwicks that the generator can add this tick, over the entire field @@ -40,7 +41,7 @@ var/renwick_increase_per_field = total_renwick_increase / length(field) //per field tile var/renwick_upkeep_per_field = max(field_strength * dissipation_rate, min_dissipation) var/amount_to_strengthen = renwick_increase_per_field - renwick_upkeep_per_field - field_strength = min(field_strength + amount_to_strengthen, max_field_strength) + field_strength = max(min(field_strength + amount_to_strengthen, max_field_strength), 0) if(field_strength < 1) if(strong_field) @@ -61,7 +62,7 @@ var/required_energy = 0 if(length(field)) var/renwick_upkeep_per_field = max(field_strength * dissipation_rate, min_dissipation) - var/target_renwick_increase = min(target_field_strength - field_strength, strengthen_rate) + renwick_upkeep_per_field //per field tile + var/target_renwick_increase = max(min(target_field_strength - field_strength, strengthen_rate) + renwick_upkeep_per_field, 0) //per field tile required_energy = length(field) * target_renwick_increase / energy_conversion_rate return required_energy @@ -100,8 +101,8 @@ data["average_field"] = round(field_strength, 0.01) data["progress_field"] = (target_field_strength ? round(100 * field_strength / target_field_strength, 0.1) : "NA") - data["power_take"] = round(length(field) * max(field_strength * dissipation_rate, min_dissipation) / energy_conversion_rate) - data["shield_power"] = round(length(field) * min(strengthen_rate, target_field_strength - field_strength) / energy_conversion_rate) + data["power_take"] = round(length(field) * max(field_strength * dissipation_rate, min_dissipation) / energy_conversion_rate / 1000) //Divide by 100 to convert to kW + data["shield_power"] = round(max(length(field) * min(strengthen_rate, target_field_strength - field_strength) / energy_conversion_rate / 1000, 0)) //Divide by 100 to convert to kW data["strengthen_rate"] = (strengthen_rate * 10) data["max_strengthen_rate"] = (max_strengthen_rate * 10) data["target_field_strength"] = target_field_strength diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 87a611f4c68..356d264fefa 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -334,7 +334,7 @@ /obj/structure/machinery/shield/attackby(obj/item/attacking_item, mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) //Calculate damage var/aforce = attacking_item.force if(attacking_item.damtype == DAMAGE_BRUTE || attacking_item.damtype == DAMAGE_BURN) diff --git a/code/modules/shieldgen/energy_field.dm b/code/modules/shieldgen/energy_field.dm index 3c9de1eefaf..d13f073587c 100644 --- a/code/modules/shieldgen/energy_field.dm +++ b/code/modules/shieldgen/energy_field.dm @@ -18,6 +18,7 @@ var/ticks_recovering = 10 /// If strength goes is 1 or above, this is set to TRUE, this is to prevent flickering and animate being called constantly var/is_strong = FALSE + pass_flags_self = PASSSHIELD //Currently only ship weapons have this flag. atmos_canpass = CANPASS_ALWAYS @@ -42,7 +43,8 @@ energy_field.remove_individual_field(src) /obj/effect/energy_field/attackby(obj/item/attacking_item, mob/user) - user.do_attack_animation(src, attacking_item) + user.do_attack_animation(src, used_item = attacking_item) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(attacking_item.force < 10) user.visible_message(SPAN_WARNING("[user] harmlessly attacks \the [src] with \the [attacking_item]."), SPAN_WARNING("You attack \the [src] with \the [attacking_item], but it bounces off without doing any damage.")) @@ -55,7 +57,7 @@ if(istype(H)) if(H.species.can_shred(H)) H.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - H.do_attack_animation(src, FIST_ATTACK_ANIMATION) + H.do_attack_animation(src) H.visible_message(SPAN_WARNING("[H] shreds \the [src]!"), SPAN_WARNING("You shred \the [src]!")) damage_field(1) return @@ -65,17 +67,76 @@ damage_field(0.5 + severity) /obj/effect/energy_field/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) - . = ..() + + var/initial_damage = hitting_projectile.get_structure_damage() + /** + * The shield has three possible interactions with a projectile: + * + * If the projectile is piercing (penetrating >= 1 and pierce_flags = PASSSHIELD), the shield will decrease what it can subsequently penetrate. + * The projectile will have it's pierces increased by half the shield's strength. If a projectile's pierces is greater than it's penetrating, it stops. + * + * Eg. A penetrating 10 shot hits a strength 10 shield. It will subsequently go through 4 additional walls (10/2 = 5, +1 for the shield tile), instead of the 10 it would originally. + */ + if(piercing_hit) + hitting_projectile.pierces += round((energy_field.field_strength / 2)) + if(hitting_projectile.pierces < hitting_projectile.penetrating) + visible_message(SPAN_WARNING("\The [src] flickers and fails as it is penetrated by the \the [hitting_projectile].")) + damage_field(initial_damage / 20) //The shield takes less damage if it is penetrated like this. + return BULLET_ACT_FORCE_PIERCE + + /** + * A projectile without pass_flags = PASSSHIELD will have its damage reduced by the shield, if its damage is reduced to zero it is blocked. + * A strong projectile hitting a weak shield will penetrate it. A strength 10 field will always block a projectile. + * The projectile's damage is multiplied by 1 minus the shield's strength divided by 10, then the shield's strength is subtracted from it's damage. + * + * Eg. A 50 damage projectile hits a 5 strength shield. (damage multiplier: 1 - 5/10 = 0.5), (shot damage: = 50 * 0.5 = 25), (final damage: 25 - 5 = 20). Penetrates. + * Therefore the shot would continue on, but only deal 20 damage when it hits. + * + * Eg. A 50 damage projectile hits a 9 strength shield. (damage multiplier: 1 - 9/10 = 0.1), (shot damage: = 50 * 0.1 = 5), (final damage: 5 - 9 = -4). Blocked. + */ + if(energy_field.field_strength < 10) //A strength 10 field will always block a projectile. Without modifications to the engines, one or more upgraded SMES units, or upgrades from research the Horizon cannot generate a field of strength 10 that covers the whole ship. + hitting_projectile.damage *= 1 - max(0, energy_field.field_strength / 10) + hitting_projectile.damage -= energy_field.field_strength + if(hitting_projectile.damage >= 0) + damage_field(initial_damage / 10) + visible_message(SPAN_WARNING("\The [src] flashes and depletes the [hitting_projectile]'s energy, but doesn't fully block it.")) + return BULLET_ACT_FORCE_PIERCE + else + visible_message(SPAN_WARNING("\The [src] shimmers and absorbs \the [hitting_projectile].")) + return BULLET_ACT_BLOCK + + /** + * An explosive projectile that fails to penetrate will be deleted before it can explode. + * All explosive ship weapons also have high damage, so this only really matters on a strength 10 shield. + * If the projectile is explosive, it deals whatever damage that explosion would have done to the shield. + */ + if(istype(hitting_projectile, /obj/projectile/ship_ammo)) + var/obj/projectile/ship_ammo/explosive_projectile = hitting_projectile + if(explosive_projectile.explosion_strength[3] || explosive_projectile.explosion_strength[2] || explosive_projectile.explosion_strength[1]) + for(var/obj/effect/energy_field/shield_tile in energy_field.field) + var/distance = get_dist(src, shield_tile) + if(distance <= explosive_projectile.explosion_strength[1]) + shield_tile.damage_field(3) + else if(distance <= explosive_projectile.explosion_strength[2]) + shield_tile.damage_field(2) + else if(distance <= explosive_projectile.explosion_strength[3]) + shield_tile.damage_field(1) + // explosive_projectile.explosion_strength = list(0, 0, 0) // Set the explosion strength to 0. + visible_message(SPAN_WARNING("\The [src] shimmers and absorbs \the [hitting_projectile].")) + return BULLET_ACT_BLOCK + + damage_field(initial_damage / 10) + + . = ..() //If we get down here fall back on normal piercing calculations, for normal projectiles hitting shields. if(. != BULLET_ACT_HIT) return . - damage_field(hitting_projectile.get_structure_damage() / 10) - /obj/effect/energy_field/proc/damage_field(var/severity) if(!severity) return damage += severity + energy_field.field_strength = max(energy_field.field_strength - (severity / length(energy_field.field)), 0) if(!(datum_flags & DF_ISPROCESSING)) // Start processing ONLY when we're damaged. Through processing, we're going to slowly climb back up to field strength. diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 5bbd8d2f3e1..181fe3ecc7a 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -14,13 +14,33 @@ var/stored_charge = 0 var/last_stored_charge = 0 var/time_since_fail = 100 - var/max_charge = 2e7 //20 MJ - var/max_charge_rate = 9000000 //9 MW + ///How much energy the capacitor can store, value is in Joules, displayed in the UI as MJ. This value is calculated in RefreshParts() based on the components used, the value listed here is what base components provides, changing the value only here will not do anything. + var/max_charge = 20 MEGA //200 MJ + ///How much energy the capacitor can absorb per second, value is in Watts, displayed in the UI as MW. This value is calculated in RefreshParts() based on the components used, the value listed here is what base components provides, changing the value only here will not do anything. + var/max_charge_rate = 9 MEGA WATTS //9 MW var/locked = FALSE - var/charge_rate = 100000 //100 kW + var/charge_rate = 100 KILO WATTS //100 kW var/obj/structure/machinery/shield_gen/owned_gen + component_types = list( + /obj/item/circuitboard/shield_cap, + /obj/item/stock_parts/capacitor = 4, + /obj/item/stock_parts/micro_laser = 1, + /obj/item/stock_parts/subspace/filter = 1, + /obj/item/stock_parts/subspace/treatment = 1, + /obj/item/stock_parts/subspace/analyzer = 1, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 5 + ) + +/obj/structure/machinery/shield_capacitor/upgrade_hints(mob/user, distance, is_adjacent) + . += ..() + . += "Upgraded capacitors will increase capacity." + . += SPAN_NOTICE(" - The current capacity is [max_charge / 1e6] MJ") + . += "Upgraded microlasers will increase the charging rate." + . += SPAN_NOTICE(" - The current maximum charge rate is [max_charge_rate / 1e6] MW") + /obj/structure/machinery/shield_capacitor/Initialize() ..() return INITIALIZE_HINT_LATELOAD @@ -29,8 +49,9 @@ . = ..() for(var/obj/structure/machinery/shield_gen/possible_gen in range(1, src)) if(get_dir(src, possible_gen) == dir) - possible_gen.owned_capacitor = src - break + if(possible_gen.attach_capacitor(src)) + owned_gen = possible_gen + break /obj/structure/machinery/shield_capacitor/emag_act(var/remaining_charges, var/mob/user) if(prob(75)) @@ -40,8 +61,26 @@ updateDialog() spark(src, 5, GLOB.alldirs) +/obj/structure/machinery/shield_capacitor/RefreshParts() + ..() + max_charge = 0 + max_charge_rate = 6 MEGA WATTS //9 MW after base components. 15 MW with full upgrades. + + for(var/obj/item/stock_parts/P in component_parts) + if(iscapacitor(P)) + max_charge += P.rating * 5 MEGA + else if(ismicrolaser(P)) + max_charge_rate += P.rating * 3 MEGA WATTS + /obj/structure/machinery/shield_capacitor/attackby(obj/item/attacking_item, mob/user) + if(default_part_replacement(user, attacking_item)) + return TRUE + else if(default_deconstruction_screwdriver(user, attacking_item)) + return TRUE + else if(default_deconstruction_crowbar(user, attacking_item)) + return TRUE + if(istype(attacking_item, /obj/item/card/id)) if(allowed(user)) locked = !locked @@ -55,14 +94,14 @@ if(anchored) for(var/obj/structure/machinery/shield_gen/gen in range(1, src)) - if(get_dir(src, gen) == src.dir && !gen.owned_capacitor) - owned_gen = gen - owned_gen.owned_capacitor = src - owned_gen.updateDialog() + if(get_dir(src, gen) == src.dir) + if(gen.attach_capacitor(src)) + owned_gen = gen + break else - if(owned_gen && owned_gen.owned_capacitor == src) - owned_gen.owned_capacitor = null - owned_gen = null + if(owned_gen) + owned_gen.detach_capacitor(src) + owned_gen = null else ..() @@ -71,6 +110,11 @@ return ui_interact(user) +/obj/structure/machinery/shield_capacitor/attack_ai(mob/user) + if(!ai_can_interact(user)) + return + return attack_hand(user) + /obj/structure/machinery/shield_capacitor/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -83,10 +127,10 @@ data["locked"] = locked data["active"] = active data["time_since_fail"] = time_since_fail - data["charge_rate"] = charge_rate - data["stored_charge"] = stored_charge - data["max_charge"] = max_charge - data["max_charge_rate"] = max_charge_rate + data["charge_rate"] = charge_rate / 1000 //UI expects kW + data["stored_charge"] = round(stored_charge / 1e6, 0.1) //UI expects MJ + data["max_charge"] = max_charge / 1e6 //UI expects MJ + data["max_charge_rate"] = max_charge_rate / 1000 //UI expects kW return data /obj/structure/machinery/shield_capacitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -101,7 +145,8 @@ active = !active . = TRUE if("charge_rate") - charge_rate = between(10000, params["charge_rate"], max_charge_rate) + // UI sends kW; convert to W and clamp. + charge_rate = between(0 KILO WATTS, round(params["charge_rate"]) * 1000, max_charge_rate) . = TRUE /obj/structure/machinery/shield_capacitor/process() @@ -140,4 +185,3 @@ /// Horizon-specific non-variant, for now. /obj/structure/machinery/shield_capacitor/multiz - diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 74444065f45..5d177effd09 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -25,23 +25,52 @@ var/field_radius = 3 /// Maximum field radius. var/max_field_radius = 100 - /// The shield capacitor attached to this shield generator. - var/obj/structure/machinery/shield_capacitor/owned_capacitor + /// The shield capacitors attached to this shield generator. + var/list/owned_capacitors = list() /// If this shield generator supports multi-z. var/multiz = TRUE + ///How much the manipulator rating increases the maximum field strengthen rate. This increases how fast the shield can strengthen, allowing it to recover faster. + var/manipulator_bonus = 0.1 //Maximum recovery rate with base components is 0.5 renwicks per second, with maxed out manipulators it's 0.9 renwicks per second. + ///How much the capacitor rating increases the field conversion rate. This increases the efficiency of converting power into shield strength, decreasing all shield power costs. + var/capacitor_bonus = 0.000005 + ///How much the micro laser rating decreased the field dissipation rate. This reduces the amount of shield strength lost per tick, reducing the shield upkeep. + var/micro_laser_bonus = 0.002 + + component_types = list( + /obj/item/circuitboard/shield_gen, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/micro_laser = 2, + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/subspace/transmitter = 1, + /obj/item/stock_parts/subspace/crystal = 1, + /obj/item/stock_parts/subspace/amplifier = 1, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 5 + ) /obj/structure/machinery/shield_gen/Initialize() - for(var/obj/structure/machinery/shield_capacitor/possible_cap in range(1, src)) - if(get_dir(possible_cap, src) == possible_cap.dir) - owned_capacitor = possible_cap - break + owned_capacitors = list() + for(var/obj/structure/machinery/shield_capacitor/possible_cap in range(1, src)) //Attach nearby capacitors + attach_capacitor(possible_cap) energy_field = new(src, get_shielded_turfs()) . = ..() /obj/structure/machinery/shield_gen/Destroy() - owned_capacitor = null + for(var/obj/structure/machinery/shield_capacitor/cap in owned_capacitors) //Detach any owned capacitors + detach_capacitor(cap) + owned_capacitors = list() return ..() +/obj/structure/machinery/shield_gen/upgrade_hints(mob/user, distance, is_adjacent) + . += ..() + . += "Upgraded manipulators will increase the maximum field strengthen rate." + . += SPAN_NOTICE("\t- The current maximum field strengthen rate is [energy_field.max_strengthen_rate] renwicks per second.") + . += "Upgraded capacitors will increase the field conversion rate." + . += SPAN_NOTICE("\t- The current field conversion efficiency increase is: [(initial(energy_field.energy_conversion_rate) + (2 * capacitor_bonus)) / energy_field.energy_conversion_rate * 100]%") + . += "Upgraded micro lasers will decrease the energy field dispersion rate." + . += SPAN_NOTICE("\t- The current field dissipation rate decrease is: [(initial(energy_field.dissipation_rate) - (2 * micro_laser_bonus)) / energy_field.dissipation_rate * 100]%") + + /obj/structure/machinery/shield_gen/emag_act(var/remaining_charges, var/mob/user) if(prob(75)) locked = !locked @@ -52,6 +81,13 @@ spark(src, 5, GLOB.alldirs) /obj/structure/machinery/shield_gen/attackby(obj/item/attacking_item, mob/user) + if(default_part_replacement(user, attacking_item)) + return TRUE + else if(default_deconstruction_screwdriver(user, attacking_item)) + return TRUE + else if(default_deconstruction_crowbar(user, attacking_item)) + return TRUE + if(istype(attacking_item, /obj/item/card/id)) if(allowed(user)) locked = !locked @@ -66,20 +102,38 @@ if(active) toggle() if(anchored) + // Attach nearby capacitors wrenching down the shield + owned_capacitors = list() for(var/obj/structure/machinery/shield_capacitor/cap in range(1, src)) - if(cap.owned_gen) - continue - if(get_dir(cap, src) == cap.dir && cap.anchored) - owned_capacitor = cap - owned_capacitor.owned_gen = src - break + attach_capacitor(cap) else - if(owned_capacitor && owned_capacitor.owned_gen == src) - owned_capacitor.owned_gen = null - owned_capacitor = null + // Detach any owned capacitors when unwrenching + for(var/obj/structure/machinery/shield_capacitor/cap in owned_capacitors) + detach_capacitor(cap) + owned_capacitors = list() else ..() +/obj/structure/machinery/shield_gen/RefreshParts() + ..() + var/max_strengthen_rate_increase = 0 + var/energy_conversion_rate_increase = 0 + var/dissipation_rate_decrease = 0 + + for(var/obj/item/stock_parts/P in component_parts) + if(ismanipulator(P)) + max_strengthen_rate_increase += P.rating + else if(iscapacitor(P)) + energy_conversion_rate_increase += P.rating + else if(ismicrolaser(P)) + dissipation_rate_decrease += P.rating + + if(energy_field) + energy_field.max_strengthen_rate = initial(energy_field.max_strengthen_rate) + (max_strengthen_rate_increase * manipulator_bonus) + energy_field.energy_conversion_rate = initial(energy_field.energy_conversion_rate) + (energy_conversion_rate_increase * capacitor_bonus) + energy_field.dissipation_rate = max(0, initial(energy_field.dissipation_rate) - (dissipation_rate_decrease * micro_laser_bonus)) + energy_field.strengthen_rate = min(energy_field.strengthen_rate, energy_field.max_strengthen_rate) ///If the strengthen rate got decreased and the current strengthen rate is now above the max, reduce it to the max. + /obj/structure/machinery/shield_gen/attack_ai(mob/user) if(!ai_can_interact(user)) return @@ -98,22 +152,38 @@ to_chat(user, SPAN_WARNING("The device needs to be bolted to the ground first.")) return else - if(owned_capacitor) - if(!((owned_capacitor in range(1, src)) && get_dir(owned_capacitor, src) == owned_capacitor.dir && owned_capacitor.anchored)) - if(owned_capacitor.owned_gen == src) - owned_capacitor.owned_gen = null - owned_capacitor = null - if(!owned_capacitor) + for(var/obj/structure/machinery/shield_capacitor/cap in owned_capacitors) //Make sure the capacitors weren't blown up + if(!(cap in range(1, src)) || get_dir(cap, src) != cap.dir || !cap.anchored) + if(cap && cap.owned_gen == src) + cap.owned_gen = null + owned_capacitors -= cap + if(!owned_capacitors || owned_capacitors.len == 0) // Try to attach any valid adjacent capacitors for(var/obj/structure/machinery/shield_capacitor/cap in range(1, src)) - if(cap.owned_gen) - continue - if(get_dir(cap, src) == cap.dir && cap.anchored) - owned_capacitor = cap - owned_capacitor.owned_gen = src - updateDialog() - break + attach_capacitor(cap) return ui_interact(user) +/obj/structure/machinery/shield_gen/proc/attach_capacitor(obj/structure/machinery/shield_capacitor/cap) + if(!cap || cap.owned_gen || !cap.anchored) + return FALSE + if(!(cap in range(1, src)) || get_dir(cap, src) != cap.dir) + return FALSE + if(!owned_capacitors) + owned_capacitors = list() + owned_capacitors += cap + cap.owned_gen = src + updateDialog() + return TRUE + +/obj/structure/machinery/shield_gen/proc/detach_capacitor(obj/structure/machinery/shield_capacitor/cap) + if(!cap) + return FALSE + if(owned_capacitors && (cap in owned_capacitors)) + owned_capacitors -= cap + if(cap.owned_gen == src) + cap.owned_gen = null + updateDialog() + return TRUE + /obj/structure/machinery/shield_gen/process() if(active) if(!anchored) @@ -128,15 +198,41 @@ energy_field.handle_strength(assumed_charge) /** - * Called whenever the field needs to take charge from the capacitor. + * Called whenever the field needs to take charge from attached capacitors. */ /obj/structure/machinery/shield_gen/proc/assume_charge(required_energy) - if(!owned_capacitor || !owned_capacitor.active) + if(!owned_capacitors || owned_capacitors.len == 0) return 0 - var/assumed_charge = min(owned_capacitor.stored_charge, required_energy) - assumed_charge = max(assumed_charge, 0) - owned_capacitor.stored_charge -= assumed_charge - return assumed_charge + var/list/active_capacitors = list() + var/available_charge = 0 + for(var/obj/structure/machinery/shield_capacitor/cap in owned_capacitors) //Loop through capacitors that can provide charge + if(!cap || !cap.active || cap.stored_charge <= 0) + continue + active_capacitors += cap + available_charge += cap.stored_charge + + if(!active_capacitors.len || available_charge <= 0) //If we have no capacitors, or they're not charged stop + return 0 + + var/assumed_charge = min(available_charge, required_energy) + if(assumed_charge >= available_charge) + for(var/obj/structure/machinery/shield_capacitor/cap in active_capacitors) + cap.stored_charge = 0 + return assumed_charge + + var/remaining = assumed_charge + for(var/i = 1, i <= active_capacitors.len, i++) + var/obj/structure/machinery/shield_capacitor/cap = active_capacitors[i] + var/took = (i == active_capacitors.len) ? remaining : round(assumed_charge * (cap.stored_charge / available_charge)) + took = min(took, cap.stored_charge, remaining) + if(took <= 0) + continue + cap.stored_charge -= took + remaining -= took + if(remaining <= 0) + break + + return assumed_charge - remaining /obj/structure/machinery/shield_gen/ex_act(var/severity) if(active) @@ -145,12 +241,18 @@ /obj/structure/machinery/shield_gen/proc/toggle() if(!active) - if(!owned_capacitor) + if(!owned_capacitors || owned_capacitors.len == 0) balloon_alert_to_viewers("no capacitor") return - else if(!owned_capacitor?.active) - balloon_alert_to_viewers("capacitor offline") - return + else + var/has_active = FALSE + for(var/obj/structure/machinery/shield_capacitor/cap in owned_capacitors) + if(cap && cap.active) + has_active = TRUE + break + if(!has_active) + balloon_alert_to_viewers("capacitors offline") + return active = !active update_icon() if(active) @@ -213,7 +315,8 @@ /obj/structure/machinery/shield_gen/ui_data(mob/user) var/list/data = list() - data["owned_capacitor"] = !!owned_capacitor + data["owned_capacitor"] = length(owned_capacitors) + data["owned_capacitor_count"] = length(owned_capacitors) data["active"] = active data["time_since_fail"] = energy_field ? energy_field.time_since_fail : 0 data["multiz"] = multiz diff --git a/code/modules/shieldgen/shield_gen_external.dm b/code/modules/shieldgen/shield_gen_external.dm index 1467af01a87..9ba333e24ec 100644 --- a/code/modules/shieldgen/shield_gen_external.dm +++ b/code/modules/shieldgen/shield_gen_external.dm @@ -4,6 +4,18 @@ /obj/structure/machinery/shield_gen/external name = "hull shield generator" + component_types = list( + /obj/item/circuitboard/shield_gen_ex, + /obj/item/stock_parts/manipulator = 2, + /obj/item/stock_parts/micro_laser = 2, + /obj/item/stock_parts/capacitor = 2, + /obj/item/stock_parts/subspace/transmitter = 1, + /obj/item/stock_parts/subspace/crystal = 1, + /obj/item/stock_parts/subspace/amplifier = 1, + /obj/item/stock_parts/console_screen = 1, + /obj/item/stack/cable_coil = 5 + ) + //Search for space turfs within range that are adjacent to a simulated turf. /obj/structure/machinery/shield_gen/external/get_shielded_turfs() var/list/out = list() @@ -18,15 +30,15 @@ for (var/tt in RANGE_TURFS(field_radius, gen_turf)) T = tt // Ignore station areas. - if (GLOB.the_station_areas[T.loc] || is_shuttle_area(T.loc)) + if ((GLOB.the_station_areas[T.loc] && !is_shieldless_exterior(T.loc)) || is_shuttle_area(T.loc)) continue - else if (istype(T, /turf/space) || istype(T, /turf/simulated/floor/exoplanet/asteroid) || isopenturf(T) || istype(T, /turf/simulated/floor/reinforced)) + else if (istype(T, /turf/space) || isopenturf(T) || istype(T, /turf/simulated/floor/reinforced)) for (var/uu in RANGE_TURFS(1, T)) U = uu if (T == U) continue - if (GLOB.the_station_areas[U.loc] || istype(U, /turf/simulated/mineral/surface)) + if (GLOB.the_station_areas[U.loc] && !is_shieldless_exterior(U.loc)) out += T break @@ -40,19 +52,21 @@ if(below) for(var/turf/z as anything in below) connected_levels += z + for(var/turf/z in connected_levels) for (var/tt in RANGE_TURFS(field_radius, z)) T = tt // Ignore station areas. - if (GLOB.the_station_areas[T.loc] || istype(T.loc, /area/shuttle)) + if ((GLOB.the_station_areas[T.loc] && !is_shieldless_exterior(T.loc)) || istype(T.loc, /area/shuttle)) continue - else if (istype(T, /turf/space) || istype(T, /turf/simulated/floor/exoplanet/asteroid) || isopenturf(T) || istype(T, /turf/simulated/floor/reinforced)) + + else if (istype(T, /turf/space) || isopenturf(T) || istype(T, /turf/simulated/floor/reinforced)) for (var/uu in RANGE_TURFS(1, T)) U = uu if (T == U) continue - if (GLOB.the_station_areas[U.loc]) + if (GLOB.the_station_areas[U.loc] && !is_shieldless_exterior(U.loc)) out += T break return out diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 258a519542d..23edf40dea0 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -776,7 +776,7 @@ if(!istype(endoskeleton)) return FALSE - return affected && affected.open == ORGAN_ENCASED_RETRACTED && affected.organ_tag == BP_CHEST && target_zone != BP_MOUTH && endoskeleton.damage > 0 + return affected && affected.open == ORGAN_ENCASED_RETRACTED && affected.limb_name == BP_CHEST && target_zone != BP_MOUTH && endoskeleton.damage > 0 /singleton/surgery_step/robotics/repair_endoskeleton/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message("[user] begins to repair the support structures of [target]'s endoskeleton with \the [tool]." , \ diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 5d4d4550e6c..a005022e313 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -193,5 +193,5 @@ var/list/in_progress = list() /datum/surgery_status/Destroy(force) - in_progress = null - . = ..() + in_progress?.Cut() + return ..() diff --git a/code/modules/tgchat/README.md b/code/modules/tgchat/README.md new file mode 100644 index 00000000000..d2a99e5ffd2 --- /dev/null +++ b/code/modules/tgchat/README.md @@ -0,0 +1,31 @@ +## /TG/ Chat + +/TG/ Chat, which will be referred to as TgChat from this point onwards, is a system in which we can send messages to clients in a controlled and semi-reliable manner. The standard way of sending messages to BYOND clients simply dumps whatever you output to them directly into their chat window, however BYOND allows us to load our own code on the client to change this behaviour in a way that allows us to do some pretty neat things. + +### Message Format + +TgChat handles sending messages from the server to the client through the use of JSON payloads, of which the format will change depending on the type of message and the intended client endpoint. An example of the payload for chat messages is as follows: + +```json +{ + "sequence": 0, + "content": { + "type": ". . .", // ?optional + "text": ". . .", // ?optional !atleast-one + "html": ". . .", // ?optional !atleast-one + "avoidHighlighting": 0 // ?optional + } +} +``` + +### Reliability + +In the past there have been issues where BYOND will silently and without reason lose a message we sent to the client, to detect this and recover from it seamlessly TgChat also has a baked in reliability layer. This reliability layer is very primitive, and simply keeps track of received sequence numbers. Should the client receive an unexpected sequence number TgChat asks the server to resend any missing packets. + +### Ping System + +TgChat supports a round trip time ping measurement, which is displayed to the client so they can know how long it takes for their commands and inputs to reach the server. This is done by sending the client a ping request, `ping/soft`, which tells the client to send a ping to the server. When the server receives said ping it sends a reply, `ping/reply`, to the client with a payload containing the current DateTime which the client can reference against the initial ping request. + +### Chat Tabs, Local Storage, and Highlighting + +To make organizing and managing chat easier and more functional for both players and admins, TgChat has the ability to filter out messages based on their primary tag, such as individual departmental radios, to a dedicated chat tab for easier reading and comprehension. These tabs can also be configured to highlist messages based on a simple keyword search. You can set a multitude of different keywords to search for and they will be highlighting for instant alerting of the client. Said tabs, highlighting rules, and your chat history will persist thanks to use of local storage on the client. Using local storage TgChat can ensure that your preferences are saved and maintained between client restarts and switching between other /TG/ servers. Local Storage is also used to keep your chat history aswell, should you need to scroll through your chat logs. diff --git a/code/modules/tgchat/to_chat.dm b/code/modules/tgchat/to_chat.dm index 09c9b536c06..965d9545ff1 100644 --- a/code/modules/tgchat/to_chat.dm +++ b/code/modules/tgchat/to_chat.dm @@ -35,23 +35,8 @@ if(text) message["text"] = text if(html) message["html"] = html if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting - var/message_blob = TGUI_CREATE_MESSAGE("chat/message", message) - var/message_html = message_to_html(message) - if(islist(target)) - for(var/_target in target) - var/client/client = CLIENT_FROM_VAR(_target) - if(client) - // Send to tgchat - client.tgui_panel?.window.send_raw_message(message_blob) - // Send to old chat - to_target(client, message_html) - return - var/client/client = CLIENT_FROM_VAR(target) - if(client) - // Send to tgchat - client.tgui_panel?.window.send_raw_message(message_blob) - // Send to old chat - to_target(client, message_html) + // send it immediately + SSchat.send_immediate(target, message) /** * Sends the message to the recipient (target). @@ -74,7 +59,7 @@ trailing_newline = TRUE, confidential = FALSE ) - if(isnull(Master) || !SSchat?.initialized) + if(isnull(Master) || !SSchat?.initialized || !MC_RUNNING(SSchat.init_stage)) to_chat_immediate(target, html, type, text, avoid_highlighting) return diff --git a/code/modules/tgs/LICENSE b/code/modules/tgs/LICENSE index 2bedf9a63aa..324c48e993e 100644 --- a/code/modules/tgs/LICENSE +++ b/code/modules/tgs/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017-2023 Jordan Brown +Copyright (c) 2017-2024 Jordan Brown Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md index 6319028d810..473442fd119 100644 --- a/code/modules/tgs/README.md +++ b/code/modules/tgs/README.md @@ -1,13 +1,13 @@ # DMAPI Internals -This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. +This folder should be placed on its own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. - [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest. - The [core](./core) folder includes all code not directly part of any API version. - The other versioned folders contain code for the different DMAPI versions. - - [v3210](./v3210) contains the final TGS3 API. - - [v4](./v4) is the legacy DMAPI 4 (Used in TGS 4.0.X versions). - - [v5](./v5) is the current DMAPI version used by TGS >=4.1. + - [v3210](./v3210) contains the final TGS3 API. + - [v4](./v4) is the legacy DMAPI 4 (Used in TGS 4.0.X versions). + - [v5](./v5) is the current DMAPI version used by TGS >=4.1. - [LICENSE](./LICENSE) is the MIT license for the DMAPI. APIs communicate with TGS in two ways. All versions implement TGS -> DM communication using /world/Topic. DM -> TGS communication, called the bridge method, is different for each version. diff --git a/code/modules/tgs/core/README.md b/code/modules/tgs/core/README.md index b82d8f49e29..7886a857149 100644 --- a/code/modules/tgs/core/README.md +++ b/code/modules/tgs/core/README.md @@ -2,8 +2,8 @@ This folder contains all DMAPI code not directly involved in an API. -- [_definitions.dm](./definitions.dm) contains defines needed across DMAPI internals. +- [\_definitions.dm](./definitions.dm) contains defines needed across DMAPI internals. +- [byond_world_export.dm](./byond_world_export.dm) contains the default `/datum/tgs_http_handler` implementation which uses `world.Export()`. - [core.dm](./core.dm) contains the implementations of the `/world/proc/TgsXXX()` procs. Many map directly to the `/datum/tgs_api` functions. It also contains the /datum selection and setup code. - [datum.dm](./datum.dm) contains the `/datum/tgs_api` declarations that all APIs must implement. - [tgs_version.dm](./tgs_version.dm) contains the `/datum/tgs_version` definition -- diff --git a/code/modules/tgs/core/byond_world_export.dm b/code/modules/tgs/core/byond_world_export.dm new file mode 100644 index 00000000000..6ef8d841b8f --- /dev/null +++ b/code/modules/tgs/core/byond_world_export.dm @@ -0,0 +1,22 @@ +/datum/tgs_http_handler/byond_world_export + +/datum/tgs_http_handler/byond_world_export/PerformGet(url) + // This is an infinite sleep until we get a response + var/export_response = world.Export(url) + TGS_DEBUG_LOG("byond_world_export: Export complete") + + if(!export_response) + TGS_ERROR_LOG("byond_world_export: Failed request: [url]") + return new /datum/tgs_http_result(null, FALSE) + + var/content = export_response["CONTENT"] + if(!content) + TGS_ERROR_LOG("byond_world_export: Failed request, missing content!") + return new /datum/tgs_http_result(null, FALSE) + + var/response_json = TGS_FILE2TEXT_NATIVE(content) + if(!response_json) + TGS_ERROR_LOG("byond_world_export: Failed request, failed to load content!") + return new /datum/tgs_http_result(null, FALSE) + + return new /datum/tgs_http_result(response_json, TRUE) diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm index d6219fcd308..98f26090cad 100644 --- a/code/modules/tgs/core/core.dm +++ b/code/modules/tgs/core/core.dm @@ -1,7 +1,7 @@ -/world/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE) +/world/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE, datum/tgs_http_handler/http_handler = null) var/current_api = TGS_READ_GLOBAL(tgs) if(current_api) - TGS_ERROR_LOG("API datum already set ([REF(current_api)] ([current_api]))! Was TgsNew() called more than once?") + TGS_ERROR_LOG("API datum already set ([current_api])! Was TgsNew() called more than once?") return if(!(minimum_required_security_level in list(TGS_SECURITY_ULTRASAFE, TGS_SECURITY_SAFE, TGS_SECURITY_TRUSTED))) @@ -42,11 +42,11 @@ var/datum/tgs_version/max_api_version = TgsMaximumApiVersion(); if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter) - TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.") + TGS_ERROR_LOG("Detected unknown Interop API version! Defaulting to latest. Update the DMAPI to fix this problem.") api_datum = /datum/tgs_api/latest if(!api_datum) - TGS_ERROR_LOG("Found unsupported API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") + TGS_ERROR_LOG("Found unsupported Interop API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") return TGS_INFO_LOG("Activating API for version [version.deprefixed_parameter]") @@ -55,7 +55,10 @@ TGS_ERROR_LOG("Invalid parameter for event_handler: [event_handler]") event_handler = null - var/datum/tgs_api/new_api = new api_datum(event_handler, version) + if(!http_handler) + http_handler = new /datum/tgs_http_handler/byond_world_export + + var/datum/tgs_api/new_api = new api_datum(event_handler, version, http_handler) TGS_WRITE_GLOBAL(tgs, new_api) @@ -107,6 +110,13 @@ if(api) return api.ApiVersion() +/world/TgsEngine() +#ifdef OPENDREAM + return TGS_ENGINE_TYPE_OPENDREAM +#else + return TGS_ENGINE_TYPE_BYOND +#endif + /world/TgsInstanceName() var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) @@ -159,3 +169,11 @@ var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) return api.Visibility() + +/world/TgsTriggerEvent(event_name, list/parameters, wait_for_completion = FALSE) + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + if(!istype(parameters, /list)) + parameters = list() + + return api.TriggerEvent(event_name, parameters, wait_for_completion) diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm index 07ce3b68458..3ca53e9bf7c 100644 --- a/code/modules/tgs/core/datum.dm +++ b/code/modules/tgs/core/datum.dm @@ -6,8 +6,8 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) var/list/warned_deprecated_command_runs -/datum/tgs_api/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version) - . = ..() +/datum/tgs_api/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version, datum/tgs_http_handler/http_handler) + ..() src.event_handler = event_handler src.version = version @@ -17,7 +17,7 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866 del(world) world.sleep_offline = FALSE // just in case, this is BYOND after all... - sleep(1) + sleep(world.tick_lag) TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]") /datum/tgs_api/latest @@ -69,3 +69,6 @@ TGS_PROTECT_DATUM(/datum/tgs_api) /datum/tgs_api/proc/Visibility() return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/TriggerEvent(event_name, list/parameters, wait_for_completion) + return FALSE diff --git a/code/modules/tgs/core/tgs_version.dm b/code/modules/tgs/core/tgs_version.dm index a5dae1241a3..bc561e67487 100644 --- a/code/modules/tgs/core/tgs_version.dm +++ b/code/modules/tgs/core/tgs_version.dm @@ -1,4 +1,5 @@ /datum/tgs_version/New(raw_parameter) + ..() src.raw_parameter = raw_parameter deprefixed_parameter = replacetext(raw_parameter, "/tg/station 13 Server v", "") var/list/version_bits = splittext(deprefixed_parameter, ".") diff --git a/code/modules/tgs/includes.dm b/code/modules/tgs/includes.dm index 23b714f9d06..f5118ed55a3 100644 --- a/code/modules/tgs/includes.dm +++ b/code/modules/tgs/includes.dm @@ -1,4 +1,5 @@ #include "core\_definitions.dm" +#include "core\byond_world_export.dm" #include "core\core.dm" #include "core\datum.dm" #include "core\tgs_version.dm" diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm index 945e2e41176..7c87922750b 100644 --- a/code/modules/tgs/v4/api.dm +++ b/code/modules/tgs/v4/api.dm @@ -181,7 +181,7 @@ var/json = json_encode(data) while(requesting_new_port && !override_requesting_new_port) - sleep(1) + sleep(world.tick_lag) //we need some port open at this point to facilitate return communication if(!world.port) @@ -209,7 +209,7 @@ requesting_new_port = FALSE while(export_lock) - sleep(1) + sleep(world.tick_lag) export_lock = TRUE last_interop_response = null @@ -217,7 +217,7 @@ text2file(json, server_commands_json_path) for(var/I = 0; I < EXPORT_TIMEOUT_DS && !last_interop_response; ++I) - sleep(1) + sleep(world.tick_lag) if(!last_interop_response) TGS_ERROR_LOG("Failed to get export result for: [json]") diff --git a/code/modules/tgs/v5/README.md b/code/modules/tgs/v5/README.md index a8a0c748e7b..fb374c2f872 100644 --- a/code/modules/tgs/v5/README.md +++ b/code/modules/tgs/v5/README.md @@ -2,8 +2,8 @@ This DMAPI implements bridge requests using HTTP GET requests to TGS. It has no security restrictions. -- [__interop_version.dm](./__interop_version.dm) contains the version of the API used between the DMAPI and TGS. -- [_defines.dm](./_defines.dm) contains constant definitions. +- [\_\_interop_version.dm](./__interop_version.dm) contains the version of the API used between the DMAPI and TGS. +- [\_defines.dm](./_defines.dm) contains constant definitions. - [api.dm](./api.dm) contains the bulk of the API code. - [bridge.dm](./bridge.dm) contains functions related to making bridge requests. - [chunking.dm](./chunking.dm) contains common function for splitting large raw data sets into chunks BYOND can natively process. diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 1b52b31d6a7..9589cbf31bb 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.6.2" +"5.10.1" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index bdcd4e4dd58..a47bfd78000 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -8,16 +8,17 @@ #define DMAPI5_TOPIC_REQUEST_LIMIT 65528 #define DMAPI5_TOPIC_RESPONSE_LIMIT 65529 -#define DMAPI5_BRIDGE_COMMAND_PORT_UPDATE 0 #define DMAPI5_BRIDGE_COMMAND_STARTUP 1 #define DMAPI5_BRIDGE_COMMAND_PRIME 2 #define DMAPI5_BRIDGE_COMMAND_REBOOT 3 #define DMAPI5_BRIDGE_COMMAND_KILL 4 #define DMAPI5_BRIDGE_COMMAND_CHAT_SEND 5 #define DMAPI5_BRIDGE_COMMAND_CHUNK 6 +#define DMAPI5_BRIDGE_COMMAND_EVENT 7 #define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier" #define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands" +#define DMAPI5_PARAMETER_TOPIC_PORT "topicPort" #define DMAPI5_CHUNK "chunk" #define DMAPI5_CHUNK_PAYLOAD "payload" @@ -34,6 +35,7 @@ #define DMAPI5_BRIDGE_PARAMETER_VERSION "version" #define DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE "chatMessage" #define DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL "minimumSecurityLevel" +#define DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION "eventInvocation" #define DMAPI5_BRIDGE_RESPONSE_NEW_PORT "newPort" #define DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION "runtimeInformation" @@ -80,6 +82,8 @@ #define DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH 8 #define DMAPI5_TOPIC_COMMAND_SEND_CHUNK 9 #define DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK 10 +#define DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST 11 +#define DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT 12 #define DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE "commandType" #define DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND "chatCommand" @@ -89,7 +93,9 @@ #define DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME "newInstanceName" #define DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE "chatUpdate" #define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion" +#define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage" +#define DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT "clientCount" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage" #define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses" @@ -114,3 +120,9 @@ #define DMAPI5_CUSTOM_CHAT_COMMAND_NAME "name" #define DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT "helpText" #define DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY "adminOnly" + +#define DMAPI5_EVENT_ID "eventId" + +#define DMAPI5_EVENT_INVOCATION_NAME "eventName" +#define DMAPI5_EVENT_INVOCATION_PARAMETERS "parameters" +#define DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION "notifyCompletion" diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 7226f29bba6..4ca9036b790 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -8,8 +8,12 @@ var/reboot_mode = TGS_REBOOT_MODE_NORMAL + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call var/list/intercepted_message_queue + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call + var/list/offline_message_queue + var/list/custom_commands var/list/test_merges @@ -17,15 +21,23 @@ var/list/chat_channels var/initialized = FALSE + var/initial_bridge_request_received = FALSE + var/datum/tgs_version/interop_version var/chunked_requests = 0 var/list/chunked_topics = list() + var/list/pending_events = list() + var/detached = FALSE -/datum/tgs_api/v5/New() + var/datum/tgs_http_handler/http_handler + +/datum/tgs_api/v5/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version, datum/tgs_http_handler/http_handler) . = ..() - TGS_DEBUG_LOG("V5 API created") + interop_version = version + src.http_handler = http_handler + TGS_DEBUG_LOG("V5 API created: [json_encode(args)]") /datum/tgs_api/v5/ApiVersion() return new /datum/tgs_version( @@ -38,8 +50,14 @@ access_identifier = world.params[DMAPI5_PARAM_ACCESS_IDENTIFIER] var/datum/tgs_version/api_version = ApiVersion() - version = null - var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands())) + version = null // we want this to be the TGS version, not the interop version + + // sleep once to prevent an issue where world.Export on the first tick can hang indefinitely + TGS_DEBUG_LOG("Starting Export bug prevention sleep tick. time:[world.time] sleep_offline:[world.sleep_offline]") + sleep(world.tick_lag) + TGS_DEBUG_LOG("Export bug prevention sleep complete") + + var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort())) if(!istype(bridge_response)) TGS_ERROR_LOG("Failed initial bridge request!") return FALSE @@ -53,7 +71,8 @@ TGS_INFO_LOG("DMAPI validation, exiting...") TerminateWorld() - version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) + initial_bridge_request_received = TRUE + version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) // reassigning this because it can change if TGS updates security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL] visibility = runtime_information[DMAPI5_RUNTIME_INFORMATION_VISIBILITY] instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME] @@ -78,7 +97,7 @@ if(revInfo) tm.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA] tm.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA] - tm.timestamp = entry[DMAPI5_REVISION_INFORMATION_TIMESTAMP] + tm.timestamp = revisionData[DMAPI5_REVISION_INFORMATION_TIMESTAMP] else TGS_WARNING_LOG("Failed to decode [DMAPI5_TEST_MERGE_REVISION] from test merge #[tm.number]!") @@ -102,15 +121,22 @@ initialized = TRUE return TRUE +/datum/tgs_api/v5/proc/GetTopicPort() +#if defined(OPENDREAM) && defined(OPENDREAM_TOPIC_PORT_EXISTS) + return "[world.opendream_topic_port]" +#else + return null +#endif + /datum/tgs_api/v5/proc/RequireInitialBridgeResponse() TGS_DEBUG_LOG("RequireInitialBridgeResponse()") var/logged = FALSE - while(!version) + while(!initial_bridge_request_received) if(!logged) TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep") logged = TRUE - sleep(1) + sleep(world.tick_lag) TGS_DEBUG_LOG("RequireInitialBridgeResponse: Passed") @@ -183,17 +209,7 @@ var/datum/tgs_chat_channel/channel = I ids += channel.id - message2 = UpgradeDeprecatedChatMessage(message2) - - if (!length(channels)) - return - - var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids - if(intercepted_message_queue) - intercepted_message_queue += list(data) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + SendChatMessageRaw(message2, ids) /datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message2, admin_only) var/list/channels = list() @@ -202,32 +218,82 @@ if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) channels += channel.id + SendChatMessageRaw(message2, channels) + +/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) + SendChatMessageRaw(message2, list(user.channel.id)) + +/datum/tgs_api/v5/proc/SendChatMessageRaw(datum/tgs_message_content/message2, list/channel_ids) message2 = UpgradeDeprecatedChatMessage(message2) - if (!length(channels)) + if (!length(channel_ids)) return var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels + data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channel_ids if(intercepted_message_queue) intercepted_message_queue += list(data) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + return -/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) - message2 = UpgradeDeprecatedChatMessage(message2) - var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id) - if(intercepted_message_queue) - intercepted_message_queue += list(data) + if(offline_message_queue) + offline_message_queue += list(data) + return + + if(detached) + offline_message_queue = list(data) + + WaitForReattach(FALSE) + + data = offline_message_queue + offline_message_queue = null + + for(var/queued_message in data) + SendChatDataRaw(queued_message) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + SendChatDataRaw(data) + +/datum/tgs_api/v5/proc/SendChatDataRaw(list/data) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) /datum/tgs_api/v5/ChatChannelInfo() RequireInitialBridgeResponse() WaitForReattach(TRUE) return chat_channels.Copy() +/datum/tgs_api/v5/TriggerEvent(event_name, list/parameters, wait_for_completion) + RequireInitialBridgeResponse() + WaitForReattach(TRUE) + + if(interop_version.minor < 9) + TGS_WARNING_LOG("Interop version too low for custom events!") + return FALSE + + var/str_parameters = list() + for(var/i in parameters) + str_parameters += "[i]" + + var/list/response = Bridge(DMAPI5_BRIDGE_COMMAND_EVENT, list(DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION = list(DMAPI5_EVENT_INVOCATION_NAME = event_name, DMAPI5_EVENT_INVOCATION_PARAMETERS = str_parameters, DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION = wait_for_completion))) + if(!response) + return FALSE + + var/event_id = response[DMAPI5_EVENT_ID] + if(!event_id) + return FALSE + + TGS_DEBUG_LOG("Created event ID: [event_id]") + if(!wait_for_completion) + return TRUE + + TGS_DEBUG_LOG("Waiting for completion of event ID: [event_id]") + + while(!pending_events[event_id]) + sleep(world.tick_lag) + + TGS_DEBUG_LOG("Completed wait on event ID: [event_id]") + pending_events -= event_id + + return TRUE + /datum/tgs_api/v5/proc/DecodeChannels(chat_update_json) TGS_DEBUG_LOG("DecodeChannels()") var/list/chat_channels_json = chat_update_json[DMAPI5_CHAT_UPDATE_CHANNELS] diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm index 37f58bcdf63..62201fcc9e5 100644 --- a/code/modules/tgs/v5/bridge.dm +++ b/code/modules/tgs/v5/bridge.dm @@ -48,7 +48,9 @@ var/json = CreateBridgeData(command, data, TRUE) var/encoded_json = url_encode(json) - var/url = "http://127.0.0.1:[server_port]/Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" + var/api_prefix = interop_version.minor >= 8 ? "api/" : "" + + var/url = "http://127.0.0.1:[server_port]/[api_prefix]Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" return url /datum/tgs_api/v5/proc/CreateBridgeData(command, list/data, needs_auth) @@ -63,7 +65,7 @@ if(detached) // Wait up to one minute for(var/i in 1 to 600) - sleep(1) + sleep(world.tick_lag) if(!detached && (!require_channels || length(chat_channels))) break @@ -75,20 +77,25 @@ /datum/tgs_api/v5/proc/PerformBridgeRequest(bridge_request) WaitForReattach(FALSE) - // This is an infinite sleep until we get a response - var/export_response = world.Export(bridge_request) - if(!export_response) - TGS_ERROR_LOG("Failed bridge request: [bridge_request]") + TGS_DEBUG_LOG("Bridge request start") + var/datum/tgs_http_result/result = http_handler.PerformGet(bridge_request) + TGS_DEBUG_LOG("Bridge request complete") + + if(isnull(result)) + TGS_ERROR_LOG("Failed bridge request, handler returned null!") return - var/response_json = file2text(export_response["CONTENT"]) - if(!response_json) - TGS_ERROR_LOG("Failed bridge request, missing content!") + if(!istype(result) || result.type != /datum/tgs_http_result) + TGS_ERROR_LOG("Failed bridge request, handler returned non-[/datum/tgs_http_result]!") return - var/list/bridge_response = json_decode(response_json) + if(!result.success) + TGS_DEBUG_LOG("Failed bridge request, HTTP request failed!") + return + + var/list/bridge_response = json_decode(result.response_text) if(!bridge_response) - TGS_ERROR_LOG("Failed bridge request, bad json: [response_json]") + TGS_ERROR_LOG("Failed bridge request, bad json: [result.response_text]") return var/error = bridge_response[DMAPI5_RESPONSE_ERROR_MESSAGE] diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index d7d47121381..59e5e63e5cd 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -94,7 +94,7 @@ if(DMAPI5_TOPIC_COMMAND_CHANGE_PORT) var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] if (!isnum(new_port) || !(new_port > 0)) - return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]") + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]") if(event_handler != null) event_handler.HandleEvent(TGS_EVENT_PORT_SWAP, new_port) @@ -141,7 +141,7 @@ if(DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE) var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] if (!isnum(new_port) || !(new_port > 0)) - return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]") + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]") server_port = new_port return TopicResponse() @@ -149,7 +149,9 @@ if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) if(event_handler && event_handler.receive_health_checks) event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) - return TopicResponse() + var/list/health_check_response = TopicResponse() + health_check_response[DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT] = TGS_CLIENT_COUNT + return health_check_response; if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) detached = FALSE @@ -157,7 +159,7 @@ var/error_message = null if (new_port != null) if (!isnum(new_port) || !(new_port > 0)) - error_message = "Invalid [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]" + error_message = "Invalid [DMAPI5_TOPIC_PARAMETER_NEW_PORT]" else server_port = new_port @@ -165,7 +167,7 @@ if (!istext(new_version_string)) if(error_message != null) error_message += ", " - error_message += "Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]]" + error_message += "Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]" else var/datum/tgs_version/new_version = new(new_version_string) if (event_handler) @@ -175,6 +177,11 @@ var/list/reattach_response = TopicResponse(error_message) reattach_response[DMAPI5_PARAMETER_CUSTOM_COMMANDS] = ListCustomCommands() + reattach_response[DMAPI5_PARAMETER_TOPIC_PORT] = GetTopicPort() + + for(var/eventId in pending_events) + pending_events[eventId] = TRUE + return reattach_response if(DMAPI5_TOPIC_COMMAND_SEND_CHUNK) @@ -267,4 +274,25 @@ return chunk_to_send + if(DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST) + var/message = topic_parameters[DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE] + if (!istext(message)) + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE]") + + TGS_WORLD_ANNOUNCE(message) + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT) + var/event_id = topic_parameters[DMAPI5_EVENT_ID] + if (!istext(event_id)) + return TopicResponse("Invalid or missing [DMAPI5_EVENT_ID]") + + TGS_DEBUG_LOG("Completing event ID [event_id]...") + pending_events[event_id] = TRUE + return TopicResponse() + return TopicResponse("Unknown command: [command]") + +/datum/tgs_api/v5/proc/WorldBroadcast(message) + set waitfor = FALSE + TGS_WORLD_ANNOUNCE(message) diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index f163adaaafe..ca49e46cdff 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -8,16 +8,17 @@ #undef DMAPI5_TOPIC_REQUEST_LIMIT #undef DMAPI5_TOPIC_RESPONSE_LIMIT -#undef DMAPI5_BRIDGE_COMMAND_PORT_UPDATE #undef DMAPI5_BRIDGE_COMMAND_STARTUP #undef DMAPI5_BRIDGE_COMMAND_PRIME #undef DMAPI5_BRIDGE_COMMAND_REBOOT #undef DMAPI5_BRIDGE_COMMAND_KILL #undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND #undef DMAPI5_BRIDGE_COMMAND_CHUNK +#undef DMAPI5_BRIDGE_COMMAND_EVENT #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS +#undef DMAPI5_PARAMETER_TOPIC_PORT #undef DMAPI5_CHUNK #undef DMAPI5_CHUNK_PAYLOAD @@ -34,6 +35,7 @@ #undef DMAPI5_BRIDGE_PARAMETER_VERSION #undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE #undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL +#undef DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION #undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT #undef DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION @@ -78,6 +80,10 @@ #undef DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE #undef DMAPI5_TOPIC_COMMAND_HEALTHCHECK #undef DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH +#undef DMAPI5_TOPIC_COMMAND_SEND_CHUNK +#undef DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK +#undef DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST +#undef DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT #undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE #undef DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND @@ -87,7 +93,9 @@ #undef DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME #undef DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE #undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION +#undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE +#undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE #undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES @@ -112,3 +120,9 @@ #undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME #undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT #undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY + +#undef DMAPI5_EVENT_ID + +#undef DMAPI5_EVENT_INVOCATION_NAME +#undef DMAPI5_EVENT_INVOCATION_PARAMETERS +#undef DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm index bcd97a91245..aa4e9927758 100644 --- a/code/modules/tgui/external.dm +++ b/code/modules/tgui/external.dm @@ -42,7 +42,7 @@ * * required user mob The mob interacting with the UI. * - * return list Statuic Data to be sent to the UI. + * return list Static Data to be sent to the UI. */ /datum/proc/ui_static_data(mob/user) return list() @@ -129,13 +129,6 @@ */ /datum/var/list/tgui_shared_states -/** - * global - * - * Tracks open UIs for a user. - */ -/mob/var/list/tgui_open_uis = list() - /** * global * diff --git a/code/modules/nano/modules/follow_menu.dm b/code/modules/tgui/modules/follow_menu.dm similarity index 100% rename from code/modules/nano/modules/follow_menu.dm rename to code/modules/tgui/modules/follow_menu.dm diff --git a/code/modules/nano/modules/human_appearance.dm b/code/modules/tgui/modules/human_appearance.dm similarity index 100% rename from code/modules/nano/modules/human_appearance.dm rename to code/modules/tgui/modules/human_appearance.dm diff --git a/code/modules/nano/modules/narrate_panel.dm b/code/modules/tgui/modules/narrate_panel.dm similarity index 88% rename from code/modules/nano/modules/narrate_panel.dm rename to code/modules/tgui/modules/narrate_panel.dm index 03bc127bc02..6f91eea21eb 100644 --- a/code/modules/nano/modules/narrate_panel.dm +++ b/code/modules/tgui/modules/narrate_panel.dm @@ -16,49 +16,50 @@ if(.) return - var/mob/abstract/ghost/ghost = ui.user - if(!istype(ghost)) + var/mob/abstract/ghost/narrate_user = ui.user + var/is_admin = check_rights(R_ADMIN, user = ui.user) + if(!istype(narrate_user) && !is_admin) return FALSE if(action == "narrate") var/narrate_text = sanitizeSafe(params["narrate_text"]) if(!length(narrate_text)) - to_chat(ghost, SPAN_WARNING("No text was supplied!")) + to_chat(narrate_user, SPAN_WARNING("No text was supplied!")) return FALSE var/narrate_style = params["narrate_style"] if(!narrate_style) - to_chat(ghost, SPAN_WARNING("No text style was supplied!")) + to_chat(narrate_user, SPAN_WARNING("No text style was supplied!")) return FALSE var/narrate_size = text2num(params["narrate_size"]) if(!isnum(narrate_size)) - to_chat(ghost, SPAN_WARNING("No text size was supplied!")) + to_chat(narrate_user, SPAN_WARNING("No text size was supplied!")) return FALSE var/narrate_range = text2num(params["narrate_range"]) if(!isnum(narrate_range)) - to_chat(ghost, SPAN_WARNING("No narrate range was supplied!")) + to_chat(narrate_user, SPAN_WARNING("No narrate range was supplied!")) return FALSE var/narrate_location = params["narrate_location"] if(!narrate_location) - to_chat(ghost, SPAN_WARNING("No narrate location was supplied!")) + to_chat(narrate_user, SPAN_WARNING("No narrate location was supplied!")) return FALSE var/list/mobs_to_message = list() switch(narrate_location) if("View") - for(var/mob/M in get_hearers_in_view(narrate_range, ghost)) + for(var/mob/M in get_hearers_in_view(narrate_range, narrate_user)) mobs_to_message |= M if("Range") - for(var/mob/M in get_hearers_in_range(narrate_range, ghost)) + for(var/mob/M in get_hearers_in_range(narrate_range, narrate_user)) mobs_to_message |= M if("Z-Level") for(var/mob/M in GLOB.player_list) - if(GET_Z(M) == ghost.z) + if(GET_Z(M) == narrate_user.z) mobs_to_message |= M if("Global") diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index d3ce59cf352..188fb7f48a1 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -70,7 +70,7 @@ // Disable UIs if unconscious. else if(stat) return UI_DISABLED - // Update UIs if incapicitated but concious. + // Update UIs if incapicitated but conscious. else if(incapacitated()) return UI_UPDATE return UI_INTERACTIVE @@ -86,6 +86,34 @@ return UI_DISABLED return ..() +/mob/living/silicon/ai/proc/can_use_remote_ui(src_object) + if(src_object == src) + return TRUE + + if(control_disabled || !istype(src_object, /atom)) + return FALSE + + var/atom/source = src_object + var/atom/interaction_source = eyeobj || src + var/turf/interaction_turf = get_turf(interaction_source) + var/turf/source_turf = get_turf(source) + if(!interaction_turf || !source_turf || interaction_turf.z != source_turf.z) + return FALSE + + var/view_setting = world.view + if(client) + view_setting = client.view + + var/list/clientviewlist = getviewsize(view_setting) + var/x_range = round((clientviewlist[1] - 1) / 2) + var/y_range = round((clientviewlist[2] - 1) / 2) + if(!IsInRange(source_turf.x, interaction_turf.x - x_range, interaction_turf.x + x_range)) + return FALSE + if(!IsInRange(source_turf.y, interaction_turf.y - y_range, interaction_turf.y + y_range)) + return FALSE + + return can_see(interaction_source, source, max(x_range, y_range)) + /mob/living/silicon/robot/shared_ui_interaction(src_object) // Disable UIs if the object isn't installed in the borg AND the borg has a dead cell, or no cell. var/atom/device = src_object @@ -129,6 +157,3 @@ /datum/ui_state/proc/href_list(mob/user) return list() - -/datum/proc/nano_container() - return src diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm index 0f93514cfe6..24a3d7e1ff0 100644 --- a/code/modules/tgui/states/default.dm +++ b/code/modules/tgui/states/default.dm @@ -13,11 +13,18 @@ GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new) /datum/ui_state/default/can_use_topic(src_object, mob/user) - return user.default_can_use_topic(src_object) // Call the individual mob-overridden procs. + return user?.default_can_use_topic(src_object) // Call the individual mob-overridden procs. /mob/proc/default_can_use_topic(src_object) return UI_CLOSE // Don't allow interaction by default. +/mob/abstract/eye/freelook/aiEye/default_can_use_topic(src_object) + if(!isAI(owner)) + return UI_CLOSE + + var/mob/living/silicon/ai/ai = owner + return ai.default_can_use_topic(src_object) + /mob/living/default_can_use_topic(src_object) . = shared_ui_interaction(src_object) if(. > UI_CLOSE && loc) //must not be in nullspace. @@ -41,8 +48,8 @@ GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new) if(. < UI_INTERACTIVE) return - // The AI can interact with anything it can see nearby, or with cameras while wireless control is enabled. - if(!control_disabled) + // The AI can interact with anything visible from its eye while wireless control is enabled. + if(can_use_remote_ui(src_object)) return UI_INTERACTIVE return UI_CLOSE diff --git a/code/modules/tgui/status_composers.dm b/code/modules/tgui/status_composers.dm index 7924ed9f2f2..4777c9d012c 100644 --- a/code/modules/tgui/status_composers.dm +++ b/code/modules/tgui/status_composers.dm @@ -11,6 +11,16 @@ ) ) +/// Returns the silicon mob represented by a TGUI user, including an AI using its camera eye. +/proc/tgui_silicon_user(mob/user) + if(issilicon(user)) + return user + + if(istype(user, /mob/abstract/eye/freelook/aiEye)) + var/mob/abstract/eye/freelook/aiEye/eye = user + if(issilicon(eye.owner)) + return eye.owner + /// Returns a UI status such that users adjacent to source will be able to interact, /// far away users will be able to see, and anyone farther won't see anything. /// Dead users will receive updates no matter what, though you likely want to add @@ -24,6 +34,9 @@ /// Returns a UI status such that the dead will be able to watch, but not interact. /proc/ui_status_only_living(mob/user, source) + if(tgui_silicon_user(user)) + return UI_INTERACTIVE + if (isliving(user)) return UI_INTERACTIVE @@ -49,25 +62,33 @@ /// Being dead will disable UI, being incapacitated will continue updating it, /// and anything else will make it interactive. /proc/ui_status_user_is_abled(mob/user, atom/source) + var/mob/living/silicon/silicon_user = tgui_silicon_user(user) + if(silicon_user && silicon_user != user) + return silicon_user.shared_ui_interaction(source) return user.shared_ui_interaction(source) /// Returns a UI status such that those without blocked hands will be able to interact, /// but everyone else can only watch. /proc/ui_status_user_has_free_hands(mob/user, atom/source) + if(tgui_silicon_user(user)) + return UI_INTERACTIVE return user.use_check() ? UI_UPDATE : UI_INTERACTIVE /// Returns a UI status such that advanced tool users will be able to interact, /// but everyone else can only watch. /proc/ui_status_user_is_advanced_tool_user(mob/user) + var/mob/living/silicon/silicon_user = tgui_silicon_user(user) + if(silicon_user) + return silicon_user.IsAdvancedToolUser() ? UI_INTERACTIVE : UI_UPDATE return user.IsAdvancedToolUser() ? UI_INTERACTIVE : UI_UPDATE /// Returns a UI status such that silicons will be able to interact with whatever /// they would have access to if this was a machine. For example, AIs can /// interact if there's cameras with wireless control is enabled. /proc/ui_status_silicon_has_access(mob/user, atom/source) - if (!issilicon(user)) + var/mob/living/silicon/silicon_user = tgui_silicon_user(user) + if(!silicon_user) return UI_CLOSE - var/mob/living/silicon/silicon_user = user return silicon_user.get_ui_access(source) /// Returns a UI status representing this silicon's capability to access @@ -83,8 +104,8 @@ return UI_DISABLED // Otherwise they can keep the UI open. /mob/living/silicon/ai/get_ui_access(atom/source) - // The AI can interact with anything it can see nearby, or with cameras while wireless control is enabled. - if(!control_disabled && can_see(source)) + // The AI can interact with anything visible from its eye while wireless control is enabled. + if(can_use_remote_ui(source)) return UI_INTERACTIVE return UI_CLOSE @@ -113,3 +134,11 @@ return UI_CLOSE return UI_INTERACTIVE + +/// Return UI_INTERACTIVE if the user is inside the target atom, whether they can see it or not. +/// Return UI_CLOSE otherwise. +/proc/ui_status_user_inside(mob/user, atom/target) + if(target.contains(user)) + return UI_INTERACTIVE + + return UI_CLOSE diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 62b40969958..b5391b4473d 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -37,11 +37,9 @@ var/datum/ui_state/state = null /// Rate limit client refreshes to prevent DoS. COOLDOWN_DECLARE(refresh_cooldown) - /// Are byond mouse events beyond the window passed in to the ui - var/mouse_hooked = FALSE - /// Any partial packets that we have received from TGUI, waiting to be sent - var/partial_packets + /// The id of any ByondUi elements that we have opened + var/list/open_byondui_elements /** * public @@ -58,9 +56,6 @@ * return datum/tgui The requested UI. */ /datum/tgui/New(mob/user, datum/src_object, interface, title, ui_x, ui_y) - log_tgui(user, - "new [interface] fancy [user?.client?.prefs.tgui_fancy]", - src_object = src_object) src.user = user src.src_object = src_object src.window_key = "[REF(src_object)]-main" @@ -85,7 +80,7 @@ * return bool - TRUE if a new pooled window is opened, FALSE in all other situations including if a new pooled window didn't open because one already exists. */ /datum/tgui/proc/open() - if(!user?.client) + if(user && !user.client) return FALSE if(window) return FALSE @@ -100,7 +95,6 @@ if(!window.is_ready()) window.initialize( strict_mode = TRUE, - fancy = user.client.prefs.tgui_fancy, assets = list( get_asset_datum(/datum/asset/simple/tgui), )) @@ -110,8 +104,6 @@ window.send_message("update", get_payload( with_data = TRUE, with_static_data = TRUE)) - if(mouse_hooked) - window.set_mouse_macro() SStgui.on_open(src) return TRUE @@ -146,11 +138,27 @@ window.release_lock() window.close(can_be_suspended) src_object.ui_close(user) - SEND_SIGNAL(src, COMSIG_TGUI_CLOSE, user) SStgui.on_close(src) + + if(user.client) + terminate_byondui_elements() + state = null qdel(src) +/** + * public + * + * Closes all ByondUI elements, left dangling by a forceful TGUI exit, + * such as via Alt+F4, or terminating the process + * + */ +/datum/tgui/proc/terminate_byondui_elements() + set waitfor = FALSE + + for(var/byondui_element in open_byondui_elements) + winset(user.client, byondui_element, list("parent" = "")) + /** * public * @@ -161,18 +169,6 @@ /datum/tgui/proc/set_autoupdate(autoupdate) src.autoupdate = autoupdate -/** - * public - * - * Enable/disable passing through byond mouse events to the window - * - * required value bool Enable/disable hooking. - */ -/datum/tgui/proc/set_mouse_hook(value) - src.mouse_hooked = value - //Handle unhooking/hooking on already open windows ? - - /** * public * @@ -248,12 +244,13 @@ json_data["config"] = list( "title" = title, "status" = status, - "interface" = interface, + "interface" = list( + "name" = interface, + ), "refreshing" = refreshing, "window" = list( "key" = window_key, "size" = window_size, - "fancy" = user.client.prefs.tgui_fancy, "locked" = user.client.prefs.tgui_lock, "scale" = user.client.prefs.ui_scale, ), @@ -329,31 +326,6 @@ // Pass act type messages to ui_act if(type && copytext(type, 1, 5) == "act/") var/act_type = copytext(type, 5) - - var/id = href_list["packetId"] - if(!isnull(id)) - id = text2num(id) - - var/total = text2num(href_list["totalPackets"]) - - if(total > MAX_MESSAGE_CHUNKS) - return - - if(id == 1) - partial_packets = new /list(total) - - partial_packets[id] = href_list["packet"] - - if(id != total) - return - - var/assembled_payload = "" - for(var/packet in partial_packets) - assembled_payload += packet - - payload = json_decode(assembled_payload) - partial_packets = null - log_tgui(user, "Action: [act_type] [href_list["payload"]]", window = window, src_object = src_object) @@ -381,6 +353,18 @@ LAZYINITLIST(src_object.tgui_shared_states) src_object.tgui_shared_states[href_list["key"]] = href_list["value"] SStgui.update_uis(src_object) + if(TGUI_MANAGED_BYONDUI_TYPE_RENDER) + var/byond_ui_id = payload[TGUI_MANAGED_BYONDUI_PAYLOAD_ID] + if(!byond_ui_id || LAZYLEN(open_byondui_elements) > TGUI_MANAGED_BYONDUI_LIMIT) + return + + LAZYOR(open_byondui_elements, byond_ui_id) + if(TGUI_MANAGED_BYONDUI_TYPE_UNMOUNT) + var/byond_ui_id = payload[TGUI_MANAGED_BYONDUI_PAYLOAD_ID] + if(!byond_ui_id) + return + + LAZYREMOVE(open_byondui_elements, byond_ui_id) /// Wrapper for behavior to potentially wait until the next tick if the server is overloaded /datum/tgui/proc/on_act_message(act_type, payload, state) diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm index 996013a1aa5..1b29cacdb79 100644 --- a/code/modules/tgui/tgui_window.dm +++ b/code/modules/tgui/tgui_window.dm @@ -11,6 +11,7 @@ var/is_browser = FALSE var/status = TGUI_WINDOW_CLOSED var/locked = FALSE + var/visible = FALSE var/datum/tgui/locked_by var/datum/subscriber_object var/subscriber_delegate @@ -19,12 +20,12 @@ var/sent_assets = list() // Vars passed to initialize proc (and saved for later) var/initial_strict_mode - var/initial_fancy var/initial_assets var/initial_inline_html var/initial_inline_js var/initial_inline_css - var/mouse_event_macro_set = FALSE + + var/list/oversized_payloads = list() /** * public @@ -50,7 +51,6 @@ * will be put into the queue until the window finishes loading. * * optional strict_mode bool - Enables strict error handling and BSOD. - * optional fancy bool - If TRUE and if this is NOT a panel, will hide the window titlebar. * optional assets list - List of assets to load during initialization. * optional inline_html string - Custom HTML to inject. * optional inline_js string - Custom JS to inject. @@ -58,7 +58,6 @@ */ /datum/tgui_window/proc/initialize( strict_mode = FALSE, - fancy = FALSE, assets = list(), inline_html = "", inline_js = "", @@ -68,7 +67,6 @@ window = src) if(!client) return - src.initial_fancy = fancy src.initial_assets = assets src.initial_inline_html = inline_html src.initial_inline_js = inline_js @@ -76,16 +74,12 @@ status = TGUI_WINDOW_LOADING fatally_errored = FALSE // Build window options - var/options = "file=[id].html;can_minimize=0;auto_format=0;" - // Remove titlebar and resize handles for a fancy window - if(fancy) - options += "titlebar=0;can_resize=0;" - else - options += "titlebar=1;can_resize=1;" + var/options = "file=[id].html;can_minimize=0;auto_format=0;titlebar=0;can_resize=0;" // Generate page html var/html = SStgui.basehtml html = replacetextEx(html, "\[tgui:windowId]", id) html = replacetextEx(html, "\[tgui:strictMode]", strict_mode) + html = replacetextEx(html, "\[tgui:storagecdn]", GLOB.config.storage_cdn_iframe) // Inject assets var/inline_assets_str = "" for(var/datum/asset/asset in assets) @@ -128,7 +122,6 @@ /datum/tgui_window/proc/reinitialize() initialize( strict_mode = initial_strict_mode, - fancy = initial_fancy, assets = initial_assets, inline_html = initial_inline_html, inline_js = initial_inline_js, @@ -220,12 +213,11 @@ /datum/tgui_window/proc/close(can_be_suspended = TRUE) if(!client) return - if(mouse_event_macro_set) - remove_mouse_macro() if(can_be_suspended && can_be_suspended()) log_tgui(client, context = "[id]/close (suspending)", window = src) + visible = FALSE status = TGUI_WINDOW_READY send_message("suspend") return @@ -233,6 +225,7 @@ context = "[id]/close", window = src) release_lock() + visible = FALSE status = TGUI_WINDOW_CLOSED message_queue = null // Do not close the window to give user some time @@ -298,9 +291,6 @@ return sent_assets |= list(asset) . = asset.send(client) - if(istype(asset, /datum/asset/spritesheet)) - var/datum/asset/spritesheet/spritesheet = asset - send_message("asset/stylesheet", spritesheet.css_filename()) send_raw_message(asset.get_serialized_url_mappings()) /** @@ -364,6 +354,11 @@ switch(type) if("ping") send_message("ping/reply", payload) + if("ping/set") + client?.avgping = payload["ping"] + if("visible") + visible = TRUE + SEND_SIGNAL(src, COMSIG_TGUI_WINDOW_VISIBLE, client) if("suspend") close(can_be_suspended = TRUE) if("close") @@ -372,40 +367,48 @@ client << link(href_list["url"]) if("cacheReloaded") reinitialize() + if("chat/resend") + SSchat.handle_resend(client, payload) + if("oversizedPayloadRequest") + var/payload_id = payload["id"] + var/chunk_count = payload["chunkCount"] + var/permit_payload = chunk_count <= 32 + if(permit_payload) + create_oversized_payload(payload_id, payload["type"], chunk_count) + send_message("oversizePayloadResponse", list("allow" = permit_payload, "id" = payload_id)) + if("payloadChunk") + var/payload_id = payload["id"] + append_payload_chunk(payload_id, payload["chunk"]) + send_message("acknowledgePayloadChunk", list("id" = payload_id)) -/datum/tgui_window/proc/set_mouse_macro() - if(mouse_event_macro_set) +/datum/tgui_window/vv_edit_var(var_name, var_value) + return var_name != NAMEOF(src, id) && ..() + +/datum/tgui_window/proc/create_oversized_payload(payload_id, message_type, chunk_count) + if(oversized_payloads[payload_id]) + stack_trace("Attempted to create oversized tgui payload with duplicate ID.") return - - var/list/byondToTguiEventMap = list( - "MouseDown" = "byond/mousedown", - "MouseUp" = "byond/mouseup" + oversized_payloads[payload_id] = list( + "type" = message_type, + "count" = chunk_count, + "chunks" = list(), + "timeout" = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) ) - for(var/mouseMacro in byondToTguiEventMap) - var/command_template = ".output CONTROL PAYLOAD" - var/event_message = TGUI_CREATE_MESSAGE(byondToTguiEventMap[mouseMacro], null) - var target_control = is_browser \ - ? "[id]:update" \ - : "[id].browser:update" - var/with_id = replacetext(command_template, "CONTROL", target_control) - var/full_command = replacetext(with_id, "PAYLOAD", event_message) +/datum/tgui_window/proc/append_payload_chunk(payload_id, chunk) + var/list/payload = oversized_payloads[payload_id] + if(!payload) + return + var/list/chunks = payload["chunks"] + chunks += chunk + if(length(chunks) >= payload["count"]) + deltimer(payload["timeout"]) + var/message_type = payload["type"] + var/final_payload = chunks.Join() + remove_oversized_payload(payload_id) + on_message(message_type, json_decode(final_payload), list("type" = message_type, "payload" = final_payload, "tgui" = TRUE, "window_id" = id)) + else + payload["timeout"] = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) - var/list/params = list() - params["parent"] = "default" //Technically this is external to tgui but whatever - params["name"] = mouseMacro - params["command"] = full_command - - winset(client, "[mouseMacro]Window[id]Macro", params) - mouse_event_macro_set = TRUE - -/datum/tgui_window/proc/remove_mouse_macro() - if(!mouse_event_macro_set) - stack_trace("Unsetting mouse macro on tgui window that has none") - var/list/byondToTguiEventMap = list( - "MouseDown" = "byond/mousedown", - "MouseUp" = "byond/mouseup" - ) - for(var/mouseMacro in byondToTguiEventMap) - winset(client, null, "[mouseMacro]Window[id]Macro.parent=null") - mouse_event_macro_set = FALSE +/datum/tgui_window/proc/remove_oversized_payload(payload_id) + oversized_payloads -= payload_id diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm index 469cd7831b1..6efee72a7cd 100644 --- a/code/modules/tgui_input/alert.dm +++ b/code/modules/tgui_input/alert.dm @@ -10,7 +10,7 @@ * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout. * * autofocus - The bool that controls if this alert should grab window focus. */ -/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE) +/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, ui_state = GLOB.always_state) if (!user) user = usr if (!istype(user)) @@ -18,7 +18,11 @@ var/client/client = user user = client.mob else - return + return null + + if(isnull(user.client)) + return null + // A gentle nudge - you should not be using TGUI alert for anything other than a simple message. if(length(buttons) > 3) log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert") @@ -29,7 +33,7 @@ return alert(user, message, title, buttons[1], buttons[2]) if(length(buttons) == 3) return alert(user, message, title, buttons[1], buttons[2], buttons[3]) - var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus) + var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus, ui_state) alert.ui_interact(user) alert.wait() if (alert) @@ -59,19 +63,23 @@ var/autofocus /// Boolean field describing if the tgui_alert was closed by the user. var/closed + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state -/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus) +/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus, ui_state) src.autofocus = autofocus src.buttons = buttons.Copy() src.message = message src.title = title + src.state = ui_state if (timeout) src.timeout = timeout start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_alert/Destroy(force, ...) +/datum/tgui_alert/Destroy(force) SStgui.close_uis(src) + state = null buttons?.Cut() return ..() @@ -94,7 +102,7 @@ closed = TRUE /datum/tgui_alert/ui_state(mob/user) - return GLOB.always_state + return state /datum/tgui_alert/ui_static_data(mob/user) var/list/data = list() @@ -112,7 +120,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -/datum/tgui_alert/ui_act(action, list/params) +/datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if (.) return diff --git a/code/modules/tgui_input/checkboxes.dm b/code/modules/tgui_input/checkboxes.dm new file mode 100644 index 00000000000..51ce2a631aa --- /dev/null +++ b/code/modules/tgui_input/checkboxes.dm @@ -0,0 +1,139 @@ +/** + * ### tgui_input_checkbox + * Opens a window with a list of checkboxes and returns a list of selected choices. + * + * user - The mob to display the window to + * message - The message inside the window + * title - The title of the window + * list/items - The list of items to display + * min_checked - The minimum number of checkboxes that must be checked (defaults to 1) + * max_checked - The maximum number of checkboxes that can be checked (optional) + * timeout - The timeout for the input (optional) + */ +/proc/tgui_input_checkboxes(mob/user, message, title = "Select", list/items, min_checked = 1, max_checked = 50, timeout = 0, ui_state = GLOB.always_state) + if (!user) + user = usr + if(!length(items)) + return null + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return null + + if(isnull(user.client)) + return null + + if(!user.client.prefs.tgui_inputs) + return input(user, message, title) as null|anything in items + var/datum/tgui_checkbox_input/input = new(user, message, title, items, min_checked, max_checked, timeout, ui_state) + input.ui_interact(user) + input.wait() + if (input) + . = input.choices + qdel(input) + +/// Window for tgui_input_checkboxes +/datum/tgui_checkbox_input + /// Title of the window + var/title + /// Message to display + var/message + /// List of items to display + var/list/items + /// List of selected items + var/list/choices + /// Time when the input was created + var/start_time + /// Timeout for the input + var/timeout + /// Whether the input was closed + var/closed + /// Minimum number of checkboxes that must be checked + var/min_checked + /// Maximum number of checkboxes that can be checked + var/max_checked + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state + +/datum/tgui_checkbox_input/New(mob/user, message, title, list/items, min_checked, max_checked, timeout, ui_state) + src.title = title + src.message = message + src.items = items.Copy() + src.min_checked = min_checked + src.max_checked = max_checked + src.state = ui_state + + if (timeout) + src.timeout = timeout + start_time = world.time + QDEL_IN(src, timeout) + +/datum/tgui_checkbox_input/Destroy(force) + SStgui.close_uis(src) + state = null + items?.Cut() + return ..() + +/datum/tgui_checkbox_input/proc/wait() + while (!closed && !QDELETED(src)) + stoplag(1) + +/datum/tgui_checkbox_input/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "CheckboxInput") + ui.open() + +/datum/tgui_checkbox_input/ui_close(mob/user) + . = ..() + closed = TRUE + +/datum/tgui_checkbox_input/ui_state(mob/user) + return state + +/datum/tgui_checkbox_input/ui_data(mob/user) + var/list/data = list() + + if(timeout) + data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) + + return data + +/datum/tgui_checkbox_input/ui_static_data(mob/user) + var/list/data = list() + + data["items"] = items + data["min_checked"] = min_checked + data["max_checked"] = max_checked + data["large_buttons"] = user.client.prefs.tgui_buttons_large + data["message"] = message + data["swapped_buttons"] = user.client.prefs.tgui_inputs_swapped + data["title"] = title + + return data + +/datum/tgui_checkbox_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if (.) + return + + switch(action) + if("submit") + var/list/selections = params["entry"] + if(length(selections) >= min_checked && length(selections) <= max_checked) + set_choices(selections) + closed = TRUE + SStgui.close_uis(src) + return TRUE + + if("cancel") + closed = TRUE + SStgui.close_uis(src) + return TRUE + + return FALSE + +/datum/tgui_checkbox_input/proc/set_choices(list/selections) + src.choices = selections.Copy() diff --git a/code/modules/tgui_input/keycombo.dm b/code/modules/tgui_input/keycombo.dm new file mode 100644 index 00000000000..45bd3c18034 --- /dev/null +++ b/code/modules/tgui_input/keycombo.dm @@ -0,0 +1,126 @@ +/** + * Creates a TGUI window with a key input. Returns the user's response as a full key with modifiers, eg ShiftK. + * + * This proc should be used to create windows for key entry that the caller will wait for a response from. + * If tgui fancy chat is turned off: Will return a normal input. + * + * Arguments: + * * user - The user to show the number input to. + * * message - The content of the number input, shown in the body of the TGUI window. + * * title - The title of the number input modal, shown on the top of the TGUI window. + * * default - The default (or current) key, shown as a placeholder. + */ +/proc/tgui_input_keycombo(mob/user = usr, message, title = "Key Input", default = 0, timeout = 0, ui_state = GLOB.always_state) + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return null + + if (isnull(user.client)) + return null + + // Client does NOT have tgui_input on: Returns regular input + if(!user.client.prefs.tgui_inputs) + var/input_key = input(user, message, title + "(Modifiers are TGUI only, sorry!)", default) as null|text + return input_key[1] + var/datum/tgui_input_keycombo/key_input = new(user, message, title, default, timeout, ui_state) + key_input.ui_interact(user) + key_input.wait() + if (key_input) + . = key_input.entry + qdel(key_input) + +/** + * # tgui_input_keycombo + * + * Datum used for instantiating and using a TGUI-controlled key input that prompts the user with + * a message and listens for key presses. + */ +/datum/tgui_input_keycombo + /// Boolean field describing if the tgui_input_number was closed by the user. + var/closed + /// The default (or current) value, shown as a default. Users can press reset with this. + var/default + /// The entry that the user has return_typed in. + var/entry + /// The prompt's body, if any, of the TGUI window. + var/message + /// The time at which the number input was created, for displaying timeout progress. + var/start_time + /// The lifespan of the number input, after which the window will close and delete itself. + var/timeout + /// The title of the TGUI window + var/title + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state + +/datum/tgui_input_keycombo/New(mob/user, message, title, default, timeout, ui_state) + src.default = default + src.message = message + src.title = title + src.state = ui_state + if (timeout) + src.timeout = timeout + start_time = world.time + QDEL_IN(src, timeout) + +/datum/tgui_input_keycombo/Destroy(force) + SStgui.close_uis(src) + state = null + return ..() + +/** + * Waits for a user's response to the tgui_input_keycombo's prompt before returning. Returns early if + * the window was closed by the user. + */ +/datum/tgui_input_keycombo/proc/wait() + while (!entry && !closed && !QDELETED(src)) + stoplag(1) + +/datum/tgui_input_keycombo/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "KeyComboModal") + ui.open() + +/datum/tgui_input_keycombo/ui_close(mob/user) + . = ..() + closed = TRUE + +/datum/tgui_input_keycombo/ui_state(mob/user) + return state + +/datum/tgui_input_keycombo/ui_static_data(mob/user) + var/list/data = list() + data["init_value"] = default // Default is a reserved keyword + data["large_buttons"] = user.client.prefs.tgui_buttons_large + data["message"] = message + data["swapped_buttons"] = user.client.prefs.tgui_inputs_swapped + data["title"] = title + return data + +/datum/tgui_input_keycombo/ui_data(mob/user) + var/list/data = list() + if(timeout) + data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) + return data + +/datum/tgui_input_keycombo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if (.) + return + switch(action) + if("submit") + set_entry(params["entry"]) + closed = TRUE + SStgui.close_uis(src) + return TRUE + if("cancel") + closed = TRUE + SStgui.close_uis(src) + return TRUE + +/datum/tgui_input_keycombo/proc/set_entry(entry) + src.entry = entry diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm index 1192bb55b85..5448a4a4729 100644 --- a/code/modules/tgui_input/list.dm +++ b/code/modules/tgui_input/list.dm @@ -10,21 +10,28 @@ * * default - If an option is already preselected on the UI. Current values, etc. * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout. */ -/proc/tgui_input_list(mob/user, message, title = "Select", list/items, default, timeout = 0) +/proc/tgui_input_list(mob/user, message, title = "Select", list/items, default, timeout = 0, ui_state = GLOB.always_state) if (!user) user = usr if(!length(items)) - return + return null if (!istype(user)) if (istype(user, /client)) var/client/client = user user = client.mob else - return + return null + + if(isnull(user.client)) + return null + /// Client does NOT have tgui_input on: Returns regular input if(!user.client.prefs.tgui_inputs) return input(user, message, title, default) as null|anything in items - var/datum/tgui_list_input/input = new(user, message, title, items, default, timeout) + var/datum/tgui_list_input/input = new(user, message, title, items, default, timeout, ui_state) + if(input.invalid) + qdel(input) + return input.ui_interact(user) input.wait() if (input) @@ -56,13 +63,18 @@ var/timeout /// Boolean field describing if the tgui_list_input was closed by the user. var/closed + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state + /// Whether the tgui list input is invalid or not (i.e. due to all list entries being null) + var/invalid = FALSE -/datum/tgui_list_input/New(mob/user, message, title, list/items, default, timeout) +/datum/tgui_list_input/New(mob/user, message, title, list/items, default, timeout, ui_state) src.title = title src.message = message src.items = list() src.items_map = list() src.default = default + src.state = ui_state var/list/repeat_items = list() // Gets rid of illegal characters var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"}) @@ -74,13 +86,17 @@ string_key = avoid_assoc_duplicate_keys(string_key, repeat_items) src.items += string_key src.items_map[string_key] = i + + if(length(src.items) == 0) + invalid = TRUE if (timeout) src.timeout = timeout start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_list_input/Destroy(force, ...) +/datum/tgui_list_input/Destroy(force) SStgui.close_uis(src) + state = null items?.Cut() items_map?.Cut() return ..() @@ -96,7 +112,7 @@ /datum/tgui_list_input/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "ListInputModal") + ui = new(user, src, "ListInputWindow") ui.open() /datum/tgui_list_input/ui_close(mob/user) @@ -104,15 +120,15 @@ closed = TRUE /datum/tgui_list_input/ui_state(mob/user) - return GLOB.always_state + return state /datum/tgui_list_input/ui_static_data(mob/user) var/list/data = list() data["init_value"] = default || items[1] data["items"] = items data["large_buttons"] = user.client.prefs.tgui_buttons_large - data["swapped_buttons"] = user.client.prefs.tgui_inputs_swapped data["message"] = message + data["swapped_buttons"] = user.client.prefs.tgui_inputs_swapped data["title"] = title return data @@ -122,7 +138,7 @@ data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) return data -/datum/tgui_list_input/ui_act(action, list/params) +/datum/tgui_list_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if (.) return diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm index 8eb489be1f0..5c708f618e3 100644 --- a/code/modules/tgui_input/number.dm +++ b/code/modules/tgui_input/number.dm @@ -15,7 +15,7 @@ * * timeout - The timeout of the number input, after which the modal will close and qdel itself. Set to zero for no timeout. * * round_value - whether the inputted number is rounded down into an integer. */ -/proc/tgui_input_number(mob/user, message, title = "Number Input", default = 0, max_value = 10000, min_value = 0, timeout = 0, round_value = TRUE) +/proc/tgui_input_number(mob/user, message, title = "Number Input", default = 0, max_value = 10000, min_value = 0, timeout = 0, round_value = TRUE, ui_state = GLOB.always_state) if (!user) user = usr if (!istype(user)) @@ -30,7 +30,7 @@ if(!user.client.prefs.tgui_inputs) var/input_number = input(user, message, title, default) as null|num return clamp(round_value ? round(input_number) : input_number, min_value, max_value) - var/datum/tgui_input_number/number_input = new(user, message, title, default, max_value, min_value, timeout, round_value) + var/datum/tgui_input_number/number_input = new(user, message, title, default, max_value, min_value, timeout, round_value, ui_state) number_input.ui_interact(user) number_input.wait() if (number_input) @@ -64,14 +64,17 @@ var/timeout /// The title of the TGUI window var/title + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state -/datum/tgui_input_number/New(mob/user, message, title, default, max_value, min_value, timeout, round_value) +/datum/tgui_input_number/New(mob/user, message, title, default, max_value, min_value, timeout, round_value, ui_state) src.default = default src.max_value = max_value src.message = message src.min_value = min_value src.title = title src.round_value = round_value + src.state = ui_state if (timeout) src.timeout = timeout start_time = world.time @@ -87,8 +90,9 @@ if(default > max_value) CRASH("Default value is greater than max value.") -/datum/tgui_input_number/Destroy(force, ...) +/datum/tgui_input_number/Destroy(force) SStgui.close_uis(src) + state = null return ..() /** @@ -110,7 +114,7 @@ closed = TRUE /datum/tgui_input_number/ui_state(mob/user) - return GLOB.always_state + return state /datum/tgui_input_number/ui_static_data(mob/user) if (!user.client) @@ -119,10 +123,10 @@ var/list/data = list() data["init_value"] = default // Default is a reserved keyword data["large_buttons"] = user.client.prefs.tgui_buttons_large - data["swapped_buttons"] = user.client.prefs.tgui_inputs_swapped data["max_value"] = max_value data["message"] = message data["min_value"] = min_value + data["swapped_buttons"] = user.client.prefs.tgui_inputs_swapped data["title"] = title data["round_value"] = round_value return data @@ -133,7 +137,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -/datum/tgui_input_number/ui_act(action, list/params) +/datum/tgui_input_number/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if (.) return diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm index 4b96ab1791d..4caf3f82420 100644 --- a/code/modules/tgui_input/say_modal/modal.dm +++ b/code/modules/tgui_input/say_modal/modal.dm @@ -48,7 +48,6 @@ sleep(3 SECONDS) window.initialize( strict_mode = TRUE, - fancy = TRUE, inline_css = file("tgui/public/tgui-say.bundle.css"), inline_js = file("tgui/public/tgui-say.bundle.js"), ); diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm index c934a4276a6..6b3563a27a0 100644 --- a/code/modules/tgui_input/text.dm +++ b/code/modules/tgui_input/text.dm @@ -10,12 +10,12 @@ * * message - The content of the text input, shown in the body of the TGUI window. * * title - The title of the text input modal, shown on the top of the TGUI window. * * default - The default (or current) value, shown as a placeholder. - * * max_length - Specifies a max length for input. MAX_MESSAGE_LEN is default (1024) + * * max_length - Specifies a max length for input. MAX_MESSAGE_LEN is default (4096) * * multiline - Bool that determines if the input box is much larger. Good for large messages, laws, etc. * * encode - Toggling this determines if input is filtered via html_encode. Setting this to FALSE gives raw input. * * timeout - The timeout of the textbox, after which the modal will close and qdel itself. Set to zero for no timeout. */ -/proc/tgui_input_text(mob/user, message = "", title = "Text Input", default, max_length = MAX_MESSAGE_LEN, multiline = FALSE, encode = TRUE, timeout = 0) +/proc/tgui_input_text(mob/user, message = "", title = "Text Input", default, max_length = MAX_MESSAGE_LEN, multiline = FALSE, encode = TRUE, timeout = 0, ui_state = GLOB.always_state) if (!user) user = usr if (!istype(user)) @@ -39,7 +39,7 @@ return input(user, message, title, default) as message|null else return input(user, message, title, default) as text|null - var/datum/tgui_input_text/text_input = new(user, message, title, default, max_length, multiline, encode, timeout) + var/datum/tgui_input_text/text_input = new(user, message, title, default, max_length, multiline, encode, timeout, ui_state) text_input.ui_interact(user) text_input.wait() if (text_input) @@ -73,21 +73,25 @@ var/timeout /// The title of the TGUI window var/title + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state -/datum/tgui_input_text/New(mob/user, message, title, default, max_length, multiline, encode, timeout) +/datum/tgui_input_text/New(mob/user, message, title, default, max_length, multiline, encode, timeout, ui_state) src.default = default src.encode = encode src.max_length = max_length src.message = message src.multiline = multiline src.title = title + src.state = ui_state if (timeout) src.timeout = timeout start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_input_text/Destroy(force, ...) +/datum/tgui_input_text/Destroy(force) SStgui.close_uis(src) + state = null return ..() /** @@ -131,7 +135,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -/datum/tgui_input_text/ui_act(action, list/params) +/datum/tgui_input_text/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if (.) return diff --git a/code/modules/tgui_panel/external.dm b/code/modules/tgui_panel/external.dm index 5ab90b3d61b..8874bf3a49e 100644 --- a/code/modules/tgui_panel/external.dm +++ b/code/modules/tgui_panel/external.dm @@ -32,3 +32,11 @@ tgui_panel.initialize(force = TRUE) // Force show the panel to see if there are any errors winset(src, "output_selector.legacy_output_selector", "left=output_browser") + +/client/verb/refresh_tgui() + set name = "Refresh TGUI" + set category = "OOC.Debug" + + for(var/window_id in tgui_windows) + var/datum/tgui_window/window = tgui_windows[window_id] + window.reinitialize() diff --git a/code/modules/turbolift/turbolift_areas.dm b/code/modules/turbolift/turbolift_areas.dm index b5d62178ef3..73ba00edbd5 100644 --- a/code/modules/turbolift/turbolift_areas.dm +++ b/code/modules/turbolift/turbolift_areas.dm @@ -1,6 +1,7 @@ // Used for creating the exchange areas. /area/turbolift name = "Turbolift" + icon_state = "turbolift" base_turf = /turf/simulated/open requires_power = 0 station_area = TRUE diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm index 017d0678876..178c3768f96 100644 --- a/code/unit_tests/map_tests.dm +++ b/code/unit_tests/map_tests.dm @@ -159,6 +159,8 @@ var/checks = 0 var/failed_checks = 0 for(var/obj/structure/machinery/door/airlock/A in world) + if(QDELETED(A)) + continue var/turf/T = get_turf(A) checks++ TEST_ASSERT_NOTNULL(T, "A turf does not exist under the door at [A.x],[A.y],[A.z]") @@ -180,8 +182,11 @@ var/checks = 0 var/failed_checks = 0 for(var/obj/structure/machinery/door/firedoor/F in world) + if(QDELETED(F)) + continue var/turf/T = get_turf(F) checks++ + TEST_ASSERT_NOTNULL(T, "A turf does not exist under the firedoor at [F.x],[F.y],[F.z]") var/firelock_increment = 0 for(var/obj/structure/machinery/door/firedoor/FD in T) firelock_increment += 1 diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm index b2b730a1e02..e9b77caa54d 100644 --- a/code/unit_tests/zas_tests.dm +++ b/code/unit_tests/zas_tests.dm @@ -124,7 +124,6 @@ GLOBAL_LIST_EMPTY(turfs_to_map_type) /datum/unit_test/zas_area_test/ai_chamber name = "ZAS: AI Chamber" area_path = /area/horizon/ai/chamber - expectation = UT_NORMAL_COOL /datum/unit_test/zas_area_test/xenobio name = "ZAS: Xenobiology" diff --git a/config/example/config.txt b/config/example/config.txt index 0824bb673a6..a486343be07 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -604,3 +604,7 @@ CACHE_ASSETS 0 # # # + +## Tgui payloads larger than the 2kb limit for BYOND topic requests are split into roughly 1kb chunks and sent in sequence. +## This config option limits the maximum chunk count for which the server will accept a payload, default is 32 +TGUI_MAX_CHUNK_COUNT 32 diff --git a/dependencies.sh b/dependencies.sh index dc296092ca2..a015b9e405d 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -17,9 +17,12 @@ echo "SPACEMAN_DMM_VERSION=$SPACEMAN_DMM_VERSION" >> "$GITHUB_ENV" #node version export NODE_VERSION=20 echo "NODE_VERSION=$NODE_VERSION" >> "$GITHUB_ENV" -export NODE_VERSION_LTS=20.12.0 +export NODE_VERSION_LTS=22.11.0 echo "NODE_VERSION_LTS=$NODE_VERSION_LTS" >> "$GITHUB_ENV" +# Bun version +export BUN_VERSION=1.2.16 +echo "BUN_VERSION=$BUN_VERSION" >> "$GITHUB_ENV" # Python version for mapmerge and other tools # Ensure in https://www.python.org/ftp/python/ there is a file called python--embed-amd64.zip, diff --git a/html/changelogs/Bat-TGUIHotfixes1.yml b/html/changelogs/Bat-TGUIHotfixes1.yml new file mode 100644 index 00000000000..0d325c1f87d --- /dev/null +++ b/html/changelogs/Bat-TGUIHotfixes1.yml @@ -0,0 +1,6 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - bugfix: "Fixes TGUI windows having their dimensions provided from datum init being overridden." + - bugfix: "Increases say window width." + - bugfix: "Re-enables spellcheck in tgui-say." diff --git a/html/changelogs/Bat-TGUIHotfixes2.yml b/html/changelogs/Bat-TGUIHotfixes2.yml new file mode 100644 index 00000000000..ae9154ea48e --- /dev/null +++ b/html/changelogs/Bat-TGUIHotfixes2.yml @@ -0,0 +1,8 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - bugfix: "Fixes LateJoin and Manifest interfaces not displaying department colors by creating a shared component for both interfaces to use." + - bugfix: "Fixes the Manifest interface not displaying colors for crew status." + - bugfix: "Fixes status composer not allowing AIs to view TGUIs." + - bugfix: "Fixes inline icons in alt-click atom viewer." + - bugfix: "Fixes PDA light toggle icon not appearing." diff --git a/html/changelogs/Bat-TGUIHotfixes3.yml b/html/changelogs/Bat-TGUIHotfixes3.yml new file mode 100644 index 00000000000..31ab3960c0f --- /dev/null +++ b/html/changelogs/Bat-TGUIHotfixes3.yml @@ -0,0 +1,5 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - bugfix: "Fixes SmartFridge interface crashing with stored items due to malformed image rendering." + - bugfix: "Forces chat pane to re-render immediately when filters are changed." diff --git a/html/changelogs/Bat-TGUIHotfixes4.yml b/html/changelogs/Bat-TGUIHotfixes4.yml new file mode 100644 index 00000000000..913c353d248 --- /dev/null +++ b/html/changelogs/Bat-TGUIHotfixes4.yml @@ -0,0 +1,17 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - bugfix: "Restores chat highlight background color selection functionality (PR #20701)" + - bugfix: "Restores customizable chat message retention settings." + - bugfix: "Updates recommended vscode extension config file." + - bugfix: "Fixes some mismapped and missing scss files as well as removing temporary working files leftover in PR." + - bugfix: "Fixes silicons/AI being unable to interact remotely with shield capacitor and shield generator machinery." + - bugfix: "Fixes gene data disks produced by xenobotany's lysis-isolation centrifuge machine not displaying gene names." + - bugfix: "Makes AI remote access to machinery TGUIs more consistent." + - bugfix: "Fixes the Sensors interface not displaying sensor machinery's current health." + - bugfix: "Fixes the Sensors interface displaying strange values for current range." + - bugfix: "Fixes modular computer software displaying device themes instead of explicit software themes." + - bugfix: "Fixes MC tab links." + - bugfix: "Fixes Manifest and LateJoin department colors to match pre-React settings." + - bugfix: "Aligns mismatched radio channel keys between tgui-say and the radio subsystem." + - spellcheck: "Fixes a typo in the TGUI fatal error message." diff --git a/html/changelogs/Bat-TGUIReactMigration.yml b/html/changelogs/Bat-TGUIReactMigration.yml new file mode 100644 index 00000000000..4078a497fb4 --- /dev/null +++ b/html/changelogs/Bat-TGUIReactMigration.yml @@ -0,0 +1,66 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Batrachophrenoboocosmomachia + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - refactor: "Updates TGUI backend (both modules and tgui code) from Inferno to React." + - refactor: "Migrates all TGUI components and interfaces to the new React architecture." + - rscadd: "Adds item examine tags and descriptors w/ hoverable tooltips in chat window." + - rscdel: "Removal of all lingering NanoUI code and assets." + - server: "Build tool Javascript to Typescript migrations." + - code_imp: "Migration to bun 1.2.16." + - code_imp: "Migration from eslint 7.32.0 -> biome 2.1.2." + - code_imp: "Many many other dependency changes; see all 'package.json' diffs." + - bugfix: "Fixes runtime attempting to clone executable files in NTOS File Manager." diff --git a/html/changelogs/MapFixFromTGW.yml b/html/changelogs/MapFixFromTGW.yml deleted file mode 100644 index 5ef1eb1d4e7..00000000000 --- a/html/changelogs/MapFixFromTGW.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: TheGreyWolf - -delete-after: True - -changes: - - bugfix: "Gives the role merchant a EFTPOS." diff --git a/html/changelogs/TGWCleansUp.yml b/html/changelogs/TGWCleansUp.yml new file mode 100644 index 00000000000..f0f984a2489 --- /dev/null +++ b/html/changelogs/TGWCleansUp.yml @@ -0,0 +1,14 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixed the taj sprites for the bucket hat, boonie hat and camo boonie hat." + - bugfix: "Fixed noticeboard not formatting certain symbols correctly." + - bugfix: "Fixed pill bottle sound when inserting items." + - bugfix: "Fixed the overflow of vitamins from biogenerators." + - bugfix: "Fixed the sound from the investigator crime scene kit and aluminium briefcase when inserting items." + - bugfix: "Fixed intercoms on south walls were too far in on the walls." + - bugfix: "Fixed the stripes disappearing briefly when a glass airlock denied access." + - bugfix: "Fixed the missing wall pharmacy vending machine sprite when vending." + - bugfix: "Fixed vaurca having access to the base combi-tool. They have their own in the loadout, they should be using that." diff --git a/html/changelogs/archive/2026-05.yml b/html/changelogs/archive/2026-05.yml index 4b942c96eb6..70a8e829538 100644 --- a/html/changelogs/archive/2026-05.yml +++ b/html/changelogs/archive/2026-05.yml @@ -413,3 +413,10 @@ kermit: - rscadd: Adds 3x PsiProtect Broad Use pill bottles to the Pharmacy retail shelf for prescription refills (and investigation). +2026-05-31: + Kano: + - bugfix: Fixed the machinery repath in cryo outpost Odyssey map. + TheGreyWolf: + - bugfix: Gives the role merchant a EFTPOS. + Wowzewow (Wezzy): + - soundadd: Adds a whole lot more of pick up, drop, and handling sounds. diff --git a/html/changelogs/archive/2026-06.yml b/html/changelogs/archive/2026-06.yml new file mode 100644 index 00000000000..8d8bc239e5a --- /dev/null +++ b/html/changelogs/archive/2026-06.yml @@ -0,0 +1,164 @@ +2026-06-01: + Llywelwyn: + - bugfix: Leaning on the north side of a wall now correctly hides your lower body + behind the wall instead of drawing you on top of it. + - code_imp: Adds a COMSIG_MOB_LYING_DOWN signal, sent when a mob transitions into + lying down. +2026-06-02: + Batrachophrenoboocosmomachia: + - bugfix: 'Reverts #22556 (organ rejection changes).' + - bugfix: Fixes non-hardsuit health analyzer runtime. + - bugfix: Fixes hardsuit health analyzer not reliably self-scanning. + - bugfix: Adds additional safety checks to hardsuit deployment logic to better handle + boot checks. + - bugfix: Hardsuit Health Analyzer module works again. + - rscadd: Adds 'Retract All Parts' verb for hardsuits. + - rscdel: Removes Vitals Scanner module; hardsuits which had this module by default + have had it replaced with the Health Analzyer module. + - rscdel: Removes hardsuit Maneuvering Jets onmob sprites. + ElorgRHG: + - imageadd: Tweaked the sprites for security badge accessories and added belt sprites + for them. + Greenjoe: + - rscadd: Adds clothing item versions of various undershirt items. They can be selected + in the loadout. The undershirt versions of them are removed from the game. Some + other undershirts are removed outright. + Hellfirejag: + - rscdel: Removed a couple of completely vestigial global-ish mob vars to save on + memory and time. + - bugfix: Fixed a runtime error caused by giving any mob spell objects. + - bugfix: Fixed a runtime error caused by shift clicking a turf after logging out + and relogging. + - bugfix: Fixed some situations where an IPC datacable can get 'stuck'. + - bugfix: Fixed a runtime error caused by robotics consoles using a protolathe when + no circuit imprinter is connected. + - bugfix: Fixed a runtime error on objects caused by timers being created on objects + that are already being qdel'ed. + - rscadd: Tweaked the hard delete logging sensitivity to correctly catch and record + typical hard dels to the sentry logs. They will also now provide more usable + information in order to help find where the memory leaks are coming from. + - bugfix: Fixed a runtime error in organ rejection. + - bugfix: Fixed vines spamming runtime errors after they are 'damaged' by a player. + - bugfix: Fixed a runtime error related to the stamina bar. + - bugfix: Fixed a runtime regularly caused by flashlights. + - bugfix: Fixed a runtime error caused by explosive implants lying about being a + radio to the Radio Subsystem. + Llywelwyn: + - bugfix: Fake Crew Arrival Announcement uplink service now works even with an invalid + employer faction. + MattAtlas: + - bugfix: Synthetic external armour now deteriorates with the actual damage taken. + Previously, the calculation led to the armour instead taking less damage the + less it was blocked. + - bugfix: Fixing the synthetic endoskeleton now fixes the permanent paincrit effect + on IPCs. This was caused by the self preservation status being toggled when + the endoskeleton was destroyed, but it was never reset when the endoskeleton + was fixed. + - bugfix: Species components are now added and removed properly, meaning you can + switch from IPC to human and back and forth as a mercenary once more. + - bugfix: The Bishop internal PDA now uses your actual ID on your person as its + own ID. + - bugfix: Fixed the endoskeleton welder repair surgery. You can do this surgery + by using a welder while aiming chest and after having opened the chest fully. + - bugfix: The endoskeleton now takes damage from EMPs as well. This should make + them A LOT more effective against IPCs. + - qol: The posibrain will now show up in diagnostics. + - rscadd: Posibrains can now be destroyed by hitting them. This will completely + kill the IPC's consciousness! + TheGreyWolf: + - balance: Tajara brute mods were changed from 10%, 20% and 30% for zhan, base tajara + and m'sai to 5%, 10%, 15%. + - balance: Flashbangs no longer stun tajara unless they have sensitive hearing on. + - rscadd: The height difference between hharar, m'sai and zhan were tweaked to not + be identical. + - rscadd: Tajara eyes can now extend their vision, somewhat similarly to using a + binocular. + - rscadd: Tajara with sensitive hearing on can now hear whispers and people talking + into radios from 2 turfs away. + - bugfix: Fixed a bug with the autakh farseer eyes causing them to give the improper + message if retracted by movement or other sources. + hazelmouse: + - rscadd: Implemented a large revision of maintenance, in the hope of establishing + a more coherent style to be followed into the future. Expect slightly brighter + lighting and a more consistent use of decals. + - rscadd: Turrets now produce less light. + - rscadd: Telecommunications is no longer lit with blue lighting. + - rscadd: Several dark spots on the map are now better lit, including medical's + GTR and the INDRA chamber in engineering. + - rscadd: Implemented a few very ancillary changes to the Horizon's mapping outside + of maintenance, including adding tiles to all airlocks. + llywelwyn: + - bugfix: Modular energy guns with a reactor now self-recharge from assembly, instead + of only starting after the first shot is fired. +2026-06-03: + Fenodyree: + - bugfix: Fixes Longbow shells exploding when mechs pick them up. + MattAtlas: + - admin: Added the Storyteller narrate panel for admins. +2026-06-04: + Fenodyree: + - bugfix: Fixes modular lasers improvement cap. + - bugfix: Fixes negative initial values being handled incorrectly. + - bugfix: Fixes some repair edge cases. + - bugfix: Fixes welding repairs not needing eye protection. + - bugfix: Fixes gattling laser mod having the wrong improvable variables. + - bugfix: Fixes the weapon analyzer printout calculating modlaser stats incorrectly. + - bugfix: Fixes high skill users not being able to field repair modlasers. + - bugfix: Fixes the weapon analyzer ripping your combitool out of your hand. + - bugfix: Fixes the weapon analyzer not being deconstructable. + - balance: Drops the per var improvement cap by 50%, multiplicative scaling is no + joke. + - rscadd: Adds spalling when a projectile punches from a solid turf to an open turf. + These are big chunks of shrapnel with low damage and high embed chance. + - rscadd: Adds an admin only gun that fires ship weapon ammo. + - rscadd: 'Makes several indestructible structures breakable: vending machines, + computer frames, window frames and watertanks. They now also leave behind shrapnel + instead of just steel sheets.' + - rscadd: Adds a negative maim chance, which reduces the chance of decapitation + or limb loss. + - balance: Reworks shields, they take more power and are generally weaker. In exchange + they now block explosions and each generator can be upgraded with research components, + in addition to accepting multiple capacitors. + - balance: All non-exoplosive ship projectiles got buffs. All projectiles got additional + anti-material. Armour piercing shells now penetrate many more things. + - balance: Reworked overmap targetting. Shots now spawn on the map edge and aim + at their target, instead of spawning near their target and aiming straight forwards. + - bugfix: Fixes explosive projectiles destroying the thing they hit before the explosion + can happen, causing them not to explode. + - bugfix: Fixes projectiles not penetrating windows, because they hit the window + frame which was indestructible. + - bugfix: Fixes shrapnel getting misnamed, or named twice. + - bugfix: Fixes shields having no click delay when attacked with melee weapons. + Hellfirejag: + - bugfix: Fixed a hard delete caused by worm monsters. + - bugfix: Fixed negative dispersion (from high gun skill) sometimes wrapping back + around to inaccurate guns again. + - bugfix: Comprehensively destroyed an extremely large number of niche hard dels + across the entire Atom-Human Hierarchy. + - bugfix: Fixed some references being deleted instead of nulled. + Hellfirejag, TheGreyWolf: + - rscadd: Implemented the Anatomy skill. Anatomy determines the quality of information + received when medically examining your own injuries. + Llywelwyn: + - bugfix: Saved chat logs are now written with the correct text/html file type. + - bugfix: Emote markup like *bold* and /italics/ once again renders in chat instead + of showing literal tags. + - code_imp: Door tests skip qdeleted doors, so they should no longer intermittently + fail when landing zone generation clears a ruin. + - bugfix: Colour chips in character setup are correctly coloured again. + hazelmouse: + - bugfix: Removed an erroneous scrubber in the bar. + kermit, louiseisnthome: + - imageadd: Changes the Reade accent icon from purple splodges to one that represents + the gas giant. +2026-06-05: + Baldos: + - balance: Added a new box to the uplink that contains 8 shotgun slugs for 2 TC, + and reduced the cost of Assault Shotgun's magazines. + Hellfirejag: + - balance: Tweaked the empathy penalty from mindblankers and PsiProtect drugs to + only cut the morale modifiers from Ministry and Leadership in half, rather than + fully negate them. + TheGreyWolf: + - bugfix: Added a changelog editing system that should cause fewer conflicts and + more accurate timestamps. diff --git a/html/changelogs/fyni-outer-eyes-2-5-5.yml b/html/changelogs/fyni-outer-eyes-2-5-5.yml new file mode 100644 index 00000000000..8e58e41dc2d --- /dev/null +++ b/html/changelogs/fyni-outer-eyes-2-5-5.yml @@ -0,0 +1,5 @@ +author: fyni +delete-after: True +changes: + - rscadd: "Adds modkits to the two Outer Eyes antag loadouts so you can mod the voidsuit to fit other species." + - rscadd: "Adds the Outer Eyes Enforcer outfit, for quicker Outer Eyes spawning for admins." \ No newline at end of file diff --git a/html/changelogs/hazelmouse-eeeeee.yml b/html/changelogs/hazelmouse-eeeeee.yml new file mode 100644 index 00000000000..b4df5326b24 --- /dev/null +++ b/html/changelogs/hazelmouse-eeeeee.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a new exterior area subtype which shields cannot form around. Used to force shields to wrap around the actual walls and windows on deck three, rather than around the entirety of the Horizon's wings." + - imageadd: "Added several area sprites. Makes the map prettier in map editing programs." + - bugfix: "Shields no longer wrap in a large arc around the starboard thrusters." diff --git a/html/changelogs/kano-dot-blend.yml b/html/changelogs/kano-dot-blend.yml new file mode 100644 index 00000000000..eecec494897 --- /dev/null +++ b/html/changelogs/kano-dot-blend.yml @@ -0,0 +1,4 @@ +author: Kano +delete-after: True +changes: + - bugfix: "Fixed windows and grilles not applying the proper smooth overlays they're supposed to have." diff --git a/html/changelogs/kano-dot-cryo-outpost-repath-fix.yml b/html/changelogs/kano-dot-cryo-outpost-repath-fix.yml deleted file mode 100644 index dbeaf7999ae..00000000000 --- a/html/changelogs/kano-dot-cryo-outpost-repath-fix.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Kano - -delete-after: True - -changes: - - bugfix: "Fixed the machinery repath in cryo outpost Odyssey map." diff --git a/html/changelogs/kermit-ipc-cooler-size.yml b/html/changelogs/kermit-ipc-cooler-size.yml new file mode 100644 index 00000000000..e0dc9f79aae --- /dev/null +++ b/html/changelogs/kermit-ipc-cooler-size.yml @@ -0,0 +1,7 @@ +author: kermit + +delete-after: True + +changes: + - qol: "Downsizes the IPC Suit Cooler from Bulky to Normal so they can fit in bags (on par with large oxygen tanks)." + - balance: "Downgrades the IPC Suit Cooler's cell to a heavy-duty cell (-50% charge capacity) and increases charge consumption modifer by 85% (result is: approx. 10 minutes cooling a cooler-less IPC; in ordinary EVA conditions, it still lasts ages, don't worry)." diff --git a/html/changelogs/llywelwyn-sh.yml b/html/changelogs/llywelwyn-sh.yml new file mode 100644 index 00000000000..26da84c3535 --- /dev/null +++ b/html/changelogs/llywelwyn-sh.yml @@ -0,0 +1,5 @@ +author: Llywelwyn +delete-after: True +changes: + - code_imp: "Shellcheck shell scripts in CI/CD." + - code_imp: "Fixes shellcheck warns in existing scripts." diff --git a/html/changelogs/wezzy-sounds-joneses.yml b/html/changelogs/mattatlas-tgattackanims.yml similarity index 90% rename from html/changelogs/wezzy-sounds-joneses.yml rename to html/changelogs/mattatlas-tgattackanims.yml index 310242698f6..663bb08a194 100644 --- a/html/changelogs/wezzy-sounds-joneses.yml +++ b/html/changelogs/mattatlas-tgattackanims.yml @@ -44,7 +44,7 @@ ################################# # Your name. -author: Wowzewow (Wezzy) +author: MattAtlas (Porting), /tg/station (Original Code) # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True @@ -55,4 +55,4 @@ delete-after: True # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - soundadd: "Adds a whole lot more of pick up, drop, and handling sounds." + - rscadd: "Ported attack animations from /tg/station for attacking with items, unarmed attacks, and for simple mobs." diff --git a/html/statbrowser.css b/html/statbrowser.css index 3dd7f78b786..07704633be2 100644 --- a/html/statbrowser.css +++ b/html/statbrowser.css @@ -1,241 +1,295 @@ .light:root { - --scrollbar-base: #f2f2f2; - --scrollbar-thumb: #a7a7a7; + --color-base: #ffffff; + --scrollbar-base: #f2f2f2; + --scrollbar-thumb: #a7a7a7; } -html, body { - scrollbar-color: var(--scrollbar-base) var(--scrollbar-thumb); +html, +body { + scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-base); } body { - font-family: Verdana, Geneva, Tahoma, sans-serif; - font-size: 12px !important; - margin: 0 !important; - padding: 0 !important; - overflow-x: hidden; - overflow-y: scroll; -} - -body.dark { - background-color: #131313; - color: #b2c4dd; - scrollbar-base-color: #1c1c1c; - scrollbar-face-color: #3b3b3b; - scrollbar-3dlight-color: #252525; - scrollbar-highlight-color: #252525; - scrollbar-track-color: #1c1c1c; - scrollbar-arrow-color: #929292; - scrollbar-shadow-color: #3b3b3b; -} - -.dark:root { - --scrollbar-base: #181818; - --scrollbar-thumb: #363636; -} - -#menu { - background-color: #F0F0F0; - position: fixed; - width: 100%; - z-index: 100; -} - -.dark #menu { - background-color: #202020; -} - -#statcontent { - padding: 7px 7px 7px 7px; + font-family: Verdana, Geneva, Tahoma, sans-serif; + font-size: 12px; + margin: 0 !important; + padding: 0 !important; + overflow: hidden; } a { - color: black; - text-decoration: none + color: #003399; + text-decoration: none; } -.dark a { - color: #b2c4dd; +a:hover { + color: #007fff; } -a:hover, -.dark a:hover { - text-decoration: underline; -} - -ul { - list-style-type: none; - margin: 0; - padding: 0; - background-color: #333; -} - -li { - float: left; -} - -li a { - display: block; - color: white; - text-align: center; - padding: 14px 16px; - text-decoration: none; -} - -li a:hover:not(.active) { - background-color: #111; -} - -.button-container { - display: inline-flex; - flex-wrap: wrap-reverse; - flex-direction: row; - align-items: flex-start; - overflow-x: hidden; - white-space: pre-wrap; - padding: 0 4px; -} - -.button { - background-color: #dfdfdf; - border: 1px solid #cecece; - border-bottom-width: 2px; - color: rgba(0, 0, 0, 0.7); - padding: 6px 4px 4px; - text-align: center; - text-decoration: none; - font-size: 12px; - margin: 0; - cursor: pointer; - transition-duration: 100ms; - order: 3; - min-width: 40px; -} - -.dark button { - background-color: #222222; - border-color: #343434; - color: rgba(255, 255, 255, 0.5); -} - -.button:hover { - background-color: #ececec; - transition-duration: 0; -} - -.dark button:hover { - background-color: #2e2e2e; -} - -.button:active, -.button.active { - background-color: #ffffff; - color: black; - border-top-color: #cecece; - border-left-color: #cecece; - border-right-color: #cecece; - border-bottom-color: #ffffff; -} - -.dark .button:active, -.dark .button.active { - background-color: #444444; - color: white; - border-top-color: #343434; - border-left-color: #343434; - border-right-color: #343434; - border-bottom-color: #ffffff; -} - -.grid-container { - margin: -2px; - margin-right: -15px; -} - -.grid-item { - position: relative; - display: inline-block; - width: 100%; - box-sizing: border-box; - overflow: visible; - padding: 3px 2px; - text-decoration: none; -} - -@media only screen and (min-width: 300px) { - .grid-item { - width: 50%; - } -} - -@media only screen and (min-width: 430px) { - .grid-item { - width: 33%; - } -} - -@media only screen and (min-width: 560px) { - .grid-item { - width: 25%; - } -} - -@media only screen and (min-width: 770px) { - .grid-item { - width: 20%; - } -} - -.grid-item:hover { - z-index: 1; -} - -.grid-item:hover .grid-item-text { - width: auto; - text-decoration: underline; -} - -.grid-item-text { - display: inline-block; - width: 100%; - background-color: #ffffff; - margin: 0 -6px; - padding: 0 6px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - pointer-events: none; -} - -.dark .grid-item-text { - background-color: #131313; -} - -.link { - display: inline; - background: none; - border: none; - padding: 7px 14px; - color: black; - text-decoration: none; - cursor: pointer; - font-size: 13px; - margin: 2px 2px; -} - -.dark .link { - color: #abc6ec; -} - -.link:hover { - text-decoration: underline; +h3 { + margin: 0 -0.5em 0.5em; + padding: 1em 0.66em 0.5em; + border-bottom: 0.1667em solid; } img { - -ms-interpolation-mode: nearest-neighbor; - image-rendering: pixelated; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; } -.interview_panel_controls, -.interview_panel_stats { - margin-bottom: 10px; +.listed-turf-list { + display: flex; + flex-direction: column; + gap: 0.25em; +} + +.listed-turf-item { + display: inline-flex; + align-items: center; + gap: 0.35em; + width: 100%; + cursor: pointer; +} + +.listed-turf-item img { + flex: 0 0 auto; +} + +.listed-turf-item .link { + min-width: 0; +} + +.stat-container { + display: flex; + flex-direction: column; + height: 100vh; +} + +#menu { + display: flex; + overflow-x: auto; + overflow-y: hidden; + padding: 0.25em 0.25em 0; + background-color: #ffffff; +} + +.menu-wrap { + flex-wrap: wrap-reverse; +} + +#menu.tabs-classic { + padding: 0.15em; +} + +#menu.tabs-classic .button { + min-width: 2em; + margin: 0.1em; + padding: 0.25em 0.4em; + border: 0; + border-radius: 0.25em; +} + +#menu.tabs-classic .button.active { + background-color: #0668b8; + color: white; +} + +.button { + display: inline-table; + cursor: pointer; + user-select: none; + -ms-user-select: none; /* Remove after Byond 516 */ + text-align: center; + font-size: 1em; + min-width: 2.9em; + padding: 0.5em 0.5em 0.4em; + background-color: transparent; + color: rgba(0, 0, 0, 0.5); + border: 0; + border-bottom: 0.1667em solid transparent; + border-radius: 0.25em 0.25em 0 0; +} + +.button:hover { + background-color: #ececec; +} + +.button.active { + cursor: default; + background-color: #dfdfdf; + color: black; + border-bottom-color: #000000; +} + +.statcontent { + flex: 1; + padding: 0.75em 0.5em; + overflow-y: auto; + overflow-x: hidden; +} + +.mcstatcontent { + flex: 1; + padding: 0.75em 0.5em; + overflow-y: auto; + overflow-x: auto; + white-space: pre; +} + +.mcstatcontent td { + vertical-align: top; +} + +.mcstatcontent .monospace { + font-family: "Consolas", "Lucida Console", "Courier New", monospace; +} + +#under-menu { + height: 0.5em; + background-color: #eeeeee; +} + +#under-content { + height: calc(0.5em - 4px); + background-color: #eeeeee; +} + +.grid-container { + margin: -0.25em; +} + +.grid-item { + display: inline-flex; + position: relative; + user-select: none; + -ms-user-select: none; /* Remove after Byond 516 */ + width: 100%; + max-height: 1.85em; + text-decoration: none; + background-color: transparent; + color: black; +} + +.grid-item:hover, +.grid-item:active { + color: #003399; + z-index: 1; +} + +.grid-item-text { + display: inline-block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + pointer-events: none; + width: 100%; + padding: 0.33em 0.5em; + border-radius: 0.25em; +} + +.grid-item:hover .grid-item-text { + height: 100%; + overflow: visible; + white-space: normal; + background-color: #ececec; +} + +.grid-item:active .grid-item-text { + background-color: #dfdfdf; +} + +@media only screen and (min-width: 300px) { + .grid-item { + width: 50%; + } +} + +@media only screen and (min-width: 430px) { + .grid-item { + width: 33%; + } +} + +@media only screen and (min-width: 560px) { + .grid-item { + width: 25%; + } +} + +@media only screen and (min-width: 770px) { + .grid-item { + width: 20%; + } +} + +.status-info { + margin: 0 0.33em 0.25em; +} + +.interview_panel_stats, +.interview_panel_controls { + margin-bottom: 1em; +} + +/** + * MARK: Dark theme colors + */ +.dark:root { + --color-base: #151515; + --scrollbar-base: #151515; + --scrollbar-thumb: #363636; +} + +body.dark { + background-color: #151515; + color: #b2c4dd; +} + +.dark a { + color: #6699ff; +} + +.dark a:hover, +.dark .grid-item:hover, +.dark .grid-item:active { + color: #80bfff; +} + +.dark #menu { + background-color: #151515; +} + +.dark #menu.tabs-classic .button.active { + background-color: #20b142; +} + +.dark .button { + color: rgba(255, 255, 255, 0.5); +} + +.dark .button:hover { + background-color: #252525; +} + +.dark .button.active { + background-color: #313131; + color: #d4dfec; + border-bottom-color: #d4dfec; +} + +.dark #under-menu, +.dark #under-content { + background-color: #202020; +} + +.dark .grid-item { + color: #b2c4dd; +} + +.dark .grid-item:hover .grid-item-text { + background-color: #252525; +} + +.dark .grid-item:active .grid-item-text { + background-color: #313131; } diff --git a/html/statbrowser.html b/html/statbrowser.html index 1aea8811d58..bbbd8fa53ab 100644 --- a/html/statbrowser.html +++ b/html/statbrowser.html @@ -1,3 +1,6 @@ - -
    -
    +
    + +
    +
    +
    +
    diff --git a/html/statbrowser.js b/html/statbrowser.js index c3c167ad4dc..1de23783591 100644 --- a/html/statbrowser.js +++ b/html/statbrowser.js @@ -1,977 +1,941 @@ // Polyfills and compatibility ------------------------------------------------ var decoder = decodeURIComponent || unescape; if (!Array.prototype.includes) { - Array.prototype.includes = function (thing) { - for (var i = 0; i < this.length; i++) { - if (this[i] == thing) return true; - } - return false; - } + Array.prototype.includes = function (thing) { + for (var i = 0; i < this.length; i++) { + if (this[i] == thing) return true; + } + return false; + }; } if (!String.prototype.trim) { - String.prototype.trim = function () { - return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, ''); - }; + String.prototype.trim = function () { + return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, ''); + }; } // Status panel implementation ------------------------------------------------ -var status_tab_parts = ["Loading..."]; +//status_tab_parts expects a list to be returned, to which we'll send a list within a list +//with just "loading" to not appear broken. +var status_tab_parts = [['Loading...']]; var current_tab = null; -var mc_tab_parts = [["Loading...", ""]]; -var spells = []; -var spell_tabs = []; +//mc_tab_parts expects a list to be returned, to which we'll send a list within a list +//with just "loading" to not appear broken. +var mc_tab_parts = [['Loading...']]; +var href_token = null; var verb_tabs = []; -var verbs = [["", ""]]; // list with a list inside +var verbs = [['', '']]; // list with a list inside var tickets = []; -var interviewManager = { status: "", interviews: [] }; +var interviewManager = { status: '', interviews: [] }; var sdql2 = []; var permanent_tabs = []; // tabs that won't be cleared by wipes var turfcontents = []; -var turfname = ""; +var turfname = ''; var imageRetryDelay = 500; var imageRetryLimit = 50; var menu = document.getElementById('menu'); -var under_menu = document.getElementById('under_menu'); var statcontentdiv = document.getElementById('statcontent'); var storedimages = []; var split_admin_tabs = false; +//The 'default' tab that everyone should have, that we swap to if the tab you're on is deleted or anything similar. +var defaultTab = 'Status'; // Any BYOND commands that could result in the client's focus changing go through this // to ensure that when we relinquish our focus, we don't do it after the result of // a command has already taken focus for itself. function run_after_focus(callback) { - setTimeout(callback, 0); + setTimeout(callback, 0); } function createStatusTab(name) { - if (name.indexOf(".") != -1) { - var splitName = name.split("."); - if (split_admin_tabs && splitName[0] === "Admin") - name = splitName[1]; - else - name = splitName[0]; - } - if (document.getElementById(name) || name.trim() == "") { - return; - } - if (!verb_tabs.includes(name) && !permanent_tabs.includes(name)) { - return; - } - var B = document.createElement("BUTTON"); - B.onclick = function () { - tab_change(name); - this.blur(); - }; - B.id = name; - B.textContent = name; - B.className = "button"; - //ORDERING ALPHABETICALLY - B.style.order = name.charCodeAt(0); - if (name == "Status" || name == "MC") { - B.style.order = name == "Status" ? 1 : 2; - } - //END ORDERING - menu.appendChild(B); - SendTabToByond(name); - under_menu.style.height = menu.clientHeight + 'px'; + if (name.indexOf('.') != -1) { + var splitName = name.split('.'); + if (split_admin_tabs && splitName[0] === 'Admin') name = splitName[1]; + else name = splitName[0]; + } + if (document.getElementById(name) || name.trim() == '') { + return; + } + if (!verb_tabs.includes(name) && !permanent_tabs.includes(name)) { + return; + } + var button = document.createElement('DIV'); + button.onclick = function () { + tab_change(name); + this.blur(); + statcontentdiv.focus(); + }; + button.id = name; + button.textContent = name; + button.className = 'button'; + //ORDERING ALPHABETICALLY + button.style.order = { Status: 1, MC: 2 }[name] || name.charCodeAt(0); + //END ORDERING + menu.appendChild(button); + SendTabToByond(name); } function removeStatusTab(name) { - if (!document.getElementById(name) || permanent_tabs.includes(name)) { - return; - } - for (var i = verb_tabs.length - 1; i >= 0; --i) { - if (verb_tabs[i] == name) { - verb_tabs.splice(i, 1); - } - } - menu.removeChild(document.getElementById(name)); - TakeTabFromByond(name); - under_menu.style.height = menu.clientHeight + 'px'; + if (!document.getElementById(name) || permanent_tabs.includes(name)) { + return; + } + for (var i = verb_tabs.length - 1; i >= 0; --i) { + if (verb_tabs[i] == name) { + verb_tabs.splice(i, 1); + } + } + menu.removeChild(document.getElementById(name)); + TakeTabFromByond(name); } function sortVerbs() { - verbs.sort(function (a, b) { - var selector = a[0] == b[0] ? 1 : 0; - if (a[selector].toUpperCase() < b[selector].toUpperCase()) { - return 1; - } - else if (a[selector].toUpperCase() > b[selector].toUpperCase()) { - return -1; - } - return 0; - }) -} - -window.onresize = function () { - under_menu.style.height = menu.clientHeight + 'px'; + verbs.sort((a, b) => { + var selector = a[0] == b[0] ? 1 : 0; + if (a[selector].toUpperCase() < b[selector].toUpperCase()) { + return 1; + } else if (a[selector].toUpperCase() > b[selector].toUpperCase()) { + return -1; + } + return 0; + }); } function addPermanentTab(name) { - if (!permanent_tabs.includes(name)) { - permanent_tabs.push(name); - } - createStatusTab(name); + if (!permanent_tabs.includes(name)) { + permanent_tabs.push(name); + } + createStatusTab(name); } function removePermanentTab(name) { - for (var i = permanent_tabs.length - 1; i >= 0; --i) { - if (permanent_tabs[i] == name) { - permanent_tabs.splice(i, 1); - } - } - removeStatusTab(name); + for (var i = permanent_tabs.length - 1; i >= 0; --i) { + if (permanent_tabs[i] == name) { + permanent_tabs.splice(i, 1); + } + } + removeStatusTab(name); } function checkStatusTab() { - for (var i = 0; i < menu.children.length; i++) { - if (!verb_tabs.includes(menu.children[i].id) && !permanent_tabs.includes(menu.children[i].id)) { - menu.removeChild(menu.children[i]); - } - } + for (var i = 0; i < menu.children.length; i++) { + if ( + !verb_tabs.includes(menu.children[i].id) && + !permanent_tabs.includes(menu.children[i].id) + ) { + menu.removeChild(menu.children[i]); + } + } } function remove_verb(v) { - var verb_to_remove = v; // to_remove = [verb:category, verb:name] - for (var i = verbs.length - 1; i >= 0; i--) { - var part_to_remove = verbs[i]; - if (part_to_remove[1] == verb_to_remove[1]) { - verbs.splice(i, 1) - } - } + var verb_to_remove = v; // to_remove = [verb:category, verb:name] + for (var i = verbs.length - 1; i >= 0; i--) { + var part_to_remove = verbs[i]; + if (part_to_remove[1] == verb_to_remove[1]) { + verbs.splice(i, 1); + } + } } function check_verbs() { - for (var v = verb_tabs.length - 1; v >= 0; v--) { - //Aurora snowflake check because somehow we manage to break even ports - if(!verb_tabs[v]){ - v--; - continue; - } - verbs_cat_check(verb_tabs[v]); - } + for (var v = verb_tabs.length - 1; v >= 0; v--) { + verbs_cat_check(verb_tabs[v]); + } } function verbs_cat_check(cat) { - var tabCat = cat; - if (cat.indexOf(".") != -1) { - var splitName = cat.split("."); - if (split_admin_tabs && splitName[0] === "Admin") - tabCat = splitName[1]; - else - tabCat = splitName[0]; - } - var verbs_in_cat = 0; - var verbcat = ""; - if (!verb_tabs.includes(tabCat) && !spell_tabs.includes(tabCat)) { - removeStatusTab(tabCat); - return; - } - for (var v = 0; v < verbs.length; v++) { - var part = verbs[v]; - verbcat = part[0]; - if (verbcat.indexOf(".") != -1) { - var splitName = verbcat.split("."); - if (split_admin_tabs && splitName[0] === "Admin") - verbcat = splitName[1]; - else - verbcat = splitName[0]; - } - if (verbcat != tabCat || verbcat.trim() == "") { - continue; - } - else { - verbs_in_cat = 1; - break; // we only need one - } - } - //More aurora snowflake code to handle spell tabs - var spells_in_cat = 0; - var spellcat = ""; - for(var v = (spells.length - 1); v >= 0; v--) { - var spell = spells[v]; - spellcat = spell[0]; - if(spellcat != tabCat || spellcat.trim() == ""){ - continue; - } - else{ - spells_in_cat = 1; - break; - } + var tabCat = cat; + if (cat.indexOf('.') != -1) { + var splitName = cat.split('.'); + if (split_admin_tabs && splitName[0] === 'Admin') tabCat = splitName[1]; + else tabCat = splitName[0]; + } + var verbs_in_cat = 0; + var verbcat = ''; + if (!verb_tabs.includes(tabCat)) { + removeStatusTab(tabCat); + return; + } + for (var v = 0; v < verbs.length; v++) { + var part = verbs[v]; + verbcat = part[0]; + if (verbcat.indexOf('.') != -1) { + var splitName = verbcat.split('.'); + if (split_admin_tabs && splitName[0] === 'Admin') verbcat = splitName[1]; + else verbcat = splitName[0]; } - - if (verbs_in_cat != 1 && spells_in_cat != 1) { - removeStatusTab(tabCat); - if (current_tab == tabCat) - tab_change("Status"); - } + if (verbcat != tabCat || verbcat.trim() == '') { + } else { + verbs_in_cat = 1; + break; // we only need one + } + } + if (verbs_in_cat != 1) { + removeStatusTab(tabCat); + if (current_tab == tabCat) tab_change(defaultTab); + } } function findVerbindex(name, verblist) { - for (var i = 0; i < verblist.length; i++) { - var part = verblist[i]; - if (part[1] == name) - return i; - } + for (var i = 0; i < verblist.length; i++) { + var part = verblist[i]; + if (part[1] == name) return i; + } } function wipe_verbs() { - verbs = [["", ""]]; - verb_tabs = []; - checkStatusTab(); // remove all empty verb tabs + verbs = [['', '']]; + verb_tabs = []; + checkStatusTab(); // remove all empty verb tabs } function update_verbs() { - wipe_verbs(); - Byond.sendMessage("Update-Verbs"); + wipe_verbs(); + Byond.sendMessage('Update-Verbs'); } function SendTabsToByond() { - var tabstosend = []; - tabstosend = tabstosend.concat(permanent_tabs, verb_tabs); - for (var i = 0; i < tabstosend.length; i++) { - SendTabToByond(tabstosend[i]); - } + var tabstosend = []; + tabstosend = tabstosend.concat(permanent_tabs, verb_tabs); + for (var i = 0; i < tabstosend.length; i++) { + SendTabToByond(tabstosend[i]); + } } function SendTabToByond(tab) { - Byond.sendMessage("Send-Tabs", {tab: tab}); + Byond.sendMessage('Send-Tabs', { tab: tab }); } //Byond can't have this tab anymore since we're removing it function TakeTabFromByond(tab) { - Byond.sendMessage("Remove-Tabs", {tab: tab}); -} - -function spell_cat_check(cat) { - var spells_in_cat = 0; - var spellcat = ""; - for (var s = 0; s < spells.length; s++) { - var spell = spells[s]; - spellcat = spell[0]; - if (spellcat == cat) { - spells_in_cat++; - } - } - if (spells_in_cat < 1) { - removeStatusTab(cat); - } + Byond.sendMessage('Remove-Tabs', { tab: tab }); } function tab_change(tab) { - if (tab == current_tab) return; - if (document.getElementById(current_tab)) - document.getElementById(current_tab).className = "button"; // disable active on last button - current_tab = tab; - set_byond_tab(tab); - if (document.getElementById(tab)) - document.getElementById(tab).className = "button active"; // make current button active - var spell_tabs_thingy = (spell_tabs.includes(tab)); - var verb_tabs_thingy = (verb_tabs.includes(tab)); - if (tab == "Status") { - draw_status(); - } else if (tab == "MC") { - draw_mc(); - } else if (spell_tabs_thingy) { - draw_spells(tab); - } else if (verb_tabs_thingy) { - draw_verbs(tab); - } else if (tab == "Debug Stat Panel") { - draw_debug(); - } else if (tab == "SDQL2") { - draw_sdql2(); - } else if (tab == turfname) { - draw_listedturf(); - } else { - statcontentdiv.textContext = "Loading..."; - } - Byond.winset(Byond.windowId, { - 'is-visible': true, - }); + if (tab == current_tab) return; + if (document.getElementById(current_tab)) + document.getElementById(current_tab).className = 'button'; // disable active on last button + current_tab = tab; + set_byond_tab(tab); + if (document.getElementById(tab)) + document.getElementById(tab).className = 'button active'; // make current button active + var verb_tabs_thingy = verb_tabs.includes(tab); + statcontentdiv.className = 'statcontent'; + if (tab == 'Status') { + draw_status(); + } else if (tab == 'MC') { + draw_mc(); + } else if (verb_tabs_thingy) { + draw_verbs(tab); + } else if (tab == 'Debug Stat Panel') { + draw_debug(); + } else if (tab == 'Tickets') { + draw_tickets(); + draw_interviews(); + } else if (tab == 'SDQL2') { + draw_sdql2(); + } else if (tab == turfname) { + draw_listedturf(); + } else { + statcontentdiv.textContext = 'Loading...'; + } + Byond.winset(Byond.windowId, { + 'is-visible': true, + }); } function set_byond_tab(tab) { - Byond.sendMessage("Set-Tab", {tab: tab}); + Byond.sendMessage('Set-Tab', { tab: tab }); } function draw_debug() { - statcontentdiv.textContent = ""; - var wipeverbstabs = document.createElement("div"); - var link = document.createElement("a"); - link.onclick = function () { wipe_verbs() }; - link.textContent = "Wipe All Verbs"; - wipeverbstabs.appendChild(link); - document.getElementById("statcontent").appendChild(wipeverbstabs); - var wipeUpdateVerbsTabs = document.createElement("div"); - var updateLink = document.createElement("a"); - updateLink.onclick = function () { update_verbs() }; - updateLink.textContent = "Wipe and Update All Verbs"; - wipeUpdateVerbsTabs.appendChild(updateLink); - document.getElementById("statcontent").appendChild(wipeUpdateVerbsTabs); - var text = document.createElement("div"); - text.textContent = "Verb Tabs:"; - document.getElementById("statcontent").appendChild(text); - var table1 = document.createElement("table"); - for (var i = 0; i < verb_tabs.length; i++) { - var part = verb_tabs[i]; - // Hide subgroups except admin subgroups if they are split - if (verb_tabs[i].lastIndexOf(".") != -1) { - var splitName = verb_tabs[i].split("."); - if (split_admin_tabs && splitName[0] === "Admin") - part = splitName[1]; - else - continue; - } - var tr = document.createElement("tr"); - var td1 = document.createElement("td"); - td1.textContent = part; - var a = document.createElement("a"); - a.onclick = function (part) { - return function () { removeStatusTab(part) }; - }(part); - a.textContent = " Delete Tab " + part; - td1.appendChild(a); - tr.appendChild(td1); - table1.appendChild(tr); - } - document.getElementById("statcontent").appendChild(table1); - var header2 = document.createElement("div"); - header2.textContent = "Verbs:"; - document.getElementById("statcontent").appendChild(header2); - var table2 = document.createElement("table"); - for (var v = 0; v < verbs.length; v++) { - var part2 = verbs[v]; - var trr = document.createElement("tr"); - var tdd1 = document.createElement("td"); - tdd1.textContent = part2[0]; - var tdd2 = document.createElement("td"); - tdd2.textContent = part2[1]; - trr.appendChild(tdd1); - trr.appendChild(tdd2); - table2.appendChild(trr); - } - document.getElementById("statcontent").appendChild(table2); - var text3 = document.createElement("div"); - text3.textContent = "Permanent Tabs:"; - document.getElementById("statcontent").appendChild(text3); - var table3 = document.createElement("table"); - for (var i = 0; i < permanent_tabs.length; i++) { - var part3 = permanent_tabs[i]; - var trrr = document.createElement("tr"); - var tddd1 = document.createElement("td"); - tddd1.textContent = part3; - trrr.appendChild(tddd1); - table3.appendChild(trrr); - } - document.getElementById("statcontent").appendChild(table3); - + statcontentdiv.textContent = ''; + var wipeverbstabs = document.createElement('div'); + var link = document.createElement('a'); + link.onclick = () => { + wipe_verbs(); + }; + link.textContent = 'Wipe All Verbs'; + wipeverbstabs.appendChild(link); + document.getElementById('statcontent').appendChild(wipeverbstabs); + var wipeUpdateVerbsTabs = document.createElement('div'); + var updateLink = document.createElement('a'); + updateLink.onclick = () => { + update_verbs(); + }; + updateLink.textContent = 'Wipe and Update All Verbs'; + wipeUpdateVerbsTabs.appendChild(updateLink); + document.getElementById('statcontent').appendChild(wipeUpdateVerbsTabs); + var text = document.createElement('div'); + text.textContent = 'Verb Tabs:'; + document.getElementById('statcontent').appendChild(text); + var table1 = document.createElement('table'); + for (var i = 0; i < verb_tabs.length; i++) { + var part = verb_tabs[i]; + // Hide subgroups except admin subgroups if they are split + if (verb_tabs[i].lastIndexOf('.') != -1) { + var splitName = verb_tabs[i].split('.'); + if (split_admin_tabs && splitName[0] === 'Admin') part = splitName[1]; + else continue; + } + var tr = document.createElement('tr'); + var td1 = document.createElement('td'); + td1.textContent = part; + var a = document.createElement('a'); + a.onclick = ((part) => () => { + removeStatusTab(part); + })(part); + a.textContent = ' Delete Tab ' + part; + td1.appendChild(a); + tr.appendChild(td1); + table1.appendChild(tr); + } + document.getElementById('statcontent').appendChild(table1); + var header2 = document.createElement('div'); + header2.textContent = 'Verbs:'; + document.getElementById('statcontent').appendChild(header2); + var table2 = document.createElement('table'); + for (var v = 0; v < verbs.length; v++) { + var part2 = verbs[v]; + var trr = document.createElement('tr'); + var tdd1 = document.createElement('td'); + tdd1.textContent = part2[0]; + var tdd2 = document.createElement('td'); + tdd2.textContent = part2[1]; + trr.appendChild(tdd1); + trr.appendChild(tdd2); + table2.appendChild(trr); + } + document.getElementById('statcontent').appendChild(table2); + var text3 = document.createElement('div'); + text3.textContent = 'Permanent Tabs:'; + document.getElementById('statcontent').appendChild(text3); + var table3 = document.createElement('table'); + for (var i = 0; i < permanent_tabs.length; i++) { + var part3 = permanent_tabs[i]; + var trrr = document.createElement('tr'); + var tddd1 = document.createElement('td'); + tddd1.textContent = part3; + trrr.appendChild(tddd1); + table3.appendChild(trrr); + } + document.getElementById('statcontent').appendChild(table3); } + function draw_status() { - if (!document.getElementById("Status")) { - createStatusTab("Status"); - current_tab = "Status"; - } - statcontentdiv.textContent = ''; - for (var i = 0; i < status_tab_parts.length; i++) { - if (status_tab_parts[i].trim() == "") { - document.getElementById("statcontent").appendChild(document.createElement("br")); - } else { - var div = document.createElement("div"); - div.textContent = status_tab_parts[i]; - document.getElementById("statcontent").appendChild(div); - } - } - if (verb_tabs.length == 0 || !verbs) { - Byond.command("Fix-Stat-Panel"); - } + if (!document.getElementById('Status')) { + createStatusTab('Status'); + current_tab = 'Status'; + } + statcontentdiv.textContent = ''; + var table = document.createElement('table'); + for (var i = 0; i < status_tab_parts.length; i++) { + var part = status_tab_parts[i]; + if (!Array.isArray(part)) { + var div = document.createElement('div'); + if (part.trim() == '') { + table.appendChild(document.createElement('br')); + } else { + div.textContent = part; + table.appendChild(div); + } + } else { + var div; + if (part[0].trim() == 'same_line') { + var a = document.createElement('a'); + a.href = 'byond://?' + part[2]; + a.textContent = part[1]; + div.appendChild(a); + } else { + div = document.createElement('div'); + if (part[0].trim() == '') { + table.appendChild(document.createElement('br')); + } else { + div.textContent = part[0]; + if (part[2]) { + var a = document.createElement('a'); + a.href = 'byond://?' + part[2]; + a.textContent = part[1]; + div.appendChild(a); + } + table.appendChild(div); + } + } + } + } + document.getElementById('statcontent').appendChild(table); + if (verb_tabs.length == 0 || !verbs) { + Byond.command('Fix-Stat-Panel'); + } } function draw_mc() { - statcontentdiv.textContent = ""; - var table = document.createElement("table"); - for (var i = 0; i < mc_tab_parts.length; i++) { - var part = mc_tab_parts[i]; - var tr = document.createElement("tr"); - var td1 = document.createElement("td"); - td1.textContent = part[0]; - var td2 = document.createElement("td"); - if (part[2]) { - var a = document.createElement("a"); - a.href="byond://?_src_=vars;Vars=" + part[2]; - a.textContent = part[1]; - td2.appendChild(a); - } else { - td2.textContent = part[1]; - } - tr.appendChild(td1); - tr.appendChild(td2); - table.appendChild(tr); - } - document.getElementById("statcontent").appendChild(table); + statcontentdiv.textContent = ''; + statcontentdiv.className = 'mcstatcontent'; + var table = document.createElement('table'); + for (var i = 0; i < mc_tab_parts.length; i++) { + var part = mc_tab_parts[i]; + var tr = document.createElement('tr'); + var td0 = document.createElement('td'); + td0.className = 'monospace'; + td0.textContent = part[0]; + var td1 = document.createElement('td'); + if (part[2]) { + var a = document.createElement('a'); + a.href = 'byond://?_src_=vars;Vars=' + part[2]; + a.textContent = part[1]; + td1.appendChild(a); + } else { + td1.textContent = part[1]; + } + tr.appendChild(td0); + tr.appendChild(td1); + table.appendChild(tr); + } + document.getElementById('statcontent').appendChild(table); } + +function remove_tickets() { + if (tickets) { + tickets = []; + removePermanentTab('Tickets'); + if (current_tab == 'Tickets') tab_change(defaultTab); + } + checkStatusTab(); +} + function remove_sdql2() { - if (sdql2) { - sdql2 = []; - removePermanentTab("SDQL2"); - if (current_tab == "SDQL2") - tab_change("Status"); - } - checkStatusTab(); + if (sdql2) { + sdql2 = []; + removePermanentTab('SDQL2'); + if (current_tab == 'SDQL2') tab_change(defaultTab); + } + checkStatusTab(); } + +function remove_interviews() { + if (tickets) { + tickets = []; + } + checkStatusTab(); +} + function iconError(e) { - if(current_tab != turfname) { - return; - } - setTimeout(function () { - var node = e.target; - var current_attempts = Number(node.getAttribute("data-attempts")) || 0 - if (current_attempts > imageRetryLimit) { - return; - } - var src = node.src; - node.src = null; - node.src = src + '#' + current_attempts; - node.setAttribute("data-attempts", current_attempts + 1) - draw_listedturf(); - }, imageRetryDelay); + if (current_tab != turfname) { + return; + } + setTimeout(() => { + var node = e.target; + var current_attempts = Number(node.getAttribute('data-attempts')) || 0; + if (current_attempts > imageRetryLimit) { + return; + } + var src = node.src; + node.src = null; + node.src = src + '#' + current_attempts; + node.setAttribute('data-attempts', current_attempts + 1); + draw_listedturf(); + }, imageRetryDelay); } function draw_listedturf() { - statcontentdiv.textContent = ""; - var table = document.createElement("table"); - for (var i = 0; i < turfcontents.length; i++) { - var part = turfcontents[i]; - var clickfunc = (function (part) { - // The outer function is used to close over a fresh "part" variable, - // rather than every onmousedown getting the "part" of the last entry. - return function (e) { - e.preventDefault(); - clickcatcher = "byond://?src=" + part[1]; - switch (e.button) { - case 1: - clickcatcher += ";statpanel_item_click=middle"; - break; - case 2: - clickcatcher += ";statpanel_item_click=right"; - break; - default: - clickcatcher += ";statpanel_item_click=left"; - } - if (e.shiftKey) { - clickcatcher += ";statpanel_item_shiftclick=1"; - } - if (e.ctrlKey) { - clickcatcher += ";statpanel_item_ctrlclick=1"; - } - if (e.altKey) { - clickcatcher += ";statpanel_item_altclick=1"; - } - window.location.href = clickcatcher; - }; - })(part); - if (storedimages[part[1]] == null && part[2]) { - var img = document.createElement("img"); - img.src = part[2]; - img.id = part[1]; - storedimages[part[1]] = part[2]; - img.onerror = iconError; - img.onmousedown = clickfunc; - table.appendChild(img); - } else { - var img = document.createElement("img"); - img.onerror = iconError; - img.onmousedown = clickfunc; - img.src = storedimages[part[1]]; - img.id = part[1]; - table.appendChild(img); - } - var b = document.createElement("div"); - var clickcatcher = ""; - b.className = "link"; - b.onmousedown = clickfunc; - b.textContent = part[0]; - table.appendChild(b); - table.appendChild(document.createElement("br")); - } - document.getElementById("statcontent").appendChild(table); + statcontentdiv.textContent = ''; + var list = document.createElement('div'); + list.className = 'listed-turf-list'; + for (var i = 0; i < turfcontents.length; i++) { + var part = turfcontents[i]; + var clickfunc = ((part) => { + // The outer function is used to close over a fresh "part" variable, + // rather than every onmousedown getting the "part" of the last entry. + return (e) => { + e.preventDefault(); + clickcatcher = 'byond://?src=' + part[1]; + switch (e.button) { + case 1: + clickcatcher += ';statpanel_item_click=middle'; + break; + case 2: + clickcatcher += ';statpanel_item_click=right'; + break; + default: + clickcatcher += ';statpanel_item_click=left'; + } + if (e.shiftKey) { + clickcatcher += ';statpanel_item_shiftclick=1'; + } + if (e.ctrlKey) { + clickcatcher += ';statpanel_item_ctrlclick=1'; + } + if (e.altKey) { + clickcatcher += ';statpanel_item_altclick=1'; + } + window.location.href = clickcatcher; + }; + })(part); + var row = document.createElement('div'); + row.className = 'listed-turf-item'; + row.onmousedown = clickfunc; + if (storedimages[part[1]] == null && part[2]) { + var img = document.createElement('img'); + img.src = part[2]; + img.id = part[1]; + storedimages[part[1]] = part[2]; + img.onerror = iconError; + row.appendChild(img); + } else { + var img = document.createElement('img'); + img.onerror = iconError; + img.src = storedimages[part[1]]; + img.id = part[1]; + row.appendChild(img); + } + var b = document.createElement('div'); + var clickcatcher = ''; + b.className = 'link'; + b.textContent = part[0]; + row.appendChild(b); + list.appendChild(row); + } + document.getElementById('statcontent').appendChild(list); } function remove_listedturf() { - removePermanentTab(turfname); - checkStatusTab(); - if (current_tab == turfname) { - tab_change("Status"); - } + removePermanentTab(turfname); + checkStatusTab(); + if (current_tab == turfname) { + tab_change(defaultTab); + } } function remove_mc() { - removePermanentTab("MC"); - if (current_tab == "MC") { - tab_change("Status"); - } -}; + removePermanentTab('MC'); + if (current_tab == 'MC') { + tab_change(defaultTab); + } +} function draw_sdql2() { - statcontentdiv.textContent = ""; - var table = document.createElement("table"); - for (var i = 0; i < sdql2.length; i++) { - var part = sdql2[i]; - var tr = document.createElement("tr"); - var td1 = document.createElement("td"); - td1.textContent = part[0]; - var td2 = document.createElement("td"); - if (part[2]) { - var a = document.createElement("a"); - a.href="byond://?src=" + part[2] + ";statpanel_item_click=left"; - a.textContent = part[1]; - td2.appendChild(a); - } else { - td2.textContent = part[1]; - } - tr.appendChild(td1); - tr.appendChild(td2); - table.appendChild(tr); - } - document.getElementById("statcontent").appendChild(table); + statcontentdiv.textContent = ''; + var table = document.createElement('table'); + for (var i = 0; i < sdql2.length; i++) { + var part = sdql2[i]; + var tr = document.createElement('tr'); + var td1 = document.createElement('td'); + td1.textContent = part[0]; + var td2 = document.createElement('td'); + if (part[2]) { + var a = document.createElement('a'); + a.href = 'byond://?src=' + part[2] + ';statpanel_item_click=left'; + a.textContent = part[1]; + td2.appendChild(a); + } else { + td2.textContent = part[1]; + } + tr.appendChild(td1); + tr.appendChild(td2); + table.appendChild(tr); + } + document.getElementById('statcontent').appendChild(table); } function draw_tickets() { - statcontentdiv.textContent = ""; - var table = document.createElement("table"); - if (!tickets) { - return; - } - for (var i = 0; i < tickets.length; i++) { - var part = tickets[i]; - var tr = document.createElement("tr"); - var td1 = document.createElement("td"); - td1.textContent = part[0]; - var td2 = document.createElement("td"); - if (part[2]) { - var a = document.createElement("a"); - a.href="byond://?_src_=holder;ahelp=" + part[2] + ";ahelp_action=ticket;statpanel_item_click=left;action=ticket"; - a.textContent = part[1]; - td2.appendChild(a); - } else if (part[3]) { - var a = document.createElement("a"); - a.href="byond://?src=" + part[3] + ";statpanel_item_click=left"; - a.textContent = part[1]; - td2.appendChild(a); - } else { - td2.textContent = part[1]; - } - tr.appendChild(td1); - tr.appendChild(td2); - table.appendChild(tr); - } - document.getElementById("statcontent").appendChild(table); + statcontentdiv.textContent = ''; + var table = document.createElement('table'); + if (!tickets) { + return; + } + for (var i = 0; i < tickets.length; i++) { + var part = tickets[i]; + var tr = document.createElement('tr'); + var td1 = document.createElement('td'); + td1.textContent = part[0]; + var td2 = document.createElement('td'); + if (part[2]) { + var a = document.createElement('a'); + a.href = + 'byond://?_src_=holder;admin_token=' + + href_token + + ';ahelp=' + + part[2] + + ';ahelp_action=ticket;statpanel_item_click=left;action=ticket'; + a.textContent = part[1]; + td2.appendChild(a); + } else if (part[3]) { + var a = document.createElement('a'); + a.href = 'byond://?src=' + part[3] + ';statpanel_item_click=left'; + a.textContent = part[1]; + td2.appendChild(a); + } else { + td2.textContent = part[1]; + } + tr.appendChild(td1); + tr.appendChild(td2); + table.appendChild(tr); + } + document.getElementById('statcontent').appendChild(table); } function draw_interviews() { - var body = document.createElement("div"); - var header = document.createElement("h3"); - header.textContent = "Interviews"; - body.appendChild(header); - var manDiv = document.createElement("div"); - manDiv.className = "interview_panel_controls" - var manLink = document.createElement("a"); - manLink.textContent = "Open Interview Manager Panel"; - manLink.href="byond://?_src_=holder;interview_man=1;statpanel_item_click=left"; - manDiv.appendChild(manLink); - body.appendChild(manDiv); + var body = document.createElement('div'); + var header = document.createElement('h3'); + header.textContent = 'Interviews'; + body.appendChild(header); + var manDiv = document.createElement('div'); + manDiv.className = 'interview_panel_controls'; + var manLink = document.createElement('a'); + manLink.textContent = 'Open Interview Manager Panel'; + manLink.href = + 'byond://?_src_=holder;admin_token=' + + href_token + + ';interview_man=1;statpanel_item_click=left'; + manDiv.appendChild(manLink); + body.appendChild(manDiv); - // List interview stats - var statsDiv = document.createElement("table"); - statsDiv.className = "interview_panel_stats"; - for (var key in interviewManager.status) { - var d = document.createElement("div"); - var tr = document.createElement("tr"); - var stat_name = document.createElement("td"); - var stat_text = document.createElement("td"); - stat_name.textContent = key; - stat_text.textContent = interviewManager.status[key]; - tr.appendChild(stat_name); - tr.appendChild(stat_text); - statsDiv.appendChild(tr); - } - body.appendChild(statsDiv); - document.getElementById("statcontent").appendChild(body); + // List interview stats + var statsDiv = document.createElement('table'); + statsDiv.className = 'interview_panel_stats'; + for (var key in interviewManager.status) { + var d = document.createElement('div'); + var tr = document.createElement('tr'); + var stat_name = document.createElement('td'); + var stat_text = document.createElement('td'); + stat_name.textContent = key; + stat_text.textContent = interviewManager.status[key]; + tr.appendChild(stat_name); + tr.appendChild(stat_text); + statsDiv.appendChild(tr); + } + body.appendChild(statsDiv); + document.getElementById('statcontent').appendChild(body); - // List interviews if any are open - var table = document.createElement("table"); - table.className = "interview_panel_table"; - if (!interviewManager) { - return; - } - for (var i = 0; i < interviewManager.interviews.length; i++) { - var part = interviewManager.interviews[i]; - var tr = document.createElement("tr"); - var td = document.createElement("td"); - var a = document.createElement("a"); - a.textContent = part["status"]; - a.href="byond://?_src_=holder;interview=" + part["ref"] + ";statpanel_item_click=left"; - td.appendChild(a); - tr.appendChild(td); - table.appendChild(tr); - } - document.getElementById("statcontent").appendChild(table); -} - -function draw_spells(cat) { - statcontentdiv.textContent = ""; - var table = document.createElement("table"); - for (var i = 0; i < spells.length; i++) { - var part = spells[i]; - if (part[0] != cat) continue; - var tr = document.createElement("tr"); - var td1 = document.createElement("td"); - td1.textContent = part[1]; - var td2 = document.createElement("td"); - if (part[3]) { - var a = document.createElement("a"); - a.href="byond://?src=" + part[3] + ";statpanel_item_click=left"; - a.textContent = part[2]; - td2.appendChild(a); - } else { - td2.textContent = part[2]; - } - tr.appendChild(td1); - tr.appendChild(td2); - table.appendChild(tr); - } - document.getElementById("statcontent").appendChild(table); + // List interviews if any are open + var table = document.createElement('table'); + table.className = 'interview_panel_table'; + if (!interviewManager) { + return; + } + for (var i = 0; i < interviewManager.interviews.length; i++) { + var part = interviewManager.interviews[i]; + var tr = document.createElement('tr'); + var td = document.createElement('td'); + var a = document.createElement('a'); + a.textContent = part['status']; + a.href = + 'byond://?_src_=holder;admin_token=' + + href_token + + ';interview=' + + part['ref'] + + ';statpanel_item_click=left'; + td.appendChild(a); + tr.appendChild(td); + table.appendChild(tr); + } + document.getElementById('statcontent').appendChild(table); } function make_verb_onclick(command) { - return function () { - run_after_focus(function () { - Byond.command(command); - }); - }; + return () => { + run_after_focus(() => { + Byond.command(command); + }); + }; } function draw_verbs(cat) { - statcontentdiv.textContent = ""; - var table = document.createElement("div"); - var additions = {}; // additional sub-categories to be rendered - table.className = "grid-container"; - sortVerbs(); - if (split_admin_tabs && cat.lastIndexOf(".") != -1) { - var splitName = cat.split("."); - if (splitName[0] === "Admin") - cat = splitName[1]; - } - verbs.reverse(); // sort verbs backwards before we draw - for (var i = 0; i < verbs.length; ++i) { - var part = verbs[i]; - var name = part[0]; - if (split_admin_tabs && name.lastIndexOf(".") != -1) { - var splitName = name.split("."); - if (splitName[0] === "Admin") - name = splitName[1]; - } - var command = part[1]; + statcontentdiv.textContent = ''; + var table = document.createElement('div'); + var additions = {}; // additional sub-categories to be rendered + table.className = 'grid-container'; + sortVerbs(); + if (split_admin_tabs && cat.lastIndexOf('.') != -1) { + var splitName = cat.split('.'); + if (splitName[0] === 'Admin') cat = splitName[1]; + } + verbs.reverse(); // sort verbs backwards before we draw + for (var i = 0; i < verbs.length; ++i) { + var part = verbs[i]; + var name = part[0]; + if (split_admin_tabs && name.lastIndexOf('.') != -1) { + var splitName = name.split('.'); + if (splitName[0] === 'Admin') name = splitName[1]; + } + var command = part[1]; - if (command && name.lastIndexOf(cat, 0) != -1 && (name.length == cat.length || name.charAt(cat.length) == ".")) { - var subCat = name.lastIndexOf(".") != -1 ? name.split(".")[1] : null; - if (subCat && !additions[subCat]) { - var newTable = document.createElement("div"); - newTable.className = "grid-container"; - additions[subCat] = newTable; - } + if ( + command && + name.lastIndexOf(cat, 0) != -1 && + (name.length == cat.length || name.charAt(cat.length) == '.') + ) { + var subCat = name.lastIndexOf('.') != -1 ? name.split('.')[1] : null; + if (subCat && !additions[subCat]) { + var newTable = document.createElement('div'); + newTable.className = 'grid-container'; + additions[subCat] = newTable; + } - var a = document.createElement("a"); - a.href = "#"; - a.onclick = make_verb_onclick(command.replace(/\s/g, "-")); - a.className = "grid-item"; - var t = document.createElement("span"); - t.textContent = command; - t.className = "grid-item-text"; - a.appendChild(t); - (subCat ? additions[subCat] : table).appendChild(a); - } - } + var a = document.createElement('a'); + a.href = '#'; + a.onclick = make_verb_onclick(command.replace(/\s/g, '-')); + a.className = 'grid-item'; + var t = document.createElement('span'); + t.textContent = command; + t.className = 'grid-item-text'; + a.appendChild(t); + (subCat ? additions[subCat] : table).appendChild(a); + } + } - // Append base table to view - var content = document.getElementById("statcontent"); - content.appendChild(table); + // Append base table to view + var content = document.getElementById('statcontent'); + content.appendChild(table); - // Append additional sub-categories if relevant - for (var cat in additions) { - if (additions.hasOwnProperty(cat)) { - // do addition here - var header = document.createElement("h3"); - header.textContent = cat; - content.appendChild(header); - content.appendChild(additions[cat]); - } - } + // Append additional sub-categories if relevant + for (var cat in additions) { + if (Object.hasOwn(additions, cat)) { + // do addition here + var header = document.createElement('h3'); + header.textContent = cat; + content.appendChild(header); + content.appendChild(additions[cat]); + } + } } function set_theme(which) { - if (which == "light") { - document.body.className = ""; - document.documentElement.className = "light"; - set_style_sheet("browserOutput_white"); - } else if (which == "dark") { - document.body.className = "dark"; - document.documentElement.className = "dark"; - set_style_sheet("browserOutput"); - } + if (which == 'light') { + document.body.className = ''; + document.documentElement.className = 'light'; + } else if (which == 'dark') { + document.body.className = 'dark'; + document.documentElement.className = 'dark'; + } } -function set_style_sheet(sheet) { - if (document.getElementById("goonStyle")) { - var currentSheet = document.getElementById("goonStyle"); - currentSheet.parentElement.removeChild(currentSheet); - } - var head = document.getElementsByTagName('head')[0]; - var sheetElement = document.createElement("link"); - sheetElement.id = "goonStyle"; - sheetElement.rel = "stylesheet"; - sheetElement.type = "text/css"; - sheetElement.href = sheet + ".css"; - sheetElement.media = 'all'; - head.appendChild(sheetElement); +function set_font_size(size) { + document.body.style.setProperty('font-size', size); +} + +function set_tabs_style(style) { + if (style == 'default') { + menu.classList.add('menu-wrap'); + menu.classList.remove('tabs-classic'); + } else if (style == 'classic') { + menu.classList.add('menu-wrap'); + menu.classList.add('tabs-classic'); + } else if (style == 'scrollable') { + menu.classList.remove('menu-wrap'); + menu.classList.remove('tabs-classic'); + } } function restoreFocus() { - run_after_focus(function () { - Byond.winset('map', { - focus: true, - }); - }); + run_after_focus(() => { + Byond.winset('map', { + focus: true, + }); + }); } function getCookie(cname) { - var name = cname + '='; - var ca = document.cookie.split(';'); - for (var i = 0; i < ca.length; i++) { - var c = ca[i]; - while (c.charAt(0) == ' ') c = c.substring(1); - if (c.indexOf(name) === 0) { - return decoder(c.substring(name.length, c.length)); - } - } - return ''; + var name = cname + '='; + var ca = document.cookie.split(';'); + for (var i = 0; i < ca.length; i++) { + var c = ca[i]; + while (c.charAt(0) == ' ') c = c.substring(1); + if (c.indexOf(name) === 0) { + return decoder(c.substring(name.length, c.length)); + } + } + return ''; } function add_verb_list(payload) { - var to_add = payload; // list of a list with category and verb inside it - to_add.sort(); // sort what we're adding - for (var i = 0; i < to_add.length; i++) { - var part = to_add[i]; - if (!part[0]) - continue; - var category = part[0]; - if (category.indexOf(".") != -1) { - var splitName = category.split("."); - if (split_admin_tabs && splitName[0] === "Admin") - category = splitName[1]; - else - category = splitName[0]; - } - if (findVerbindex(part[1], verbs)) - continue; - if (verb_tabs.includes(category)) { - verbs.push(part); - if (current_tab == category) { - draw_verbs(category); // redraw if we added a verb to the tab we're currently in - } - } else if (category) { - verb_tabs.push(category); - verbs.push(part); - createStatusTab(category); - } - } -}; - -function init_spells() { - var cat = ""; - for (var i = 0; i < spell_tabs.length; i++) { - cat = spell_tabs[i]; - if (cat.length > 0) { - verb_tabs.push(cat); - createStatusTab(cat); - } - } + var to_add = payload; // list of a list with category and verb inside it + to_add.sort(); // sort what we're adding + for (var i = 0; i < to_add.length; i++) { + var part = to_add[i]; + if (!part[0]) continue; + var category = part[0]; + if (category.indexOf('.') != -1) { + var splitName = category.split('.'); + if (split_admin_tabs && splitName[0] === 'Admin') category = splitName[1]; + else category = splitName[0]; + } + if (findVerbindex(part[1], verbs)) continue; + if (verb_tabs.includes(category)) { + verbs.push(part); + if (current_tab == category) { + draw_verbs(category); // redraw if we added a verb to the tab we're currently in + } + } else if (category) { + verb_tabs.push(category); + verbs.push(part); + createStatusTab(category); + } + } } -document.addEventListener("mouseup", restoreFocus); -document.addEventListener("keyup", restoreFocus); +document.addEventListener('mouseup', restoreFocus); +document.addEventListener('keyup', restoreFocus); if (!current_tab) { - addPermanentTab("Status"); - tab_change("Status"); + addPermanentTab(defaultTab); + tab_change(defaultTab); } -window.onload = function () { - Byond.sendMessage("Update-Verbs"); +window.onload = () => { + Byond.sendMessage('Update-Verbs'); }; -Byond.subscribeTo('update_spells', function (payload) { - spell_tabs = payload.spell_tabs; - var do_update = false; - if (spell_tabs.includes(current_tab)) { - do_update = true; - } - init_spells(); - if (payload.actions) { - spells = payload.actions; - if (do_update) { - draw_spells(current_tab); - } - } else { - remove_spells(); - } -}); - -Byond.subscribeTo('remove_verb_list', function (v) { - var to_remove = v; - for (var i = 0; i < to_remove.length; i++) { - remove_verb(to_remove[i]); - } - check_verbs(); - sortVerbs(); - if (verb_tabs.includes(current_tab)) - draw_verbs(current_tab); +Byond.subscribeTo('remove_verb_list', (v) => { + var to_remove = v; + for (var i = 0; i < to_remove.length; i++) { + remove_verb(to_remove[i]); + } + check_verbs(); + sortVerbs(); + if (verb_tabs.includes(current_tab)) draw_verbs(current_tab); }); // passes a 2D list of (verbcategory, verbname) creates tabs and adds verbs to respective list // example (IC, Say) -Byond.subscribeTo('init_verbs', function (payload) { - wipe_verbs(); // remove all verb categories so we can replace them - checkStatusTab(); // remove all status tabs - verb_tabs = payload.panel_tabs; - verb_tabs.sort(); // sort it - var do_update = false; - var cat = ""; - for (var i = 0; i < verb_tabs.length; i++) { - cat = verb_tabs[i]; - createStatusTab(cat); // create a category if the verb doesn't exist yet - } - if (verb_tabs.includes(current_tab)) { - do_update = true; - } - if (payload.verblist) { - add_verb_list(payload.verblist); - sortVerbs(); // sort them - if (do_update) { - draw_verbs(current_tab); - } - } - SendTabsToByond(); +Byond.subscribeTo('init_verbs', (payload) => { + wipe_verbs(); // remove all verb categories so we can replace them + checkStatusTab(); // remove all status tabs + verb_tabs = payload.panel_tabs; + verb_tabs.sort(); // sort it + var do_update = false; + var cat = ''; + for (var i = 0; i < verb_tabs.length; i++) { + cat = verb_tabs[i]; + createStatusTab(cat); // create a category if the verb doesn't exist yet + } + if (verb_tabs.includes(current_tab)) { + do_update = true; + } + if (payload.verblist) { + add_verb_list(payload.verblist); + sortVerbs(); // sort them + if (do_update) { + draw_verbs(current_tab); + } + } + SendTabsToByond(); }); -Byond.subscribeTo('update_stat', function (payload) { - status_tab_parts = [payload.ping_str]; - var parsed = payload.global_data; +Byond.subscribeTo('update_stat', (payload) => { + status_tab_parts = []; - for (var i = 0; i < parsed.length; i++) if (parsed[i] != null) status_tab_parts.push(parsed[i]); + var parsed = payload.global_data; - parsed = payload.other_str; + for (var i = 0; i < parsed.length; i++) + if (parsed[i] != null) status_tab_parts.push(parsed[i]); - for (var i = 0; i < parsed.length; i++) if (parsed[i] != null) status_tab_parts.push(parsed[i]); + parsed = payload.other_str; - if (current_tab == "Status") { - draw_status(); - } else if (current_tab == "Debug Stat Panel") { - draw_debug(); - } + for (var i = 0; i < parsed.length; i++) + if (parsed[i] != null) status_tab_parts.push(parsed[i]); + + if (current_tab == 'Status') { + draw_status(); + } else if (current_tab == 'Debug Stat Panel') { + draw_debug(); + } }); -Byond.subscribeTo('update_mc', function (payload) { - mc_tab_parts = payload.mc_data; - mc_tab_parts.splice(0, 0, ["Location:", payload.coord_entry]); +Byond.subscribeTo('update_mc', (payload) => { + mc_tab_parts = payload.mc_data; + mc_tab_parts.splice(0, 0, ['Location:', payload.coord_entry]); - if (!verb_tabs.includes("MC")) { - verb_tabs.push("MC"); - } + if (!verb_tabs.includes('MC')) { + verb_tabs.push('MC'); + } - createStatusTab("MC"); + createStatusTab('MC'); - if (current_tab == "MC") { - draw_mc(); - } + if (current_tab == 'MC') { + draw_mc(); + } }); -Byond.subscribeTo('remove_spells', function () { - for (var s = 0; s < spell_tabs.length; s++) { - removeStatusTab(spell_tabs[s]); - } +Byond.subscribeTo('create_debug', () => { + if (!document.getElementById('Debug Stat Panel')) { + addPermanentTab('Debug Stat Panel'); + } else { + removePermanentTab('Debug Stat Panel'); + } }); -Byond.subscribeTo('init_spells', function () { - var cat = ""; - for (var i = 0; i < spell_tabs.length; i++) { - cat = spell_tabs[i]; - if (cat.length > 0) { - verb_tabs.push(cat); - createStatusTab(cat); - } - } +Byond.subscribeTo('create_listedturf', (TN) => { + remove_listedturf(); // remove the last one if we had one + turfname = TN; + addPermanentTab(turfname); + tab_change(turfname); }); -Byond.subscribeTo('check_spells', function () { - for (var v = 0; v < spell_tabs.length; v++) { - spell_cat_check(spell_tabs[v]); - } +Byond.subscribeTo('remove_admin_tabs', () => { + href_token = null; + remove_mc(); + remove_tickets(); + remove_sdql2(); + remove_interviews(); }); -Byond.subscribeTo('create_debug', function () { - if (!document.getElementById("Debug Stat Panel")) { - addPermanentTab("Debug Stat Panel"); - } else { - removePermanentTab("Debug Stat Panel"); - } +Byond.subscribeTo('update_listedturf', (TC) => { + turfcontents = TC; + if (current_tab == turfname) { + draw_listedturf(); + } }); -Byond.subscribeTo('create_listedturf', function (TN) { - remove_listedturf(); // remove the last one if we had one - turfname = TN; - addPermanentTab(turfname); - tab_change(turfname); +Byond.subscribeTo('update_interviews', (I) => { + interviewManager = I; + if (current_tab == 'Tickets') { + draw_interviews(); + } }); -Byond.subscribeTo('remove_admin_tabs', function () { - remove_mc(); - remove_sdql2(); +Byond.subscribeTo('update_split_admin_tabs', (status) => { + status = status == true; + + if (split_admin_tabs !== status) { + if (split_admin_tabs === true) { + removeStatusTab('Events'); + removeStatusTab('Fun'); + removeStatusTab('Game'); + } + update_verbs(); + } + split_admin_tabs = status; }); -Byond.subscribeTo('update_listedturf', function (TC) { - turfcontents = TC; - if (current_tab == turfname) { - draw_listedturf(); - } +Byond.subscribeTo('add_admin_tabs', (ht) => { + href_token = ht; + addPermanentTab('MC'); + addPermanentTab('Tickets'); }); -Byond.subscribeTo('update_split_admin_tabs', function (status) { - status = (status == true); - - if (split_admin_tabs !== status) { - if (split_admin_tabs === true) { - removeStatusTab("Events"); - removeStatusTab("Fun"); - removeStatusTab("Game"); - } - update_verbs(); - } - split_admin_tabs = status; +Byond.subscribeTo('update_sdql2', (S) => { + sdql2 = S; + if (sdql2.length > 0 && !verb_tabs.includes('SDQL2')) { + verb_tabs.push('SDQL2'); + addPermanentTab('SDQL2'); + } + if (current_tab == 'SDQL2') { + draw_sdql2(); + } }); -Byond.subscribeTo('add_admin_tabs', function () { - addPermanentTab("MC"); +Byond.subscribeTo('update_tickets', (T) => { + tickets = T; + if (!verb_tabs.includes('Tickets')) { + verb_tabs.push('Tickets'); + addPermanentTab('Tickets'); + } + if (current_tab == 'Tickets') { + draw_tickets(); + } }); -Byond.subscribeTo('update_sdql2', function (S) { - sdql2 = S; - if (sdql2.length > 0 && !verb_tabs.includes("SDQL2")) { - verb_tabs.push("SDQL2"); - addPermanentTab("SDQL2"); - } - if (current_tab == "SDQL2") { - draw_sdql2(); - } -}); Byond.subscribeTo('remove_listedturf', remove_listedturf); Byond.subscribeTo('remove_sdql2', remove_sdql2); diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 897ffbb79c1..b533246d20f 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 1f224ccd19d..b9791113537 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 66619bafa93..d71057500c4 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/rig_modules.dmi b/icons/mob/rig_modules.dmi index f921263c754..a184129e692 100644 Binary files a/icons/mob/rig_modules.dmi and b/icons/mob/rig_modules.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index f5ea1081364..96fd33fe36b 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 131a91bdc03..d3cf0dfb320 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi index 1e4d937665a..6747884b577 100644 Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 25669628e05..85f7c22c349 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/item/clothing/under/shirt/shirts.dmi b/icons/obj/item/clothing/under/shirt/shirts.dmi index 5c12e8914e1..e227bf858c3 100644 Binary files a/icons/obj/item/clothing/under/shirt/shirts.dmi and b/icons/obj/item/clothing/under/shirt/shirts.dmi differ diff --git a/icons/obj/smooth/window/full_window.dmi b/icons/obj/smooth/window/full_window.dmi index fd18f81ac8e..1643a30f94a 100644 Binary files a/icons/obj/smooth/window/full_window.dmi and b/icons/obj/smooth/window/full_window.dmi differ diff --git a/icons/obj/smooth/window/full_window_frame_color.dmi b/icons/obj/smooth/window/full_window_frame_color.dmi index a12bc46d219..be36161729d 100644 Binary files a/icons/obj/smooth/window/full_window_frame_color.dmi and b/icons/obj/smooth/window/full_window_frame_color.dmi differ diff --git a/icons/obj/smooth/window/grille_over.dmi b/icons/obj/smooth/window/grille_over.dmi index 13964268633..c5822ce2e21 100644 Binary files a/icons/obj/smooth/window/grille_over.dmi and b/icons/obj/smooth/window/grille_over.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 889b5180eec..4489b38921c 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 20490e14c9f..3f3f6e1f84c 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/maps/sccv_horizon/areas/_horizon_areas.dm b/maps/sccv_horizon/areas/_horizon_areas.dm index 3d470a50a63..9b8fda28f8c 100644 --- a/maps/sccv_horizon/areas/_horizon_areas.dm +++ b/maps/sccv_horizon/areas/_horizon_areas.dm @@ -22,7 +22,7 @@ /// SCCV Horizon master areas /area/horizon name = "Horizon (PARENT AREA - DON'T USE)" - icon_state = "unknown" + icon_state = "horizon" station_area = TRUE ambience = AMBIENCE_GENERIC // Remember to set this for new areas!! @@ -46,3 +46,8 @@ ambience = AMBIENCE_SPACE area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP | AREA_FLAG_PREVENT_PERSISTENT_TRASH area_blurb = "The sheer scale of the SCCV Horizon is never more apparent when crawling across its hull like an ant." + +// Same as above, except shields will not wrap around it. +// For bits of space or the outer hull that shouldn't be covered by shields. +/area/horizon/exterior/no_shields + icon_state = "exterior_noshield" diff --git a/maps/sccv_horizon/areas/horizon_areas_command.dm b/maps/sccv_horizon/areas/horizon_areas_command.dm index cd3a0ce0f92..4cd4b7ccb3b 100644 --- a/maps/sccv_horizon/areas/horizon_areas_command.dm +++ b/maps/sccv_horizon/areas/horizon_areas_command.dm @@ -29,6 +29,7 @@ /area/horizon/command/heads/xo name = "Executive Officer's Office" + icon_state = "head_quarters" area_blurb = "No one really knows what goes on in here, but Ian usually seems pretty happy so it's got that going for it.." horizon_deck = 3 diff --git a/maps/sccv_horizon/areas/horizon_areas_engineering.dm b/maps/sccv_horizon/areas/horizon_areas_engineering.dm index bca3d252a25..204c3864328 100644 --- a/maps/sccv_horizon/areas/horizon_areas_engineering.dm +++ b/maps/sccv_horizon/areas/horizon_areas_engineering.dm @@ -146,7 +146,7 @@ /area/horizon/engineering/atmos/propulsion name = "Propulsion" subdepartment = null - icon_state = "blue2" + icon_state = "thrust" sound_environment = SOUND_AREA_SMALL_ENCLOSED area_blurb = "Every bulkhead is invisibly tense with the long-term strains of powerful impulse. The subtle aromas of various fuel compounds linger in the air." location_ew = LOC_PORT @@ -154,7 +154,7 @@ /area/horizon/engineering/atmos/propulsion/starboard name = "Propulsion" - icon_state = "blue-red2" + icon_state = "thrust" location_ew = LOC_STARBOARD /area/horizon/engineering/atmos/turbine @@ -229,8 +229,9 @@ /// TCOMMS_AREAS /area/horizon/tcommsat + icon_state = "tcomsatcham" ambience = AMBIENCE_ENGINEERING - area_lighting = LIGHT_HIGHSEC_COLORS + area_lighting = LIGHT_CLINICAL_COLORS no_light_control = 1 station_area = TRUE holomap_color = HOLOMAP_AREACOLOR_ENGINEERING @@ -247,4 +248,3 @@ /area/horizon/tcommsat/chamber name = "Telecomms Central Compartment" - icon_state = "tcomsatcham" diff --git a/maps/sccv_horizon/areas/horizon_areas_holodeck.dm b/maps/sccv_horizon/areas/horizon_areas_holodeck.dm index 93b196436b3..059f758e6ca 100644 --- a/maps/sccv_horizon/areas/horizon_areas_holodeck.dm +++ b/maps/sccv_horizon/areas/horizon_areas_holodeck.dm @@ -1,6 +1,7 @@ /// HOLODECK_AREAS /area/horizon/holodeck_control name = "Holodeck Alpha" + icon_state = "holodeck_control" area_flags = AREA_FLAG_RAD_SHIELDED holomap_color = HOLOMAP_AREACOLOR_CIVILIAN horizon_deck = 3 diff --git a/maps/sccv_horizon/areas/horizon_areas_medical.dm b/maps/sccv_horizon/areas/horizon_areas_medical.dm index aad9ef30d8e..ec6a76e3b0b 100644 --- a/maps/sccv_horizon/areas/horizon_areas_medical.dm +++ b/maps/sccv_horizon/areas/horizon_areas_medical.dm @@ -1,5 +1,6 @@ /// MEDICAL_AREAS /area/horizon/medical + icon_state = "medbay" station_area = TRUE area_lighting = LIGHT_CLINICAL_COLORS holomap_color = HOLOMAP_AREACOLOR_MEDICAL @@ -8,13 +9,11 @@ /area/horizon/medical/paramedic name = "Paramedic Equipment Storage" - icon_state = "medbay" horizon_deck = 3 lightswitch = FALSE /area/horizon/medical/reception name = "Reception" - icon_state = "medbay" ambience = list('sound/ambience/signal.ogg') horizon_deck = 2 @@ -39,18 +38,18 @@ /area/horizon/medical/gen_treatment name = "General Treatment" - icon_state = "cryo" + icon_state = "medbay2" horizon_deck = 2 /area/horizon/medical/icu name = "Intensive Care Unit" - icon_state = "cryo" + icon_state = "medbay3" area_blurb = "The sounds of pumps and cooling equipment can be heard within the room." horizon_deck = 2 /area/horizon/medical/main_storage name = "Main Storage" - icon_state = "exam_room" + icon_state = "medbay4" horizon_deck = 2 lightswitch = FALSE @@ -110,7 +109,6 @@ /area/horizon/medical/hallway name = "Atrium" holomap_color = HOLOMAP_AREACOLOR_MEDICAL - icon_state = "medbay" horizon_deck = 2 /area/horizon/medical/hallway/upper diff --git a/maps/sccv_horizon/areas/horizon_areas_operations.dm b/maps/sccv_horizon/areas/horizon_areas_operations.dm index 3397e802911..cc92b22a4a3 100644 --- a/maps/sccv_horizon/areas/horizon_areas_operations.dm +++ b/maps/sccv_horizon/areas/horizon_areas_operations.dm @@ -1,7 +1,7 @@ /// OPERATIONS_AREAS /area/horizon/operations name = "Ops (PARENT AREA - DON'T USE)" - icon_state = "dark" + icon_state = "operations" area_lighting = LIGHT_ENGINEERING_COLORS ambience = AMBIENCE_ENGINEERING holomap_color = HOLOMAP_AREACOLOR_OPERATIONS @@ -10,21 +10,18 @@ /area/horizon/operations/warehouse name = "Warehouse" - icon_state = "dark160" sound_environment = SOUND_AREA_LARGE_ENCLOSED area_blurb = "Scuff marks scar the floor from the movement of many crates and stored goods." horizon_deck = 1 /area/horizon/operations/ship_supply_warehouse name = "Ship Supply Warehouse" - icon_state = "dark160" sound_environment = SOUND_AREA_LARGE_ENCLOSED area_blurb = "Scuff marks scar the floor from the movement of many crates and stored goods." horizon_deck = 2 /area/horizon/operations/package_conveyors name = "Package Conveyors" - icon_state = "dark128" horizon_deck = 1 /area/horizon/operations/lobby @@ -66,6 +63,7 @@ /area/horizon/operations/secure_ammunition_storage name = "Secure Ammunitions Storage" + icon_state = "ammo" sound_environment = SOUND_AREA_SMALL_ENCLOSED ambience = AMBIENCE_FOREBODING holomap_color = HOLOMAP_AREACOLOR_OPERATIONS @@ -75,7 +73,7 @@ /// OPERATIONS_AREAS - HANGAR_AREAS /area/horizon/hangar name = "Hangar (PARENT AREA - DON'T USE)" - icon_state = "bluenew" + icon_state = "hangar" area_lighting = LIGHT_ENGINEERING_COLORS ambience = AMBIENCE_HANGAR sound_environment = SOUND_ENVIRONMENT_HANGAR @@ -143,6 +141,7 @@ /// WEAPONS_AREAS /area/horizon/weapons + icon_state = "bridge_weapon" area_lighting = LIGHT_ENGINEERING_COLORS sound_environment = SOUND_AREA_LARGE_ENCLOSED ambience = AMBIENCE_HIGHSEC @@ -150,7 +149,6 @@ /area/horizon/weapons/longbow name = "Longbow Weapon System" - icon_state = "bridge_weapon" horizon_deck = 3 area_blurb = "One of the SCCV Horizon's daunting weapons bays." department = LOC_COMMAND @@ -158,7 +156,6 @@ /area/horizon/weapons/grauwolf name = "Grauwolf Weapon System" - icon_state = "bridge_weapon" horizon_deck = 2 area_blurb = "One of the SCCV Horizon's daunting weapons bays." department = LOC_COMMAND @@ -191,22 +188,21 @@ holomap_color = HOLOMAP_AREACOLOR_SCIENCE department = LOC_SCIENCE +/area/horizon/storage/secure/ops_vault + icon_state = "storage" + area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP + department = LOC_COMMAND + area_lighting = LIGHT_HIGHSEC_COLORS + /// THE VAAAAAAUULLT /area/horizon/storage/secure/ops_vault name = "Secure Operational Storage" - icon_state = "storage" - area_lighting = LIGHT_HIGHSEC_COLORS horizon_deck = 2 - area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP - department = LOC_COMMAND area_blurb = "A place not to be visited unless things are going either horribly wrong or horribly right." /// THE VAAAAAAUULLT /area/horizon/storage/secure/tech_vault name = "Secure Technical Storage" - icon_state = "storage" area_lighting = LIGHT_HIGHSEC_COLORS horizon_deck = 3 - area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP - department = LOC_COMMAND area_blurb = "A place not to be visited unless things are going either horribly wrong or horribly right." diff --git a/maps/sccv_horizon/areas/horizon_areas_service.dm b/maps/sccv_horizon/areas/horizon_areas_service.dm index 68907ad0069..54cc7e45448 100644 --- a/maps/sccv_horizon/areas/horizon_areas_service.dm +++ b/maps/sccv_horizon/areas/horizon_areas_service.dm @@ -116,6 +116,7 @@ name = "Chapel" icon_state = "chapel" area_blurb = "An impressive, spacious compartment nonetheless kept somewhat bland to accommodate the many disparate faiths whose practice may be attended here." + lightswitch = TRUE /area/horizon/service/chapel/office name = "Chapel Office" diff --git a/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm b/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm index c9c98535937..bd71c6920b6 100644 --- a/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm +++ b/maps/sccv_horizon/code/_sccv_horizon_shuttle_landmarks.dm @@ -33,42 +33,42 @@ landmark_tag = "nav_horizon_dock_deck_3_starboard_1" docking_controller = "airlock_horizon_dock_deck_3_starboard_1" base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/horizon/exterior + base_area = /area/horizon/exterior/no_shields /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2 name = "Third Deck Starboard Dock 2" landmark_tag = "nav_horizon_dock_deck_3_starboard_2" docking_controller = "airlock_horizon_dock_deck_3_starboard_2" base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/horizon/exterior + base_area = /area/horizon/exterior/no_shields /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_3 name = "Third Deck Starboard Dock 3" landmark_tag = "nav_horizon_dock_deck_3_starboard_3" docking_controller = "airlock_horizon_dock_deck_3_starboard_3" base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/horizon/exterior + base_area = /area/horizon/exterior/no_shields /obj/effect/shuttle_landmark/horizon/dock/deck_3/port_1 name = "Third Deck Port Dock 1" landmark_tag = "nav_horizon_dock_deck_3_port_2" docking_controller = "airlock_horizon_dock_deck_3_port_2" base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/horizon/exterior + base_area = /area/horizon/exterior/no_shields /obj/effect/shuttle_landmark/horizon/dock/deck_3/port_2 name = "Third Deck Port Dock 2" landmark_tag = "nav_horizon_dock_deck_3_port_4" docking_controller = "airlock_horizon_dock_deck_3_port_4" base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/horizon/exterior + base_area = /area/horizon/exterior/no_shields /obj/effect/shuttle_landmark/horizon/dock/deck_3/port_3 name = "Third Deck Port Dock 3" landmark_tag = "nav_horizon_dock_deck_3_port_5" docking_controller = "airlock_horizon_dock_deck_3_port_5" base_turf = /turf/simulated/floor/reinforced/airless - base_area = /area/horizon/exterior + base_area = /area/horizon/exterior/no_shields // ================================ exterior diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index f8ad5f51eed..630c8152dda 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -178,7 +178,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -360,6 +360,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/horizon/service/custodial) "act" = ( @@ -518,7 +521,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard/far) "adm" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -644,7 +647,8 @@ /obj/structure/platform{ dir = 4 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "aec" = ( /obj/structure/cable/green{ @@ -882,7 +886,8 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "aeL" = ( /obj/structure/platform_deco, @@ -908,6 +913,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/security) "aeU" = ( @@ -931,14 +940,15 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "afe" = ( /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "afi" = ( /obj/effect/floor_decal/spline/plain/mauve{ @@ -1039,7 +1049,7 @@ /obj/structure/railing/mapped, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -1319,6 +1329,12 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hangar/intrepid) +"agT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "agU" = ( /obj/structure/machinery/smartfridge/tradeshelf/clothing, /obj/structure/machinery/firealarm/west, @@ -1398,6 +1414,7 @@ /obj/structure/machinery/atmospherics/unary/freezer{ icon_state = "freezer" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "ahs" = ( @@ -1471,7 +1488,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "ahI" = ( /obj/effect/floor_decal/corner/brown{ @@ -1663,13 +1680,13 @@ dir = 1; icon_state = "pipe-c" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "aiR" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -1734,7 +1751,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency, /obj/structure/lattice/catwalk/indoor/grate/damaged{ color = "#4c535b" }, @@ -1749,7 +1765,7 @@ /obj/random/tool, /obj/random/tool, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/auxatmos) "ajD" = ( /obj/structure/cable/green{ @@ -1812,6 +1828,7 @@ master_tag = "airlock_horizon_deck_2_port_1"; name = "airlock_horizon_deck_2_port_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "ajY" = ( @@ -1904,8 +1921,7 @@ /obj/structure/machinery/alarm/east{ req_one_access = list(24,11,48) }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "akl" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ @@ -1916,26 +1932,30 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_3"; name = "airlock_horizon_dock_deck_3_starboard_3" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard/docks) "aky" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/green{ icon_state = "1-8" }, /obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "akz" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -1955,14 +1975,14 @@ master_tag = "airlock_horizon_deck_2_port_1"; name = "airlock_horizon_deck_2_port_1" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "akD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/structure/reagent_dispensers/extinguisher, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/teleporter) "akE" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -2030,7 +2050,7 @@ /turf/simulated/floor/plating, /area/horizon/engineering/storage_hard/lower) "akY" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/table/rack, @@ -2297,8 +2317,9 @@ /turf/simulated/floor/wood, /area/merchant_station) "amR" = ( +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/main/port) +/area/horizon/maintenance/deck_2/wing/port/far) "amS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -2368,7 +2389,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "anu" = ( /obj/structure/sign/radiation{ @@ -2411,7 +2432,10 @@ dir = 1 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "anF" = ( /obj/effect/decal{ @@ -3019,9 +3043,11 @@ /turf/simulated/wall/shuttle/scc, /area/horizon/shuttle/intrepid/flight_deck) "ata" = ( -/obj/effect/decal/cleanable/blood/oil, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/aft) +/area/horizon/maintenance/deck_2/wing/port) "atd" = ( /obj/structure/ladder{ pixel_y = 8 @@ -3105,7 +3131,7 @@ name = "airlock_horizon_deck_1_aft_propulsion_2" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion) "atv" = ( /obj/structure/disposalpipe/segment{ @@ -3398,19 +3424,12 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "auD" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 1 +/obj/structure/machinery/porta_turret/stationary, +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/sign/nosmoking_1{ + pixel_y = 32 }, -/obj/effect/floor_decal/corner_wide/blue{ - dir = 10 - }, -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "auK" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3548,7 +3567,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "ave" = ( /obj/effect/floor_decal/industrial/hatch_door/red, @@ -3677,7 +3696,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "avJ" = ( @@ -3686,14 +3705,10 @@ /turf/unsimulated/floor, /area/antag/raider) "avK" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/random/dirt_75, /obj/structure/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/auxatmos) "avV" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -3766,7 +3781,7 @@ dir = 4; req_one_access = list(5,10,12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "awq" = ( /obj/structure/railing/mapped{ @@ -3865,6 +3880,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_2"; name = "airlock_horizon_dock_deck_3_starboard_2" }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_3/starboard/docks) "axi" = ( @@ -3941,6 +3957,10 @@ "axx" = ( /obj/structure/machinery/alarm/north, /obj/random/dirt_75, +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "axy" = ( @@ -4229,7 +4249,7 @@ pixel_y = 20 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/aft_airlock) "azy" = ( /turf/simulated/floor/holofloor/beach/sand{ @@ -4347,7 +4367,7 @@ req_access = list(23) }, /obj/effect/floor_decal/industrial/hatch_door/engineering, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/storage/tech) "aAg" = ( /obj/structure/machinery/light/small{ @@ -4363,6 +4383,9 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "aAq" = ( @@ -4385,8 +4408,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "aAu" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/near) "aAD" = ( @@ -4399,7 +4425,7 @@ dir = 4; req_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "aAE" = ( /obj/structure/closet/crate/secure/legion, @@ -4458,6 +4484,11 @@ }, /turf/simulated/floor/lino, /area/horizon/service/cafeteria) +"aBb" = ( +/obj/structure/lattice/catwalk, +/obj/item/hullbeacon/red, +/turf/simulated/open/airless, +/area/horizon/exterior/no_shields) "aBh" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4516,9 +4547,15 @@ /turf/simulated/floor/tiled, /area/merchant_station/warehouse) "aBI" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform_deco{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "aBJ" = ( /obj/structure/machinery/atmospherics/pipe/manifold/visible, @@ -4723,6 +4760,11 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/aibunker) +"aCR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/operations/starboard) "aCV" = ( /obj/effect/floor_decal/corner_wide/orange{ dir = 5 @@ -4731,9 +4773,8 @@ /area/horizon/medical/pharmacy) "aCW" = ( /obj/structure/platform, -/obj/effect/floor_decal/industrial/warning, /obj/structure/railing/mapped, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "aDa" = ( /obj/structure/machinery/atmospherics/portables_connector{ @@ -4773,7 +4814,7 @@ c_tag = "Bridge - CIC Foyer"; dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "aDv" = ( /obj/structure/bed/stool/chair/sofa/right/brown{ @@ -5041,14 +5082,12 @@ /turf/simulated/floor/tiled, /area/horizon/operations/office) "aFT" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "aFX" = ( @@ -5085,6 +5124,10 @@ }, /turf/simulated/floor/plating, /area/horizon/hangar/auxiliary) +"aGc" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "aGj" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -5521,7 +5564,10 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "aIH" = ( /obj/structure/table/standard, @@ -5592,8 +5638,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/random/dirt_75, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "aIU" = ( @@ -5603,6 +5649,9 @@ /area/horizon/maintenance/deck_2/aft) "aIW" = ( /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "aIZ" = ( @@ -5689,12 +5738,13 @@ }, /area/centcom/specops) "aJz" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/cobweb2, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "aJB" = ( /obj/effect/floor_decal/spline/plain/mauve{ @@ -5805,6 +5855,7 @@ master_tag = "airlock_horizon_deck_2_port_1"; name = "airlock_horizon_deck_2_port_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "aKt" = ( @@ -5918,7 +5969,6 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 4 }, -/obj/effect/floor_decal/corner, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/xenoarchaeology) "aKL" = ( @@ -5962,7 +6012,7 @@ dir = 8 }, /obj/structure/trash_pile, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) "aKV" = ( /obj/structure/machinery/vending/assist/synd, @@ -6387,6 +6437,7 @@ "aNW" = ( /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard) "aNY" = ( @@ -6397,10 +6448,7 @@ /area/horizon/command/heads/captain) "aOa" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/glasses/sunglasses, -/obj/item/screwdriver, /obj/structure/platform, -/obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "aOd" = ( @@ -6409,7 +6457,8 @@ /area/horizon/service/cafeteria) "aOe" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "aOf" = ( @@ -6604,22 +6653,12 @@ /turf/simulated/floor/tiled, /area/horizon/operations/loading) "aPd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/far) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/near) "aPe" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume, @@ -6656,7 +6695,7 @@ /area/centcom/specops) "aPh" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -6684,7 +6723,7 @@ dir = 4; req_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard) "aPs" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -6769,18 +6808,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/propulsion) "aPJ" = ( -/obj/structure/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/obj/structure/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/hatch_door/yellow{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/teleporter) +/obj/structure/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/redgrid, +/area/horizon/command/bridge/selfdestruct) "aPM" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -6837,6 +6867,9 @@ /area/horizon/engineering/atmos/storage) "aQd" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "aQe" = ( @@ -7024,7 +7057,7 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_gym) "aSk" = ( -/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "aSv" = ( @@ -7082,6 +7115,16 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/port) +"aSC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/main/starboard) "aSE" = ( /obj/structure/table/reinforced/steel, /obj/item/magnetic_lock, @@ -7119,6 +7162,9 @@ req_access = list(56) }, /mob/living/simple_animal/carp/fluff/ginny, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/horizon/command/heads/chief) "aSZ" = ( @@ -7265,6 +7311,7 @@ name_tag = "Deck 2 and 3 Security Subgrid" }, /obj/structure/machinery/power/apc/low/south, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/security) "aTL" = ( @@ -7296,6 +7343,7 @@ /turf/simulated/floor/plating, /area/horizon/rnd/xenoarch/atrium) "aTV" = ( +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/storage_maintenance) "aTY" = ( @@ -7403,7 +7451,8 @@ dir = 8; must_start_working = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/operations) "aUP" = ( /obj/structure/platform, @@ -7466,7 +7515,10 @@ dir = 1 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "aUX" = ( /obj/structure/railing/mapped, @@ -8008,7 +8060,7 @@ /area/horizon/engineering/bluespace_drive) "aYO" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden, -/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "aYQ" = ( @@ -8040,7 +8092,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "aZb" = ( /obj/structure/machinery/door/airlock/hatch{ @@ -8369,6 +8424,9 @@ "bbr" = ( /obj/structure/table/rack, /obj/random/junk, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "bbs" = ( @@ -8457,16 +8515,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenobiology/xenoflora) "bcf" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/industrial/warning, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/near) +/area/horizon/maintenance/deck_2/wing/port/far) "bci" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/random/junk, @@ -8518,7 +8573,8 @@ pixel_x = 1; pixel_y = 5 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "bcA" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -8529,7 +8585,8 @@ master_tag = "airlock_horizon_dock_deck_3_port_4"; name = "airlock_horizon_dock_deck_3_port_4" }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "bcB" = ( /obj/effect/floor_decal/industrial/warning{ @@ -8549,9 +8606,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/structure/table/rack, +/obj/random/med_stack, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "bcK" = ( @@ -8569,7 +8628,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "bcP" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8623,7 +8682,7 @@ "bcZ" = ( /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "bdb" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 5 @@ -8650,7 +8709,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/amidships) "bdm" = ( /turf/simulated/floor/holofloor/grass{ @@ -8661,11 +8720,12 @@ }, /area/horizon/holodeck/source_konyang) "bdp" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 4 }, -/turf/space, -/area/centcom/control) +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/central_ring) "bdr" = ( /obj/structure/table/stone/marble, /obj/structure/machinery/door/firedoor, @@ -8683,6 +8743,7 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_theatre) "bdv" = ( +/obj/structure/platform, /turf/simulated/floor/tiled/ramp/bottom{ dir = 4 }, @@ -8701,6 +8762,14 @@ }, /turf/unsimulated/floor/wood, /area/centcom/evac) +"bdz" = ( +/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/auxatmos) "bdD" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/bed/stool/chair/wood{ @@ -9105,10 +9174,7 @@ /obj/item/modular_computer/console/preset/ai{ dir = 8 }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor, /area/horizon/ai/chamber) "bgu" = ( /obj/structure/cable/green{ @@ -9154,7 +9220,9 @@ /turf/unsimulated/floor, /area/centcom/ferry) "bgD" = ( -/turf/simulated/wall/r_wall, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port) "bgG" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -9710,15 +9778,12 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "bjl" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/structure/machinery/atmospherics/unary/vent_pump/on{ - dir = 1; - level = 2 - }, -/turf/simulated/floor/tiled, -/area/horizon/rnd/hallway) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/nacelle) "bjs" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9825,7 +9890,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "bjL" = ( /obj/structure/shuttle_part/ert{ @@ -9912,7 +9980,7 @@ "bkN" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9947,7 +10015,7 @@ /area/antag/raider) "bkY" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -10060,10 +10128,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "blJ" = ( /obj/structure/railing/mapped{ @@ -10078,7 +10146,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hangar/intrepid) "blK" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -10212,7 +10280,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "bmS" = ( /obj/effect/map_effect/door_helper/unres, @@ -10254,12 +10322,12 @@ /area/horizon/engineering/reactor/supermatter/mainchamber) "bni" = ( /obj/random/dirt_75, -/obj/random/dirt_75, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/machinery/alarm/north, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port/shortcut) "bnj" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10446,7 +10514,7 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "boh" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/table/rack, /obj/item/mecha_equipment/sleeper, /obj/item/mecha_equipment/sleeper, @@ -10492,7 +10560,7 @@ }, /obj/effect/floor_decal/industrial/hatch_door/yellow, /obj/structure/curtain/black, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "bon" = ( /obj/random/pottedplant, @@ -10625,6 +10693,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/sign/cmo, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) "boS" = ( @@ -10750,6 +10819,9 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/operations) "bpu" = ( @@ -10774,6 +10846,10 @@ name = "Powernet Sensor - Deck 2 Engineering Subgrid"; name_tag = "Deck 2 Engineering Subgrid" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering) "bpB" = ( @@ -10830,7 +10906,9 @@ pixel_y = 13 }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "bpT" = ( @@ -10860,7 +10938,7 @@ /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "bqi" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/machinery/embedded_controller/radio/airlock/airlock_controller{ @@ -10876,7 +10954,7 @@ master_tag = "airlock_horizon_deck_1_aft_propulsion_2"; name = "airlock_horizon_deck_1_aft_propulsion_2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion) "bqj" = ( /obj/effect/floor_decal/corner_wide/blue/full{ @@ -11088,7 +11166,6 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/light/small, /obj/structure/cable{ icon_state = "4-8" }, @@ -11156,7 +11233,9 @@ /obj/structure/machinery/atmospherics/portables_connector{ dir = 1 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "bsh" = ( /turf/simulated/wall/shuttle/unique/ccia{ @@ -11177,6 +11256,7 @@ /obj/structure/machinery/embedded_controller/radio/airlock/airlock_controller{ pixel_y = 23 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/ai/upload_foyer) "bsv" = ( @@ -11213,6 +11293,12 @@ /area/horizon/service/chapel/main) "bsJ" = ( /obj/random/junk, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "bsO" = ( @@ -11379,15 +11465,8 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "btW" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/purple{ - dir = 5 - }, -/obj/item/stack/material/steel/full{ - pixel_x = -6; - pixel_y = 9 - }, -/turf/simulated/floor/tiled, +/obj/structure/machinery/light/small/floor, +/turf/simulated/floor/wood, /area/horizon/maintenance/deck_2/wing/starboard) "bud" = ( /obj/structure/machinery/camera/network/crescent{ @@ -11559,6 +11638,8 @@ icon_state = "0-2" }, /obj/structure/machinery/power/apc/north, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "bvt" = ( @@ -11612,12 +11693,25 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) +"bvM" = ( +/obj/structure/machinery/porta_turret, +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/machinery/alarm/west, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/ai/upload) "bvV" = ( /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "bvX" = ( /obj/structure/coatrack{ @@ -11745,7 +11839,7 @@ }, /obj/item/hullbeacon/red, /turf/space, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "bxd" = ( /obj/structure/bed/stool/chair/office/light, /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -11798,6 +11892,9 @@ /area/horizon/engineering/lobby) "bxt" = ( /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/reception) "bxA" = ( @@ -11809,6 +11906,7 @@ /obj/effect/floor_decal/corner/lime{ dir = 5 }, +/obj/structure/sign/poster/civilian/bay_55, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -11820,7 +11918,10 @@ /obj/random/tech_supply{ pixel_y = 2 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "bxJ" = ( /obj/structure/table/rack, @@ -11865,6 +11966,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/fore) +"bxY" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/structure/machinery/light/small, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/main/port) "bya" = ( /obj/structure/stairs_railing{ dir = 4; @@ -11897,7 +12005,7 @@ /area/horizon/rnd/hallway) "byl" = ( /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "byn" = ( /obj/structure/machinery/power/apc/low/north, @@ -11931,7 +12039,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_1"; name = "airlock_horizon_dock_deck_3_starboard_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "byt" = ( /obj/structure/machinery/atmospherics/binary/pump/fuel{ @@ -11972,8 +12080,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/evidence_storage) "byC" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, /obj/item/weldingtool/largetank{ pixel_y = 8; pixel_x = 1 @@ -11982,6 +12088,7 @@ pixel_x = -8; pixel_y = 6 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "byG" = ( @@ -12127,6 +12234,15 @@ }, /turf/simulated/floor/tiled, /area/horizon/operations/loading) +"bzM" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/starboard/near) "bzZ" = ( /obj/structure/machinery/button/remote/airlock{ dir = 8; @@ -12772,6 +12888,12 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/engineering/locker_room) +"bEr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "bEu" = ( /obj/structure/machinery/meter, /obj/effect/floor_decal/corner/yellow{ @@ -12790,7 +12912,7 @@ master_tag = "airlock_horizon_deck_1_aft_port_1"; name = "airlock_horizon_deck_1_aft_port_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "bEA" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12914,7 +13036,7 @@ "bFt" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/disposalpipe/segment, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -12992,10 +13114,13 @@ /area/horizon/hallway/primary/deck_3/central) "bGo" = ( /obj/random/junk, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port/shortcut) "bGp" = ( /obj/structure/disposalpipe/segment{ @@ -13007,6 +13132,7 @@ /obj/random/junk, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "bGE" = ( @@ -13017,7 +13143,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/shuttle/quark/cargo_hold) "bGJ" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -13040,6 +13166,9 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) "bGS" = ( @@ -13083,6 +13212,7 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering) "bHv" = ( @@ -13115,7 +13245,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/starboard) "bHA" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -13290,7 +13420,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard/far) "bJc" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13305,9 +13435,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/storage/eva) "bJf" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/near) "bJk" = ( /obj/structure/cable{ @@ -13349,7 +13481,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/machinery/vending/snack{ name = "Jacked Getmore Chocolate Corp"; prices = list(); @@ -13776,7 +13908,7 @@ }, /obj/structure/table/rack, /obj/random/loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) "bMo" = ( /obj/structure/stairs/north, @@ -13892,9 +14024,9 @@ /turf/simulated/open, /area/horizon/maintenance/deck_2/wing/port/far) "bMO" = ( -/obj/random/dirt_75, /obj/structure/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "bMX" = ( /obj/structure/machinery/portable_atmospherics/canister/empty/air, @@ -13967,6 +14099,7 @@ icon_state = "2-8" }, /obj/structure/machinery/alarm/east, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/civ_d2) "bNG" = ( @@ -14013,8 +14146,8 @@ "bOg" = ( /obj/structure/machinery/porta_turret, /obj/effect/floor_decal/industrial/warning/full, -/obj/structure/machinery/alarm/cold/west, -/turf/simulated/floor/tiled/dark/cooled, +/obj/structure/machinery/alarm/west, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/upload) "bOl" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -14030,7 +14163,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor, @@ -14145,7 +14278,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "bOZ" = ( /obj/structure/machinery/light, @@ -14445,7 +14578,7 @@ /obj/structure/machinery/door/airlock/maintenance_hatch{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard) "bQN" = ( /obj/effect/decal/cleanable/dirt, @@ -14453,7 +14586,6 @@ /turf/unsimulated/floor/monotile, /area/antag/raider) "bQO" = ( -/obj/effect/floor_decal/sign/cmo, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -14692,6 +14824,15 @@ }, /turf/simulated/floor/marble/dark, /area/horizon/command/bridge/minibar) +"bSs" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 6 + }, +/obj/structure/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/hangar/auxiliary) "bSu" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plating, @@ -14795,7 +14936,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/bar/padded/red, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "bTf" = ( /obj/structure/machinery/door/airlock/centcom{ @@ -14824,7 +14966,7 @@ dir = 4 }, /obj/structure/machinery/alarm/west, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port) "bTD" = ( /obj/item/deck/cards, @@ -15015,11 +15157,9 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "bVg" = ( -/obj/effect/landmark{ - name = "Revenant" - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/structure/closet, +/obj/random/loot, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "bVi" = ( /obj/structure/machinery/disposal/small/east{ @@ -15153,6 +15293,9 @@ /area/horizon/command/bridge/controlroom) "bVV" = ( /obj/structure/machinery/alarm/south, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "bVZ" = ( @@ -15272,6 +15415,13 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/turbine) +"bWK" = ( +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 + }, +/obj/structure/machinery/light/floor, +/turf/simulated/floor/tiled, +/area/horizon/engineering/hallway/fore) "bWM" = ( /obj/item/paicard, /obj/item/paicard, @@ -15294,7 +15444,8 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_1"; name = "airlock_horizon_dock_deck_3_starboard_1" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard/docks) "bWV" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/green{ @@ -15398,7 +15549,6 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "bXG" = ( @@ -15423,6 +15573,9 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "bXS" = ( @@ -15439,7 +15592,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos) "bXZ" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/unsimulated/floor, @@ -15496,6 +15649,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, +/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "bYO" = ( @@ -15513,6 +15667,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "bYQ" = ( @@ -15669,7 +15826,8 @@ master_tag = "airlock_horizon_dock_deck_3_port_5"; name = "airlock_horizon_dock_deck_3_port_5" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port/docks) "cah" = ( /turf/simulated/floor/grass/no_edge, @@ -15688,7 +15846,7 @@ /area/horizon/engineering/hallway/fore) "cav" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "caw" = ( /obj/structure/table/wood, @@ -15914,7 +16072,7 @@ }, /obj/structure/machinery/power/apc/west, /obj/structure/cable/green, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "cbU" = ( /turf/unsimulated/floor/plating, @@ -16078,6 +16236,7 @@ master_tag = "airlock_horizon_deck_1_aft_port_1"; name = "airlock_horizon_deck_1_aft_port_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "ccS" = ( @@ -16094,7 +16253,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_3"; name = "airlock_horizon_dock_deck_3_starboard_3" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "ccY" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -16357,7 +16516,9 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, -/obj/structure/machinery/firealarm/east, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/engineering/storage/lower) "cfg" = ( @@ -16470,6 +16631,9 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow, /turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard) +"cfP" = ( +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/starboard) "cfT" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/effect/floor_decal/spline/fancy, @@ -16572,7 +16736,11 @@ "cgw" = ( /obj/structure/cable, /obj/structure/machinery/power/apc/west, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "cgH" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16599,9 +16767,6 @@ /obj/random/loot, /obj/random/junk, /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "cgR" = ( @@ -16840,6 +17005,9 @@ pixel_x = -6; pixel_y = 3 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/rnd/xenoarch/presentation) "ciH" = ( @@ -16947,6 +17115,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/machinery/light/floor{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/hangar/auxiliary) "cji" = ( @@ -17181,6 +17352,9 @@ /obj/structure/engineer_maintenance/pipe{ dir = 1 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/shields) "clb" = ( @@ -17189,10 +17363,14 @@ }, /turf/simulated/floor/plating, /area/turbolift/research/deck_1) +"clc" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "cld" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/machinery/pipedispenser, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -17264,6 +17442,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/operations) "cmj" = ( @@ -17301,9 +17480,6 @@ /turf/unsimulated/floor/plating, /area/centcom/distress_prep) "cmx" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 1 - }, /obj/item/circuitboard/ghettosmes{ pixel_x = -4; pixel_y = 3 @@ -17316,6 +17492,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "cmF" = ( @@ -17439,7 +17619,7 @@ /obj/random/dirt_75, /obj/structure/reagent_dispensers/fueltank, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/operations) "cnw" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -17482,7 +17662,7 @@ /turf/simulated/floor/tiled, /area/horizon/medical/paramedic) "cnN" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -17517,9 +17697,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 1; @@ -17531,7 +17708,9 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "coi" = ( @@ -17609,7 +17788,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/bluespace_drive/monitoring) "coJ" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -17656,10 +17835,9 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "coT" = ( -/obj/structure/machinery/alarm/east, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/cryo) +/obj/effect/floor_decal/industrial/warning/cee, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/main/starboard) "coX" = ( /obj/structure/sink{ dir = 8; @@ -17689,7 +17867,10 @@ /obj/structure/machinery/light/small, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "cpn" = ( /obj/structure/machinery/atmospherics/unary/engine/scc_ship_engine, @@ -17843,6 +18024,10 @@ name = "airlock_horizon_deck_1_fore_1" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "cqt" = ( @@ -17881,6 +18066,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "cqB" = ( +/obj/structure/platform{ + dir = 1 + }, /turf/simulated/floor/tiled/ramp/bottom{ dir = 8 }, @@ -17914,9 +18102,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "crp" = ( /obj/effect/floor_decal/corner/yellow{ @@ -17960,6 +18148,9 @@ /area/horizon/engineering/atmos/propulsion/starboard) "crw" = ( /obj/structure/grille/broken, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/operations/machinist) "crz" = ( @@ -18136,7 +18327,7 @@ /turf/unsimulated/floor, /area/centcom/holding) "csu" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/table/rack, @@ -18971,6 +19162,9 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/structure/machinery/floodlight/randomcharge, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "cxm" = ( @@ -19050,7 +19244,7 @@ dir = 4; req_one_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/port/far) "cxJ" = ( /obj/structure/cable{ @@ -19082,6 +19276,16 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard) +"cxP" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/command/bridge/selfdestruct) "cxQ" = ( /obj/structure/machinery/light, /obj/structure/machinery/computer/bluespacedrivecontrol{ @@ -19262,9 +19466,6 @@ /obj/item/stock_parts/console_screen, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/structure/machinery/light/small/emergency{ - dir = 4 - }, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "cyU" = ( @@ -19417,11 +19618,12 @@ /turf/simulated/floor/bluegrid/server, /area/horizon/rnd/server) "czN" = ( -/obj/structure/railing/mapped, -/obj/structure/lattice/catwalk/indoor, -/obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/research) +/obj/effect/floor_decal/corner/white{ + dir = 5 + }, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/horizon/rnd/hallway) "czO" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -19477,6 +19679,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/lattice/catwalk/indoor/grate/dark/damaged, /turf/simulated/floor, /area/horizon/maintenance/deck_3/cafe) "cAb" = ( @@ -19651,14 +19854,16 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/machinery/light/floor, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/main_compartment) "cBy" = ( +/obj/random/maintenance_junk_or_loot, /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/main/interstitial) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "cBz" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -19681,7 +19886,7 @@ master_tag = "airlock_horizon_deck_3_aft_1"; name = "airlock_horizon_deck_3_aft_1" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "cBJ" = ( /obj/effect/floor_decal/corner/brown{ @@ -19842,10 +20047,11 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_2"; name = "airlock_horizon_dock_deck_3_starboard_2" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard/docks) "cCU" = ( /obj/effect/floor_decal/spline/plain/cee{ @@ -19877,7 +20083,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "cDb" = ( @@ -20123,9 +20329,10 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/conference) "cFn" = ( -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/railing/mapped, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "cFq" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -20139,26 +20346,23 @@ /area/horizon/crew/fitness/changing) "cFr" = ( /obj/structure/machinery/portable_atmospherics/canister/air, -/obj/structure/window/reinforced{ +/obj/structure/machinery/light/small{ dir = 8 }, -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "cFs" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/hatch/red, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "cFC" = ( /obj/structure/filingcabinet{ @@ -20370,9 +20574,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/structure/machinery/light{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_1/central) "cHk" = ( @@ -20556,7 +20757,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/conference) "cII" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/tiled/dark, /area/shuttle/burglar) @@ -20666,9 +20867,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" @@ -20802,13 +21000,9 @@ /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) "cJN" = ( -/obj/structure/platform_stairs/south_north_solo{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "cJO" = ( /obj/structure/machinery/door/firedoor, @@ -20908,7 +21102,7 @@ name = "airlock_horizon_deck_1_aft_propulsion_1" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion/starboard) "cKs" = ( /obj/effect/floor_decal/industrial/outline/security, @@ -21027,7 +21221,8 @@ /area/horizon/engineering/atmos/air) "cLM" = ( /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "cLT" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -21044,6 +21239,7 @@ "cLU" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/platform_deco, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) "cLX" = ( @@ -21112,7 +21308,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "cMB" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -21120,6 +21316,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/engineering/storage/lower) "cMK" = ( @@ -21377,7 +21576,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "cOo" = ( /obj/structure/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -21392,6 +21591,9 @@ "cOz" = ( /obj/structure/table/rack, /obj/random/contraband, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "cOB" = ( @@ -21458,7 +21660,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "cOY" = ( /obj/structure/table/wood, @@ -21490,11 +21692,10 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_1/central) "cPd" = ( -/obj/random/dirt_75, -/obj/structure/cable, -/obj/structure/machinery/power/apc/low/south, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_1/main/port/shortcut) +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/starboard) "cPq" = ( /obj/effect/shuttle_landmark/horizon/exterior/deck_1/starboard_propulsion, /turf/template_noop, @@ -21877,11 +22078,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/structure/machinery/light/small{ - dir = 4 - }, /obj/random/junk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "cRW" = ( /obj/structure/machinery/light/small{ @@ -22011,6 +22209,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering) "cSA" = ( @@ -22122,6 +22321,9 @@ /area/horizon/medical/ward) "cTn" = ( /obj/structure/bed/stool, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "cTp" = ( @@ -22462,6 +22664,11 @@ }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) +"cVh" = ( +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "cVl" = ( /obj/structure/machinery/door/airlock/centcom{ name = "Arrival Hangar Maintenance"; @@ -22744,7 +22951,7 @@ cycle_to_external_air = 1 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/quark/cargo_hold) "cWP" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -22809,7 +23016,10 @@ /area/centcom/legion) "cXF" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "cXG" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -22963,7 +23173,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/security/evidence_storage) "cYv" = ( /obj/structure/machinery/door/airlock/glass_security{ @@ -23184,6 +23394,7 @@ master_tag = "airlock_horizon_deck_1_fore_1"; name = "airlock_horizon_deck_1_fore_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "cZT" = ( @@ -23246,6 +23457,9 @@ dir = 9 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/shields) "cZY" = ( @@ -23255,10 +23469,10 @@ dir = 4; pixel_y = 3 }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 }, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "dab" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -23285,7 +23499,7 @@ name = "Security Maintenance"; req_one_access = list(12,47) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "dad" = ( /obj/structure/shuttle_part/mercenary/small{ @@ -23901,7 +24115,7 @@ /obj/item/material/shard{ icon_state = "small" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "deZ" = ( /obj/structure/table/reinforced/glass, @@ -24104,6 +24318,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/mainchamber) "dfN" = ( @@ -24143,6 +24360,7 @@ name = "Powernet Sensor - Deck 1 Engineering Subgrid"; name_tag = "Deck 1 Engineering Subgrid" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering/lower) "dgo" = ( @@ -24243,9 +24461,6 @@ "dgT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/atmospherics/pipe/manifold/hidden, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -24255,6 +24470,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "dhd" = ( @@ -24290,7 +24506,7 @@ /obj/structure/table/rack, /obj/random/loot, /obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor, @@ -24316,6 +24532,10 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/medical) "dhr" = ( @@ -24339,6 +24559,9 @@ dir = 4; icon_state = "pipe-j2" }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) "dhv" = ( @@ -24484,7 +24707,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -24650,6 +24873,7 @@ master_tag = "airlock_horizon_deck_2_aft_sm"; name = "airlock_horizon_deck_2_aft_sm" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/engineering/reactor/supermatter/airlock) "djb" = ( @@ -24742,7 +24966,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_3"; name = "airlock_horizon_dock_deck_3_starboard_3" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "djC" = ( /obj/structure/table/reinforced/steel, @@ -24811,8 +25035,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "dkb" = ( /turf/simulated/floor/plating, @@ -25351,7 +25575,7 @@ /obj/item/storage/bag/inflatable, /obj/random/loot, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/auxatmos) "dnf" = ( /obj/structure/machinery/conveyor{ @@ -25447,6 +25671,7 @@ /area/horizon/maintenance/deck_2/research) "dnK" = ( /obj/item/wrench, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "dnM" = ( @@ -25470,6 +25695,15 @@ /obj/structure/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/horizon/engineering/hallway/aft) +"dnX" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/ai/upload_foyer) "doc" = ( /obj/structure/machinery/light{ dir = 4 @@ -25541,6 +25775,9 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "dos" = ( @@ -25598,7 +25835,7 @@ name = "Distro to Airlock"; target_pressure = 200 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "doW" = ( /obj/structure/shuttle_part/tcfl{ @@ -25649,13 +25886,15 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate/damaged{ - color = "#4c535b" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/structure/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port) "dpf" = ( /obj/structure/cable{ @@ -25689,6 +25928,9 @@ /obj/structure/engineer_maintenance/pipe{ dir = 1 }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/medical/gen_treatment) "dpt" = ( @@ -25983,6 +26225,12 @@ /obj/random/pottedplant, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) +"dqJ" = ( +/obj/structure/ladder{ + pixel_y = 16 + }, +/turf/simulated/open/airless, +/area/horizon/exterior/no_shields) "dqK" = ( /obj/structure/machinery/atmospherics/unary/vent_pump{ external_pressure_bound = 0; @@ -26011,6 +26259,10 @@ pixel_x = -5; pixel_y = 6 }, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "dqQ" = ( @@ -26022,6 +26274,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/alarm/north, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port) "dqR" = ( @@ -26071,6 +26324,9 @@ /obj/structure/machinery/power/breakerbox/activated{ RCon_tag = "Service Substation" }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/civ_d2) "drf" = ( @@ -26215,6 +26471,7 @@ "dsf" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, +/obj/structure/platform, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "dsj" = ( @@ -26314,7 +26571,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "dsP" = ( /obj/structure/machinery/light{ @@ -26351,15 +26608,18 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "dta" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "dtb" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/central_ring) "dtc" = ( /obj/structure/window/reinforced{ @@ -26644,6 +26904,7 @@ /area/horizon/holodeck/source_cafe) "dvg" = ( /obj/structure/machinery/alarm/north, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "dvk" = ( @@ -26656,6 +26917,7 @@ name = "airlock_horizon_deck_3_aft_1" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "dvo" = ( @@ -26683,10 +26945,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate/damaged{ - color = "#4c535b" +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "dvv" = ( /obj/structure/machinery/door/airlock/glass_engineering{ @@ -27045,6 +27307,7 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/storage_maintenance) "dxY" = ( @@ -27198,7 +27461,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/random/dirt_75, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) @@ -27254,7 +27516,7 @@ /area/horizon/security/forensic_laboratory) "dzv" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "dzz" = ( /obj/effect/floor_decal/corner/dark_green/diagonal, @@ -27326,7 +27588,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -27351,7 +27613,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "dAa" = ( /obj/effect/floor_decal/industrial/loading/research{ @@ -27367,7 +27629,10 @@ /obj/structure/closet/crate, /obj/random/loot, /obj/random/loot, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "dAj" = ( /obj/structure/bed/stool/chair/padded/brown{ @@ -27410,6 +27675,10 @@ name_tag = "Operations Subgrid" }, /obj/structure/machinery/power/apc/low/north, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/operations) "dAp" = ( @@ -27492,7 +27761,7 @@ /obj/effect/floor_decal/industrial/hatch_door/engineering{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/storage/lower) "dAO" = ( /obj/structure/cable/green{ @@ -27596,7 +27865,7 @@ /area/horizon/holodeck/source_battlemonsters) "dBq" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "dBs" = ( /obj/effect/floor_decal/spline/plain{ @@ -27736,7 +28005,7 @@ /area/horizon/service/cafeteria) "dCv" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "dCx" = ( /obj/effect/floor_decal/corner/brown{ @@ -27791,7 +28060,7 @@ dir = 1 }, /obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/teleporter) "dCJ" = ( /obj/structure/bed/stool/chair/office/dark, @@ -28153,7 +28422,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -28207,7 +28476,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "dFc" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -28287,7 +28556,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "dFI" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -28335,11 +28605,21 @@ }, /obj/structure/table/rack, /obj/random/loot, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) +"dFV" = ( +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/machinery/alarm/west, +/turf/simulated/floor/tiled, +/area/horizon/engineering/hallway/aft) "dFW" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -28400,7 +28680,7 @@ dir = 4 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "dGi" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -28549,7 +28829,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "dHn" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ @@ -28857,7 +29138,7 @@ name = "airlock_horizon_dock_deck_3_port_2" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "dJw" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -28928,6 +29209,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor, /area/horizon/maintenance/substation/civ_d3) "dJI" = ( @@ -28974,13 +29256,11 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "dKr" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/loot{ pixel_x = -10; pixel_y = -11 }, -/obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "dKt" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29020,7 +29300,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/structure/machinery/firealarm/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "dKE" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -29041,9 +29321,8 @@ /turf/simulated/floor/plating, /area/horizon/shuttle/intrepid/starboard_compartment) "dKI" = ( -/obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "dKN" = ( /obj/structure/shuttle/engine/propulsion/burst, @@ -29159,6 +29438,13 @@ /obj/effect/shuttle_landmark/lift/morgue_bottom, /turf/simulated/floor/plating, /area/horizon/medical/morgue) +"dLS" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/near) "dLT" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -29197,13 +29483,14 @@ }, /area/centcom/holding) "dMd" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/operations/starboard/far) +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/main/interstitial) "dMr" = ( /obj/structure/railing/mapped{ dir = 1 @@ -29402,7 +29689,6 @@ dir = 9 }, /obj/random/junk, -/obj/random/canister/restricted, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "dNP" = ( @@ -29436,6 +29722,13 @@ /obj/item/pen, /turf/simulated/floor/carpet, /area/horizon/command/bridge/meeting_room) +"dOk" = ( +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/main/port) "dOn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -29545,7 +29838,7 @@ /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/morgue_lift) "dOS" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/item/storage/toolbox/electrical{ @@ -29634,7 +29927,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port/far) "dPE" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -29735,10 +30028,14 @@ /turf/simulated/floor/tiled, /area/horizon/engineering/locker_room) "dQk" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "dQl" = ( /obj/structure/bed/stool/chair/padded/red{ @@ -29770,16 +30067,17 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) "dQA" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 5 +/obj/structure/table/standard, +/obj/structure/bedsheetbin, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/horizon/rnd/hallway) +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/near) "dQF" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" @@ -30078,6 +30376,9 @@ "dSz" = ( /obj/structure/machinery/alarm/west, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard) "dSC" = ( @@ -30089,15 +30390,13 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_3/aft/starboard/far) "dSD" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/civ_d2) "dSJ" = ( @@ -30168,7 +30467,11 @@ /area/horizon/command/bridge/supply) "dTn" = ( /obj/structure/trash_pile, -/turf/simulated/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "dTq" = ( /obj/structure/cable{ @@ -30181,7 +30484,7 @@ dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "dTu" = ( @@ -30215,9 +30518,6 @@ /area/centcom/bar) "dTK" = ( /obj/structure/extinguisher_cabinet/east, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -30228,12 +30528,19 @@ c_tag = "Bridge - Restricted Area"; dir = 1 }, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/dark_blue{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "dTO" = ( /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "dTW" = ( /obj/structure/machinery/door/firedoor, @@ -30357,6 +30664,7 @@ master_tag = "airlock_horizon_deck_2_starboard_aft"; name = "airlock_horizon_deck_2_starboard_aft" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) "dUU" = ( @@ -30400,14 +30708,13 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenoarch/atrium) "dUZ" = ( -/obj/effect/floor_decal/industrial/hatch_door/yellow, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 +/obj/random/maintenance_junk_or_loot, +/obj/random/dirt_75, +/obj/structure/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/main/starboard) +/area/horizon/maintenance/deck_2/wing/port/far) "dVf" = ( /obj/effect/floor_decal/corner/mauve{ dir = 1 @@ -30548,14 +30855,12 @@ /turf/simulated/floor/tiled/white, /area/merchant_station) "dWf" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/item/hoist_kit, /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "dWp" = ( /obj/structure/disposalpipe/segment, @@ -30619,7 +30924,7 @@ icon_state = "railing0-1"; name = "railing" }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/unsimulated/floor/plating, /area/centcom/specops) "dWR" = ( @@ -30681,7 +30986,7 @@ icon_state = "4-8" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) "dXk" = ( @@ -30720,6 +31025,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/engineering/drone_fabrication) "dXu" = ( @@ -30865,14 +31171,14 @@ /turf/simulated/wall/r_wall, /area/horizon/operations/ship_supply_warehouse) "dYE" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/mapped{ - dir = 8 +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/decal/cleanable/dirt, +/obj/random/canister/restricted, +/obj/structure/machinery/light/small{ + dir = 1 }, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/near) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/main/port) "dYF" = ( /obj/effect/floor_decal/industrial/outline/service, /obj/structure/closet/secure_closet/hydroponics, @@ -30997,7 +31303,7 @@ pixel_y = 11; req_one_access = list(12,31,73,76,77,78) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/canary) "dZx" = ( /obj/structure/cable/green{ @@ -31022,6 +31328,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/starboard/far) "dZC" = ( @@ -31290,8 +31599,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "ebn" = ( /obj/structure/railing/mapped{ @@ -31927,7 +32238,10 @@ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "eeS" = ( /obj/effect/step_trigger/thrower/shuttle/east, @@ -32159,7 +32473,7 @@ dir = 4 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "efN" = ( /obj/structure/railing/mapped, @@ -32374,7 +32688,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -32395,7 +32709,10 @@ /obj/structure/table/rack, /obj/random/loot, /obj/random/loot, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "ehx" = ( @@ -32503,6 +32820,9 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/machinery/papershredder, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "eif" = ( @@ -32559,7 +32879,7 @@ /area/horizon/weapons/longbow) "eiJ" = ( /obj/random/loot, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/contraband, @@ -32568,7 +32888,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "eiK" = ( /obj/structure/cable/green{ @@ -32653,7 +32973,6 @@ dir = 8 }, /obj/effect/decal/cleanable/generic, -/obj/structure/machinery/light/small/emergency, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "ejJ" = ( @@ -32677,6 +32996,10 @@ "ejX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "ekb" = ( @@ -32725,6 +33048,14 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) +"eks" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_3/security/port) "ekt" = ( /obj/structure/railing/mapped, /obj/structure/lattice/catwalk/indoor, @@ -32793,18 +33124,16 @@ /turf/simulated/floor/tiled, /area/horizon/service/hydroponics) "ekN" = ( -/obj/structure/platform/ledge/dark{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/open, -/area/horizon/maintenance/deck_2/cryo) +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/aft/starboard/far) "ekP" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "ekR" = ( @@ -32831,7 +33160,7 @@ /area/centcom/bar) "ekY" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/effect/map_effect/marker/airlock{ @@ -32839,6 +33168,7 @@ master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; name = "airlock_horizon_deck_1_aft_propulsion_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/engineering/atmos/propulsion/starboard) "elb" = ( @@ -32864,7 +33194,7 @@ pixel_y = 35; dir = 4 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/tiled/dark/full, /area/horizon/ai/upload_foyer) "elq" = ( /obj/structure/machinery/light{ @@ -32964,6 +33294,12 @@ }, /turf/unsimulated/floor, /area/centcom/bar) +"elV" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "elY" = ( /obj/effect/landmark{ name = "Syndicate-Spawn" @@ -33010,7 +33346,10 @@ dir = 5 }, /obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "emr" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -33049,6 +33388,7 @@ }, /obj/structure/machinery/power/apc/low/west, /obj/structure/machinery/light/small, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/hangar) "emA" = ( @@ -33070,7 +33410,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/cable/green{ @@ -33127,6 +33467,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/elevator) "enf" = ( @@ -33512,13 +33855,13 @@ "epn" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/reagent_dispensers/extinguisher, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/sign/radiation{ pixel_y = 32 }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "epo" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -33527,6 +33870,7 @@ /obj/structure/machinery/status_display{ pixel_y = -32 }, +/obj/structure/machinery/light, /turf/simulated/floor/tiled, /area/horizon/engineering/hallway/fore) "epv" = ( @@ -33859,7 +34203,7 @@ /area/horizon/maintenance/deck_1/main/port) "esh" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "esi" = ( /obj/effect/floor_decal/industrial/warning{ @@ -33935,6 +34279,7 @@ /area/horizon/operations/office) "esN" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/teleporter) "esQ" = ( @@ -33942,7 +34287,10 @@ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "esV" = ( /obj/effect/floor_decal/spline/plain/corner{ @@ -34200,17 +34548,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/propulsion/starboard) "euC" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/random/maintenance_junk_or_loot, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/near) +/area/horizon/maintenance/deck_1/operations/starboard) "euF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34257,7 +34598,7 @@ /obj/effect/landmark{ name = "Revenant" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "euN" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/red{ @@ -34412,15 +34753,19 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/mercenary) "ewx" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/machinery/power/apc/hyper/north, /obj/effect/floor_decal/industrial/hatch/red, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "ewy" = ( /obj/effect/floor_decal/corner/yellow{ @@ -34482,16 +34827,20 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/washroom) "ewG" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard/near) "ewO" = ( /obj/structure/machinery/chemical_dispenser/bar_alc/full{ pixel_y = 7 @@ -34616,10 +34965,8 @@ /area/shuttle/skipjack) "exE" = ( /obj/structure/bed/stool/chair/office/dark, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "exF" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -34688,7 +35035,7 @@ name = "airlock_horizon_deck_3_aft_1"; frequency = 1001 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "eyg" = ( /obj/structure/table/steel, @@ -34717,8 +35064,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/power/apc/high/east, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/engineering/drone_fabrication) "eyq" = ( @@ -34780,10 +35127,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "eyJ" = ( /obj/effect/floor_decal/industrial/outline/red, @@ -35028,7 +35376,7 @@ /obj/random/dirt_75, /obj/random/loot, /obj/random/loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port) "eAx" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, @@ -35064,7 +35412,7 @@ /area/horizon/shuttle/quark/cargo_hold) "eAX" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ @@ -35078,6 +35426,9 @@ dir = 1 }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "eBd" = ( @@ -35160,13 +35511,17 @@ }, /area/centcom/holding) "eBH" = ( -/obj/effect/floor_decal/industrial/warning/cee{ +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/machinery/light/floor{ dir = 4 }, -/obj/structure/closet, -/obj/random/loot, /turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/wing/starboard/near) +/area/horizon/hangar/auxiliary) "eBI" = ( /obj/structure/bed/stool/chair/folding{ dir = 8 @@ -35228,7 +35583,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "eCm" = ( /obj/structure/cable/green{ @@ -35251,6 +35606,12 @@ /obj/structure/grille, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) +"eCs" = ( +/obj/structure/platform, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 8 + }, +/area/horizon/maintenance/deck_1/wing/starboard/far) "eCw" = ( /obj/structure/shuttle/engine/propulsion/burst/right, /turf/unsimulated/floor/plating, @@ -35262,7 +35623,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/cable{ icon_state = "1-4" }, @@ -35335,6 +35696,9 @@ "eDs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/starboard/far) "eDt" = ( @@ -35379,6 +35743,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/research) "eDB" = ( @@ -35520,6 +35888,10 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/machinery/alarm/north, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "eEl" = ( @@ -35760,6 +36132,14 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/command/bridge/upperdeck) +"eFv" = ( +/obj/effect/floor_decal/industrial/outline/operations, +/obj/structure/table/rack{ + dir = 8 + }, +/obj/random/tech_supply, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/operations/starboard) "eFB" = ( /turf/simulated/wall, /area/horizon/rnd/eva) @@ -36281,11 +36661,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner_wide/blue{ + dir = 5 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, /area/horizon/storage/secure/tech_vault) "eIO" = ( /obj/structure/machinery/flasher{ @@ -36322,7 +36703,7 @@ /area/horizon/engineering/atmos/propulsion/starboard) "eJb" = ( /obj/structure/machinery/pipedispenser, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "eJc" = ( /obj/effect/floor_decal/industrial/hatch_door/red{ @@ -36393,6 +36774,9 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "eJx" = ( @@ -36491,7 +36875,7 @@ master_tag = "airlock_horizon_deck_1_fore_1"; name = "airlock_horizon_deck_1_fore_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "eKK" = ( /obj/effect/map_effect/door_helper/unres{ @@ -36515,7 +36899,7 @@ dir = 8 }, /obj/effect/floor_decal/spline/plain, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/unsimulated/floor/plating, @@ -36555,12 +36939,22 @@ /turf/simulated/floor/wood, /area/horizon/service/mess_hall) "eLe" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/random/dirt_75, -/turf/simulated/floor, -/area/horizon/maintenance/deck_2/wing/port/far) +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/horizon/rnd/hallway) "eLj" = ( /obj/structure/table/glass{ table_reinf = "glass" @@ -36740,7 +37134,7 @@ icon_state = "4-8" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard/far) "eNf" = ( @@ -36851,9 +37245,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/test_range) "eNX" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning, /obj/structure/machinery/alarm/north, /obj/structure/reagent_dispensers/fueltank, @@ -36960,7 +37351,7 @@ /obj/effect/shuttle_landmark/merchant/dock{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/security/checkpoint2) "eOU" = ( /turf/simulated/floor/holofloor/beach/sand{ @@ -37089,6 +37480,10 @@ /obj/structure/platform_stairs/full{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "eQv" = ( @@ -37131,7 +37526,11 @@ "eQA" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/structure/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "eQC" = ( /obj/structure/platform/ledge, @@ -37170,6 +37569,9 @@ "eQL" = ( /obj/structure/machinery/portable_atmospherics/canister/empty, /obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "eQO" = ( @@ -37278,7 +37680,7 @@ req_one_access = list(11,24) }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/research) "eRl" = ( /obj/structure/cable{ @@ -37287,6 +37689,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/hangar) "eRt" = ( @@ -37378,7 +37784,7 @@ pixel_x = 3; pixel_y = 3 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "eRR" = ( /obj/structure/cable/green{ @@ -37489,7 +37895,7 @@ pixel_x = 32; req_access = list(13) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/security/checkpoint2) "eSz" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -37684,7 +38090,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "eTh" = ( /obj/structure/machinery/holosign/surgery{ id = 2 @@ -37773,6 +38179,10 @@ icon_state = "2-4" }, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "eTz" = ( @@ -38043,7 +38453,8 @@ /area/horizon/crew/lounge) "eVJ" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "eVM" = ( /obj/structure/machinery/requests_console/east{ @@ -38067,7 +38478,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "eVT" = ( /obj/structure/lattice/catwalk, @@ -38112,10 +38523,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "eWg" = ( -/obj/structure/machinery/light/small/emergency, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -38123,6 +38533,9 @@ dir = 5 }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "eWh" = ( @@ -38153,7 +38566,7 @@ "eWn" = ( /obj/structure/railing/mapped, /turf/space, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "eWq" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/bed/stool/chair/office/light{ @@ -38298,7 +38711,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "eXH" = ( /obj/structure/disposalpipe/segment{ @@ -38327,10 +38744,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "eXT" = ( -/obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate/tool, /obj/random/tech_supply, /obj/random/tech_supply, @@ -38342,7 +38758,10 @@ /obj/random/tool, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "eXV" = ( /turf/simulated/wall/r_wall, @@ -38351,7 +38770,10 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "eYf" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -38364,6 +38786,9 @@ icon_state = "2-8" }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "eYg" = ( @@ -38397,17 +38822,17 @@ /area/horizon/maintenance/deck_3/aft/starboard) "eYo" = ( /obj/random/dirt_75, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_1/main/port/shortcut) +/area/horizon/maintenance/deck_2/wing/port/far) "eYq" = ( /obj/effect/map_effect/map_helper/ruler_tiles_3{ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "eYt" = ( /obj/structure/machinery/disposal/small/east{ pixel_x = -6 @@ -38515,6 +38940,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/grille/broken, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "eZu" = ( @@ -38528,6 +38954,9 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor, /area/horizon/ai/upload_foyer) "eZv" = ( @@ -38547,7 +38976,7 @@ dir = 1 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/port/nacelle) "eZD" = ( /obj/effect/decal/cleanable/dirt, @@ -38720,9 +39149,10 @@ /turf/simulated/floor/wood, /area/horizon/service/mess_hall) "faM" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "faN" = ( @@ -38958,6 +39388,10 @@ /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "fcK" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "fcL" = ( @@ -39009,7 +39443,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -39202,7 +39636,7 @@ /turf/simulated/floor/plating, /area/horizon/operations/mining_main/refinery) "feo" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -39278,6 +39712,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/medical) "feB" = ( @@ -39380,10 +39818,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/flight_deck) "feU" = ( -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 }, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "feV" = ( /obj/structure/machinery/camera/network/reactor{ @@ -39552,11 +39990,11 @@ /turf/unsimulated/floor/plating, /area/shuttle/legion) "ffQ" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/area/horizon/maintenance/deck_2/wing/port/far) "ffX" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 1 @@ -39613,6 +40051,17 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/carpet/rubber, /area/horizon/medical/pharmacy) +"fgy" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb2, +/obj/structure/table/rack, +/obj/random/technology_scanner, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/main/port) "fgz" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/light{ @@ -39660,6 +40109,10 @@ /obj/structure/machinery/camera/network/command{ c_tag = "AI Core - Upload Airlock" }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/machinery/alarm/north, /turf/simulated/floor, /area/horizon/ai/upload_foyer) "fgX" = ( @@ -39668,9 +40121,9 @@ /area/horizon/holodeck/source_combat_training) "fgY" = ( /obj/structure/machinery/firealarm/south, -/obj/effect/floor_decal/corner/dark_blue/full, -/obj/structure/machinery/alarm/west, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/machinery/porta_turret, +/turf/simulated/floor/tiled/dark/full, /area/horizon/ai/upload_foyer) "fha" = ( /obj/item/modular_computer/console/preset/supply, @@ -39807,6 +40260,13 @@ /obj/effect/floor_decal/industrial/outline/medical, /turf/simulated/floor/tiled/dark/full, /area/horizon/medical/paramedic) +"fhO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/wing/starboard) "fhQ" = ( /obj/effect/floor_decal/corner_wide/black{ dir = 6 @@ -39819,6 +40279,10 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/propulsion) +"fhX" = ( +/obj/structure/lattice/catwalk, +/turf/simulated/open/airless, +/area/horizon/exterior/no_shields) "fic" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -39830,6 +40294,7 @@ c_tag = "Engineering - Deck 3 - Civilian Substation"; dir = 1 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor, /area/horizon/maintenance/substation/civ_d3) "fie" = ( @@ -40006,7 +40471,10 @@ no_cargo = 1 }, /obj/random/plushie, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "fka" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -40019,11 +40487,15 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "fkf" = ( /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "fkg" = ( @@ -40124,7 +40596,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "fkY" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -40333,7 +40808,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_2"; name = "airlock_horizon_dock_deck_3_starboard_2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "fmy" = ( /obj/effect/decal/cleanable/cobweb2{ @@ -40400,6 +40875,12 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) +"fmW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "fmX" = ( /obj/structure/shuttle_part/scc/scout{ icon_state = "7,7" @@ -40770,7 +41251,7 @@ req_access = list(12); name = "Deck 1 Starboard Primary Maintenance Conduit" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "fpl" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -40887,7 +41368,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "fpR" = ( /turf/simulated/open, @@ -40925,7 +41407,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "fqc" = ( /obj/effect/floor_decal/industrial/warning{ @@ -40939,7 +41421,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "fqs" = ( /obj/effect/floor_decal/spline/plain{ @@ -40984,7 +41466,7 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, -/obj/structure/machinery/hologram/holopad, +/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/bar) "fqG" = ( @@ -41329,7 +41811,10 @@ /area/horizon/service/cafeteria) "fta" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "ftp" = ( /obj/effect/floor_decal/industrial/warning{ @@ -41632,11 +42117,13 @@ /turf/simulated/floor, /area/tdome/tdome1) "fvR" = ( +/obj/effect/floor_decal/industrial/outline/grey, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 8 +/obj/structure/machinery/light/small{ + dir = 1 }, -/area/horizon/maintenance/deck_1/wing/starboard/far) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/main/port) "fvV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -41728,6 +42215,14 @@ /obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/horizon/operations/loading) +"fxg" = ( +/obj/random/dirt_75, +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/near) "fxi" = ( /obj/structure/table/reinforced/steel, /obj/item/storage/toolbox/mechanical{ @@ -41757,12 +42252,14 @@ /turf/unsimulated/floor/freezer, /area/antag/mercenary) "fxq" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 }, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/wing/starboard/far) +/obj/structure/machinery/light/floor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/engineering/hallway/fore) "fxt" = ( /obj/effect/decal/fake_object{ dir = 1; @@ -41874,7 +42371,7 @@ pixel_x = 25; req_one_access = list(13,65) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/security/checkpoint2) "fxW" = ( /obj/structure/sink{ @@ -42119,6 +42616,8 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small, /turf/simulated/floor, /area/horizon/maintenance/substation/civ_d3) "fzV" = ( @@ -42133,7 +42632,6 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/obj/structure/machinery/meter, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -42143,6 +42641,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "fAi" = ( @@ -42164,14 +42663,11 @@ }, /area/shuttle/legion) "fAu" = ( -/obj/structure/machinery/alarm/south, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/random/dirt_75, -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "fAJ" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -42335,7 +42831,7 @@ /obj/structure/machinery/access_button{ pixel_x = 28 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "fCf" = ( /obj/effect/floor_decal/corner/black/diagonal, @@ -42529,7 +43025,7 @@ dir = 10 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "fDE" = ( /obj/structure/machinery/door/firedoor, /obj/structure/cable/green{ @@ -42635,7 +43131,7 @@ icon_state = "1-2" }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "fEu" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -42673,7 +43169,9 @@ /obj/structure/bed/stool/chair/padded/brown{ dir = 4 }, -/obj/structure/disposalpipe/trunk, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/command/heads/chief) "fEH" = ( @@ -42750,7 +43248,8 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/ai/upload_foyer) "fFc" = ( /obj/effect/floor_decal/spline/plain/cee{ @@ -42885,10 +43384,10 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "fGm" = ( @@ -43061,6 +43560,7 @@ /area/horizon/operations/machinist/surgicalbay) "fHu" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/security/port) "fHB" = ( @@ -43087,6 +43587,10 @@ }, /turf/unsimulated/floor, /area/antag/ninja) +"fHH" = ( +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/auxatmos) "fHO" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -43124,15 +43628,14 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/auxiliary) "fIe" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, /obj/effect/decal/cleanable/ash{ pixel_x = -11; pixel_y = -2 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port/shortcut) "fIj" = ( @@ -43152,9 +43655,11 @@ /turf/unsimulated/floor, /area/centcom/legion) "fIn" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/lube, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "fIo" = ( /obj/structure/cable/green{ @@ -43247,6 +43752,7 @@ master_tag = "airlock_horizon_deck_1_aft_propulsion_2"; name = "airlock_horizon_deck_1_aft_propulsion_2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/engineering/atmos/propulsion) "fJc" = ( @@ -43293,7 +43799,6 @@ /obj/effect/floor_decal/corner/beige{ dir = 10 }, -/obj/structure/machinery/light, /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/white, @@ -43453,6 +43958,9 @@ "fKl" = ( /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "fKx" = ( @@ -43463,7 +43971,7 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/engineering/hallway/fore) "fKy" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/random/dirt_75, @@ -43485,7 +43993,7 @@ pixel_x = -31; dir = 4 }, -/turf/simulated/floor/tiled/dark/cooled, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "fKQ" = ( /obj/structure/closet/emcloset, @@ -43636,12 +44144,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload) "fLy" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/machinery/light/small{ must_start_working = 1 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "fLH" = ( @@ -43680,13 +44186,19 @@ /obj/structure/machinery/portable_atmospherics/powered/pump/filled{ start_pressure = 15000 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/shuttle/mercenary) "fLP" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/r_wall, -/area/horizon/maintenance/deck_1/main/port) +/obj/structure/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/auxatmos) "fLQ" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning{ @@ -43908,7 +44420,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/shuttle/black, @@ -43930,6 +44442,15 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/tcommsat/chamber) +"fNn" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/horizon/service/bar) "fNB" = ( /obj/structure/machinery/camera/network/crescent{ c_tag = "Crescent Departures"; @@ -44093,6 +44614,9 @@ /obj/item/modular_computer/console/preset/medical{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "fOO" = ( @@ -44111,7 +44635,7 @@ }, /obj/item/material/shard, /obj/effect/floor_decal/industrial/warning{ - dir = 6 + dir = 10 }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) @@ -44187,7 +44711,7 @@ /obj/structure/machinery/access_button{ pixel_x = 28 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "fPx" = ( /obj/structure/cable{ @@ -44311,11 +44835,12 @@ /turf/simulated/open, /area/horizon/maintenance/deck_2/main/starboard) "fQq" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard/far) "fQs" = ( /obj/structure/railing/mapped{ dir = 4 @@ -44404,7 +44929,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "fQX" = ( /obj/structure/bed/stool/chair/padded/black{ @@ -44484,7 +45009,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenobiology/xenoflora) "fRs" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" @@ -44496,6 +45020,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/service/bar) "fRu" = ( @@ -44532,6 +45059,9 @@ /obj/item/material/shard{ icon_state = "small" }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "fRL" = ( @@ -44547,7 +45077,7 @@ /obj/structure/machinery/door/firedoor{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/air) "fSa" = ( /obj/structure/cable/green{ @@ -44561,9 +45091,13 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/minibar) "fSb" = ( -/obj/random/junk, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/operations, +/obj/structure/table/rack{ + dir = 8 + }, +/obj/random/tech_supply, +/obj/random/tool, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard) "fSf" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -44662,7 +45196,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/near) "fSH" = ( /obj/random/dirt_75, @@ -44832,7 +45366,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "fTE" = ( /obj/structure/flora/ausbushes/lavendergrass, @@ -44940,7 +45474,7 @@ /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "fTZ" = ( /obj/effect/decal/cleanable/dirt, @@ -45055,13 +45589,15 @@ /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) "fUJ" = ( -/obj/effect/floor_decal/industrial/warning, /obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/operations) "fUU" = ( @@ -45149,7 +45685,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/command/heads/cmo) "fVk" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/unsimulated/floor/plating, /area/centcom/ferry) "fVp" = ( @@ -45208,7 +45744,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/lab) "fVK" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/floor_decal/industrial/warning, @@ -45246,7 +45782,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port) "fWc" = ( /obj/structure/machinery/light_switch/south{ @@ -45301,6 +45837,7 @@ master_tag = "airlock_horizon_deck_1_aft_port_1"; name = "airlock_horizon_deck_1_aft_port_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "fWo" = ( @@ -45610,10 +46147,11 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "fYN" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/template_noop, @@ -45739,6 +46277,11 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/rnd/chemistry) +"fZT" = ( +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "fZU" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -45794,14 +46337,13 @@ /area/shuttle/hapt) "gao" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/reagent_dispensers/extinguisher, -/obj/structure/railing/mapped{ - icon_state = "railing0-0" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/service/starboard) "gaq" = ( /obj/structure/machinery/camera/network/third_deck{ @@ -46060,6 +46602,7 @@ dir = 8 }, /obj/structure/cable, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/civ_d2) "gbK" = ( @@ -46118,7 +46661,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/maintenance_junk_or_loot, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/port) @@ -46252,6 +46795,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/rnd/hallway/secondary) +"gda" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "gdb" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -46358,6 +46908,12 @@ }, /turf/unsimulated/floor, /area/centcom/legion) +"gel" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/main/port) "gep" = ( /obj/structure/grille, /obj/structure/machinery/door/firedoor, @@ -46441,7 +46997,10 @@ /obj/structure/bed/stool/chair/office/dark{ dir = 8 }, -/turf/simulated/floor, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/starboard) "geP" = ( /obj/structure/table/standard{ @@ -46457,6 +47016,9 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/storage_maintenance) "geV" = ( @@ -46622,13 +47184,12 @@ /turf/simulated/floor/lino, /area/horizon/service/bar) "gfP" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/platform_deco{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/starboard/far) "gfR" = ( /turf/simulated/wall/shuttle/scc, /area/horizon/shuttle/intrepid/engineering) @@ -46645,6 +47206,7 @@ /area/horizon/hangar/auxiliary) "ggh" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/black, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "ggl" = ( @@ -46677,6 +47239,13 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark/full, /area/horizon/hangar/airstation) +"ggG" = ( +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/near) "ggJ" = ( /obj/effect/floor_decal/corner/black{ dir = 9 @@ -46778,7 +47347,7 @@ /area/horizon/engineering/reactor/indra/monitoring) "ghA" = ( /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -47259,11 +47828,6 @@ }, /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_thunderdomecourt) -"gkW" = ( -/obj/structure/grille, -/obj/structure/grille, -/turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) "gkY" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -47285,8 +47849,9 @@ /turf/simulated/floor/plating, /area/horizon/security/hallway) "gla" = ( -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/operations) +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/aft/starboard/far) "glg" = ( /obj/structure/closet/crate/software_backup, /obj/effect/floor_decal/industrial/outline/yellow, @@ -47459,7 +48024,12 @@ /turf/space, /area/horizon/exterior) "gme" = ( -/obj/structure/girder, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "gmg" = ( @@ -47467,9 +48037,13 @@ dir = 10 }, /obj/random/dirt_75, -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "gmi" = ( /obj/structure/railing/mapped{ @@ -47668,9 +48242,12 @@ /area/horizon/hallway/primary/deck_2/fore) "gnX" = ( /obj/random/junk, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "goa" = ( @@ -47689,6 +48266,10 @@ /obj/random/maintenance_junk_or_loot, /turf/simulated/floor/tiled/dark, /area/horizon/service/custodial/disposals/deck_1) +"gog" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/starboard) "goh" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, @@ -47760,7 +48341,12 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "gou" = ( -/turf/simulated/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "goB" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -48006,9 +48592,11 @@ /turf/unsimulated/floor, /area/centcom/spawning) "gqp" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard) +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard) "gqs" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48348,7 +48936,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard/far) "grD" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -48433,7 +49021,8 @@ /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" }, -/turf/simulated/floor/plating, +/obj/random/maintenance_junk_or_loot, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "gsz" = ( /obj/structure/machinery/smartfridge/chemistry{ @@ -48641,7 +49230,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "gur" = ( /obj/structure/table/reinforced/steel, @@ -48793,7 +49382,6 @@ }, /area/horizon/holodeck/source_konyang) "gvf" = ( -/obj/structure/machinery/light, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/machinery/vending/coffee, /turf/simulated/floor/tiled/dark/full, @@ -48884,7 +49472,7 @@ name = "airlock_horizon_deck_3_fore_starboard_1" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/crewlounge) "gvK" = ( /obj/structure/table/stone/marble, @@ -48967,6 +49555,10 @@ icon_state = "white" }, /area/tdome/tdomeobserve) +"gwi" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/wing/starboard) "gwk" = ( /obj/effect/floor_decal/corner/dark_green/full{ dir = 1 @@ -49048,7 +49640,7 @@ /area/horizon/engineering/hallway/interior) "gwI" = ( /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "gwK" = ( /obj/structure/machinery/atmospherics/unary/engine/scc_shuttle, @@ -49249,7 +49841,6 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "gyf" = ( @@ -49368,7 +49959,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/reception) "gyK" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/open, /area/horizon/maintenance/deck_2/wing/starboard) "gyR" = ( @@ -49424,6 +50015,10 @@ /area/antag/mercenary) "gzh" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/elevator) "gzj" = ( @@ -49437,7 +50032,7 @@ /area/centcom/bar) "gzn" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/cable{ @@ -49595,10 +50190,12 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/main_storage) "gAs" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard) +/area/horizon/maintenance/deck_2/wing/port) "gAu" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -49853,7 +50450,7 @@ /obj/structure/bed/stool/padded/black, /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/alarm/north, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "gBV" = ( /obj/structure/cable/yellow{ @@ -50050,10 +50647,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/starboard) "gDD" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -50304,8 +50898,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "gFn" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -50391,7 +50984,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_1"; name = "airlock_horizon_dock_deck_3_starboard_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "gFU" = ( /obj/structure/machinery/alarm/north, @@ -50455,6 +51048,9 @@ /turf/unsimulated/floor/plating, /area/antag/jockey) "gGk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "gGo" = ( @@ -50465,6 +51061,9 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/machinery/light/floor{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos) "gGr" = ( @@ -50555,18 +51154,12 @@ /turf/simulated/floor/tiled, /area/horizon/rnd/hallway) "gGL" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/effect/floor_decal/industrial/warning, +/obj/random/dirt_75, /obj/structure/platform{ dir = 4 }, -/obj/structure/platform_deco{ - dir = 10 - }, -/obj/random/dirt_75, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "gGS" = ( /obj/structure/bed/stool/chair/sofa/left/purple{ @@ -50617,10 +51210,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "gHg" = ( /turf/unsimulated/wall/riveted, @@ -50701,7 +51291,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_2"; name = "airlock_horizon_dock_deck_3_starboard_2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "gHy" = ( /turf/simulated/wall/shuttle/unique/mercenary/small, @@ -50781,7 +51371,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "gIb" = ( /obj/structure/table/reinforced/steel, /obj/structure/machinery/door/window/southleft{ @@ -50801,14 +51391,14 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "gIi" = ( -/obj/structure/machinery/floodlight, /obj/effect/floor_decal/industrial/warning{ - dir = 5 + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard) "gIk" = ( /turf/unsimulated/wall/steel, @@ -50840,6 +51430,9 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "gIO" = ( @@ -51042,17 +51635,11 @@ /turf/simulated/open, /area/horizon/hallway/primary/deck_3/central) "gJW" = ( -/obj/structure/railing/mapped{ +/obj/structure/platform, +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "gJX" = ( /obj/effect/floor_decal/industrial/warning, @@ -51124,7 +51711,7 @@ pixel_x = 12; pixel_y = 28 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "gKg" = ( /turf/simulated/floor/holofloor/tiled, @@ -51146,7 +51733,7 @@ /turf/simulated/floor/tiled, /area/horizon/medical/morgue) "gKz" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/platform, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "gKD" = ( @@ -51220,6 +51807,9 @@ /area/centcom/specops) "gLE" = ( /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "gLG" = ( @@ -51389,11 +51979,9 @@ /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_3/aft/starboard) "gMA" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/grille, -/turf/simulated/floor/reinforced/airless, +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/space, /area/horizon/exterior) "gMC" = ( /obj/structure/cable{ @@ -51419,8 +52007,8 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "gMP" = ( -/obj/random/dirt_75, /obj/random/junk, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "gMR" = ( @@ -51434,16 +52022,14 @@ c_tag = "Engineering - Deck 2 - Medical Substation"; dir = 4 }, -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/medical) "gMT" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, /turf/space, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "gMZ" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -51611,7 +52197,7 @@ /obj/structure/closet/crate, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "gNN" = ( /obj/structure/cable/yellow{ @@ -52104,7 +52690,7 @@ "gSa" = ( /obj/effect/map_effect/map_helper/ruler_tiles_3, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "gSb" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -52220,7 +52806,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "gSA" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -52338,8 +52924,13 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenoarch/atrium) "gTF" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_1/main/port/shortcut) +/area/horizon/maintenance/deck_2/main/starboard) "gTH" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -52480,6 +53071,15 @@ }, /turf/simulated/floor/reinforced/oxygen, /area/horizon/engineering/atmos/air) +"gUK" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 10 + }, +/obj/structure/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/rnd/hallway) "gUM" = ( /obj/item/stack/packageWrap, /obj/item/hand_labeler, @@ -52503,10 +53103,11 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "gUT" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/random/junk, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/platform_deco{ + icon_state = "ledge_deco" + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "gUV" = ( @@ -52817,7 +53418,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, -/obj/structure/machinery/firealarm/south, +/obj/structure/machinery/light, /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "gWP" = ( @@ -52913,8 +53514,14 @@ /area/horizon/operations/machinist) "gXo" = ( /obj/structure/machinery/anti_bluespace, +/obj/structure/machinery/alarm/south, +/obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled/dark/full, /area/horizon/storage/secure/tech_vault) +"gXr" = ( +/obj/structure/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "gXu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -53361,7 +53968,6 @@ pixel_x = 32 }, /obj/structure/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -53373,7 +53979,11 @@ pixel_y = 30; req_access = list(16) }, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/dark_blue{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "har" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -53420,11 +54030,8 @@ /turf/simulated/floor/wood, /area/horizon/repoffice/consular_two) "haz" = ( -/obj/effect/floor_decal/industrial/loading/yellow, -/obj/structure/platform{ - dir = 8 - }, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "haC" = ( /obj/structure/cable{ @@ -53592,6 +54199,12 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos) +"hbQ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "hbU" = ( /obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/machinery/camera/network/intrepid{ @@ -54292,7 +54905,7 @@ /obj/item/hullbeacon/red, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "hgh" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -54363,6 +54976,12 @@ /obj/effect/floor_decal/corner/green, /turf/unsimulated/floor, /area/centcom/bar) +"hgJ" = ( +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/machinery/light/floor, +/turf/simulated/floor/tiled/full, +/area/horizon/engineering/hallway/fore) "hgK" = ( /obj/structure/machinery/portable_atmospherics/canister/air/airlock, /obj/structure/machinery/atmospherics/portables_connector, @@ -54520,6 +55139,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, +/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "hhX" = ( @@ -54625,12 +55245,10 @@ /area/horizon/operations/warehouse) "hiU" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/effect/decal/cleanable/dirt, /obj/structure/railing/mapped{ icon_state = "railing0-0" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port) "hiV" = ( @@ -54693,7 +55311,7 @@ req_one_access = list(24,11,67,73); dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/starboard) "hjB" = ( /obj/structure/cable/green{ @@ -54949,7 +55567,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor, @@ -55154,8 +55772,14 @@ /area/horizon/storage/secure/tech_vault) "hmf" = ( /obj/structure/trash_pile, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /obj/random/dirt_75, -/turf/simulated/floor, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "hmg" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -55243,7 +55867,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "hmO" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -55461,7 +56088,10 @@ /obj/effect/decal/cleanable/dirt, /obj/random/junk, /obj/random/med_stack, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "hnB" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -55709,7 +56339,7 @@ /turf/simulated/floor/tiled, /area/horizon/command/bridge/supply) "hpn" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -56030,10 +56660,6 @@ dir = 1 }, /obj/item/modular_computer/console/preset/command, -/obj/structure/machinery/light/small, -/obj/structure/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/aibunker) "hrK" = ( @@ -56312,7 +56938,7 @@ name = "Operations Substation"; req_one_access = list(11,24) }, -/turf/simulated/floor/tiled/gunmetal/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/operations/warehouse) "htJ" = ( /obj/structure/machinery/door/airlock/external, @@ -56344,7 +56970,7 @@ id = "quark_bay_outer"; name = "Quark Shutter" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/quark/cargo_hold) "htP" = ( /obj/structure/window/reinforced/crescent{ @@ -56678,7 +57304,10 @@ /area/horizon/security/warden) "hvn" = ( /obj/random/junk, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "hvt" = ( /obj/structure/machinery/atmospherics/portables_connector/fuel{ @@ -56878,8 +57507,8 @@ dir = 1 }, /obj/structure/trash_pile, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "hwP" = ( /obj/effect/floor_decal/corner/dark_green/full, @@ -57083,7 +57712,7 @@ /obj/structure/closet, /obj/random/loot, /obj/random/junk, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "hyz" = ( /obj/structure/machinery/atmospherics/binary/pump/fuel{ @@ -57216,6 +57845,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "hyZ" = ( @@ -57263,10 +57893,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/bluegrid, /area/horizon/ai/chamber) "hzl" = ( /obj/structure/cable/green{ @@ -57301,7 +57928,7 @@ must_start_working = 1 }, /obj/random/canister/filled/restricted, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "hzx" = ( /obj/structure/railing/mapped{ @@ -57309,7 +57936,7 @@ }, /obj/structure/railing/mapped, /obj/structure/lattice/catwalk, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/open, @@ -57340,9 +57967,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "hzW" = ( /obj/structure/railing/mapped{ @@ -57430,6 +58056,7 @@ "hAA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/alarm/north, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "hAB" = ( @@ -57689,6 +58316,13 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) +"hCj" = ( +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/wing/starboard) "hCm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -57728,17 +58362,22 @@ /turf/simulated/floor/reinforced, /area/horizon/rnd/xenobiology) "hCI" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/obj/structure/table/rack, +/obj/random/loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "hCL" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/platform_deco{ dir = 8 }, -/turf/simulated/floor/reinforced, -/area/horizon/command/bridge/selfdestruct) +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/wing/starboard/far) "hCM" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -57806,7 +58445,7 @@ name = "Investigators' Office"; req_access = list(4) }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/security/investigators_office) "hDb" = ( /obj/effect/landmark/entry_point/port{ @@ -57871,14 +58510,12 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/engineering/reactor/supermatter/monitoring) "hDv" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/machinery/floodlight, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/operations, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard) "hDy" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -57931,7 +58568,7 @@ pixel_x = 20; pixel_y = -28 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "hDH" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -57958,7 +58595,7 @@ /turf/simulated/floor/carpet/red, /area/horizon/service/library) "hDM" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/lattice/catwalk/indoor, @@ -57989,6 +58626,9 @@ /obj/random/junk, /obj/structure/table/rack, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "hDX" = ( @@ -57997,7 +58637,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/random/dirt_75, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) @@ -58032,7 +58671,7 @@ /area/shuttle/legion) "hEh" = ( /obj/structure/machinery/alarm/north, -/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "hEk" = ( @@ -58101,7 +58740,7 @@ req_access = list(12); name = "Deck 1 Starboard Primary Maintenance Conduit" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard) "hEE" = ( /obj/structure/cable{ @@ -58112,14 +58751,14 @@ /obj/structure/machinery/door/firedoor, /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/effect/floor_decal/industrial/hatch_door/yellow{ - dir = 8 - }, /obj/structure/machinery/door/airlock/maintenance{ name = "Deck 1 Starboard Primary Maintenance Conduit"; req_one_access = list(12,31) }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard/amidships) "hEH" = ( /obj/structure/cable/green{ @@ -58283,7 +58922,10 @@ /area/horizon/hangar/intrepid) "hFZ" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "hGe" = ( /obj/structure/machinery/door/airlock/glass_security{ @@ -58323,6 +58965,7 @@ master_tag = "airlock_horizon_deck_2_starboard_aft"; name = "airlock_horizon_deck_2_starboard_aft" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) "hGq" = ( @@ -58377,14 +59020,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "hGA" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/random/junk, /obj/structure/platform{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "hGF" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -58436,13 +59075,19 @@ /area/horizon/hallway/primary/deck_2/fore) "hHp" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/sign/double/barsign{ pixel_y = -32 }, /obj/structure/lattice/catwalk, /turf/simulated/open, /area/horizon/maintenance/deck_2/service/starboard) +"hHr" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/railing/mapped, +/obj/structure/machinery/light/small/floor, +/turf/simulated/floor/wood, +/area/horizon/service/cafeteria) "hHv" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -58717,6 +59362,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "hJs" = ( @@ -59148,9 +59797,6 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible/universal{ dir = 1 }, -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) @@ -59168,10 +59814,10 @@ pixel_x = 0 }, /obj/structure/machinery/firealarm/south, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, +/turf/simulated/floor, /area/horizon/ai/chamber) "hLX" = ( /obj/structure/machinery/door/airlock/external{ @@ -59222,7 +59868,10 @@ "hMc" = ( /obj/structure/closet, /obj/random/loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "hMf" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -59236,6 +59885,10 @@ dir = 8 }, /area/horizon/holodeck/source_sauna) +"hMn" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/main/port) "hMC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -59299,11 +59952,10 @@ /turf/unsimulated/floor/plating, /area/shuttle/legion) "hNb" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/industrial/warning, +/obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning, -/obj/random/maintenance_junk_or_loot, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "hNe" = ( @@ -59321,6 +59973,7 @@ icon_state = "1-8" }, /obj/structure/cable, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/operations) "hNm" = ( @@ -59331,9 +59984,6 @@ /obj/structure/platform{ dir = 4 }, -/obj/structure/machinery/light/floor{ - dir = 8 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -59360,10 +60010,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/aibunker) "hNu" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor, -/area/horizon/maintenance/deck_3/security/port) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "hNv" = ( /obj/effect/floor_decal/spline/plain/corner{ dir = 4 @@ -59497,7 +60148,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "hOs" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -59525,7 +60176,7 @@ master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; name = "airlock_horizon_deck_1_aft_propulsion_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion/starboard) "hOw" = ( /obj/structure/cable/green{ @@ -59570,7 +60221,7 @@ "hOG" = ( /obj/effect/floor_decal/industrial/warning, /obj/random/junk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "hOO" = ( /obj/structure/machinery/button/switch/windowtint{ @@ -59643,7 +60294,7 @@ /obj/item/pipe{ pixel_x = -5 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "hPl" = ( /obj/structure/bed/stool/chair/shuttle, @@ -59735,7 +60386,7 @@ /turf/simulated/floor/tiled, /area/horizon/crew/vacantoffice) "hPB" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -59768,7 +60419,7 @@ pixel_x = -32; pixel_y = -6 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "hPK" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -59901,6 +60552,13 @@ /obj/item/stack/material/graphite/full, /turf/simulated/floor, /area/horizon/command/bridge/aibunker) +"hQt" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/platform_deco{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/wing/starboard/far) "hQx" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -60079,7 +60737,8 @@ master_tag = "airlock_horizon_dock_deck_3_port_5"; name = "airlock_horizon_dock_deck_3_port_5" }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "hRQ" = ( /obj/structure/flora/grass/jungle, @@ -60249,7 +60908,11 @@ /turf/simulated/floor/tiled/full, /area/horizon/medical/ward) "hTl" = ( -/turf/simulated/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/starboard/far) "hTm" = ( /obj/structure/holostool{ @@ -60288,11 +60951,12 @@ /area/horizon/storage/eva) "hTF" = ( /obj/structure/table/steel, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/contraband, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "hTG" = ( /obj/effect/floor_decal/corner_wide/yellow/full, @@ -60322,7 +60986,7 @@ name = "airlock_horizon_dock_deck_3_port_4" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "hTR" = ( /obj/structure/cable/green{ @@ -60559,6 +61223,9 @@ "hWq" = ( /obj/structure/bed/stool/chair/padded/brown, /obj/structure/machinery/firealarm/north, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "hWr" = ( @@ -60660,7 +61327,7 @@ }, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "hXx" = ( /obj/structure/machinery/door/airlock/glass{ name = "Cryogenic Storage" @@ -60913,7 +61580,7 @@ /turf/simulated/floor/tiled/dark/full, /area/supply/dock) "hZk" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden{ @@ -60922,6 +61589,10 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) +"hZl" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "hZq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -60985,8 +61656,8 @@ c_tag = "Engineering - Deck 2 - Port Pod Substation"; dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "hZG" = ( @@ -61023,14 +61694,15 @@ /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/loot, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "hZR" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -61084,6 +61756,7 @@ /area/horizon/rnd/xenobiology/xenoflora) "iaw" = ( /obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/research) "iaB" = ( @@ -61104,7 +61777,10 @@ "iaC" = ( /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/near) "iaD" = ( /obj/structure/railing/mapped{ @@ -61501,6 +62177,18 @@ "icP" = ( /turf/simulated/wall/r_wall, /area/horizon/security/lobby) +"icR" = ( +/obj/random/dirt_75, +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/far) +"icV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "icW" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 @@ -61606,7 +62294,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "idu" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/dirt_75, @@ -61646,7 +62334,7 @@ /area/horizon/hangar/control) "idJ" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/maintenance_junk_or_loot, @@ -61832,7 +62520,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/floodlight, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "ieK" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -61937,7 +62625,6 @@ /turf/simulated/floor/plating, /area/horizon/engineering/storage/lower) "ifu" = ( -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/item/storage/box/lights/mixed{ pixel_x = 6; @@ -61947,7 +62634,8 @@ pixel_x = 6; pixel_y = -4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port/shortcut) "ifw" = ( /obj/structure/machinery/hologram/holopad, @@ -61969,9 +62657,9 @@ /area/horizon/security/checkpoint2) "ifK" = ( /obj/structure/trash_pile, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "ifN" = ( /obj/structure/railing/mapped{ @@ -62201,10 +62889,12 @@ /turf/simulated/floor/tiled, /area/horizon/command/bridge/upperdeck) "ihL" = ( -/obj/structure/machinery/porta_turret/stationary, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/reinforced, -/area/horizon/command/bridge/selfdestruct) +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/obj/structure/machinery/firealarm/north, +/turf/simulated/floor/tiled, +/area/horizon/operations/lobby) "ihS" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -62306,7 +62996,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "iiL" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -62356,7 +63046,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "ijf" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -62504,7 +63194,10 @@ /obj/structure/sign/securearea{ pixel_y = 32 }, -/turf/simulated/floor, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "ikd" = ( /obj/structure/cable/green{ @@ -62866,7 +63559,7 @@ pixel_x = -22; pixel_y = 32 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "imk" = ( /obj/structure/cable/green{ @@ -62907,15 +63600,21 @@ /turf/simulated/floor/wood, /area/horizon/command/heads/captain) "imq" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/item/radio/intercom/west, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "ims" = ( /obj/structure/shuttle_part/scc/scout{ @@ -62923,12 +63622,6 @@ }, /turf/simulated/floor/plating, /area/horizon/shuttle/canary) -"imA" = ( -/obj/structure/grille/diagonal{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) "imF" = ( /obj/effect/floor_decal/corner/red/full, /turf/unsimulated/floor, @@ -62938,6 +63631,7 @@ dir = 6 }, /obj/structure/railing/mapped, +/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "imJ" = ( @@ -63224,10 +63918,9 @@ }, /area/horizon/medical/morgue) "ioS" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/grille, +/obj/item/hullbeacon/green, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "ioU" = ( /obj/structure/machinery/button/remote/airlock/screamer{ channel = "Command"; @@ -63332,6 +64025,7 @@ shuttle_tag = "Quark"; cycle_to_external_air = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/shuttle/quark/cargo_hold) "ipD" = ( @@ -63364,7 +64058,7 @@ "ipQ" = ( /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "ipY" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume/aux{ @@ -63388,6 +64082,7 @@ shuttle_tag = "Quark"; cycle_to_external_air = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/shuttle/quark/cargo_hold) "ipZ" = ( @@ -63549,6 +64244,16 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/medical/ward) +"iqK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/random/maintenance_junk_or_loot, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/main/port) "iqN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -63577,16 +64282,14 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "iqW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "iqY" = ( @@ -64055,7 +64758,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "iuf" = ( @@ -64114,19 +64817,11 @@ /turf/simulated/floor/carpet, /area/horizon/repoffice/consular_one) "iuG" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/far) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "iuJ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -64291,7 +64986,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor, @@ -64508,7 +65203,7 @@ /obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "ixn" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -64614,9 +65309,12 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/firing_range) "ixJ" = ( -/obj/structure/girder, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/random/maintenance_junk_or_loot, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/far) +/area/horizon/maintenance/deck_2/aft) "ixK" = ( /obj/structure/machinery/button/remote/airlock{ dir = 8; @@ -64670,7 +65368,7 @@ pixel_y = 27; dir = 8 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/ai/upload_foyer) "ixR" = ( /obj/effect/floor_decal/spline/plain/black, @@ -64719,7 +65417,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_1"; name = "airlock_horizon_dock_deck_3_starboard_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "iyg" = ( /obj/structure/cable/green{ @@ -64939,7 +65637,7 @@ "izG" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "izH" = ( /obj/effect/floor_decal/corner/lime/diagonal, @@ -64999,7 +65697,9 @@ /turf/unsimulated/floor, /area/antag/mercenary) "iAc" = ( -/obj/item/stack/material/wood/full, +/obj/item/stack/material/wood/full{ + pixel_y = 6 + }, /obj/structure/table/steel, /turf/simulated/floor/wood, /area/horizon/maintenance/deck_2/wing/starboard) @@ -65160,7 +65860,11 @@ /turf/simulated/floor/tiled, /area/horizon/operations/lobby) "iBh" = ( -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "iBn" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -65446,7 +66150,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "iDk" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -65481,6 +66185,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "iDr" = ( @@ -65535,8 +66242,23 @@ /area/horizon/engineering/reactor/indra/office) "iDV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/alarm/north, -/obj/random/maintenance_junk_or_loot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/paper{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/paper{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/pen/fountain/black{ + pixel_x = -12; + pixel_y = -1 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "iEa" = ( @@ -65618,6 +66340,9 @@ /obj/structure/trash_pile, /obj/structure/machinery/alarm/north, /obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "iEN" = ( @@ -65757,6 +66482,7 @@ icon_state = "0-8" }, /obj/structure/machinery/power/apc/low/south, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "iFD" = ( @@ -65767,7 +66493,12 @@ /area/horizon/engineering/shields) "iFI" = ( /obj/random/loot, -/obj/structure/machinery/light/small/emergency{ +/obj/effect/decal/cleanable/dirt, +/obj/random/med_stack, +/obj/structure/closet/crate{ + name = "Cremation Urn Materials" + }, +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -65936,7 +66667,7 @@ /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "iGX" = ( /obj/structure/table/wood, @@ -65979,10 +66710,10 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/railing/mapped{ +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "iHj" = ( @@ -66021,6 +66752,9 @@ "iHu" = ( /obj/structure/closet/crate/freezer/rations, /obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/aibunker) "iHv" = ( @@ -66105,7 +66839,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "iHT" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -66191,6 +66925,9 @@ /obj/structure/machinery/power/breakerbox/activated{ RCon_tag = "Operations Substation" }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/operations) "iIN" = ( @@ -66232,7 +66969,7 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "iJa" = ( /obj/effect/floor_decal/corner/brown{ @@ -66288,13 +67025,10 @@ /turf/simulated/floor/plating, /area/horizon/engineering/bluespace_drive) "iJq" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/main/starboard) +/obj/random/maintenance_junk_or_loot, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/port/far) "iJr" = ( /obj/structure/bed/stool/chair/holochair{ dir = 1 @@ -66458,6 +67192,7 @@ dir = 1; name = "adjusted light fixture" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "iKz" = ( @@ -66532,14 +67267,17 @@ /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "iLt" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "iLu" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -66632,11 +67370,14 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/turbine) "iMi" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "iMk" = ( /obj/effect/floor_decal/corner/mauve{ @@ -66754,7 +67495,7 @@ name = "airlock_horizon_deck_3_aft_1"; frequency = 1001 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "iMZ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -66869,10 +67610,11 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, +/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "iNQ" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/dirt_75, @@ -66937,7 +67679,7 @@ /area/horizon/operations/office_aux) "iOp" = ( /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "iOq" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -67057,9 +67799,6 @@ /area/horizon/service/kitchen) "iPn" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ - dir = 1 - }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "iPo" = ( @@ -67069,7 +67808,7 @@ master_tag = "airlock_horizon_deck_2_starboard_aft"; name = "airlock_horizon_deck_2_starboard_aft" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "iPu" = ( /obj/random/pottedplant{ @@ -67249,7 +67988,11 @@ /obj/structure/bed/stool/chair/folding{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "iQu" = ( /obj/structure/platform{ @@ -67291,7 +68034,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "iQJ" = ( @@ -67420,15 +68163,18 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/aibunker) "iRo" = ( /obj/structure/closet/crate, /obj/random/loot, +/obj/effect/floor_decal/industrial/outline/grey, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "iRu" = ( @@ -67510,6 +68256,7 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/operations) "iSm" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/port) "iSo" = ( @@ -67634,8 +68381,8 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/intrepid) "iTg" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "iTh" = ( @@ -67650,7 +68397,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "iTo" = ( /obj/structure/table/rack, @@ -67730,6 +68477,11 @@ /obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/central) +"iTN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard) "iTP" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -67740,7 +68492,7 @@ /turf/simulated/floor/wood, /area/horizon/service/mess_hall) "iTV" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/reagent_dispensers/watertank, @@ -67798,9 +68550,10 @@ /area/centcom/evac) "iUv" = ( /obj/structure/disposalpipe/segment, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/research) "iUw" = ( @@ -67886,9 +68639,12 @@ /turf/simulated/floor/plating, /area/horizon/hangar/intrepid) "iVb" = ( -/obj/random/dirt_75, -/turf/simulated/floor, -/area/horizon/maintenance/deck_3/security/port) +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "iVd" = ( /obj/item/reagent_containers/food/drinks/carton/soymilk{ pixel_x = 6; @@ -67925,14 +68681,17 @@ /turf/simulated/open/airless, /area/horizon/exterior) "iVt" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "iVx" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -67944,15 +68703,12 @@ /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "iVG" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/horizon/service/bar) +/obj/structure/machinery/light, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_3/starboard) "iVH" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -67964,7 +68720,7 @@ /turf/simulated/floor/reinforced, /area/horizon/engineering/gravity_gen) "iVO" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/junk, @@ -67973,6 +68729,7 @@ /obj/structure/railing/mapped{ icon_state = "railing0-0" }, +/obj/structure/machinery/alarm/north, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port) "iVP" = ( @@ -68062,6 +68819,12 @@ /area/horizon/operations/loading) "iWj" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "iWk" = ( @@ -68096,7 +68859,6 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "iWu" = ( @@ -68427,7 +69189,8 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/ai/upload_foyer) "iYD" = ( /obj/structure/table/wood, @@ -68526,9 +69289,6 @@ /obj/structure/platform_deco/dark{ dir = 6 }, -/obj/structure/railing/mapped{ - dir = 4 - }, /turf/simulated/open, /area/horizon/maintenance/deck_2/cryo) "iZk" = ( @@ -68566,7 +69326,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/bar/padded/red, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -68685,6 +69445,17 @@ /obj/structure/machinery/meter, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/propulsion) +"iZX" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform, +/obj/structure/platform_deco{ + dir = 5; + pixel_y = -1 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "iZZ" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -68758,8 +69529,18 @@ dir = 8 }, /obj/structure/machinery/power/apc/low/east, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/amidships) +"jaF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/service/port) "jaG" = ( /obj/structure/platform{ dir = 4 @@ -68768,8 +69549,9 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenoarch/atrium) "jaK" = ( +/obj/effect/floor_decal/corner/brown, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "jaO" = ( /obj/effect/floor_decal/industrial/warning{ @@ -68861,7 +69643,10 @@ /area/centcom/control) "jbx" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "jbC" = ( /obj/structure/machinery/light, @@ -69120,10 +69905,12 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "jdo" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_1/main/port/shortcut) +/area/horizon/maintenance/deck_1/wing/starboard) "jdq" = ( /obj/structure/sign/drop{ desc = "A warning sign which reads 'DANGER: FALLING HAZARD' and 'THIS EQUIPMENT STARTS AND STOPS AUTOMATICALLY'."; @@ -69145,12 +69932,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port/docks) "jdR" = ( -/obj/structure/machinery/atmospherics/pipe/simple/visible{ +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "jdT" = ( /obj/structure/disposalpipe/segment{ @@ -69214,7 +70001,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/shuttle/quark/cockpit) "jeB" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/cable{ @@ -69472,7 +70259,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor, @@ -69767,7 +70554,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "jib" = ( /obj/structure/shuttle_part/mercenary/small{ icon_state = "4,1" @@ -69848,7 +70635,7 @@ "jiy" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "jiA" = ( /obj/effect/floor_decal/corner/white{ @@ -70065,6 +70852,9 @@ }, /obj/effect/floor_decal/corner_wide/yellow/diagonal, /obj/structure/disposalpipe/segment, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/break_room) "jkm" = ( @@ -70141,6 +70931,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/cafe) "jkJ" = ( @@ -70362,7 +71155,7 @@ icon_state = "1-8" }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "jlZ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -70464,6 +71257,9 @@ "jmB" = ( /obj/structure/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/auxatmos) "jmD" = ( @@ -70525,7 +71321,6 @@ dir = 4 }, /obj/random/dirt_75, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "jmY" = ( @@ -70551,7 +71346,8 @@ pixel_x = -6; pixel_y = 28 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port/docks) "jnl" = ( /obj/structure/bed/stool, @@ -70620,10 +71416,7 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate/damaged{ - color = "#4c535b" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/ramp/bottom, /area/horizon/maintenance/deck_2/wing/starboard/far) "jnE" = ( /turf/simulated/floor/carpet/purple, @@ -70686,9 +71479,8 @@ dir = 10 }, /obj/random/dirt_75, -/obj/random/dirt_75, /obj/item/material/shard, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "jnR" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -70818,6 +71610,16 @@ }, /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) +"joO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/platform_deco{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/wing/starboard/far) "joT" = ( /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/holofloor/carpet/rubber, @@ -70834,7 +71636,7 @@ /obj/effect/floor_decal/industrial/hatch_door/engineering{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/gravity_gen) "jpd" = ( /obj/structure/bed/stool/padded/brown{ @@ -70858,19 +71660,20 @@ /turf/unsimulated/wall/darkshuttlewall, /area/centcom/control) "jpj" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "jpk" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "jpo" = ( /obj/structure/bed/stool/chair/padded/brown{ @@ -70938,7 +71741,7 @@ /obj/structure/machinery/door/firedoor{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "jpR" = ( /obj/structure/machinery/computer/slot_machine, @@ -70973,6 +71776,7 @@ c_tag = "Engineering - Deck 3 - Command Substation"; dir = 4 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "jqe" = ( @@ -70982,6 +71786,19 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) +"jqg" = ( +/obj/structure/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/structure/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hangar/intrepid/interstitial) "jqj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -70990,10 +71807,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/central_ring) "jqn" = ( /obj/structure/disposalpipe/segment{ @@ -71022,6 +71839,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/atmos_crosser) "jqG" = ( +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "jqI" = ( @@ -71060,6 +71878,7 @@ shuttle_tag = "Quark"; cycle_to_external_air = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/shuttle/quark/cargo_hold) "jqW" = ( @@ -71296,7 +72115,7 @@ dir = 8 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "jsL" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/structure/table/steel, @@ -71368,7 +72187,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -71421,7 +72240,10 @@ /obj/item/storage/bag/inflatable, /obj/random/loot, /obj/item/storage/bag/inflatable, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "jtC" = ( /obj/effect/floor_decal/corner_wide/green{ @@ -71537,6 +72359,13 @@ /area/antag/ninja) "jur" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "juN" = ( @@ -71583,7 +72412,7 @@ /obj/structure/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/structure/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/crewlounge) "jvb" = ( /obj/random/pottedplant, @@ -71731,10 +72560,9 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/service/starboard) "jvO" = ( -/obj/structure/lattice/catwalk, /obj/structure/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 }, @@ -71744,6 +72572,7 @@ /obj/structure/cable{ icon_state = "11-8" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/open, /area/horizon/maintenance/deck_2/wing/starboard/far) "jvW" = ( @@ -71855,6 +72684,9 @@ /obj/random/loot, /obj/random/loot, /obj/random/contraband, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "jwz" = ( @@ -72015,7 +72847,10 @@ "jxL" = ( /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "jxU" = ( /obj/structure/machinery/computer/general_air_control/large_tank_control/wall{ @@ -72099,7 +72934,8 @@ "jyC" = ( /obj/structure/machinery/meter, /obj/structure/machinery/atmospherics/pipe/manifold4w/visible, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "jyE" = ( /obj/structure/bonfire/fireplace, @@ -72184,7 +73020,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor, @@ -72368,9 +73204,6 @@ /obj/structure/platform_deco/ledge/dark{ dir = 5 }, -/obj/structure/railing/mapped{ - dir = 8 - }, /turf/simulated/open, /area/horizon/maintenance/deck_2/cryo) "jzT" = ( @@ -72496,9 +73329,8 @@ /obj/structure/machinery/firealarm/north, /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/structure/machinery/light/spot{ - dir = 4; - must_start_working = 1 +/obj/structure/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) @@ -72506,8 +73338,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/alarm/east, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/engineering/drone_fabrication) "jBb" = ( @@ -72517,15 +73349,13 @@ /turf/unsimulated/floor, /area/centcom/ferry) "jBf" = ( -/obj/effect/floor_decal/corner_wide/blue{ - dir = 5 - }, -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 10 +/obj/structure/machinery/alarm/south, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/alarm/south, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "jBg" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -72564,6 +73394,10 @@ }, /turf/unsimulated/floor, /area/centcom/bar) +"jBv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/wing/starboard/far) "jBx" = ( /obj/turbolift_map_holder/scc_ship/primary, /turf/simulated/floor/plating, @@ -72601,10 +73435,10 @@ /area/horizon/security/autopsy_laboratory) "jBM" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "jBR" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -72737,13 +73571,14 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/test_range) "jCu" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "jCA" = ( /obj/structure/machinery/door/airlock/centcom{ @@ -72756,7 +73591,7 @@ /area/centcom/spawning) "jCB" = ( /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "jCF" = ( /obj/structure/lattice, @@ -72803,7 +73638,7 @@ /obj/structure/lattice/catwalk/indoor/grate/damaged{ color = "#4c535b" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -73186,10 +74021,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "jGc" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -73346,11 +74182,17 @@ /turf/simulated/floor/plating, /area/horizon/engineering/reactor/supermatter/airlock) "jGV" = ( -/obj/structure/platform_stairs/south_north_solo, /obj/structure/platform{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/structure/platform, +/obj/structure/platform_deco{ + dir = 5 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/canister/restricted, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "jHa" = ( /turf/simulated/wall, @@ -73471,13 +74313,14 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "jIt" = ( -/obj/structure/machinery/light{ +/obj/structure/machinery/light/floor{ dir = 1 }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 +/obj/effect/floor_decal/corner/dark_blue{ + dir = 10 }, +/obj/structure/machinery/alarm/north, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "jIw" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -73616,7 +74459,7 @@ name = "airlock_horizon_deck_3_aft_1" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "jJs" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -73741,9 +74584,9 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/lab) "jKw" = ( -/obj/random/dirt_75, /obj/random/junk, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port/shortcut) "jKx" = ( /obj/structure/table/standard, @@ -73794,7 +74637,8 @@ pixel_x = 20; pixel_y = 6 }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "jKX" = ( /obj/structure/table/reinforced/wood, @@ -73837,12 +74681,11 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "jLi" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) "jLj" = ( @@ -73954,6 +74797,19 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/full, /area/horizon/operations/mining_main/refinery) +"jMp" = ( +/obj/structure/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 + }, +/obj/structure/machinery/light/floor{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/rnd/xenoarch/atrium) "jMt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -74006,17 +74862,15 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/icu) "jMM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ - dir = 1 +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate/damaged{ - color = "#4c535b" +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/main/port) +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/auxatmos) "jMO" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-4-f" @@ -74081,12 +74935,10 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/port) "jNs" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/wing/port/far) +/area/horizon/maintenance/deck_1/wing/starboard) "jNt" = ( /obj/effect/floor_decal/industrial/warning, /obj/random/dirt_75, @@ -74104,8 +74956,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "jNA" = ( /obj/structure/cable/green{ @@ -74165,7 +75017,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/effect/map_effect/map_helper/ruler_tiles_3, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "jNM" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/brflowers, @@ -74272,7 +75124,10 @@ "jOh" = ( /obj/structure/table/rack, /obj/random/loot, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "jOj" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden{ @@ -74680,7 +75535,10 @@ "jQL" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/random/canister/restricted, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "jQT" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden/black, @@ -74703,7 +75561,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/reagent_containers/spray, /obj/item/reagent_containers/spray, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/operations) "jRe" = ( /obj/structure/table/glass{ @@ -74788,7 +75646,8 @@ /turf/simulated/floor/tiled/gridded, /area/horizon/operations/warehouse) "jRJ" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/teleporter) "jRL" = ( @@ -74805,7 +75664,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/tiled/dark/full, @@ -74885,6 +75744,12 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) +"jSc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance_junk_or_loot, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/wing/starboard/far) "jSf" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -74971,8 +75836,8 @@ /turf/simulated/floor/tiled/gunmetal, /area/horizon/operations/warehouse) "jSx" = ( -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "jSy" = ( /obj/structure/disposalpipe/segment{ @@ -75135,7 +76000,10 @@ /obj/random/loot, /obj/structure/closet, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "jTF" = ( /obj/structure/bed/stool/chair{ @@ -75157,14 +76025,13 @@ }, /area/centcom/distress_prep) "jTM" = ( -/obj/structure/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 +/obj/random/dirt_75, +/obj/structure/machinery/alarm/north, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/effect/floor_decal/industrial/hatch_door/yellow, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/main/starboard) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/cryo) "jTO" = ( /obj/structure/machinery/door/airlock/maintenance{ dir = 4; @@ -75217,7 +76084,7 @@ pixel_y = 3; pixel_x = -8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "jTV" = ( /obj/structure/disposalpipe/segment{ @@ -75480,7 +76347,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "jVI" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/black{ @@ -75632,10 +76499,9 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning, /obj/structure/platform, /obj/structure/railing/mapped, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "jWM" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -75755,12 +76621,17 @@ /turf/simulated/wall, /area/horizon/service/hydroponics/garden) "jXE" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) +"jXG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "jXH" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -76068,8 +76939,8 @@ /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/starboard/far) "jZH" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/alarm/west, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "jZI" = ( @@ -76086,10 +76957,7 @@ icon_state = "1-4" }, /obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "jZT" = ( /obj/structure/table/wood, @@ -76349,7 +77217,10 @@ "kbC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "kbD" = ( /obj/structure/table/reinforced/steel, @@ -76691,8 +77562,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "kdv" = ( /obj/structure/cable{ @@ -76719,10 +77589,12 @@ "kdG" = ( /obj/structure/closet/crate, /obj/random/loot, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb2, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "kdL" = ( @@ -76974,7 +77846,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_3"; name = "airlock_horizon_dock_deck_3_starboard_3" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "kfA" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -77013,7 +77885,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -77073,6 +77945,9 @@ pixel_y = -32 }, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "kgd" = ( @@ -77116,9 +77991,10 @@ /turf/unsimulated/wall/steel, /area/antag/ninja) "kgm" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/port/far) "kgs" = ( @@ -77150,7 +78026,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/teleporter) "kgE" = ( @@ -77854,6 +78730,9 @@ dir = 1 }, /obj/effect/floor_decal/sign/w, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway) "kle" = ( @@ -77862,6 +78741,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/mess_hall) "klg" = ( @@ -77894,6 +78774,10 @@ /area/horizon/holodeck/source_trinary) "kll" = ( /obj/effect/spider/stickyweb, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/civilian/bay_51{ + pixel_y = 32 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "kln" = ( @@ -77948,10 +78832,17 @@ /area/horizon/rnd/conference) "klF" = ( /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "klH" = ( /obj/structure/bed/stool/chair/office/light, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "klK" = ( @@ -77999,11 +78890,15 @@ /area/horizon/service/hydroponics) "klY" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/random/plushie, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "klZ" = ( /obj/structure/railing/mapped{ @@ -78087,7 +78982,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/storage_maintenance) "kmr" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, @@ -78113,14 +79008,12 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/ward) "kmv" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 }, -/obj/effect/floor_decal/corner/pink/diagonal, -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/far) "kmF" = ( /obj/structure/machinery/firealarm/west, /obj/structure/closet/secure_closet/engineering_electrical, @@ -78171,7 +79064,7 @@ /obj/structure/machinery/door/airlock/maintenance{ req_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "kmO" = ( /obj/structure/cable/green{ @@ -78317,9 +79210,9 @@ /area/horizon/hangar/operations) "knA" = ( /obj/structure/machinery/alarm/south, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/spiderling_remains, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "knB" = ( @@ -78414,6 +79307,7 @@ /obj/structure/machinery/door/firedoor/multi_tile{ dir = 2 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "kor" = ( @@ -78437,8 +79331,10 @@ /area/horizon/stairwell/engineering/deck_2) "kov" = ( /obj/structure/railing/mapped, -/obj/structure/girder, /obj/effect/decal/cleanable/cobweb2, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "kow" = ( @@ -78552,6 +79448,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/xenoarchaeology) "kpd" = ( @@ -78600,7 +79500,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "kpl" = ( /obj/effect/floor_decal/industrial/hatch/grey, @@ -78809,7 +79709,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "kqW" = ( /turf/simulated/floor/tiled/ramp/bottom{ dir = 4 @@ -78821,7 +79721,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "kri" = ( /obj/effect/floor_decal/corner/yellow/full{ dir = 4 @@ -78946,7 +79846,7 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark/cooled, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/upload) "ksl" = ( /obj/structure/flora/log_bench, @@ -79072,6 +79972,9 @@ /area/tdome/tdomeobserve) "kti" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "ktm" = ( @@ -79126,8 +80029,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "ktG" = ( /obj/structure/table/reinforced, @@ -79376,7 +80279,8 @@ dir = 5 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "kuL" = ( /turf/simulated/wall, @@ -79435,7 +80339,6 @@ /turf/simulated/floor/plating, /area/horizon/engineering/reactor/indra/office) "kvi" = ( -/obj/effect/floor_decal/sign/w, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -79456,6 +80359,7 @@ pixel_y = 25; req_access = list(5) }, +/obj/effect/floor_decal/sign/w, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) "kvn" = ( @@ -79496,7 +80400,7 @@ "kvw" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor, @@ -79547,6 +80451,10 @@ name = "Powernet Sensor - Deck 1 Research Subgrid"; name_tag = "Deck 1 Research Subgrid" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/xenoarchaeology) "kvS" = ( @@ -79571,8 +80479,6 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "kvX" = ( @@ -79798,7 +80704,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/random/maintenance_junk_or_loot, @@ -80011,7 +80917,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) "kyH" = ( @@ -80193,10 +81099,7 @@ "kzt" = ( /obj/structure/machinery/porta_turret/cannon, /obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/bluegrid, /area/horizon/ai/chamber) "kzy" = ( /obj/random/dirt_75, @@ -80211,9 +81114,11 @@ /obj/random/medical, /obj/random/medical, /obj/random/dirt_75, -/obj/random/dirt_75, /obj/random/med_stack, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "kzB" = ( @@ -80258,7 +81163,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/medical) "kzQ" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -80304,7 +81209,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard/far) "kAa" = ( /obj/structure/cable/green{ @@ -80481,9 +81386,6 @@ c_tag = "Medical - Staff Smoking Lounge"; dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/horizon/medical/smoking) "kBh" = ( @@ -80569,7 +81471,7 @@ "kBv" = ( /obj/random/junk, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "kBw" = ( /obj/effect/decal/cleanable/dirt, @@ -80661,6 +81563,12 @@ /obj/structure/machinery/light, /turf/unsimulated/floor/rubber_carpet, /area/centcom/control) +"kCc" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/near) "kCe" = ( /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, @@ -80669,6 +81577,9 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "kCi" = ( @@ -80833,11 +81744,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/stairwell/engineering/deck_2) "kDq" = ( -/obj/structure/machinery/light, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 +/obj/structure/machinery/light/floor, +/obj/effect/floor_decal/corner/dark_blue{ + dir = 5 }, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "kDs" = ( /obj/effect/decal/fake_object{ @@ -80984,8 +81895,8 @@ "kEf" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/machinery/portable_atmospherics/powered/pump/filled, -/obj/structure/machinery/light/small{ - dir = 1 +/obj/structure/sign/air_station{ + pixel_y = 32 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/auxatmos) @@ -81035,6 +81946,12 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/weapons/grauwolf) +"kEE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/main/starboard) "kEG" = ( /obj/structure/machinery/door/blast/regular{ id = "exteriorpropulsionstarboard" @@ -81043,6 +81960,14 @@ /area/horizon/engineering/atmos/propulsion/starboard) "kEI" = ( /obj/random/junk, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "kEM" = ( @@ -81259,6 +82184,12 @@ }, /turf/unsimulated/floor, /area/centcom/legion/hangar5) +"kFV" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "kFZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -81464,6 +82395,16 @@ /obj/structure/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, /area/horizon/hangar/intrepid) +"kGJ" = ( +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/black{ + dir = 1 + }, +/obj/structure/machinery/light/floor, +/turf/simulated/floor/tiled/dark, +/area/horizon/engineering/break_room) "kGK" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -81478,7 +82419,7 @@ /obj/structure/machinery/door/airlock/maintenance_hatch{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard) "kGR" = ( /obj/structure/cable/green{ @@ -81805,10 +82746,10 @@ /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/port/nacelle) "kIR" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "kIS" = ( @@ -81816,7 +82757,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "kIT" = ( /obj/structure/grille, @@ -81898,13 +82839,13 @@ /area/horizon/holodeck/source_moghes) "kJG" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "kJK" = ( @@ -82143,14 +83084,8 @@ /turf/simulated/floor/tiled, /area/horizon/crew/fitness/gym) "kLq" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/structure/platform, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "kLr" = ( /obj/structure/cable/green{ @@ -82352,14 +83287,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "kMN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/material/shard, -/obj/structure/lattice/catwalk/indoor/grate/damaged{ - color = "#4c535b" +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/main/port) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/wing/starboard/far) "kMP" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -82418,7 +83352,17 @@ /area/horizon/rnd/test_range) "kNd" = ( /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = -2 + }, +/obj/item/trash/cigbutt{ + pixel_y = -12; + pixel_x = 7 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "kNj" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -82532,11 +83476,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "kOh" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/machinery/recharge_station, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/drone_fabrication) "kOq" = ( /obj/effect/floor_decal/spline/plain, @@ -82558,6 +83502,7 @@ dir = 8; pixel_x = 20 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/crewlounge) "kOs" = ( @@ -82696,6 +83641,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard) "kPR" = ( @@ -82933,12 +83881,15 @@ /obj/effect/landmark{ name = "Revenant" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/maintenance_junk_or_loot, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "kRR" = ( /obj/structure/machinery/door/blast/shutters/open{ @@ -82961,7 +83912,10 @@ /obj/structure/table/steel, /obj/random/loot, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "kRV" = ( /obj/structure/holostool, @@ -83003,7 +83957,7 @@ "kSk" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -83060,9 +84014,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, -/obj/structure/machinery/light{ - dir = 4 - }, /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -83472,7 +84423,9 @@ /turf/simulated/floor/plating, /area/horizon/operations/lobby) "kVr" = ( -/turf/simulated/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/structure/curtain/open/bar, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "kVs" = ( /obj/structure/bed/stool/padded/brown{ @@ -83599,7 +84552,7 @@ name = "airlock_horizon_deck_2_aft_sm" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/airlock) "kWk" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, @@ -83639,6 +84592,15 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/legion) +"kWH" = ( +/obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/redgrid, +/area/horizon/command/bridge/selfdestruct) "kWJ" = ( /obj/structure/machinery/camera/network/medbay{ c_tag = "Medical - Morgue Port"; @@ -83659,7 +84621,7 @@ }, /area/horizon/medical/morgue) "kWK" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -83788,7 +84750,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/unsimulated/floor/plating, @@ -83958,12 +84920,22 @@ }, /turf/simulated/floor, /area/horizon/command/bridge/meeting_room) +"kYu" = ( +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_3/aft/starboard/far) "kYw" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/random/canister/restricted, @@ -84116,7 +85088,7 @@ req_access = list(12); name = "Deck 2 Starboard Wingframe" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "kZl" = ( /obj/effect/floor_decal/corner/yellow{ @@ -84221,9 +85193,6 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "lad" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/atmospherics/pipe/simple/visible/universal{ dir = 8 @@ -84231,7 +85200,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "lae" = ( /obj/effect/floor_decal/corner/paleblue, @@ -84326,7 +85295,7 @@ dir = 8 }, /obj/structure/machinery/door/firedoor, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/near) "laM" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -84336,7 +85305,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark/cooled, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/upload) "laP" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/red{ @@ -84644,6 +85613,9 @@ /obj/random/junk, /obj/structure/table/rack, /obj/structure/grille/broken, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "lcT" = ( @@ -84800,7 +85772,8 @@ pixel_x = 20; pixel_y = 6 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port/docks) "ldC" = ( /obj/structure/machinery/door/airlock/external{ @@ -84812,7 +85785,7 @@ name = "airlock_horizon_deck_1_fore_1" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "ldE" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -84892,7 +85865,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "lec" = ( /obj/structure/trash_pile, @@ -85172,7 +86148,7 @@ /obj/effect/floor_decal/industrial/warning/full, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "lgc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/industrial/outline/grey, @@ -85186,6 +86162,9 @@ "lgd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/steel, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "lge" = ( @@ -85308,7 +86287,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "lgZ" = ( /obj/structure/railing/mapped, @@ -85394,6 +86373,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_3"; name = "airlock_horizon_dock_deck_3_starboard_3" }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_3/starboard/docks) "lhU" = ( @@ -85451,7 +86431,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "lir" = ( /obj/effect/floor_decal/corner_wide/lime{ @@ -85913,7 +86897,10 @@ }, /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "lkJ" = ( /obj/structure/closet/emcloset, @@ -86077,6 +87064,9 @@ pixel_x = -32; pixel_y = 32 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/simulated/floor, /area/horizon/command/bridge/aibunker) "llW" = ( @@ -86089,6 +87079,12 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/weapons/grauwolf) +"lme" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard) "lmo" = ( /obj/structure/machinery/atmospherics/unary/cryo_cell, /turf/simulated/floor/tiled, @@ -86157,11 +87153,16 @@ /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) +"lmS" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped, +/turf/simulated/open/airless, +/area/horizon/exterior/no_shields) "lmU" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -86319,6 +87320,18 @@ }, /turf/simulated/floor/tiled, /area/horizon/rnd/hallway/secondary) +"lnW" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/structure/machinery/light/floor{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/hangar/auxiliary) "lod" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/ladder/up{ @@ -86441,7 +87454,8 @@ "loS" = ( /obj/random/dirt_75, /obj/structure/machinery/firealarm/west, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/operations) "loZ" = ( /obj/effect/floor_decal/corner/brown/full{ @@ -86458,6 +87472,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, /area/shuttle/skipjack) +"lpj" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "lpm" = ( /obj/structure/sign/double/map/left{ desc = "A framed picture of a station."; @@ -86537,9 +87557,6 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/random/dirt_75, -/obj/random/maintenance_junk_or_loot, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "lpy" = ( @@ -86680,15 +87697,15 @@ output_level = 45000 }, /obj/structure/cable/yellow, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "lqg" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/dark_blue/full, -/obj/structure/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/machinery/light/floor, +/obj/effect/floor_decal/corner/dark_blue{ + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) @@ -86799,7 +87816,7 @@ name = "Deck 2 Starboard Wingframe"; req_one_access = list(12,31,67) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "lqJ" = ( /obj/structure/disposalpipe/segment{ @@ -86918,7 +87935,7 @@ "lrn" = ( /obj/structure/machinery/suit_storage_unit/standard_unit, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled/dark/full, @@ -87201,7 +88218,7 @@ "ltf" = ( /obj/random/tool, /obj/random/tech_supply, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "ltg" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -87224,6 +88241,18 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/service/hydroponics/hazard) +"ltn" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/structure/machinery/light/floor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/hangar/auxiliary) "ltq" = ( /obj/structure/sink{ dir = 8; @@ -87657,10 +88686,10 @@ /area/horizon/engineering/reactor/supermatter/mainchamber) "lwq" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 9 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/auxatmos) "lws" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 1 @@ -87729,7 +88758,7 @@ /turf/simulated/floor/tiled, /area/horizon/security/checkpoint2) "lxa" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume, @@ -87738,7 +88767,8 @@ master_tag = "airlock_horizon_dock_deck_3_port_2"; name = "airlock_horizon_dock_deck_3_port_2" }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "lxb" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -87967,7 +88997,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "lyH" = ( /obj/structure/machinery/firealarm/south, /obj/effect/floor_decal/corner_wide/yellow/full{ @@ -88030,8 +89060,12 @@ /turf/unsimulated/floor/plating, /area/antag/mercenary) "lzd" = ( +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/auxatmos) +/area/horizon/maintenance/deck_2/wing/port/far) "lze" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-2-f" @@ -88062,7 +89096,7 @@ "lzr" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/random/canister/empty, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "lzv" = ( /obj/effect/floor_decal/spline/plain/corner{ @@ -88216,7 +89250,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) "lAs" = ( /obj/effect/step_trigger/thrower/shuttle/north, @@ -88464,11 +89498,18 @@ }, /turf/unsimulated/floor/rubber_carpet, /area/centcom/control) -"lCd" = ( +"lCc" = ( +/obj/random/dirt_75, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, /turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/starboard/far) +"lCd" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "lCj" = ( /obj/structure/railing/mapped{ @@ -88504,6 +89545,9 @@ /obj/effect/decal/cleanable/cobweb, /obj/structure/machinery/vending/engivend/low_supply, /obj/effect/floor_decal/industrial/hatch/engineering, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "lCB" = ( @@ -88623,7 +89667,7 @@ req_access = list(13) }, /obj/structure/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/security/checkpoint2) "lDo" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ @@ -88671,7 +89715,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/machinery/light/small/emergency, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -88840,6 +89883,9 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "lEw" = ( @@ -88870,7 +89916,7 @@ /area/horizon/engineering/hallway/interior) "lED" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/machinery/portable_atmospherics/canister/hydrogen, @@ -88965,14 +90011,13 @@ /turf/simulated/floor/tiled/full, /area/horizon/engineering/hallway/interior) "lFe" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/obj/random/maintenance_junk_or_loot, +/obj/random/dirt_75, +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/starboard/far) "lFp" = ( /obj/structure/bed/stool/chair/unmovable, /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -89052,11 +90097,11 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/light/small/emergency{ name = "broken light"; status = 2 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) "lGc" = ( @@ -89331,7 +90376,7 @@ dir = 4 }, /obj/structure/platform/ledge, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "lHY" = ( /obj/structure/disposalpipe/segment{ @@ -89445,7 +90490,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "lID" = ( /obj/structure/cable/green{ @@ -89623,9 +90668,15 @@ /turf/unsimulated/floor/monotile, /area/antag/mercenary) "lJz" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/full, -/area/horizon/hallway/primary/deck_2/central) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/shuttle/intrepid/main_compartment) "lJB" = ( /obj/structure/tank_wall/nitrogen{ density = 0; @@ -89779,22 +90830,17 @@ icon_state = "1-2" }, /obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/machinery/hologram/holopad/long_range, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "lKn" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_stairs/south_north_solo, /obj/structure/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/plating, +/obj/structure/platform{ + dir = 8 + }, +/turf/simulated/floor/tiled/ramp/bottom, /area/horizon/maintenance/deck_2/wing/starboard/near) "lKo" = ( /turf/simulated/wall, @@ -89834,9 +90880,6 @@ pixel_x = -28; pixel_y = -10 }, -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, /turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/aibunker) "lKy" = ( @@ -89850,7 +90893,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/security/port) @@ -89874,7 +90917,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -89893,6 +90936,7 @@ c_tag = "Engineering - Deck 2 - Engineering Substation"; dir = 8 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering) "lKF" = ( @@ -89948,7 +90992,9 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/monitoring) "lKW" = ( -/turf/simulated/floor/tiled, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "lKZ" = ( /obj/structure/railing/mapped, @@ -89980,7 +91026,7 @@ req_access = list(1); dir = 4 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/security/interrogation/monitoring) "lLe" = ( /obj/effect/floor_decal/spline/plain/mauve, @@ -90059,7 +91105,7 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/rnd/xenoarch/spectrometry) "lLQ" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/window/reinforced/crescent{ dir = 8 }, @@ -90086,7 +91132,7 @@ }, /area/centcom/control) "lMe" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume, @@ -90095,6 +91141,7 @@ master_tag = "airlock_horizon_deck_1_aft_port_1"; name = "airlock_horizon_deck_1_aft_port_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "lMg" = ( @@ -90174,7 +91221,7 @@ dir = 4 }, /turf/space, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "lMB" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/purple, /obj/structure/lattice/catwalk/indoor, @@ -90292,6 +91339,7 @@ dir = 8 }, /obj/random/dirt_75, +/obj/structure/trash_pile, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "lNC" = ( @@ -90302,11 +91350,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "lNG" = ( /obj/structure/disposalpipe/segment{ @@ -90662,7 +91710,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -90875,7 +91922,7 @@ }, /obj/effect/map_effect/map_helper/ruler_tiles_3, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "lTr" = ( /obj/structure/window/reinforced/holowindow{ dir = 4 @@ -90936,7 +91983,7 @@ /obj/effect/map_effect/map_helper/ruler_tiles_3, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "lTO" = ( /obj/structure/machinery/door/firedoor{ dir = 4 @@ -90967,7 +92014,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "lTW" = ( /turf/simulated/floor/holofloor/desert{ @@ -91048,13 +92095,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "lUN" = ( +/obj/random/dirt_75, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/main/starboard) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/starboard/far) "lUT" = ( /obj/effect/floor_decal/spline/plain/mauve, /obj/structure/window/reinforced, @@ -91095,10 +92141,10 @@ /turf/simulated/wall, /area/horizon/security/firing_range) "lVK" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/machinery/light/floor{ dir = 8 }, -/obj/structure/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos) "lVP" = ( @@ -91178,15 +92224,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/central) "lWb" = ( -/obj/random/junk, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 1 - }, /obj/structure/platform{ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "lWf" = ( /obj/structure/table/wood, @@ -91293,7 +92336,7 @@ name = "Deck 3 Civilian Substation"; req_one_access = list(11,24) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/civ_d3) "lWO" = ( /obj/structure/bed/stool/chair, @@ -91495,14 +92538,17 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "lYo" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/railing/mapped{ dir = 4 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "lYq" = ( /obj/structure/sign/fire{ @@ -91511,16 +92557,18 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "lYr" = ( /obj/random/junk, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "lYv" = ( /obj/structure/cable/green{ @@ -91721,6 +92769,12 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenoarch/hallway/hangar) +"lZu" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "lZy" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 @@ -91895,6 +92949,10 @@ /area/antag/raider) "maS" = ( /obj/structure/machinery/alarm/south, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/security) "maY" = ( @@ -92052,7 +93110,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/dark/full, @@ -92276,7 +93334,8 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_2"; name = "airlock_horizon_dock_deck_3_starboard_2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard/docks) "mdN" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -92377,11 +93436,9 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/medical/morgue) "meo" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 10 - }, /obj/structure/machinery/hologram/holopad, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/break_room) "mep" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -92475,7 +93532,11 @@ }, /area/centcom/legion/hangar5) "meP" = ( -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "meU" = ( /obj/effect/floor_decal/spline/plain{ @@ -92499,6 +93560,14 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/brig) +"mfb" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 4 + }, +/area/horizon/maintenance/deck_1/wing/starboard/far) "mfe" = ( /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) @@ -92611,7 +93680,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "mfZ" = ( /obj/structure/cable/green{ @@ -92759,7 +93828,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenoarch/atrium) "mgM" = ( -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/horizon/storage/secure/tech_vault) "mgN" = ( /obj/effect/landmark/entry_point/port{ @@ -92887,7 +93956,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "mho" = ( /obj/structure/machinery/access_button{ dir = 1; @@ -93240,7 +94309,7 @@ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port) "mji" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -93368,8 +94437,9 @@ /area/centcom/ferry) "mjX" = ( /obj/structure/machinery/alarm/west, -/obj/structure/girder, -/turf/simulated/floor/plating, +/obj/structure/machinery/floodlight, +/obj/effect/floor_decal/industrial/outline/operations, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard) "mka" = ( /obj/structure/machinery/firealarm/south, @@ -93384,6 +94454,7 @@ /area/antag/raider) "mkh" = ( /obj/structure/machinery/alarm/north, +/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "mki" = ( @@ -93459,7 +94530,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/turbine) "mkO" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/effect/decal/cleanable/dirt, @@ -93618,9 +94689,6 @@ name = "Powernet Sensor - Shield Subgrid"; name_tag = "Shield Subgrid" }, -/obj/structure/machinery/light{ - dir = 8 - }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/shields) "mmk" = ( @@ -93935,6 +95003,14 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard/far) +"mor" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/closet/crate, +/obj/random/softcap, +/obj/random/toolbox, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard) "moz" = ( /obj/structure/machinery/atmospherics/binary/pump{ dir = 8; @@ -93943,15 +95019,10 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "moG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/operations) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/operations/starboard) "moI" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -93982,7 +95053,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "moQ" = ( /obj/structure/table/rack, @@ -93991,7 +95062,7 @@ dir = 4 }, /obj/random/dirt_75, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "moS" = ( /obj/structure/table/stone/marble, @@ -94305,9 +95376,14 @@ /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) "mrf" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/trash_pile, -/turf/simulated/floor/plating, +/obj/structure/platform{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/bed/stool/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "mrg" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/red{ @@ -94500,7 +95576,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "msp" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -94589,7 +95665,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/machinery/atmospherics/pipe/manifold/visible/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, @@ -94663,7 +95739,7 @@ "mtA" = ( /obj/effect/floor_decal/industrial/warning, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "mtC" = ( /obj/structure/machinery/meter{ @@ -94733,7 +95809,7 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/effect/map_effect/marker/airlock{ @@ -94751,7 +95827,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "muo" = ( @@ -94947,13 +96023,9 @@ /turf/simulated/floor, /area/horizon/command/heads/captain) "mvt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/service/starboard) +/obj/structure/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/primary/deck_2/central) "mvv" = ( /obj/structure/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 @@ -95004,6 +96076,14 @@ /obj/structure/target_stake, /turf/simulated/floor/tiled/dark/full, /area/horizon/security/firing_range) +"mvR" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/structure/machinery/atmospherics/unary/vent_pump/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/command/bridge/selfdestruct) "mvS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -95023,7 +96103,7 @@ dir = 9 }, /obj/random/dirt_75, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "mvW" = ( /obj/structure/cable/green{ @@ -95177,7 +96257,8 @@ /obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/structure/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "mxb" = ( /obj/structure/cable{ @@ -95235,7 +96316,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "mxv" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -95524,7 +96605,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "mzC" = ( /obj/structure/cable/green{ @@ -95552,7 +96633,10 @@ "mzX" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "mzY" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux, @@ -95581,18 +96665,15 @@ /area/horizon/stairwell/port/deck_2) "mAe" = ( /obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "mAg" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor, @@ -95649,7 +96730,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/port/far) "mAK" = ( /turf/simulated/floor/airless, @@ -95848,7 +96929,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -95859,10 +96940,8 @@ /area/horizon/command/bridge/controlroom) "mCw" = ( /obj/structure/railing/mapped, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/open, /area/horizon/maintenance/deck_2/main/starboard) "mCx" = ( /obj/effect/floor_decal/corner/dark_green/full{ @@ -95891,7 +96970,7 @@ /turf/simulated/floor/tiled/full, /area/horizon/operations/commissary) "mCO" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -96004,7 +97083,7 @@ dir = 5 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -96041,6 +97120,17 @@ }, /turf/simulated/floor/plating, /area/horizon/service/hydroponics/lower) +"mEa" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/platform_deco{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/wing/starboard/far) "mEd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -96066,14 +97156,10 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/tcommsat/chamber) "mEk" = ( -/obj/structure/machinery/porta_turret/stationary, -/obj/effect/floor_decal/industrial/warning/full, -/obj/structure/machinery/camera/motion{ - c_tag = "Scuttling Device"; - network = list("Command","Security") - }, -/turf/simulated/floor/reinforced, -/area/horizon/command/bridge/selfdestruct) +/obj/effect/floor_decal/spline/plain/black, +/obj/structure/machinery/hologram/holopad, +/turf/simulated/floor/tiled/dark, +/area/horizon/service/bar) "mEo" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/operations, @@ -96090,7 +97176,10 @@ /obj/structure/table/steel, /obj/random/junk, /obj/random/contraband, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "mEq" = ( /obj/structure/machinery/light_switch/east{ @@ -96206,6 +97295,9 @@ /obj/structure/table/reinforced/steel, /obj/random/contraband, /obj/random/contraband, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "mEZ" = ( @@ -96502,12 +97594,12 @@ /turf/unsimulated/floor/plating, /area/centcom/legion) "mGA" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, /obj/structure/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "mGB" = ( /obj/structure/machinery/button/remote/blast_door{ @@ -96547,7 +97639,7 @@ dir = 4; req_one_access = list(5,10,12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "mGV" = ( /obj/effect/landmark/entry_point/port{ @@ -96585,6 +97677,9 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/operations/commissary) "mHc" = ( @@ -96739,7 +97834,7 @@ "mHX" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/machinery/alarm/north, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor, @@ -96803,7 +97898,7 @@ /obj/effect/floor_decal/industrial/hatch_door/engineering{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/elevator) "mIC" = ( /obj/effect/floor_decal/industrial/hatch_door/red, @@ -96831,7 +97926,7 @@ "mIH" = ( /obj/random/junk, /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "mIQ" = ( /obj/effect/floor_decal/corner/dark_blue/full, @@ -96993,7 +98088,7 @@ name = "airlock_horizon_deck_1_fore_1" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "mKj" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -97260,7 +98355,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/engineering/drone_fabrication) "mMa" = ( @@ -97445,7 +98540,8 @@ /area/horizon/engineering/atmos/storage) "mMO" = ( /obj/random/junk, -/obj/structure/machinery/light/small/emergency{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -97514,10 +98610,13 @@ /turf/unsimulated/floor, /area/centcom/bar) "mNb" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "mNc" = ( @@ -97583,7 +98682,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "mNu" = ( /obj/effect/floor_decal/industrial/warning{ @@ -97921,7 +99020,6 @@ }, /area/shuttle/legion) "mQw" = ( -/obj/structure/lattice/catwalk, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -97931,6 +99029,7 @@ /obj/structure/cable/green{ icon_state = "11-4" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/open, /area/horizon/maintenance/deck_2/wing/starboard/far) "mQz" = ( @@ -97962,7 +99061,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/radiation, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "mRn" = ( /obj/structure/platform/ledge, @@ -98030,16 +99129,17 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_1"; name = "airlock_horizon_dock_deck_3_starboard_1" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard/docks) "mRS" = ( /obj/structure/table/steel, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "mRU" = ( /obj/structure/window/reinforced{ @@ -98376,8 +99476,10 @@ /turf/simulated/floor/shuttle/black, /area/centcom/specops) "mUv" = ( -/obj/effect/floor_decal/industrial/warning, /obj/structure/trash_pile, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "mUw" = ( @@ -98441,10 +99543,7 @@ /obj/structure/window/borosilicate/reinforced/skrell{ dir = 1 }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/bluegrid, /area/horizon/ai/chamber) "mVm" = ( /obj/structure/railing/mapped, @@ -98581,7 +99680,7 @@ name = "airlock_horizon_deck_1_aft_port_1" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "mWm" = ( /obj/effect/map_effect/window_spawner/full/reinforced/indestructible, @@ -98808,7 +99907,7 @@ "mYc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/alarm/east, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/maintenance_junk_or_loot, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port) @@ -98816,6 +99915,7 @@ /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "mYf" = ( @@ -98891,7 +99991,7 @@ /area/horizon/hangar/intrepid) "mYt" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/reagent_dispensers/fueltank, @@ -98990,10 +100090,10 @@ /area/centcom/specops) "mYY" = ( /obj/structure/machinery/alarm/north, -/obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "mZa" = ( @@ -99035,7 +100135,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/medical/cryo) "mZg" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -99043,7 +100142,8 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/wood, @@ -99118,12 +100218,11 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_3"; name = "airlock_horizon_dock_deck_3_starboard_3" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "mZz" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/operations) "mZB" = ( /obj/effect/floor_decal/industrial/hatch_door/yellow{ @@ -99346,19 +100445,18 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/crew/lounge) -"naR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) "naT" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced, -/area/horizon/command/bridge/selfdestruct) +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/starboard/far) "naU" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -99383,8 +100481,7 @@ /area/horizon/medical/hallway/upper) "nbn" = ( /obj/structure/railing/mapped, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "nbp" = ( /obj/effect/decal/cleanable/dirt, @@ -99398,7 +100495,8 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/open, /area/horizon/medical/gen_treatment) "nbt" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/black{ @@ -99574,7 +100672,7 @@ req_one_access = list(24,11,67,73); dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "ncM" = ( /obj/structure/machinery/mech_recharger, @@ -99795,6 +100893,9 @@ /obj/item/modular_computer/laptop/preset/medical{ pixel_y = 11 }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/simulated/floor/wood, /area/horizon/medical/psych) "ndF" = ( @@ -99805,11 +100906,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/controlroom) "ndG" = ( -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/random/dirt_75, /obj/structure/machinery/portable_atmospherics/canister/empty/carbon_dioxide, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "ndK" = ( /obj/effect/floor_decal/industrial/warning{ @@ -99936,6 +101039,13 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) +"new" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/wing/starboard/far) "nez" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -100074,12 +101184,17 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "nfe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "nfp" = ( @@ -100121,18 +101236,21 @@ /area/horizon/maintenance/deck_1/wing/starboard) "nfw" = ( /obj/structure/platform, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "nfy" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/obj/structure/machinery/vending/cigarette/horizon, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/service/starboard) "nfD" = ( /obj/structure/machinery/door/airlock/maintenance{ @@ -100173,6 +101291,7 @@ name_tag = "Deck 3 Command Subgrid" }, /obj/structure/cable/green, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "nfW" = ( @@ -100180,7 +101299,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/junk, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/contraband, @@ -100210,16 +101329,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped, /obj/structure/trash_pile, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "ngz" = ( /obj/effect/floor_decal/industrial/warning{ @@ -100348,7 +101463,7 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "nha" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ @@ -100391,7 +101506,7 @@ frequency = 1109; req_one_access = list(19) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/ai/upload_foyer) "nho" = ( /obj/structure/machinery/firealarm/west, @@ -100417,10 +101532,12 @@ /turf/unsimulated/floor/rubber_carpet, /area/centcom/control) "nid" = ( -/obj/effect/floor_decal/industrial/warning, /obj/structure/machinery/alarm/north, /obj/structure/closet/crate/bin, /obj/random/loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "nig" = ( @@ -100576,6 +101693,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/port/far) "njg" = ( @@ -100650,9 +101770,6 @@ /obj/structure/platform/ledge/dark{ dir = 8 }, -/obj/structure/railing/mapped{ - dir = 4 - }, /turf/simulated/open, /area/horizon/maintenance/deck_2/cryo) "nku" = ( @@ -100707,7 +101824,7 @@ icon_state = "4-8" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -101028,7 +102145,7 @@ name = "airlock_horizon_deck_1_aft_propulsion_2" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion) "nmz" = ( /obj/structure/machinery/atmospherics/portables_connector, @@ -101066,7 +102183,7 @@ /area/horizon/engineering/atmos/storage) "nmJ" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -101445,6 +102562,9 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "nqw" = ( @@ -101528,7 +102648,7 @@ "nrf" = ( /obj/effect/floor_decal/industrial/warning, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/port/nacelle) "nri" = ( /obj/effect/floor_decal/industrial/hatch/red, @@ -101667,7 +102787,8 @@ /obj/structure/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "nsp" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, @@ -101726,6 +102847,12 @@ /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/plating, /area/shuttle/mercenary) +"nsQ" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/main/starboard) "nsR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -101778,12 +102905,17 @@ master_tag = "airlock_horizon_deck_2_port_1"; name = "airlock_horizon_deck_2_port_1" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "ntf" = ( /obj/effect/floor_decal/corner/dark_blue, /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation/monitoring) +"nti" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/main/starboard) "ntp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -101832,10 +102964,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/bluegrid, /area/horizon/ai/chamber) "ntv" = ( /obj/structure/cable{ @@ -101891,7 +103020,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor, @@ -102262,12 +103391,9 @@ /turf/simulated/floor/reinforced, /area/shuttle/hapt) "nwM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/operations/starboard) "nwN" = ( /turf/simulated/floor/holofloor/grass{ dir = 8; @@ -102316,9 +103442,7 @@ c_tag = "Engineering - Deck 1 - Security Substation"; dir = 8 }, -/obj/structure/machinery/light/small{ - dir = 4 - }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/security) "nxb" = ( @@ -102327,7 +103451,13 @@ no_cargo = 1 }, /obj/random/firstaid, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "nxd" = ( /obj/structure/machinery/door/airlock/centcom{ @@ -102413,13 +103543,19 @@ "nxT" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/command/heads/rd) +"nxU" = ( +/obj/structure/trash_pile, +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard) "nxW" = ( /turf/simulated/wall/shuttle/hapt/blue, /area/shuttle/hapt) "nxZ" = ( -/obj/structure/lattice/catwalk/indoor, /obj/structure/railing/mapped, /obj/structure/machinery/alarm/north, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/research) "nyc" = ( @@ -102598,13 +103734,13 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/command/bridge/controlroom) "nzh" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "nzj" = ( /obj/structure/disposalpipe/segment, @@ -102718,7 +103854,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "nzX" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -103101,7 +104237,7 @@ dir = 1 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "nCI" = ( /obj/structure/machinery/camera/network/service{ c_tag = "Service - Chapel Storage"; @@ -103348,14 +104484,14 @@ /area/horizon/command/bridge/minibar) "nDP" = ( /obj/structure/machinery/recharge_station, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/ai/upload_foyer) "nDQ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) "nDR" = ( /obj/structure/machinery/cryopod, @@ -103388,19 +104524,12 @@ /turf/simulated/floor/tiled/dark, /area/horizon/storage/eva) "nED" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/random/maintenance_junk_or_loot, +/obj/structure/machinery/light/small{ + dir = 8 }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/far) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/nacelle) "nEE" = ( /obj/effect/floor_decal/industrial/hatch_door/engineering{ dir = 1 @@ -103475,8 +104604,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) @@ -103640,7 +104769,7 @@ /area/horizon/security/brig) "nFV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/lattice/catwalk/indoor/grate/old, /turf/unsimulated/floor/plating, /area/antag/raider) @@ -103675,8 +104804,10 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "nFZ" = ( -/obj/item/stack/tile/floor, -/turf/simulated/floor/tiled, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/tile/floor_dark, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "nGb" = ( /obj/structure/lattice/catwalk, @@ -103687,12 +104818,12 @@ dir = 8 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "nGe" = ( /obj/structure/window/reinforced/crescent, /obj/effect/decal/cleanable/dirt, /obj/structure/table/steel, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/floor_decal/corner/grey{ @@ -103905,7 +105036,7 @@ /obj/structure/machinery/door/airlock/maintenance{ req_one_access = list(12,19) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "nHo" = ( /obj/structure/window/shuttle/unique/scc/scout{ @@ -103922,9 +105053,13 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/security_port) "nHy" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "nHB" = ( @@ -104117,7 +105252,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor, @@ -104519,16 +105654,15 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "nLp" = ( -/obj/structure/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_2/central) "nLs" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) @@ -104749,7 +105883,7 @@ master_tag = "airlock_horizon_deck_1_aft_propulsion_1"; name = "airlock_horizon_deck_1_aft_propulsion_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion/starboard) "nMN" = ( /obj/structure/sign/directions/security{ @@ -104828,14 +105962,10 @@ /area/template_noop) "nNG" = ( /obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_deco{ - dir = 9 - }, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/canister/restricted, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "nNH" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -105077,6 +106207,11 @@ }, /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) +"nPv" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/canister/restricted, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_3/security/port) "nPx" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -105101,6 +106236,7 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/elevator) "nPH" = ( @@ -105409,7 +106545,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "nRx" = ( /obj/structure/shuttle_part/mercenary/small{ icon_state = "2,0" @@ -105589,6 +106725,7 @@ "nTg" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/alarm/east, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/research) "nTj" = ( @@ -105607,7 +106744,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenoarch/atrium) "nTn" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/bed/stool/chair{ @@ -105818,15 +106955,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway) "nUL" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, -/obj/item/trash/cigbutt{ - pixel_y = -12; - pixel_x = 7 - }, -/obj/item/trash/cigbutt/cigarbutt{ - pixel_x = -2 - }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port/shortcut) "nUN" = ( @@ -105954,11 +107083,11 @@ /area/shuttle/burglar) "nVI" = ( /obj/effect/floor_decal/corner/brown/diagonal, -/obj/structure/machinery/light/spot{ - dir = 1 - }, /obj/structure/closet/lasertag, /obj/effect/floor_decal/industrial/outline/red, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control) "nVR" = ( @@ -105993,6 +107122,7 @@ /obj/random/dirt_75, /obj/random/junk, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "nWe" = ( @@ -106028,8 +107158,8 @@ c_tag = "Engineering - Deck 2 - Starboard Auxiliary Atmospherics"; dir = 1 }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "nWp" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -106041,12 +107171,16 @@ /area/horizon/security/checkpoint2) "nWM" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/machinery/hologram/holopad, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "nWN" = ( @@ -106091,7 +107225,7 @@ /area/horizon/rnd/xenological) "nWT" = ( /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "nXb" = ( @@ -106119,7 +107253,12 @@ /area/horizon/rnd/hallway) "nXe" = ( /obj/effect/decal/cleanable/dirt, -/obj/random/maintenance_junk_or_loot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/random/pottedplant_small{ + pixel_x = 2; + pixel_y = 2 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "nXf" = ( @@ -106151,6 +107290,13 @@ /obj/structure/stairs/north, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) +"nXu" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/platform_deco{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/wing/starboard/far) "nXx" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/machinery/light/small{ @@ -106185,7 +107331,7 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "nXS" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -106242,7 +107388,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/disposalpipe/segment, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor, @@ -106332,6 +107478,9 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "nZa" = ( @@ -106534,9 +107683,6 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard) "oaF" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -106638,6 +107784,15 @@ /obj/random/maintenance_junk_or_loot, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) +"obv" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 6 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_1/central) "obw" = ( /obj/structure/table/stone/marble, /obj/item/reagent_containers/glass/rag/advanced/idris{ @@ -106712,6 +107867,7 @@ pixel_x = 20; pixel_y = 6 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_3/starboard/docks) "obN" = ( @@ -107052,7 +108208,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "odX" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -107169,7 +108328,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/legion) "oey" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/table/rack, /obj/effect/map_effect/mecha_part_spawner/propulsion, /obj/effect/floor_decal/industrial/outline/yellow, @@ -107537,6 +108696,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/machinery/light/floor{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/aibunker) "ogv" = ( @@ -107557,7 +108719,7 @@ name = "airlock_horizon_deck_1_aft_port_1" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "ogy" = ( /obj/structure/table/reinforced/steel, @@ -107749,9 +108911,6 @@ /area/horizon/engineering/break_room) "ohZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ - dir = 1 - }, /obj/structure/bed/stool/chair, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) @@ -108038,10 +109197,10 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/surgery) "ojv" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "ojI" = ( @@ -108120,18 +109279,30 @@ /turf/simulated/floor/plating, /area/merchant_station/warehouse) "okz" = ( -/obj/structure/cable{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_1/main/port/shortcut) +/turf/simulated/floor/tiled/full, +/area/horizon/rnd/hallway) "okF" = ( /obj/structure/machinery/portable_atmospherics/canister/air/airlock, /obj/structure/machinery/atmospherics/portables_connector{ dir = 1 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "okI" = ( /obj/structure/cable/green{ @@ -108187,7 +109358,8 @@ /turf/simulated/wall, /area/horizon/security/meeting_room) "olm" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_3/aft/starboard/far) "oln" = ( /obj/structure/toilet{ @@ -108372,7 +109544,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/hangar/airstation) "omI" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/service, @@ -108388,7 +109560,8 @@ master_tag = "airlock_horizon_dock_deck_3_port_4"; name = "airlock_horizon_dock_deck_3_port_4" }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "omQ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -108775,6 +109948,7 @@ /obj/structure/lattice/catwalk/indoor/grate/damaged{ color = "#4c535b" }, +/obj/item/pen, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "opn" = ( @@ -108782,7 +109956,7 @@ /turf/simulated/floor/bluegrid, /area/horizon/tcommsat/chamber) "opo" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/unsimulated/floor/plating, @@ -108805,12 +109979,12 @@ icon_state = "1-4" }, /obj/structure/machinery/power/apc/hyper/south, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 1 - }, /obj/structure/railing/mapped{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "opE" = ( @@ -109319,8 +110493,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "osD" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -109374,7 +110548,7 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/operations) "osX" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate/damaged{ @@ -109497,6 +110671,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering/lower) "otK" = ( @@ -109663,7 +110841,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -109808,7 +110986,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) "ovV" = ( /obj/structure/bed/stool/chair{ @@ -109919,7 +111097,7 @@ /area/shuttle/merchant) "owF" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/cable{ @@ -109937,11 +111115,9 @@ /turf/simulated/floor/tiled/gunmetal, /area/horizon/operations/warehouse) "owI" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 - }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "owJ" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -109997,6 +111173,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/main_compartment) "oxe" = ( @@ -110020,7 +111199,10 @@ no_cargo = 1 }, /obj/random/gloves, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "oxq" = ( /obj/structure/bed/stool/chair/shuttle, @@ -110083,6 +111265,12 @@ "oxM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/alarm/north, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) "oxQ" = ( @@ -110093,7 +111281,7 @@ name = "airlock_horizon_deck_2_aft_sm" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/airlock) "oxR" = ( /obj/effect/floor_decal/industrial/hatch/red, @@ -110141,6 +111329,9 @@ "oyp" = ( /obj/structure/machinery/vending/cigarette/horizon, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "oyq" = ( @@ -110167,9 +111358,9 @@ /area/horizon/command/heads/cmo) "oyv" = ( /obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/canister/empty, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "oyz" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, @@ -110282,7 +111473,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/fore) "ozq" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "ozr" = ( @@ -110353,7 +111544,6 @@ /turf/simulated/floor/tiled, /area/horizon/rnd/hallway/secondary) "ozK" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -110425,6 +111615,10 @@ /area/horizon/security/investigations_hallway) "oAd" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/machinery/meter, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "oAe" = ( @@ -110576,6 +111770,9 @@ dir = 4 }, /obj/item/radio/intercom/south, +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "oBl" = ( @@ -110618,6 +111815,7 @@ /area/shuttle/legion) "oBz" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "oBD" = ( @@ -110761,6 +111959,9 @@ /obj/structure/machinery/power/breakerbox/activated{ RCon_tag = "Engineering Lower Deck Substation" }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering/lower) "oCI" = ( @@ -110800,7 +112001,7 @@ /obj/random/dirt_75, /obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "oCR" = ( /obj/structure/disposalpipe/segment, @@ -111307,11 +112508,12 @@ /turf/simulated/floor/tiled, /area/horizon/operations/machinist) "oGs" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 10 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/wing/starboard/far) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/main/starboard) "oGt" = ( /obj/structure/machinery/door/airlock/glass{ dir = 1; @@ -111366,11 +112568,13 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "oGP" = ( /obj/structure/cable/green{ @@ -111508,7 +112712,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, /obj/random/loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "oHG" = ( /obj/structure/railing/mapped{ @@ -111809,9 +113013,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/railing/mapped, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "oJM" = ( @@ -111910,7 +113115,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_1"; name = "airlock_horizon_dock_deck_3_starboard_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "oKh" = ( /obj/structure/railing/mapped, @@ -111996,8 +113201,8 @@ /area/shuttle/transport1) "oKI" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "oKM" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -112346,8 +113551,11 @@ /area/horizon/engineering/atmos/propulsion/starboard) "oMH" = ( /obj/random/junk, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "oMK" = ( /obj/effect/decal/fake_object{ @@ -112531,7 +113739,7 @@ dir = 4; req_one_access = list(5,12) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard) "oNN" = ( /turf/simulated/floor/holofloor/wood, @@ -112565,7 +113773,7 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "oOg" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -112656,9 +113864,11 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenoarch/atrium) "oOz" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "oOI" = ( /obj/structure/table/reinforced/steel, @@ -112763,13 +113973,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/central) "oPC" = ( -/obj/structure/machinery/door/window/eastright{ - dir = 1 - }, /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "oPE" = ( @@ -112797,7 +114006,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/random/maintenance_junk_or_loot, @@ -112806,7 +114015,10 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/cargo_compartment) "oPN" = ( -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "oPO" = ( /obj/structure/machinery/door/airlock/maintenance_hatch{ @@ -112880,9 +114092,6 @@ /area/horizon/service/cafeteria) "oQp" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ - dir = 4 - }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_3/aft/starboard/far) "oQu" = ( @@ -112969,10 +114178,7 @@ "oRf" = ( /obj/structure/machinery/porta_turret, /obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "oRi" = ( /obj/effect/floor_decal/corner/red{ @@ -113037,6 +114243,7 @@ "oRC" = ( /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "oRD" = ( @@ -113406,10 +114613,10 @@ no_cargo = 1 }, /obj/random/lavalamp, -/obj/structure/machinery/light/small/emergency{ - dir = 4 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "oTp" = ( /turf/simulated/floor/wood, @@ -113435,6 +114642,7 @@ /obj/random/loot, /obj/random/bandana, /obj/random/firstaid, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "oTJ" = ( @@ -113513,6 +114721,9 @@ dir = 8 }, /obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) "oUg" = ( @@ -113568,8 +114779,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/medical/paramedic) "oUx" = ( -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_3/security/port) +/obj/random/maintenance_junk_or_loot, +/obj/structure/platform, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/operations/starboard) "oUB" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -113955,11 +115168,11 @@ /turf/simulated/floor/tiled/full, /area/horizon/hangar/operations) "oXf" = ( -/obj/effect/floor_decal/industrial/warning/corner, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/operations) "oXi" = ( /obj/effect/floor_decal/industrial/hatch_door/red, @@ -113995,7 +115208,7 @@ dir = 4 }, /obj/structure/machinery/floodlight, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "oXq" = ( /obj/structure/machinery/door/firedoor{ @@ -114120,11 +115333,8 @@ /turf/simulated/floor/tiled/gunmetal, /area/horizon/operations/ship_supply_warehouse) "oXN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/random/tool, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "oXX" = ( /obj/structure/cable/green{ @@ -114150,7 +115360,8 @@ "oYa" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "oYb" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -114270,7 +115481,7 @@ /obj/effect/floor_decal/industrial/warning/cee, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/central_ring) "oYW" = ( /obj/structure/machinery/door/window/southleft{ @@ -114290,7 +115501,7 @@ /area/horizon/shuttle/canary) "oZl" = ( /obj/structure/lattice/catwalk/indoor, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/unsimulated/floor/plating, @@ -114377,7 +115588,7 @@ /area/horizon/command/bridge/upperdeck) "oZW" = ( /obj/structure/trash_pile, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/dirt_75, @@ -114398,7 +115609,11 @@ /turf/simulated/floor/plating, /area/horizon/operations/break_room) "oZY" = ( -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "pai" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -114419,7 +115634,7 @@ /turf/simulated/floor/tiled, /area/horizon/crew/fitness/changing) "pan" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -114535,7 +115750,7 @@ name = "Cryogenics Control Room"; req_access = list(66) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "pbg" = ( /obj/effect/floor_decal/spline/plain/yellow{ @@ -114606,8 +115821,11 @@ /turf/simulated/open, /area/horizon/medical/gen_treatment) "pbN" = ( -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/machinery/disposal/small/east, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, /area/horizon/command/heads/chief) "pbO" = ( @@ -114639,6 +115857,7 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "pcg" = ( @@ -114677,6 +115896,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/research) "pcJ" = ( @@ -114899,14 +116119,17 @@ /obj/structure/machinery/power/breakerbox/activated{ RCon_tag = "Research Substation" }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/research) "peq" = ( /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) "pet" = ( @@ -115015,7 +116238,10 @@ "peN" = ( /obj/structure/trash_pile, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "peQ" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -115115,6 +116341,9 @@ dir = 8; c_tag = "Operations - Supply Corridor Aft" }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/operations) "pfp" = ( @@ -115222,7 +116451,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "pfP" = ( /obj/structure/cable{ @@ -115232,6 +116461,9 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/engineering/storage/lower) "pfT" = ( @@ -115870,7 +117102,10 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "pkh" = ( /obj/item/aiModule/conglomerate, @@ -116280,7 +117515,7 @@ pixel_y = 6 }, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -116305,11 +117540,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "pnw" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/landmark{ + name = "Revenant" }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/far) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard/near) "pnD" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -116702,14 +117937,30 @@ /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_3/security/port) "pqm" = ( -/turf/simulated/floor/reinforced, +/obj/structure/sign/flag/scc{ + pixel_x = 32 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "pqn" = ( /obj/structure/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "pqv" = ( /obj/effect/decal/cleanable/dirt, @@ -116765,18 +118016,6 @@ /obj/structure/stairs/north, /turf/simulated/floor/tiled, /area/horizon/operations/loading) -"prj" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 10 - }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/medical/hallway) "prm" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -116814,7 +118053,7 @@ /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -116993,6 +118232,12 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/mainchamber) +"psu" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "psv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -117036,7 +118281,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "psD" = ( /obj/structure/machinery/door/airlock/external{ @@ -117296,7 +118541,7 @@ }, /obj/structure/table/wood, /obj/random/contraband, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "puG" = ( /obj/effect/floor_decal/corner_wide/paleblue/diagonal{ @@ -117361,13 +118606,6 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/security/investigations_hallway) -"puX" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/structure/grille, -/turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) "pva" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -117393,7 +118631,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "pvl" = ( /obj/structure/railing/mapped, @@ -117403,12 +118644,6 @@ /obj/structure/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /turf/simulated/floor/plating, /area/horizon/engineering/reactor/indra/office) -"pvs" = ( -/obj/structure/machinery/atmospherics/unary/vent_pump/aux{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/horizon/command/bridge/selfdestruct) "pvw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -117452,7 +118687,7 @@ master_tag = "airlock_horizon_deck_1_aft_port_1"; name = "airlock_horizon_deck_1_aft_port_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "pvW" = ( /obj/structure/bed/stool/chair/padded/black{ @@ -117464,7 +118699,7 @@ /turf/simulated/floor/carpet, /area/horizon/repoffice/representative_two) "pwg" = ( -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "pwj" = ( /obj/structure/closet/emcloset, @@ -117508,10 +118743,12 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "pws" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled, -/area/horizon/maintenance/deck_1/operations/starboard) +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/starboard/far) "pwv" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -117547,9 +118784,15 @@ /turf/simulated/floor/plating, /area/horizon/command/bridge/controlroom) "pwz" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_deco{ + dir = 9 + }, +/obj/structure/machinery/portable_atmospherics/canister/air/warm, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "pwC" = ( /obj/effect/floor_decal/industrial/outline/grey, @@ -117634,6 +118877,7 @@ dir = 4 }, /obj/structure/machinery/alarm/north, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/operations) "pxv" = ( @@ -117721,7 +118965,10 @@ dir = 4 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "pxP" = ( /obj/structure/machinery/light{ @@ -117782,7 +119029,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "pyp" = ( /obj/structure/machinery/seed_storage/garden/xenobotany, @@ -117837,7 +119087,7 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "pyI" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -117854,7 +119104,7 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/turbine) "pyM" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -117998,13 +119248,9 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/upperdeck) "pzV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/main/starboard) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/main/starboard) "pzW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -118024,8 +119270,14 @@ pixel_x = -11; pixel_y = -2 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port/shortcut) +"pAe" = ( +/turf/simulated/floor/tiled/ramp, +/area/horizon/maintenance/deck_1/operations/starboard) "pAi" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -118065,7 +119317,7 @@ name = "airlock_horizon_deck_2_port_1" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "pAA" = ( /obj/structure/machinery/access_button{ @@ -118197,7 +119449,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port) "pBj" = ( /obj/effect/floor_decal/industrial/warning{ @@ -118284,7 +119536,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, -/obj/structure/machinery/light/small{ +/obj/structure/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -118385,7 +119637,7 @@ name = "airlock_horizon_deck_2_starboard_aft" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "pCo" = ( /obj/structure/table/reinforced/steel, @@ -118469,12 +119721,16 @@ master_tag = "airlock_horizon_deck_2_aft_sm"; name = "airlock_horizon_deck_2_aft_sm" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/engineering/reactor/supermatter/airlock) "pCM" = ( /obj/random/tool, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "pCP" = ( /obj/structure/railing/mapped{ @@ -118578,6 +119834,9 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "pDm" = ( @@ -118707,7 +119966,7 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "pEj" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/decal/cleanable/dirt, @@ -118857,6 +120116,9 @@ /area/horizon/holodeck/source_battlemonsters) "pFS" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "pGe" = ( @@ -118884,7 +120146,8 @@ dir = 4 }, /obj/random/junk, -/turf/simulated/floor/tiled/dark/full, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "pGm" = ( /obj/structure/tank_wall{ @@ -118918,6 +120181,13 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port/shortcut) +"pGF" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard) "pGG" = ( /obj/structure/machinery/door/airlock/hatch{ dir = 4; @@ -119269,7 +120539,7 @@ dir = 10 }, /obj/structure/machinery/alarm/east, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "pJa" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -119305,6 +120575,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible/purple{ dir = 6 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "pJs" = ( @@ -119497,7 +120768,13 @@ dir = 10 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "pKx" = ( /turf/simulated/wall/shuttle/unique/tcfl{ @@ -119532,7 +120809,10 @@ "pKC" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "pKI" = ( /obj/effect/floor_decal/spline/plain/black{ @@ -119583,9 +120863,6 @@ /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "pLp" = ( -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -119596,6 +120873,7 @@ dir = 10 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/horizon/service/bar) "pLu" = ( @@ -119617,7 +120895,7 @@ req_access = list(1); dir = 4 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/security/interrogation) "pLy" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ @@ -119725,10 +121003,10 @@ /area/horizon/command/heads/om) "pMv" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1 + dir = 6 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port/far) +/turf/simulated/floor, +/area/horizon/maintenance/deck_3/aft/starboard/far) "pMw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -119796,6 +121074,7 @@ icon_state = "2-8" }, /obj/structure/machinery/power/apc/low/north, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/medical) "pNc" = ( @@ -119910,6 +121189,9 @@ /area/centcom/spawning) "pNT" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "pNX" = ( @@ -119919,6 +121201,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/dirt_75, +/obj/structure/machinery/alarm/north, /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "pNY" = ( @@ -119933,14 +121216,12 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/upperdeck) "pOa" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate/damaged{ - color = "#4c535b" - }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard/far) "pOb" = ( /obj/effect/landmark/entry_point/fore{ name = "fore, starboard ballast" @@ -120206,11 +121487,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port) "pPQ" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/light/small/emergency{ - dir = 1 +/obj/structure/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port) "pPR" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -120242,7 +121524,10 @@ /obj/random/tool{ pixel_y = 6 }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "pPZ" = ( /obj/structure/bed/stool/padded, @@ -120542,6 +121827,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, +/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/bar) "pRR" = ( @@ -120813,14 +122099,11 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) "pTN" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/horizon/command/bridge/selfdestruct) +/turf/simulated/floor/tiled/full, +/area/horizon/hallway/primary/deck_2/central) "pTZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/unsimulated/floor, @@ -120833,7 +122116,7 @@ dir = 8 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) "pUg" = ( /obj/structure/table/standard, @@ -120976,7 +122259,7 @@ req_one_access = list(12,66); name = "Deck 1 Starboard Primary Maintenance Conduit" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/teleporter) "pVw" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -121009,6 +122292,7 @@ /obj/structure/machinery/atmospherics/binary/pump{ name = "Mix to Connector" }, +/obj/structure/machinery/firealarm/east, /turf/simulated/floor/plating, /area/horizon/engineering/storage/lower) "pVD" = ( @@ -121342,7 +122626,8 @@ /area/merchant_station/warehouse) "pXz" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/obj/structure/machinery/alarm/north, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "pXA" = ( /obj/structure/lattice, @@ -121439,10 +122724,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "pYd" = ( @@ -121469,7 +122751,7 @@ icon_state = "0-4" }, /obj/structure/machinery/power/apc/low/south, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port) "pYr" = ( /obj/effect/floor_decal/industrial/warning{ @@ -121523,7 +122805,7 @@ name = "airlock_horizon_deck_2_starboard_aft" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "pYV" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -121726,6 +123008,9 @@ "qaq" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/operations) "qas" = ( @@ -121801,10 +123086,14 @@ /area/horizon/operations/machinist) "qaV" = ( /obj/structure/machinery/alarm/west, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "qbc" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -121812,7 +123101,10 @@ /area/horizon/maintenance/deck_1/hangar/port) "qbh" = ( /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "qbj" = ( /obj/effect/floor_decal/industrial/warning/full, @@ -122153,6 +123445,14 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/operations/mining_main/refinery) +"qdE" = ( +/obj/random/maintenance_junk_or_loot, +/obj/random/dirt_75, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/far) "qdL" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -122210,11 +123510,11 @@ /area/horizon/crew/fitness/changing) "qec" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/railing/mapped{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/aft) +/area/horizon/maintenance/deck_2/wing/starboard) "qee" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -122248,7 +123548,7 @@ name = "airlock_horizon_deck_1_aft_port_1" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "qem" = ( /obj/structure/machinery/door/firedoor, @@ -122258,7 +123558,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "qep" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -122385,9 +123685,13 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/engineering/reactor/indra/mainchamber) "qfa" = ( -/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/cable, +/obj/structure/machinery/power/apc/low/south, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port/shortcut) "qfo" = ( /turf/simulated/open/airless, @@ -122490,6 +123794,9 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "qga" = ( @@ -122515,8 +123822,10 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/maintenance/deck_2/security_port) "qgf" = ( -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "qgh" = ( /obj/structure/cable/green{ @@ -122858,7 +124167,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "qiW" = ( /obj/structure/platform/ledge{ @@ -122885,6 +124194,22 @@ }, /turf/simulated/floor/tiled/freezer, /area/horizon/crew/fitness/showers) +"qjh" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/starboard/far) "qjk" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -122902,15 +124227,21 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "qjG" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/machinery/light/small, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "qjH" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, /obj/random/loot, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "qjN" = ( /obj/structure/machinery/light, @@ -123092,7 +124423,7 @@ name = "airlock_horizon_deck_1_aft_propulsion_1" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion/starboard) "qli" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -123123,7 +124454,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard) "qlr" = ( /obj/structure/railing/mapped{ @@ -123358,6 +124689,9 @@ /obj/effect/floor_decal/spline/plain/corner/black{ dir = 1 }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/break_room) "qmh" = ( @@ -123458,9 +124792,6 @@ target_pressure = 200 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) @@ -123685,9 +125016,6 @@ }, /area/centcom/control) "qnV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/structure/trash_pile, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -123731,7 +125059,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "qor" = ( /obj/structure/machinery/alarm/east, @@ -123853,7 +125181,7 @@ "qpd" = ( /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "qpr" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -123984,7 +125312,6 @@ /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "qqm" = ( -/obj/structure/grille/broken, /obj/item/material/shard{ icon_state = "medium" }, @@ -124002,9 +125329,6 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/plating, @@ -124043,6 +125367,9 @@ /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/storage_maintenance) "qqF" = ( @@ -124071,10 +125398,10 @@ /turf/simulated/floor/tiled/white, /area/horizon/shuttle/intrepid/medical) "qqP" = ( -/obj/random/dirt_75, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port/shortcut) "qqQ" = ( @@ -124194,12 +125521,19 @@ icon_state = "1-4" }, /obj/structure/machinery/power/apc/low/west, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/civ_d2) "qrM" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "qrO" = ( /obj/item/reagent_containers/food/drinks/waterbottle{ @@ -124556,6 +125890,9 @@ }, /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/down, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/open, /area/horizon/maintenance/deck_2/wing/starboard/near) "quC" = ( @@ -124600,7 +125937,7 @@ /obj/effect/floor_decal/industrial/hatch_door/engineering{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/storage/lower) "quS" = ( /obj/effect/floor_decal/industrial/warning, @@ -124608,7 +125945,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "quT" = ( /obj/structure/shuttle_part/scc/mining{ icon_state = "1,1" @@ -124676,7 +126013,7 @@ name = "Deck 2 Research Substation"; req_one_access = list(11,24) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/research) "qve" = ( /obj/structure/railing/mapped{ @@ -124740,7 +126077,10 @@ pixel_y = 3 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "qvD" = ( /obj/structure/machinery/light{ @@ -124888,7 +126228,7 @@ dir = 8 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/amidships) "qwU" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -124933,7 +126273,7 @@ pixel_x = 28; pixel_y = 12 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "qxm" = ( /obj/effect/floor_decal/corner/mauve/full{ @@ -125068,7 +126408,7 @@ }, /area/centcom/shared_dream) "qyg" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/maintenance_junk_or_loot, @@ -125110,7 +126450,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/corner/red/diagonal, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/floor_decal/industrial/outline/firefighting_closet, @@ -125157,6 +126497,9 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) "qyQ" = ( @@ -125339,7 +126682,7 @@ }, /obj/structure/closet/crate/bin, /obj/random/loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/amidships) "qAF" = ( /turf/unsimulated/wall/darkshuttlewall, @@ -125465,7 +126808,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/open, /area/horizon/medical/gen_treatment) "qBm" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, @@ -125542,7 +126886,8 @@ "qBM" = ( /obj/random/junk, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/near) "qBN" = ( /obj/structure/flora/ausbushes/lavendergrass, @@ -125572,11 +126917,13 @@ }, /area/centcom/control) "qBY" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/wood, -/area/horizon/service/bar) +/obj/random/maintenance_junk_or_loot, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard/far) "qBZ" = ( /turf/simulated/wall, /area/horizon/stairwell/port/deck_3) @@ -125620,24 +126967,30 @@ }, /area/tdome/tdomeobserve) "qCx" = ( +/obj/effect/floor_decal/corner/white{ + dir = 5 + }, /obj/structure/machinery/light/floor{ dir = 1 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "qCy" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "qCB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, +/obj/structure/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "qCN" = ( /obj/structure/bed/padded, /obj/item/bedsheet/blue, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/floor_decal/corner/dark_blue/full, @@ -125792,7 +127145,6 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "qDQ" = ( @@ -125857,6 +127209,9 @@ /obj/structure/machinery/computer/ship/navigation{ dir = 8 }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/aibunker) "qEl" = ( @@ -126314,23 +127669,20 @@ c_tag = "Engineering - Deck 2 - Research Substation"; dir = 1 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/research) "qHn" = ( /obj/structure/closet/crate, -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/random/loot, /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, -/obj/structure/railing/mapped{ - icon_state = "railing0-0" - }, /obj/random/med_stack, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "qHv" = ( /obj/effect/floor_decal/corner/brown{ @@ -126410,6 +127762,12 @@ "qHE" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/maintenance/deck_1/atmos_crosser) +"qHG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard) "qHI" = ( /turf/simulated/wall, /area/horizon/medical/main_storage) @@ -126474,18 +127832,12 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/port/far) "qIf" = ( -/obj/effect/floor_decal/corner_wide/blue{ - dir = 5 - }, -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/porta_turret/stationary, +/obj/effect/floor_decal/industrial/warning/full, /obj/structure/sign/nosmoking_1{ pixel_y = -32 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "qIg" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -126717,6 +128069,13 @@ /obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/gunmetal/full, /area/horizon/operations/warehouse) +"qJW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/open/airless, +/area/horizon/exterior/no_shields) "qJX" = ( /obj/structure/table/wood, /obj/structure/machinery/power/outlet, @@ -126818,7 +128177,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "qKs" = ( /obj/structure/machinery/telepad, @@ -126853,10 +128213,12 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/elevator) "qKF" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/rack, +/obj/random/loot, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "qKM" = ( /obj/effect/floor_decal/industrial/outline/grey, @@ -127019,6 +128381,9 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/air) +"qLr" = ( +/turf/space, +/area/horizon/exterior/no_shields) "qLw" = ( /obj/structure/machinery/light{ dir = 4 @@ -127054,7 +128419,7 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "qLN" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/map_effect/marker/airlock{ @@ -127062,7 +128427,10 @@ master_tag = "airlock_horizon_deck_3_aft_1"; name = "airlock_horizon_deck_3_aft_1" }, -/turf/simulated/floor, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "qLO" = ( /obj/structure/railing/mapped, @@ -127084,7 +128452,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -127109,15 +128477,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/medical/gen_treatment) "qLX" = ( -/obj/structure/machinery/portable_atmospherics/canister/empty/air, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port/nacelle) +/obj/structure/table/reinforced, +/obj/item/screwdriver, +/obj/item/clothing/glasses/sunglasses, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "qMe" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/dark_green/diagonal, @@ -127278,7 +128645,7 @@ name = "airlock_horizon_deck_2_aft_sm" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/airlock) "qMR" = ( /obj/effect/floor_decal/spline/plain/black{ @@ -127674,6 +129041,10 @@ }, /turf/simulated/floor/tiled, /area/horizon/hangar/intrepid/interstitial) +"qQf" = ( +/obj/structure/machinery/light/small/floor, +/turf/simulated/floor/wood, +/area/horizon/service/mess_hall) "qQh" = ( /obj/structure/sign/greencross{ name = "Emergency Room" @@ -128044,7 +129415,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/starboard) "qSA" = ( /turf/unsimulated/wall/steel, @@ -128069,9 +129440,6 @@ /turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "qSL" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, /obj/effect/floor_decal/corner/dark_blue/full, /obj/structure/closet/walllocker/firecloset{ pixel_x = -32 @@ -128180,6 +129548,9 @@ /obj/random/loot, /obj/random/maintenance_junk_or_loot, /obj/random/contraband, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/central_ring) "qTs" = ( @@ -128230,9 +129601,7 @@ "qTR" = ( /obj/structure/table/rack, /obj/random/loot, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "qTS" = ( @@ -128323,7 +129692,7 @@ /turf/simulated/floor/holofloor/carpet, /area/horizon/holodeck/source_courtroom) "qUT" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/railing/mapped{ @@ -128346,7 +129715,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "qUY" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -128413,7 +129782,7 @@ /obj/effect/floor_decal/industrial/outline_segment/yellow{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -128470,7 +129839,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "qVF" = ( /obj/structure/cable/green{ @@ -128519,7 +129892,7 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/service/starboard) "qWc" = ( /turf/simulated/floor/tiled/dark/full, @@ -128553,7 +129926,8 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "qWk" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -128709,7 +130083,7 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/trash_pile, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/port/nacelle) "qXl" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/purple{ @@ -128853,7 +130227,7 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "qXJ" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/table/rack, @@ -129396,7 +130770,8 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "rbM" = ( /obj/structure/cable/green{ @@ -129423,7 +130798,7 @@ "rbW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/greenglow, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -129609,7 +130984,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "rdq" = ( /obj/structure/grille, /obj/structure/window/shuttle/scc_space_ship/cardinal, @@ -129668,7 +131043,6 @@ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "rdS" = ( @@ -129779,6 +131153,9 @@ /obj/item/material/stool/chair/folding/camping, /obj/item/material/stool/chair/folding/camping, /obj/item/wrench, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/rnd/xenoarch/presentation) "rer" = ( @@ -130186,10 +131563,13 @@ /turf/simulated/open, /area/horizon/medical/hallway/upper) "rhw" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/chair/padded/black, /obj/structure/machinery/alarm/north, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "rhx" = ( /obj/structure/machinery/conveyor{ @@ -130238,6 +131618,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "rhL" = ( @@ -130357,8 +131738,8 @@ /turf/simulated/floor/wood/maple, /area/horizon/holodeck/source_cafe) "rim" = ( -/obj/structure/lattice/catwalk/indoor, /obj/structure/railing/mapped, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/research) "rir" = ( @@ -130367,7 +131748,7 @@ /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "riy" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -130456,7 +131837,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/storage_hard/upper) "riR" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -130475,19 +131856,22 @@ /turf/simulated/floor/plating, /area/horizon/shuttle/intrepid/port_compartment) "riV" = ( -/obj/structure/machinery/alarm/east, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/storage/secure/tech_vault) "rjd" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 }, -/turf/simulated/floor, -/area/horizon/maintenance/deck_3/aft/starboard/far) -"rjn" = ( -/obj/structure/railing/mapped{ +/obj/structure/platform_deco{ dir = 8 }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/wing/starboard/far) +"rjn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/platform{ dir = 4 @@ -130574,6 +131958,9 @@ "rjI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) "rjL" = ( @@ -130584,7 +131971,7 @@ /turf/simulated/floor/tiled, /area/horizon/operations/machinist) "rjP" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -130714,11 +132101,12 @@ /turf/simulated/wall, /area/horizon/maintenance/deck_3/aft/holodeck) "rkL" = ( -/obj/effect/floor_decal/corner/white{ - dir = 5 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/primary/deck_2/central) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard/far) "rkM" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -130820,7 +132208,7 @@ /obj/random/loot, /obj/random/loot, /obj/random/contraband, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "rlq" = ( /obj/effect/floor_decal/industrial/warning, @@ -130860,10 +132248,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/full, /area/horizon/rnd/hallway) "rlE" = ( @@ -130883,18 +132273,18 @@ /turf/simulated/floor/tiled/dark, /area/horizon/rnd/xenoarch/hallway/elevator) "rlF" = ( -/obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/loot, /obj/random/bomb_supply, /obj/random/bomb_supply, /obj/random/bomb_supply, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/closet/crate/tool, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "rlJ" = ( /obj/effect/floor_decal/corner_wide/paleblue/diagonal{ @@ -131107,7 +132497,7 @@ req_one_access = list(12,31); name = "Deck 1 Starboard Primary Maintenance Conduit" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard) "rmy" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -131212,7 +132602,7 @@ master_tag = "airlock_horizon_deck_2_aft_sm"; name = "airlock_horizon_deck_2_aft_sm" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/airlock) "rmU" = ( /obj/effect/floor_decal/industrial/warning{ @@ -131417,7 +132807,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/port/far) "roU" = ( @@ -131495,7 +132885,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "rps" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -131580,10 +132971,10 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) "rpV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "rpY" = ( /obj/structure/cable/green{ @@ -131764,6 +133155,16 @@ }, /turf/unsimulated/floor/rubber_carpet, /area/centcom/specops) +"rqX" = ( +/obj/random/dirt_75, +/obj/structure/machinery/door/firedoor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/starboard) "rre" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -131982,7 +133383,7 @@ dir = 4; req_one_access = list(12) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard) "rsr" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ @@ -132078,7 +133479,15 @@ /area/centcom/specops) "rti" = ( /obj/structure/machinery/atmospherics/pipe/manifold4w/visible, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "rtj" = ( /obj/structure/machinery/door/firedoor/multi_tile, @@ -132157,7 +133566,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -132212,9 +133621,15 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/turbine) "rtV" = ( -/obj/structure/machinery/atmospherics/pipe/simple/visible/universal, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning, +/obj/random/smalltank, +/obj/random/smalltank, +/obj/structure/table/rack, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "ruc" = ( /obj/structure/machinery/door/window/eastleft, @@ -132380,7 +133795,10 @@ /obj/item/material/shard{ icon_state = "medium" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "rvl" = ( /obj/structure/railing/mapped{ @@ -132393,7 +133811,7 @@ dir = 1 }, /mob/living/silicon/robot/shell, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/ai/upload_foyer) "rvo" = ( /obj/structure/machinery/door/airlock/glass_command{ @@ -132404,8 +133822,12 @@ /area/shuttle/hapt) "rvs" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/random/smalltank, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "rvy" = ( /turf/simulated/floor/shuttle/dark_red, @@ -132521,12 +133943,12 @@ /area/horizon/medical/ward) "rwq" = ( /obj/structure/trash_pile, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "rws" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "rwv" = ( @@ -132539,10 +133961,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 }, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/chamber) "rwJ" = ( /obj/effect/landmark/entry_point/aft{ @@ -132626,7 +134048,7 @@ /area/centcom/legion/hangar5) "rxo" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/unsimulated/floor/plating, /area/centcom/specops) "rxp" = ( @@ -132695,7 +134117,7 @@ /area/horizon/security/office) "rxL" = ( /obj/random/keg, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "rxO" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -132856,7 +134278,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "ryL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/corner/grey/full{ @@ -133052,12 +134474,15 @@ /obj/structure/machinery/door/airlock/maintenance{ req_one_access = list(5,10,12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "rzO" = ( /obj/random/junk, /obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "rzW" = ( /obj/effect/map_effect/window_spawner/full/reinforced/indestructible, @@ -133110,7 +134535,7 @@ /obj/structure/machinery/access_button{ pixel_x = -28 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "rAr" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -133313,6 +134738,14 @@ "rBJ" = ( /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/smes) +"rBO" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/random/maintenance_junk_or_loot, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/wing/port/far) "rBT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -133320,7 +134753,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -133440,7 +134873,8 @@ c_tag = "Engineering - Deck 1 - Atmospherics Substation"; dir = 1 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering/lower) "rDi" = ( @@ -133520,8 +134954,10 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "rDL" = ( /obj/effect/floor_decal/spline/plain/corner, @@ -133530,6 +134966,7 @@ "rDN" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "rDS" = ( @@ -133560,9 +134997,16 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard/docks) "rEc" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor/plating, -/area/horizon/exterior) +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/rack, +/obj/random/tool, +/obj/random/tech_supply, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/main/port) "rEd" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -133668,7 +135112,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor, /area/antag/jockey) @@ -133765,7 +135209,7 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "rFo" = ( /obj/structure/shuttle/engine/propulsion/burst/right{ @@ -133797,7 +135241,7 @@ /area/horizon/operations/ship_supply_warehouse) "rFB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -133915,6 +135359,7 @@ /obj/structure/engineer_maintenance/electric{ dir = 8 }, +/obj/structure/machinery/light/floor, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/aibunker) "rGs" = ( @@ -134134,7 +135579,7 @@ /area/horizon/command/heads/rd) "rHt" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "rHz" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -134420,7 +135865,8 @@ "rJP" = ( /obj/random/dirt_75, /obj/structure/trash_pile, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "rJR" = ( /obj/structure/machinery/firealarm/south, @@ -134733,7 +136179,7 @@ name = "airlock_horizon_deck_1_fore_1" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "rLY" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -134768,17 +136214,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/medical/reception) "rMc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/light/small{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/horizon/engineering/storage/lower) +/area/horizon/operations/machinist) "rMe" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -134805,13 +136247,12 @@ /turf/simulated/floor/plating, /area/horizon/command/bridge/controlroom) "rMf" = ( -/obj/structure/machinery/door/window{ - dir = 1 - }, /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "rMj" = ( @@ -135236,17 +136677,16 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "rOO" = ( -/obj/effect/floor_decal/corner/dark_blue/full{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/machinery/atmospherics/portables_connector{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/ai/upload_foyer) +/obj/structure/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/starboard/near) "rOR" = ( /obj/structure/railing/mapped{ dir = 8 @@ -135308,7 +136748,9 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos) "rPb" = ( @@ -135418,7 +136860,7 @@ /obj/structure/machinery/door/firedoor{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/medical) "rPH" = ( /obj/structure/machinery/door/blast/odin/shuttle/tcfl/shutter{ @@ -135431,10 +136873,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/structure/machinery/power/apc/low/north, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/structure/machinery/power/apc/north, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "rPP" = ( @@ -135464,7 +136906,7 @@ icon_state = "0-4" }, /obj/structure/machinery/power/apc/low/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/teleporter) "rPW" = ( /obj/effect/decal/fake_object{ @@ -135595,7 +137037,7 @@ /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/cable{ @@ -135688,7 +137130,7 @@ /obj/effect/landmark{ name = "Revenant" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "rRE" = ( /obj/structure/machinery/camera/network/engineering{ @@ -135699,12 +137141,12 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) "rRL" = ( /obj/structure/table/wood/gamblingtable, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "rRO" = ( @@ -135807,10 +137249,10 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, +/turf/simulated/floor, /area/horizon/ai/chamber) "rSo" = ( /obj/effect/floor_decal/industrial/warning{ @@ -135840,6 +137282,9 @@ "rSt" = ( /obj/effect/floor_decal/corner/pink/diagonal, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "rSu" = ( @@ -135935,9 +137380,13 @@ "rST" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/alarm/west, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "rSV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "rTf" = ( @@ -136003,9 +137452,13 @@ /turf/unsimulated/floor, /area/antag/raider) "rTp" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/aft) +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/nacelle) "rTt" = ( /obj/structure/machinery/vending/tool, /obj/effect/floor_decal/corner/dark_green{ @@ -136313,10 +137766,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/storage_hard/lower) "rUY" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "rVa" = ( /obj/effect/floor_decal/spline/plain/corner{ @@ -136327,6 +137783,9 @@ "rVc" = ( /obj/effect/floor_decal/corner_wide/yellow/diagonal, /obj/structure/reagent_dispensers/water_cooler, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/break_room) "rVj" = ( @@ -136341,7 +137800,10 @@ pixel_x = -11 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "rVn" = ( /obj/structure/cable{ @@ -136455,7 +137917,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "rWr" = ( /obj/structure/railing/mapped{ dir = 8 @@ -136659,14 +138121,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "rXH" = ( @@ -136716,7 +138176,9 @@ /obj/effect/floor_decal/corner_wide/yellow{ dir = 5 }, -/obj/structure/machinery/alarm/north, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/engineering/hallway/aft) "rXX" = ( @@ -136742,11 +138204,12 @@ /turf/simulated/floor/wood, /area/horizon/service/mess_hall) "rYe" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard) "rYf" = ( @@ -136828,6 +138291,9 @@ input_level = 50000; output_level = 45000 }, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/central_ring) "rYP" = ( @@ -136846,7 +138312,13 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/sign/air_station{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "rYW" = ( /turf/simulated/wall/shuttle/unique/tcfl{ @@ -136883,7 +138355,7 @@ /obj/item/modular_computer/console/preset/engineering{ dir = 8 }, -/obj/structure/machinery/light{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/dark/full, @@ -136948,7 +138420,8 @@ master_tag = "airlock_horizon_dock_deck_3_port_5"; name = "airlock_horizon_dock_deck_3_port_5" }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, /area/horizon/hallway/primary/deck_3/port/docks) "rZw" = ( /obj/structure/cable/green{ @@ -137074,11 +138547,14 @@ /area/horizon/repoffice/consular_one) "sam" = ( /obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "san" = ( /obj/random/junk, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "saD" = ( /obj/effect/floor_decal/industrial/warning{ @@ -137089,7 +138565,7 @@ name = "\improper CAUTION: HEAVY MACHINERY IN USE sign"; pixel_y = 32 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "saG" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -137122,6 +138598,15 @@ /obj/structure/table/rack, /turf/unsimulated/floor, /area/centcom/legion/hangar5) +"sbd" = ( +/obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/redgrid, +/area/horizon/command/bridge/selfdestruct) "sbk" = ( /obj/structure/machinery/alarm/tcom/north, /obj/effect/floor_decal/spline/plain/black{ @@ -137165,7 +138650,15 @@ dir = 5 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/random/smalltank, +/obj/structure/table/rack, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "sbD" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -137409,7 +138902,7 @@ }, /obj/structure/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/near) "sdr" = ( /obj/structure/machinery/door/firedoor{ @@ -137630,8 +139123,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "sfe" = ( /obj/structure/cable/green{ @@ -137910,7 +139404,7 @@ /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_2/starboard) "sgB" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, @@ -137936,6 +139430,7 @@ /area/shuttle/skipjack) "sgF" = ( /obj/item/stack/rods, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "sgH" = ( @@ -137999,6 +139494,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/storage/primary) +"sha" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/item/material/shard, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/main/port) "shc" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -138033,7 +139533,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -138143,6 +139643,7 @@ pixel_x = 20; pixel_y = 6 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_3/starboard/docks) "shJ" = ( @@ -138348,6 +139849,7 @@ name = "airlock_horizon_deck_3_aft_1"; frequency = 1001 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "siA" = ( @@ -138381,8 +139883,6 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "siM" = ( @@ -138503,12 +140003,11 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/telesci) "sjz" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/wing/starboard/far) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "sjA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -138827,7 +140326,7 @@ /area/horizon/crew/vacantoffice) "slR" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -139043,9 +140542,8 @@ /obj/structure/window/reinforced, /obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/structure/closet/emcloset, -/obj/structure/machinery/light/spot{ - dir = 4; - must_start_working = 1 +/obj/structure/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control) @@ -139138,7 +140636,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "snH" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -139275,7 +140773,7 @@ dir = 1; req_one_access = list(5,12) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/holodeck) "spd" = ( /obj/effect/floor_decal/corner/purple{ @@ -139298,6 +140796,7 @@ icon_state = "1-8" }, /obj/structure/machinery/alarm/east, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/hangar) "sph" = ( @@ -139342,7 +140841,7 @@ pixel_x = 28; pixel_y = 12 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "spE" = ( /turf/simulated/wall, @@ -139422,8 +140921,11 @@ /turf/simulated/floor/plating, /area/horizon/medical/reception) "sqM" = ( -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "sqP" = ( /obj/structure/table/steel, @@ -139432,6 +140934,13 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/hapt) +"sqS" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/wing/starboard/far) "sqT" = ( /obj/effect/floor_decal/corner/teal{ dir = 10 @@ -139581,7 +141090,7 @@ dir = 4 }, /obj/structure/trash_pile, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/cargo_compartment) "ssd" = ( @@ -139775,7 +141284,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "ssL" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -139804,8 +141314,9 @@ }, /area/centcom/ferry) "std" = ( -/turf/simulated/floor, -/area/horizon/maintenance/deck_2/wing/port/far) +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/main/port/shortcut) "stp" = ( /obj/structure/table/standard{ no_cargo = 1 @@ -140090,7 +141601,7 @@ pixel_x = 32; req_one_access = list(12,31,73,76,77,78) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/quark/cargo_hold) "svw" = ( /obj/structure/cable/green{ @@ -140129,7 +141640,7 @@ /area/horizon/security/office) "svM" = ( /obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/canister/restricted, @@ -140236,9 +141747,6 @@ /turf/unsimulated/floor/plating, /area/centcom/legion) "swm" = ( -/obj/structure/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{ dir = 8; frequency = 1380; @@ -140277,7 +141785,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/central) "sws" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/effect/map_effect/marker/airlock/docking{ @@ -140285,14 +141793,15 @@ master_tag = "airlock_horizon_dock_deck_3_port_4"; name = "airlock_horizon_dock_deck_3_port_4" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/port/docks) "swt" = ( /obj/structure/railing/mapped, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/research) "swu" = ( @@ -140367,6 +141876,7 @@ master_tag = "airlock_horizon_deck_2_port_1"; name = "airlock_horizon_deck_2_port_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "swT" = ( @@ -140390,6 +141900,14 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/horizon/command/heads/xo) +"swW" = ( +/obj/random/maintenance_junk_or_loot, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard) "swX" = ( /obj/structure/railing/mapped, /obj/structure/platform/ledge{ @@ -140466,13 +141984,10 @@ }, /area/centcom/control) "sxq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 4 - }, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "sxz" = ( /obj/structure/table/standard, @@ -140529,6 +142044,13 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/unsimulated/floor, /area/centcom/control) +"sxQ" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port/far) "sxS" = ( /turf/simulated/floor/wood, /area/horizon/command/heads/rd) @@ -140655,13 +142177,14 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/junk, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "syv" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "syK" = ( /obj/effect/landmark/entry_point/starboard{ @@ -140746,7 +142269,7 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/dark/cooled, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/upload) "syZ" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -140876,7 +142399,7 @@ dir = 4; req_one_access = list(5,12) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/starboard/far) "szR" = ( /turf/simulated/wall/r_wall, @@ -140950,6 +142473,9 @@ pixel_x = -6 }, /obj/random/contraband, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/starboard/far) "sAx" = ( @@ -141002,7 +142528,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/dirt_75, @@ -141013,7 +142539,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/maintenance_junk_or_loot, @@ -141269,16 +142795,16 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/canary) "sBT" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "sBV" = ( /obj/structure/table/wood/gamblingtable, @@ -141350,7 +142876,10 @@ /obj/structure/reagent_dispensers/watertank, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "sCr" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -141488,8 +143017,11 @@ /area/horizon/rnd/conference) "sDi" = ( /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard) "sDk" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden, @@ -141498,7 +143030,7 @@ master_tag = "airlock_horizon_deck_3_fore_starboard_1"; name = "airlock_horizon_deck_3_fore_starboard_1" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/crewlounge) "sDo" = ( /obj/structure/disposalpipe/segment, @@ -141533,6 +143065,12 @@ /obj/structure/machinery/firealarm/south, /turf/simulated/floor/tiled/dark, /area/horizon/rnd/xenoarch/hallway/elevator) +"sDx" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "sDz" = ( /obj/structure/machinery/door/airlock/external{ dir = 4; @@ -141596,7 +143134,7 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "sDM" = ( /obj/structure/machinery/door/firedoor, @@ -141635,6 +143173,9 @@ }, /obj/random/loot, /obj/random/contraband, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/port) "sDU" = ( @@ -141754,6 +143295,7 @@ /obj/effect/decal/cleanable/dirt, /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "sES" = ( @@ -141994,13 +143536,11 @@ /turf/simulated/floor/plating, /area/horizon/security/evidence_storage) "sGD" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/near) "sGF" = ( /obj/effect/floor_decal/corner/lime{ @@ -142148,10 +143688,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/railing/mapped, /obj/structure/closet, /obj/random/loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "sHz" = ( /turf/simulated/floor/tiled/dark, @@ -142253,6 +143792,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "sIl" = ( @@ -142310,7 +143850,7 @@ /obj/random/junk, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port) "sIQ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -142360,7 +143900,7 @@ welded = 1 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/central_ring) "sJm" = ( /obj/structure/cable/green{ @@ -142466,7 +144006,10 @@ /obj/structure/machinery/light/small, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "sJY" = ( /obj/structure/bed/stool/padded, @@ -142626,9 +144169,14 @@ }, /area/centcom/legion/hangar5) "sLa" = ( -/obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "sLf" = ( /obj/structure/table/reinforced/wood, @@ -142718,6 +144266,12 @@ }, /turf/unsimulated/floor/blue_circuit, /area/centcom/control) +"sLF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "sLG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -142766,6 +144320,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 4 }, +/obj/structure/machinery/light/floor, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/controlroom) "sLT" = ( @@ -142824,7 +144379,10 @@ "sMp" = ( /obj/random/maintenance_junk_or_loot, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "sMw" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -143432,6 +144990,9 @@ dir = 4 }, /obj/structure/machinery/disposal/small/east, +/obj/structure/machinery/light/floor{ + dir = 8 + }, /turf/simulated/floor/tiled/full, /area/horizon/command/bridge/upperdeck) "sQG" = ( @@ -143549,7 +145110,7 @@ req_access = list(63) }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/security/firing_range) "sRv" = ( /obj/structure/machinery/vending/zora{ @@ -143786,7 +145347,7 @@ /obj/structure/machinery/door/airlock/maintenance_hatch{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "sSD" = ( /obj/structure/machinery/door/blast/shutters{ @@ -143818,7 +145379,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/port) "sSL" = ( @@ -143853,7 +145414,7 @@ /area/horizon/engineering/atmos/air) "sTe" = ( /obj/effect/decal/cleanable/cobweb, -/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "sTh" = ( @@ -144191,14 +145752,18 @@ dir = 1 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "sWx" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "sWC" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -144491,6 +146056,14 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) +"sYd" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/nacelle) "sYf" = ( /obj/effect/decal/fake_object/light_source/invisible, /turf/unsimulated/floor/rubber_carpet, @@ -144534,7 +146107,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/service/kitchen) "sYx" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/map_effect/marker/airlock{ @@ -144542,7 +146115,7 @@ master_tag = "airlock_horizon_deck_2_port_1"; name = "airlock_horizon_deck_2_port_1" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "sYE" = ( /obj/structure/shuttle_part/ert{ @@ -144560,7 +146133,7 @@ dir = 8 }, /obj/structure/trash_pile, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/amidships) "sYJ" = ( /obj/effect/floor_decal/corner/green{ @@ -144647,7 +146220,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_2"; name = "airlock_horizon_dock_deck_3_starboard_2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "sZm" = ( /obj/structure/machinery/embedded_controller/radio/simple_docking_controller{ @@ -144681,7 +146254,6 @@ /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "sZy" = ( /obj/effect/decal/cleanable/spiderling_remains, -/obj/structure/machinery/light/small/emergency, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "sZz" = ( @@ -144839,7 +146411,7 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "taQ" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -144879,7 +146451,7 @@ /area/horizon/maintenance/deck_1/wing/starboard/far) "tbc" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -144901,6 +146473,13 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenobiology/xenoflora) +"tbF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "tbK" = ( /obj/structure/table/stone/marble, /obj/structure/machinery/chemical_dispenser/coffeemaster/full, @@ -144912,6 +146491,18 @@ }, /turf/simulated/open, /area/horizon/maintenance/deck_2/main/starboard) +"tbR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/main/starboard) "tbT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -144970,7 +146561,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/holodeck) "tcr" = ( /obj/structure/tank_wall/oxygen{ @@ -144992,12 +146583,10 @@ /turf/simulated/floor/tiled/gunmetal/full, /area/horizon/operations/ship_supply_warehouse) "tcA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/main/starboard) +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/wing/port) "tcB" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -145111,14 +146700,14 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/structure/machinery/power/apc/west, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/main/starboard) "tdm" = ( @@ -145352,6 +146941,9 @@ /area/horizon/engineering/storage/tech) "teO" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "teR" = ( @@ -145411,7 +147003,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/horizon/maintenance/deck_2/wing/port/nacelle) "tfs" = ( /obj/effect/floor_decal/industrial/hatch_door/red, @@ -145471,7 +147063,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "tfC" = ( /turf/simulated/floor/wood, @@ -145528,7 +147120,7 @@ name = "Deck 2 Starboard Wingframe"; req_one_access = list(12,31,67) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "tfX" = ( /obj/structure/machinery/light/floor{ @@ -145555,12 +147147,23 @@ /obj/structure/closet/crate, /obj/random/contraband, /obj/random/loot, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "tgj" = ( /obj/structure/machinery/suit_cycler/freelancer, /turf/unsimulated/floor, /area/centcom/distress_prep) +"tgl" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard) "tgm" = ( /obj/structure/railing/mapped{ dir = 8 @@ -145926,11 +147529,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/auxatmos) "tim" = ( -/obj/random/dirt_75, -/obj/random/dirt_75, /obj/item/stack/material/steel{ amount = 10 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "tis" = ( @@ -146148,8 +147750,10 @@ "tkj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "tkk" = ( /turf/simulated/floor/shuttle/dark_blue, @@ -146497,7 +148101,7 @@ /obj/item/hullbeacon/red, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "tmm" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/aux{ dir = 4 @@ -146625,7 +148229,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/quark/cargo_hold) "tna" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/purple{ @@ -146634,9 +148238,6 @@ /turf/space, /area/horizon/exterior) "tne" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, /obj/structure/cable{ icon_state = "0-8" }, @@ -146646,6 +148247,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/xenoarchaeology) "tng" = ( @@ -146666,7 +148268,7 @@ /obj/structure/machinery/computer/drone_control{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "tnj" = ( /obj/structure/disposalpipe/segment{ @@ -146696,7 +148298,8 @@ "tnn" = ( /obj/structure/machinery/atmospherics/pipe/manifold4w/visible, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "tno" = ( /obj/structure/machinery/light{ @@ -146775,6 +148378,7 @@ frequency = 1109; req_one_access = list(19) }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/ai/upload_foyer) "tnL" = ( @@ -146800,6 +148404,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/simulated/floor/reinforced, /area/horizon/weapons/grauwolf) "tnV" = ( @@ -146863,13 +148470,14 @@ master_tag = "airlock_horizon_deck_3_fore_starboard_1"; name = "airlock_horizon_deck_3_fore_starboard_1" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/machinery/embedded_controller/radio/airlock/airlock_controller{ dir = 4; pixel_x = -20 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/crewlounge) "tos" = ( @@ -146898,7 +148506,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard) "toJ" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/on, @@ -147018,7 +148626,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "tpX" = ( /obj/structure/disposalpipe/segment, @@ -147250,7 +148858,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "tqZ" = ( /obj/structure/sign/flag/scc, @@ -147287,14 +148895,14 @@ /area/horizon/rnd/xenoarch/storage) "trh" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/port/far) "trj" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -147429,10 +149037,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/visible/purple{ dir = 9 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "trS" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -147455,6 +149064,7 @@ id_tag = "merchant_shuttle_dock_sensor"; pixel_x = -27 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/security/checkpoint2) "trU" = ( @@ -147672,7 +149282,10 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "ttB" = ( /obj/effect/overlay/palmtree_r, @@ -147901,15 +149514,10 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "tvn" = ( -/obj/structure/railing/mapped{ - pixel_y = -5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/material/shard{ - icon_state = "small" - }, +/obj/random/maintenance_junk_or_loot, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/main/starboard) +/area/horizon/maintenance/deck_1/operations/starboard) "tvp" = ( /obj/structure/shuttle_part/scc/scout{ icon_state = "7,9" @@ -148092,7 +149700,7 @@ /obj/item/material/folding_table, /obj/item/material/stool/chair/folding, /obj/item/material/stool/chair/folding, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "twp" = ( /obj/structure/machinery/alarm/east, @@ -148258,7 +149866,8 @@ "txy" = ( /obj/structure/machinery/light/small, /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "txz" = ( /obj/effect/floor_decal/corner/green/full{ @@ -148276,7 +149885,11 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/machinery/light/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/storage/secure/tech_vault) "txD" = ( /obj/structure/disposalpipe/segment, @@ -148843,6 +150456,12 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/elevator) +"tAV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "tAX" = ( /obj/structure/machinery/light{ dir = 1 @@ -148882,9 +150501,6 @@ pixel_x = 6; pixel_y = -6 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/item/pipe{ pixel_x = 10; pixel_y = -2 @@ -148901,7 +150517,7 @@ pixel_x = -5; pixel_y = -3 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "tBz" = ( /obj/structure/machinery/alarm/east, @@ -149114,7 +150730,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/material/shard{ + icon_state = "small" + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "tDj" = ( /obj/structure/machinery/computer/shuttle_control/lift{ @@ -149140,7 +150760,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/service/starboard) "tDr" = ( /obj/structure/cable/green{ @@ -149228,6 +150848,15 @@ }, /turf/unsimulated/floor, /area/centcom/spawning) +"tDV" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/starboard/near) "tDZ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -149256,10 +150885,10 @@ /turf/simulated/floor/tiled, /area/horizon/crew/resdeck/living_quarters_lift) "tEj" = ( -/obj/structure/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/effect/floor_decal/corner_wide/blue{ + dir = 5 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/horizon/storage/secure/tech_vault) "tEl" = ( /obj/effect/floor_decal/industrial/warning, @@ -149270,9 +150899,7 @@ /turf/simulated/floor/tiled/dark/full/airless, /area/horizon/command/bridge/controlroom) "tEm" = ( -/obj/structure/machinery/anti_bluespace, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/redgrid, /area/horizon/command/bridge/selfdestruct) "tEq" = ( /turf/simulated/floor/exoplanet/water/shallow{ @@ -149354,7 +150981,7 @@ dir = 4; name = "Deck 2 Starboard Wingframe" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard) "tEP" = ( /obj/structure/plasticflaps/mining, @@ -149371,9 +150998,14 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/lab) "tEX" = ( -/obj/effect/floor_decal/industrial/warning, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "tFe" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -149555,7 +151187,7 @@ dir = 4; req_one_access = list(12,19) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port) "tFV" = ( /obj/effect/floor_decal/corner/paleblue/full{ @@ -149797,7 +151429,7 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "tHh" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -149818,6 +151450,7 @@ master_tag = "airlock_horizon_deck_2_aft_indra"; name = "airlock_horizon_deck_2_aft_indra" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/engineering/aft_airlock) "tHj" = ( @@ -149854,10 +151487,16 @@ /area/horizon/holodeck/source_desert) "tHq" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "tHu" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/cryo) "tHw" = ( @@ -150157,7 +151796,7 @@ dir = 4; req_one_access = list(12,19) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port/far) "tKa" = ( /obj/structure/machinery/vending/wallmed1{ @@ -150176,7 +151815,7 @@ "tKb" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/secure_closet/refrigerator/cafe, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/cafe) "tKc" = ( /obj/effect/decal/cleanable/dirt, @@ -150226,24 +151865,15 @@ /turf/simulated/open, /area/horizon/medical/gen_treatment) "tKq" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/structure/platform, +/obj/structure/machinery/portable_atmospherics/canister/air/warm, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "tKs" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "tKu" = ( /obj/structure/cable/green{ @@ -150277,7 +151907,10 @@ dir = 4 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "tKA" = ( /obj/effect/decal/fake_object{ @@ -150401,6 +152034,7 @@ master_tag = "airlock_horizon_deck_2_starboard_aft"; name = "airlock_horizon_deck_2_starboard_aft" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) "tLr" = ( @@ -150435,7 +152069,7 @@ pixel_y = -28 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/aft_airlock) "tLB" = ( /obj/structure/machinery/light{ @@ -150500,7 +152134,7 @@ /obj/structure/machinery/door/airlock/maintenance_hatch{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "tMs" = ( /obj/structure/closet/secure_closet/medical3, @@ -150666,6 +152300,9 @@ /obj/structure/window/shuttle/scc_space_ship, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) +"tOa" = ( +/turf/template_noop, +/area/horizon/exterior/no_shields) "tOf" = ( /obj/structure/bed/stool/chair/office/dark, /turf/simulated/floor/carpet/rubber, @@ -150784,7 +152421,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "tOT" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -150796,12 +152433,11 @@ /turf/simulated/floor/grass/no_edge, /area/horizon/hallway/primary/deck_2/fore) "tOX" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "tOZ" = ( /obj/structure/machinery/atmospherics/binary/pump{ @@ -150983,7 +152619,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/dirt_75, @@ -151071,6 +152707,7 @@ /obj/structure/machinery/light/small/red{ dir = 4 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/shuttle/quark/cargo_hold) "tRk" = ( @@ -151143,7 +152780,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux, /obj/structure/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -151315,7 +152952,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/random/smokable, /obj/random/smokable, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "tTb" = ( /obj/structure/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -151357,6 +152994,15 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/operations/commissary) +"tTo" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "tTp" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/dark_green{ @@ -151395,6 +153041,15 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenoarch/atrium) +"tTJ" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 5 + }, +/obj/structure/machinery/light/floor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/operations/office) "tTQ" = ( /obj/structure/machinery/button/remote/blast_door{ dir = 1; @@ -151478,6 +153133,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "tUJ" = ( @@ -151522,8 +153180,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/service/starboard) "tUS" = ( /obj/effect/floor_decal/industrial/warning, @@ -151531,7 +153188,7 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port) "tUW" = ( /obj/structure/machinery/telecomms/processor/preset_one, @@ -151587,7 +153244,7 @@ }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -151607,6 +153264,9 @@ dir = 1; pixel_y = 22 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "tVm" = ( @@ -151679,6 +153339,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "tVV" = ( @@ -151799,7 +153460,7 @@ dir = 4 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "tWV" = ( /obj/structure/cable/green{ @@ -151820,7 +153481,7 @@ "tWX" = ( /obj/random/maintenance_junk_or_loot, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/structure/table/rack, @@ -151844,7 +153505,10 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "tXd" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -151869,7 +153533,7 @@ name = "Research Maintenance"; req_one_access = list(12) }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/far) "tXi" = ( /obj/effect/floor_decal/industrial/warning{ @@ -152013,12 +153677,13 @@ }, /area/centcom/control) "tYc" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "tYe" = ( @@ -152451,7 +154116,7 @@ dir = 4; req_one_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port/shortcut) "ubD" = ( /obj/effect/floor_decal/industrial/warning{ @@ -152517,10 +154182,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "ubX" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "ubZ" = ( @@ -152940,11 +154608,11 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/central_ring) "ufx" = ( -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/railing/mapped, -/obj/random/canister/restricted, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/near) +/area/horizon/maintenance/deck_2/wing/starboard) "ufG" = ( /obj/structure/bed/stool/chair/padded/black{ dir = 4 @@ -153089,7 +154757,10 @@ /area/horizon/security/washroom) "ugu" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "ugF" = ( /obj/structure/grille, @@ -153245,7 +154916,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "uhu" = ( /obj/effect/floor_decal/corner/red{ @@ -153387,7 +155058,7 @@ /area/antag/mercenary) "uiw" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor, @@ -153475,7 +155146,7 @@ dir = 1 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "uiN" = ( /obj/structure/bed/stool/chair/sofa/right/brown, @@ -153667,7 +155338,7 @@ }, /obj/structure/table/rack, /obj/random/dirt_75, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port) "ujU" = ( /obj/effect/floor_decal/industrial/warning{ @@ -153761,7 +155432,7 @@ "ukq" = ( /obj/random/junk, /obj/effect/floor_decal/industrial/warning{ - dir = 1 + dir = 9 }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) @@ -153770,7 +155441,7 @@ dir = 6 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "ukx" = ( /obj/structure/platform_stairs/full{ @@ -153794,7 +155465,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_2"; name = "airlock_horizon_dock_deck_3_starboard_2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard/docks) "ukI" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, @@ -153871,6 +155542,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/mainchamber) "ulh" = ( @@ -153977,6 +155651,7 @@ icon_state = "0-4" }, /obj/structure/machinery/power/apc/low/west, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/research) "umh" = ( @@ -154083,6 +155758,12 @@ icon_state = "white" }, /area/tdome/tdomeadmin) +"umG" = ( +/obj/effect/floor_decal/corner/white{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_2/central) "umM" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -154156,7 +155837,7 @@ dir = 4; req_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/auxatmos) "uns" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -154326,7 +156007,7 @@ req_one_access = list(24,11,67,73); dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "uoP" = ( /obj/effect/floor_decal/corner/beige/diagonal, @@ -154413,14 +156094,12 @@ /area/horizon/command/bridge/cciaroom) "upp" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "upx" = ( @@ -154669,7 +156348,7 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "uqT" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -154714,10 +156393,7 @@ pixel_y = 25; req_access = list(16) }, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/bluegrid, /area/horizon/ai/chamber) "ura" = ( /obj/effect/floor_decal/corner/mauve{ @@ -154885,7 +156561,7 @@ pixel_x = 2; pixel_y = 5 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "urV" = ( /obj/structure/machinery/light/small/emergency{ @@ -154903,7 +156579,7 @@ dir = 4 }, /obj/structure/platform/ledge, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "usa" = ( /obj/structure/stairs/south, @@ -155021,15 +156697,11 @@ /turf/simulated/floor/bluegrid, /area/horizon/tcommsat/chamber) "usI" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/obj/random/maintenance_junk_or_loot, -/obj/random/dirt_75, -/obj/random/dirt_75, -/obj/structure/table/rack, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/far) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/research) "usJ" = ( /obj/structure/bed/stool/chair/padded/blue{ dir = 8 @@ -155043,7 +156715,11 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/machinery/alarm/south, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "uta" = ( /obj/effect/floor_decal/industrial/warning{ @@ -155139,17 +156815,19 @@ /turf/unsimulated/floor/plating, /area/shuttle/transport1) "utL" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "utO" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -155239,6 +156917,9 @@ }, /obj/structure/machinery/hologram/holopad, /obj/item/radio/intercom/south, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "uuv" = ( @@ -155321,7 +157002,7 @@ pixel_x = 12; pixel_y = -28 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "uvi" = ( /obj/effect/decal/cleanable/liquid_fuel, @@ -155362,7 +157043,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos) "uvv" = ( -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard) "uvw" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -155375,7 +157059,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/near) "uvG" = ( @@ -155532,7 +157216,7 @@ dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -155621,7 +157305,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/platform_stairs/south_north_solo, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "uxj" = ( /obj/structure/closet/secure_closet/engineering_chief, @@ -155715,8 +157399,14 @@ dir = 8 }, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/operations) +"uxQ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_3/aft/starboard/far) "uxU" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/exoplanet/barren/raskara, @@ -156180,6 +157870,9 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 1 }, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_1/central) "uBA" = ( @@ -156464,12 +158157,11 @@ }, /area/centcom/shared_dream) "uDg" = ( -/obj/structure/table/rack, -/obj/random/loot, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "uDl" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ @@ -156522,6 +158214,10 @@ }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) +"uDA" = ( +/obj/structure/lattice/catwalk, +/turf/space, +/area/horizon/exterior/no_shields) "uDB" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/cable/green{ @@ -156590,7 +158286,10 @@ /obj/random/loot, /obj/random/loot, /obj/random/contraband, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "uDP" = ( /obj/structure/machinery/disposal/small/east{ @@ -156603,7 +158302,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/pharmacy) "uDT" = ( -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/engineering/drone_fabrication) "uDV" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -156987,7 +158686,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "uGs" = ( /obj/structure/machinery/alarm/east{ @@ -157040,7 +158739,7 @@ master_tag = "airlock_horizon_deck_2_aft_sm"; name = "airlock_horizon_deck_2_aft_sm" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/airlock) "uGL" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -157219,7 +158918,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/security/evidence_storage) "uHE" = ( /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -157230,6 +158929,7 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_1"; name = "airlock_horizon_dock_deck_3_starboard_1" }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_3/starboard/docks) "uHG" = ( @@ -157271,7 +158971,7 @@ }, /obj/structure/machinery/power/apc/east, /obj/random/dirt_75, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/operations) "uId" = ( /obj/effect/decal/cleanable/dirt, @@ -157516,7 +159216,7 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -157527,7 +159227,7 @@ }, /obj/structure/machinery/power/apc/south, /obj/structure/cable, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "uJw" = ( /obj/effect/floor_decal/spline/plain{ @@ -157580,6 +159280,7 @@ pixel_x = 2; pixel_y = 8 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "uJZ" = ( @@ -157835,6 +159536,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/storage/secure/tech_vault) "uLC" = ( @@ -157950,7 +159654,7 @@ pixel_x = -28; pixel_y = 12 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "uMi" = ( /obj/effect/floor_decal/spline/plain{ @@ -158213,7 +159917,7 @@ "uOD" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "uOE" = ( /obj/structure/machinery/camera/network/service{ @@ -158362,7 +160066,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/unsimulated/floor, @@ -158375,8 +160079,6 @@ icon_state = "1-2" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/obj/random/dirt_75, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "uPK" = ( @@ -158420,6 +160122,9 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "uPV" = ( @@ -158508,7 +160213,7 @@ /area/horizon/maintenance/deck_2/wing/port/far) "uQG" = ( /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/random/maintenance_junk_or_loot, @@ -158861,6 +160566,9 @@ /area/shuttle/syndicate_elite) "uSC" = ( /obj/structure/machinery/recharge_station, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/aibunker) "uSF" = ( @@ -158939,14 +160647,13 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/port/far) "uTo" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/wing/starboard/near) +/obj/structure/platform, +/obj/random/dirt_75, +/obj/structure/closet/crate/freezer, +/obj/random/booze, +/obj/random/booze, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/starboard/far) "uTs" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner_wide/green{ @@ -158966,7 +160673,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "uTA" = ( @@ -159238,6 +160945,7 @@ /obj/structure/machinery/light/small{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/security/checkpoint2) "uVk" = ( @@ -159385,11 +161093,11 @@ /turf/unsimulated/floor/plating, /area/antag/raider) "uWf" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, /obj/structure/platform, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/near) "uWh" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -159570,7 +161278,7 @@ /obj/structure/sign/electricshock{ pixel_y = 32 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/main/starboard) "uXo" = ( /obj/effect/floor_decal/industrial/warning{ @@ -159587,7 +161295,8 @@ master_tag = "airlock_horizon_dock_deck_3_starboard_3"; name = "airlock_horizon_dock_deck_3_starboard_3" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_3/starboard/docks) "uXq" = ( /obj/structure/cable/green{ @@ -159599,7 +161308,9 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "uXr" = ( @@ -159654,13 +161365,15 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenological) "uXF" = ( -/obj/effect/floor_decal/industrial/warning, /obj/structure/closet, /obj/random/loot, /obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "uXG" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -159901,8 +161614,11 @@ /area/horizon/command/bridge/controlroom) "uZR" = ( /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/port) +/area/horizon/maintenance/deck_2/wing/starboard/far) "uZS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -159919,6 +161635,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/engineering/lower) "uZV" = ( @@ -160255,6 +161972,13 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/service/hydroponics/lower) +"vcp" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/operations) "vcq" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "bar_fore"; @@ -160414,6 +162138,9 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 4 }, +/obj/structure/machinery/light/floor{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_1/central) "vcY" = ( @@ -160623,7 +162350,7 @@ name = "airlock_horizon_deck_2_aft_sm" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/supermatter/airlock) "veM" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -160647,11 +162374,7 @@ /area/centcom/spawning) "veP" = ( /obj/structure/machinery/portable_atmospherics/canister/empty/air, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port/nacelle) "veQ" = ( /obj/effect/floor_decal/corner/green{ @@ -160751,6 +162474,9 @@ /obj/structure/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) +"vfC" = ( +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "vfF" = ( /obj/structure/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -160806,6 +162532,7 @@ name = "airlock_horizon_deck_3_aft_1" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "vgg" = ( @@ -161174,13 +162901,14 @@ "vjk" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/reagent_dispensers/extinguisher, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "vjm" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "vjo" = ( @@ -161326,7 +163054,7 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/substation/research) "vkn" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -161410,10 +163138,10 @@ /turf/simulated/floor/wood, /area/horizon/service/chapel/main) "vkO" = ( -/obj/random/dirt_75, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark/damaged, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "vkY" = ( @@ -161490,7 +163218,10 @@ "vlx" = ( /obj/effect/decal/cleanable/dirt, /mob/living/silicon/robot/drone/construction/matriarch, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/drone_fabrication) "vlz" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -161635,7 +163366,7 @@ }, /area/horizon/holodeck/source_pool) "vmv" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/nacelle) "vmw" = ( @@ -161805,6 +163536,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "vnN" = ( @@ -161830,6 +163562,7 @@ /area/horizon/hallway/primary/deck_2/central) "vnP" = ( /obj/random/junk, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "vnS" = ( @@ -161917,7 +163650,7 @@ "vom" = ( /obj/effect/floor_decal/industrial/warning, /obj/item/material/shard, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "vop" = ( /obj/effect/floor_decal/spline/plain/black{ @@ -161996,6 +163729,10 @@ "voK" = ( /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/main/starboard) "voU" = ( @@ -162077,7 +163814,7 @@ /area/horizon/hallway/primary/deck_2/central) "vpO" = ( /obj/random/canister/filled/restricted, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "vpT" = ( /obj/effect/floor_decal/spline/plain/corner/black{ @@ -162212,9 +163949,6 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "vqO" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 6 - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -162223,6 +163957,7 @@ dir = 8 }, /obj/structure/machinery/disposal/small/north, +/obj/structure/machinery/light/floor, /turf/simulated/floor/tiled/white, /area/horizon/medical/gen_treatment) "vqQ" = ( @@ -162232,8 +163967,8 @@ /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "vqT" = ( /obj/effect/decal/cleanable/dirt, @@ -162241,7 +163976,7 @@ /obj/structure/closet, /obj/random/loot, /obj/random/junk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "vqY" = ( /obj/structure/machinery/door/blast/odin/shuttle/tcfl/shutter{ @@ -162291,7 +164026,8 @@ /area/centcom/spawning) "vrr" = ( /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/security/port) "vrH" = ( /obj/structure/curtain/open/shower/security, @@ -162374,21 +164110,23 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "vsg" = ( -/obj/structure/machinery/porta_turret/stationary, -/obj/effect/floor_decal/industrial/warning/full, /obj/structure/sign/flag/scc{ pixel_x = 32 }, -/obj/structure/machinery/light/small/emergency{ +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "vsl" = ( /obj/structure/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -162448,15 +164186,14 @@ /turf/simulated/floor/plating, /area/horizon/hangar/intrepid) "vti" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/wing/starboard/far) +/obj/random/bomb_supply, +/obj/random/bomb_supply, +/obj/structure/closet/crate, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/main/port) "vtq" = ( /obj/structure/machinery/door/blast/regular{ dir = 4; @@ -162469,7 +164206,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "vtu" = ( /obj/effect/floor_decal/spline/plain/lime{ @@ -162486,12 +164224,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/turf/simulated/floor/plating, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "vtw" = ( /obj/structure/bed/stool/chair/sofa/left/red, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/structure/machinery/light/spot{ +/obj/structure/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -162512,6 +164251,9 @@ icon_state = "0-4" }, /obj/structure/machinery/power/apc/low/west, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/storage_maintenance) "vtM" = ( @@ -162688,6 +164430,9 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/rnd/xenobiology/xenoflora) "vvr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard) "vvt" = ( @@ -162880,7 +164625,10 @@ /area/horizon/rnd/lab) "vwJ" = ( /obj/structure/table/rack, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "vwP" = ( /turf/simulated/wall/r_wall, @@ -163059,12 +164807,12 @@ /turf/unsimulated/floor/plating, /area/centcom/control) "vyb" = ( -/obj/structure/machinery/door/window{ - dir = 1 - }, /obj/structure/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor, /area/horizon/hallway/primary/deck_3/starboard/docks) "vyc" = ( @@ -163120,10 +164868,8 @@ /area/horizon/security/hallway) "vyC" = ( /obj/structure/machinery/floodlight, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/operations, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard) "vyE" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -163176,7 +164922,10 @@ /area/centcom/legion/hangar5) "vyT" = ( /obj/random/junk, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "vyX" = ( /obj/effect/decal/fake_object{ @@ -163200,7 +164949,7 @@ shuttle_tag = "Quark"; cycle_to_external_air = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/quark/cargo_hold) "vzb" = ( /obj/structure/machinery/firealarm/west, @@ -163414,7 +165163,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "vAL" = ( /obj/structure/machinery/light, @@ -163530,7 +165279,6 @@ /turf/simulated/floor/plating, /area/horizon/operations/package_conveyors) "vBe" = ( -/obj/structure/grille/broken, /obj/structure/machinery/door/firedoor, /obj/item/material/shard{ icon_state = "small" @@ -163539,7 +165287,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "vBf" = ( /obj/structure/machinery/atmospherics/valve{ @@ -163656,6 +165404,9 @@ alarm_id = 1601; req_one_access = list(11,24,52) }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/operations) "vBO" = ( @@ -163677,7 +165428,7 @@ /area/centcom/legion) "vBR" = ( /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard) "vBU" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ @@ -163848,12 +165599,23 @@ /obj/effect/decal/fake_object/light_source/invisible, /turf/simulated/floor, /area/tdome/tdome2) +"vDf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_1/main/starboard) "vDg" = ( /obj/structure/cable/green{ icon_state = "1-8" }, /obj/structure/cable/green, /obj/structure/machinery/power/apc/low/east, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/xenoarchaeology) "vDj" = ( @@ -164043,6 +165805,10 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "vEo" = ( @@ -164441,7 +166207,7 @@ /area/horizon/maintenance/deck_2/central_ring) "vHq" = ( /obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "vHL" = ( /obj/structure/table/standard, @@ -164597,13 +166363,10 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) "vIR" = ( -/obj/random/dirt_75, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port/shortcut) "vIZ" = ( @@ -164792,10 +166555,11 @@ /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) "vKx" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "vKz" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -165029,6 +166793,9 @@ /obj/structure/sign/nosmoking_1{ pixel_y = -32 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "vLF" = ( @@ -165063,7 +166830,10 @@ /area/horizon/hangar/auxiliary) "vMb" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/starboard/far) "vMk" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -165299,12 +167069,9 @@ /turf/simulated/floor/tiled, /area/merchant_station) "vON" = ( -/obj/structure/machinery/light/small/emergency{ - dir = 4 - }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "vOR" = ( /obj/structure/lattice, @@ -165376,6 +167143,9 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/syndicate_elite) +"vPA" = ( +/turf/simulated/open/airless, +/area/horizon/exterior/no_shields) "vPO" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -165581,12 +167351,15 @@ /turf/unsimulated/floor, /area/centcom/holding) "vQY" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/table/standard{ no_cargo = 1 }, /obj/random/contraband, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "vRa" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -165647,7 +167420,7 @@ /area/horizon/rnd/xenobiology/xenoflora) "vRz" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -165692,6 +167465,19 @@ /obj/structure/table/reinforced/steel, /turf/simulated/floor/carpet/rubber, /area/horizon/command/bridge/controlroom) +"vRZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/material/ashtray/plastic{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/paper/cig/fine{ + pixel_x = 3; + pixel_y = 1 + }, +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_1/wing/starboard/far) "vSa" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning/corner{ @@ -165954,10 +167740,12 @@ /turf/simulated/floor/wood, /area/horizon/service/library) "vUc" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/machinery/anti_bluespace, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "vUj" = ( /obj/structure/bed/stool/chair{ @@ -166323,7 +168111,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/operations/starboard) "vVO" = ( /obj/structure/disposalpipe/segment, @@ -166771,7 +168559,8 @@ /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/operations) "vYp" = ( /obj/structure/cable/green{ @@ -166797,7 +168586,7 @@ master_tag = "airlock_horizon_deck_1_fore_1"; name = "airlock_horizon_deck_1_fore_1" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "vYu" = ( /obj/structure/window/reinforced/holowindow{ @@ -166890,13 +168679,14 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/effect/map_effect/marker/airlock{ frequency = 1004; master_tag = "airlock_horizon_deck_1_fore_1"; name = "airlock_horizon_deck_1_fore_1" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "vZn" = ( @@ -166970,8 +168760,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "vZQ" = ( /obj/structure/machinery/door/blast/odin/open{ @@ -167038,6 +168827,7 @@ /obj/item/material/shard{ icon_state = "small" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard) "wax" = ( @@ -167162,28 +168952,27 @@ /turf/simulated/floor/plating, /area/horizon/shuttle/intrepid/main_compartment) "wbr" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, /obj/structure/machinery/atmospherics/portables_connector, /obj/structure/machinery/portable_atmospherics/canister/air/airlock, /obj/structure/sign/nosmoking_1{ pixel_y = 32 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "wbs" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor, /area/horizon/maintenance/deck_2/wing/port/far) "wbv" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -167261,7 +169050,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "wcg" = ( @@ -167372,6 +169161,9 @@ /obj/structure/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "wcx" = ( @@ -167392,11 +169184,12 @@ /turf/simulated/floor/marble, /area/horizon/holodeck/source_trinary) "wcB" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 5 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_1/main/port/shortcut) +/area/horizon/maintenance/deck_2/wing/starboard) "wcC" = ( /obj/structure/bed/stool/bar/padded/blue, /obj/effect/floor_decal/spline/fancy/wood, @@ -167488,7 +169281,7 @@ }, /obj/random/loot, /obj/random/loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "wcW" = ( /obj/structure/disposalpipe/segment, @@ -167496,7 +169289,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "wcX" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -167522,7 +169315,7 @@ }, /obj/random/junk, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "wdo" = ( /turf/simulated/floor/holofloor/tiled, @@ -167557,7 +169350,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/tiled/dark/full, /area/horizon/operations/secure_ammunition_storage) "wdK" = ( @@ -167651,7 +169444,8 @@ dir = 9 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "wee" = ( /obj/structure/table/standard, @@ -167686,6 +169480,12 @@ /area/horizon/medical/main_storage) "wef" = ( /obj/random/maintenance_junk_or_loot, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "weh" = ( @@ -167717,7 +169517,7 @@ pixel_x = -5; pixel_y = -3 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "weq" = ( /obj/effect/floor_decal/industrial/hatch_door/red, @@ -167880,6 +169680,9 @@ dir = 9 }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "wfp" = ( @@ -168266,7 +170069,7 @@ dir = 4 }, /obj/random/dirt_75, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -168374,7 +170177,8 @@ dir = 8 }, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/operations) "wiq" = ( /obj/effect/floor_decal/corner/lime/diagonal, @@ -168550,10 +170354,10 @@ /turf/simulated/floor/tiled/white, /area/shuttle/hapt) "wjI" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port) "wjJ" = ( /obj/effect/floor_decal/corner_wide/black{ @@ -168586,16 +170390,11 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "wjV" = ( -/obj/random/dirt_75, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, -/area/horizon/maintenance/deck_2/wing/starboard) +/area/horizon/maintenance/deck_2/wing/port/near) "wkc" = ( /obj/structure/bed/stool/chair/office/light{ dir = 8 @@ -169043,6 +170842,9 @@ "wmv" = ( /obj/effect/decal/cleanable/dirt, /obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/aft) "wmD" = ( @@ -169405,14 +171207,11 @@ /area/centcom/bar) "woF" = ( /obj/effect/floor_decal/industrial/hatch_door/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/machinery/door/firedoor{ req_one_access = list(24,11,67,73); dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/starboard) "woH" = ( /obj/structure/window/reinforced/crescent{ @@ -169447,12 +171246,7 @@ /obj/structure/ladder/up{ pixel_y = 13 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb2, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port) "wpb" = ( @@ -169630,6 +171424,7 @@ /area/horizon/holodeck_control) "wqg" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_3/aft/starboard/far) "wqh" = ( @@ -169917,14 +171712,12 @@ }, /area/centcom/spawning) "wqY" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/chair/padded/black{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/brown/full, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "wqZ" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -170175,17 +171968,17 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "wsN" = ( -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance_junk_or_loot, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_1/wing/starboard/far) +/area/horizon/engineering/storage/lower) "wsR" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -170326,7 +172119,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -170427,9 +172220,6 @@ /obj/structure/platform/ledge/dark{ dir = 8 }, -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/structure/lattice, /turf/simulated/open, /area/horizon/maintenance/deck_2/cryo) @@ -170538,7 +172328,7 @@ name = "Deck 2 Starboard Nacelle Substation"; req_one_access = list(11,24) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/wing_port) "wuI" = ( /obj/structure/machinery/vending/coffee/free{ @@ -170773,6 +172563,9 @@ dir = 4 }, /obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "wwE" = ( @@ -170834,6 +172627,10 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) +"wwN" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard) "wwP" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/machinery/light{ @@ -170855,7 +172652,7 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/meeting_room) "wwX" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/reagent_dispensers/watertank, @@ -170884,7 +172681,8 @@ /area/horizon/engineering/atmos/storage) "wxe" = ( /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/operations) "wxj" = ( /obj/structure/curtain/open/bar, @@ -170932,13 +172730,16 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/storage/tech) "wxv" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/table/standard{ no_cargo = 1 }, /obj/item/reagent_containers/glass/rag, /obj/random/smokable, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "wxy" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -170979,7 +172780,7 @@ "wxG" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -171087,7 +172888,10 @@ "wyA" = ( /obj/random/dirt_75, /obj/structure/machinery/alarm/west, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) "wyB" = ( /obj/structure/machinery/atmospherics/pipe/manifold/visible/purple{ @@ -171214,6 +173018,10 @@ }, /turf/simulated/floor/lino, /area/horizon/security/investigators_office) +"wzp" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/wing/port/far) "wzr" = ( /obj/effect/shuttle_landmark/lift/operations_third_deck, /turf/simulated/open, @@ -171231,6 +173039,10 @@ }, /turf/unsimulated/floor/plating, /area/centcom/specops) +"wzz" = ( +/obj/item/hullbeacon/red, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "wzD" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/unsimulated/floor/wood, @@ -171313,7 +173125,7 @@ name = "airlock_horizon_deck_1_fore_1" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "wzS" = ( /obj/effect/floor_decal/corner/beige/full{ @@ -171343,6 +173155,12 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/rnd/xenobiology/xenoflora) +"wAf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "wAh" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 10 @@ -171565,7 +173383,7 @@ /area/horizon/rnd/lab) "wCb" = ( /obj/effect/floor_decal/corner/brown/diagonal, -/obj/structure/machinery/light/spot{ +/obj/structure/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -172034,6 +173852,9 @@ "wFH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/bar/padded/red, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/starboard/far) "wFI" = ( @@ -172062,7 +173883,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "wFZ" = ( @@ -172158,8 +173979,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/structure/machinery/light/small/emergency, -/turf/simulated/floor/plating, +/obj/structure/machinery/light/small, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "wGH" = ( /turf/simulated/floor/tiled, @@ -172188,7 +174009,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /obj/structure/table/rack/folding_table, @@ -172204,7 +174025,7 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/cafe) "wGN" = ( /obj/structure/machinery/door/firedoor, @@ -172216,7 +174037,7 @@ /obj/effect/floor_decal/industrial/hatch_door/engineering{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/storage/lower) "wGP" = ( /obj/structure/tank_wall/nitrogen{ @@ -172387,7 +174208,7 @@ /turf/simulated/floor/wood, /area/horizon/service/mess_hall) "wHx" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/random/junk, @@ -172595,12 +174416,10 @@ /turf/simulated/open, /area/horizon/security/investigations_hallway) "wJL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port) "wJM" = ( @@ -172612,6 +174431,9 @@ /area/horizon/service/custodial/disposals/deck_1) "wJQ" = ( /obj/effect/floor_decal/corner_wide/yellow/full, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/shields) "wJR" = ( @@ -172721,7 +174543,7 @@ name = "airlock_horizon_deck_1_fore_1" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "wKo" = ( /obj/effect/floor_decal/corner/brown{ @@ -172980,12 +174802,12 @@ /turf/simulated/floor/plating, /area/merchant_station/warehouse) "wMC" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/railing/mapped{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/aft) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/wing/starboard/far) "wMJ" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/maintenance{ @@ -173272,7 +175094,7 @@ "wOw" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/structure/bed/stool/padded/red, -/obj/structure/machinery/light/spot{ +/obj/structure/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -173299,6 +175121,7 @@ /obj/structure/machinery/light/small/red{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/shuttle/quark/cargo_hold) "wOz" = ( @@ -173424,7 +175247,7 @@ dir = 1 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/research) "wPr" = ( /obj/effect/floor_decal/corner/brown{ @@ -173598,12 +175421,8 @@ /area/horizon/holodeck/source_wildlife) "wQg" = ( /obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/machinery/alarm/north, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/wing/starboard/far) "wQj" = ( /obj/structure/flora/pottedplant{ @@ -173632,6 +175451,7 @@ pixel_x = -6; pixel_y = 28 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_3/starboard/docks) "wQq" = ( @@ -173639,7 +175459,7 @@ dir = 10 }, /obj/random/junk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/port) "wQs" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -174136,7 +175956,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/hangar/starboard) "wTq" = ( /obj/effect/spider/cocoon, @@ -174164,7 +175984,8 @@ /area/horizon/crew/fitness/gym) "wTw" = ( /obj/structure/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "wTz" = ( /obj/structure/cable{ @@ -174179,6 +176000,15 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard/far) +"wTA" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/primary/deck_1/central) "wTD" = ( /obj/effect/floor_decal/corner/dark_blue/full{ dir = 1 @@ -174309,7 +176139,7 @@ name = "airlock_horizon_dock_deck_3_port_5" }, /obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/port/docks) "wUx" = ( /obj/structure/closet/bombclosetsecurity, @@ -174510,7 +176340,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "wVm" = ( /obj/structure/machinery/door/blast/shutters{ @@ -174820,7 +176650,7 @@ pixel_y = 13 }, /obj/effect/floor_decal/industrial/warning/cee, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -174834,7 +176664,7 @@ name = "\improper DANGER: MASS EJECTOR PATH sign" }, /turf/space, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "wXN" = ( /obj/structure/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 @@ -174906,6 +176736,7 @@ /area/horizon/operations/lobby) "wYd" = ( /obj/structure/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/atmos_crosser) "wYg" = ( @@ -175087,6 +176918,9 @@ pixel_y = 4 }, /obj/structure/machinery/alarm/north, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor, /area/horizon/command/bridge/aibunker) "wYJ" = ( @@ -175228,7 +177062,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, @@ -175249,8 +177083,7 @@ /area/shuttle/merchant) "wZJ" = ( /obj/structure/machinery/nuclearbomb/station, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/redgrid, /area/horizon/command/bridge/selfdestruct) "wZT" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -175551,7 +177384,7 @@ }, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "xbT" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -175664,7 +177497,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/aft/port) "xcO" = ( /turf/simulated/wall/shuttle/unique/ert{ @@ -176207,7 +178040,7 @@ /obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port) "xfX" = ( /obj/structure/machinery/door/airlock/security{ @@ -176237,6 +178070,7 @@ pixel_x = 3; pixel_y = 8 }, +/obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/nacelle) "xgd" = ( @@ -176250,9 +178084,6 @@ "xgn" = ( /obj/structure/table/reinforced/steel, /obj/item/storage/bag/circuits/basic, -/obj/structure/machinery/light/small/emergency{ - dir = 1 - }, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "xgr" = ( @@ -176279,6 +178110,7 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/hangar) "xgx" = ( @@ -176492,9 +178324,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/machinery/light/small/emergency{ - dir = 1 - }, /turf/simulated/floor, /area/horizon/maintenance/substation/command) "xid" = ( @@ -176507,7 +178336,7 @@ name = "Deck 2 Starboard Nacelle Substation"; req_one_access = list(11,24) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/wing_port) "xie" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -176657,6 +178486,12 @@ /obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/exoplanet/grass, /area/centcom/shared_dream) +"xjN" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "xjP" = ( /obj/structure/machinery/camera/network/third_deck{ c_tag = "Third Deck - Crew Lounge Starboard" @@ -176681,6 +178516,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "xki" = ( @@ -176841,8 +178679,8 @@ /area/horizon/hallway/primary/deck_3/central) "xli" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/pinup/bay_47{ - pixel_x = -32 +/obj/structure/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) @@ -176860,7 +178698,7 @@ name = "Deck 3 Civilian Substation"; req_one_access = list(11,24) }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/substation/civ_d3) "xlm" = ( /turf/simulated/wall, @@ -176951,7 +178789,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/port/shortcut) "xma" = ( /obj/effect/floor_decal/spline/plain/corner{ @@ -177171,7 +179010,17 @@ "xnE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/random/maintenance_junk_or_loot, +/obj/structure/table/steel, +/obj/item/pen{ + pixel_x = 10 + }, +/obj/structure/sign/poster/civilian/bay_56{ + pixel_y = 32 + }, +/obj/item/paper/stickynotes/pad/random{ + pixel_x = -1; + pixel_y = 6 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "xnI" = ( @@ -177186,7 +179035,7 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/operations) "xnL" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -177197,6 +179046,7 @@ master_tag = "airlock_horizon_deck_2_starboard_aft"; name = "airlock_horizon_deck_2_starboard_aft" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) "xnQ" = ( @@ -177249,6 +179099,12 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/legion) +"xoq" = ( +/obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/turf/simulated/floor/redgrid, +/area/horizon/command/bridge/selfdestruct) "xos" = ( /obj/effect/floor_decal/corner/mauve{ dir = 5 @@ -177259,11 +179115,11 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/structure/machinery/atmospherics/pipe/simple/hidden, /obj/structure/machinery/power/apc/high/west, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/medical/cryo) "xoC" = ( @@ -177346,6 +179202,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /obj/structure/machinery/power/apc/east, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_starboard) "xpu" = ( @@ -177469,11 +179326,16 @@ /area/centcom/shared_dream) "xqg" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ - dir = 4 +/obj/effect/floor_decal/corner/purple{ + dir = 9 + }, +/obj/structure/table/steel, +/obj/item/stack/material/steel/full{ + pixel_x = -6; + pixel_y = 9 }, /turf/simulated/floor/tiled, -/area/horizon/maintenance/deck_1/wing/starboard/far) +/area/horizon/maintenance/deck_2/wing/starboard) "xqk" = ( /obj/effect/floor_decal/corner/purple{ dir = 9 @@ -177519,9 +179381,6 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos) "xqu" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/random/junk, /turf/simulated/floor/plating, @@ -177536,11 +179395,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/machinery/alarm/north, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard) "xqD" = ( @@ -177579,9 +179440,13 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "xqL" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/structure/platform_deco{ + icon_state = "ledge_deco" + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/wing/starboard/far) "xqT" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -177616,7 +179481,6 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/intrepid) "xrf" = ( -/obj/structure/machinery/light/floor, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -177640,6 +179504,9 @@ pixel_y = -9 }, /obj/structure/machinery/power/apc/east, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/substation/wing_port) "xrw" = ( @@ -177713,7 +179580,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/structure/lattice/catwalk/indoor/grate/damaged{ color = "#4c535b" }, @@ -177751,7 +179618,9 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "xsf" = ( -/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "xsn" = ( @@ -177935,17 +179804,13 @@ /turf/unsimulated/floor/wood, /area/antag/actor) "xtc" = ( -/obj/effect/floor_decal/corner_wide/blue{ - dir = 10 - }, -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 5 - }, +/obj/structure/machinery/firealarm/north, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/machinery/firealarm/north, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/horizon/command/bridge/selfdestruct) "xtf" = ( /obj/structure/closet/secure_closet/refrigerator/standard, @@ -177970,8 +179835,11 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/auxiliary) "xtj" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/cryo) "xtu" = ( @@ -178009,8 +179877,9 @@ "xtE" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/mapped{ - dir = 8 +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/near) @@ -178056,6 +179925,7 @@ /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/storage_maintenance) "xub" = ( @@ -178073,7 +179943,7 @@ /obj/effect/floor_decal/industrial/hatch_door/engineering{ dir = 1 }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/propulsion/starboard) "xuc" = ( /obj/structure/disposalpipe/trunk{ @@ -178197,9 +180067,6 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -178232,7 +180099,8 @@ dir = 9 }, /obj/structure/machinery/meter, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "xuR" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -178255,6 +180123,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/far) "xuT" = ( @@ -178374,7 +180243,7 @@ /area/centcom/legion) "xvQ" = ( /obj/item/material/shard, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/security/port) "xvY" = ( /obj/structure/machinery/camera/network/service{ @@ -178387,7 +180256,7 @@ "xwd" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/junk, -/obj/structure/machinery/light/small/emergency, +/obj/structure/machinery/light/small, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "xwf" = ( @@ -178422,9 +180291,6 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, -/obj/structure/machinery/light/small{ - dir = 1 - }, /obj/structure/closet/walllocker/medical/firstaid{ pixel_y = 32 }, @@ -178455,6 +180321,7 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, +/obj/structure/machinery/light/floor, /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenoarch/atrium) "xwU" = ( @@ -178472,7 +180339,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/research) "xxb" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -178488,7 +180355,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/structure/machinery/light/small/floor, /turf/simulated/floor/wood, /area/horizon/service/cafeteria) "xxi" = ( @@ -178513,8 +180379,8 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "xxu" = ( /turf/simulated/wall, @@ -178572,8 +180438,10 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "xxC" = ( -/obj/structure/table/rack, -/obj/random/loot, +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "xxE" = ( @@ -178948,6 +180816,7 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "xzE" = ( @@ -178971,8 +180840,12 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/hapt) "xzK" = ( +/obj/random/junk, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/aft) +/area/horizon/maintenance/deck_2/wing/starboard/far) "xzL" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -179342,6 +181215,14 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) +"xCH" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/random/dirt_75, +/obj/random/maintenance_junk_or_loot, +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_2/research) "xCI" = ( /obj/structure/platform/ledge{ dir = 4 @@ -179431,7 +181312,10 @@ "xDi" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/starboard/far) "xDm" = ( /obj/structure/machinery/light{ @@ -179475,7 +181359,7 @@ pixel_y = 24 }, /obj/effect/floor_decal/industrial/warning/full, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/unsimulated/floor/plating, @@ -179831,10 +181715,12 @@ /turf/simulated/floor/tiled/full, /area/horizon/command/heads/om) "xFD" = ( -/obj/structure/railing/mapped, -/obj/structure/lattice/catwalk/indoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/research) +/area/horizon/maintenance/deck_1/wing/starboard) "xFJ" = ( /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" @@ -180204,6 +182090,9 @@ }, /area/horizon/holodeck/source_moghes) "xIz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/cryo) "xIB" = ( @@ -180217,12 +182106,12 @@ /obj/structure/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/main/interstitial) "xIF" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/machinery/vending/quick_e_meals, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/cafe) "xIH" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -180338,7 +182227,7 @@ dir = 8 }, /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark/cooled, +/turf/simulated/floor/tiled/dark, /area/horizon/ai/upload) "xIY" = ( /obj/structure/bed/stool/chair/office/light{ @@ -180406,7 +182295,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, @@ -180428,6 +182317,7 @@ master_tag = "airlock_horizon_deck_1_aft_port_1"; name = "airlock_horizon_deck_1_aft_port_1" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/auxatmos) "xJO" = ( @@ -180723,7 +182613,7 @@ /area/horizon/service/cafeteria) "xLT" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, @@ -180820,7 +182710,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/tiled, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "xMC" = ( /obj/effect/floor_decal/industrial/outline_straight/yellow{ @@ -180918,7 +182809,7 @@ req_one_access = list(2,3,4) }, /obj/effect/floor_decal/industrial/hatch_door/yellow, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/security/evidence_storage) "xNh" = ( /obj/effect/floor_decal/industrial/outline/service, @@ -180950,6 +182841,9 @@ }, /area/horizon/medical/morgue) "xNk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, /turf/simulated/floor, /area/horizon/ai/upload_foyer) "xNm" = ( @@ -181049,6 +182943,9 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "xNW" = ( @@ -181212,7 +183109,7 @@ "xPf" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -181278,6 +183175,11 @@ /obj/structure/machinery/light_switch/west, /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) +"xPB" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "xPC" = ( /turf/simulated/floor/reinforced{ blocks_air = 1; @@ -181493,8 +183395,8 @@ /area/horizon/engineering/lobby) "xRs" = ( /obj/structure/machinery/atmospherics/pipe/manifold/visible, -/obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/auxatmos) "xRu" = ( /obj/structure/closet/crate, @@ -181615,8 +183517,7 @@ dir = 4 }, /obj/structure/railing/mapped, -/obj/random/maintenance_junk_or_loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_1/operations/starboard/far) "xSC" = ( /obj/structure/bed/stool/padded/red, @@ -181657,8 +183558,9 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/starboard/far) "xSQ" = ( -/obj/structure/closet/crate/bin, -/obj/random/med_stack, +/obj/effect/decal/cleanable/dirt, +/obj/structure/whiteboard/portable, +/obj/structure/machinery/alarm/north, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/operations/starboard) "xSV" = ( @@ -181698,7 +183600,10 @@ /obj/structure/sign/securearea{ pixel_y = 32 }, -/turf/simulated/floor, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/aft/port/far) "xTg" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, @@ -181859,7 +183764,8 @@ /turf/simulated/floor/tiled, /area/horizon/hangar/intrepid/interstitial) "xTV" = ( -/obj/structure/machinery/light/small/emergency, +/obj/structure/lattice/catwalk/indoor, +/obj/structure/machinery/light/small, /turf/simulated/floor, /area/horizon/maintenance/substation/civ_d3) "xTW" = ( @@ -182008,7 +183914,7 @@ /obj/effect/map_effect/door_helper/unres{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/operations/break_room) "xUR" = ( /obj/structure/closet/secure_closet/guncabinet{ @@ -182027,9 +183933,12 @@ /area/horizon/engineering/hallway/fore) "xUW" = ( /obj/structure/machinery/alarm/west, -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port) "xUY" = ( @@ -182061,7 +183970,10 @@ dir = 4 }, /obj/random/maintenance_junk_or_loot, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_2/wing/port/far) "xVj" = ( /obj/structure/machinery/camera/network/research{ @@ -182115,15 +184027,22 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_3/security/port) +"xVE" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/machinery/light/small/floor, +/turf/simulated/floor/wood, +/area/horizon/service/cafeteria) "xVO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "xVV" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 8 @@ -182331,7 +184250,7 @@ /obj/effect/map_effect/door_helper/unres{ dir = 8 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/holodeck_control/beta) "xXI" = ( /obj/structure/table/rack, @@ -182446,7 +184365,7 @@ dir = 4 }, /turf/simulated/open/airless, -/area/horizon/exterior) +/area/horizon/exterior/no_shields) "xYF" = ( /obj/structure/lattice, /obj/structure/machinery/light{ @@ -182615,7 +184534,8 @@ }, /obj/structure/machinery/light/small, /obj/random/dirt_75, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor, /area/horizon/maintenance/deck_3/auxatmos) "xZE" = ( /turf/simulated/wall, @@ -182647,7 +184567,7 @@ "xZR" = ( /obj/structure/closet, /obj/random/loot, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/wing/port) "xZU" = ( /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply, @@ -182788,9 +184708,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/structure/machinery/light{ - dir = 1 - }, /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/morgue_lift) "yaW" = ( @@ -182924,6 +184841,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/starboard/far) "ybZ" = ( @@ -182936,10 +184854,7 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "ycp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/carpet/rubber, /area/horizon/engineering/atmos/storage_maintenance) "ycu" = ( /obj/effect/floor_decal/industrial/warning{ @@ -182969,7 +184884,7 @@ }, /area/shuttle/syndicate_elite) "ycB" = ( -/obj/structure/machinery/light/small/emergency{ +/obj/structure/machinery/light/small{ dir = 1 }, /turf/simulated/floor/reinforced/airless, @@ -183209,6 +185124,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/main_compartment) "yef" = ( @@ -183444,6 +185362,12 @@ /obj/effect/floor_decal/industrial/hatch_door/engineering, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/hallway/aft) +"yfa" = ( +/obj/structure/machinery/shield_diffuser{ + pixel_y = 2 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior/no_shields) "yfc" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 @@ -183661,6 +185585,9 @@ /obj/item/circuitboard/optable, /obj/item/circuitboard/security/engineering, /obj/item/circuitboard/grill, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "ygu" = ( @@ -184051,6 +185978,13 @@ /obj/effect/floor_decal/corner/mauve/full, /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenobiology) +"yji" = ( +/obj/random/maintenance_junk_or_loot, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/maintenance/deck_2/wing/port/far) "yjj" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -184067,15 +186001,15 @@ /turf/simulated/floor/grass/no_edge, /area/horizon/service/hydroponics/lower) "yjp" = ( -/obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/stool/chair/office/dark{ + dir = 8 }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/horizon/service/bar) +/turf/simulated/floor/tiled/dark, +/area/horizon/maintenance/deck_1/operations/starboard/far) "yjt" = ( /obj/structure/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/medical, @@ -202315,7 +204249,7 @@ swu swu ooy wTz -dMd +nOK ooy swu eSV @@ -203323,7 +205257,7 @@ eSV eSV tua gsg -kVr +xXe xxB mug tss @@ -203585,13 +205519,13 @@ rfC rfC tss jFW -efI -efI -tqS -tqS -tqS -tqS +qBY +qBY tqS +yjp +rkL +rkL +qBY efI xSt aDC @@ -203837,7 +205771,7 @@ vQY wqY taW bJk -jAH +mEa jAH sSA hnj @@ -204090,8 +206024,8 @@ mhP rfC rfC rhw -cXF -jaK +jBv +meP fpc vQA gJW @@ -204342,13 +206276,13 @@ eSV eSV rfC prG -jaK +new klF iQp kVr -jaK -jaK -cXF +sqS +jBv +meP taW nkF kLq @@ -204599,17 +206533,17 @@ eSV eSV tua oxe +jBv +jBv jaK -jaK -jaK -xqg +kVr cXF sLa fIn taW lNe tKq -wsN +dKI taW pYX sCS @@ -204856,8 +206790,8 @@ eSV eSV tua oxm -jaK -cXF +jBv +jBv meP taW taW @@ -205121,11 +207055,11 @@ bMo nju ayn taW -vjm +hCL gUT +vRZ taW -taW -ahH +dzV wlr wlr htA @@ -205379,10 +207313,10 @@ hFg hFg taW bdv -bdv +mfb taW -fxq -dzV +taW +ahH dPK jxs yjC @@ -205634,8 +207568,8 @@ sQE sQE ida hFg -oxe -cXF +jSc +joO aBI taW wQg @@ -205892,7 +207826,7 @@ evv lnz hFg kdG -cXF +rjd xqL jHt mAe @@ -206149,10 +208083,10 @@ aoJ lnz hFg jOM +eCs cqB -fvR jHt -mAe +dKI mcw wlr wji @@ -206405,9 +208339,9 @@ scN aoJ lnz xZm -oxe -oGs -sjz +vjm +nXu +hQt jHt mAe uTy @@ -206638,8 +208572,8 @@ eSV eSV eSV eSV -rSL -rSL +qLr +qLr eTR tDE rSL @@ -206663,8 +208597,8 @@ iZD lnz xZm sTe -xXe -xXe +wMC +kMN taW owI uKF @@ -206889,14 +208823,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr eTR tDE rSL @@ -207146,15 +209080,15 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -eTR +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +gMA tDE rSL rSL @@ -207403,14 +209337,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr eTR tDE rSL @@ -207655,19 +209589,19 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr eTR tDE rSL @@ -207911,20 +209845,20 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr sRg tDE tDE @@ -207955,13 +209889,13 @@ nfd lcZ jxL uvv -rHt -uvv -afe +jdo +fhO +hCj kbC ppE -rHt -uvv +jNs +gwi vVL aOe jgx @@ -208168,20 +210102,20 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr eTR tDE rSL @@ -208424,21 +210358,21 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +sRg +eTR +eTR +eTR +eTR +eTR +eTR +eTR +eTR +eTR sRg tDE rSL @@ -208681,12 +210615,12 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +eTR qyQ tDE tDE @@ -208733,7 +210667,7 @@ uOT uOT tJW qHn -hWT +gqp hWT jgx bzL @@ -208937,13 +210871,13 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +eTR tDE tJJ tJJ @@ -208976,7 +210910,7 @@ nNk dmm hFg plB -rHt +xFD tJW dIe sxl @@ -209193,14 +211127,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +gMA tDE qlh hOu @@ -209449,14 +211383,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe iWT iWT @@ -209706,14 +211640,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe xPC xPC @@ -209747,7 +211681,7 @@ wbG nad nid uCN -akV +aCt tJW hQh avE @@ -209963,14 +211897,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr jLM xPC rkZ @@ -210002,7 +211936,7 @@ vht uUo mwG nad -dUZ +woF hjs woF tJW @@ -210220,14 +212154,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe xPC xPC @@ -210477,14 +212411,14 @@ eSV eSV eSV iUQ -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe jOq jOq @@ -210513,8 +212447,8 @@ huR idV diA qGr -rMc gWV +wsN quK rXL opl @@ -210734,13 +212668,13 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe iWT iWT @@ -210991,13 +212925,13 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe xPC xPC @@ -211248,13 +213182,13 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr uui xPC rkZ @@ -211294,9 +213228,9 @@ gRK xnE nXe iFI -gou +nxU +oUx vrJ -gou san bGJ vBR @@ -211505,13 +213439,13 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe xPC xPC @@ -211550,12 +213484,12 @@ lTB gRK iDV nFZ -gou -gou +iTN +lKW gKz dta pyo -gou +lme rvf ecj gRK @@ -211761,14 +213695,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe jOq jOq @@ -211806,14 +213740,14 @@ wtJ lTB gRK xSQ -jbx -gou -gou -gou -pws +aCR +moG +nwM +pAe +hWT sIk -lKW -lKW +hWT +hWT sgF uEI hWT @@ -212019,14 +213953,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe iWT iWT @@ -212063,8 +213997,8 @@ hrS avG gRK dTn -jbx -gou +iTN +wwN lKW gou fta @@ -212276,14 +214210,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe xPC xPC @@ -212317,17 +214251,17 @@ ygr meB mUv uCN -akV +aCt gRK kll -vrJ +euC mMO -vrJ +tvn dsf iYO xMz rUY -vrJ +eFv fSb wZA beE @@ -212533,14 +214467,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr iXn xPC rkZ @@ -212572,7 +214506,7 @@ pWo meB meB meB -jTM +gDu bHz gDu gRK @@ -212790,14 +214724,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe xPC xPC @@ -212828,11 +214762,11 @@ xMp vGz aCt ssf -qLQ -pkJ +tbR +coT uCN -aCt -sae +nsQ +vDf sae qLQ ssf @@ -213047,14 +214981,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr oMe oMe jOq @@ -213099,7 +215033,7 @@ lJn jQA dyx uJc -pzV +ttN wZA dFP jhe @@ -213304,16 +215238,16 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr tJJ tJJ szc @@ -213561,17 +215495,17 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr tJJ tJJ tJJ @@ -213818,17 +215752,17 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr kEc kEc etP @@ -213843,10 +215777,10 @@ hPJ lKF cbM gHe -cBy +gHe wVl wdd -cBy +gHe ieG oXm lKo @@ -213855,7 +215789,7 @@ iBP dYV kYZ lKo -eYo +qqP bGo fFU wXy @@ -214075,16 +216009,16 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr wXz wZw tHL @@ -214333,16 +216267,16 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr kEc ssy etP @@ -214356,7 +216290,7 @@ ahB saD bAv cRS -moN +dMd moN lTV lTV @@ -214372,7 +216306,7 @@ lKo bni pAa liX -qfa +std lQd lQd lQd @@ -214591,15 +216525,15 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr tDt nPJ lIN @@ -214849,14 +216783,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr jSo goe tfG @@ -214883,7 +216817,7 @@ mbO mwx chZ lKo -wcB +qqP ndG hGt hGt @@ -215106,14 +217040,14 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr +qLr jSo dJk rGz @@ -215140,7 +217074,7 @@ lKo unM lKo lKo -okz +qqP sqM hGt ozx @@ -215363,13 +217297,13 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr +qLr owU kEc kEc @@ -215620,12 +217554,12 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr +qLr oBv frp rhP @@ -215655,7 +217589,7 @@ hie jvh lKo vIR -cPd +nUL hGt cbH dnK @@ -215664,7 +217598,7 @@ klH fOM hGt lsX -aPJ +esN qwi nRa lbj @@ -215878,11 +217812,11 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr eTR swu wCk @@ -215912,7 +217846,7 @@ rzj mHI lKo eXT -jdo +nUL hGt irM gIh @@ -216135,11 +218069,11 @@ eSV eSV eSV eSV -rSL -rSL -rSL -rSL -rSL +qLr +qLr +qLr +qLr +qLr eTR rSL pFF @@ -216426,7 +218360,7 @@ pcn det lKo ifu -gTF +nUL hGt hGt iKv @@ -216692,7 +218626,7 @@ iNk iNk iNk aAX -aAX +jqg qwi qwi ieR @@ -216941,7 +218875,7 @@ pdw tVN sJO sJO -sJO +wTA sJO cyD koZ @@ -217243,7 +219177,7 @@ wGg dAO ixB esA -esA +fUs fUs iJG fdt @@ -217455,7 +219389,7 @@ kBl jwp ooP kST -oWD +obv oWD cyD woc @@ -217489,7 +219423,7 @@ hdc bPS uVW nxM -yed +lJz dwn oEP dwn @@ -221829,7 +223763,7 @@ jRR fpH uxc sio -djZ +vZK vYZ oeT sxb @@ -222086,7 +224020,7 @@ owQ ahU sBT sQy -vZK +djZ vYZ oeT nEo @@ -222600,7 +224534,7 @@ owQ ahU tEX gXz -vts +bxY vYZ oeT uIj @@ -222857,7 +224791,7 @@ owQ ahU pPQ dpe -vts +pPQ vYZ hTy hTy @@ -223112,14 +225046,14 @@ uGV uGV lZy ahU -tEX +dOk vgh rpV hmM -blI +iqK uku esc -rpV +gel gBg xgH qEr @@ -223863,7 +225797,7 @@ iHh iHh hgK qGq -lzd +bjj aus umn jwD @@ -224142,7 +226076,7 @@ cVG xzl mbV rtS -vts +vti eFV onW nLE @@ -224639,7 +226573,7 @@ aus bti kYw mha -lzd +xxb eMv nHV nLo @@ -224650,7 +226584,7 @@ nLo nHV qiR yfU -amR +gxi coJ cVG oDt @@ -224941,7 +226875,7 @@ tzF ggJ ggJ ggJ -ggJ +eBH rNG qCn bdZ @@ -225455,7 +227389,7 @@ bbj jFo jFo gNE -gNE +ltn gNE gNE gNE @@ -226983,7 +228917,7 @@ oRJ eLF jVV dHs -bBk +jMp eEw ktX wIE @@ -227989,10 +229923,10 @@ dfr oDa lHu dfr -sRg -rEc -fLP -jMM +xNA +fvR +bgD +gxi dok dok dok @@ -228024,8 +229958,8 @@ caC lnO bhl bhl -lnO rWr +lnW bdZ bdZ bdZ @@ -228246,10 +230180,10 @@ aJU aJU aJU xkJ -sRg -rEc -bgD -kMN +xNA +dYE +sha +gxi dok bJR eJj @@ -228281,7 +230215,7 @@ iBn xie iBn hrU -iBn +bSs swm eTt xth @@ -228503,9 +230437,9 @@ aJU aJU aJU lHu -sRg -rEc -fLP +xNA +xNA +xNA woP dok oZQ @@ -228760,10 +230694,10 @@ aJU aJU aJU xkJ -sRg +xNA rEc -bgD -fLP +hMn +gxi dok uBS vrM @@ -229017,10 +230951,10 @@ aJU aJU aJU lHu -sRg -rEc -bgD +xNA +fgy bgD +gxi dok dok dok @@ -229042,7 +230976,7 @@ upf lgr lgr fVa -jUl +rBO scr njf xZg @@ -229274,8 +231208,8 @@ aJU aJU aJU xkJ -sRg -sRg +xNA +xNA xNA xNA gLM @@ -233411,7 +235345,7 @@ eSV eSV eSV xDX -jNs +kgm jpS vsr eSV @@ -264491,7 +266425,7 @@ sSL mvX fjk sSp -usI +sSL sSL okw bGR @@ -264500,14 +266434,14 @@ okw laV sDE fqa -sDE +naT sDE sDE jnC sDE fqa siH -vti +sDE fQP aef urY @@ -264748,7 +266682,7 @@ lqt oRC bsJ kti -oRC +kti kzy okw uDy @@ -264761,12 +266695,12 @@ ncE jGV lWb gGL -qgf +gfP fjk kvT qjG fjk -kiI +qjh lHQ mzX fjk @@ -265003,10 +266937,10 @@ wSb xPN iNQ syu -rSV +srI gMP -kti -kti +srI +srI xid peq lFZ @@ -265014,7 +266948,7 @@ okw mCO tkj fjk -xxC +srI nNG haz cJN @@ -265023,7 +266957,7 @@ fjk iWn hCI qqm -aPd +kiI lHQ qjH fjk @@ -265259,11 +267193,11 @@ eSV tYz rPj sSL -mvX -kti -kti +lFe +srI +lCc hDV -qgf +xxC okw oxM xrs @@ -265272,15 +267206,15 @@ baX uUa qem srI -qjG -qjG +uTo +haz tOX srI qem -nED -srI +kvT +lUN vBe -iuG +kiI lHQ jTy fjk @@ -265519,7 +267453,7 @@ fjk fjk tfB fjk -ixJ +fjk fjk okw okw @@ -265774,9 +267708,9 @@ aHz fjk tWX nWa -kti +srI tYc -pnw +jUn lgY jUn nUl @@ -265791,10 +267725,10 @@ wnP aMt kZc srI -nED +kvT klY fjk -nED +kvT qfP fjk fjk @@ -266030,17 +267964,17 @@ tYz jQD fjk sSp -kti +uZR rSV ybU -bsJ +xzK fjk sMp +fQq +fQq +pOa qgf -qgf -vMb -qgf -qgf +fQq fRc rWx ffJ @@ -266308,8 +268242,8 @@ lik qWj sbt eNL -iuG -qjG +kiI +pws efY ucz fjk @@ -266547,7 +268481,7 @@ cxh gIJ iWj jmf -jNB +wcB hwV epZ oly @@ -266802,9 +268736,9 @@ fJX fJX tim byC -gAs +jNB vkO -tDL +jNB tfU pGJ mKw @@ -267057,11 +268991,11 @@ rZc lkX fJX wYS -iWj +jNB sam qog sdl -pEd +qHG bSi wjs mEQ @@ -267314,10 +269248,10 @@ xnV njK fJX mYY -pEd +qec kov wrk -pOa +vkO sDi hwV qJo @@ -267570,10 +269504,10 @@ tYz mHE fJX fJX -iWj +rqX +fJX fJX fJX -jNB sdl qvA bSi @@ -267827,10 +269761,10 @@ rZc kiT rir deU -iWj +gog fJX -gLE -jNB +swW +tgl sdl kRU bSi @@ -268084,7 +270018,7 @@ xnV fJX bjK gNJ -rDN +cPd eQA rDN mjM @@ -268341,9 +270275,9 @@ bnZ fJX lNC esh -pEd -gqp -tDL +cfP +fJX +pGF dvt hcp peN @@ -268598,9 +270532,9 @@ blA fJX snE esh -pEd -gqp -pEd +cfP +fJX +mor fke kJG gLE @@ -268863,16 +270797,16 @@ uIt wat tfU mZz -wxe -gla -gla -gla +mZz +mZz +mZz +mZz aUO wxe loS wij oXf -moG +oXf eXH jgu aNy @@ -269109,7 +271043,7 @@ eSV tYz mHE kzH -vnD +xqg lQN vnD lXk @@ -269117,11 +271051,11 @@ fJX fJX bvs dFA -pEd +ufx fJX jRb cnn -wxe +vcp pfo vYo vBL @@ -269366,9 +271300,9 @@ eSV rZc kiT btW -pEd -tlD pFs +tlD +btW baC baC fJX @@ -270393,15 +272327,15 @@ tHf exF xqu pEd -pFs +btW fJX fJX fJX fJX fJX fpW -wjV -gqp +eIx +nHy kEI fJX rPD @@ -271429,7 +273363,7 @@ qyO bnl hLU kDz -jkr +bzM jkr jkr pyM @@ -271679,7 +273613,7 @@ nXR iPo pYS jOd -oJM +pZu gFm kdu uWf @@ -271688,7 +273622,7 @@ oaF oaF oaF oaF -uTo +gun nez rdJ dod @@ -271937,14 +273871,14 @@ dUK ppk rsr jqe -oJM +pnw nbn jWI sjO bzr pTG uyE -cFn +uyE hNb nLu nwj @@ -272193,7 +274127,7 @@ ppk ppk ppk sdp -sdp +rOO bVg akk aCW @@ -272201,8 +274135,8 @@ sjO bzr svM pTG -ufx -eBH +pTG +hNb vaL nwj qNa @@ -272227,7 +274161,7 @@ dhN dhN dhN dhN -fUl +ihL uHG aaw dEI @@ -272974,7 +274908,7 @@ sON ltE dUV khW -ebm +ewG nwj vwY eTz @@ -273247,7 +275181,7 @@ tWP cxb cxb jdq -aFJ +tTJ chu tWP tNC @@ -273495,10 +275429,10 @@ cgw hvn iBh iBh +cFn +iBh +iBh iBh -dBq -oJM -oJM oMH tWP vOb @@ -273740,20 +275674,20 @@ eNf oGM sWx cVF -sWx +tDV utL jCu kvH ape nGt dzZ -ape +xtE mBL -euC +ape +ape xtE -xtE -dYE -bcf +ape +ape yki pan qVv @@ -274513,7 +276447,7 @@ fRB ykj aEs leL -oZN +kEE qgh rmS ipa @@ -274744,7 +276678,7 @@ dBi lTn cXW lTn -lTn +dBi lTn lTn xHQ @@ -274782,7 +276716,7 @@ rmS yaR caI gOt -prj +lss rPd nUu vmb @@ -276312,7 +278246,7 @@ jwC fpR fpR fQk -lUN +rjI dXe ygJ ygJ @@ -277083,8 +279017,8 @@ unC qiC fpR rFQ -oZN -iJq +pzV +aio ygJ tAr kqK @@ -277336,7 +279270,7 @@ gDn pbP tWW tDd -tvn +unC qiC fpR rFQ @@ -277854,7 +279788,7 @@ oZN uga uga mfn -teO +nti hdD fXk bWj @@ -278368,7 +280302,7 @@ jGr xGE fpR rFQ -teO +oGs aio xlm aUI @@ -279396,7 +281330,7 @@ pPE stI kfX qaV -tcA +aio xlm xlm uwk @@ -279652,7 +281586,7 @@ bim bSB whQ mCw -jur +gTF iZk xlm xlm @@ -279688,7 +281622,7 @@ nku msU qVW gGT -mvt +qVW kYT fhz rfq @@ -279908,7 +281842,7 @@ udq tqs bSB xVm -teO +aSC jur nLs koc @@ -279953,10 +281887,10 @@ vlf gyf sAM wwp -qBY vNU +fNn fqF -yjp +eGN stz fui jrl @@ -280165,7 +282099,7 @@ gTR hIU xeI whQ -oZN +mCw eTx aIT koc @@ -280213,11 +282147,11 @@ hQe ezA ofw ozK -iVG +eGN moS fui jrl -sdI +mEk tnA crQ tUB @@ -280937,7 +282871,7 @@ tqs bSB whQ jzS -ekN +qTS jdZ qTS jEE @@ -281176,7 +283110,7 @@ cSv bHl cwA ksO -mHM +iGQ aSM oqf lyi @@ -281965,8 +283899,8 @@ qEQ nIl stI stI +jTM tHu -coT xIz xtj jHa @@ -282205,7 +284139,7 @@ egn jxA sRp wUd -wUd +dFV bVJ wUd rBX @@ -282219,7 +284153,7 @@ iUf aFt nYs uef -bSB +bWK fKx stI stI @@ -282527,7 +284461,7 @@ iGf oiD pqM wwv -rxQ +qQf fje wFI wFI @@ -282736,10 +284670,10 @@ vKz dwE lGs ujA -lGs +hgJ dwE upO -bSB +fxq gvf stI oaA @@ -282988,10 +284922,10 @@ dLd tlL gOK lNY -lql +utO wWv djb -utO +lql uFY lql lql @@ -283765,8 +285699,8 @@ bLv bLv bLv ecg -rkL -nLp +umG +mvt ikp gst kBx @@ -284022,10 +285956,10 @@ bLv bLv bLv ecg -rkL qCx +pTN xrf -gst +edn mlB pQd pwm @@ -284279,8 +286213,8 @@ bLv bLv bLv ecg -rkL -lJz +umG +nLp qRi rCg iAR @@ -286328,7 +288262,7 @@ iNU enb uWn nJg -vxx +rMc vxx lbd dpx @@ -286370,7 +288304,7 @@ oGh kwI aoE aoE -yfn +jaF leN nBM pxy @@ -287093,8 +289027,8 @@ wuX dHB aTV ycp -aTV -aTV +ycp +ycp hzs vwP ycF @@ -287367,7 +289301,7 @@ cwK ceN nKX vQS -nqF +rTg fnk qtl cyZ @@ -287624,7 +289558,7 @@ xMb xRv hQo dZD -nqF +rTg fnk ovK cyZ @@ -287861,12 +289795,12 @@ epn uOD jOO vDb -xzK +jOO rST -xzK +jOO faM vnP -ata +jOO jBy qmF fHs @@ -287882,8 +289816,8 @@ nqF ydZ nqF nqF -fnk -ovK +paQ +qgE cyZ ufu hNT @@ -288118,7 +290052,7 @@ jiy dzv jOO ufs -rTp +qCy vnP dYY dYY @@ -288376,7 +290310,7 @@ uOD jOO pRY ubX -rTp +qCy dYY oOR lzQ @@ -288397,11 +290331,11 @@ tmk rJl pAT fnk -qgE +ovK cyZ goa dkb -bAg +bdp qKU cyZ mwl @@ -288633,7 +290567,7 @@ dsL aIU pRY tgg -rTp +qCy dYY pUg hxH @@ -288887,7 +290821,7 @@ bqw ovm cqF jOO -qec +jOO pRY oTH qCy @@ -288911,7 +290845,7 @@ nXc uGo uGo dVf -ovK +qgE cyZ dtb jqj @@ -289142,7 +291076,7 @@ oUm dOx qJs ovm -ubX +ixJ jOO yak pRY @@ -289401,7 +291335,7 @@ ovm ovm oep jOO -wMC +jOO afY afY afY @@ -289658,7 +291592,7 @@ ovm tAI tAI tAI -jOO +nmJ afY hoc xRV @@ -290463,7 +292397,7 @@ pCI oaL hKx apM -lkG +xCH hCQ hCQ hCQ @@ -291209,7 +293143,7 @@ twH uXi cwC gbF -gbF +qcY eMG gbF eRe @@ -292252,7 +294186,7 @@ hfB tuY gGK pfE -qgE +ovK neT jCF gwn @@ -292265,7 +294199,7 @@ jyQ wGF qTu bJf -fwI +aPd abh efg gos @@ -292507,9 +294441,9 @@ cfm cfm cfm tuY -dQA +paQ rlz -bjl +qgE neT jCF jCF @@ -292758,15 +294692,15 @@ rrx nRV uJH vZd -xFD +rim cfm cfm cfm cfm tfn -gBd -qmR -ovK +czN +eLe +gUK tuV jCF gwn @@ -292778,7 +294712,7 @@ mFY rmO mso qTu -iHT +wjV iaC fqG fTe @@ -293786,7 +295720,7 @@ jVY kXk eXV kRy -czN +rim rIA gwn gwn @@ -294043,15 +295977,15 @@ kdc xFe eXV lVs -czN +rim rIA gwn gwn gwn neT paQ -qmR -ovK +okz +qgE ohz ohz moM @@ -294300,14 +296234,14 @@ jgB rkM eXV tXc -czN +rim rIA gwn gwn gwn neT fnk -qmR +okz ovK mFY qcM @@ -294574,13 +296508,13 @@ pnP hpD hvc kmb -ozc +usI rKb taE taE bqZ tXd -ash +dQA fTe xtB nXi @@ -294837,7 +296771,7 @@ twJ hPT bqZ sKU -ncB +ggG fTe gsR fFV @@ -295094,7 +297028,7 @@ sUE fwI laK tXd -oMW +kCc fTe meW mbR @@ -295608,7 +297542,7 @@ fpo hdM bqZ tXd -fwI +dLS sxD fTe fTe @@ -295865,7 +297799,7 @@ gll ncB bqZ mfu -fwI +dLS lkJ qTu oHF @@ -296122,7 +298056,7 @@ ash jGx bqZ tXd -iaC +fxg qTu qTu kBv @@ -296383,7 +298317,7 @@ qTu qTu vgA llu -iey +clc vTm kWK obe @@ -296635,12 +298569,12 @@ rzi qYc pnk eAZ -uZR -iey +ass +bEr xUW -iey -iey -llu +sDx +sDx +iVb nSn xnT qHe @@ -296892,12 +298826,12 @@ rzi xqI alf bGw -nBW -iey -iey -llu -iey -iey +ass +ass +ass +tcA +ass +ass tlN hNn xXl @@ -297146,16 +299080,16 @@ eDy qvd lAg rzi -iey -iey nSn -nBW -iey -iey +nSn +elV +agT +ass +ata nfe -xqI -iey -iey +gAs +hNu +hNu cTn lgd rzi @@ -297406,8 +299340,8 @@ rzi xqI nBW iey -nSn -iey +clc +ass xqI cYQ eRy @@ -297921,7 +299855,7 @@ rzi rzi rzi rzi -iey +ass iQH rzi vHq @@ -298154,7 +300088,7 @@ mGC dZt qBg bce -bvp +kmv bvp vbn uwY @@ -298412,7 +300346,7 @@ htU sWD eXV cOz -sHs +sxQ bri uwY dQT @@ -298669,7 +300603,7 @@ rlk kpN kpN jPS -ipQ +icR bvp uwY hAg @@ -298683,7 +300617,7 @@ boy egy nsw uwY -pAV +cVh oom wZE wec @@ -298940,12 +300874,12 @@ rjR rGZ itL uwY -pAV +cVh dCz -cdm -cdm -xsf -cdm +lZu +iuG +cBy +iuG aMX aMX aMX @@ -299200,9 +301134,9 @@ uwY eVJ fEm xsf -ipQ -sHs -sHs +iJq +iJq +iJq aMX hqr bMK @@ -299453,19 +301387,19 @@ uwY mEd hql uwY -pAV +dUZ wTw cuO xNU bxI -sHs -ihk +eYo +sjz aMX pGi vtv -ihk -pMv -ihk +bvp +uiM +cdm rwq piA bWZ @@ -299697,7 +301631,7 @@ eTS sBe aMX ihk -ihk +amR aQm acr rIU @@ -299715,12 +301649,12 @@ oYa wSF vON uDg -ihk -ihk +aSk +aSk aGt -ihk -ihk -sHs +bvp +bvp +bvp uiM ipQ ipQ @@ -299954,7 +301888,7 @@ qJp bTv aMX pAV -pAV +bcf bvp uwY mOQ @@ -299967,10 +301901,10 @@ uwY oHl aGL uwY -pAV -ihk +qdE +wzp oMt -aMX +iZX lad hGA rjn @@ -300225,7 +302159,7 @@ uwY uwY uwY kpN -cdm +qLX xuS aOa doU @@ -300233,7 +302167,7 @@ jXE bsd jOh vwJ -aSk +gda aSk aIW aMX @@ -300488,7 +302422,7 @@ nfw ldZ oOz okF -std +aSk aSk aSk kIR @@ -300731,15 +302665,15 @@ iml ssr lYo pxO -cdm +bvp kpN qKF -ihk -pAV -pAV +ffQ +lzd +lzd gnX kpN -xsf +yji oBu lJr wbs @@ -301002,7 +302936,7 @@ kOu kOu kOu kOu -std +aSk xVh aMX sYx @@ -301253,14 +303187,14 @@ evC evC evC sKD -qLX +veP cFr veP dWf uJT kOu hEh -eLe +ekP pAr akB ntb @@ -301506,13 +303440,13 @@ aMX sKD sKD sKD -evC -evC -evC +sKD +sKD +sKD sKD qnV -nwM -lwq +bBm +hnP exE xgc kOu @@ -301760,17 +303694,17 @@ qwo bBm bUr bBm +nED bUr -bUr -sKD -sKD -sKD -sKD +hnP +bBm +sYd +obs sKD axx rVl bvV -mxY +bjl dqM kOu jrL @@ -302021,17 +303955,17 @@ hnP ssK hDX hDX -ewG -lFe +hDX +hDX suc -gfP +hDX qDP lpw uPG -kmv -kmv pXR -ffQ +pXR +pXR +pXR aeY eZR jZH @@ -302279,11 +304213,11 @@ swi hnP bBm sGd -bBm +hnP kOu huQ aAl -sGd +rTp bXN rSt rSt @@ -302291,8 +304225,8 @@ iMi tKz rFk dyP -jSj -eZR +bBm +bBm eZC gwI gwI @@ -302549,7 +304483,7 @@ gKj dHQ qzR dKr -fQq +bBm vQV het het @@ -328220,47 +330154,47 @@ eSV eSV eSV eSV -iJX -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -hoE +wAf +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +sLF eSV eSV eSV @@ -328476,49 +330410,49 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -328733,49 +330667,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -328990,49 +330924,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -329247,49 +331181,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -329504,49 +331438,49 @@ eSV eSV eSV eSV -sIA +jXG ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -329762,47 +331696,47 @@ eSV eSV eSV eSV -sIA -hCm -hCm +jXG +lpj +lpj ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +fmW eSV eSV eSV @@ -330022,34 +331956,34 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -330279,34 +332213,34 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -330535,36 +332469,36 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -330792,36 +332726,36 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -331049,37 +332983,37 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -331305,38 +333239,38 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -331562,39 +333496,39 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -331819,39 +333753,39 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -332075,41 +334009,41 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -332332,48 +334266,48 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -dbd -dbd -dbd -dbd -dbd -dbd -hoE +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +icV +icV +icV +icV +icV +icV +sLF eSV eSV eSV @@ -332589,50 +334523,50 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -dbd -hoE +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +icV +sLF eSV eSV eSV @@ -332845,51 +334779,51 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC eYq -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -333102,51 +335036,51 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -hCm -lEF +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +lpj +fmW eSV eSV eSV @@ -333359,49 +335293,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc wWR eSV eSV @@ -333615,50 +335549,50 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC eYq -cKu -uYQ +vfC +aGc xKG eSV eSV @@ -333872,50 +335806,50 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -334129,49 +336063,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC eYq -cKu -cKu +vfC +vfC eYq gSa -cKu +vfC eYq hig oJZ iyb hig eYq -cKu +vfC gSa eYq -cKu -cKu +vfC +vfC quS eSV eSV @@ -334385,51 +336319,51 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC asF bWN uHE hig -cKu -cKu -cKu -cKu -pWB -hCm -lEF +vfC +vfC +vfC +vfC +hZl +lpj +fmW eSV eSV eSV @@ -334642,49 +336576,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hig wQk mRO asF -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -334899,49 +336833,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC cOn -cKu -cKu +vfC +vfC hig gFS byp hig -cKu -cKu +vfC +vfC gSa -cKu -uYQ +vfC +aGc eSV eSV eSV @@ -335155,38 +337089,38 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hig oMr oMr @@ -335194,12 +337128,12 @@ hig uXb fXe hig -cKu -cKu -cKu -cKu -tGt -hoE +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -335412,38 +337346,38 @@ eSV eSV wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gHu axa mdM @@ -335451,12 +337385,12 @@ ukD jkv bot hig -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -335669,38 +337603,38 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC sZh cCR obF @@ -335708,13 +337642,13 @@ fmt pJn rDZ hig -cKu -cKu +vfC +vfC lTN -cKu -cKu -tGt -hoE +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -335925,39 +337859,39 @@ wWR wWR wWR wWR -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hig hig hig @@ -335968,10 +337902,10 @@ hig oMr oMr hig -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +aGc eSV eSV eSV @@ -336182,42 +338116,42 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC cOn -cKu -cKu +vfC +vfC hig qot uzq @@ -336225,11 +338159,11 @@ djB akl lhM kfy -cKu -cKu -cKu -cKu -hoE +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -336439,42 +338373,42 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC asF isA ffD @@ -336482,11 +338416,11 @@ mZu shA uXp ccS -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -336695,43 +338629,43 @@ wWR wWR wWR wWR -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC asF lKy rhZ @@ -336739,12 +338673,12 @@ hig hig hig hig -cKu -cKu -cKu -cKu -tGt -hoE +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -336954,54 +338888,54 @@ wWR lyG mhk ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu -cKu +vfC +vfC hig cLZ wea hig -cKu -cKu +vfC +vfC lTN -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -337210,56 +339144,56 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC hig wBi pwn hig -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -337465,58 +339399,58 @@ wWR wWR wWR wWR -iJX -dbd -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wAf +icV +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC rwJ uOC fZg hig -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -337722,59 +339656,59 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu -cKu +vfC +vfC asF lKy jjV hig -cKu -cKu +vfC +vfC gSa -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -337979,59 +339913,59 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -rVj -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +tAV +vfC +vfC asF oro rxr hig -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -338235,45 +340169,45 @@ wWR wWR wWR wWR -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +ioS +ioS +ioS +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC +vfC +vfC eYq -dbd -gFJ -cKu -cKu +icV +psu +vfC +vfC hig tkB sez @@ -338281,16 +340215,16 @@ hig hig hig hig -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -dbd -hoE +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +icV +sLF eSV eSV eSV @@ -338492,36 +340426,36 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +ioS +wzz +ioS +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC wEr wEr cFE @@ -338538,16 +340472,16 @@ rgk vyb nIz wUJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -338749,25 +340683,25 @@ wWR wWR wWR wWR -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +ioS +ioS wvs bnv nzM @@ -338795,16 +340729,16 @@ rrS jyW nIz hig -cKu -cKu -dQL -cKu -cKu -cKu -cKu -pWB -hCm -lEF +vfC +vfC +wzz +vfC +vfC +vfC +vfC +hZl +lpj +fmW eSV eSV eSV @@ -338994,37 +340928,37 @@ wWR wWR wWR wWR -iJX -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu +wAf +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +icV +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC +vfC +vfC wlQ oyp iLs @@ -339058,8 +340992,8 @@ lYg sIm kxZ uBs -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -339247,37 +341181,37 @@ wWR wWR wWR jhY -hDB -hDB -hDB -hDB -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +xjN +xjN +xjN +xjN +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC ykc xAE mYm @@ -339315,8 +341249,8 @@ uyj tXJ eVH iRy -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -339503,38 +341437,38 @@ wWR wWR wWR wWR -gDh -iJX -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +kFV +wAf +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC ach tKO tMs @@ -339572,8 +341506,8 @@ pnM pnM aoT stX -dQL -uYQ +wzz +aGc wWR eSV eSV @@ -339760,38 +341694,38 @@ wWR wWR wWR jhY -cKu +vfC rdm -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC fKY wFQ cug @@ -339829,8 +341763,8 @@ jQf pzD ago stX -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -340016,39 +341950,39 @@ wWR wWR wWR jhY -iJX -dbd -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu -cKu +wAf +icV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC +vfC +vfC +vfC xoK lOJ cug @@ -340086,8 +342020,8 @@ pnM pnM mQh stX -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -340272,40 +342206,40 @@ wWR wWR wWR wWR -gDh +kFV rdm -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC nqk nqk nqk -cKu -cKu +vfC +vfC xoK hnu oGv @@ -340343,8 +342277,8 @@ qyE uqT wtE qDU -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -340528,36 +342462,36 @@ wWR wWR wWR wWR -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC nqk kbP qsY @@ -340600,8 +342534,8 @@ tnl czh qDU jkx -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -340785,27 +342719,27 @@ wWR wWR wWR wWR -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC nqk nqk dSC @@ -340857,8 +342791,8 @@ otk jVM gdG stX -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -341041,25 +342975,25 @@ wWR wWR wWR wWR -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC nqk nqk nqk @@ -341114,10 +343048,10 @@ pnM pcY kRT stX -cKu -tGt -dbd -hoE +vfC +hbQ +icV +sLF eSV eSV eSV @@ -341297,33 +343231,33 @@ wWR wWR wWR wWR -gDh -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +kFV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC nqk qLN siv nqk qmH cev -hTl +uxQ wFH sAp bPE @@ -341371,10 +343305,10 @@ pnM sMU ejj stX -dQL -cKu -cKu -uYQ +wzz +vfC +vfC +aGc wWR eSV eSV @@ -341554,26 +343488,26 @@ wWR wWR wWR jhY -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +gXr eyc jJr cBI @@ -341583,7 +343517,7 @@ ttm wqg olm bTe -rjd +hHF nzt nKW eAX @@ -341628,10 +343562,10 @@ hsU iwv mQh stX -cKu -pWB -hCm -lEF +vfC +hZl +lpj +fmW wWR eSV eSV @@ -341810,27 +343744,27 @@ wWR wWR wWR wWR -gDh -iJX -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL +kFV +wAf +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz nqk vge dvk @@ -341841,7 +343775,7 @@ tkY hTl eDs dHm -yiS +kYu nKW jZB mfe @@ -341885,8 +343819,8 @@ cVN oOg eTu stX -cKu -uYQ +vfC +aGc wWR wWR wWR @@ -342067,25 +344001,25 @@ wWR wWR wWR wWR -gDh -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL +kFV +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz kYp kYp kYp @@ -342142,8 +344076,8 @@ tnl iQK qDU qDU -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -342324,25 +344258,25 @@ wWR wWR wWR wWR -gDh -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +kFV +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp xDn goX @@ -342358,7 +344292,7 @@ bom nKW cgO qTR -mfe +gla nZt ofr eai @@ -342399,8 +344333,8 @@ pYe mea azd stX -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -342581,25 +344515,25 @@ wWR wWR wWR wWR -gDh -sIA -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +kFV +jXG +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp tzh sMj @@ -342613,9 +344547,9 @@ ltD fLk hHF gGk -gGk -gGk -mfe +ekN +pMv +gla xQw ofr eai @@ -342656,8 +344590,8 @@ ckQ tjy abB cDb -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -342838,25 +344772,25 @@ wWR wWR wWR wWR -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp eQe mIh @@ -342870,8 +344804,8 @@ gdB fLk mFK hBM -gGk -mfe +gla +gla vKx ofr bMX @@ -342913,8 +344847,8 @@ bOw kSG fOn stX -dQL -uYQ +wzz +aGc wWR eSV eSV @@ -343095,25 +345029,25 @@ wWR wWR wWR wWR -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp mnq pHn @@ -343170,8 +345104,8 @@ mQh snC abB stX -cKu -uYQ +vfC +aGc wWR eSV eSV @@ -343352,25 +345286,25 @@ wWR wWR wWR wWR -gDh -iJX -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL +kFV +wAf +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz kYp tzh oXr @@ -343427,8 +345361,8 @@ oRO vZc ePm stX -cKu -lEF +vfC +fmW wWR wWR eSV @@ -343609,25 +345543,25 @@ wWR wWR wWR wWR -gDh -sIA -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +kFV +jXG +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp cnO bDf @@ -343866,25 +345800,25 @@ wWR wWR wWR wWR -gDh -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +kFV +vfC +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp gwM mEj @@ -344124,24 +346058,24 @@ wWR wWR wWR nzV -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp nRo opn @@ -344381,24 +346315,24 @@ wWR wWR wWR wWR -gDh -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +kFV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp sbk quG @@ -344639,23 +346573,23 @@ wWR wWR wWR wWR -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp mnq ctf @@ -344899,20 +346833,20 @@ wWR wWR cMs tml -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp tzh uHh @@ -345155,21 +347089,21 @@ wWR wWR wWR cMs -uYQ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL +aGc +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz kYp foK tdC @@ -345412,21 +347346,21 @@ wWR wWR wWR cMs -uYQ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +aGc +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp mnq xxY @@ -345469,7 +347403,7 @@ phb fZL mOz iPC -hkE +iVG tZu tJp bpu @@ -345670,20 +347604,20 @@ wWR wWR nRs iDg -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp eaS lnj @@ -345926,21 +347860,21 @@ wWR wWR wWR wWR -wDF -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tbF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp uwr gEU @@ -346185,19 +348119,19 @@ wWR wWR iiI ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kYp tzh aDN @@ -346441,20 +348375,20 @@ wWR wWR wWR wWR -sIA -hCm -hCm -xKD -xKD -xKD -hCm -eTg -cKu -cKu -cKu -cKu -cKu -dQL +jXG +lpj +lpj +tTo +tTo +tTo +ryE +wzz +vfC +vfC +vfC +vfC +vfC +wzz kYp sgy dqK @@ -346699,13 +348633,13 @@ wWR wWR wWR nCC -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC jQk jQk jQk @@ -346956,13 +348890,13 @@ wWR wWR wWR hXw -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC jQk qbV cZX @@ -347213,13 +349147,13 @@ wWR wWR wWR bcZ -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC dZK dFc osf @@ -347470,13 +349404,13 @@ eSV eSV eSV bcZ -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC dZK itl lBr @@ -347727,13 +349661,13 @@ eSV eSV eSV bcZ -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC dZK myx jsf @@ -347742,10 +349676,10 @@ mBr kQc jGE fvx -vvr +sFX sFX geN -vvr +sFX dUo eFc hll @@ -347984,13 +349918,13 @@ eSV eSV eSV bcZ -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC jQk jjI oXu @@ -348241,13 +350175,13 @@ eSV eSV eSV bcZ -krQ +aBb nGb nGb nGb nGb -nGb -bcN +tAV +wzz jQk jGE xhV @@ -348498,13 +350432,13 @@ eSV eSV eSV bcZ -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC aPs koJ qBI @@ -348755,13 +350689,13 @@ eSV eSV eSV bcZ -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC nKm uni hJA @@ -349012,13 +350946,13 @@ eSV eSV eSV bcZ -dJM -qfo -qfo -qfo -qfo -qfo -rVj +lmS +vPA +vPA +vPA +vPA +tAV +vfC pBZ xTM nqE @@ -349269,13 +351203,13 @@ eSV eSV eSV bcZ -eVT +fhX qUW qUW jsF -qfo -qfo -rVj +vPA +tAV +vfC nKm igj oOI @@ -349526,18 +351460,18 @@ eSV eSV eSV xbR -eVT -eVT -eWI -dJM -qfo -qfo -rVj +fhX +fhX +dqJ +lmS +vPA +tAV +vfC pXI cfh nKc hZG -dMP +kGJ meo fyf fyf @@ -349783,13 +351717,13 @@ eSV eSV eSV nCC -eVT -qfR -qfR +fhX +qJW +qJW xYC -qfo -qfo -rVj +vPA +tAV +vfC pBZ igj ycI @@ -350036,17 +351970,17 @@ eSV eSV eSV eSV -iJX -dbd +wAf +icV fDA -dbd -dbd -dbd -dbd -dbd -dbd -dbd -gFJ +icV +icV +icV +icV +icV +icV +psu +vfC nKm lxY nqE @@ -350292,18 +352226,18 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -jkB -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu +wAf +psu +vfC +fZT +vfC +vfC +vfC +vfC +wzz +vfC +vfC +vfC nKm hqN rxf @@ -350549,18 +352483,18 @@ eSV eSV eSV eSV -rVj -cKu -cKu +tAV +vfC +vfC tml -cKu -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC aPs lxr etJ @@ -350595,11 +352529,11 @@ wZG kcX nFG twr -rag +hHr nZM xCI hSB -fFN +xVE bdD wZG cah @@ -350806,12 +352740,12 @@ eSV eSV eSV eSV -rVj -cKu -cKu -jkB -cKu -xLZ +tAV +vfC +vfC +fZT +vfC +vfC kcC kcC kcC @@ -350835,7 +352769,7 @@ xrU iyG biD lXK -mgM +riV abT iyG iyG @@ -351063,12 +352997,12 @@ eSV eSV eSV eSV -rVj -cKu -cKu -jkB -cKu -cKu +tAV +vfC +vfC +fZT +vfC +vfC kcC wNN wNN @@ -351320,12 +353254,12 @@ eSV eSV eSV eSV -rVj -cKu -cKu +tAV +vfC +vfC tml -cKu -cKu +vfC +vfC kcC wNN lrn @@ -351575,14 +353509,14 @@ eSV eSV eSV krb -dbd -dbd -gFJ -cKu -cKu -jkB -cKu -cKu +icV +icV +psu +vfC +vfC +fZT +vfC +vfC kcC wNN eRN @@ -351604,7 +353538,7 @@ xZa wyv hxs iyG -mgM +tEj pAi mgM glg @@ -351830,16 +353764,16 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -jkB -cKu -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +fZT +vfC +vfC kcC wNN wYH @@ -352087,16 +354021,16 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC tml -cKu -cKu +vfC +vfC kcC wNN wNN @@ -352343,16 +354277,16 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -jkB -cKu +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +fZT +vfC rWq kcC wNN @@ -352382,7 +354316,7 @@ iyG iyG iyG rJP -vrr +dlo jQL lzr nLb @@ -352600,17 +354534,17 @@ eSV eSV eSV eSV -rVj -xLZ -xLZ -xLZ -ioS -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC kcC wNN iRm @@ -352639,7 +354573,7 @@ wyA dAg uDM oZY -vrr +dlo pKC oyv nLb @@ -352857,8 +354791,8 @@ eSV eSV eSV eSV -rVj -gkW +tAV +vfC qWk qWk qWk @@ -352892,13 +354826,13 @@ pzX syg bhb dTO -oZY -hNu -hNu -iVb -oZY +dlo +dlo +dlo +dlo +dlo pKC -jQL +nPv nLb nLb nLb @@ -353114,8 +355048,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC qWk qGv qGv @@ -353150,7 +355084,7 @@ fNL bhb hTF fHu -oZY +eks dQk qbh vrr @@ -353371,11 +355305,11 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC qWk qGv -tOi +bvM wQG lLC bOg @@ -353628,8 +355562,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC qWk qGv wfY @@ -353667,7 +355601,7 @@ pPT sph xvQ qpd -oUx +dlo xVC moQ tOS @@ -353885,8 +355819,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC qWk qGv tOi @@ -354142,8 +356076,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC qWk qGv tnk @@ -354160,7 +356094,7 @@ eyA ngB rvn nDP -vpt +dnX oBb wNN wNN @@ -354399,8 +356333,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC miS uyp jIt @@ -354656,8 +356590,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC miS uyp oRf @@ -354669,7 +356603,7 @@ uyp eyg mgc eJt -rOO +lqg lBL ngB hap @@ -354680,14 +356614,14 @@ wNN wNN hUv pHG -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC pHG qpS jCj @@ -354913,8 +356847,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC miS uyp hLV @@ -354937,19 +356871,19 @@ oKR oKR pHG pHG -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu +vfC +wzz +vfC +vfC +vfC +vfC +vfC +vfC phj jCj jCj kEf -eeO +iqR mGA avK xZA @@ -355170,8 +357104,8 @@ eSV eSV eSV eSV -rVj -xLZ +tAV +vfC miS uyp bgt @@ -355192,22 +357126,22 @@ aky iVt oKR oKR -sRg -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +pHG +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC phj gIo fpL oPN knB -eeO +fLP jcR jpk xNS @@ -355427,8 +357361,8 @@ eSV eSV eSV eSV -sIA -gMA +jXG +ryE miS uyp uyp @@ -355442,23 +357376,23 @@ cJa mSl ngB oKR -mEk -naT -pqm -pTN -ihL +auD +tEm +tEm +sbd +qIf oKR oKR -sRg -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +pHG +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC phj sBi tnn @@ -355685,7 +357619,7 @@ eSV eSV eSV eSV -naR +tAV miS miS miS @@ -355700,28 +357634,28 @@ ngB ngB oKR xtc -hCL +tEm wZJ -pvs +sbd jBf oKR oKR -sRg -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +pHG +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC phj gIo wed qfD til -cLM +bdz sWq usQ jCj @@ -355942,13 +357876,13 @@ eSV eSV eSV eSV -puX -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ +jXG +ryE +vfC +vfC +vfC +vfC +vfC mUn mUn bsu @@ -355957,28 +357891,28 @@ tnJ mUn oKR auD -pqm -tEm -pqm +xoq +aPJ +kWH qIf oKR oKR -sRg -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +pHG +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC phj ajx -oPN +fHH fXs eeO -cLM +jMM eXX sJX jCj @@ -356201,39 +358135,39 @@ eSV eSV eSV xVO -hCm -hCm -hCm +lpj +lpj +lpj ryE -imA -xLZ +vfC +vfC mUn wmT eli mUn xut oKR -vsg -vUc -vUc +pqm +mvR vUc +cxP vsg oKR xut -sRg -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +pHG +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC phj dnd cLM -oPN +lwq pKr uqO izG @@ -356461,13 +358395,13 @@ eSV eSV eSV eSV -rVj -cKu -imA -xLZ -dQL -cKu -xLZ +tAV +vfC +vfC +vfC +wzz +yfa +wzz xut oKR oKR @@ -356477,16 +358411,16 @@ oKR oKR oKR xut -xLZ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC phj jCj jCj @@ -356718,13 +358652,13 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -xLZ +tAV +vfC +vfC +vfC +vfC +vfC +vfC xut xut xut @@ -356734,16 +358668,16 @@ xut xut xut xut -xLZ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC uez dlo uiw @@ -356975,31 +358909,31 @@ eSV eSV eSV eSV -sIA -hCm -hCm -hCm -hCm +jXG +lpj +lpj +lpj +lpj ryE -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ -xLZ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC vRE vRE lTO @@ -357237,26 +359171,26 @@ eSV eSV eSV eSV -sIA -hCm -hCm -hCm +jXG +lpj +lpj +lpj ryE -cKu -cKu -cKu -dQL -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC vRE hYp nEU @@ -357499,21 +359433,21 @@ eSV eSV pvl xVO -hCm -hCm -hCm +lpj +lpj +lpj ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC sGC ffb ssL @@ -357755,22 +359689,22 @@ eSV eSV eSV pvl -tDE +uDA hOo hOo ijb -sIA +jXG ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC sGC ffb czP @@ -357803,9 +359737,9 @@ vVZ vVZ vVZ vVZ -cKu -cKu -cKu +vfC +vfC +vfC hVC iXw wPe @@ -358013,21 +359947,21 @@ eSV eSV eWn gMT -eSV -eSV -eSV -eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tOa +tOa +tOa +tOa +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC sGC ttV czP @@ -358049,20 +359983,20 @@ gdw dqW hUw nao -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC hgg -hCm -cKu -cKu -cKu -cKu +lpj +vfC +vfC +vfC +vfC eYq -hCm +lpj ryE -cKu +vfC bXy pDQ ddB @@ -358270,21 +360204,21 @@ eSV eSV eWn gMT -eSV -eSV -eSV -eSV -sIA -hCm +tOa +tOa +tOa +tOa +jXG +lpj ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC vRE uUA bas @@ -358306,20 +360240,20 @@ qfV kan hUw nao -cKu -cKu -cKu -cKu -uYQ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -rVj -cKu +vfC +vfC +vfC +vfC +aGc +vfC +vfC +vfC +vfC +vfC +vfC +vfC +tAV +vfC bXy meJ ily @@ -358327,12 +360261,12 @@ hVC hVC hVC hVC -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC lYK uYQ jGo @@ -358527,21 +360461,21 @@ eSV eSV eWn gMT -eSV -eSV -eSV -eSV -eSV -eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tOa +tOa +tOa +tOa +tOa +tOa +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC vRE vRE jnz @@ -358563,33 +360497,33 @@ bAm oAa bAm evf -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu +vfC bXy oxt cQS bXy -cKu -cKu +vfC +vfC gSa -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC cKu uYQ qlr @@ -358790,16 +360724,16 @@ lMz gHX kqU bxb -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC rNO mcW aUV @@ -358820,35 +360754,35 @@ nmE kan hUw nao -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hVC ehx uhS bXy -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc wWR wWR wWR @@ -359048,15 +360982,15 @@ eSV eSV eSV xVO -hCm -hCm -hCm -hCm -hCm +lpj +lpj +lpj +lpj +lpj ryE -cKu -cKu -cKu +vfC +vfC +vfC dZW jyk hSe @@ -359077,35 +361011,35 @@ lGt cTD hUw nao -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hVC old pwV bXy -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW wWR wWR wWR @@ -359310,10 +361244,10 @@ wWR wWR wWR wWR -sIA +jXG ryE -cKu -cKu +vfC +vfC dZW mVw rka @@ -359334,34 +361268,34 @@ oRK tPB gUM evf -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu +vfC hVC esk fxL hVC -cKu -cKu +vfC +vfC gSa -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +aGc wWR wWR wWR @@ -359568,9 +361502,9 @@ eSV eSV wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC rNO jyk kVR @@ -359591,34 +361525,34 @@ olj cLX cLX was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hVC umX fOW hVC -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW wWR wWR eSV @@ -359825,9 +361759,9 @@ eSV eSV wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC rNO rNO xyo @@ -359848,33 +361782,33 @@ sCL sLH ljy was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hVC geG gih onl -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc wWR wWR eSV @@ -360082,10 +362016,10 @@ eSV eSV wWR wWR -sIA +jXG eTg -cKu -cKu +vfC +vfC dZW rfe hSe @@ -360105,33 +362039,33 @@ uhp bnM jzl was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC lTq -cKu +vfC hVC wLF dCh hVC -cKu -cKu +vfC +vfC jNG -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +aGc wWR wWR eSV @@ -360340,9 +362274,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC dZW pdd ekw @@ -360362,18 +362296,18 @@ xmT nMT nQJ was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hVC sZz hVC @@ -360383,12 +362317,12 @@ hVC ugF hVC hVC -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +aGc wWR wWR eSV @@ -360597,9 +362531,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC rNO tGI dtE @@ -360619,18 +362553,18 @@ oOj xCL jIO was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC uMf lxa dJp @@ -360640,12 +362574,12 @@ hTL bcA sws rAm -cKu -cKu -cKu -pWB -hCm -lEF +vfC +vfC +vfC +hZl +lpj +fmW wWR wWR eSV @@ -360854,9 +362788,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC gZB skv skv @@ -360876,18 +362810,18 @@ xmT nMT eIM was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC qxh jKL fCe @@ -360897,10 +362831,10 @@ spB ldA omJ fPv -cKu -cKu -cKu -nTE +vfC +vfC +vfC +xPB wWR wWR wWR @@ -361111,9 +363045,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC kIT msq xUa @@ -361133,18 +363067,18 @@ xgr dSc qGa was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hVC hVC hVC @@ -361154,10 +363088,10 @@ hVC hVC ugF hVC -cKu -cKu -pWB -lEF +vfC +vfC +hZl +fmW eSV eSV eSV @@ -361369,8 +363303,8 @@ wWR wWR wWR bcN -cKu -cKu +vfC +vfC kIT vxL aTc @@ -361390,30 +363324,30 @@ bhI bhI rIj was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC lTq -cKu +vfC oQv gtn fkY bXy -cKu -cKu +vfC +vfC jNG -cKu -cKu -uYQ +vfC +vfC +aGc eSV eSV eSV @@ -361625,9 +363559,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC gZB dPN frv @@ -361647,30 +363581,30 @@ fWg fWg was was -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC hVC imj wUs hVC -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -361882,9 +363816,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC gZB lqx frv @@ -361897,36 +363831,36 @@ vPd vPd vPd aSZ -dQL -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +wzz +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC bXy hRP cae hVC -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -362139,9 +364073,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC kIT eUB jBK @@ -362154,36 +364088,36 @@ vPd vPd vPd aSZ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu +vfC hVC jmZ rZt bXy -cKu -cKu +vfC +vfC gSa -pWB -lEF +hZl +fmW eSV eSV eSV @@ -362396,9 +364330,9 @@ eSV wWR wWR wWR -rVj -cKu -cKu +tAV +vfC +vfC kIT kIT dOH @@ -362411,34 +364345,34 @@ ctH ctH ghD xAo -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC eYq -cKu -cKu +vfC +vfC eYq -cKu -cKu +vfC +vfC eYq hVC gKf uve hVC eYq -cKu -cKu +vfC +vfC quS eSV eSV @@ -362653,10 +364587,10 @@ eSV eSV wWR wWR -rVj -cKu -cKu -cKu +tAV +vfC +vfC +vfC kIT kIT hyK @@ -362668,35 +364602,35 @@ bRs bRs bRs xAo -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -362910,11 +364844,11 @@ eSV eSV wWR eSV -rVj -cKu -cKu -dQL -cKu +tAV +vfC +vfC +wzz +vfC kIT rqy ruu @@ -362925,33 +364859,33 @@ fXu xAo xAo xAo -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC jNG eSV eSV @@ -363167,49 +365101,49 @@ eSV eSV eSV eSV -sIA -hCm -hCm -hCm +jXG +lpj +lpj +lpj ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC gSa -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -363428,44 +365362,44 @@ eSV eSV eSV eSV -rVj -cKu -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -dQL -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu +tAV +vfC +vfC +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +wzz +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC eYq -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV npI @@ -363685,44 +365619,44 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -363942,43 +365876,43 @@ eSV eSV eSV eSV -sIA +jXG ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -364200,42 +366134,42 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -364457,41 +366391,41 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -364714,41 +366648,41 @@ eSV eSV eSV eSV -sIA +jXG ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -364972,39 +366906,39 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -365229,39 +367163,39 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -365486,38 +367420,38 @@ eSV eSV eSV eSV -sIA +jXG ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -365744,37 +367678,37 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -366001,36 +367935,36 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -366258,36 +368192,36 @@ eSV eSV eSV eSV -sIA +jXG ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -366516,34 +368450,34 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -366773,34 +368707,34 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -367027,47 +368961,47 @@ eSV eSV eSV eSV -iJX -dbd -dbd -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -dbd -hoE +wAf +icV +icV +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +icV +icV +icV +icV +icV +icV +icV +icV +icV +sLF eSV eSV eSV @@ -367283,49 +369217,49 @@ eSV eSV eSV eSV -iJX -gFJ -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -tGt -hoE +wAf +psu +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hbQ +sLF eSV eSV eSV @@ -367540,49 +369474,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -367797,49 +369731,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -368054,49 +369988,49 @@ eSV eSV eSV eSV -rVj -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -uYQ +tAV +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +aGc eSV eSV eSV @@ -368311,49 +370245,49 @@ eSV eSV eSV eSV -sIA +jXG ryE -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -cKu -pWB -lEF +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +vfC +hZl +fmW eSV eSV eSV @@ -368569,47 +370503,47 @@ eSV eSV eSV eSV -sIA -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -hCm -lEF +jXG +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +lpj +fmW eSV eSV eSV @@ -395110,7 +397044,7 @@ eSV eSV fVU oUd -bdp +vKe qDD qDD qDD diff --git a/nano/TemplatesGuide.txt b/nano/TemplatesGuide.txt deleted file mode 100644 index cbfb9241771..00000000000 --- a/nano/TemplatesGuide.txt +++ /dev/null @@ -1,10 +0,0 @@ --------------------------------- -Nano UI Template Guide --------------------------------- - -Nano UI uses templates, which are comprised of HTML and a markup syntax. The markup allows you -to easily add conditionals (if statements), loops (for loops) and custom formatting (using helpers). - -Templates are stored in the /nano/templates folder and the file extension is .tmpl. - -This guide is being replaced with a wiki entry, found here: https://bay.ss13.me/en/Guides/coderbus/nanoui diff --git a/nano/To BYOND Cache.bat b/nano/To BYOND Cache.bat deleted file mode 100644 index 486b8d1beaa..00000000000 --- a/nano/To BYOND Cache.bat +++ /dev/null @@ -1,4 +0,0 @@ -copy css\* "%USERPROFILE%\Documents\BYOND\cache" /y -copy images\* "%USERPROFILE%\Documents\BYOND\cache" /y -copy js\* "%USERPROFILE%\Documents\BYOND\cache" /y -copy templates\* "%USERPROFILE%\Documents\BYOND\cache" /y diff --git a/nano/css/icons.css b/nano/css/icons.css deleted file mode 100644 index cb2fd42a250..00000000000 --- a/nano/css/icons.css +++ /dev/null @@ -1,315 +0,0 @@ -/* Icons -----------------------------------*/ - -.icon24 -{ - width: 24px; - height: 24px; -} - -.icon24.uiStatusGood -{ - background: url(uiIcons24.png) 0 0 no-repeat; -} - -.icon24.uiStatusAverage -{ - background: url(uiIcons24.png) 0 -24px no-repeat; -} - -.icon24.uiStatusBad -{ - background: url(uiIcons24.png) 0 -48px no-repeat; -} - -/* states and images */ -.uiIcon16 { - float: left; - width: 16px; - height: 16px; - margin: 2px 2px 0 2px; - background-image: url(uiIcons16.png); -} - -.uiLinkPendingIcon { - display: none; - float: left; - width: 16px; - height: 16px; - margin: 2px 2px 0 2px; - background-image: url(uiLinkPendingIcon.gif); -} - -.linkPending .uiIcon16 { - display: none; -} - -.linkPending .uiLinkPendingIcon { - display: block; -} - -/* positioning */ -.uiIcon16.icon-blank { background-position: 16px 16px; } -.uiIcon16.icon-carat-1-n { background-position: 0 0; } -.uiIcon16.icon-carat-1-ne { background-position: -16px 0; } -.uiIcon16.icon-carat-1-e { background-position: -32px 0; } -.uiIcon16.icon-carat-1-se { background-position: -48px 0; } -.uiIcon16.icon-carat-1-s { background-position: -64px 0; } -.uiIcon16.icon-carat-1-sw { background-position: -80px 0; } -.uiIcon16.icon-carat-1-w { background-position: -96px 0; } -.uiIcon16.icon-carat-1-nw { background-position: -112px 0; } -.uiIcon16.icon-carat-2-n-s { background-position: -128px 0; } -.uiIcon16.icon-carat-2-e-w { background-position: -144px 0; } -.uiIcon16.icon-triangle-1-n { background-position: 0 -16px; } -.uiIcon16.icon-triangle-1-ne { background-position: -16px -16px; } -.uiIcon16.icon-triangle-1-e { background-position: -32px -16px; } -.uiIcon16.icon-triangle-1-se { background-position: -48px -16px; } -.uiIcon16.icon-triangle-1-s { background-position: -64px -16px; } -.uiIcon16.icon-triangle-1-sw { background-position: -80px -16px; } -.uiIcon16.icon-triangle-1-w { background-position: -96px -16px; } -.uiIcon16.icon-triangle-1-nw { background-position: -112px -16px; } -.uiIcon16.icon-triangle-2-n-s { background-position: -128px -16px; } -.uiIcon16.icon-triangle-2-e-w { background-position: -144px -16px; } -.uiIcon16.icon-arrow-1-n { background-position: 0 -32px; } -.uiIcon16.icon-arrow-1-ne { background-position: -16px -32px; } -.uiIcon16.icon-arrow-1-e { background-position: -32px -32px; } -.uiIcon16.icon-arrow-1-se { background-position: -48px -32px; } -.uiIcon16.icon-arrow-1-s { background-position: -64px -32px; } -.uiIcon16.icon-arrow-1-sw { background-position: -80px -32px; } -.uiIcon16.icon-arrow-1-w { background-position: -96px -32px; } -.uiIcon16.icon-arrow-1-nw { background-position: -112px -32px; } -.uiIcon16.icon-arrow-2-n-s { background-position: -128px -32px; } -.uiIcon16.icon-arrow-2-ne-sw { background-position: -144px -32px; } -.uiIcon16.icon-arrow-2-e-w { background-position: -160px -32px; } -.uiIcon16.icon-arrow-2-se-nw { background-position: -176px -32px; } -.uiIcon16.icon-arrowstop-1-n { background-position: -192px -32px; } -.uiIcon16.icon-arrowstop-1-e { background-position: -208px -32px; } -.uiIcon16.icon-arrowstop-1-s { background-position: -224px -32px; } -.uiIcon16.icon-arrowstop-1-w { background-position: -240px -32px; } -.uiIcon16.icon-arrowthick-1-n { background-position: 0 -48px; } -.uiIcon16.icon-arrowthick-1-ne { background-position: -16px -48px; } -.uiIcon16.icon-arrowthick-1-e { background-position: -32px -48px; } -.uiIcon16.icon-arrowthick-1-se { background-position: -48px -48px; } -.uiIcon16.icon-arrowthick-1-s { background-position: -64px -48px; } -.uiIcon16.icon-arrowthick-1-sw { background-position: -80px -48px; } -.uiIcon16.icon-arrowthick-1-w { background-position: -96px -48px; } -.uiIcon16.icon-arrowthick-1-nw { background-position: -112px -48px; } -.uiIcon16.icon-arrowthick-2-n-s { background-position: -128px -48px; } -.uiIcon16.icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.uiIcon16.icon-arrowthick-2-e-w { background-position: -160px -48px; } -.uiIcon16.icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.uiIcon16.icon-arrowthickstop-1-n { background-position: -192px -48px; } -.uiIcon16.icon-arrowthickstop-1-e { background-position: -208px -48px; } -.uiIcon16.icon-arrowthickstop-1-s { background-position: -224px -48px; } -.uiIcon16.icon-arrowthickstop-1-w { background-position: -240px -48px; } -.uiIcon16.icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.uiIcon16.icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.uiIcon16.icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.uiIcon16.icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.uiIcon16.icon-arrowreturn-1-w { background-position: -64px -64px; } -.uiIcon16.icon-arrowreturn-1-n { background-position: -80px -64px; } -.uiIcon16.icon-arrowreturn-1-e { background-position: -96px -64px; } -.uiIcon16.icon-arrowreturn-1-s { background-position: -112px -64px; } -.uiIcon16.icon-arrowrefresh-1-w { background-position: -128px -64px; } -.uiIcon16.icon-arrowrefresh-1-n { background-position: -144px -64px; } -.uiIcon16.icon-arrowrefresh-1-e { background-position: -160px -64px; } -.uiIcon16.icon-arrowrefresh-1-s { background-position: -176px -64px; } -.uiIcon16.icon-arrow-4 { background-position: 0 -80px; } -.uiIcon16.icon-arrow-4-diag { background-position: -16px -80px; } -.uiIcon16.icon-extlink { background-position: -32px -80px; } -.uiIcon16.icon-newwin { background-position: -48px -80px; } -.uiIcon16.icon-refresh { background-position: -64px -80px; } -.uiIcon16.icon-shuffle { background-position: -80px -80px; } -.uiIcon16.icon-transfer-e-w { background-position: -96px -80px; } -.uiIcon16.icon-transferthick-e-w { background-position: -112px -80px; } -.uiIcon16.icon-radiation { background-position: -128px -80px; } -.uiIcon16.icon-folder-collapsed { background-position: 0 -96px; } -.uiIcon16.icon-folder-open { background-position: -16px -96px; } -.uiIcon16.icon-document { background-position: -32px -96px; } -.uiIcon16.icon-document-b { background-position: -48px -96px; } -.uiIcon16.icon-note { background-position: -64px -96px; } -.uiIcon16.icon-mail-closed { background-position: -80px -96px; } -.uiIcon16.icon-mail-open { background-position: -96px -96px; } -.uiIcon16.icon-suitcase { background-position: -112px -96px; } -.uiIcon16.icon-comment { background-position: -128px -96px; } -.uiIcon16.icon-person { background-position: -144px -96px; } -.uiIcon16.icon-print { background-position: -160px -96px; } -.uiIcon16.icon-trash { background-position: -176px -96px; } -.uiIcon16.icon-locked { background-position: -192px -96px; } -.uiIcon16.icon-unlocked { background-position: -208px -96px; } -.uiIcon16.icon-bookmark { background-position: -224px -96px; } -.uiIcon16.icon-tag { background-position: -240px -96px; } -.uiIcon16.icon-home { background-position: 0 -112px; } -.uiIcon16.icon-flag { background-position: -16px -112px; } -.uiIcon16.icon-calendar { background-position: -32px -112px; } -.uiIcon16.icon-cart { background-position: -48px -112px; } -.uiIcon16.icon-pencil { background-position: -64px -112px; } -.uiIcon16.icon-clock { background-position: -80px -112px; } -.uiIcon16.icon-disk { background-position: -96px -112px; } -.uiIcon16.icon-calculator { background-position: -112px -112px; } -.uiIcon16.icon-zoomin { background-position: -128px -112px; } -.uiIcon16.icon-zoomout { background-position: -144px -112px; } -.uiIcon16.icon-search { background-position: -160px -112px; } -.uiIcon16.icon-wrench { background-position: -176px -112px; } -.uiIcon16.icon-gear { background-position: -192px -112px; } -.uiIcon16.icon-heart { background-position: -208px -112px; } -.uiIcon16.icon-star { background-position: -224px -112px; } -.uiIcon16.icon-link { background-position: -240px -112px; } -.uiIcon16.icon-cancel { background-position: 0 -128px; } -.uiIcon16.icon-plus { background-position: -16px -128px; } -.uiIcon16.icon-plusthick { background-position: -32px -128px; } -.uiIcon16.icon-minus { background-position: -48px -128px; } -.uiIcon16.icon-minusthick { background-position: -64px -128px; } -.uiIcon16.icon-close { background-position: -80px -128px; } -.uiIcon16.icon-closethick { background-position: -96px -128px; } -.uiIcon16.icon-key { background-position: -112px -128px; } -.uiIcon16.icon-lightbulb { background-position: -128px -128px; } -.uiIcon16.icon-scissors { background-position: -144px -128px; } -.uiIcon16.icon-clipboard { background-position: -160px -128px; } -.uiIcon16.icon-copy { background-position: -176px -128px; } -.uiIcon16.icon-contact { background-position: -192px -128px; } -.uiIcon16.icon-image { background-position: -208px -128px; } -.uiIcon16.icon-video { background-position: -224px -128px; } -.uiIcon16.icon-script { background-position: -240px -128px; } -.uiIcon16.icon-alert { background-position: 0 -144px; } -.uiIcon16.icon-info { background-position: -16px -144px; } -.uiIcon16.icon-notice { background-position: -32px -144px; } -.uiIcon16.icon-help { background-position: -48px -144px; } -.uiIcon16.icon-check { background-position: -64px -144px; } -.uiIcon16.icon-bullet { background-position: -80px -144px; } -.uiIcon16.icon-radio-on { background-position: -96px -144px; } -.uiIcon16.icon-radio-off { background-position: -112px -144px; } -.uiIcon16.icon-pin-w { background-position: -128px -144px; } -.uiIcon16.icon-pin-s { background-position: -144px -144px; } -.uiIcon16.icon-night { background-position: -160px -144px; } -.uiIcon16.icon-play { background-position: 0 -160px; } -.uiIcon16.icon-pause { background-position: -16px -160px; } -.uiIcon16.icon-seek-next { background-position: -32px -160px; } -.uiIcon16.icon-seek-prev { background-position: -48px -160px; } -.uiIcon16.icon-seek-end { background-position: -64px -160px; } -.uiIcon16.icon-seek-start { background-position: -80px -160px; } -/* uiIcon-seek-first is deprecated, use uiIcon-seek-start instead */ -.uiIcon16.icon-seek-first { background-position: -80px -160px; } -.uiIcon16.icon-stop { background-position: -96px -160px; } -.uiIcon16.icon-eject { background-position: -112px -160px; } -.uiIcon16.icon-volume-off { background-position: -128px -160px; } -.uiIcon16.icon-volume-on { background-position: -144px -160px; } -.uiIcon16.icon-power { background-position: 0 -176px; } -.uiIcon16.icon-signal-diag { background-position: -16px -176px; } -.uiIcon16.icon-signal { background-position: -32px -176px; } -.uiIcon16.icon-battery-0 { background-position: -48px -176px; } -.uiIcon16.icon-battery-1 { background-position: -64px -176px; } -.uiIcon16.icon-battery-2 { background-position: -80px -176px; } -.uiIcon16.icon-battery-3 { background-position: -96px -176px; } -.uiIcon16.icon-circle-plus { background-position: 0 -192px; } -.uiIcon16.icon-circle-minus { background-position: -16px -192px; } -.uiIcon16.icon-circle-close { background-position: -32px -192px; } -.uiIcon16.icon-circle-triangle-e { background-position: -48px -192px; } -.uiIcon16.icon-circle-triangle-s { background-position: -64px -192px; } -.uiIcon16.icon-circle-triangle-w { background-position: -80px -192px; } -.uiIcon16.icon-circle-triangle-n { background-position: -96px -192px; } -.uiIcon16.icon-circle-arrow-e { background-position: -112px -192px; } -.uiIcon16.icon-circle-arrow-s { background-position: -128px -192px; } -.uiIcon16.icon-circle-arrow-w { background-position: -144px -192px; } -.uiIcon16.icon-circle-arrow-n { background-position: -160px -192px; } -.uiIcon16.icon-circle-zoomin { background-position: -176px -192px; } -.uiIcon16.icon-circle-zoomout { background-position: -192px -192px; } -.uiIcon16.icon-circle-check { background-position: -208px -192px; } -.uiIcon16.icon-circlesmall-plus { background-position: 0 -208px; } -.uiIcon16.icon-circlesmall-minus { background-position: -16px -208px; } -.uiIcon16.icon-circlesmall-close { background-position: -32px -208px; } -.uiIcon16.icon-squaresmall-plus { background-position: -48px -208px; } -.uiIcon16.icon-squaresmall-minus { background-position: -64px -208px; } -.uiIcon16.icon-squaresmall-close { background-position: -80px -208px; } -.uiIcon16.icon-grip-dotted-vertical { background-position: 0 -224px; } -.uiIcon16.icon-grip-dotted-horizontal { background-position: -16px -224px; } -.uiIcon16.icon-grip-solid-vertical { background-position: -32px -224px; } -.uiIcon16.icon-grip-solid-horizontal { background-position: -48px -224px; } -.uiIcon16.icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.uiIcon16.icon-grip-diagonal-se { background-position: -80px -224px; } -.uiIcon16.icon-batt_full { background-image: url(c_max.gif); background-position: 0px 0px } -.uiIcon16.icon-batt_disc { background-image: url(c_discharging.gif); background-position: 0px 0px } -.uiIcon16.icon-batt_chrg { background-image: url(c_charging.gif); background-position: 0px 0px } - -.mapIcon16 { - position: absolute; - width: 16px; - height: 16px; - background-image: url(uiIcons16Green.png); - background-position: -144px -96px; - background-repeat: no-repeat; - zoom: 0.125; - margin-left: -1px; - /*margin-bottom: -1px;*/ -} -.mapIcon16.dead { - background-image: url(uiIcons16Red.png); -} - -/* Command Positions */ -.mapIcon16.rank-captain { - background-position: -224px -112px; -} -.mapIcon16.rank-headofpersonnel { - background-position: -112px -96px; -} -.mapIcon16.rank-headofsecurity { - background-position: -112px -128px; -} -.mapIcon16.rank-chiefengineer { - background-position: -176px -112px; -} -.mapIcon16.rank-researchdirector { - background-position: -128px -128px; -} -.mapIcon16.rank-chiefmedicalofficer { - background-position: -32px -128px; -} - -/* Engineering Positions */ -.mapIcon16.rank-stationengineer { - background-position: -176px -112px; -} -.mapIcon16.rank-atmospherictechnician { - background-position: -176px -112px; -} - -/* Medical Positions */ -.mapIcon16.rank-medicaldoctor { - background-position: -32px -128px; -} -.mapIcon16.rank-geneticist { - background-position: -32px -128px; -} -.mapIcon16.rank-psychiatrist { - background-position: -32px -128px; -} -.mapIcon16.rank-chemist { - background-position: -32px -128px; -} - -/* Science Positions */ -.mapIcon16.rank-scientist { - background-position: -128px -128px; -} -.mapIcon16.rank-geneticist { - background-position: -128px -128px; -} -.mapIcon16.rank-roboticist { - background-position: -128px -128px; -} -.mapIcon16.rank-xenobiologist { - background-position: -128px -128px; -} - -/* Security Positions */ -.mapIcon16.rank-warden { - background-position: -112px -128px; -} -.mapIcon16.rank-detective { - background-position: -112px -128px; -} -.mapIcon16.rank-securityofficer { - background-position: -112px -128px; -} - diff --git a/nano/css/layout_basic.css b/nano/css/layout_basic.css deleted file mode 100644 index 30a75490f39..00000000000 --- a/nano/css/layout_basic.css +++ /dev/null @@ -1,21 +0,0 @@ -body { - background: #272727 url(uiBasicBackground.png) 50% 0 repeat-x; -} - -#uiContent { - clear: both; - padding: 8px; -} - -#uiLoadingNotice { - position: relative; - background: url(uiNoticeBackground.jpg) 50% 50%; - color: #000000; - font-size: 14px; - font-style: italic; - font-weight: bold; - padding: 3px 4px 3px 4px; - margin: 4px 0 4px 0; -} - - diff --git a/nano/css/layout_default.css b/nano/css/layout_default.css deleted file mode 100644 index 109beb2c72e..00000000000 --- a/nano/css/layout_default.css +++ /dev/null @@ -1,128 +0,0 @@ -body { - background: #272727 url(uiBackground.png) 50% 0 repeat-x; -} - -#uiWrapper { - width: 100%; - height: 100%; - -ms-user-select: none; - user-select: none; -} - -#uiTitleWrapper { - position: relative; - height: 30px; -} - -#uiTitleText { - position: absolute; - top: 6px; - left: 44px; - width: 66%; - overflow: hidden; - color: #E9C183; - font-size: 16px; -} - -#uiTitle.icon { - padding: 6px 8px 6px 42px; - background-position: 2px 50%; - background-repeat: no-repeat; -} - -#uiTitleFluff { - position: absolute; - top: 4px; - right: 12px; - width: 42px; - height: 24px; - background: url(uiTitleFluff.png) 50% 50% no-repeat; -} - -#uiStatusIcon { - position: absolute; - top: 4px; - left: 12px; - width: 24px; - height: 24px; -} - -#uiMapWrapper { - clear: both; - padding: 8px; -} - -#uiMapHeader { - position: relative; - clear: both; -} - -#uiMapContainer { - position: relative; - width: 100%; - height: 600px; - overflow: hidden; - border: 1px solid #40628a; - background: url(nanomapBackground.png); -} - -#uiMap { - position: absolute; - top: 50%; - left: 50%; - margin: -512px 0 0 -512px; - width: 256px; - height: 256px; - overflow: hidden; - zoom: 4; -} - -#uiMapImage { - position: absolute; - bottom: 1px; - left: 1px; - width: 256px; - height: 256px; -} - -#uiMapContent { - position: absolute; - bottom: 0px; - left: 0px; - width: 256px; - height: 256px; -} - -#uiMapFooter { - position: relative; - clear: both; -} - -#uiContent { - clear: both; - padding: 8px; -} - -#uiMapTooltip { - position: absolute; - right: 10px; - top: 10px; - border: 1px solid #40628a; - background-color: #272727; - padding: 8px; - display: none; - z-index: 9999; -} - -#uiLoadingNotice { - position: relative; - background: url(uiNoticeBackground.jpg) 50% 50%; - color: #000000; - font-size: 14px; - font-style: italic; - font-weight: bold; - padding: 3px 4px 3px 4px; - margin: 4px 0 4px 0; -} - - diff --git a/nano/css/shared.css b/nano/css/shared.css deleted file mode 100644 index fad7c0dcd78..00000000000 --- a/nano/css/shared.css +++ /dev/null @@ -1,599 +0,0 @@ -body { - padding: 0; - margin: 0; - font-size: 12px; - color: #ffffff; - line-height: 170%; - font-family: Verdana, Geneva, sans-serif; - background: #202020; -} - -#uiNoScript { - position: fixed; - top: 50%; - left: 50%; - margin: -60px 0 0 -150px; - width: 280px; - height: 120px; - background: #ffffff; - border: 2px solid #ff0000; - color: #000000; - font-size: 10px; - font-weight: bold; - z-index: 9999; - padding: 0px 10px; - text-align: center; -} - -hr { - background-color: #40628a; - height: 1px; -} - -.link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton { - float: left; - min-width: 15px; - height: 16px; - text-align: center; - color: #ffffff; - text-decoration: none; - background: #40628a; - border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 4px; - padding: 0px 4px 4px 4px; - margin: 0 2px 2px 0; - cursor: default; - white-space: nowrap; -} - -.hasIcon { - padding: 0px 4px 4px 0px; -} - -a:hover, .zoomLink:hover, .linkActive:hover { - background: #507aac; -} - -.linkPending, .linkPending:hover { - color: #ffffff; - background: #507aac; -} - -a.white, a.white:link, a.white:visited, a.white:active { - color: #40628a; - text-decoration: none; - background: #ffffff; - border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 4px; - padding: 1px 4px 1px 4px; - margin: 0 2px 0 0; - cursor: default; -} - -a.white:hover { - color: #ffffff; - background: #40628a; -} - -.hidden { - display: none; -} - -.linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn:hover, .selected, a.selected:link, a.selected:visited, a.selected:active, a.selected:hover { - color: #ffffff; - background: #2f943c; -} - -.linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff:hover, .disabled, a.disabled:link, a.disabled:visited, a.disabled:active, a.disabled:hover { - color: #ffffff; - background: #999999; - border-color: #666666; -} - -a.icon, .linkOn.icon, .linkOff.icon, .selected.icon, .disabled.icon { - position: relative; - padding: 1px 4px 2px 20px; -} - -a.icon img, .linkOn.icon img, .linkOff.icon img, .selected.icon img, .disabled.icon img { - position: absolute; - top: 0; - left: 0; - width: 18px; - height: 18px; -} - -.linkDanger, a.linkDanger:link, a.linkDanger:visited, a.linkDanger:active { - color: #ffffff; - background-color: #ff0000; - border-color: #aa0000; -} - -.linkDanger:hover { - background-color: #ff6666; -} - -ul { - padding: 4px 0 0 10px; - margin: 0; - list-style-type: none; -} - -li { - padding: 0 0 2px 0; -} - -img, a img { - border-style: none; -} - -h1, h2, h3, h4, h5, h6 { - margin: 0; - padding: 12px 0 6px 0; - color: #FFFFFF; - clear: both; -} - -h1 { - font-size: 18px; -} - -h2 { - font-size: 16px; -} - -h3 { - font-size: 14px; -} - -h4 { - font-size: 12px; -} - -.white { - color: white; - font-weight: bold; -} - -.good { - color: #4f7529; - font-weight: bold; -} - -.average { - color: #cd6500; - font-weight: bold; -} - -.bad { - color: #ee0000; - font-weight: bold; -} - -.idle { - color: #272727; - font-weight: bold; -} - -.redButton { - background: #ea0000; -} - -.yellowButton { - background: #cacc00; -} - -.highlight { - color: #8BA5C4; -} - -.dark { - color: #272727; -} - -.caption { - font-size: 10px; - font-weight: bold; - padding: 5px; -} - -.footer { - font-size: 10px; -} - -.noticePlaceholder { - position: relative; - font-size: 12px; - font-style: italic; - font-weight: bold; - padding: 3px 4px 3px 4px; - margin: 4px 0 4px 0; -} - -.notice { - position: relative; - background: url(uiNoticeBackground.jpg) 50% 50%; - color: #000000; - font-size: 12px; - font-style: italic; - font-weight: bold; - padding: 3px 4px 3px 4px; - margin: 4px 0 4px 0; -} - -.notice.icon { - padding: 2px 4px 0 20px; -} - -.notice img { - position: absolute; - top: 0; - left: 0; - width: 16px; - height: 16px; -} - -div.notice { - clear: both; -} - -.itemGroup { - border: 1px solid #e9c183; - background: #2c2c2c; - padding: 4px; - clear: both; -} - -.item { - width: 100%; - margin: 4px 0 0 0; - clear: both; -} - -.itemContentNarrow, .itemContent { - float: left; -} - -.itemContentNarrow { - width: 30%; -} - -.itemContent { - width: 69%; -} - -.itemLabelNarrow, .itemLabel, .itemLabelWide, .itemLabelWider, .itemLabelWidest { - float: left; - color: #e9c183; -} - -.itemLabelNarrow { - width: 20%; -} - -.itemLabel { - width: 30%; -} - -.itemLabelWide { - width: 45%; -} - -.itemLabelWider { - width: 69%; -} - -.itemLabelWidest { - width: 100%; -} - -.itemContentWide { - float: left; - width: 79%; -} - -.itemContentSmall { - float: left; - width: 33%; -} - -.itemContentMedium { - float: left; - width: 55%; -} - -.statusDisplay { - background: #000000; - color: #ffffff; - border: 1px solid #40628a; - padding: 4px; - margin: 3px 0; -} - -.statusDisplayRecords { - background: #000000; - color: #ffffff; - border: 1px solid #40628a; - padding: 4px; - margin: 3px 0; - overflow-x: hidden; - overflow-y: auto; -} - -.statusLabel { - width: 138px; - float: left; - overflow: hidden; - color: #98B0C3; -} - -.statusValue { - float: left; -} - -.block { - padding: 8px; - margin: 10px 4px 4px 4px; - border: 1px solid #40628a; - background-color: #202020; -} - -.block h3 { - padding: 0; -} - -.displayBar { - position: relative; - width: 236px; - height: 16px; - border: 1px solid #666666; - float: left; - margin: 0 5px 0 0; - overflow: hidden; - background: #000000; -} - -.displayBarText { - position: absolute; - top: -2px; - left: 5px; - width: 100%; - height: 100%; - color: #ffffff; - font-weight: normal; -} - -.displayBarFill { - width: 0%; - height: 100%; - background: #40628a; - overflow: hidden; - float: left; -} - -.displayBarFill.alignRight { - float: right; -} - -.displayBarFill.good { - color: #ffffff; - background: #4f7529; -} - -.displayBarFill.average { - color: #ffffff; - background: #cd6500; -} - -.displayBarFill.bad { - color: #ffffff; - background: #ee0000; -} - -.displayBarFill.highlight { - color: #ffffff; - background: #8BA5C4; -} - -.clearBoth { - clear: both; -} - -.clearLeft { - clear: left; -} - -.clearRight { - clear: right; -} - -.line { - width: 100%; - clear: both; -} - -.inactive, a.inactive:link, a.inactive:visited, a.inactive:active, a.inactive:hover { - color: #ffffff; - background: #999999; - border-color: #666666; -} - -.fixedLeft { - width: 110px; - float: left; -} - -.fixedLeftWide { - width: 165px; - float: left; -} - -.fixedLeftWider { - width: 220px; - float: left; -} - -.fixedLeftWidest { - width: 250px; - float: left; -} - -.fixedLeftWiderRed { - width: 220px; - float: left; - background: #ee0000; -} - -.floatRight { - float: right; -} - -/* Used in PDA */ - -.wholeScreen { - position: absolute; - color: #517087; - font-size: 16px; - font-weight: bold; - text-align: center; -} - -.pdalink { - float: left; - white-space: nowrap; -} - -/* DNA Modifier UI (dna_modifier.tmpl) */ - -.dnaBlock { - float: left; - width: 90px; - padding: 0 0 5px 0; -} - -.dnaBlockNumber { - font-family: Fixed, monospace; - float: left; - color: #ffffff; - background: #363636; - min-width: 20px; - height: 20px; - padding: 0; - text-align: center; -} - -.dnaSubBlock { - font-family: Fixed, monospace; - float: left; - padding: 0; - min-width: 16px; - height: 20px; - text-align: center; -} - -.mask { - position: fixed; - left: 0; - top: 0; - width: 100%; - height: 100%; - background: url(uiMaskBackground.png); -} - -.maskContent { - width: 100%; - height: 200px; - margin: 200px 0; - text-align: center; -} - -table.fixed { - table-layout:fixed; -} - -table.fixed td { - overflow: hidden; -} - -/* Table stuffs for power monitor */ -table.pmon { - border: 2px solid RoyalBlue; -} - -table.pmon td, table.pmon th { - border-bottom: 1px dotted black; - padding: 0px 5px 0px 5px; -} - -/* Table Stuffs for manifest*/ - -th.command { - background: #3333FF; - font-weight: bold; - color: #ffffff; -} - -th.sec { - background: #8e0000; - font-weight: bold; - color: #ffffff; -} - -th.med { - background: #006600; - font-weight: bold; - color: #ffffff; -} - -th.eng { - background: #b27300; - font-weight: bold; - color: #ffffff; -} - -th.sci { - background: #a65ba6; - font-weight: bold; - color: #ffffff; -} - -th.car { - background: #bb9040; - font-weight: bold; - color: #ffffff; -} - -th.civ { - background: #a32800; - font-weight: bold; - color: #ffffff; -} - -th.misc { - background: #666666; - font-weight: bold; - color: #ffffff; -} - -/* Damage colors for crew monitoring computer */ - -.burn { - color: orange; -} - -.brute { - color: red; -} - -.toxin { - color: #8ac44c; -} - -.oxyloss { - color: #00baee; -} - -/* 75px width used in power monitoring console buttons */ -.width75btn { - width: 75px; -} \ No newline at end of file diff --git a/nano/images/c_charging.gif b/nano/images/c_charging.gif deleted file mode 100644 index e080e27cfc6..00000000000 Binary files a/nano/images/c_charging.gif and /dev/null differ diff --git a/nano/images/c_discharging.gif b/nano/images/c_discharging.gif deleted file mode 100644 index 793fa589c2f..00000000000 Binary files a/nano/images/c_discharging.gif and /dev/null differ diff --git a/nano/images/c_max.gif b/nano/images/c_max.gif deleted file mode 100644 index 7f26e51d20e..00000000000 Binary files a/nano/images/c_max.gif and /dev/null differ diff --git a/nano/images/status_icons/alarm_green.gif b/nano/images/status_icons/alarm_green.gif deleted file mode 100644 index 7c2570c8ce3..00000000000 Binary files a/nano/images/status_icons/alarm_green.gif and /dev/null differ diff --git a/nano/images/status_icons/alarm_red.gif b/nano/images/status_icons/alarm_red.gif deleted file mode 100644 index 327d58e4db8..00000000000 Binary files a/nano/images/status_icons/alarm_red.gif and /dev/null differ diff --git a/nano/images/status_icons/batt_100.gif b/nano/images/status_icons/batt_100.gif deleted file mode 100644 index ccdbd4333e9..00000000000 Binary files a/nano/images/status_icons/batt_100.gif and /dev/null differ diff --git a/nano/images/status_icons/batt_20.gif b/nano/images/status_icons/batt_20.gif deleted file mode 100644 index 1d5e38fc888..00000000000 Binary files a/nano/images/status_icons/batt_20.gif and /dev/null differ diff --git a/nano/images/status_icons/batt_40.gif b/nano/images/status_icons/batt_40.gif deleted file mode 100644 index d5cedb99675..00000000000 Binary files a/nano/images/status_icons/batt_40.gif and /dev/null differ diff --git a/nano/images/status_icons/batt_5.gif b/nano/images/status_icons/batt_5.gif deleted file mode 100644 index ceac8f3a945..00000000000 Binary files a/nano/images/status_icons/batt_5.gif and /dev/null differ diff --git a/nano/images/status_icons/batt_60.gif b/nano/images/status_icons/batt_60.gif deleted file mode 100644 index d39534c8cb0..00000000000 Binary files a/nano/images/status_icons/batt_60.gif and /dev/null differ diff --git a/nano/images/status_icons/batt_80.gif b/nano/images/status_icons/batt_80.gif deleted file mode 100644 index 9c299773f01..00000000000 Binary files a/nano/images/status_icons/batt_80.gif and /dev/null differ diff --git a/nano/images/status_icons/charging.gif b/nano/images/status_icons/charging.gif deleted file mode 100644 index cf19ca72876..00000000000 Binary files a/nano/images/status_icons/charging.gif and /dev/null differ diff --git a/nano/images/status_icons/downloader_finished.gif b/nano/images/status_icons/downloader_finished.gif deleted file mode 100644 index f01b7c42af8..00000000000 Binary files a/nano/images/status_icons/downloader_finished.gif and /dev/null differ diff --git a/nano/images/status_icons/downloader_running.gif b/nano/images/status_icons/downloader_running.gif deleted file mode 100644 index 68fb977c86d..00000000000 Binary files a/nano/images/status_icons/downloader_running.gif and /dev/null differ diff --git a/nano/images/status_icons/ntnrc_idle.gif b/nano/images/status_icons/ntnrc_idle.gif deleted file mode 100644 index d47c01d5800..00000000000 Binary files a/nano/images/status_icons/ntnrc_idle.gif and /dev/null differ diff --git a/nano/images/status_icons/ntnrc_new.gif b/nano/images/status_icons/ntnrc_new.gif deleted file mode 100644 index af72a8b332f..00000000000 Binary files a/nano/images/status_icons/ntnrc_new.gif and /dev/null differ diff --git a/nano/images/status_icons/power_norm.gif b/nano/images/status_icons/power_norm.gif deleted file mode 100644 index 2b8d60edfa5..00000000000 Binary files a/nano/images/status_icons/power_norm.gif and /dev/null differ diff --git a/nano/images/status_icons/power_warn.gif b/nano/images/status_icons/power_warn.gif deleted file mode 100644 index 0c85b3a85a1..00000000000 Binary files a/nano/images/status_icons/power_warn.gif and /dev/null differ diff --git a/nano/images/status_icons/sig_high.gif b/nano/images/status_icons/sig_high.gif deleted file mode 100644 index efb20f67306..00000000000 Binary files a/nano/images/status_icons/sig_high.gif and /dev/null differ diff --git a/nano/images/status_icons/sig_lan.gif b/nano/images/status_icons/sig_lan.gif deleted file mode 100644 index 07ba929f7f3..00000000000 Binary files a/nano/images/status_icons/sig_lan.gif and /dev/null differ diff --git a/nano/images/status_icons/sig_low.gif b/nano/images/status_icons/sig_low.gif deleted file mode 100644 index 08f98baea8e..00000000000 Binary files a/nano/images/status_icons/sig_low.gif and /dev/null differ diff --git a/nano/images/status_icons/sig_none.gif b/nano/images/status_icons/sig_none.gif deleted file mode 100644 index 79840d8a2bd..00000000000 Binary files a/nano/images/status_icons/sig_none.gif and /dev/null differ diff --git a/nano/images/uiBackground-Syndicate.png b/nano/images/uiBackground-Syndicate.png deleted file mode 100644 index f7f7fa2f18e..00000000000 Binary files a/nano/images/uiBackground-Syndicate.png and /dev/null differ diff --git a/nano/images/uiBackground.png b/nano/images/uiBackground.png deleted file mode 100644 index 1943543a526..00000000000 Binary files a/nano/images/uiBackground.png and /dev/null differ diff --git a/nano/images/uiBasicBackground.png b/nano/images/uiBasicBackground.png deleted file mode 100644 index 572b1f1400a..00000000000 Binary files a/nano/images/uiBasicBackground.png and /dev/null differ diff --git a/nano/images/uiIcons16.png b/nano/images/uiIcons16.png deleted file mode 100644 index a337345e765..00000000000 Binary files a/nano/images/uiIcons16.png and /dev/null differ diff --git a/nano/images/uiIcons16Green.png b/nano/images/uiIcons16Green.png deleted file mode 100644 index 1ca23cb81d5..00000000000 Binary files a/nano/images/uiIcons16Green.png and /dev/null differ diff --git a/nano/images/uiIcons16Red.png b/nano/images/uiIcons16Red.png deleted file mode 100644 index 3af11de93a2..00000000000 Binary files a/nano/images/uiIcons16Red.png and /dev/null differ diff --git a/nano/images/uiIcons24.png b/nano/images/uiIcons24.png deleted file mode 100644 index ee51c2386bf..00000000000 Binary files a/nano/images/uiIcons24.png and /dev/null differ diff --git a/nano/images/uiLinkPendingIcon.gif b/nano/images/uiLinkPendingIcon.gif deleted file mode 100644 index c3070fd157a..00000000000 Binary files a/nano/images/uiLinkPendingIcon.gif and /dev/null differ diff --git a/nano/images/uiMaskBackground.png b/nano/images/uiMaskBackground.png deleted file mode 100644 index babc9a855e8..00000000000 Binary files a/nano/images/uiMaskBackground.png and /dev/null differ diff --git a/nano/images/uiNoticeBackground.jpg b/nano/images/uiNoticeBackground.jpg deleted file mode 100644 index dffe2f296b8..00000000000 Binary files a/nano/images/uiNoticeBackground.jpg and /dev/null differ diff --git a/nano/images/uiTitleFluff-Syndicate.png b/nano/images/uiTitleFluff-Syndicate.png deleted file mode 100644 index 675f302b9bd..00000000000 Binary files a/nano/images/uiTitleFluff-Syndicate.png and /dev/null differ diff --git a/nano/images/uiTitleFluff.png b/nano/images/uiTitleFluff.png deleted file mode 100644 index 99a14e66a31..00000000000 Binary files a/nano/images/uiTitleFluff.png and /dev/null differ diff --git a/nano/js/libraries.min.js b/nano/js/libraries.min.js deleted file mode 100644 index f27e98c7331..00000000000 --- a/nano/js/libraries.min.js +++ /dev/null @@ -1 +0,0 @@ -jQuery.fn.extend({everyTime:function(e,t,r,n){return this.each(function(){jQuery.timer.add(this,e,t,r,n)})},oneTime:function(e,t,r){return this.each(function(){jQuery.timer.add(this,e,t,r,1)})},stopTime:function(e,t){return this.each(function(){jQuery.timer.remove(this,e,t)})}}),jQuery.extend({timer:{global:[],guid:1,dataKey:"jQuery.timer",regex:/^([0-9]+(?:\.[0-9]*)?)\s*(.*s)?$/,powers:{ms:1,cs:10,ds:100,s:1e3,das:1e4,hs:1e5,ks:1e6},timeParse:function(e){if(null==e||null==e)return null;var t=this.regex.exec(jQuery.trim(e.toString()));return t[2]?parseFloat(t[1])*(this.powers[t[2]]||1):e},add:function(e,t,r,n,i){var o,a,u=0;jQuery.isFunction(r)&&(i=i||n,n=r,r=t),"number"!=typeof(t=jQuery.timer.timeParse(t))||isNaN(t)||t<0||(("number"!=typeof i||isNaN(i)||i<0)&&(i=0),i=i||0,(o=jQuery.data(e,this.dataKey)||jQuery.data(e,this.dataKey,{}))[r]||(o[r]={}),n.timerID=n.timerID||this.guid++,(a=function(){(++u>i&&0!==i||!1===n.call(e,u))&&jQuery.timer.remove(e,r,n)}).timerID=n.timerID,o[r][n.timerID]||(o[r][n.timerID]=window.setInterval(a,t)),this.global.push(e))},remove:function(e,t,r){var n,i=jQuery.data(e,this.dataKey);if(i){if(t){if(i[t]){if(r)r.timerID&&(window.clearInterval(i[t][r.timerID]),delete i[t][r.timerID]);else for(r in i[t])window.clearInterval(i[t][r]),delete i[t][r];for(n in i[t])break;n||(n=null,delete i[t])}}else for(t in i)this.remove(e,t,r);for(n in i)break;n||jQuery.removeData(e,this.dataKey)}}}}),jQuery(window).bind("unload",function(){jQuery.each(jQuery.timer.global,function(e,t){jQuery.timer.remove(t)})}),function(){"use strict";var u={version:"1.0.1-nanoui",templateSettings:{evaluate:/\{\{([\s\S]+?)\}\}/g,interpolate:/\{\{:([\s\S]+?)\}\}/g,encode:/\{\{>([\s\S]+?)\}\}/g,use:/\{\{#([\s\S]+?)\}\}/g,define:/\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,conditional:/\{\{\/?if\s*([\s\S]*?)\s*\}\}/g,conditionalElse:/\{\{else\s*([\s\S]*?)\s*\}\}/g,iterate:/\{\{\/?for\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,props:/\{\{\/?props\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g,empty:/\{\{empty\}\}/g,varname:"data, config, helper",strip:!0,append:!0,selfcontained:!1},template:void 0,compile:void 0};function s(){var t={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},e=/&(?!#?\w+;)|<|>|"|'|\//g;return function(){return this?this.replace(e,function(e){return t[e]||e}):this}}"undefined"!=typeof module&&module.exports?module.exports=u:"function"==typeof define&&define.amd?define(function(){return u}):function(){return this||(0,eval)("this")}().doT=u,String.prototype.encodeHTML=s();var c={append:{start:"'+(",end:")+'",endencode:"||'').toString().encodeHTML()+'"},split:{start:"';out+=(",end:");out+='",endencode:"||'').toString().encodeHTML();out+='"}},l=/$^/;function f(e){return e.replace(/\\('|\\)/g,"$1").replace(/[\r\t\n]/g," ")}u.template=function(e,t,r){var n,i=(t=t||u.templateSettings).append?c.append:c.split,o=0,a=t.use||t.define?function n(i,e,o){return("string"==typeof e?e:e.toString()).replace(i.define||l,function(e,n,t,r){return 0===n.indexOf("def.")&&(n=n.substring(4)),n in o||(":"===t?(i.defineParams&&r.replace(i.defineParams,function(e,t,r){o[n]={arg:t,text:r}}),n in o||(o[n]=r)):new Function("def","def['"+n+"']="+r)(o)),""}).replace(i.use||l,function(e,t){i.useParams&&(t=t.replace(i.useParams,function(e,t,r,n){if(o[r]&&o[r].arg&&n){var i=(r+":"+n).replace(/'|\\/g,"_");return o.__exp=o.__exp||{},o.__exp[i]=o[r].text.replace(new RegExp("(^|[^\\w$])"+o[r].arg+"([^\\w$])","g"),"$1"+n+"$2"),t+"def.__exp['"+i+"']"}}));var r=new Function("def","return "+t)(o);return r?n(i,r,o):r})}(t,e,r||{}):e,a=("var out='"+(t.strip?a.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g," ").replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,""):a).replace(/'|\\/g,"\\$&").replace(t.interpolate||l,function(e,t){return i.start+f(t)+i.end}).replace(t.encode||l,function(e,t){return n=!0,i.start+f(t)+i.endencode}).replace(t.conditional||l,function(e,t){return t?"';if("+f(t)+"){out+='":"';}out+='"}).replace(t.conditionalElse||l,function(e,t){return t?"';}else if("+f(t)+"){out+='":"';}else{out+='"}).replace(t.iterate||l,function(e,t,r,n){if(!t)return"';} } out+='";o+=1,r=r||"value",n=n||"index",t=f(t);var i="arr"+o;return"';var "+i+"="+t+";if("+i+" && "+i+".length > 0){var "+r+","+n+"=-1,l"+o+"="+i+".length-1;while("+n+" 0){var "+r+";for( var "+n+" in "+i+"){ if (!"+i+".hasOwnProperty("+n+")) continue; "+r+"="+i+"["+n+"];out+='"}).replace(t.empty||l,function(e){return"';}}else{if(true){out+='"}).replace(t.evaluate||l,function(e,t){return"';"+f(t)+"out+='"})+"';return out;").replace(/\n/g,"\\n").replace(/\t/g,"\\t").replace(/\r/g,"\\r").replace(/(\s|;|\}|^|\{)out\+='';/g,"$1").replace(/\+''/g,"").replace(/(\s|;|\}|^|\{)out\+=''\+/g,"$1out+=");n&&t.selfcontained&&(a="String.prototype.encodeHTML=("+s.toString()+"());"+a);try{return new Function(t.varname,a)}catch(e){throw"undefined"!=typeof console&&console.log("Could not create a template function: "+a),e}},u.compile=function(e,t){return u.template(e,null,t)}}(); \ No newline at end of file diff --git a/nano/js/libraries/doT.js b/nano/js/libraries/doT.js deleted file mode 100644 index a0ec5520c02..00000000000 --- a/nano/js/libraries/doT.js +++ /dev/null @@ -1,157 +0,0 @@ -(function () { - "use strict"; - - var doT = { - version: '1.0.1-nanoui', - templateSettings: { - evaluate: /\{\{([\s\S]+?)\}\}/g, - interpolate: /\{\{:([\s\S]+?)\}\}/g, - encode: /\{\{>([\s\S]+?)\}\}/g, - use: /\{\{#([\s\S]+?)\}\}/g, - define: /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g, - conditional: /\{\{\/?if\s*([\s\S]*?)\s*\}\}/g, - conditionalElse: /\{\{else\s*([\s\S]*?)\s*\}\}/g, - iterate: /\{\{\/?for\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g, - props: /\{\{\/?props\s*(?:\}\}|([\s\S]+?)\s*(?:\:\s*([\w$]+))?\s*(?:\:\s*([\w$]+))?\s*\}\})/g, - empty: /\{\{empty\}\}/g, - varname: 'data, config, helper', - strip: true, - append: true, - selfcontained: false - }, - template: undefined, //fn, compile template - compile: undefined //fn, for express - }, global; - - if (typeof module !== 'undefined' && module.exports) { - module.exports = doT; - } else if (typeof define === 'function' && define.amd) { - define(function () { - return doT; - }); - } else { - global = (function () { - return this || (0, eval)('this'); - }()); - global.doT = doT; - } - - function encodeHTMLSource() { - var encodeHTMLRules = { "&": "&", "<": "<", ">": ">", '"': '"', "'": ''', "/": '/' }, - matchHTML = /&(?!#?\w+;)|<|>|"|'|\//g; - return function () { - return this ? this.replace(matchHTML, function (m) { - return encodeHTMLRules[m] || m; - }) : this; - }; - } - - String.prototype.encodeHTML = encodeHTMLSource(); - - var startend = { - append: { start: "'+(", end: ")+'", endencode: "||'').toString().encodeHTML()+'" }, - split: { start: "';out+=(", end: ");out+='", endencode: "||'').toString().encodeHTML();out+='"} - }, skip = /$^/; - - function resolveDefs(c, block, def) { - return ((typeof block === 'string') ? block : block.toString()) - .replace(c.define || skip, function (m, code, assign, value) { - if (code.indexOf('def.') === 0) { - code = code.substring(4); - } - if (!(code in def)) { - if (assign === ':') { - if (c.defineParams) value.replace(c.defineParams, function (m, param, v) { - def[code] = {arg: param, text: v}; - }); - if (!(code in def)) def[code] = value; - } else { - new Function("def", "def['" + code + "']=" + value)(def); - } - } - return ''; - }) - .replace(c.use || skip, function (m, code) { - if (c.useParams) code = code.replace(c.useParams, function (m, s, d, param) { - if (def[d] && def[d].arg && param) { - var rw = (d + ":" + param).replace(/'|\\/g, '_'); - def.__exp = def.__exp || {}; - def.__exp[rw] = def[d].text.replace(new RegExp("(^|[^\\w$])" + def[d].arg + "([^\\w$])", "g"), "$1" + param + "$2"); - return s + "def.__exp['" + rw + "']"; - } - }); - var v = new Function("def", "return " + code)(def); - return v ? resolveDefs(c, v, def) : v; - }); - } - - function unescape(code) { - return code.replace(/\\('|\\)/g, "$1").replace(/[\r\t\n]/g, ' '); - } - - doT.template = function (tmpl, c, def) { - c = c || doT.templateSettings; - var cse = c.append ? startend.append : startend.split, needhtmlencode, sid = 0, - str = (c.use || c.define) ? resolveDefs(c, tmpl, def || {}) : tmpl; - - str = ("var out='" + (c.strip ? str.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g, ' ') - .replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g, '') : str) - .replace(/'|\\/g, '\\$&') - .replace(c.interpolate || skip, function (m, code) { - return cse.start + unescape(code) + cse.end; - }) - .replace(c.encode || skip, function (m, code) { - needhtmlencode = true; - return cse.start + unescape(code) + cse.endencode; - }) - .replace(c.conditional || skip, function (m, code) { - return (code ? "';if(" + unescape(code) + "){out+='" : "';}out+='"); - }) - .replace(c.conditionalElse || skip, function (m, code) { - return (code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='"); - }) - .replace(c.iterate || skip, function (m, iterate, vname, iname) { - if (!iterate) return "';} } out+='"; - sid += 1; - vname = vname || "value"; - iname = iname || "index"; - iterate = unescape(iterate); - var arrayName = "arr" + sid; - return "';var " + arrayName + "=" + iterate + ";if(" + arrayName + " && " + arrayName + ".length > 0){var " + vname + "," + iname + "=-1,l" + sid + "=" + arrayName + ".length-1;while(" + iname + " 0){var " + vname + ";for( var " + iname + " in " + objectName + "){ if (!" + objectName + ".hasOwnProperty(" + iname + ")) continue; " + vname + "=" + objectName + "[" + iname + "];out+='"; - }) - .replace(c.empty || skip, function (m) { - return "';}}else{if(true){out+='"; // The "if(true)" condition is required to account for the for tag closing with two brackets - }) - .replace(c.evaluate || skip, function (m, code) { - return "';" + unescape(code) + "out+='"; - }) - + "';return out;") - .replace(/\n/g, '\\n').replace(/\t/g, '\\t').replace(/\r/g, '\\r') - .replace(/(\s|;|\}|^|\{)out\+='';/g, '$1').replace(/\+''/g, '') - .replace(/(\s|;|\}|^|\{)out\+=''\+/g, '$1out+='); - - if (needhtmlencode && c.selfcontained) { - str = "String.prototype.encodeHTML=(" + encodeHTMLSource.toString() + "());" + str; - } - try { - return new Function(c.varname, str); - } catch (e) { - if (typeof console !== 'undefined') console.log("Could not create a template function: " + str); - throw e; - } - }; - - doT.compile = function (tmpl, def) { - return doT.template(tmpl, null, def); - }; -}()); \ No newline at end of file diff --git a/nano/js/libraries/jquery.timers.js b/nano/js/libraries/jquery.timers.js deleted file mode 100644 index 7001e503108..00000000000 --- a/nano/js/libraries/jquery.timers.js +++ /dev/null @@ -1,4 +0,0 @@ -jQuery.fn.extend({everyTime:function(c,a,d,b){return this.each(function(){jQuery.timer.add(this,c,a,d,b)})},oneTime:function(c,a,d){return this.each(function(){jQuery.timer.add(this,c,a,d,1)})},stopTime:function(c,a){return this.each(function(){jQuery.timer.remove(this,c,a)})}}); -jQuery.extend({timer:{global:[],guid:1,dataKey:"jQuery.timer",regex:/^([0-9]+(?:\.[0-9]*)?)\s*(.*s)?$/,powers:{ms:1,cs:10,ds:100,s:1E3,das:1E4,hs:1E5,ks:1E6},timeParse:function(c){if(c==undefined||c==null)return null;var a=this.regex.exec(jQuery.trim(c.toString()));return a[2]?parseFloat(a[1])*(this.powers[a[2]]||1):c},add:function(c,a,d,b,e){var g=0;if(jQuery.isFunction(d)){e||(e=b);b=d;d=a}a=jQuery.timer.timeParse(a);if(!(typeof a!="number"||isNaN(a)||a<0)){if(typeof e!="number"||isNaN(e)||e<0)e= -0;e=e||0;var f=jQuery.data(c,this.dataKey)||jQuery.data(c,this.dataKey,{});f[d]||(f[d]={});b.timerID=b.timerID||this.guid++;var h=function(){if(++g>e&&e!==0||b.call(c,g)===false)jQuery.timer.remove(c,d,b)};h.timerID=b.timerID;f[d][b.timerID]||(f[d][b.timerID]=window.setInterval(h,a));this.global.push(c)}},remove:function(c,a,d){var b=jQuery.data(c,this.dataKey),e;if(b){if(a){if(b[a]){if(d){if(d.timerID){window.clearInterval(b[a][d.timerID]);delete b[a][d.timerID]}}else for(d in b[a]){window.clearInterval(b[a][d]); -delete b[a][d]}for(e in b[a])break;if(!e){e=null;delete b[a]}}}else for(a in b)this.remove(c,a,d);for(e in b)break;e||jQuery.removeData(c,this.dataKey)}}}});jQuery(window).bind("unload",function(){jQuery.each(jQuery.timer.global,function(c,a){jQuery.timer.remove(a)})}); \ No newline at end of file diff --git a/nano/js/nano_base_callbacks.js b/nano/js/nano_base_callbacks.js deleted file mode 100644 index 889c6a80424..00000000000 --- a/nano/js/nano_base_callbacks.js +++ /dev/null @@ -1,126 +0,0 @@ -// NanoBaseCallbacks is where the base callbacks (common to all templates) are stored -NanoBaseCallbacks = function () -{ - // _canClick is used to disable clicks for a short period after each click (to avoid mis-clicks) - var _canClick = true; - - var _baseBeforeUpdateCallbacks = {} - - var _baseAfterUpdateCallbacks = { - // this callback is triggered after new data is processed - // it updates the status/visibility icon and adds click event handling to buttons/links - status: function (updateData) { - var uiStatusClass; - if (updateData['config']['status'] == 2) - { - uiStatusClass = 'icon24 uiStatusGood'; - $('.linkActive').removeClass('inactive'); - } - else if (updateData['config']['status'] == 1) - { - uiStatusClass = 'icon24 uiStatusAverage'; - $('.linkActive').addClass('inactive'); - } - else - { - uiStatusClass = 'icon24 uiStatusBad' - $('.linkActive').addClass('inactive'); - } - $('#uiStatusIcon').attr('class', uiStatusClass); - - $('.linkActive').stopTime('linkPending'); - $('.linkActive').removeClass('linkPending'); - - $('.linkActive') - .off('click') - .on('click', function (event) { - event.preventDefault(); - var href = $(this).data('href'); - if (href != null && _canClick) - { - _canClick = false; - $('body').oneTime(300, 'enableClick', function () { - _canClick = true; - }); - if (updateData['config']['status'] == 2) - { - $(this).oneTime(300, 'linkPending', function () { - $(this).addClass('linkPending'); - }); - } - window.location.href = href; - } - }); - - return updateData; - }, - nanomap: function (updateData) { - $('.mapIcon') - .off('mouseenter mouseleave') - .on('mouseenter', - function (event) { - var self = this; - $('#uiMapTooltip') - .html($(this).children('.tooltip').html()) - .show() - .stopTime() - .oneTime(5000, 'hideTooltip', function () { - $(this).fadeOut(500); - }); - } - ); - - $('.zoomLink') - .off('click') - .on('click', function (event) { - event.preventDefault(); - var zoomLevel = $(this).data('zoomLevel'); - var uiMapObject = $('#uiMap'); - var uiMapWidth = uiMapObject.width() * zoomLevel; - var uiMapHeight = uiMapObject.height() * zoomLevel; - - uiMapObject.css({ - zoom: zoomLevel, - left: '50%', - top: '50%', - marginLeft: '-' + Math.floor(uiMapWidth / 2) + 'px', - marginTop: '-' + Math.floor(uiMapHeight / 2) + 'px' - }); - }); - - $('#uiMapImage').attr('src', updateData['config']['mapName'] + '-' + updateData['config']['mapZLevel'] + '.png'); - - return updateData; - } - }; - - return { - addCallbacks: function () { - NanoStateManager.addBeforeUpdateCallbacks(_baseBeforeUpdateCallbacks); - NanoStateManager.addAfterUpdateCallbacks(_baseAfterUpdateCallbacks); - }, - removeCallbacks: function () { - for (var callbackKey in _baseBeforeUpdateCallbacks) - { - if (_baseBeforeUpdateCallbacks.hasOwnProperty(callbackKey)) - { - NanoStateManager.removeBeforeUpdateCallback(callbackKey); - } - } - for (var callbackKey in _baseAfterUpdateCallbacks) - { - if (_baseAfterUpdateCallbacks.hasOwnProperty(callbackKey)) - { - NanoStateManager.removeAfterUpdateCallback(callbackKey); - } - } - } - }; -} (); - - - - - - - diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js deleted file mode 100644 index 20e6160fed4..00000000000 --- a/nano/js/nano_base_helpers.js +++ /dev/null @@ -1,213 +0,0 @@ -// NanoBaseHelpers is where the base template helpers (common to all templates) are stored -NanoBaseHelpers = function () -{ - var _baseHelpers = { - // change ui styling to "syndicate mode" - syndicateMode: function() { - $('body').css("background-color","#8f1414"); - $('body').css("background-image","url('uiBackground-Syndicate.png')"); - $('body').css("background-position","50% 0"); - $('body').css("background-repeat","repeat-x"); - - $('#uiTitleFluff').css("background-image","url('uiTitleFluff-Syndicate.png')"); - $('#uiTitleFluff').css("background-position","50% 50%"); - $('#uiTitleFluff').css("background-repeat", "no-repeat"); - - return ''; - }, - // Generate a Byond link - link: function( text, icon, parameters, status, elementClass, elementId) { - - var iconHtml = ''; - var iconClass = 'noIcon'; - if (typeof icon != 'undefined' && icon) - { - iconHtml = '
    '; - iconClass = 'hasIcon'; - } - - if (typeof elementClass == 'undefined' || !elementClass) - { - elementClass = 'link'; - } - - var elementIdHtml = ''; - if (typeof elementId != 'undefined' && elementId) - { - elementIdHtml = 'id="' + elementId + '"'; - } - - if (typeof status != 'undefined' && status) - { - return '
    ' + iconHtml + text + '
    '; - } - - return '
    ' + iconHtml + text + '
    '; - }, - // Round a number to the nearest integer - round: function(number) { - return Math.round(number); - }, - // Returns the number fixed to 1 decimal - fixed: function(number) { - return Math.round(number * 10) / 10; - }, - // Round a number down to integer - floor: function(number) { - return Math.floor(number); - }, - // Round a number up to integer - ceil: function(number) { - return Math.ceil(number); - }, - // Format a string (~string("Hello {0}, how are {1}?", 'Martin', 'you') becomes "Hello Martin, how are you?") - string: function() { - if (arguments.length == 0) - { - return ''; - } - else if (arguments.length == 1) - { - return arguments[0]; - } - else if (arguments.length > 1) - { - stringArgs = []; - for (var i = 1; i < arguments.length; i++) - { - stringArgs.push(arguments[i]); - } - return arguments[0].format(stringArgs); - } - return ''; - }, - formatNumber: function(x) { - // From http://stackoverflow.com/questions/2901102/how-to-print-a-number-with-commas-as-thousands-separators-in-javascript - var parts = x.toString().split("."); - parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join("."); - }, - // Capitalize the first letter of a string. From http://stackoverflow.com/questions/1026069/capitalize-the-first-letter-of-string-in-javascript - capitalizeFirstLetter: function(string) { - return string.charAt(0).toUpperCase() + string.slice(1); - }, - // Display a bar. Used to show health, capacity, etc. - displayBar: function(value, rangeMin, rangeMax, styleClass, showText) { - - if (rangeMin < rangeMax) - { - if (value < rangeMin) - { - value = rangeMin; - } - else if (value > rangeMax) - { - value = rangeMax; - } - } - else - { - if (value > rangeMin) - { - value = rangeMin; - } - else if (value < rangeMax) - { - value = rangeMax; - } - } - - if (typeof styleClass == 'undefined' || !styleClass) - { - styleClass = ''; - } - - if (typeof showText == 'undefined' || !showText) - { - showText = ''; - } - - var percentage = Math.round((value - rangeMin) / (rangeMax - rangeMin) * 100); - - return '
    ' + showText + '
    '; - }, - // Display DNA Blocks (for the DNA Modifier UI) - displayDNABlocks: function(dnaString, selectedBlock, selectedSubblock, blockSize, paramKey) { - if (!dnaString) - { - return '
    Please place a valid subject into the DNA modifier.
    '; - } - - var characters = dnaString.split(''); - - var html = '
    1
    '; - var block = 1; - var subblock = 1; - for (index in characters) - { - if (!characters.hasOwnProperty(index) || typeof characters[index] === 'object') - { - continue; - } - - var parameters; - if (paramKey.toUpperCase() == 'UI') - { - parameters = { 'selectUIBlock' : block, 'selectUISubblock' : subblock }; - } - else - { - parameters = { 'selectSEBlock' : block, 'selectSESubblock' : subblock }; - } - - var status = 'linkActive'; - if (block == selectedBlock && subblock == selectedSubblock) - { - status = 'selected'; - } - - html += '' - - index++; - if (index % blockSize == 0 && index < characters.length) - { - block++; - subblock = 1; - html += '
    ' + block + '
    '; - } - else - { - subblock++; - } - } - - html += '
    '; - - return html; - } - }; - - return { - addHelpers: function () - { - NanoTemplate.addHelpers(_baseHelpers); - }, - removeHelpers: function () - { - for (var helperKey in _baseHelpers) - { - if (_baseHelpers.hasOwnProperty(helperKey)) - { - NanoTemplate.removeHelper(helperKey); - } - } - } - }; -} (); - - - - - - - diff --git a/nano/js/nano_state.js b/nano/js/nano_state.js deleted file mode 100644 index 198fa451246..00000000000 --- a/nano/js/nano_state.js +++ /dev/null @@ -1,121 +0,0 @@ -// This is the base state class, it is not to be used directly - -function NanoStateClass() { - /*if (typeof this.key != 'string' || !this.key.length) - { - alert('ERROR: Tried to create a state with an invalid state key: ' + this.key); - return; - } - - this.key = this.key.toLowerCase(); - - NanoStateManager.addState(this);*/ -} - -NanoStateClass.prototype.key = null; -NanoStateClass.prototype.layoutRendered = false; -NanoStateClass.prototype.contentRendered = false; -NanoStateClass.prototype.mapInitialised = false; - -NanoStateClass.prototype.isCurrent = function () { - return NanoStateManager.getCurrentState() == this; -}; - -NanoStateClass.prototype.onAdd = function (previousState) { - // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function - - NanoBaseCallbacks.addCallbacks(); - NanoBaseHelpers.addHelpers(); -}; - -NanoStateClass.prototype.onRemove = function (nextState) { - // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function - - NanoBaseCallbacks.removeCallbacks(); - NanoBaseHelpers.removeHelpers(); -}; - -NanoStateClass.prototype.onBeforeUpdate = function (data) { - // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function - - data = NanoStateManager.executeBeforeUpdateCallbacks(data); - - return data; // Return data to continue, return false to prevent onUpdate and onAfterUpdate -}; - -NanoStateClass.prototype.onUpdate = function (data) { - // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function - - try - { - if (!this.layoutRendered || (data['config'].hasOwnProperty('autoUpdateLayout') && data['config']['autoUpdateLayout'])) - { - $("#uiLayout").html(NanoTemplate.parse('layout', data)); // render the 'mail' template to the #mainTemplate div - this.layoutRendered = true; - } - if (!this.contentRendered || (data['config'].hasOwnProperty('autoUpdateContent') && data['config']['autoUpdateContent'])) - { - $("#uiContent").html(NanoTemplate.parse('main', data)); // render the 'mail' template to the #mainTemplate div - this.contentRendered = true; - } - if (NanoTemplate.templateExists('mapContent')) - { - if (!this.mapInitialised) - { - // Add drag functionality to the map ui - $('#uiMap').draggable({ - handle : '#uiMapImage' - }); - - $('#uiMapTooltip') - .off('click') - .on('click', function (event) { - event.preventDefault(); - $(this).fadeOut(400); - }); - - this.mapInitialised = true; - } - - $("#uiMapContent").html(NanoTemplate.parse('mapContent', data)); // render the 'mapContent' template to the #uiMapContent div - - if (data['config'].hasOwnProperty('showMap') && data['config']['showMap']) - { - $('#uiContent').addClass('hidden'); - $('#uiMapWrapper').removeClass('hidden'); - } - else - { - $('#uiMapWrapper').addClass('hidden'); - $('#uiContent').removeClass('hidden'); - } - } - if (NanoTemplate.templateExists('mapHeader')) - { - $("#uiMapHeader").html(NanoTemplate.parse('mapHeader', data)); // render the 'mapHeader' template to the #uiMapHeader div - } - if (NanoTemplate.templateExists('mapFooter')) - { - $("#uiMapFooter").html(NanoTemplate.parse('mapFooter', data)); // render the 'mapFooter' template to the #uiMapFooter div - } - } - catch(error) - { - alert('ERROR: An error occurred while rendering the UI: ' + error.message); - return; - } -}; - -NanoStateClass.prototype.onAfterUpdate = function (data) { - // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function - - NanoStateManager.executeAfterUpdateCallbacks(data); -}; - -NanoStateClass.prototype.alertText = function (text) { - // Do not add code here, add it to the 'default' state (nano_state_defaut.js) or create a new state and override this function - - alert(text); -}; - - diff --git a/nano/js/nano_state_default.js b/nano/js/nano_state_default.js deleted file mode 100644 index 65493b8c87e..00000000000 --- a/nano/js/nano_state_default.js +++ /dev/null @@ -1,14 +0,0 @@ - -NanoStateDefaultClass.inheritsFrom(NanoStateClass); -var NanoStateDefault = new NanoStateDefaultClass(); - -function NanoStateDefaultClass() { - - this.key = 'default'; - - //this.parent.constructor.call(this); - - this.key = this.key.toLowerCase(); - - NanoStateManager.addState(this); -} \ No newline at end of file diff --git a/nano/js/nano_state_manager.js b/nano/js/nano_state_manager.js deleted file mode 100644 index 84de1d1c89e..00000000000 --- a/nano/js/nano_state_manager.js +++ /dev/null @@ -1,220 +0,0 @@ -// NanoStateManager handles data from the server and uses it to render templates -NanoStateManager = function () -{ - // _isInitialised is set to true when all of this ui's templates have been processed/rendered - var _isInitialised = false; - - // the data for this ui - var _data = null; - - // this is an array of callbacks which are called when new data arrives, before it is processed - var _beforeUpdateCallbacks = {}; - // this is an array of callbacks which are called when new data arrives, before it is processed - var _afterUpdateCallbacks = {}; - - // this is an array of state objects, these can be used to provide custom javascript logic - var _states = {}; - - var _currentState = null; - - // the init function is called when the ui has loaded - // this function sets up the templates and base functionality - var init = function () - { - // We store initialData and templateData in the body tag, it's as good a place as any - _data = $('body').data('initialData'); - - if (_data == null || !_data.hasOwnProperty('config') || !_data.hasOwnProperty('data')) - { - alert('Error: Initial data did not load correctly.'); - } - - var stateKey = 'default'; - if (_data['config'].hasOwnProperty('stateKey') && _data['config']['stateKey']) - { - stateKey = _data['config']['stateKey'].toLowerCase(); - } - - NanoStateManager.setCurrentState(stateKey); - - $(document).on('templatesLoaded', function () { - doUpdate(_data); - - _isInitialised = true; - }); - }; - - // Receive update data from the server - var receiveUpdateData = function (jsonString) - { - var updateData; - try - { - // parse the JSON string from the server into a JSON object - updateData = jQuery.parseJSON(jsonString); - } - catch (error) - { - alert(error.Message); - return; - } - - if (!updateData.hasOwnProperty('data')) - { - if (_data && _data.hasOwnProperty('data')) - { - updateData['data'] = _data['data']; - } - else - { - updateData['data'] = {}; - } - } - - if (_isInitialised) // all templates have been registered, so render them - { - doUpdate(updateData); - } - else - { - _data = updateData; // all templates have not been registered. We set _data directly here which will be applied after the template is loaded with the initial data - } - }; - - // This function does the update by calling the methods on the current state - var doUpdate = function (data) - { - if (_currentState == null) - { - return; - } - - data = _currentState.onBeforeUpdate(data); - - if (data === false) - { - alert('data is false, return'); - return; // A beforeUpdateCallback returned a false value, this prevents the render from occuring - } - - _data = data; - - _currentState.onUpdate(_data); - - _currentState.onAfterUpdate(_data); - }; - - // Execute all callbacks in the callbacks array/object provided, updateData is passed to them for processing and potential modification - var executeCallbacks = function (callbacks, data) - { - for (var key in callbacks) - { - if (callbacks.hasOwnProperty(key) && jQuery.isFunction(callbacks[key])) - { - data = callbacks[key].call(this, data); - } - } - - return data; - }; - - return { - init: function () - { - init(); - }, - receiveUpdateData: function (jsonString) - { - receiveUpdateData(jsonString); - }, - addBeforeUpdateCallback: function (key, callbackFunction) - { - _beforeUpdateCallbacks[key] = callbackFunction; - }, - addBeforeUpdateCallbacks: function (callbacks) { - for (var callbackKey in callbacks) { - if (!callbacks.hasOwnProperty(callbackKey)) - { - continue; - } - NanoStateManager.addBeforeUpdateCallback(callbackKey, callbacks[callbackKey]); - } - }, - removeBeforeUpdateCallback: function (key) - { - if (_beforeUpdateCallbacks.hasOwnProperty(key)) - { - delete _beforeUpdateCallbacks[key]; - } - }, - executeBeforeUpdateCallbacks: function (data) { - return executeCallbacks(_beforeUpdateCallbacks, data); - }, - addAfterUpdateCallback: function (key, callbackFunction) - { - _afterUpdateCallbacks[key] = callbackFunction; - }, - addAfterUpdateCallbacks: function (callbacks) { - for (var callbackKey in callbacks) { - if (!callbacks.hasOwnProperty(callbackKey)) - { - continue; - } - NanoStateManager.addAfterUpdateCallback(callbackKey, callbacks[callbackKey]); - } - }, - removeAfterUpdateCallback: function (key) - { - if (_afterUpdateCallbacks.hasOwnProperty(key)) - { - delete _afterUpdateCallbacks[key]; - } - }, - executeAfterUpdateCallbacks: function (data) { - return executeCallbacks(_afterUpdateCallbacks, data); - }, - addState: function (state) - { - if (!(state instanceof NanoStateClass)) - { - alert('ERROR: Attempted to add a state which is not instanceof NanoStateClass'); - return; - } - if (!state.key) - { - alert('ERROR: Attempted to add a state with an invalid stateKey'); - return; - } - _states[state.key] = state; - }, - setCurrentState: function (stateKey) - { - if (typeof stateKey == 'undefined' || !stateKey) { - alert('ERROR: No state key was passed!'); - return false; - } - if (!_states.hasOwnProperty(stateKey)) - { - alert('ERROR: Attempted to set a current state which does not exist: ' + stateKey); - return false; - } - - var previousState = _currentState; - - _currentState = _states[stateKey]; - - if (previousState != null) { - previousState.onRemove(_currentState); - } - - _currentState.onAdd(previousState); - - return true; - }, - getCurrentState: function () - { - return _currentState; - } - }; -} (); - \ No newline at end of file diff --git a/nano/js/nano_template.js b/nano/js/nano_template.js deleted file mode 100644 index 877f2315bf1..00000000000 --- a/nano/js/nano_template.js +++ /dev/null @@ -1,135 +0,0 @@ - -var NanoTemplate = function () { - - var _templateData = {}; - - var _templates = {}; - var _compiledTemplates = {}; - - var _helpers = {}; - - var init = function () { - // We store templateData in the body tag, it's as good a place as any - _templateData = $('body').data('templateData'); - - if (_templateData == null) - { - alert('Error: Template data did not load correctly.'); - } - - loadNextTemplate(); - }; - - var loadNextTemplate = function () { - // we count the number of templates for this ui so that we know when they've all been rendered - var templateCount = Object.size(_templateData); - - if (!templateCount) - { - $(document).trigger('templatesLoaded'); - return; - } - - // load markup for each template and register it - for (var key in _templateData) - { - if (!_templateData.hasOwnProperty(key)) - { - continue; - } - - $.when($.ajax({ - url: _templateData[key], - cache: false, - dataType: 'text' - })) - .done(function(templateMarkup) { - - templateMarkup += '
    '; - - try - { - NanoTemplate.addTemplate(key, templateMarkup); - } - catch(error) - { - alert('ERROR: An error occurred while loading the UI: ' + error.message); - return; - } - - delete _templateData[key]; - - loadNextTemplate(); - }) - .fail(function () { - alert('ERROR: Loading template ' + key + '(' + _templateData[key] + ') failed!'); - }); - - return; - } - } - - var compileTemplates = function () { - - for (var key in _templates) { - try { - _compiledTemplates[key] = doT.template(_templates[key], null, _templates) - } - catch (error) { - alert(error.message); - } - } - }; - - return { - init: function () { - init(); - }, - addTemplate: function (key, templateString) { - _templates[key] = templateString; - }, - templateExists: function (key) { - return _templates.hasOwnProperty(key); - }, - parse: function (templateKey, data) { - if (!_compiledTemplates.hasOwnProperty(templateKey) || !_compiledTemplates[templateKey]) { - if (!_templates.hasOwnProperty(templateKey)) { - alert('ERROR: Template "' + templateKey + '" does not exist in _compiledTemplates!'); - return '

    Template error (does not exist)

    '; - } - compileTemplates(); - } - if (typeof _compiledTemplates[templateKey] != 'function') { - alert(_compiledTemplates[templateKey]); - alert('ERROR: Template "' + templateKey + '" failed to compile!'); - return '

    Template error (failed to compile)

    '; - } - return _compiledTemplates[templateKey].call(this, data['data'], data['config'], _helpers); - }, - addHelper: function (helperName, helperFunction) { - if (!jQuery.isFunction(helperFunction)) { - alert('NanoTemplate.addHelper failed to add ' + helperName + ' as it is not a function.'); - return; - } - - _helpers[helperName] = helperFunction; - }, - addHelpers: function (helpers) { - for (var helperName in helpers) { - if (!helpers.hasOwnProperty(helperName)) - { - continue; - } - NanoTemplate.addHelper(helperName, helpers[helperName]); - } - }, - removeHelper: function (helperName) { - if (helpers.hasOwnProperty(helperName)) - { - delete _helpers[helperName]; - } - } - } -}(); - - diff --git a/nano/js/nano_utility.js b/nano/js/nano_utility.js deleted file mode 100644 index 59a4b2a24a6..00000000000 --- a/nano/js/nano_utility.js +++ /dev/null @@ -1,161 +0,0 @@ -// NanoUtility is the place to store utility functions -var NanoUtility = function () -{ - var _urlParameters = {}; // This is populated with the base url parameters (used by all links), which is probaby just the "src" parameter - - return { - init: function () - { - var body = $('body'); // We store data in the body tag, it's as good a place as any - - _urlParameters = body.data('urlParameters'); - }, - // generate a Byond href, combines _urlParameters with parameters - generateHref: function (parameters) - { - var queryString = '?'; - - for (var key in _urlParameters) - { - if (_urlParameters.hasOwnProperty(key)) - { - if (queryString !== '?') - { - queryString += ';'; - } - queryString += key + '=' + _urlParameters[key]; - } - } - - for (var key in parameters) - { - if (parameters.hasOwnProperty(key)) - { - if (queryString !== '?') - { - queryString += ';'; - } - queryString += key + '=' + parameters[key]; - } - } - return queryString; - } - } -} (); - -if (typeof jQuery == 'undefined') { - alert('ERROR: Javascript library failed to load!'); -} -if (typeof doT == 'undefined') { - alert('ERROR: Template engine failed to load!'); -} - -// All scripts are initialised here, this allows control of init order -$(document).ready(function () { - NanoUtility.init(); - NanoStateManager.init(); - NanoTemplate.init(); -}); - -if (!Array.prototype.indexOf) -{ - Array.prototype.indexOf = function(elt /*, from*/) - { - var len = this.length; - - var from = Number(arguments[1]) || 0; - from = (from < 0) - ? Math.ceil(from) - : Math.floor(from); - if (from < 0) - from += len; - - for (; from < len; from++) - { - if (from in this && - this[from] === elt) - return from; - } - return -1; - }; -}; - -if (!String.prototype.format) -{ - String.prototype.format = function (args) { - var str = this; - return str.replace(String.prototype.format.regex, function(item) { - var intVal = parseInt(item.substring(1, item.length - 1)); - var replace; - if (intVal >= 0) { - replace = args[intVal]; - } else if (intVal === -1) { - replace = "{"; - } else if (intVal === -2) { - replace = "}"; - } else { - replace = ""; - } - return replace; - }); - }; - String.prototype.format.regex = new RegExp("{-?[0-9]+}", "g"); -}; - -Object.size = function(obj) { - var size = 0, key; - for (var key in obj) { - if (obj.hasOwnProperty(key)) size++; - } - return size; -}; - -if(!window.console) { - window.console = { - log : function(str) { - return false; - } - }; -}; - -String.prototype.toTitleCase = function () { - var smallWords = /^(a|an|and|as|at|but|by|en|for|if|in|of|on|or|the|to|vs?\.?|via)$/i; - - return this.replace(/([^\W_]+[^\s-]*) */g, function (match, p1, index, title) { - if (index > 0 && index + p1.length !== title.length && - p1.search(smallWords) > -1 && title.charAt(index - 2) !== ":" && - title.charAt(index - 1).search(/[^\s-]/) < 0) { - return match.toLowerCase(); - } - - if (p1.substr(1).search(/[A-Z]|\../) > -1) { - return match; - } - - return match.charAt(0).toUpperCase() + match.substr(1); - }); -}; - -$.ajaxSetup({ - cache: false -}); - -Function.prototype.inheritsFrom = function (parentClassOrObject) { - this.prototype = new parentClassOrObject; - this.prototype.constructor = this; - this.prototype.parent = parentClassOrObject.prototype; - return this; -}; - -if (!String.prototype.trim) { - String.prototype.trim = function () { - return this.replace(/^\s+|\s+$/g, ''); - }; -} - -// Replicate the ckey proc from BYOND -if (!String.prototype.ckey) { - String.prototype.ckey = function () { - return this.replace(/\W/g, '').toLowerCase(); - }; -} \ No newline at end of file diff --git a/nano/mapbase1024.png b/nano/mapbase1024.png deleted file mode 100644 index a927a71b6e7..00000000000 Binary files a/nano/mapbase1024.png and /dev/null differ diff --git a/nano/templates/engines_control.tmpl b/nano/templates/engines_control.tmpl deleted file mode 100644 index 56c783d94de..00000000000 --- a/nano/templates/engines_control.tmpl +++ /dev/null @@ -1,110 +0,0 @@ -
    - {{:helper.link('Overall info', 'note', {'state' :'status'}, null, data.state == 'status' ? 'selected' : null)}} - {{:helper.link('Details', 'note', {'state' : 'engines'}, null, data.state == 'engines' ? 'selected' : null)}} -
    -
    -
    -
    - Global controls: -
    -
    - {{:helper.link(data.global_state ? 'Shut all down' : 'Power all up', 'power', {'global_toggle' : 1}, null, data.global_state ? 'selected' : null)}} -
    -
    -
    -
    - Thrust limit: -
    -
    - {{:helper.link('', 'circle-plus', { 'global_limit' : 0.1}, null, null)}} - {{:helper.link(data.global_limit+'%', null, { 'set_global_limit' : 1 }, null, null)}} - {{:helper.link('', 'circle-minus', { 'global_limit' : -0.1}, null, null)}} -
    -
    -
    -
    - Total thrust: -
    -
    - {{:data.total_thrust}} -
    -
    -
    -{{if data.state == "engines"}} - {{if data.engines_info}} - {{for data.engines_info}} -
    -
    - Engine #{{:(index + 1)}}: -
    -
    - {{:helper.link(value.eng_on ? 'Shutdown' : 'Power up', 'power', { 'toggle' : 1, 'engine' : value.eng_reference }, null, value.eng_on ? value.eng_on == 1 ? 'linkOn' : 'yellowButton' : null)}} -
    -
    -
    -
    - Type: -
    -
    - {{:value.eng_type}} -
    -
    -
    -
    - Status: -
    -
    - {{:value.eng_on ? value.eng_on == 1 ? 'Online' : 'Booting' : 'Offline'}}
    - {{:value.eng_status}} -
    -
    -
    -
    - Current thrust: -
    -
    - {{:value.eng_thrust}} -
    -
    -
    -
    - Thrust limit: -
    -
    - {{:helper.link('', 'circle-plus', { 'limit' : 0.1, 'engine' : value.eng_reference }, null, null)}} - {{:helper.link(value.eng_thrust_limiter+'%', null, { 'set_limit' : 1, 'engine' : value.eng_reference }, null, null)}} - {{:helper.link('', 'circle-minus', { 'limit' : -0.1, 'engine' : value.eng_reference }, null, null)}} -
    -
    -
    - {{/for}} - {{/if}} -{{/if}} -{{if data.state == "status"}} - {{if data.engines_info}} - {{for data.engines_info}} -
    -
    -
    - Engine #{{:(index + 1)}}: -
    -
    - {{:helper.link(value.eng_on ? 'Shutdown' : 'Power up', 'power', { 'toggle' : 1, 'engine' : value.eng_reference }, null, value.eng_on ? value.eng_on == 1 ? 'linkOn' : 'yellowButton' : null)}} -
    -
    -
    -
    - Thrust: -
    - Thrust limit: -
    -
    - {{:value.eng_thrust}} -
    - {{:value.eng_thrust_limiter}}% -
    -
    -
    - {{/for}} - {{/if}} -{{/if}} \ No newline at end of file diff --git a/nano/templates/hardsuit.tmpl b/nano/templates/hardsuit.tmpl deleted file mode 100644 index b32bb621c8e..00000000000 --- a/nano/templates/hardsuit.tmpl +++ /dev/null @@ -1,257 +0,0 @@ - - - - -{{if data.interfacelock || data.malf > 0}} -
    -- HARDSUIT INTERFACE OFFLINE --
    -{{else}} - {{if data.aicontrol && data.ai != 1}} -
    -- HARDSUIT CONTROL OVERRIDDEN BY AI --
    - {{else}} -
    -
    -
    - Power supply -
    -
    - {{:helper.displayBar(data.chargestatus, 0, 50, (data.chargestatus >= 35) ? 'good' : (data.chargestatus >= 15) ? 'average' : 'bad')}} {{:data.charge}}/{{:data.maxcharge}} -
    -
    -
    -
    -
    - AI control: -
    -
    - {{if data.aioverride}} -
    ENABLED
    - {{else}} -
    DISABLED
    - {{/if}} -
    -
    - {{:helper.link('Toggle', 'circle-arrow-s', {'toggle_ai_control' : 1}, null)}} -
    -
    -
    -
    - Suit status: -
    -
    - {{if data.sealing == 1}} -
    PROCESSING
    - {{else}} - {{if data.seals == 1}} -
    INACTIVE
    - {{else}} -
    ACTIVE
    - {{/if}} - {{/if}} -
    -
    - {{:helper.link('Toggle', 'circle-arrow-s', {'toggle_seals' : 1}, null)}} -
    -
    -
    -
    - Cover status: -
    -
    - {{if data.emagged || !data.securitycheck}} -
    ERROR - MAINTENANCE LOCK CONTROL OFFLINE
    - {{else}} - {{if data.coverlock}} -
    LOCKED
    - {{else}} -
    UNLOCKED
    - {{/if}} - {{/if}} -
    -
    - {{:helper.link('Toggle', 'circle-arrow-s', {'toggle_suit_lock' : 1}, null)}} -
    -
    -
    -
    - -

    Hardware

    -

    Suit pieces

    - -
    -
    -
    - Helmet: -
    -
    - {{:helper.capitalizeFirstLetter(data.helmet)}} -
    - {{if data.sealing != 1}} -
    - {{:helper.link('Toggle', 'circle-arrow-s', {'toggle_piece' : 'helmet'}, null)}} -
    - {{/if}} -
    -
    -
    - Gauntlets: -
    -
    - {{:helper.capitalizeFirstLetter(data.gauntlets)}} -
    - {{if data.sealing != 1}} -
    - {{:helper.link('Toggle', 'circle-arrow-s', {'toggle_piece' : 'gauntlets'}, null)}} -
    - {{/if}} -
    -
    -
    - Boots: -
    -
    - {{:helper.capitalizeFirstLetter(data.boots)}} -
    - {{if data.sealing != 1}} -
    - {{:helper.link('Toggle', 'circle-arrow-s', {'toggle_piece' : 'boots'}, null)}} -
    - {{/if}} -
    -
    -
    - Chestpiece: -
    -
    - {{:helper.capitalizeFirstLetter(data.chest)}} -
    - {{if data.sealing != 1}} -
    - {{:helper.link('Toggle', 'circle-arrow-s', {'toggle_piece' : 'chest'}, null)}} -
    - {{/if}} -
    -
    - -

    System modules

    - {{if data.seals == 1 || data.sealing == 1}} -

    HARDSUIT SYSTEMS OFFLINE

    - {{else}} -

    Selected primary system: - {{if data.primarysystem}} - {{:helper.capitalizeFirstLetter(data.primarysystem)}} - {{else}} - None - {{/if}} -

    - {{if data.modules}} -
    - {{for data.modules}} -
    -
    -
    -
    {{:helper.capitalizeFirstLetter(value.name)}}
    - {{if value.damage > 0}} -
    - {{if value.damage == 1}} - (
    damaged
    ) - {{else}} - (
    destroyed
    ) - {{/if}} -
    - {{/if}} -
    -
    - Engage: {{:value.engagecost}} - Activate: {{:value.activecost}} - Passive: {{:value.passivecost}} -
    -
    - {{:value.desc}} -
    -
    - {{if value.can_use == 1}} -
    - {{:helper.link(value.engagestring, 'circle-arrow-s', {'interact_module' : value.index, 'module_mode' : 'engage'}, null)}} -
    - {{/if}} - {{if value.can_select == 1}} -
    - {{if value.name == data.primarysystem}} -
    SELECTED
    - {{else}} - {{:helper.link('Select', 'circle-arrow-s', {'interact_module' : value.index, 'module_mode' : 'select'}, null)}} - {{/if}} -
    - {{/if}} - {{if value.can_toggle == 1}} -
    - {{if value.is_active == 1}} - {{:helper.link(value.deactivatestring, 'circle-arrow-s', {'interact_module' : value.index, 'module_mode' : 'deactivate'}, null)}} - {{else}} - {{:helper.link(value.activatestring, 'circle-arrow-s', {'interact_module' : value.index, 'module_mode' : 'activate'}, null)}} - {{/if}} -
    - {{/if}} -
    -
    -
    -
    - {{if value.charges}} -
    Stored charges
    -
    Selected:
    {{:helper.capitalizeFirstLetter(value.chargetype)}} - {{for value.charges :itemValue:itemIndex}} -
    - {{:helper.link(helper.capitalizeFirstLetter(itemValue.caption), null, {'interact_module' : value.index, 'module_mode' : 'select_charge_type', 'charge_type' : itemValue.index}, null)}} -
    - {{/for}} - {{/if}} -
    -
    -
    - {{/for}} -
    - {{else}} - None. - {{/if}} - {{/if}} - {{/if}} -{{/if}} \ No newline at end of file diff --git a/nano/templates/layout_basic.tmpl b/nano/templates/layout_basic.tmpl deleted file mode 100644 index 67fcd51f805..00000000000 --- a/nano/templates/layout_basic.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -
    -
    Initiating...
    -
    \ No newline at end of file diff --git a/nano/templates/layout_default.tmpl b/nano/templates/layout_default.tmpl deleted file mode 100644 index 45c304ae745..00000000000 --- a/nano/templates/layout_default.tmpl +++ /dev/null @@ -1,73 +0,0 @@ -{{if data._PC}} -
    -
    - - {{if data._PC.batteryicon && data._PC.showbatteryicon}} -
    - {{/if}} - {{if data._PC.batterypercent && data._PC.showbatteryicon}} - {{:data._PC.batterypercent}} - {{/if}} - {{if data._PC.ntneticon}} - - {{/if}} - {{if data._PC.apclinkicon}} - - {{/if}} - {{if data._PC.stationtime}} - {{:data._PC.stationtime}} - {{/if}} - {{for data._PC.programheaders}} - - {{/for}} -
    -
    -
    -
    - - {{if data._PC.showexitprogram}} -
    {{:helper.link('Minimize', null, {'PC_minimize' : 1})}} - {{:helper.link('Exit', null, {'PC_exit' : 1})}} - {{/if}} -
    -
    -
    -{{/if}} - -
    {{:config.title}}
    - -
    -
    Initiating...
    -
    diff --git a/package.json b/package.json new file mode 100644 index 00000000000..1d123f3ffce --- /dev/null +++ b/package.json @@ -0,0 +1,10 @@ +{ + "devDependencies": { + "@biomejs/biome": "^2.1.2", + "prettier": "^3.6.2" + }, + "scripts": { + "tgui:fix": "biome check --write --unsafe tgui", + "tgui:lint": "biome lint tgui" + } +} diff --git a/tgui/.eslintignore b/tgui/.eslintignore deleted file mode 100644 index a59187b933a..00000000000 --- a/tgui/.eslintignore +++ /dev/null @@ -1,6 +0,0 @@ -/.yarn/** -/**/node_modules -/**/*.bundle.* -/**/*.chunk.* -/**/*.hot-update.* -/packages/inferno/** diff --git a/tgui/.eslintrc-sonar.yml b/tgui/.eslintrc-sonar.yml deleted file mode 100644 index 3cdd49f889e..00000000000 --- a/tgui/.eslintrc-sonar.yml +++ /dev/null @@ -1,26 +0,0 @@ -rules: - # radar/cognitive-complexity: error - radar/max-switch-cases: error - radar/no-all-duplicated-branches: error - radar/no-collapsible-if: error - radar/no-collection-size-mischeck: error - radar/no-duplicate-string: error - radar/no-duplicated-branches: error - radar/no-element-overwrite: error - radar/no-extra-arguments: error - radar/no-identical-conditions: error - radar/no-identical-expressions: error - radar/no-identical-functions: error - radar/no-inverted-boolean-check: error - radar/no-one-iteration-loop: error - radar/no-redundant-boolean: error - radar/no-redundant-jump: error - radar/no-same-line-conditional: error - radar/no-small-switch: error - radar/no-unused-collection: error - radar/no-use-of-empty-return-value: error - radar/no-useless-catch: error - radar/prefer-immediate-return: error - radar/prefer-object-literal: error - radar/prefer-single-boolean-return: error - radar/prefer-while: error diff --git a/tgui/.eslintrc.yml b/tgui/.eslintrc.yml deleted file mode 100644 index 4ab8f84dccc..00000000000 --- a/tgui/.eslintrc.yml +++ /dev/null @@ -1,766 +0,0 @@ -root: true -extends: prettier -parser: '@typescript-eslint/parser' -parserOptions: - ecmaVersion: 2020 - sourceType: module - ecmaFeatures: - jsx: true -env: - es6: true - browser: true - node: true -plugins: - - radar - - react - - unused-imports -settings: - react: - version: '16.10' -rules: - ## Possible Errors - ## ---------------------------------------- - ## Enforce “for” loop update clause moving the counter in the right - ## direction. - # for-direction: error - ## Enforce return statements in getters - # getter-return: error - ## Disallow using an async function as a Promise executor - no-async-promise-executor: error - ## Disallow await inside of loops - # no-await-in-loop: error - ## Disallow comparing against -0 - # no-compare-neg-zero: error - ## Disallow assignment operators in conditional expressions - no-cond-assign: error - ## Disallow the use of console - # no-console: error - ## Disallow constant expressions in conditions - # no-constant-condition: error - ## Disallow control characters in regular expressions - # no-control-regex: error - ## Disallow the use of debugger - no-debugger: error - ## Disallow duplicate arguments in function definitions - no-dupe-args: error - ## Disallow duplicate keys in object literals - no-dupe-keys: error - ## Disallow duplicate case labels - no-duplicate-case: error - ## Disallow empty block statements - # no-empty: error - ## Disallow empty character classes in regular expressions - no-empty-character-class: error - ## Disallow reassigning exceptions in catch clauses - no-ex-assign: error - ## Disallow unnecessary boolean casts - no-extra-boolean-cast: error - ## Disallow unnecessary parentheses - # no-extra-parens: warn - ## Disallow unnecessary semicolons - no-extra-semi: error - ## Disallow reassigning function declarations - no-func-assign: error - ## Disallow assigning to imported bindings - no-import-assign: error - ## Disallow variable or function declarations in nested blocks - no-inner-declarations: error - ## Disallow invalid regular expression strings in RegExp constructors - no-invalid-regexp: error - ## Disallow irregular whitespace - no-irregular-whitespace: error - ## Disallow characters which are made with multiple code points in character - ## class syntax - no-misleading-character-class: error - ## Disallow calling global object properties as functions - no-obj-calls: error - ## Disallow calling some Object.prototype methods directly on objects - no-prototype-builtins: error - ## Disallow multiple spaces in regular expressions - no-regex-spaces: error - ## Disallow sparse arrays - no-sparse-arrays: error - ## Disallow template literal placeholder syntax in regular strings - no-template-curly-in-string: error - ## Disallow confusing multiline expressions - no-unexpected-multiline: error - ## Disallow unreachable code after return, throw, continue, and break - ## statements - # no-unreachable: warn - ## Disallow control flow statements in finally blocks - no-unsafe-finally: error - ## Disallow negating the left operand of relational operators - no-unsafe-negation: error - ## Disallow assignments that can lead to race conditions due to usage of - ## await or yield - # require-atomic-updates: error - ## Require calls to isNaN() when checking for NaN - use-isnan: error - ## Enforce comparing typeof expressions against valid strings - valid-typeof: error - - ## Best practices - ## ---------------------------------------- - ## Enforce getter and setter pairs in objects and classes - # accessor-pairs: error - ## Enforce return statements in callbacks of array methods - # array-callback-return: error - ## Enforce the use of variables within the scope they are defined - # block-scoped-var: error - ## Enforce that class methods utilize this - # class-methods-use-this: error - ## Enforce a maximum cyclomatic complexity allowed in a program - complexity: [error, { max: 50 }] - ## Require return statements to either always or never specify values - # consistent-return: error - ## Enforce consistent brace style for all control statements - curly: [error, multi-line] - ## Require default cases in switch statements - # default-case: error - ## Enforce default parameters to be last - # default-param-last: error - ## Enforce consistent newlines before and after dots - dot-location: [error, property] - ## Enforce dot notation whenever possible - # dot-notation: error - ## Require the use of === and !== - eqeqeq: [error, always] - ## Require for-in loops to include an if statement - # guard-for-in: error - ## Enforce a maximum number of classes per file - # max-classes-per-file: error - ## Disallow the use of alert, confirm, and prompt - # no-alert: error - ## Disallow the use of arguments.caller or arguments.callee - # no-caller: error - ## Disallow lexical declarations in case clauses - no-case-declarations: error - ## Disallow division operators explicitly at the beginning of regular - ## expressions - # no-div-regex: error - ## Disallow else blocks after return statements in if statements - # no-else-return: error - ## Disallow empty functions - # no-empty-function: error - ## Disallow empty destructuring patterns - no-empty-pattern: error - ## Disallow null comparisons without type-checking operators - # no-eq-null: error - ## Disallow the use of eval() - # no-eval: error - ## Disallow extending native types - # no-extend-native: error - ## Disallow unnecessary calls to .bind() - # no-extra-bind: error - ## Disallow unnecessary labels - # no-extra-label: error - ## Disallow fallthrough of case statements - no-fallthrough: error - ## Disallow leading or trailing decimal points in numeric literals - # no-floating-decimal: error - ## Disallow assignments to native objects or read-only global variables - no-global-assign: error - ## Disallow shorthand type conversions - # no-implicit-coercion: error - ## Disallow variable and function declarations in the global scope - # no-implicit-globals: error - ## Disallow the use of eval()-like methods - # no-implied-eval: error - ## Disallow this keywords outside of classes or class-like objects - # no-invalid-this: error - ## Disallow the use of the __iterator__ property - # no-iterator: error - ## Disallow labeled statements - # no-labels: error - ## Disallow unnecessary nested blocks - # no-lone-blocks: error - ## Disallow function declarations that contain unsafe references inside - ## loop statements - # no-loop-func: error - ## Disallow magic numbers - # no-magic-numbers: error - ## Disallow multiple spaces - no-multi-spaces: warn - ## Disallow multiline strings - # no-multi-str: error - ## Disallow new operators outside of assignments or comparisons - # no-new: error - ## Disallow new operators with the Function object - # no-new-func: error - ## Disallow new operators with the String, Number, and Boolean objects - # no-new-wrappers: error - ## Disallow octal literals - no-octal: error - ## Disallow octal escape sequences in string literals - no-octal-escape: error - ## Disallow reassigning function parameters - # no-param-reassign: error - ## Disallow the use of the __proto__ property - # no-proto: error - ## Disallow variable redeclaration - no-redeclare: error - ## Disallow certain properties on certain objects - # no-restricted-properties: error - ## Disallow assignment operators in return statements - no-return-assign: error - ## Disallow unnecessary return await - # no-return-await: error - ## Disallow javascript: urls - # no-script-url: error - ## Disallow assignments where both sides are exactly the same - no-self-assign: error - ## Disallow comparisons where both sides are exactly the same - # no-self-compare: error - ## Disallow comma operators - no-sequences: error - ## Disallow throwing literals as exceptions - # no-throw-literal: error - ## Disallow unmodified loop conditions - # no-unmodified-loop-condition: error - ## Disallow unused expressions - # no-unused-expressions: error - ## Disallow unused labels - no-unused-labels: warn - ## Disallow unnecessary calls to .call() and .apply() - # no-useless-call: error - ## Disallow unnecessary catch clauses - # no-useless-catch: error - ## Disallow unnecessary concatenation of literals or template literals - # no-useless-concat: error - ## Disallow unnecessary escape characters - no-useless-escape: warn - ## Disallow redundant return statements - # no-useless-return: error - ## Disallow void operators - # no-void: error - ## Disallow specified warning terms in comments - # no-warning-comments: error - ## Disallow with statements - no-with: error - ## Enforce using named capture group in regular expression - # prefer-named-capture-group: error - ## Require using Error objects as Promise rejection reasons - # prefer-promise-reject-errors: error - ## Disallow use of the RegExp constructor in favor of regular expression - ## literals - # prefer-regex-literals: error - ## Enforce the consistent use of the radix argument when using parseInt() - radix: error - ## Disallow async functions which have no await expression - # require-await: error - ## Enforce the use of u flag on RegExp - # require-unicode-regexp: error - ## Require var declarations be placed at the top of their containing scope - # vars-on-top: error - ## Require parentheses around immediate function invocations - # wrap-iife: error - ## Require or disallow “Yoda” conditions - # yoda: error - - ## Strict mode - ## ---------------------------------------- - ## Require or disallow strict mode directives - strict: error - - ## Variables - ## ---------------------------------------- - ## Require or disallow initialization in variable declarations - # init-declarations: error - ## Disallow deleting variables - no-delete-var: error - ## Disallow labels that share a name with a variable - # no-label-var: error - ## Disallow specified global variables - # no-restricted-globals: error - ## Disallow variable declarations from shadowing variables declared in - ## the outer scope - # no-shadow: error - ## Disallow identifiers from shadowing restricted names - no-shadow-restricted-names: error - ## Disallow the use of undeclared variables unless mentioned - ## in /*global*/ comments - ## NOTE: Pointless when TypeScript can check for this - # no-undef: error - ## Disallow initializing variables to undefined - no-undef-init: error - ## Disallow the use of undefined as an identifier - # no-undefined: error - ## Disallow unused variables - # no-unused-vars: error - ## Disallow the use of variables before they are defined - # no-use-before-define: error - - ## Code style - ## ---------------------------------------- - ## Enforce linebreaks after opening and before closing array brackets - array-bracket-newline: [error, consistent] - ## Enforce consistent spacing inside array brackets - array-bracket-spacing: [error, never] - ## Enforce line breaks after each array element - # array-element-newline: error - ## Disallow or enforce spaces inside of blocks after opening block and - ## before closing block - block-spacing: [error, always] - ## Enforce consistent brace style for blocks - # brace-style: [error, stroustrup, { allowSingleLine: false }] - ## Enforce camelcase naming convention - # camelcase: error - ## Enforce or disallow capitalization of the first letter of a comment - # capitalized-comments: error - ## Require or disallow trailing commas - comma-dangle: [ - error, - { - arrays: always-multiline, - objects: always-multiline, - imports: always-multiline, - exports: always-multiline, - functions: only-multiline, ## Optional on functions - }, - ] - ## Enforce consistent spacing before and after commas - comma-spacing: [error, { before: false, after: true }] - ## Enforce consistent comma style - comma-style: [error, last] - ## Enforce consistent spacing inside computed property brackets - computed-property-spacing: [error, never] - ## Enforce consistent naming when capturing the current execution context - # consistent-this: error - ## Require or disallow newline at the end of files - # eol-last: error - ## Require or disallow spacing between function identifiers and their - ## invocations - func-call-spacing: [error, never] - ## Require function names to match the name of the variable or property - ## to which they are assigned - # func-name-matching: error - ## Require or disallow named function expressions - # func-names: error - ## Enforce the consistent use of either function declarations or expressions - # func-style: [error, expression] - ## Enforce line breaks between arguments of a function call - # function-call-argument-newline: error - ## Enforce consistent line breaks inside function parentheses - ## NOTE: This rule does not honor a newline on opening paren. - # function-paren-newline: [error, never] - ## Disallow specified identifiers - # id-blacklist: error - ## Enforce minimum and maximum identifier lengths - # id-length: error - ## Require identifiers to match a specified regular expression - # id-match: error - ## Enforce the location of arrow function bodies - # implicit-arrow-linebreak: error - ## Enforce consistent indentation - # indent: [error, 2, { SwitchCase: 1 }] - ## Enforce the consistent use of either double or single quotes in JSX - ## attributes - # jsx-quotes: [error, prefer-double] - ## Enforce consistent spacing between keys and values in object literal - ## properties - # key-spacing: [error, { beforeColon: false, afterColon: true }] - ## Enforce consistent spacing before and after keywords - # keyword-spacing: [error, { before: true, after: true }] - ## Enforce position of line comments - # line-comment-position: error - ## Enforce consistent linebreak style - # linebreak-style: error - ## Require empty lines around comments - # lines-around-comment: error - ## Require or disallow an empty line between class members - # lines-between-class-members: error - ## Enforce a maximum depth that blocks can be nested - # max-depth: error - ## Enforce a maximum line length - # max-len: [error, { - # code: 80, - # ## Ignore imports - # ignorePattern: '^(import\s.+\sfrom\s|.*require\()', - # ignoreUrls: true, - # ignoreRegExpLiterals: true, - # ignoreStrings: true, - # ignoreTemplateLiterals: true, - # }] - ## Enforce a maximum number of lines per file - # max-lines: error - ## Enforce a maximum number of line of code in a function - # max-lines-per-function: error - ## Enforce a maximum depth that callbacks can be nested - # max-nested-callbacks: error - ## Enforce a maximum number of parameters in function definitions - # max-params: error - ## Enforce a maximum number of statements allowed in function blocks - # max-statements: error - ## Enforce a maximum number of statements allowed per line - # max-statements-per-line: error - ## Enforce a particular style for multiline comments - # multiline-comment-style: error - ## Enforce newlines between operands of ternary expressions - # multiline-ternary: [error, always-multiline] - ## Require constructor names to begin with a capital letter - # new-cap: error - ## Enforce or disallow parentheses when invoking a constructor with no - ## arguments - # new-parens: error - ## Require a newline after each call in a method chain - # newline-per-chained-call: error - ## Disallow Array constructors - # no-array-constructor: error - ## Disallow bitwise operators - # no-bitwise: error - ## Disallow continue statements - # no-continue: error - ## Disallow inline comments after code - # no-inline-comments: error - ## Disallow if statements as the only statement in else blocks - # no-lonely-if: error - ## Disallow mixed binary operators - # no-mixed-operators: error - ## Disallow mixed spaces and tabs for indentation - # no-mixed-spaces-and-tabs: error - ## Disallow use of chained assignment expressions - # no-multi-assign: error - ## Disallow multiple empty lines - # no-multiple-empty-lines: error - ## Disallow negated conditions - # no-negated-condition: error - ## Disallow nested ternary expressions - # no-nested-ternary: error - ## Disallow Object constructors - # no-new-object: error - ## Disallow the unary operators ++ and -- - # no-plusplus: error - ## Disallow specified syntax - # no-restricted-syntax: error - ## Disallow all tabs - # no-tabs: error - ## Disallow ternary operators - # no-ternary: error - ## Disallow trailing whitespace at the end of lines - # no-trailing-spaces: error - ## Disallow dangling underscores in identifiers - # no-underscore-dangle: error - ## Disallow ternary operators when simpler alternatives exist - # no-unneeded-ternary: error - ## Disallow whitespace before properties - # no-whitespace-before-property: error - ## Enforce the location of single-line statements - # nonblock-statement-body-position: error - ## Enforce consistent line breaks inside braces - # object-curly-newline: [error, { multiline: true }] - ## Enforce consistent spacing inside braces - object-curly-spacing: [error, always] - ## Enforce placing object properties on separate lines - # object-property-newline: error - ## Enforce variables to be declared either together or separately in - ## functions - # one-var: error - ## Require or disallow newlines around variable declarations - # one-var-declaration-per-line: error - ## Require or disallow assignment operator shorthand where possible - # operator-assignment: error - ## Enforce consistent linebreak style for operators - # operator-linebreak: [error, before] - ## Require or disallow padding within blocks - # padded-blocks: error - ## Require or disallow padding lines between statements - # padding-line-between-statements: error - ## Disallow using Object.assign with an object literal as the first - ## argument and prefer the use of object spread instead. - # prefer-object-spread: error - ## Require quotes around object literal property names - # quote-props: error - ## Enforce the consistent use of either backticks, double, or single quotes - # quotes: [error, single] - ## Require or disallow semicolons instead of ASI - semi: error - ## Enforce consistent spacing before and after semicolons - semi-spacing: [error, { before: false, after: true }] - ## Enforce location of semicolons - semi-style: [error, last] - ## Require object keys to be sorted - # sort-keys: error - ## Require variables within the same declaration block to be sorted - # sort-vars: error - ## Enforce consistent spacing before blocks - space-before-blocks: [error, always] - ## Enforce consistent spacing before function definition opening parenthesis - # space-before-function-paren: [error, { - # anonymous: always, - # named: never, - # asyncArrow: always, - # }] - ## Enforce consistent spacing inside parentheses - space-in-parens: [error, never] - ## Require spacing around infix operators - # space-infix-ops: error - ## Enforce consistent spacing before or after unary operators - # space-unary-ops: error - ## Enforce consistent spacing after the // or /* in a comment - spaced-comment: [error, always] - ## Enforce spacing around colons of switch statements - switch-colon-spacing: [error, { before: false, after: true }] - ## Require or disallow spacing between template tags and their literals - template-tag-spacing: [error, never] - ## Require or disallow Unicode byte order mark (BOM) - # unicode-bom: [error, never] - ## Require parenthesis around regex literals - # wrap-regex: error - - ## ES6 - ## ---------------------------------------- - ## Require braces around arrow function bodies - # arrow-body-style: error - ## Require parentheses around arrow function arguments - # arrow-parens: [error, as-needed] - ## Enforce consistent spacing before and after the arrow in arrow functions - arrow-spacing: [error, { before: true, after: true }] - ## Require super() calls in constructors - # constructor-super: error - ## Enforce consistent spacing around * operators in generator functions - generator-star-spacing: [error, { before: false, after: true }] - ## Disallow reassigning class members - no-class-assign: error - ## Disallow arrow functions where they could be confused with comparisons - # no-confusing-arrow: error - ## Disallow reassigning const variables - no-const-assign: error - ## Disallow duplicate class members - no-dupe-class-members: error - ## Disallow duplicate module imports - # no-duplicate-imports: error - ## Disallow new operators with the Symbol object - no-new-symbol: error - ## Disallow specified modules when loaded by import - # no-restricted-imports: error - ## Disallow this/super before calling super() in constructors - no-this-before-super: error - ## Disallow unnecessary computed property keys in object literals - # no-useless-computed-key: error - ## Disallow unnecessary constructors - # no-useless-constructor: error - ## Disallow renaming import, export, and destructured assignments to the - ## same name - # no-useless-rename: error - ## Require let or const instead of var - no-var: error - ## Require or disallow method and property shorthand syntax for object - ## literals - # object-shorthand: error - ## Require using arrow functions for callbacks - prefer-arrow-callback: error - ## Require const declarations for variables that are never reassigned after - ## declared - # prefer-const: error - ## Require destructuring from arrays and/or objects - # prefer-destructuring: error - ## Disallow parseInt() and Number.parseInt() in favor of binary, octal, and - ## hexadecimal literals - # prefer-numeric-literals: error - ## Require rest parameters instead of arguments - # prefer-rest-params: error - ## Require spread operators instead of .apply() - # prefer-spread: error - ## Require template literals instead of string concatenation - # prefer-template: error - ## Require generator functions to contain yield - # require-yield: error - ## Enforce spacing between rest and spread operators and their expressions - # rest-spread-spacing: error - ## Enforce sorted import declarations within modules - # sort-imports: error - ## Require symbol descriptions - # symbol-description: error - ## Require or disallow spacing around embedded expressions of template - ## strings - # template-curly-spacing: error - ## Require or disallow spacing around the * in yield* expressions - yield-star-spacing: [error, { before: false, after: true }] - - ## React - ## ---------------------------------------- - ## Enforces consistent naming for boolean props - react/boolean-prop-naming: error - ## Forbid "button" element without an explicit "type" attribute - react/button-has-type: error - ## Prevent extraneous defaultProps on components - react/default-props-match-prop-types: error - ## Rule enforces consistent usage of destructuring assignment in component - # react/destructuring-assignment: [error, always, { ignoreClassFields: true }] - ## Prevent missing displayName in a React component definition - # react/display-name: error - ## Forbid certain props on Components - # react/forbid-component-props: error - ## Forbid certain props on DOM Nodes - # react/forbid-dom-props: error - ## Forbid certain elements - # react/forbid-elements: error - ## Forbid certain propTypes - # react/forbid-prop-types: error - ## Forbid foreign propTypes - # react/forbid-foreign-prop-types: error - ## Prevent using this.state inside this.setState - react/no-access-state-in-setstate: error - ## Prevent using Array index in key props - # react/no-array-index-key: error - ## Prevent passing children as props - react/no-children-prop: error - ## Prevent usage of dangerous JSX properties - react/no-danger: error - ## Prevent problem with children and props.dangerouslySetInnerHTML - react/no-danger-with-children: error - ## Prevent usage of deprecated methods, including component lifecycle - ## methods - react/no-deprecated: error - ## Prevent usage of setState in componentDidMount - react/no-did-mount-set-state: error - ## Prevent usage of setState in componentDidUpdate - react/no-did-update-set-state: error - ## Prevent direct mutation of this.state - react/no-direct-mutation-state: error - ## Prevent usage of findDOMNode - react/no-find-dom-node: error - ## Prevent usage of isMounted - react/no-is-mounted: error - ## Prevent multiple component definition per file - # react/no-multi-comp: error - ## Prevent usage of shouldComponentUpdate when extending React.PureComponent - react/no-redundant-should-component-update: error - ## Prevent usage of the return value of React.render - react/no-render-return-value: error - ## Prevent usage of setState - # react/no-set-state: error - ## Prevent common casing typos - react/no-typos: error - ## Prevent using string references in ref attribute. - react/no-string-refs: error - ## Prevent using this in stateless functional components - react/no-this-in-sfc: error - ## Prevent invalid characters from appearing in markup - react/no-unescaped-entities: error - ## Prevent usage of unknown DOM property (fixable) - # react/no-unknown-property: error - ## Prevent usage of unsafe lifecycle methods - react/no-unsafe: error - ## Prevent definitions of unused prop types - react/no-unused-prop-types: error - ## Prevent definitions of unused state properties - react/no-unused-state: error - ## Prevent usage of setState in componentWillUpdate - react/no-will-update-set-state: error - ## Enforce ES5 or ES6 class for React Components - react/prefer-es6-class: error - ## Enforce that props are read-only - react/prefer-read-only-props: error - ## Enforce stateless React Components to be written as a pure function - react/prefer-stateless-function: error - ## Prevent missing props validation in a React component definition - # react/prop-types: error - ## Prevent missing React when using JSX - # react/react-in-jsx-scope: error - ## Enforce a defaultProps definition for every prop that is not a required - ## prop - # react/require-default-props: error - ## Enforce React components to have a shouldComponentUpdate method - # react/require-optimization: error - ## Enforce ES5 or ES6 class for returning value in render function - react/require-render-return: error - ## Prevent extra closing tags for components without children (fixable) - react/self-closing-comp: error - ## Enforce component methods order (fixable) - # react/sort-comp: error - ## Enforce propTypes declarations alphabetical sorting - # react/sort-prop-types: error - ## Enforce the state initialization style to be either in a constructor or - ## with a class property - # react/state-in-constructor: error - ## Enforces where React component static properties should be positioned. - # react/static-property-placement: error - ## Enforce style prop value being an object - react/style-prop-object: error - ## Prevent void DOM elements (e.g. ,
    ) from receiving children - react/void-dom-elements-no-children: error - - ## JSX-specific rules - ## ---------------------------------------- - ## Enforce boolean attributes notation in JSX (fixable) - react/jsx-boolean-value: error - ## Enforce or disallow spaces inside of curly braces in JSX attributes and - ## expressions. - # react/jsx-child-element-spacing: error - ## Validate closing bracket location in JSX (fixable) - # react/jsx-closing-bracket-location: [error, { - # ## NOTE: Not really sure about enforcing this one - # selfClosing: false, - # nonEmpty: after-props, - # }] - ## Validate closing tag location in JSX (fixable) - react/jsx-closing-tag-location: error - ## Enforce or disallow newlines inside of curly braces in JSX attributes and - ## expressions (fixable) - # react/jsx-curly-newline: error - ## Enforce or disallow spaces inside of curly braces in JSX attributes and - ## expressions (fixable) - react/jsx-curly-spacing: error - ## Enforce or disallow spaces around equal signs in JSX attributes (fixable) - react/jsx-equals-spacing: error - ## Restrict file extensions that may contain JSX - # react/jsx-filename-extension: error - ## Enforce position of the first prop in JSX (fixable) - # react/jsx-first-prop-new-line: error - ## Enforce event handler naming conventions in JSX - react/jsx-handler-names: error - ## Validate JSX indentation (fixable) - # react/jsx-indent: [error, 2, { - # checkAttributes: true, - # }] - ## Validate props indentation in JSX (fixable) - # react/jsx-indent-props: [error, 2] - ## Validate JSX has key prop when in array or iterator - react/jsx-key: error - ## Validate JSX maximum depth - react/jsx-max-depth: [error, { max: 10 }] ## Generous - ## Limit maximum of props on a single line in JSX (fixable) - # react/jsx-max-props-per-line: error - ## Prevent usage of .bind() and arrow functions in JSX props - # react/jsx-no-bind: error - ## Prevent comments from being inserted as text nodes - react/jsx-no-comment-textnodes: error - ## Prevent duplicate props in JSX - react/jsx-no-duplicate-props: error - ## Prevent usage of unwrapped JSX strings - # react/jsx-no-literals: error - ## Prevent usage of unsafe target='_blank' - react/jsx-no-target-blank: error - ## Disallow undeclared variables in JSX - react/jsx-no-undef: error - ## Disallow unnecessary fragments (fixable) - react/jsx-no-useless-fragment: error - ## Limit to one expression per line in JSX - # react/jsx-one-expression-per-line: error - ## Enforce curly braces or disallow unnecessary curly braces in JSX - # react/jsx-curly-brace-presence: error - ## Enforce shorthand or standard form for React fragments - react/jsx-fragments: error - ## Enforce PascalCase for user-defined JSX components - react/jsx-pascal-case: error - ## Disallow multiple spaces between inline JSX props (fixable) - react/jsx-props-no-multi-spaces: error - ## Disallow JSX props spreading - # react/jsx-props-no-spreading: error - ## Enforce default props alphabetical sorting - # react/jsx-sort-default-props: error - ## Enforce props alphabetical sorting (fixable) - # react/jsx-sort-props: error - ## Validate whitespace in and around the JSX opening and closing brackets - ## (fixable) - react/jsx-tag-spacing: error - ## Prevent React to be incorrectly marked as unused - react/jsx-uses-react: error - ## Prevent variables used in JSX to be incorrectly marked as unused - react/jsx-uses-vars: error - ## Prevent missing parentheses around multilines JSX (fixable) - react/jsx-wrap-multilines: error - ## Prevents the use of unused imports. - ## This could be done by enabling no-unused-vars, but we're doing this for now - unused-imports/no-unused-imports: error diff --git a/tgui/.gitattributes b/tgui/.gitattributes index 482063210d3..3103a46c242 100644 --- a/tgui/.gitattributes +++ b/tgui/.gitattributes @@ -6,7 +6,6 @@ *.ts text eol=lf *.tsx text eol=lf *.css text eol=lf -*.cjs text eol=lf *.scss text eol=lf *.html text eol=lf *.json text eol=lf diff --git a/tgui/.gitignore b/tgui/.gitignore index 4d0dd666d88..46b4182f604 100644 --- a/tgui/.gitignore +++ b/tgui/.gitignore @@ -1,24 +1,9 @@ ## NPM garbage node_modules *.log -package-lock.json - -## Yarn stuff -/.pnp.* -/.yarn/* -!/.yarn/releases -!/.yarn/plugins -!/.yarn/sdks -!/.yarn/versions -!/.yarn/lock.yml ## Build artifacts -/public/.tmp/**/* /public/**/* !/public/*.html -!/public/tgui-polyfill.min.js -/coverage - -## Previously ignored locations that are kept to avoid confusing git -## while transitioning to a new project structure. -/packages/tgui/public/** +!/public/ntos-error.min.css +!/public/helpers.min.js diff --git a/tgui/.prettierignore b/tgui/.prettierignore index 97d37c5a6fa..64ad6361de2 100644 --- a/tgui/.prettierignore +++ b/tgui/.prettierignore @@ -1,8 +1,12 @@ -.pnp.* -.yarn node_modules +public + +*.js +*.ts +*.tsx +*.css +*.jsx +*.json -# Avoid running on any bundles. -/public/**/* # Running it on tgui.html is fine, however. !/public/tgui.html diff --git a/tgui/.prettierrc.yml b/tgui/.prettierrc.yml index e3cf66636e8..64d6436bcd0 100644 --- a/tgui/.prettierrc.yml +++ b/tgui/.prettierrc.yml @@ -1,6 +1,6 @@ singleQuote: true overrides: - - files: 'public/tgui.html' + - files: 'packages/tgui-setup/helpers.js' options: trailingComma: es5 arrowParens: always diff --git a/tgui/.swcrc b/tgui/.swcrc new file mode 100644 index 00000000000..5cc7c7f5dec --- /dev/null +++ b/tgui/.swcrc @@ -0,0 +1,15 @@ +{ + "$schema": "https://swc.rs/schema.json", + "jsc": { + "loose": true, + "parser": { + "syntax": "typescript", + "tsx": true + }, + "transform": { + "react": { + "runtime": "automatic" + } + } + } +} diff --git a/tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs deleted file mode 100644 index 527659ff97f..00000000000 --- a/tgui/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs +++ /dev/null @@ -1,363 +0,0 @@ -/* eslint-disable */ -//prettier-ignore -module.exports = { -name: "@yarnpkg/plugin-interactive-tools", -factory: function (require) { -var plugin=(()=>{var PR=Object.create,J1=Object.defineProperty,MR=Object.defineProperties,FR=Object.getOwnPropertyDescriptor,LR=Object.getOwnPropertyDescriptors,RR=Object.getOwnPropertyNames,hh=Object.getOwnPropertySymbols,NR=Object.getPrototypeOf,Z4=Object.prototype.hasOwnProperty,aD=Object.prototype.propertyIsEnumerable;var dD=(i,u,f)=>u in i?J1(i,u,{enumerable:!0,configurable:!0,writable:!0,value:f}):i[u]=f,dt=(i,u)=>{for(var f in u||(u={}))Z4.call(u,f)&&dD(i,f,u[f]);if(hh)for(var f of hh(u))aD.call(u,f)&&dD(i,f,u[f]);return i},zn=(i,u)=>MR(i,LR(u)),BR=i=>J1(i,"__esModule",{value:!0});var Si=(i,u)=>{var f={};for(var c in i)Z4.call(i,c)&&u.indexOf(c)<0&&(f[c]=i[c]);if(i!=null&&hh)for(var c of hh(i))u.indexOf(c)<0&&aD.call(i,c)&&(f[c]=i[c]);return f};var Me=(i,u)=>()=>(u||i((u={exports:{}}).exports,u),u.exports),jR=(i,u)=>{for(var f in u)J1(i,f,{get:u[f],enumerable:!0})},UR=(i,u,f)=>{if(u&&typeof u=="object"||typeof u=="function")for(let c of RR(u))!Z4.call(i,c)&&c!=="default"&&J1(i,c,{get:()=>u[c],enumerable:!(f=FR(u,c))||f.enumerable});return i},Er=i=>UR(BR(J1(i!=null?PR(NR(i)):{},"default",i&&i.__esModule&&"default"in i?{get:()=>i.default,enumerable:!0}:{value:i,enumerable:!0})),i);var ey=Me((YH,pD)=>{"use strict";var hD=Object.getOwnPropertySymbols,qR=Object.prototype.hasOwnProperty,zR=Object.prototype.propertyIsEnumerable;function WR(i){if(i==null)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(i)}function HR(){try{if(!Object.assign)return!1;var i=new String("abc");if(i[5]="de",Object.getOwnPropertyNames(i)[0]==="5")return!1;for(var u={},f=0;f<10;f++)u["_"+String.fromCharCode(f)]=f;var c=Object.getOwnPropertyNames(u).map(function(t){return u[t]});if(c.join("")!=="0123456789")return!1;var g={};return"abcdefghijklmnopqrst".split("").forEach(function(t){g[t]=t}),Object.keys(Object.assign({},g)).join("")==="abcdefghijklmnopqrst"}catch(t){return!1}}pD.exports=HR()?Object.assign:function(i,u){for(var f,c=WR(i),g,t=1;t{"use strict";var ty=ey(),as=typeof Symbol=="function"&&Symbol.for,Q1=as?Symbol.for("react.element"):60103,bR=as?Symbol.for("react.portal"):60106,GR=as?Symbol.for("react.fragment"):60107,VR=as?Symbol.for("react.strict_mode"):60108,YR=as?Symbol.for("react.profiler"):60114,$R=as?Symbol.for("react.provider"):60109,KR=as?Symbol.for("react.context"):60110,XR=as?Symbol.for("react.forward_ref"):60112,JR=as?Symbol.for("react.suspense"):60113,QR=as?Symbol.for("react.memo"):60115,ZR=as?Symbol.for("react.lazy"):60116,mD=typeof Symbol=="function"&&Symbol.iterator;function Z1(i){for(var u="https://reactjs.org/docs/error-decoder.html?invariant="+i,f=1;fmh.length&&mh.push(i)}function uy(i,u,f,c){var g=typeof i;(g==="undefined"||g==="boolean")&&(i=null);var t=!1;if(i===null)t=!0;else switch(g){case"string":case"number":t=!0;break;case"object":switch(i.$$typeof){case Q1:case bR:t=!0}}if(t)return f(c,i,u===""?"."+sy(i,0):u),1;if(t=0,u=u===""?".":u+":",Array.isArray(i))for(var C=0;C{"use strict";kD.exports=xD()});var AD=Me((ga,e2)=>{(function(){var i,u="4.17.21",f=200,c="Unsupported core-js use. Try https://npms.io/search?q=ponyfill.",g="Expected a function",t="Invalid `variable` option passed into `_.template`",C="__lodash_hash_undefined__",A=500,x="__lodash_placeholder__",D=1,L=2,N=4,j=1,$=2,h=1,re=2,ce=4,Q=8,oe=16,Se=32,me=64,De=128,J=256,Te=512,Oe=30,Le="...",ot=800,ct=16,Ue=1,be=2,At=3,Ot=1/0,Nt=9007199254740991,Je=17976931348623157e292,V=0/0,ne=4294967295,ge=ne-1,Z=ne>>>1,Ae=[["ary",De],["bind",h],["bindKey",re],["curry",Q],["curryRight",oe],["flip",Te],["partial",Se],["partialRight",me],["rearg",J]],at="[object Arguments]",it="[object Array]",Ft="[object AsyncFunction]",jt="[object Boolean]",hn="[object Date]",Un="[object DOMException]",Jt="[object Error]",Yt="[object Function]",cr="[object GeneratorFunction]",w="[object Map]",pt="[object Number]",Mn="[object Null]",Bn="[object Object]",Xn="[object Promise]",vr="[object Proxy]",gr="[object RegExp]",r0="[object Set]",Ci="[object String]",yo="[object Symbol]",Ds="[object Undefined]",Mu="[object WeakMap]",Gf="[object WeakSet]",iu="[object ArrayBuffer]",ou="[object DataView]",ol="[object Float32Array]",ul="[object Float64Array]",Es="[object Int8Array]",Uo="[object Int16Array]",sl="[object Int32Array]",Ss="[object Uint8Array]",Cs="[object Uint8ClampedArray]",Ti="[object Uint16Array]",Fu="[object Uint32Array]",ll=/\b__p \+= '';/g,fl=/\b(__p \+=) '' \+/g,cl=/(__e\(.*?\)|\b__t\)) \+\n'';/g,al=/&(?:amp|lt|gt|quot|#39);/g,Ui=/[&<>"']/g,Mr=RegExp(al.source),Ac=RegExp(Ui.source),of=/<%-([\s\S]+?)%>/g,Ts=/<%([\s\S]+?)%>/g,xs=/<%=([\s\S]+?)%>/g,dl=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,qi=/^\w*$/,qo=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,kr=/[\\^$.*+?()[\]{}|]/g,Fr=RegExp(kr.source),si=/^\s+/,H0=/\s/,b0=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,Bt=/\{\n\/\* \[wrapped with (.+)\] \*/,Lu=/,? & /,c0=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,Ru=/[()=,{}\[\]\/\s]/,ks=/\\(\\)?/g,As=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,uu=/\w*$/,wo=/^[-+]0x[0-9a-f]+$/i,zo=/^0b[01]+$/i,Os=/^\[object .+?Constructor\]$/,Is=/^0o[0-7]+$/i,uf=/^(?:0|[1-9]\d*)$/,_n=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,Nu=/($^)/,Wo=/['\n\r\u2028\u2029\\]/g,su="\\ud800-\\udfff",Ps="\\u0300-\\u036f",pl="\\ufe20-\\ufe2f",Vf="\\u20d0-\\u20ff",hl=Ps+pl+Vf,Bu="\\u2700-\\u27bf",ju="a-z\\xdf-\\xf6\\xf8-\\xff",sf="\\xac\\xb1\\xd7\\xf7",ro="\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf",Ms="\\u2000-\\u206f",ml=" \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",Uu="A-Z\\xc0-\\xd6\\xd8-\\xde",G0="\\ufe0e\\ufe0f",Fs=sf+ro+Ms+ml,tt="['\u2019]",zi="["+su+"]",lu="["+Fs+"]",Ho="["+hl+"]",O0="\\d+",vl="["+Bu+"]",gl="["+ju+"]",fu="[^"+su+Fs+O0+Bu+ju+Uu+"]",_l="\\ud83c[\\udffb-\\udfff]",Sn="(?:"+Ho+"|"+_l+")",gt="[^"+su+"]",en="(?:\\ud83c[\\udde6-\\uddff]){2}",I0="[\\ud800-\\udbff][\\udc00-\\udfff]",li="["+Uu+"]",qu="\\u200d",Wi="(?:"+gl+"|"+fu+")",zu="(?:"+li+"|"+fu+")",Wu="(?:"+tt+"(?:d|ll|m|re|s|t|ve))?",Ls="(?:"+tt+"(?:D|LL|M|RE|S|T|VE))?",fi=Sn+"?",e0="["+G0+"]?",io="(?:"+qu+"(?:"+[gt,en,I0].join("|")+")"+e0+fi+")*",D0="\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])",Do="\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])",i0=e0+fi+io,Rs="(?:"+[vl,en,I0].join("|")+")"+i0,a0="(?:"+[gt+Ho+"?",Ho,en,I0,zi].join("|")+")",Hu=RegExp(tt,"g"),V0=RegExp(Ho,"g"),bu=RegExp(_l+"(?="+_l+")|"+a0+i0,"g"),Ns=RegExp([li+"?"+gl+"+"+Wu+"(?="+[lu,li,"$"].join("|")+")",zu+"+"+Ls+"(?="+[lu,li+Wi,"$"].join("|")+")",li+"?"+Wi+"+"+Wu,li+"+"+Ls,Do,D0,O0,Rs].join("|"),"g"),bo=RegExp("["+qu+su+hl+G0+"]"),P0=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,ln=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],lf=-1,nr={};nr[ol]=nr[ul]=nr[Es]=nr[Uo]=nr[sl]=nr[Ss]=nr[Cs]=nr[Ti]=nr[Fu]=!0,nr[at]=nr[it]=nr[iu]=nr[jt]=nr[ou]=nr[hn]=nr[Jt]=nr[Yt]=nr[w]=nr[pt]=nr[Bn]=nr[gr]=nr[r0]=nr[Ci]=nr[Mu]=!1;var rr={};rr[at]=rr[it]=rr[iu]=rr[ou]=rr[jt]=rr[hn]=rr[ol]=rr[ul]=rr[Es]=rr[Uo]=rr[sl]=rr[w]=rr[pt]=rr[Bn]=rr[gr]=rr[r0]=rr[Ci]=rr[yo]=rr[Ss]=rr[Cs]=rr[Ti]=rr[Fu]=!0,rr[Jt]=rr[Yt]=rr[Mu]=!1;var Go={\u00C0:"A",\u00C1:"A",\u00C2:"A",\u00C3:"A",\u00C4:"A",\u00C5:"A",\u00E0:"a",\u00E1:"a",\u00E2:"a",\u00E3:"a",\u00E4:"a",\u00E5:"a",\u00C7:"C",\u00E7:"c",\u00D0:"D",\u00F0:"d",\u00C8:"E",\u00C9:"E",\u00CA:"E",\u00CB:"E",\u00E8:"e",\u00E9:"e",\u00EA:"e",\u00EB:"e",\u00CC:"I",\u00CD:"I",\u00CE:"I",\u00CF:"I",\u00EC:"i",\u00ED:"i",\u00EE:"i",\u00EF:"i",\u00D1:"N",\u00F1:"n",\u00D2:"O",\u00D3:"O",\u00D4:"O",\u00D5:"O",\u00D6:"O",\u00D8:"O",\u00F2:"o",\u00F3:"o",\u00F4:"o",\u00F5:"o",\u00F6:"o",\u00F8:"o",\u00D9:"U",\u00DA:"U",\u00DB:"U",\u00DC:"U",\u00F9:"u",\u00FA:"u",\u00FB:"u",\u00FC:"u",\u00DD:"Y",\u00FD:"y",\u00FF:"y",\u00C6:"Ae",\u00E6:"ae",\u00DE:"Th",\u00FE:"th",\u00DF:"ss",\u0100:"A",\u0102:"A",\u0104:"A",\u0101:"a",\u0103:"a",\u0105:"a",\u0106:"C",\u0108:"C",\u010A:"C",\u010C:"C",\u0107:"c",\u0109:"c",\u010B:"c",\u010D:"c",\u010E:"D",\u0110:"D",\u010F:"d",\u0111:"d",\u0112:"E",\u0114:"E",\u0116:"E",\u0118:"E",\u011A:"E",\u0113:"e",\u0115:"e",\u0117:"e",\u0119:"e",\u011B:"e",\u011C:"G",\u011E:"G",\u0120:"G",\u0122:"G",\u011D:"g",\u011F:"g",\u0121:"g",\u0123:"g",\u0124:"H",\u0126:"H",\u0125:"h",\u0127:"h",\u0128:"I",\u012A:"I",\u012C:"I",\u012E:"I",\u0130:"I",\u0129:"i",\u012B:"i",\u012D:"i",\u012F:"i",\u0131:"i",\u0134:"J",\u0135:"j",\u0136:"K",\u0137:"k",\u0138:"k",\u0139:"L",\u013B:"L",\u013D:"L",\u013F:"L",\u0141:"L",\u013A:"l",\u013C:"l",\u013E:"l",\u0140:"l",\u0142:"l",\u0143:"N",\u0145:"N",\u0147:"N",\u014A:"N",\u0144:"n",\u0146:"n",\u0148:"n",\u014B:"n",\u014C:"O",\u014E:"O",\u0150:"O",\u014D:"o",\u014F:"o",\u0151:"o",\u0154:"R",\u0156:"R",\u0158:"R",\u0155:"r",\u0157:"r",\u0159:"r",\u015A:"S",\u015C:"S",\u015E:"S",\u0160:"S",\u015B:"s",\u015D:"s",\u015F:"s",\u0161:"s",\u0162:"T",\u0164:"T",\u0166:"T",\u0163:"t",\u0165:"t",\u0167:"t",\u0168:"U",\u016A:"U",\u016C:"U",\u016E:"U",\u0170:"U",\u0172:"U",\u0169:"u",\u016B:"u",\u016D:"u",\u016F:"u",\u0171:"u",\u0173:"u",\u0174:"W",\u0175:"w",\u0176:"Y",\u0177:"y",\u0178:"Y",\u0179:"Z",\u017B:"Z",\u017D:"Z",\u017A:"z",\u017C:"z",\u017E:"z",\u0132:"IJ",\u0133:"ij",\u0152:"Oe",\u0153:"oe",\u0149:"'n",\u017F:"s"},Gu={"&":"&","<":"<",">":">",'"':""","'":"'"},yl={"&":"&","<":"<",">":">",""":'"',"'":"'"},cu={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Bs=parseFloat,Vu=parseInt,M0=typeof global=="object"&&global&&global.Object===Object&&global,au=typeof self=="object"&&self&&self.Object===Object&&self,Lr=M0||au||Function("return this")(),F=typeof ga=="object"&&ga&&!ga.nodeType&&ga,R=F&&typeof e2=="object"&&e2&&!e2.nodeType&&e2,U=R&&R.exports===F,H=U&&M0.process,fe=function(){try{var ae=R&&R.require&&R.require("util").types;return ae||H&&H.binding&&H.binding("util")}catch(Be){}}(),ue=fe&&fe.isArrayBuffer,de=fe&&fe.isDate,W=fe&&fe.isMap,ve=fe&&fe.isRegExp,Fe=fe&&fe.isSet,Ge=fe&&fe.isTypedArray;function K(ae,Be,Ie){switch(Ie.length){case 0:return ae.call(Be);case 1:return ae.call(Be,Ie[0]);case 2:return ae.call(Be,Ie[0],Ie[1]);case 3:return ae.call(Be,Ie[0],Ie[1],Ie[2])}return ae.apply(Be,Ie)}function xe(ae,Be,Ie,ht){for(var mt=-1,wn=ae==null?0:ae.length;++mt-1}function wt(ae,Be,Ie){for(var ht=-1,mt=ae==null?0:ae.length;++ht-1;);return Ie}function js(ae,Be){for(var Ie=ae.length;Ie--&&Qe(Be,ae[Ie],0)>-1;);return Ie}function Dl(ae,Be){for(var Ie=ae.length,ht=0;Ie--;)ae[Ie]===Be&&++ht;return ht}var du=Cn(Go),Yu=Cn(Gu);function Us(ae){return"\\"+cu[ae]}function oo(ae,Be){return ae==null?i:ae[Be]}function Hi(ae){return bo.test(ae)}function qs(ae){return P0.test(ae)}function F0(ae){for(var Be,Ie=[];!(Be=ae.next()).done;)Ie.push(Be.value);return Ie}function Gr(ae){var Be=-1,Ie=Array(ae.size);return ae.forEach(function(ht,mt){Ie[++Be]=[mt,ht]}),Ie}function ir(ae,Be){return function(Ie){return ae(Be(Ie))}}function L0(ae,Be){for(var Ie=-1,ht=ae.length,mt=0,wn=[];++Ie-1}function Ju(a,p){var E=this.__data__,I=hf(E,a);return I<0?(++this.size,E.push([a,p])):E[I][1]=p,this}Z0.prototype.clear=df,Z0.prototype.delete=Ba,Z0.prototype.get=Oc,Z0.prototype.has=mu,Z0.prototype.set=Ju;function ei(a){var p=-1,E=a==null?0:a.length;for(this.clear();++p=p?a:p)),a}function vi(a,p,E,I,B,G){var te,se=p&D,Ee=p&L,$e=p&N;if(E&&(te=B?E(a,I,B,G):E(a)),te!==i)return te;if(!Jr(a))return a;var Ke=On(a);if(Ke){if(te=f1(a),!se)return Xr(a,te)}else{var nt=U0(a),Ct=nt==Yt||nt==cr;if(Eu(a))return Od(a,se);if(nt==Bn||nt==at||Ct&&!B){if(te=Ee||Ct?{}:zd(a),!se)return Ee?Zu(a,Wa(te,a)):j0(a,mf(te,a))}else{if(!rr[nt])return B?a:{};te=Wd(a,nt,se)}}G||(G=new co);var Gt=G.get(a);if(Gt)return Gt;G.set(a,te),kp(a)?a.forEach(function(dn){te.add(vi(dn,p,E,dn,a,G))}):Tp(a)&&a.forEach(function(dn,Yn){te.set(Yn,vi(dn,p,E,Yn,a,G))});var an=$e?Ee?Dn:r1:Ee?Yi:q0,qn=Ke?i:an(a);return je(qn||a,function(dn,Yn){qn&&(Yn=dn,dn=a[Yn]),xl(te,Yn,vi(dn,p,E,Yn,a,G))}),te}function Xf(a){var p=q0(a);return function(E){return Rc(E,a,p)}}function Rc(a,p,E){var I=E.length;if(a==null)return!I;for(a=$t(a);I--;){var B=E[I],G=p[B],te=a[B];if(te===i&&!(B in a)||!G(te))return!1}return!0}function Jf(a,p,E){if(typeof a!="function")throw new Yr(g);return wf(function(){a.apply(i,E)},p)}function ao(a,p,E,I){var B=-1,G=xt,te=!0,se=a.length,Ee=[],$e=p.length;if(!se)return Ee;E&&(p=lt(p,qr(E))),I?(G=wt,te=!1):p.length>=f&&(G=So,te=!1,p=new vu(p));e:for(;++BB?0:B+E),I=I===i||I>B?B:jn(I),I<0&&(I+=B),I=E>I?0:Ip(I);E0&&E(se)?p>1?k0(se,p-1,E,I,B):Rt(B,se):I||(B[B.length]=se)}return B}var v=ec(),m=ec(!0);function S(a,p){return a&&v(a,p,q0)}function O(a,p){return a&&m(a,p,q0)}function M(a,p){return st(p,function(E){return rs(a[E])})}function b(a,p){p=Gs(p,a);for(var E=0,I=p.length;a!=null&&Ep}function ut(a,p){return a!=null&&or.call(a,p)}function In(a,p){return a!=null&&p in $t(a)}function A0(a,p,E){return a>=kn(p,E)&&a=120&&Ke.length>=120)?new vu(te&&Ke):i}Ke=a[0];var nt=-1,Ct=se[0];e:for(;++nt-1;)se!==a&&C0.call(se,Ee,1),C0.call(a,Ee,1);return a}function jc(a,p){for(var E=a?p.length:0,I=E-1;E--;){var B=p[E];if(E==I||B!==G){var G=B;es(B)?C0.call(a,B,1):$a(a,B)}}return a}function Ga(a,p){return a+hu(Ai()*(p-a+1))}function Lm(a,p,E,I){for(var B=-1,G=wr(B0((p-a)/(E||1)),0),te=Ie(G);G--;)te[I?G:++B]=a,a+=E;return te}function Va(a,p){var E="";if(!a||p<1||p>Nt)return E;do p%2&&(E+=a),p=hu(p/2),p&&(a+=a);while(p);return E}function Wn(a,p){return m1(Gd(a,p,$i),a+"")}function wd(a){return Fc(Ef(a))}function Dd(a,p){var E=Ef(a);return Yc(E,mi(p,0,E.length))}function Ol(a,p,E,I){if(!Jr(a))return a;p=Gs(p,a);for(var B=-1,G=p.length,te=G-1,se=a;se!=null&&++BB?0:B+p),E=E>B?B:E,E<0&&(E+=B),B=p>E?0:E-p>>>0,p>>>=0;for(var G=Ie(B);++I>>1,te=a[G];te!==null&&!mo(te)&&(E?te<=p:te=f){var $e=p?null:bm(a);if($e)return Y0($e);te=!1,B=So,Ee=new vu}else Ee=p?[]:se;e:for(;++I=I?a:Oo(a,p,E)}var Ad=pu||function(a){return Lr.clearTimeout(a)};function Od(a,p){if(p)return a.slice();var E=a.length,I=Nr?Nr(E):new a.constructor(E);return a.copy(I),I}function Qa(a){var p=new a.constructor(a.byteLength);return new R0(p).set(new R0(a)),p}function jm(a,p){var E=p?Qa(a.buffer):a.buffer;return new a.constructor(E,a.byteOffset,a.byteLength)}function Um(a){var p=new a.constructor(a.source,uu.exec(a));return p.lastIndex=a.lastIndex,p}function qm(a){return Wr?$t(Wr.call(a)):{}}function Id(a,p){var E=p?Qa(a.buffer):a.buffer;return new a.constructor(E,a.byteOffset,a.length)}function Pd(a,p){if(a!==p){var E=a!==i,I=a===null,B=a===a,G=mo(a),te=p!==i,se=p===null,Ee=p===p,$e=mo(p);if(!se&&!$e&&!G&&a>p||G&&te&&Ee&&!se&&!$e||I&&te&&Ee||!E&&Ee||!B)return 1;if(!I&&!G&&!$e&&a=se)return Ee;var $e=E[I];return Ee*($e=="desc"?-1:1)}}return a.index-p.index}function gf(a,p,E,I){for(var B=-1,G=a.length,te=E.length,se=-1,Ee=p.length,$e=wr(G-te,0),Ke=Ie(Ee+$e),nt=!I;++se1?E[B-1]:i,te=B>2?E[2]:i;for(G=a.length>3&&typeof G=="function"?(B--,G):i,te&&Ii(E[0],E[1],te)&&(G=B<3?i:G,B=1),p=$t(p);++I-1?B[G?p[te]:te]:i}}function Rd(a){return yu(function(p){var E=p.length,I=E,B=Qn.prototype.thru;for(a&&p.reverse();I--;){var G=p[I];if(typeof G!="function")throw new Yr(g);if(B&&!te&&Gc(G)=="wrapper")var te=new Qn([],!0)}for(I=te?I:E;++I1&&er.reverse(),Ke&&Eese))return!1;var $e=G.get(a),Ke=G.get(p);if($e&&Ke)return $e==p&&Ke==a;var nt=-1,Ct=!0,Gt=E&$?new vu:i;for(G.set(a,p),G.set(p,a);++nt1?"& ":"")+p[I],p=p.join(E>2?", ":" "),a.replace(b0,`{ -/* [wrapped with `+p+`] */ -`)}function Xm(a){return On(a)||Ll(a)||!!(di&&a&&a[di])}function es(a,p){var E=typeof a;return p=p==null?Nt:p,!!p&&(E=="number"||E!="symbol"&&uf.test(a))&&a>-1&&a%1==0&&a0){if(++p>=ot)return arguments[0]}else p=0;return a.apply(i,arguments)}}function Yc(a,p){var E=-1,I=a.length,B=I-1;for(p=p===i?I:p;++E1?a[p-1]:i;return E=typeof E=="function"?(a.pop(),E):i,sp(a,E)});function fp(a){var p=z(a);return p.__chain__=!0,p}function cp(a,p){return p(a),a}function Kc(a,p){return p(a)}var Wv=yu(function(a){var p=a.length,E=p?a[0]:0,I=this.__wrapped__,B=function(G){return Hs(G,a)};return p>1||this.__actions__.length||!(I instanceof nn)||!es(E)?this.thru(B):(I=I.slice(E,+E+(p?1:0)),I.__actions__.push({func:Kc,args:[B],thisArg:i}),new Qn(I,this.__chain__).thru(function(G){return p&&!G.length&&G.push(i),G}))});function Hv(){return fp(this)}function bv(){return new Qn(this.value(),this.__chain__)}function Gv(){this.__values__===i&&(this.__values__=Op(this.value()));var a=this.__index__>=this.__values__.length,p=a?i:this.__values__[this.__index__++];return{done:a,value:p}}function Vv(){return this}function Yv(a){for(var p,E=this;E instanceof Or;){var I=Jd(E);I.__index__=0,I.__values__=i,p?B.__wrapped__=I:p=I;var B=I;E=E.__wrapped__}return B.__wrapped__=a,p}function Ml(){var a=this.__wrapped__;if(a instanceof nn){var p=a;return this.__actions__.length&&(p=new nn(this)),p=p.reverse(),p.__actions__.push({func:Kc,args:[g1],thisArg:i}),new Qn(p,this.__chain__)}return this.thru(g1)}function Fl(){return xd(this.__wrapped__,this.__actions__)}var Xc=_f(function(a,p,E){or.call(a,E)?++a[E]:ti(a,E,1)});function $v(a,p,E){var I=On(a)?rt:Nc;return E&&Ii(a,p,E)&&(p=i),I(a,cn(p,3))}function Kv(a,p){var E=On(a)?st:Qf;return E(a,cn(p,3))}var Xv=Ld(Qd),D1=Ld($c);function Jv(a,p){return k0(Jc(a,p),1)}function Qv(a,p){return k0(Jc(a,p),Ot)}function ap(a,p,E){return E=E===i?1:jn(E),k0(Jc(a,p),E)}function dp(a,p){var E=On(a)?je:$o;return E(a,cn(p,3))}function pp(a,p){var E=On(a)?Xe:kl;return E(a,cn(p,3))}var Zv=_f(function(a,p,E){or.call(a,E)?a[E].push(p):ti(a,E,[p])});function eg(a,p,E,I){a=Vi(a)?a:Ef(a),E=E&&!I?jn(E):0;var B=a.length;return E<0&&(E=wr(B+E,0)),ia(a)?E<=B&&a.indexOf(p,E)>-1:!!B&&Qe(a,p,E)>-1}var tg=Wn(function(a,p,E){var I=-1,B=typeof p=="function",G=Vi(a)?Ie(a.length):[];return $o(a,function(te){G[++I]=B?K(p,te,E):po(te,p,E)}),G}),hp=_f(function(a,p,E){ti(a,E,p)});function Jc(a,p){var E=On(a)?lt:vd;return E(a,cn(p,3))}function ng(a,p,E,I){return a==null?[]:(On(p)||(p=p==null?[]:[p]),E=I?i:E,On(E)||(E=E==null?[]:[E]),Oi(a,p,E))}var rg=_f(function(a,p,E){a[E?0:1].push(p)},function(){return[[],[]]});function mp(a,p,E){var I=On(a)?yn:bn,B=arguments.length<3;return I(a,cn(p,4),E,B,$o)}function ig(a,p,E){var I=On(a)?sn:bn,B=arguments.length<3;return I(a,cn(p,4),E,B,kl)}function og(a,p){var E=On(a)?st:Qf;return E(a,Zc(cn(p,3)))}function ug(a){var p=On(a)?Fc:wd;return p(a)}function sg(a,p,E){(E?Ii(a,p,E):p===i)?p=1:p=jn(p);var I=On(a)?Lc:Dd;return I(a,p)}function lg(a){var p=On(a)?Kf:Ao;return p(a)}function E1(a){if(a==null)return 0;if(Vi(a))return ia(a)?Rr(a):a.length;var p=U0(a);return p==w||p==r0?a.size:Zf(a).length}function fg(a,p,E){var I=On(a)?ar:Nm;return E&&Ii(a,p,E)&&(p=i),I(a,cn(p,3))}var cg=Wn(function(a,p){if(a==null)return[];var E=p.length;return E>1&&Ii(a,p[0],p[1])?p=[]:E>2&&Ii(p[0],p[1],p[2])&&(p=[p[0]]),Oi(a,k0(p,1),[])}),rc=Sl||function(){return Lr.Date.now()};function ag(a,p){if(typeof p!="function")throw new Yr(g);return a=jn(a),function(){if(--a<1)return p.apply(this,arguments)}}function vp(a,p,E){return p=E?i:p,p=a&&p==null?a.length:p,Lt(a,De,i,i,i,i,p)}function gp(a,p){var E;if(typeof p!="function")throw new Yr(g);return a=jn(a),function(){return--a>0&&(E=p.apply(this,arguments)),a<=1&&(p=i),E}}var S1=Wn(function(a,p,E){var I=h;if(E.length){var B=L0(E,An(S1));I|=Se}return Lt(a,I,p,E,B)}),_p=Wn(function(a,p,E){var I=h|re;if(E.length){var B=L0(E,An(_p));I|=Se}return Lt(p,I,a,E,B)});function C1(a,p,E){p=E?i:p;var I=Lt(a,Q,i,i,i,i,i,p);return I.placeholder=C1.placeholder,I}function yp(a,p,E){p=E?i:p;var I=Lt(a,oe,i,i,i,i,i,p);return I.placeholder=yp.placeholder,I}function wp(a,p,E){var I,B,G,te,se,Ee,$e=0,Ke=!1,nt=!1,Ct=!0;if(typeof a!="function")throw new Yr(g);p=Fo(p)||0,Jr(E)&&(Ke=!!E.leading,nt="maxWait"in E,G=nt?wr(Fo(E.maxWait)||0,p):G,Ct="trailing"in E?!!E.trailing:Ct);function Gt(f0){var Jo=I,Su=B;return I=B=i,$e=f0,te=a.apply(Su,Jo),te}function an(f0){return $e=f0,se=wf(Yn,p),Ke?Gt(f0):te}function qn(f0){var Jo=f0-Ee,Su=f0-$e,Zp=p-Jo;return nt?kn(Zp,G-Su):Zp}function dn(f0){var Jo=f0-Ee,Su=f0-$e;return Ee===i||Jo>=p||Jo<0||nt&&Su>=G}function Yn(){var f0=rc();if(dn(f0))return er(f0);se=wf(Yn,qn(f0))}function er(f0){return se=i,Ct&&I?Gt(f0):(I=B=i,te)}function vo(){se!==i&&Ad(se),$e=0,I=Ee=B=se=i}function Pi(){return se===i?te:er(rc())}function Mi(){var f0=rc(),Jo=dn(f0);if(I=arguments,B=this,Ee=f0,Jo){if(se===i)return an(Ee);if(nt)return Ad(se),se=wf(Yn,p),Gt(Ee)}return se===i&&(se=wf(Yn,p)),te}return Mi.cancel=vo,Mi.flush=Pi,Mi}var dg=Wn(function(a,p){return Jf(a,1,p)}),Dp=Wn(function(a,p,E){return Jf(a,Fo(p)||0,E)});function pg(a){return Lt(a,Te)}function Qc(a,p){if(typeof a!="function"||p!=null&&typeof p!="function")throw new Yr(g);var E=function(){var I=arguments,B=p?p.apply(this,I):I[0],G=E.cache;if(G.has(B))return G.get(B);var te=a.apply(this,I);return E.cache=G.set(B,te)||G,te};return E.cache=new(Qc.Cache||ei),E}Qc.Cache=ei;function Zc(a){if(typeof a!="function")throw new Yr(g);return function(){var p=arguments;switch(p.length){case 0:return!a.call(this);case 1:return!a.call(this,p[0]);case 2:return!a.call(this,p[0],p[1]);case 3:return!a.call(this,p[0],p[1],p[2])}return!a.apply(this,p)}}function ea(a){return gp(2,a)}var hg=Bm(function(a,p){p=p.length==1&&On(p[0])?lt(p[0],qr(cn())):lt(k0(p,1),qr(cn()));var E=p.length;return Wn(function(I){for(var B=-1,G=kn(I.length,E);++B=p}),Ll=_i(function(){return arguments}())?_i:function(a){return n0(a)&&or.call(a,"callee")&&!N0.call(a,"callee")},On=Ie.isArray,x1=ue?qr(ue):Re;function Vi(a){return a!=null&&na(a.length)&&!rs(a)}function l0(a){return n0(a)&&Vi(a)}function kg(a){return a===!0||a===!1||n0(a)&&Ye(a)==jt}var Eu=pi||W1,Ag=de?qr(de):Ce;function Og(a){return n0(a)&&a.nodeType===1&&!ic(a)}function Cp(a){if(a==null)return!0;if(Vi(a)&&(On(a)||typeof a=="string"||typeof a.splice=="function"||Eu(a)||Df(a)||Ll(a)))return!a.length;var p=U0(a);if(p==w||p==r0)return!a.size;if(nc(a))return!Zf(a).length;for(var E in a)if(or.call(a,E))return!1;return!0}function Ig(a,p){return ze(a,p)}function Pg(a,p,E){E=typeof E=="function"?E:i;var I=E?E(a,p):i;return I===i?ze(a,p,i,E):!!I}function k1(a){if(!n0(a))return!1;var p=Ye(a);return p==Jt||p==Un||typeof a.message=="string"&&typeof a.name=="string"&&!ic(a)}function Mg(a){return typeof a=="number"&&Br(a)}function rs(a){if(!Jr(a))return!1;var p=Ye(a);return p==Yt||p==cr||p==Ft||p==vr}function A1(a){return typeof a=="number"&&a==jn(a)}function na(a){return typeof a=="number"&&a>-1&&a%1==0&&a<=Nt}function Jr(a){var p=typeof a;return a!=null&&(p=="object"||p=="function")}function n0(a){return a!=null&&typeof a=="object"}var Tp=W?qr(W):on;function Fg(a,p){return a===p||sr(a,p,Nn(p))}function Lg(a,p,E){return E=typeof E=="function"?E:i,sr(a,p,Nn(p),E)}function Rg(a){return xp(a)&&a!=+a}function Ng(a){if(Zm(a))throw new mt(c);return mn(a)}function Bg(a){return a===null}function O1(a){return a==null}function xp(a){return typeof a=="number"||n0(a)&&Ye(a)==pt}function ic(a){if(!n0(a)||Ye(a)!=Bn)return!1;var p=uo(a);if(p===null)return!0;var E=or.call(p,"constructor")&&p.constructor;return typeof E=="function"&&E instanceof E&&bi.call(E)==af}var ra=ve?qr(ve):pr;function jg(a){return A1(a)&&a>=-Nt&&a<=Nt}var kp=Fe?qr(Fe):Hr;function ia(a){return typeof a=="string"||!On(a)&&n0(a)&&Ye(a)==Ci}function mo(a){return typeof a=="symbol"||n0(a)&&Ye(a)==yo}var Df=Ge?qr(Ge):Vn;function Ap(a){return a===i}function Ug(a){return n0(a)&&U0(a)==Mu}function qg(a){return n0(a)&&Ye(a)==Gf}var zg=bc(Ha),Wg=bc(function(a,p){return a<=p});function Op(a){if(!a)return[];if(Vi(a))return ia(a)?Jn(a):Xr(a);if(u0&&a[u0])return F0(a[u0]());var p=U0(a),E=p==w?Gr:p==r0?Y0:Ef;return E(a)}function is(a){if(!a)return a===0?a:0;if(a=Fo(a),a===Ot||a===-Ot){var p=a<0?-1:1;return p*Je}return a===a?a:0}function jn(a){var p=is(a),E=p%1;return p===p?E?p-E:p:0}function Ip(a){return a?mi(jn(a),0,ne):0}function Fo(a){if(typeof a=="number")return a;if(mo(a))return V;if(Jr(a)){var p=typeof a.valueOf=="function"?a.valueOf():a;a=Jr(p)?p+"":p}if(typeof a!="string")return a===0?a:+a;a=E0(a);var E=zo.test(a);return E||Is.test(a)?Vu(a.slice(2),E?2:8):wo.test(a)?V:+a}function oa(a){return yi(a,Yi(a))}function Hg(a){return a?mi(jn(a),-Nt,Nt):a===0?a:0}function yr(a){return a==null?"":ho(a)}var Pp=Io(function(a,p){if(nc(p)||Vi(p)){yi(p,q0(p),a);return}for(var E in p)or.call(p,E)&&xl(a,E,p[E])}),Mp=Io(function(a,p){yi(p,Yi(p),a)}),ua=Io(function(a,p,E,I){yi(p,Yi(p),a,I)}),bg=Io(function(a,p,E,I){yi(p,q0(p),a,I)}),Gg=yu(Hs);function Vg(a,p){var E=dr(a);return p==null?E:mf(E,p)}var Fp=Wn(function(a,p){a=$t(a);var E=-1,I=p.length,B=I>2?p[2]:i;for(B&&Ii(p[0],p[1],B)&&(I=1);++E1),G}),yi(a,Dn(a),E),I&&(E=vi(E,D|L|N,Gm));for(var B=p.length;B--;)$a(E,p[B]);return E});function l_(a,p){return Bp(a,Zc(cn(p)))}var f_=yu(function(a,p){return a==null?{}:Fm(a,p)});function Bp(a,p){if(a==null)return{};var E=lt(Dn(a),function(I){return[I]});return p=cn(p),yd(a,E,function(I,B){return p(I,B[0])})}function c_(a,p,E){p=Gs(p,a);var I=-1,B=p.length;for(B||(B=1,a=i);++Ip){var I=a;a=p,p=I}if(E||a%1||p%1){var B=Ai();return kn(a+B*(p-a+Bs("1e-"+((B+"").length-1))),p)}return Ga(a,p)}var __=yf(function(a,p,E){return p=p.toLowerCase(),a+(E?Wp(p):p)});function Wp(a){return L1(yr(a).toLowerCase())}function Hp(a){return a=yr(a),a&&a.replace(_n,du).replace(V0,"")}function y_(a,p,E){a=yr(a),p=ho(p);var I=a.length;E=E===i?I:mi(jn(E),0,I);var B=E;return E-=p.length,E>=0&&a.slice(E,B)==p}function M1(a){return a=yr(a),a&&Ac.test(a)?a.replace(Ui,Yu):a}function w_(a){return a=yr(a),a&&Fr.test(a)?a.replace(kr,"\\$&"):a}var D_=yf(function(a,p,E){return a+(E?"-":"")+p.toLowerCase()}),bp=yf(function(a,p,E){return a+(E?" ":"")+p.toLowerCase()}),E_=Fd("toLowerCase");function S_(a,p,E){a=yr(a),p=jn(p);var I=p?Rr(a):0;if(!p||I>=p)return a;var B=(p-I)/2;return Hc(hu(B),E)+a+Hc(B0(B),E)}function C_(a,p,E){a=yr(a),p=jn(p);var I=p?Rr(a):0;return p&&I>>0,E?(a=yr(a),a&&(typeof p=="string"||p!=null&&!ra(p))&&(p=ho(p),!p&&Hi(a))?Vs(Jn(a),0,E):a.split(p,E)):[]}var I_=yf(function(a,p,E){return a+(E?" ":"")+L1(p)});function P_(a,p,E){return a=yr(a),E=E==null?0:mi(jn(E),0,a.length),p=ho(p),a.slice(E,E+p.length)==p}function M_(a,p,E){var I=z.templateSettings;E&&Ii(a,p,E)&&(p=i),a=yr(a),p=ua({},p,I,n1);var B=ua({},p.imports,I.imports,n1),G=q0(B),te=Eo(B,G),se,Ee,$e=0,Ke=p.interpolate||Nu,nt="__p += '",Ct=X0((p.escape||Nu).source+"|"+Ke.source+"|"+(Ke===xs?As:Nu).source+"|"+(p.evaluate||Nu).source+"|$","g"),Gt="//# sourceURL="+(or.call(p,"sourceURL")?(p.sourceURL+"").replace(/\s/g," "):"lodash.templateSources["+ ++lf+"]")+` -`;a.replace(Ct,function(dn,Yn,er,vo,Pi,Mi){return er||(er=vo),nt+=a.slice($e,Mi).replace(Wo,Us),Yn&&(se=!0,nt+=`' + -__e(`+Yn+`) + -'`),Pi&&(Ee=!0,nt+=`'; -`+Pi+`; -__p += '`),er&&(nt+=`' + -((__t = (`+er+`)) == null ? '' : __t) + -'`),$e=Mi+dn.length,dn}),nt+=`'; -`;var an=or.call(p,"variable")&&p.variable;if(!an)nt=`with (obj) { -`+nt+` -} -`;else if(Ru.test(an))throw new mt(t);nt=(Ee?nt.replace(ll,""):nt).replace(fl,"$1").replace(cl,"$1;"),nt="function("+(an||"obj")+`) { -`+(an?"":`obj || (obj = {}); -`)+"var __t, __p = ''"+(se?", __e = _.escape":"")+(Ee?`, __j = Array.prototype.join; -function print() { __p += __j.call(arguments, '') } -`:`; -`)+nt+`return __p -}`;var qn=$p(function(){return wn(G,Gt+"return "+nt).apply(i,te)});if(qn.source=nt,k1(qn))throw qn;return qn}function F_(a){return yr(a).toLowerCase()}function L_(a){return yr(a).toUpperCase()}function R_(a,p,E){if(a=yr(a),a&&(E||p===i))return E0(a);if(!a||!(p=ho(p)))return a;var I=Jn(a),B=Jn(p),G=wl(I,B),te=js(I,B)+1;return Vs(I,G,te).join("")}function F1(a,p,E){if(a=yr(a),a&&(E||p===i))return a.slice(0,ai(a)+1);if(!a||!(p=ho(p)))return a;var I=Jn(a),B=js(I,Jn(p))+1;return Vs(I,0,B).join("")}function N_(a,p,E){if(a=yr(a),a&&(E||p===i))return a.replace(si,"");if(!a||!(p=ho(p)))return a;var I=Jn(a),B=wl(I,Jn(p));return Vs(I,B).join("")}function B_(a,p){var E=Oe,I=Le;if(Jr(p)){var B="separator"in p?p.separator:B;E="length"in p?jn(p.length):E,I="omission"in p?ho(p.omission):I}a=yr(a);var G=a.length;if(Hi(a)){var te=Jn(a);G=te.length}if(E>=G)return a;var se=E-Rr(I);if(se<1)return I;var Ee=te?Vs(te,0,se).join(""):a.slice(0,se);if(B===i)return Ee+I;if(te&&(se+=Ee.length-se),ra(B)){if(a.slice(se).search(B)){var $e,Ke=Ee;for(B.global||(B=X0(B.source,yr(uu.exec(B))+"g")),B.lastIndex=0;$e=B.exec(Ke);)var nt=$e.index;Ee=Ee.slice(0,nt===i?se:nt)}}else if(a.indexOf(ho(B),se)!=se){var Ct=Ee.lastIndexOf(B);Ct>-1&&(Ee=Ee.slice(0,Ct))}return Ee+I}function Vp(a){return a=yr(a),a&&Mr.test(a)?a.replace(al,o0):a}var j_=yf(function(a,p,E){return a+(E?" ":"")+p.toUpperCase()}),L1=Fd("toUpperCase");function Yp(a,p,E){return a=yr(a),p=E?i:p,p===i?qs(a)?cf(a):d0(a):a.match(p)||[]}var $p=Wn(function(a,p){try{return K(a,i,p)}catch(E){return k1(E)?E:new mt(E)}}),U_=yu(function(a,p){return je(p,function(E){E=Xo(E),ti(a,E,S1(a[E],a))}),a});function Kp(a){var p=a==null?0:a.length,E=cn();return a=p?lt(a,function(I){if(typeof I[1]!="function")throw new Yr(g);return[E(I[0]),I[1]]}):[],Wn(function(I){for(var B=-1;++BNt)return[];var E=ne,I=kn(a,ne);p=cn(p),a-=ne;for(var B=ci(I,p);++E0||p<0)?new nn(E):(a<0?E=E.takeRight(-a):a&&(E=E.drop(a)),p!==i&&(p=jn(p),E=p<0?E.dropRight(-p):E.take(p-a)),E)},nn.prototype.takeRightWhile=function(a){return this.reverse().takeWhile(a).reverse()},nn.prototype.toArray=function(){return this.take(ne)},S(nn.prototype,function(a,p){var E=/^(?:filter|find|map|reject)|While$/.test(p),I=/^(?:head|last)$/.test(p),B=z[I?"take"+(p=="last"?"Right":""):p],G=I||/^find/.test(p);!B||(z.prototype[p]=function(){var te=this.__wrapped__,se=I?[1]:arguments,Ee=te instanceof nn,$e=se[0],Ke=Ee||On(te),nt=function(Yn){var er=B.apply(z,Rt([Yn],se));return I&&Ct?er[0]:er};Ke&&E&&typeof $e=="function"&&$e.length!=1&&(Ee=Ke=!1);var Ct=this.__chain__,Gt=!!this.__actions__.length,an=G&&!Ct,qn=Ee&&!Gt;if(!G&&Ke){te=qn?te:new nn(this);var dn=a.apply(te,se);return dn.__actions__.push({func:Kc,args:[nt],thisArg:i}),new Qn(dn,Ct)}return an&&qn?a.apply(this,se):(dn=this.thru(nt),an?I?dn.value()[0]:dn.value():dn)})}),je(["pop","push","shift","sort","splice","unshift"],function(a){var p=$r[a],E=/^(?:push|sort|unshift)$/.test(a)?"tap":"thru",I=/^(?:pop|shift)$/.test(a);z.prototype[a]=function(){var B=arguments;if(I&&!this.__chain__){var G=this.value();return p.apply(On(G)?G:[],B)}return this[E](function(te){return p.apply(On(te)?te:[],B)})}}),S(nn.prototype,function(a,p){var E=z[p];if(E){var I=E.name+"";or.call(bt,I)||(bt[I]=[]),bt[I].push({name:p,func:E})}}),bt[zc(i,re).name]=[{name:"wrapper",func:i}],nn.prototype.clone=s0,nn.prototype.reverse=t0,nn.prototype.value=g0,z.prototype.at=Wv,z.prototype.chain=Hv,z.prototype.commit=bv,z.prototype.next=Gv,z.prototype.plant=Yv,z.prototype.reverse=Ml,z.prototype.toJSON=z.prototype.valueOf=z.prototype.value=Fl,z.prototype.first=z.prototype.head,u0&&(z.prototype[u0]=Vv),z},K0=$0();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(Lr._=K0,define(function(){return K0})):R?((R.exports=K0)._=K0,F._=K0):Lr._=K0}).call(ga)});var ay=Me((XH,cy)=>{"use strict";var fr=cy.exports;cy.exports.default=fr;var Pr="[",t2="]",ya="\x07",vh=";",OD=process.env.TERM_PROGRAM==="Apple_Terminal";fr.cursorTo=(i,u)=>{if(typeof i!="number")throw new TypeError("The `x` argument is required");return typeof u!="number"?Pr+(i+1)+"G":Pr+(u+1)+";"+(i+1)+"H"};fr.cursorMove=(i,u)=>{if(typeof i!="number")throw new TypeError("The `x` argument is required");let f="";return i<0?f+=Pr+-i+"D":i>0&&(f+=Pr+i+"C"),u<0?f+=Pr+-u+"A":u>0&&(f+=Pr+u+"B"),f};fr.cursorUp=(i=1)=>Pr+i+"A";fr.cursorDown=(i=1)=>Pr+i+"B";fr.cursorForward=(i=1)=>Pr+i+"C";fr.cursorBackward=(i=1)=>Pr+i+"D";fr.cursorLeft=Pr+"G";fr.cursorSavePosition=OD?"7":Pr+"s";fr.cursorRestorePosition=OD?"8":Pr+"u";fr.cursorGetPosition=Pr+"6n";fr.cursorNextLine=Pr+"E";fr.cursorPrevLine=Pr+"F";fr.cursorHide=Pr+"?25l";fr.cursorShow=Pr+"?25h";fr.eraseLines=i=>{let u="";for(let f=0;f[t2,"8",vh,vh,u,ya,i,t2,"8",vh,vh,ya].join("");fr.image=(i,u={})=>{let f=`${t2}1337;File=inline=1`;return u.width&&(f+=`;width=${u.width}`),u.height&&(f+=`;height=${u.height}`),u.preserveAspectRatio===!1&&(f+=";preserveAspectRatio=0"),f+":"+i.toString("base64")+ya};fr.iTerm={setCwd:(i=process.cwd())=>`${t2}50;CurrentDir=${i}${ya}`,annotation:(i,u={})=>{let f=`${t2}1337;`,c=typeof u.x!="undefined",g=typeof u.y!="undefined";if((c||g)&&!(c&&g&&typeof u.length!="undefined"))throw new Error("`x`, `y` and `length` must be defined when `x` or `y` is defined");return i=i.replace(/\|/g,""),f+=u.isHidden?"AddHiddenAnnotation=":"AddAnnotation=",u.length>0?f+=(c?[i,u.length,u.x,u.y]:[u.length,i]).join("|"):f+=i,f+ya}}});var PD=Me((JH,dy)=>{"use strict";var ID=(i,u)=>{for(let f of Reflect.ownKeys(u))Object.defineProperty(i,f,Object.getOwnPropertyDescriptor(u,f));return i};dy.exports=ID;dy.exports.default=ID});var FD=Me((QH,gh)=>{"use strict";var oN=PD(),_h=new WeakMap,MD=(i,u={})=>{if(typeof i!="function")throw new TypeError("Expected a function");let f,c=!1,g=0,t=i.displayName||i.name||"",C=function(...A){if(_h.set(C,++g),c){if(u.throw===!0)throw new Error(`Function \`${t}\` can only be called once`);return f}return c=!0,f=i.apply(this,A),i=null,f};return oN(C,i),_h.set(C,g),C};gh.exports=MD;gh.exports.default=MD;gh.exports.callCount=i=>{if(!_h.has(i))throw new Error(`The given function \`${i.name}\` is not wrapped by the \`onetime\` package`);return _h.get(i)}});var LD=Me((ZH,yh)=>{yh.exports=["SIGABRT","SIGALRM","SIGHUP","SIGINT","SIGTERM"];process.platform!=="win32"&&yh.exports.push("SIGVTALRM","SIGXCPU","SIGXFSZ","SIGUSR2","SIGTRAP","SIGSYS","SIGQUIT","SIGIOT");process.platform==="linux"&&yh.exports.push("SIGIO","SIGPOLL","SIGPWR","SIGSTKFLT","SIGUNUSED")});var vy=Me((eb,n2)=>{var uN=require("assert"),r2=LD(),sN=/^win/i.test(process.platform),wh=require("events");typeof wh!="function"&&(wh=wh.EventEmitter);var Bi;process.__signal_exit_emitter__?Bi=process.__signal_exit_emitter__:(Bi=process.__signal_exit_emitter__=new wh,Bi.count=0,Bi.emitted={});Bi.infinite||(Bi.setMaxListeners(Infinity),Bi.infinite=!0);n2.exports=function(i,u){uN.equal(typeof i,"function","a callback must be provided for exit handler"),i2===!1&&RD();var f="exit";u&&u.alwaysLast&&(f="afterexit");var c=function(){Bi.removeListener(f,i),Bi.listeners("exit").length===0&&Bi.listeners("afterexit").length===0&&py()};return Bi.on(f,i),c};n2.exports.unload=py;function py(){!i2||(i2=!1,r2.forEach(function(i){try{process.removeListener(i,hy[i])}catch(u){}}),process.emit=my,process.reallyExit=ND,Bi.count-=1)}function wa(i,u,f){Bi.emitted[i]||(Bi.emitted[i]=!0,Bi.emit(i,u,f))}var hy={};r2.forEach(function(i){hy[i]=function(){var f=process.listeners(i);f.length===Bi.count&&(py(),wa("exit",null,i),wa("afterexit",null,i),sN&&i==="SIGHUP"&&(i="SIGINT"),process.kill(process.pid,i))}});n2.exports.signals=function(){return r2};n2.exports.load=RD;var i2=!1;function RD(){i2||(i2=!0,Bi.count+=1,r2=r2.filter(function(i){try{return process.on(i,hy[i]),!0}catch(u){return!1}}),process.emit=fN,process.reallyExit=lN)}var ND=process.reallyExit;function lN(i){process.exitCode=i||0,wa("exit",process.exitCode,null),wa("afterexit",process.exitCode,null),ND.call(process,process.exitCode)}var my=process.emit;function fN(i,u){if(i==="exit"){u!==void 0&&(process.exitCode=u);var f=my.apply(this,arguments);return wa("exit",process.exitCode,null),wa("afterexit",process.exitCode,null),f}else return my.apply(this,arguments)}});var jD=Me((tb,BD)=>{"use strict";var cN=FD(),aN=vy();BD.exports=cN(()=>{aN(()=>{process.stderr.write("[?25h")},{alwaysLast:!0})})});var gy=Me(Da=>{"use strict";var dN=jD(),Dh=!1;Da.show=(i=process.stderr)=>{!i.isTTY||(Dh=!1,i.write("[?25h"))};Da.hide=(i=process.stderr)=>{!i.isTTY||(dN(),Dh=!0,i.write("[?25l"))};Da.toggle=(i,u)=>{i!==void 0&&(Dh=i),Dh?Da.show(u):Da.hide(u)}});var WD=Me(o2=>{"use strict";var UD=o2&&o2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(o2,"__esModule",{value:!0});var qD=UD(ay()),zD=UD(gy()),pN=(i,{showCursor:u=!1}={})=>{let f=0,c="",g=!1,t=C=>{!u&&!g&&(zD.default.hide(),g=!0);let A=C+` -`;A!==c&&(c=A,i.write(qD.default.eraseLines(f)+A),f=A.split(` -`).length)};return t.clear=()=>{i.write(qD.default.eraseLines(f)),c="",f=0},t.done=()=>{c="",f=0,u||(zD.default.show(),g=!1)},t};o2.default={create:pN}});var bD=Me((ib,HD)=>{HD.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY_BUILD_BASE",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}}]});var YD=Me(ru=>{"use strict";var GD=bD(),nl=process.env;Object.defineProperty(ru,"_vendors",{value:GD.map(function(i){return i.constant})});ru.name=null;ru.isPR=null;GD.forEach(function(i){var u=Array.isArray(i.env)?i.env:[i.env],f=u.every(function(c){return VD(c)});if(ru[i.constant]=f,f)switch(ru.name=i.name,typeof i.pr){case"string":ru.isPR=!!nl[i.pr];break;case"object":"env"in i.pr?ru.isPR=i.pr.env in nl&&nl[i.pr.env]!==i.pr.ne:"any"in i.pr?ru.isPR=i.pr.any.some(function(c){return!!nl[c]}):ru.isPR=VD(i.pr);break;default:ru.isPR=null}});ru.isCI=!!(nl.CI||nl.CONTINUOUS_INTEGRATION||nl.BUILD_NUMBER||nl.RUN_ID||ru.name);function VD(i){return typeof i=="string"?!!nl[i]:Object.keys(i).every(function(u){return nl[u]===i[u]})}});var KD=Me((ub,$D)=>{"use strict";$D.exports=YD().isCI});var JD=Me((sb,XD)=>{"use strict";var hN=i=>{let u=new Set;do for(let f of Reflect.ownKeys(i))u.add([i,f]);while((i=Reflect.getPrototypeOf(i))&&i!==Object.prototype);return u};XD.exports=(i,{include:u,exclude:f}={})=>{let c=g=>{let t=C=>typeof C=="string"?g===C:C.test(g);return u?u.some(t):f?!f.some(t):!0};for(let[g,t]of hN(i.constructor.prototype)){if(t==="constructor"||!c(t))continue;let C=Reflect.getOwnPropertyDescriptor(g,t);C&&typeof C.value=="function"&&(i[t]=i[t].bind(i))}return i}});var iE=Me(Sr=>{"use strict";Object.defineProperty(Sr,"__esModule",{value:!0});var Ea,u2,Eh,Sh,_y;typeof window=="undefined"||typeof MessageChannel!="function"?(Sa=null,yy=null,wy=function(){if(Sa!==null)try{var i=Sr.unstable_now();Sa(!0,i),Sa=null}catch(u){throw setTimeout(wy,0),u}},QD=Date.now(),Sr.unstable_now=function(){return Date.now()-QD},Ea=function(i){Sa!==null?setTimeout(Ea,0,i):(Sa=i,setTimeout(wy,0))},u2=function(i,u){yy=setTimeout(i,u)},Eh=function(){clearTimeout(yy)},Sh=function(){return!1},_y=Sr.unstable_forceFrameRate=function(){}):(Ch=window.performance,Dy=window.Date,ZD=window.setTimeout,eE=window.clearTimeout,typeof console!="undefined"&&(tE=window.cancelAnimationFrame,typeof window.requestAnimationFrame!="function"&&console.error("This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"),typeof tE!="function"&&console.error("This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills")),typeof Ch=="object"&&typeof Ch.now=="function"?Sr.unstable_now=function(){return Ch.now()}:(nE=Dy.now(),Sr.unstable_now=function(){return Dy.now()-nE}),s2=!1,l2=null,Th=-1,Ey=5,Sy=0,Sh=function(){return Sr.unstable_now()>=Sy},_y=function(){},Sr.unstable_forceFrameRate=function(i){0>i||125kh(C,f))x!==void 0&&0>kh(x,C)?(i[c]=x,i[A]=f,c=A):(i[c]=C,i[t]=f,c=t);else if(x!==void 0&&0>kh(x,f))i[c]=x,i[A]=f,c=A;else break e}}return u}return null}function kh(i,u){var f=i.sortIndex-u.sortIndex;return f!==0?f:i.id-u.id}var ds=[],Nf=[],mN=1,_o=null,to=3,Oh=!1,pc=!1,f2=!1;function Ih(i){for(var u=Iu(Nf);u!==null;){if(u.callback===null)Ah(Nf);else if(u.startTime<=i)Ah(Nf),u.sortIndex=u.expirationTime,Ty(ds,u);else break;u=Iu(Nf)}}function xy(i){if(f2=!1,Ih(i),!pc)if(Iu(ds)!==null)pc=!0,Ea(ky);else{var u=Iu(Nf);u!==null&&u2(xy,u.startTime-i)}}function ky(i,u){pc=!1,f2&&(f2=!1,Eh()),Oh=!0;var f=to;try{for(Ih(u),_o=Iu(ds);_o!==null&&(!(_o.expirationTime>u)||i&&!Sh());){var c=_o.callback;if(c!==null){_o.callback=null,to=_o.priorityLevel;var g=c(_o.expirationTime<=u);u=Sr.unstable_now(),typeof g=="function"?_o.callback=g:_o===Iu(ds)&&Ah(ds),Ih(u)}else Ah(ds);_o=Iu(ds)}if(_o!==null)var t=!0;else{var C=Iu(Nf);C!==null&&u2(xy,C.startTime-u),t=!1}return t}finally{_o=null,to=f,Oh=!1}}function rE(i){switch(i){case 1:return-1;case 2:return 250;case 5:return 1073741823;case 4:return 1e4;default:return 5e3}}var vN=_y;Sr.unstable_ImmediatePriority=1;Sr.unstable_UserBlockingPriority=2;Sr.unstable_NormalPriority=3;Sr.unstable_IdlePriority=5;Sr.unstable_LowPriority=4;Sr.unstable_runWithPriority=function(i,u){switch(i){case 1:case 2:case 3:case 4:case 5:break;default:i=3}var f=to;to=i;try{return u()}finally{to=f}};Sr.unstable_next=function(i){switch(to){case 1:case 2:case 3:var u=3;break;default:u=to}var f=to;to=u;try{return i()}finally{to=f}};Sr.unstable_scheduleCallback=function(i,u,f){var c=Sr.unstable_now();if(typeof f=="object"&&f!==null){var g=f.delay;g=typeof g=="number"&&0c?(i.sortIndex=g,Ty(Nf,i),Iu(ds)===null&&i===Iu(Nf)&&(f2?Eh():f2=!0,u2(xy,g-c))):(i.sortIndex=f,Ty(ds,i),pc||Oh||(pc=!0,Ea(ky))),i};Sr.unstable_cancelCallback=function(i){i.callback=null};Sr.unstable_wrapCallback=function(i){var u=to;return function(){var f=to;to=u;try{return i.apply(this,arguments)}finally{to=f}}};Sr.unstable_getCurrentPriorityLevel=function(){return to};Sr.unstable_shouldYield=function(){var i=Sr.unstable_now();Ih(i);var u=Iu(ds);return u!==_o&&_o!==null&&u!==null&&u.callback!==null&&u.startTime<=i&&u.expirationTime<_o.expirationTime||Sh()};Sr.unstable_requestPaint=vN;Sr.unstable_continueExecution=function(){pc||Oh||(pc=!0,Ea(ky))};Sr.unstable_pauseExecution=function(){};Sr.unstable_getFirstCallbackNode=function(){return Iu(ds)};Sr.unstable_Profiling=null});var Ay=Me((fb,oE)=>{"use strict";oE.exports=iE()});var uE=Me((cb,c2)=>{c2.exports=function i(u){"use strict";var f=ey(),c=lr(),g=Ay();function t(v){for(var m="https://reactjs.org/docs/error-decoder.html?invariant="+v,S=1;Sqo||(v.current=qi[qo],qi[qo]=null,qo--)}function Fr(v,m){qo++,qi[qo]=v.current,v.current=m}var si={},H0={current:si},b0={current:!1},Bt=si;function Lu(v,m){var S=v.type.contextTypes;if(!S)return si;var O=v.stateNode;if(O&&O.__reactInternalMemoizedUnmaskedChildContext===m)return O.__reactInternalMemoizedMaskedChildContext;var M={},b;for(b in S)M[b]=m[b];return O&&(v=v.stateNode,v.__reactInternalMemoizedUnmaskedChildContext=m,v.__reactInternalMemoizedMaskedChildContext=M),M}function c0(v){return v=v.childContextTypes,v!=null}function Ru(v){kr(b0,v),kr(H0,v)}function ks(v){kr(b0,v),kr(H0,v)}function As(v,m,S){if(H0.current!==si)throw Error(t(168));Fr(H0,m,v),Fr(b0,S,v)}function uu(v,m,S){var O=v.stateNode;if(v=m.childContextTypes,typeof O.getChildContext!="function")return S;O=O.getChildContext();for(var M in O)if(!(M in v))throw Error(t(108,Oe(m)||"Unknown",M));return f({},S,{},O)}function wo(v){var m=v.stateNode;return m=m&&m.__reactInternalMemoizedMergedChildContext||si,Bt=H0.current,Fr(H0,m,v),Fr(b0,b0.current,v),!0}function zo(v,m,S){var O=v.stateNode;if(!O)throw Error(t(169));S?(m=uu(v,m,Bt),O.__reactInternalMemoizedMergedChildContext=m,kr(b0,v),kr(H0,v),Fr(H0,m,v)):kr(b0,v),Fr(b0,S,v)}var Os=g.unstable_runWithPriority,Is=g.unstable_scheduleCallback,uf=g.unstable_cancelCallback,_n=g.unstable_shouldYield,Nu=g.unstable_requestPaint,Wo=g.unstable_now,su=g.unstable_getCurrentPriorityLevel,Ps=g.unstable_ImmediatePriority,pl=g.unstable_UserBlockingPriority,Vf=g.unstable_NormalPriority,hl=g.unstable_LowPriority,Bu=g.unstable_IdlePriority,ju={},sf=Nu!==void 0?Nu:function(){},ro=null,Ms=null,ml=!1,Uu=Wo(),G0=1e4>Uu?Wo:function(){return Wo()-Uu};function Fs(){switch(su()){case Ps:return 99;case pl:return 98;case Vf:return 97;case hl:return 96;case Bu:return 95;default:throw Error(t(332))}}function tt(v){switch(v){case 99:return Ps;case 98:return pl;case 97:return Vf;case 96:return hl;case 95:return Bu;default:throw Error(t(332))}}function zi(v,m){return v=tt(v),Os(v,m)}function lu(v,m,S){return v=tt(v),Is(v,m,S)}function Ho(v){return ro===null?(ro=[v],Ms=Is(Ps,vl)):ro.push(v),ju}function O0(){if(Ms!==null){var v=Ms;Ms=null,uf(v)}vl()}function vl(){if(!ml&&ro!==null){ml=!0;var v=0;try{var m=ro;zi(99,function(){for(;v=m&&(ai=!0),v.firstContext=null)}function D0(v,m){if(zu!==v&&m!==!1&&m!==0)if((typeof m!="number"||m===1073741823)&&(zu=v,m=1073741823),m={context:v,observedBits:m,next:null},Wi===null){if(qu===null)throw Error(t(308));Wi=m,qu.dependencies={expirationTime:0,firstContext:m,responders:null}}else Wi=Wi.next=m;return Jt?v._currentValue:v._currentValue2}var Do=!1;function i0(v){return{baseState:v,firstUpdate:null,lastUpdate:null,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null}}function Rs(v){return{baseState:v.baseState,firstUpdate:v.firstUpdate,lastUpdate:v.lastUpdate,firstCapturedUpdate:null,lastCapturedUpdate:null,firstEffect:null,lastEffect:null,firstCapturedEffect:null,lastCapturedEffect:null}}function a0(v,m){return{expirationTime:v,suspenseConfig:m,tag:0,payload:null,callback:null,next:null,nextEffect:null}}function Hu(v,m){v.lastUpdate===null?v.firstUpdate=v.lastUpdate=m:(v.lastUpdate.next=m,v.lastUpdate=m)}function V0(v,m){var S=v.alternate;if(S===null){var O=v.updateQueue,M=null;O===null&&(O=v.updateQueue=i0(v.memoizedState))}else O=v.updateQueue,M=S.updateQueue,O===null?M===null?(O=v.updateQueue=i0(v.memoizedState),M=S.updateQueue=i0(S.memoizedState)):O=v.updateQueue=Rs(M):M===null&&(M=S.updateQueue=Rs(O));M===null||O===M?Hu(O,m):O.lastUpdate===null||M.lastUpdate===null?(Hu(O,m),Hu(M,m)):(Hu(O,m),M.lastUpdate=m)}function bu(v,m){var S=v.updateQueue;S=S===null?v.updateQueue=i0(v.memoizedState):Ns(v,S),S.lastCapturedUpdate===null?S.firstCapturedUpdate=S.lastCapturedUpdate=m:(S.lastCapturedUpdate.next=m,S.lastCapturedUpdate=m)}function Ns(v,m){var S=v.alternate;return S!==null&&m===S.updateQueue&&(m=v.updateQueue=Rs(m)),m}function bo(v,m,S,O,M,b){switch(S.tag){case 1:return v=S.payload,typeof v=="function"?v.call(b,O,M):v;case 3:v.effectTag=v.effectTag&-4097|64;case 0:if(v=S.payload,M=typeof v=="function"?v.call(b,O,M):v,M==null)break;return f({},O,M);case 2:Do=!0}return O}function P0(v,m,S,O,M){Do=!1,m=Ns(v,m);for(var b=m.baseState,ee=null,Ye=0,Ze=m.firstUpdate,ut=b;Ze!==null;){var In=Ze.expirationTime;Inpr?(Hr=mn,mn=null):Hr=mn.sibling;var Vn=jr(Re,mn,ze[pr],Et);if(Vn===null){mn===null&&(mn=Hr);break}v&&mn&&Vn.alternate===null&&m(Re,mn),Ce=b(Vn,Ce,pr),sr===null?on=Vn:sr.sibling=Vn,sr=Vn,mn=Hr}if(pr===ze.length)return S(Re,mn),on;if(mn===null){for(;prpr?(Hr=mn,mn=null):Hr=mn.sibling;var ni=jr(Re,mn,Vn.value,Et);if(ni===null){mn===null&&(mn=Hr);break}v&&mn&&ni.alternate===null&&m(Re,mn),Ce=b(ni,Ce,pr),sr===null?on=ni:sr.sibling=ni,sr=ni,mn=Hr}if(Vn.done)return S(Re,mn),on;if(mn===null){for(;!Vn.done;pr++,Vn=ze.next())Vn=A0(Re,Vn.value,Et),Vn!==null&&(Ce=b(Vn,Ce,pr),sr===null?on=Vn:sr.sibling=Vn,sr=Vn);return on}for(mn=O(Re,mn);!Vn.done;pr++,Vn=ze.next())Vn=gi(mn,Re,pr,Vn.value,Et),Vn!==null&&(v&&Vn.alternate!==null&&mn.delete(Vn.key===null?pr:Vn.key),Ce=b(Vn,Ce,pr),sr===null?on=Vn:sr.sibling=Vn,sr=Vn);return v&&mn.forEach(function(Zf){return m(Re,Zf)}),on}return function(Re,Ce,ze,Et){var on=typeof ze=="object"&&ze!==null&&ze.type===L&&ze.key===null;on&&(ze=ze.props.children);var sr=typeof ze=="object"&&ze!==null;if(sr)switch(ze.$$typeof){case x:e:{for(sr=ze.key,on=Ce;on!==null;){if(on.key===sr)if(on.tag===7?ze.type===L:on.elementType===ze.type){S(Re,on.sibling),Ce=M(on,ze.type===L?ze.props.children:ze.props,Et),Ce.ref=au(Re,on,ze),Ce.return=Re,Re=Ce;break e}else{S(Re,on);break}else m(Re,on);on=on.sibling}ze.type===L?(Ce=mi(ze.props.children,Re.mode,Et,ze.key),Ce.return=Re,Re=Ce):(Et=Hs(ze.type,ze.key,ze.props,null,Re.mode,Et),Et.ref=au(Re,Ce,ze),Et.return=Re,Re=Et)}return ee(Re);case D:e:{for(on=ze.key;Ce!==null;){if(Ce.key===on)if(Ce.tag===4&&Ce.stateNode.containerInfo===ze.containerInfo&&Ce.stateNode.implementation===ze.implementation){S(Re,Ce.sibling),Ce=M(Ce,ze.children||[],Et),Ce.return=Re,Re=Ce;break e}else{S(Re,Ce);break}else m(Re,Ce);Ce=Ce.sibling}Ce=Xf(ze,Re.mode,Et),Ce.return=Re,Re=Ce}return ee(Re)}if(typeof ze=="string"||typeof ze=="number")return ze=""+ze,Ce!==null&&Ce.tag===6?(S(Re,Ce.sibling),Ce=M(Ce,ze,Et),Ce.return=Re,Re=Ce):(S(Re,Ce),Ce=vi(ze,Re.mode,Et),Ce.return=Re,Re=Ce),ee(Re);if(M0(ze))return po(Re,Ce,ze,Et);if(J(ze))return _i(Re,Ce,ze,Et);if(sr&&Lr(Re,ze),typeof ze=="undefined"&&!on)switch(Re.tag){case 1:case 0:throw Re=Re.type,Error(t(152,Re.displayName||Re.name||"Component"))}return S(Re,Ce)}}var R=F(!0),U=F(!1),H={},fe={current:H},ue={current:H},de={current:H};function W(v){if(v===H)throw Error(t(174));return v}function ve(v,m){Fr(de,m,v),Fr(ue,v,v),Fr(fe,H,v),m=Ot(m),kr(fe,v),Fr(fe,m,v)}function Fe(v){kr(fe,v),kr(ue,v),kr(de,v)}function Ge(v){var m=W(de.current),S=W(fe.current);m=Nt(S,v.type,m),S!==m&&(Fr(ue,v,v),Fr(fe,m,v))}function K(v){ue.current===v&&(kr(fe,v),kr(ue,v))}var xe={current:0};function je(v){for(var m=v;m!==null;){if(m.tag===13){var S=m.memoizedState;if(S!==null&&(S=S.dehydrated,S===null||ll(S)||fl(S)))return m}else if(m.tag===19&&m.memoizedProps.revealOrder!==void 0){if((m.effectTag&64)!=0)return m}else if(m.child!==null){m.child.return=m,m=m.child;continue}if(m===v)break;for(;m.sibling===null;){if(m.return===null||m.return===v)return null;m=m.return}m.sibling.return=m.return,m=m.sibling}return null}function Xe(v,m){return{responder:v,props:m}}var rt=C.ReactCurrentDispatcher,st=C.ReactCurrentBatchConfig,xt=0,wt=null,lt=null,Rt=null,yn=null,sn=null,ar=null,rn=0,Hn=null,d0=0,Cr=!1,He=null,Qe=0;function Ne(){throw Error(t(321))}function ft(v,m){if(m===null)return!1;for(var S=0;Srn&&(rn=In,pf(rn))):(Yf(In,Ze.suspenseConfig),b=Ze.eagerReducer===v?Ze.eagerState:v(b,Ze.action)),ee=Ze,Ze=Ze.next}while(Ze!==null&&Ze!==O);ut||(Ye=ee,M=b),Sn(b,m.memoizedState)||(ai=!0),m.memoizedState=b,m.baseUpdate=Ye,m.baseState=M,S.lastRenderedState=b}return[m.memoizedState,S.dispatch]}function ci(v){var m=Cn();return typeof v=="function"&&(v=v()),m.memoizedState=m.baseState=v,v=m.queue={last:null,dispatch:null,lastRenderedReducer:p0,lastRenderedState:v},v=v.dispatch=Us.bind(null,wt,v),[m.memoizedState,v]}function xi(v){return h0(p0,v)}function E0(v,m,S,O){return v={tag:v,create:m,destroy:S,deps:O,next:null},Hn===null?(Hn={lastEffect:null},Hn.lastEffect=v.next=v):(m=Hn.lastEffect,m===null?Hn.lastEffect=v.next=v:(S=m.next,m.next=v,v.next=S,Hn.lastEffect=v)),v}function qr(v,m,S,O){var M=Cn();d0|=v,M.memoizedState=E0(m,S,void 0,O===void 0?null:O)}function Eo(v,m,S,O){var M=bn();O=O===void 0?null:O;var b=void 0;if(lt!==null){var ee=lt.memoizedState;if(b=ee.destroy,O!==null&&ft(O,ee.deps)){E0(0,S,b,O);return}}d0|=v,M.memoizedState=E0(m,S,b,O)}function So(v,m){return qr(516,192,v,m)}function wl(v,m){return Eo(516,192,v,m)}function js(v,m){if(typeof m=="function")return v=v(),m(v),function(){m(null)};if(m!=null)return v=v(),m.current=v,function(){m.current=null}}function Dl(){}function du(v,m){return Cn().memoizedState=[v,m===void 0?null:m],v}function Yu(v,m){var S=bn();m=m===void 0?null:m;var O=S.memoizedState;return O!==null&&m!==null&&ft(m,O[1])?O[0]:(S.memoizedState=[v,m],v)}function Us(v,m,S){if(!(25>Qe))throw Error(t(301));var O=v.alternate;if(v===wt||O!==null&&O===wt)if(Cr=!0,v={expirationTime:xt,suspenseConfig:null,action:S,eagerReducer:null,eagerState:null,next:null},He===null&&(He=new Map),S=He.get(m),S===void 0)He.set(m,v);else{for(m=S;m.next!==null;)m=m.next;m.next=v}else{var M=g0(),b=nr.suspense;M=Kr(M,v,b),b={expirationTime:M,suspenseConfig:b,action:S,eagerReducer:null,eagerState:null,next:null};var ee=m.last;if(ee===null)b.next=b;else{var Ye=ee.next;Ye!==null&&(b.next=Ye),ee.next=b}if(m.last=b,v.expirationTime===0&&(O===null||O.expirationTime===0)&&(O=m.lastRenderedReducer,O!==null))try{var Ze=m.lastRenderedState,ut=O(Ze,S);if(b.eagerReducer=O,b.eagerState=ut,Sn(ut,Ze))return}catch(In){}finally{}_0(v,M)}}var oo={readContext:D0,useCallback:Ne,useContext:Ne,useEffect:Ne,useImperativeHandle:Ne,useLayoutEffect:Ne,useMemo:Ne,useReducer:Ne,useRef:Ne,useState:Ne,useDebugValue:Ne,useResponder:Ne,useDeferredValue:Ne,useTransition:Ne},Hi={readContext:D0,useCallback:du,useContext:D0,useEffect:So,useImperativeHandle:function(v,m,S){return S=S!=null?S.concat([v]):null,qr(4,36,js.bind(null,m,v),S)},useLayoutEffect:function(v,m){return qr(4,36,v,m)},useMemo:function(v,m){var S=Cn();return m=m===void 0?null:m,v=v(),S.memoizedState=[v,m],v},useReducer:function(v,m,S){var O=Cn();return m=S!==void 0?S(m):m,O.memoizedState=O.baseState=m,v=O.queue={last:null,dispatch:null,lastRenderedReducer:v,lastRenderedState:m},v=v.dispatch=Us.bind(null,wt,v),[O.memoizedState,v]},useRef:function(v){var m=Cn();return v={current:v},m.memoizedState=v},useState:ci,useDebugValue:Dl,useResponder:Xe,useDeferredValue:function(v,m){var S=ci(v),O=S[0],M=S[1];return So(function(){g.unstable_next(function(){var b=st.suspense;st.suspense=m===void 0?null:m;try{M(v)}finally{st.suspense=b}})},[v,m]),O},useTransition:function(v){var m=ci(!1),S=m[0],O=m[1];return[du(function(M){O(!0),g.unstable_next(function(){var b=st.suspense;st.suspense=v===void 0?null:v;try{O(!1),M()}finally{st.suspense=b}})},[v,S]),S]}},qs={readContext:D0,useCallback:Yu,useContext:D0,useEffect:wl,useImperativeHandle:function(v,m,S){return S=S!=null?S.concat([v]):null,Eo(4,36,js.bind(null,m,v),S)},useLayoutEffect:function(v,m){return Eo(4,36,v,m)},useMemo:function(v,m){var S=bn();m=m===void 0?null:m;var O=S.memoizedState;return O!==null&&m!==null&&ft(m,O[1])?O[0]:(v=v(),S.memoizedState=[v,m],v)},useReducer:h0,useRef:function(){return bn().memoizedState},useState:xi,useDebugValue:Dl,useResponder:Xe,useDeferredValue:function(v,m){var S=xi(v),O=S[0],M=S[1];return wl(function(){g.unstable_next(function(){var b=st.suspense;st.suspense=m===void 0?null:m;try{M(v)}finally{st.suspense=b}})},[v,m]),O},useTransition:function(v){var m=xi(!1),S=m[0],O=m[1];return[Yu(function(M){O(!0),g.unstable_next(function(){var b=st.suspense;st.suspense=v===void 0?null:v;try{O(!1),M()}finally{st.suspense=b}})},[v,S]),S]}},F0=null,Gr=null,ir=!1;function L0(v,m){var S=xo(5,null,null,0);S.elementType="DELETED",S.type="DELETED",S.stateNode=m,S.return=v,S.effectTag=8,v.lastEffect!==null?(v.lastEffect.nextEffect=S,v.lastEffect=S):v.firstEffect=v.lastEffect=S}function Y0(v,m){switch(v.tag){case 5:return m=Ti(m,v.type,v.pendingProps),m!==null?(v.stateNode=m,!0):!1;case 6:return m=Fu(m,v.pendingProps),m!==null?(v.stateNode=m,!0):!1;case 13:return!1;default:return!1}}function Co(v){if(ir){var m=Gr;if(m){var S=m;if(!Y0(v,m)){if(m=cl(S),!m||!Y0(v,m)){v.effectTag=v.effectTag&-1025|2,ir=!1,F0=v;return}L0(F0,S)}F0=v,Gr=al(m)}else v.effectTag=v.effectTag&-1025|2,ir=!1,F0=v}}function $u(v){for(v=v.return;v!==null&&v.tag!==5&&v.tag!==3&&v.tag!==13;)v=v.return;F0=v}function Vo(v){if(!w||v!==F0)return!1;if(!ir)return $u(v),ir=!0,!1;var m=v.type;if(v.tag!==5||m!=="head"&&m!=="body"&&!at(m,v.memoizedProps))for(m=Gr;m;)L0(v,m),m=cl(m);if($u(v),v.tag===13){if(!w)throw Error(t(316));if(v=v.memoizedState,v=v!==null?v.dehydrated:null,!v)throw Error(t(317));Gr=Ac(v)}else Gr=F0?cl(v.stateNode):null;return!0}function Rr(){w&&(Gr=F0=null,ir=!1)}var Jn=C.ReactCurrentOwner,ai=!1;function o0(v,m,S,O){m.child=v===null?U(m,null,S,O):R(m,v.child,S,O)}function Vr(v,m,S,O,M){S=S.render;var b=m.ref;return io(m,M),O=St(v,m,S,O,b,M),v!==null&&!ai?(m.updateQueue=v.updateQueue,m.effectTag&=-517,v.expirationTime<=M&&(v.expirationTime=0),X0(v,m,M)):(m.effectTag|=1,o0(v,m,O,M),m.child)}function ff(v,m,S,O,M,b){if(v===null){var ee=S.type;return typeof ee=="function"&&!mf(ee)&&ee.defaultProps===void 0&&S.compare===null&&S.defaultProps===void 0?(m.tag=15,m.type=ee,cf(v,m,ee,O,M,b)):(v=Hs(S.type,null,O,null,m.mode,b),v.ref=m.ref,v.return=m,m.child=v)}return ee=v.child,Mm)&&Qn.set(v,m)))}}function Gi(v,m){v.expirationTimev?m:v)}function x0(v){if(v.lastExpiredTime!==0)v.callbackExpirationTime=1073741823,v.callbackPriority=99,v.callbackNode=Ho(Z0.bind(null,v));else{var m=fo(v),S=v.callbackNode;if(m===0)S!==null&&(v.callbackNode=null,v.callbackExpirationTime=0,v.callbackPriority=90);else{var O=g0();if(m===1073741823?O=99:m===1||m===2?O=95:(O=10*(1073741821-m)-10*(1073741821-O),O=0>=O?99:250>=O?98:5250>=O?97:95),S!==null){var M=v.callbackPriority;if(v.callbackExpirationTime===m&&M>=O)return;S!==ju&&uf(S)}v.callbackExpirationTime=m,v.callbackPriority=O,m=m===1073741823?Ho(Z0.bind(null,v)):lu(O,Xu.bind(null,v),{timeout:10*(1073741821-m)-G0()}),v.callbackNode=m}}}function Xu(v,m){if(t0=0,m)return m=g0(),kl(v,m),x0(v),null;var S=fo(v);if(S!==0){if(m=v.callbackNode,(Kt&(Br|zr))!==Fn)throw Error(t(327));if(Ws(),v===X&&S===ye||mu(v,S),Y!==null){var O=Kt;Kt|=Br;var M=ei(v);do try{Ua();break}catch(Ye){Ju(v,Ye)}while(1);if(Wu(),Kt=O,B0.current=M,he===wr)throw m=We,mu(v,S),ao(v,S),x0(v),m;if(Y===null)switch(M=v.finishedWork=v.current.alternate,v.finishedExpirationTime=S,O=he,X=null,O){case lo:case wr:throw Error(t(345));case kn:kl(v,2=S){v.lastPingedTime=S,mu(v,S);break}}if(b=fo(v),b!==0&&b!==S)break;if(O!==0&&O!==S){v.lastPingedTime=O;break}v.timeoutHandle=jt(gu.bind(null,v),M);break}gu(v);break;case hi:if(ao(v,S),O=v.lastSuspendedTime,S===O&&(v.nextKnownPendingLevel=$f(M)),qt&&(M=v.lastPingedTime,M===0||M>=S)){v.lastPingedTime=S,mu(v,S);break}if(M=fo(v),M!==0&&M!==S)break;if(O!==0&&O!==S){v.lastPingedTime=O;break}if(Dt!==1073741823?O=10*(1073741821-Dt)-G0():et===1073741823?O=0:(O=10*(1073741821-et)-5e3,M=G0(),S=10*(1073741821-S)-M,O=M-O,0>O&&(O=0),O=(120>O?120:480>O?480:1080>O?1080:1920>O?1920:3e3>O?3e3:4320>O?4320:1960*Cl(O/1960))-O,S=O?O=0:(M=ee.busyDelayMs|0,b=G0()-(10*(1073741821-b)-(ee.timeoutMs|0||5e3)),O=b<=M?0:M+O-b),10 component higher in the tree to provide a loading indicator or placeholder to display.`+dl(M))}he!==Ai&&(he=kn),b=zs(b,M),Ze=O;do{switch(Ze.tag){case 3:ee=b,Ze.effectTag|=4096,Ze.expirationTime=m;var Ce=pu(Ze,ee,m);bu(Ze,Ce);break e;case 1:ee=b;var ze=Ze.type,Et=Ze.stateNode;if((Ze.effectTag&64)==0&&(typeof ze.getDerivedStateFromError=="function"||Et!==null&&typeof Et.componentDidCatch=="function"&&(Ar===null||!Ar.has(Et)))){Ze.effectTag|=4096,Ze.expirationTime=m;var on=Sl(Ze,ee,m);bu(Ze,on);break e}}Ze=Ze.return}while(Ze!==null)}Y=vu(Y)}catch(sr){m=sr;continue}break}while(1)}function ei(){var v=B0.current;return B0.current=oo,v===null?oo:v}function Yf(v,m){vZt&&(Zt=v)}function ja(){for(;Y!==null;)Y=Ic(Y)}function Ua(){for(;Y!==null&&!_n();)Y=Ic(Y)}function Ic(v){var m=Lc(v.alternate,v,ye);return v.memoizedProps=v.pendingProps,m===null&&(m=vu(v)),hu.current=null,m}function vu(v){Y=v;do{var m=Y.alternate;if(v=Y.return,(Y.effectTag&2048)==0){e:{var S=m;m=Y;var O=ye,M=m.pendingProps;switch(m.tag){case 2:break;case 16:break;case 15:case 0:break;case 1:c0(m.type)&&Ru(m);break;case 3:Fe(m),ks(m),M=m.stateNode,M.pendingContext&&(M.context=M.pendingContext,M.pendingContext=null),(S===null||S.child===null)&&Vo(m)&&ki(m),$r(m);break;case 5:K(m);var b=W(de.current);if(O=m.type,S!==null&&m.stateNode!=null)m0(S,m,O,M,b),S.ref!==m.ref&&(m.effectTag|=128);else if(M){if(S=W(fe.current),Vo(m)){if(M=m,!w)throw Error(t(175));S=Ui(M.stateNode,M.type,M.memoizedProps,b,S,M),M.updateQueue=S,S=S!==null,S&&ki(m)}else{var ee=ne(O,M,b,S,m);Yr(ee,m,!1,!1),m.stateNode=ee,Z(ee,O,M,b,S)&&ki(m)}m.ref!==null&&(m.effectTag|=128)}else if(m.stateNode===null)throw Error(t(166));break;case 6:if(S&&m.stateNode!=null)Tn(S,m,S.memoizedProps,M);else{if(typeof M!="string"&&m.stateNode===null)throw Error(t(166));if(S=W(de.current),b=W(fe.current),Vo(m)){if(S=m,!w)throw Error(t(176));(S=Mr(S.stateNode,S.memoizedProps,S))&&ki(m)}else m.stateNode=Ft(M,S,b,m)}break;case 11:break;case 13:if(kr(xe,m),M=m.memoizedState,(m.effectTag&64)!=0){m.expirationTime=O;break e}M=M!==null,b=!1,S===null?m.memoizedProps.fallback!==void 0&&Vo(m):(O=S.memoizedState,b=O!==null,M||O===null||(O=S.child.sibling,O!==null&&(ee=m.firstEffect,ee!==null?(m.firstEffect=O,O.nextEffect=ee):(m.firstEffect=m.lastEffect=O,O.nextEffect=null),O.effectTag=8))),M&&!b&&(m.mode&2)!=0&&(S===null&&m.memoizedProps.unstable_avoidThisFallback!==!0||(xe.current&1)!=0?he===lo&&(he=T0):((he===lo||he===T0)&&(he=hi),Zt!==0&&X!==null&&(ao(X,ye),$o(X,Zt)))),cr&&M&&(m.effectTag|=4),Yt&&(M||b)&&(m.effectTag|=4);break;case 7:break;case 8:break;case 12:break;case 4:Fe(m),$r(m);break;case 10:fi(m);break;case 9:break;case 14:break;case 17:c0(m.type)&&Ru(m);break;case 19:if(kr(xe,m),M=m.memoizedState,M===null)break;if(b=(m.effectTag&64)!=0,ee=M.rendering,ee===null){if(b)bi(M,!1);else if(he!==lo||S!==null&&(S.effectTag&64)!=0)for(S=m.child;S!==null;){if(ee=je(S),ee!==null){for(m.effectTag|=64,bi(M,!1),S=ee.updateQueue,S!==null&&(m.updateQueue=S,m.effectTag|=4),M.lastEffect===null&&(m.firstEffect=null),m.lastEffect=M.lastEffect,S=O,M=m.child;M!==null;)b=M,O=S,b.effectTag&=2,b.nextEffect=null,b.firstEffect=null,b.lastEffect=null,ee=b.alternate,ee===null?(b.childExpirationTime=0,b.expirationTime=O,b.child=null,b.memoizedProps=null,b.memoizedState=null,b.updateQueue=null,b.dependencies=null):(b.childExpirationTime=ee.childExpirationTime,b.expirationTime=ee.expirationTime,b.child=ee.child,b.memoizedProps=ee.memoizedProps,b.memoizedState=ee.memoizedState,b.updateQueue=ee.updateQueue,O=ee.dependencies,b.dependencies=O===null?null:{expirationTime:O.expirationTime,firstContext:O.firstContext,responders:O.responders}),M=M.sibling;Fr(xe,xe.current&1|2,m),m=m.child;break e}S=S.sibling}}else{if(!b)if(S=je(ee),S!==null){if(m.effectTag|=64,b=!0,S=S.updateQueue,S!==null&&(m.updateQueue=S,m.effectTag|=4),bi(M,!0),M.tail===null&&M.tailMode==="hidden"&&!ee.alternate){m=m.lastEffect=M.lastEffect,m!==null&&(m.nextEffect=null);break}}else G0()>M.tailExpiration&&1M&&(M=O),ee>M&&(M=ee),b=b.sibling;S.childExpirationTime=M}if(m!==null)return m;v!==null&&(v.effectTag&2048)==0&&(v.firstEffect===null&&(v.firstEffect=Y.firstEffect),Y.lastEffect!==null&&(v.lastEffect!==null&&(v.lastEffect.nextEffect=Y.firstEffect),v.lastEffect=Y.lastEffect),1v?m:v}function gu(v){var m=Fs();return zi(99,co.bind(null,v,m)),null}function co(v,m){do Ws();while(dr!==null);if((Kt&(Br|zr))!==Fn)throw Error(t(327));var S=v.finishedWork,O=v.finishedExpirationTime;if(S===null)return null;if(v.finishedWork=null,v.finishedExpirationTime=0,S===v.current)throw Error(t(177));v.callbackNode=null,v.callbackExpirationTime=0,v.callbackPriority=90,v.nextKnownPendingLevel=0;var M=$f(S);if(v.firstPendingTime=M,O<=v.lastSuspendedTime?v.firstSuspendedTime=v.lastSuspendedTime=v.nextKnownPendingLevel=0:O<=v.firstSuspendedTime&&(v.firstSuspendedTime=O-1),O<=v.lastPingedTime&&(v.lastPingedTime=0),O<=v.lastExpiredTime&&(v.lastExpiredTime=0),v===X&&(Y=X=null,ye=0),1=S?mt(v,m,S):(Fr(xe,xe.current&1,m),m=X0(v,m,S),m!==null?m.sibling:null);Fr(xe,xe.current&1,m);break;case 19:if(O=m.childExpirationTime>=S,(v.effectTag&64)!=0){if(O)return $t(v,m,S);m.effectTag|=64}if(M=m.memoizedState,M!==null&&(M.rendering=null,M.tail=null),Fr(xe,xe.current,m),!O)return null}return X0(v,m,S)}ai=!1}}else ai=!1;switch(m.expirationTime=0,m.tag){case 2:if(O=m.type,v!==null&&(v.alternate=null,m.alternate=null,m.effectTag|=2),v=m.pendingProps,M=Lu(m,H0.current),io(m,S),M=St(null,m,O,v,M,S),m.effectTag|=1,typeof M=="object"&&M!==null&&typeof M.render=="function"&&M.$$typeof===void 0){if(m.tag=1,Qt(),c0(O)){var b=!0;wo(m)}else b=!1;m.memoizedState=M.state!==null&&M.state!==void 0?M.state:null;var ee=O.getDerivedStateFromProps;typeof ee=="function"&&Go(m,O,ee,v),M.updater=Gu,m.stateNode=M,M._reactInternalFiber=m,Vu(m,O,v,S),m=Be(null,m,O,!0,b,S)}else m.tag=0,o0(null,m,M,S),m=m.child;return m;case 16:if(M=m.elementType,v!==null&&(v.alternate=null,m.alternate=null,m.effectTag|=2),v=m.pendingProps,Te(M),M._status!==1)throw M._result;switch(M=M._result,m.type=M,b=m.tag=Wa(M),v=I0(M,v),b){case 0:m=K0(null,m,M,v,S);break;case 1:m=ae(null,m,M,v,S);break;case 11:m=Vr(null,m,M,v,S);break;case 14:m=ff(null,m,M,I0(M.type,v),O,S);break;default:throw Error(t(306,M,""))}return m;case 0:return O=m.type,M=m.pendingProps,M=m.elementType===O?M:I0(O,M),K0(v,m,O,M,S);case 1:return O=m.type,M=m.pendingProps,M=m.elementType===O?M:I0(O,M),ae(v,m,O,M,S);case 3:if(Ie(m),O=m.updateQueue,O===null)throw Error(t(282));if(M=m.memoizedState,M=M!==null?M.element:null,P0(m,O,m.pendingProps,null,S),O=m.memoizedState.element,O===M)Rr(),m=X0(v,m,S);else{if((M=m.stateNode.hydrate)&&(w?(Gr=al(m.stateNode.containerInfo),F0=m,M=ir=!0):M=!1),M)for(S=U(m,null,O,S),m.child=S;S;)S.effectTag=S.effectTag&-3|1024,S=S.sibling;else o0(v,m,O,S),Rr();m=m.child}return m;case 5:return Ge(m),v===null&&Co(m),O=m.type,M=m.pendingProps,b=v!==null?v.memoizedProps:null,ee=M.children,at(O,M)?ee=null:b!==null&&at(O,b)&&(m.effectTag|=16),$0(v,m),m.mode&4&&S!==1&&it(O,M)?(m.expirationTime=m.childExpirationTime=1,m=null):(o0(v,m,ee,S),m=m.child),m;case 6:return v===null&&Co(m),null;case 13:return mt(v,m,S);case 4:return ve(m,m.stateNode.containerInfo),O=m.pendingProps,v===null?m.child=R(m,null,O,S):o0(v,m,O,S),m.child;case 11:return O=m.type,M=m.pendingProps,M=m.elementType===O?M:I0(O,M),Vr(v,m,O,M,S);case 7:return o0(v,m,m.pendingProps,S),m.child;case 8:return o0(v,m,m.pendingProps.children,S),m.child;case 12:return o0(v,m,m.pendingProps.children,S),m.child;case 10:e:{if(O=m.type._context,M=m.pendingProps,ee=m.memoizedProps,b=M.value,Ls(m,b),ee!==null){var Ye=ee.value;if(b=Sn(Ye,b)?0:(typeof O._calculateChangedBits=="function"?O._calculateChangedBits(Ye,b):1073741823)|0,b===0){if(ee.children===M.children&&!b0.current){m=X0(v,m,S);break e}}else for(Ye=m.child,Ye!==null&&(Ye.return=m);Ye!==null;){var Ze=Ye.dependencies;if(Ze!==null){ee=Ye.child;for(var ut=Ze.firstContext;ut!==null;){if(ut.context===O&&(ut.observedBits&b)!=0){Ye.tag===1&&(ut=a0(S,null),ut.tag=2,V0(Ye,ut)),Ye.expirationTime=m&&v<=m}function ao(v,m){var S=v.firstSuspendedTime,O=v.lastSuspendedTime;Sm||S===0)&&(v.lastSuspendedTime=m),m<=v.lastPingedTime&&(v.lastPingedTime=0),m<=v.lastExpiredTime&&(v.lastExpiredTime=0)}function $o(v,m){m>v.firstPendingTime&&(v.firstPendingTime=m);var S=v.firstSuspendedTime;S!==0&&(m>=S?v.firstSuspendedTime=v.lastSuspendedTime=v.nextKnownPendingLevel=0:m>=v.lastSuspendedTime&&(v.lastSuspendedTime=m+1),m>v.nextKnownPendingLevel&&(v.nextKnownPendingLevel=m))}function kl(v,m){var S=v.lastExpiredTime;(S===0||S>m)&&(v.lastExpiredTime=m)}function Nc(v){var m=v._reactInternalFiber;if(m===void 0)throw typeof v.render=="function"?Error(t(188)):Error(t(268,Object.keys(v)));return v=Ue(m),v===null?null:v.stateNode}function Al(v,m){v=v.memoizedState,v!==null&&v.dehydrated!==null&&v.retryTime{"use strict";sE.exports=uE()});var cE=Me((db,fE)=>{"use strict";var gN={ALIGN_COUNT:8,ALIGN_AUTO:0,ALIGN_FLEX_START:1,ALIGN_CENTER:2,ALIGN_FLEX_END:3,ALIGN_STRETCH:4,ALIGN_BASELINE:5,ALIGN_SPACE_BETWEEN:6,ALIGN_SPACE_AROUND:7,DIMENSION_COUNT:2,DIMENSION_WIDTH:0,DIMENSION_HEIGHT:1,DIRECTION_COUNT:3,DIRECTION_INHERIT:0,DIRECTION_LTR:1,DIRECTION_RTL:2,DISPLAY_COUNT:2,DISPLAY_FLEX:0,DISPLAY_NONE:1,EDGE_COUNT:9,EDGE_LEFT:0,EDGE_TOP:1,EDGE_RIGHT:2,EDGE_BOTTOM:3,EDGE_START:4,EDGE_END:5,EDGE_HORIZONTAL:6,EDGE_VERTICAL:7,EDGE_ALL:8,EXPERIMENTAL_FEATURE_COUNT:1,EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS:0,FLEX_DIRECTION_COUNT:4,FLEX_DIRECTION_COLUMN:0,FLEX_DIRECTION_COLUMN_REVERSE:1,FLEX_DIRECTION_ROW:2,FLEX_DIRECTION_ROW_REVERSE:3,JUSTIFY_COUNT:6,JUSTIFY_FLEX_START:0,JUSTIFY_CENTER:1,JUSTIFY_FLEX_END:2,JUSTIFY_SPACE_BETWEEN:3,JUSTIFY_SPACE_AROUND:4,JUSTIFY_SPACE_EVENLY:5,LOG_LEVEL_COUNT:6,LOG_LEVEL_ERROR:0,LOG_LEVEL_WARN:1,LOG_LEVEL_INFO:2,LOG_LEVEL_DEBUG:3,LOG_LEVEL_VERBOSE:4,LOG_LEVEL_FATAL:5,MEASURE_MODE_COUNT:3,MEASURE_MODE_UNDEFINED:0,MEASURE_MODE_EXACTLY:1,MEASURE_MODE_AT_MOST:2,NODE_TYPE_COUNT:2,NODE_TYPE_DEFAULT:0,NODE_TYPE_TEXT:1,OVERFLOW_COUNT:3,OVERFLOW_VISIBLE:0,OVERFLOW_HIDDEN:1,OVERFLOW_SCROLL:2,POSITION_TYPE_COUNT:2,POSITION_TYPE_RELATIVE:0,POSITION_TYPE_ABSOLUTE:1,PRINT_OPTIONS_COUNT:3,PRINT_OPTIONS_LAYOUT:1,PRINT_OPTIONS_STYLE:2,PRINT_OPTIONS_CHILDREN:4,UNIT_COUNT:4,UNIT_UNDEFINED:0,UNIT_POINT:1,UNIT_PERCENT:2,UNIT_AUTO:3,WRAP_COUNT:3,WRAP_NO_WRAP:0,WRAP_WRAP:1,WRAP_WRAP_REVERSE:2};fE.exports=gN});var hE=Me((pb,aE)=>{"use strict";var _N=Object.assign||function(i){for(var u=1;u"}}]),i}(),dE=function(){Ph(i,null,[{key:"fromJS",value:function(f){var c=f.width,g=f.height;return new i(c,g)}}]);function i(u,f){Iy(this,i),this.width=u,this.height=f}return Ph(i,[{key:"fromJS",value:function(f){f(this.width,this.height)}},{key:"toString",value:function(){return""}}]),i}(),pE=function(){function i(u,f){Iy(this,i),this.unit=u,this.value=f}return Ph(i,[{key:"fromJS",value:function(f){f(this.unit,this.value)}},{key:"toString",value:function(){switch(this.unit){case ps.UNIT_POINT:return String(this.value);case ps.UNIT_PERCENT:return this.value+"%";case ps.UNIT_AUTO:return"auto";default:return this.value+"?"}}},{key:"valueOf",value:function(){return this.value}}]),i}();aE.exports=function(i,u){function f(C,A,x){var D=C[A];C[A]=function(){for(var L=arguments.length,N=Array(L),j=0;j1?N-1:0),$=1;$1&&arguments[1]!==void 0?arguments[1]:NaN,x=arguments.length>2&&arguments[2]!==void 0?arguments[2]:NaN,D=arguments.length>3&&arguments[3]!==void 0?arguments[3]:ps.DIRECTION_LTR;return C.call(this,A,x,D)}),_N({Config:u.Config,Node:u.Node,Layout:i("Layout",yN),Size:i("Size",dE),Value:i("Value",pE),getInstanceCount:function(){return u.getInstanceCount.apply(u,arguments)}},ps)}});var mE=Me((exports,module)=>{(function(i,u){typeof define=="function"&&define.amd?define([],function(){return u}):typeof module=="object"&&module.exports?module.exports=u:(i.nbind=i.nbind||{}).init=u})(exports,function(Module,cb){typeof Module=="function"&&(cb=Module,Module={}),Module.onRuntimeInitialized=function(i,u){return function(){i&&i.apply(this,arguments);try{Module.ccall("nbind_init")}catch(f){u(f);return}u(null,{bind:Module._nbind_value,reflect:Module.NBind.reflect,queryType:Module.NBind.queryType,toggleLightGC:Module.toggleLightGC,lib:Module})}}(Module.onRuntimeInitialized,cb);var Module;Module||(Module=(typeof Module!="undefined"?Module:null)||{});var moduleOverrides={};for(var key in Module)Module.hasOwnProperty(key)&&(moduleOverrides[key]=Module[key]);var ENVIRONMENT_IS_WEB=!1,ENVIRONMENT_IS_WORKER=!1,ENVIRONMENT_IS_NODE=!1,ENVIRONMENT_IS_SHELL=!1;if(Module.ENVIRONMENT)if(Module.ENVIRONMENT==="WEB")ENVIRONMENT_IS_WEB=!0;else if(Module.ENVIRONMENT==="WORKER")ENVIRONMENT_IS_WORKER=!0;else if(Module.ENVIRONMENT==="NODE")ENVIRONMENT_IS_NODE=!0;else if(Module.ENVIRONMENT==="SHELL")ENVIRONMENT_IS_SHELL=!0;else throw new Error("The provided Module['ENVIRONMENT'] value is not valid. It must be one of: WEB|WORKER|NODE|SHELL.");else ENVIRONMENT_IS_WEB=typeof window=="object",ENVIRONMENT_IS_WORKER=typeof importScripts=="function",ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof require=="function"&&!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_WORKER,ENVIRONMENT_IS_SHELL=!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_NODE&&!ENVIRONMENT_IS_WORKER;if(ENVIRONMENT_IS_NODE){Module.print||(Module.print=console.log),Module.printErr||(Module.printErr=console.warn);var nodeFS,nodePath;Module.read=function(u,f){nodeFS||(nodeFS={}("")),nodePath||(nodePath={}("")),u=nodePath.normalize(u);var c=nodeFS.readFileSync(u);return f?c:c.toString()},Module.readBinary=function(u){var f=Module.read(u,!0);return f.buffer||(f=new Uint8Array(f)),assert(f.buffer),f},Module.load=function(u){globalEval(read(u))},Module.thisProgram||(process.argv.length>1?Module.thisProgram=process.argv[1].replace(/\\/g,"/"):Module.thisProgram="unknown-program"),Module.arguments=process.argv.slice(2),typeof module!="undefined"&&(module.exports=Module),Module.inspect=function(){return"[Emscripten Module object]"}}else if(ENVIRONMENT_IS_SHELL)Module.print||(Module.print=print),typeof printErr!="undefined"&&(Module.printErr=printErr),typeof read!="undefined"?Module.read=read:Module.read=function(){throw"no read() available"},Module.readBinary=function(u){if(typeof readbuffer=="function")return new Uint8Array(readbuffer(u));var f=read(u,"binary");return assert(typeof f=="object"),f},typeof scriptArgs!="undefined"?Module.arguments=scriptArgs:typeof arguments!="undefined"&&(Module.arguments=arguments),typeof quit=="function"&&(Module.quit=function(i,u){quit(i)});else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(Module.read=function(u){var f=new XMLHttpRequest;return f.open("GET",u,!1),f.send(null),f.responseText},ENVIRONMENT_IS_WORKER&&(Module.readBinary=function(u){var f=new XMLHttpRequest;return f.open("GET",u,!1),f.responseType="arraybuffer",f.send(null),new Uint8Array(f.response)}),Module.readAsync=function(u,f,c){var g=new XMLHttpRequest;g.open("GET",u,!0),g.responseType="arraybuffer",g.onload=function(){g.status==200||g.status==0&&g.response?f(g.response):c()},g.onerror=c,g.send(null)},typeof arguments!="undefined"&&(Module.arguments=arguments),typeof console!="undefined")Module.print||(Module.print=function(u){console.log(u)}),Module.printErr||(Module.printErr=function(u){console.warn(u)});else{var TRY_USE_DUMP=!1;Module.print||(Module.print=TRY_USE_DUMP&&typeof dump!="undefined"?function(i){dump(i)}:function(i){})}ENVIRONMENT_IS_WORKER&&(Module.load=importScripts),typeof Module.setWindowTitle=="undefined"&&(Module.setWindowTitle=function(i){document.title=i})}else throw"Unknown runtime environment. Where are we?";function globalEval(i){eval.call(null,i)}!Module.load&&Module.read&&(Module.load=function(u){globalEval(Module.read(u))}),Module.print||(Module.print=function(){}),Module.printErr||(Module.printErr=Module.print),Module.arguments||(Module.arguments=[]),Module.thisProgram||(Module.thisProgram="./this.program"),Module.quit||(Module.quit=function(i,u){throw u}),Module.print=Module.print,Module.printErr=Module.printErr,Module.preRun=[],Module.postRun=[];for(var key in moduleOverrides)moduleOverrides.hasOwnProperty(key)&&(Module[key]=moduleOverrides[key]);moduleOverrides=void 0;var Runtime={setTempRet0:function(i){return tempRet0=i,i},getTempRet0:function(){return tempRet0},stackSave:function(){return STACKTOP},stackRestore:function(i){STACKTOP=i},getNativeTypeSize:function(i){switch(i){case"i1":case"i8":return 1;case"i16":return 2;case"i32":return 4;case"i64":return 8;case"float":return 4;case"double":return 8;default:{if(i[i.length-1]==="*")return Runtime.QUANTUM_SIZE;if(i[0]==="i"){var u=parseInt(i.substr(1));return assert(u%8==0),u/8}else return 0}}},getNativeFieldSize:function(i){return Math.max(Runtime.getNativeTypeSize(i),Runtime.QUANTUM_SIZE)},STACK_ALIGN:16,prepVararg:function(i,u){return u==="double"||u==="i64"?i&7&&(assert((i&7)==4),i+=4):assert((i&3)==0),i},getAlignSize:function(i,u,f){return!f&&(i=="i64"||i=="double")?8:i?Math.min(u||(i?Runtime.getNativeFieldSize(i):0),Runtime.QUANTUM_SIZE):Math.min(u,8)},dynCall:function(i,u,f){return f&&f.length?Module["dynCall_"+i].apply(null,[u].concat(f)):Module["dynCall_"+i].call(null,u)},functionPointers:[],addFunction:function(i){for(var u=0;u>2],f=(u+i+15|0)&-16;if(HEAP32[DYNAMICTOP_PTR>>2]=f,f>=TOTAL_MEMORY){var c=enlargeMemory();if(!c)return HEAP32[DYNAMICTOP_PTR>>2]=u,0}return u},alignMemory:function(i,u){var f=i=Math.ceil(i/(u||16))*(u||16);return f},makeBigInt:function(i,u,f){var c=f?+(i>>>0)+ +(u>>>0)*4294967296:+(i>>>0)+ +(u|0)*4294967296;return c},GLOBAL_BASE:8,QUANTUM_SIZE:4,__dummy__:0};Module.Runtime=Runtime;var ABORT=0,EXITSTATUS=0;function assert(i,u){i||abort("Assertion failed: "+u)}function getCFunc(ident){var func=Module["_"+ident];if(!func)try{func=eval("_"+ident)}catch(i){}return assert(func,"Cannot call unknown function "+ident+" (perhaps LLVM optimizations or closure removed it?)"),func}var cwrap,ccall;(function(){var JSfuncs={stackSave:function(){Runtime.stackSave()},stackRestore:function(){Runtime.stackRestore()},arrayToC:function(i){var u=Runtime.stackAlloc(i.length);return writeArrayToMemory(i,u),u},stringToC:function(i){var u=0;if(i!=null&&i!==0){var f=(i.length<<2)+1;u=Runtime.stackAlloc(f),stringToUTF8(i,u,f)}return u}},toC={string:JSfuncs.stringToC,array:JSfuncs.arrayToC};ccall=function(u,f,c,g,t){var C=getCFunc(u),A=[],x=0;if(g)for(var D=0;D>0]=u;break;case"i8":HEAP8[i>>0]=u;break;case"i16":HEAP16[i>>1]=u;break;case"i32":HEAP32[i>>2]=u;break;case"i64":tempI64=[u>>>0,(tempDouble=u,+Math_abs(tempDouble)>=1?tempDouble>0?(Math_min(+Math_floor(tempDouble/4294967296),4294967295)|0)>>>0:~~+Math_ceil((tempDouble-+(~~tempDouble>>>0))/4294967296)>>>0:0)],HEAP32[i>>2]=tempI64[0],HEAP32[i+4>>2]=tempI64[1];break;case"float":HEAPF32[i>>2]=u;break;case"double":HEAPF64[i>>3]=u;break;default:abort("invalid type for setValue: "+f)}}Module.setValue=setValue;function getValue(i,u,f){switch(u=u||"i8",u.charAt(u.length-1)==="*"&&(u="i32"),u){case"i1":return HEAP8[i>>0];case"i8":return HEAP8[i>>0];case"i16":return HEAP16[i>>1];case"i32":return HEAP32[i>>2];case"i64":return HEAP32[i>>2];case"float":return HEAPF32[i>>2];case"double":return HEAPF64[i>>3];default:abort("invalid type for setValue: "+u)}return null}Module.getValue=getValue;var ALLOC_NORMAL=0,ALLOC_STACK=1,ALLOC_STATIC=2,ALLOC_DYNAMIC=3,ALLOC_NONE=4;Module.ALLOC_NORMAL=ALLOC_NORMAL,Module.ALLOC_STACK=ALLOC_STACK,Module.ALLOC_STATIC=ALLOC_STATIC,Module.ALLOC_DYNAMIC=ALLOC_DYNAMIC,Module.ALLOC_NONE=ALLOC_NONE;function allocate(i,u,f,c){var g,t;typeof i=="number"?(g=!0,t=i):(g=!1,t=i.length);var C=typeof u=="string"?u:null,A;if(f==ALLOC_NONE?A=c:A=[typeof _malloc=="function"?_malloc:Runtime.staticAlloc,Runtime.stackAlloc,Runtime.staticAlloc,Runtime.dynamicAlloc][f===void 0?ALLOC_STATIC:f](Math.max(t,C?1:u.length)),g){var c=A,x;for(assert((A&3)==0),x=A+(t&~3);c>2]=0;for(x=A+t;c>0]=0;return A}if(C==="i8")return i.subarray||i.slice?HEAPU8.set(i,A):HEAPU8.set(new Uint8Array(i),A),A;for(var D=0,L,N,j;D>0],f|=c,!(c==0&&!u||(g++,u&&g==u)););u||(u=g);var t="";if(f<128){for(var C=1024,A;u>0;)A=String.fromCharCode.apply(String,HEAPU8.subarray(i,i+Math.min(u,C))),t=t?t+A:A,i+=C,u-=C;return t}return Module.UTF8ToString(i)}Module.Pointer_stringify=Pointer_stringify;function AsciiToString(i){for(var u="";;){var f=HEAP8[i++>>0];if(!f)return u;u+=String.fromCharCode(f)}}Module.AsciiToString=AsciiToString;function stringToAscii(i,u){return writeAsciiToMemory(i,u,!1)}Module.stringToAscii=stringToAscii;var UTF8Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf8"):void 0;function UTF8ArrayToString(i,u){for(var f=u;i[f];)++f;if(f-u>16&&i.subarray&&UTF8Decoder)return UTF8Decoder.decode(i.subarray(u,f));for(var c,g,t,C,A,x,D="";;){if(c=i[u++],!c)return D;if(!(c&128)){D+=String.fromCharCode(c);continue}if(g=i[u++]&63,(c&224)==192){D+=String.fromCharCode((c&31)<<6|g);continue}if(t=i[u++]&63,(c&240)==224?c=(c&15)<<12|g<<6|t:(C=i[u++]&63,(c&248)==240?c=(c&7)<<18|g<<12|t<<6|C:(A=i[u++]&63,(c&252)==248?c=(c&3)<<24|g<<18|t<<12|C<<6|A:(x=i[u++]&63,c=(c&1)<<30|g<<24|t<<18|C<<12|A<<6|x))),c<65536)D+=String.fromCharCode(c);else{var L=c-65536;D+=String.fromCharCode(55296|L>>10,56320|L&1023)}}}Module.UTF8ArrayToString=UTF8ArrayToString;function UTF8ToString(i){return UTF8ArrayToString(HEAPU8,i)}Module.UTF8ToString=UTF8ToString;function stringToUTF8Array(i,u,f,c){if(!(c>0))return 0;for(var g=f,t=f+c-1,C=0;C=55296&&A<=57343&&(A=65536+((A&1023)<<10)|i.charCodeAt(++C)&1023),A<=127){if(f>=t)break;u[f++]=A}else if(A<=2047){if(f+1>=t)break;u[f++]=192|A>>6,u[f++]=128|A&63}else if(A<=65535){if(f+2>=t)break;u[f++]=224|A>>12,u[f++]=128|A>>6&63,u[f++]=128|A&63}else if(A<=2097151){if(f+3>=t)break;u[f++]=240|A>>18,u[f++]=128|A>>12&63,u[f++]=128|A>>6&63,u[f++]=128|A&63}else if(A<=67108863){if(f+4>=t)break;u[f++]=248|A>>24,u[f++]=128|A>>18&63,u[f++]=128|A>>12&63,u[f++]=128|A>>6&63,u[f++]=128|A&63}else{if(f+5>=t)break;u[f++]=252|A>>30,u[f++]=128|A>>24&63,u[f++]=128|A>>18&63,u[f++]=128|A>>12&63,u[f++]=128|A>>6&63,u[f++]=128|A&63}}return u[f]=0,f-g}Module.stringToUTF8Array=stringToUTF8Array;function stringToUTF8(i,u,f){return stringToUTF8Array(i,HEAPU8,u,f)}Module.stringToUTF8=stringToUTF8;function lengthBytesUTF8(i){for(var u=0,f=0;f=55296&&c<=57343&&(c=65536+((c&1023)<<10)|i.charCodeAt(++f)&1023),c<=127?++u:c<=2047?u+=2:c<=65535?u+=3:c<=2097151?u+=4:c<=67108863?u+=5:u+=6}return u}Module.lengthBytesUTF8=lengthBytesUTF8;var UTF16Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf-16le"):void 0;function demangle(i){var u=Module.___cxa_demangle||Module.__cxa_demangle;if(u){try{var f=i.substr(1),c=lengthBytesUTF8(f)+1,g=_malloc(c);stringToUTF8(f,g,c);var t=_malloc(4),C=u(g,0,0,t);if(getValue(t,"i32")===0&&C)return Pointer_stringify(C)}catch(A){}finally{g&&_free(g),t&&_free(t),C&&_free(C)}return i}return Runtime.warnOnce("warning: build with -s DEMANGLE_SUPPORT=1 to link in libcxxabi demangling"),i}function demangleAll(i){var u=/__Z[\w\d_]+/g;return i.replace(u,function(f){var c=demangle(f);return f===c?f:f+" ["+c+"]"})}function jsStackTrace(){var i=new Error;if(!i.stack){try{throw new Error(0)}catch(u){i=u}if(!i.stack)return"(no stack trace available)"}return i.stack.toString()}function stackTrace(){var i=jsStackTrace();return Module.extraStackTrace&&(i+=` -`+Module.extraStackTrace()),demangleAll(i)}Module.stackTrace=stackTrace;var HEAP,buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferViews(){Module.HEAP8=HEAP8=new Int8Array(buffer),Module.HEAP16=HEAP16=new Int16Array(buffer),Module.HEAP32=HEAP32=new Int32Array(buffer),Module.HEAPU8=HEAPU8=new Uint8Array(buffer),Module.HEAPU16=HEAPU16=new Uint16Array(buffer),Module.HEAPU32=HEAPU32=new Uint32Array(buffer),Module.HEAPF32=HEAPF32=new Float32Array(buffer),Module.HEAPF64=HEAPF64=new Float64Array(buffer)}var STATIC_BASE,STATICTOP,staticSealed,STACK_BASE,STACKTOP,STACK_MAX,DYNAMIC_BASE,DYNAMICTOP_PTR;STATIC_BASE=STATICTOP=STACK_BASE=STACKTOP=STACK_MAX=DYNAMIC_BASE=DYNAMICTOP_PTR=0,staticSealed=!1;function abortOnCannotGrowMemory(){abort("Cannot enlarge memory arrays. Either (1) compile with -s TOTAL_MEMORY=X with X higher than the current value "+TOTAL_MEMORY+", (2) compile with -s ALLOW_MEMORY_GROWTH=1 which allows increasing the size at runtime but prevents some optimizations, (3) set Module.TOTAL_MEMORY to a higher value before the program runs, or (4) if you want malloc to return NULL (0) instead of this abort, compile with -s ABORTING_MALLOC=0 ")}function enlargeMemory(){abortOnCannotGrowMemory()}var TOTAL_STACK=Module.TOTAL_STACK||5242880,TOTAL_MEMORY=Module.TOTAL_MEMORY||134217728;TOTAL_MEMORY0;){var u=i.shift();if(typeof u=="function"){u();continue}var f=u.func;typeof f=="number"?u.arg===void 0?Module.dynCall_v(f):Module.dynCall_vi(f,u.arg):f(u.arg===void 0?null:u.arg)}}var __ATPRERUN__=[],__ATINIT__=[],__ATMAIN__=[],__ATEXIT__=[],__ATPOSTRUN__=[],runtimeInitialized=!1,runtimeExited=!1;function preRun(){if(Module.preRun)for(typeof Module.preRun=="function"&&(Module.preRun=[Module.preRun]);Module.preRun.length;)addOnPreRun(Module.preRun.shift());callRuntimeCallbacks(__ATPRERUN__)}function ensureInitRuntime(){runtimeInitialized||(runtimeInitialized=!0,callRuntimeCallbacks(__ATINIT__))}function preMain(){callRuntimeCallbacks(__ATMAIN__)}function exitRuntime(){callRuntimeCallbacks(__ATEXIT__),runtimeExited=!0}function postRun(){if(Module.postRun)for(typeof Module.postRun=="function"&&(Module.postRun=[Module.postRun]);Module.postRun.length;)addOnPostRun(Module.postRun.shift());callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(i){__ATPRERUN__.unshift(i)}Module.addOnPreRun=addOnPreRun;function addOnInit(i){__ATINIT__.unshift(i)}Module.addOnInit=addOnInit;function addOnPreMain(i){__ATMAIN__.unshift(i)}Module.addOnPreMain=addOnPreMain;function addOnExit(i){__ATEXIT__.unshift(i)}Module.addOnExit=addOnExit;function addOnPostRun(i){__ATPOSTRUN__.unshift(i)}Module.addOnPostRun=addOnPostRun;function intArrayFromString(i,u,f){var c=f>0?f:lengthBytesUTF8(i)+1,g=new Array(c),t=stringToUTF8Array(i,g,0,g.length);return u&&(g.length=t),g}Module.intArrayFromString=intArrayFromString;function intArrayToString(i){for(var u=[],f=0;f255&&(c&=255),u.push(String.fromCharCode(c))}return u.join("")}Module.intArrayToString=intArrayToString;function writeStringToMemory(i,u,f){Runtime.warnOnce("writeStringToMemory is deprecated and should not be called! Use stringToUTF8() instead!");var c,g;f&&(g=u+lengthBytesUTF8(i),c=HEAP8[g]),stringToUTF8(i,u,Infinity),f&&(HEAP8[g]=c)}Module.writeStringToMemory=writeStringToMemory;function writeArrayToMemory(i,u){HEAP8.set(i,u)}Module.writeArrayToMemory=writeArrayToMemory;function writeAsciiToMemory(i,u,f){for(var c=0;c>0]=i.charCodeAt(c);f||(HEAP8[u>>0]=0)}if(Module.writeAsciiToMemory=writeAsciiToMemory,(!Math.imul||Math.imul(4294967295,5)!==-5)&&(Math.imul=function(u,f){var c=u>>>16,g=u&65535,t=f>>>16,C=f&65535;return g*C+(c*C+g*t<<16)|0}),Math.imul=Math.imul,!Math.fround){var froundBuffer=new Float32Array(1);Math.fround=function(i){return froundBuffer[0]=i,froundBuffer[0]}}Math.fround=Math.fround,Math.clz32||(Math.clz32=function(i){i=i>>>0;for(var u=0;u<32;u++)if(i&1<<31-u)return u;return 32}),Math.clz32=Math.clz32,Math.trunc||(Math.trunc=function(i){return i<0?Math.ceil(i):Math.floor(i)}),Math.trunc=Math.trunc;var Math_abs=Math.abs,Math_cos=Math.cos,Math_sin=Math.sin,Math_tan=Math.tan,Math_acos=Math.acos,Math_asin=Math.asin,Math_atan=Math.atan,Math_atan2=Math.atan2,Math_exp=Math.exp,Math_log=Math.log,Math_sqrt=Math.sqrt,Math_ceil=Math.ceil,Math_floor=Math.floor,Math_pow=Math.pow,Math_imul=Math.imul,Math_fround=Math.fround,Math_round=Math.round,Math_min=Math.min,Math_clz32=Math.clz32,Math_trunc=Math.trunc,runDependencies=0,runDependencyWatcher=null,dependenciesFulfilled=null;function getUniqueRunDependency(i){return i}function addRunDependency(i){runDependencies++,Module.monitorRunDependencies&&Module.monitorRunDependencies(runDependencies)}Module.addRunDependency=addRunDependency;function removeRunDependency(i){if(runDependencies--,Module.monitorRunDependencies&&Module.monitorRunDependencies(runDependencies),runDependencies==0&&(runDependencyWatcher!==null&&(clearInterval(runDependencyWatcher),runDependencyWatcher=null),dependenciesFulfilled)){var u=dependenciesFulfilled;dependenciesFulfilled=null,u()}}Module.removeRunDependency=removeRunDependency,Module.preloadedImages={},Module.preloadedAudios={};var ASM_CONSTS=[function(i,u,f,c,g,t,C,A){return _nbind.callbackSignatureList[i].apply(this,arguments)}];function _emscripten_asm_const_iiiiiiii(i,u,f,c,g,t,C,A){return ASM_CONSTS[i](u,f,c,g,t,C,A)}function _emscripten_asm_const_iiiii(i,u,f,c,g){return ASM_CONSTS[i](u,f,c,g)}function _emscripten_asm_const_iiidddddd(i,u,f,c,g,t,C,A,x){return ASM_CONSTS[i](u,f,c,g,t,C,A,x)}function _emscripten_asm_const_iiididi(i,u,f,c,g,t,C){return ASM_CONSTS[i](u,f,c,g,t,C)}function _emscripten_asm_const_iiii(i,u,f,c){return ASM_CONSTS[i](u,f,c)}function _emscripten_asm_const_iiiid(i,u,f,c,g){return ASM_CONSTS[i](u,f,c,g)}function _emscripten_asm_const_iiiiii(i,u,f,c,g,t){return ASM_CONSTS[i](u,f,c,g,t)}STATIC_BASE=Runtime.GLOBAL_BASE,STATICTOP=STATIC_BASE+12800,__ATINIT__.push({func:function(){__GLOBAL__sub_I_Yoga_cpp()}},{func:function(){__GLOBAL__sub_I_nbind_cc()}},{func:function(){__GLOBAL__sub_I_common_cc()}},{func:function(){__GLOBAL__sub_I_Binding_cc()}}),allocate([0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,192,127,0,0,192,127,3,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,3,0,0,0,0,0,192,127,3,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,192,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,0,0,0,0,0,0,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,127,0,0,192,127,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,0,0,128,191,0,0,128,191,0,0,192,127,0,0,0,0,0,0,0,0,0,0,128,63,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,1,0,0,0,2,0,0,0,0,0,0,0,190,12,0,0,200,12,0,0,208,12,0,0,216,12,0,0,230,12,0,0,242,12,0,0,1,0,0,0,3,0,0,0,0,0,0,0,2,0,0,0,0,0,192,127,3,0,0,0,180,45,0,0,181,45,0,0,182,45,0,0,181,45,0,0,182,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,1,0,0,0,4,0,0,0,183,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,181,45,0,0,184,45,0,0,185,45,0,0,181,45,0,0,181,45,0,0,182,45,0,0,186,45,0,0,185,45,0,0,148,4,0,0,3,0,0,0,187,45,0,0,164,4,0,0,188,45,0,0,2,0,0,0,189,45,0,0,164,4,0,0,188,45,0,0,185,45,0,0,164,4,0,0,185,45,0,0,164,4,0,0,188,45,0,0,181,45,0,0,182,45,0,0,181,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,5,0,0,0,6,0,0,0,1,0,0,0,7,0,0,0,183,45,0,0,182,45,0,0,181,45,0,0,190,45,0,0,190,45,0,0,182,45,0,0,182,45,0,0,185,45,0,0,181,45,0,0,185,45,0,0,182,45,0,0,181,45,0,0,185,45,0,0,182,45,0,0,185,45,0,0,48,5,0,0,3,0,0,0,56,5,0,0,1,0,0,0,189,45,0,0,185,45,0,0,164,4,0,0,76,5,0,0,2,0,0,0,191,45,0,0,186,45,0,0,182,45,0,0,185,45,0,0,192,45,0,0,185,45,0,0,182,45,0,0,186,45,0,0,185,45,0,0,76,5,0,0,76,5,0,0,136,5,0,0,182,45,0,0,181,45,0,0,2,0,0,0,190,45,0,0,136,5,0,0,56,19,0,0,156,5,0,0,2,0,0,0,184,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,8,0,0,0,9,0,0,0,1,0,0,0,10,0,0,0,204,5,0,0,181,45,0,0,181,45,0,0,2,0,0,0,180,45,0,0,204,5,0,0,2,0,0,0,195,45,0,0,236,5,0,0,97,19,0,0,198,45,0,0,211,45,0,0,212,45,0,0,213,45,0,0,214,45,0,0,215,45,0,0,188,45,0,0,182,45,0,0,216,45,0,0,217,45,0,0,218,45,0,0,219,45,0,0,192,45,0,0,181,45,0,0,0,0,0,0,185,45,0,0,110,19,0,0,186,45,0,0,115,19,0,0,221,45,0,0,120,19,0,0,148,4,0,0,132,19,0,0,96,6,0,0,145,19,0,0,222,45,0,0,164,19,0,0,223,45,0,0,173,19,0,0,0,0,0,0,3,0,0,0,104,6,0,0,1,0,0,0,187,45,0,0,0,0,0,0,0,0,0,0,1,0,0,0,11,0,0,0,12,0,0,0,1,0,0,0,13,0,0,0,185,45,0,0,224,45,0,0,164,6,0,0,188,45,0,0,172,6,0,0,180,6,0,0,2,0,0,0,188,6,0,0,7,0,0,0,224,45,0,0,7,0,0,0,164,6,0,0,1,0,0,0,213,45,0,0,185,45,0,0,224,45,0,0,172,6,0,0,185,45,0,0,224,45,0,0,164,6,0,0,185,45,0,0,224,45,0,0,211,45,0,0,211,45,0,0,222,45,0,0,211,45,0,0,224,45,0,0,222,45,0,0,211,45,0,0,224,45,0,0,172,6,0,0,222,45,0,0,211,45,0,0,224,45,0,0,188,45,0,0,222,45,0,0,211,45,0,0,40,7,0,0,188,45,0,0,2,0,0,0,224,45,0,0,185,45,0,0,188,45,0,0,188,45,0,0,188,45,0,0,188,45,0,0,222,45,0,0,224,45,0,0,148,4,0,0,185,45,0,0,148,4,0,0,148,4,0,0,148,4,0,0,148,4,0,0,148,4,0,0,185,45,0,0,164,6,0,0,148,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,14,0,0,0,15,0,0,0,1,0,0,0,16,0,0,0,148,7,0,0,2,0,0,0,225,45,0,0,183,45,0,0,188,45,0,0,168,7,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,234,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,148,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,9,0,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,242,45,0,0,0,4,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,255,255,255,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,67,111,117,108,100,32,110,111,116,32,97,108,108,111,99,97,116,101,32,109,101,109,111,114,121,32,102,111,114,32,110,111,100,101,0,67,97,110,110,111,116,32,114,101,115,101,116,32,97,32,110,111,100,101,32,119,104,105,99,104,32,115,116,105,108,108,32,104,97,115,32,99,104,105,108,100,114,101,110,32,97,116,116,97,99,104,101,100,0,67,97,110,110,111,116,32,114,101,115,101,116,32,97,32,110,111,100,101,32,115,116,105,108,108,32,97,116,116,97,99,104,101,100,32,116,111,32,97,32,112,97,114,101,110,116,0,67,111,117,108,100,32,110,111,116,32,97,108,108,111,99,97,116,101,32,109,101,109,111,114,121,32,102,111,114,32,99,111,110,102,105,103,0,67,97,110,110,111,116,32,115,101,116,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,58,32,78,111,100,101,115,32,119,105,116,104,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,32,99,97,110,110,111,116,32,104,97,118,101,32,99,104,105,108,100,114,101,110,46,0,67,104,105,108,100,32,97,108,114,101,97,100,121,32,104,97,115,32,97,32,112,97,114,101,110,116,44,32,105,116,32,109,117,115,116,32,98,101,32,114,101,109,111,118,101,100,32,102,105,114,115,116,46,0,67,97,110,110,111,116,32,97,100,100,32,99,104,105,108,100,58,32,78,111,100,101,115,32,119,105,116,104,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,32,99,97,110,110,111,116,32,104,97,118,101,32,99,104,105,108,100,114,101,110,46,0,79,110,108,121,32,108,101,97,102,32,110,111,100,101,115,32,119,105,116,104,32,99,117,115,116,111,109,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,115,115,104,111,117,108,100,32,109,97,110,117,97,108,108,121,32,109,97,114,107,32,116,104,101,109,115,101,108,118,101,115,32,97,115,32,100,105,114,116,121,0,67,97,110,110,111,116,32,103,101,116,32,108,97,121,111,117,116,32,112,114,111,112,101,114,116,105,101,115,32,111,102,32,109,117,108,116,105,45,101,100,103,101,32,115,104,111,114,116,104,97,110,100,115,0,37,115,37,100,46,123,91,115,107,105,112,112,101,100,93,32,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,97,119,58,32,37,102,32,97,104,58,32,37,102,32,61,62,32,100,58,32,40,37,102,44,32,37,102,41,32,37,115,10,0,37,115,37,100,46,123,37,115,0,42,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,97,119,58,32,37,102,32,97,104,58,32,37,102,32,37,115,10,0,37,115,37,100,46,125,37,115,0,119,109,58,32,37,115,44,32,104,109,58,32,37,115,44,32,100,58,32,40,37,102,44,32,37,102,41,32,37,115,10,0,79,117,116,32,111,102,32,99,97,99,104,101,32,101,110,116,114,105,101,115,33,10,0,83,99,97,108,101,32,102,97,99,116,111,114,32,115,104,111,117,108,100,32,110,111,116,32,98,101,32,108,101,115,115,32,116,104,97,110,32,122,101,114,111,0,105,110,105,116,105,97,108,0,37,115,10,0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,85,78,68,69,70,73,78,69,68,0,69,88,65,67,84,76,89,0,65,84,95,77,79,83,84,0,76,65,89,95,85,78,68,69,70,73,78,69,68,0,76,65,89,95,69,88,65,67,84,76,89,0,76,65,89,95,65,84,95,77,79,83,84,0,97,118,97,105,108,97,98,108,101,87,105,100,116,104,32,105,115,32,105,110,100,101,102,105,110,105,116,101,32,115,111,32,119,105,100,116,104,77,101,97,115,117,114,101,77,111,100,101,32,109,117,115,116,32,98,101,32,89,71,77,101,97,115,117,114,101,77,111,100,101,85,110,100,101,102,105,110,101,100,0,97,118,97,105,108,97,98,108,101,72,101,105,103,104,116,32,105,115,32,105,110,100,101,102,105,110,105,116,101,32,115,111,32,104,101,105,103,104,116,77,101,97,115,117,114,101,77,111,100,101,32,109,117,115,116,32,98,101,32,89,71,77,101,97,115,117,114,101,77,111,100,101,85,110,100,101,102,105,110,101,100,0,102,108,101,120,0,115,116,114,101,116,99,104,0,109,117,108,116,105,108,105,110,101,45,115,116,114,101,116,99,104,0,69,120,112,101,99,116,101,100,32,110,111,100,101,32,116,111,32,104,97,118,101,32,99,117,115,116,111,109,32,109,101,97,115,117,114,101,32,102,117,110,99,116,105,111,110,0,109,101,97,115,117,114,101,0,69,120,112,101,99,116,32,99,117,115,116,111,109,32,98,97,115,101,108,105,110,101,32,102,117,110,99,116,105,111,110,32,116,111,32,110,111,116,32,114,101,116,117,114,110,32,78,97,78,0,97,98,115,45,109,101,97,115,117,114,101,0,97,98,115,45,108,97,121,111,117,116,0,78,111,100,101,0,99,114,101,97,116,101,68,101,102,97,117,108,116,0,99,114,101,97,116,101,87,105,116,104,67,111,110,102,105,103,0,100,101,115,116,114,111,121,0,114,101,115,101,116,0,99,111,112,121,83,116,121,108,101,0,115,101,116,80,111,115,105,116,105,111,110,84,121,112,101,0,115,101,116,80,111,115,105,116,105,111,110,0,115,101,116,80,111,115,105,116,105,111,110,80,101,114,99,101,110,116,0,115,101,116,65,108,105,103,110,67,111,110,116,101,110,116,0,115,101,116,65,108,105,103,110,73,116,101,109,115,0,115,101,116,65,108,105,103,110,83,101,108,102,0,115,101,116,70,108,101,120,68,105,114,101,99,116,105,111,110,0,115,101,116,70,108,101,120,87,114,97,112,0,115,101,116,74,117,115,116,105,102,121,67,111,110,116,101,110,116,0,115,101,116,77,97,114,103,105,110,0,115,101,116,77,97,114,103,105,110,80,101,114,99,101,110,116,0,115,101,116,77,97,114,103,105,110,65,117,116,111,0,115,101,116,79,118,101,114,102,108,111,119,0,115,101,116,68,105,115,112,108,97,121,0,115,101,116,70,108,101,120,0,115,101,116,70,108,101,120,66,97,115,105,115,0,115,101,116,70,108,101,120,66,97,115,105,115,80,101,114,99,101,110,116,0,115,101,116,70,108,101,120,71,114,111,119,0,115,101,116,70,108,101,120,83,104,114,105,110,107,0,115,101,116,87,105,100,116,104,0,115,101,116,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,87,105,100,116,104,65,117,116,111,0,115,101,116,72,101,105,103,104,116,0,115,101,116,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,72,101,105,103,104,116,65,117,116,111,0,115,101,116,77,105,110,87,105,100,116,104,0,115,101,116,77,105,110,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,77,105,110,72,101,105,103,104,116,0,115,101,116,77,105,110,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,77,97,120,87,105,100,116,104,0,115,101,116,77,97,120,87,105,100,116,104,80,101,114,99,101,110,116,0,115,101,116,77,97,120,72,101,105,103,104,116,0,115,101,116,77,97,120,72,101,105,103,104,116,80,101,114,99,101,110,116,0,115,101,116,65,115,112,101,99,116,82,97,116,105,111,0,115,101,116,66,111,114,100,101,114,0,115,101,116,80,97,100,100,105,110,103,0,115,101,116,80,97,100,100,105,110,103,80,101,114,99,101,110,116,0,103,101,116,80,111,115,105,116,105,111,110,84,121,112,101,0,103,101,116,80,111,115,105,116,105,111,110,0,103,101,116,65,108,105,103,110,67,111,110,116,101,110,116,0,103,101,116,65,108,105,103,110,73,116,101,109,115,0,103,101,116,65,108,105,103,110,83,101,108,102,0,103,101,116,70,108,101,120,68,105,114,101,99,116,105,111,110,0,103,101,116,70,108,101,120,87,114,97,112,0,103,101,116,74,117,115,116,105,102,121,67,111,110,116,101,110,116,0,103,101,116,77,97,114,103,105,110,0,103,101,116,70,108,101,120,66,97,115,105,115,0,103,101,116,70,108,101,120,71,114,111,119,0,103,101,116,70,108,101,120,83,104,114,105,110,107,0,103,101,116,87,105,100,116,104,0,103,101,116,72,101,105,103,104,116,0,103,101,116,77,105,110,87,105,100,116,104,0,103,101,116,77,105,110,72,101,105,103,104,116,0,103,101,116,77,97,120,87,105,100,116,104,0,103,101,116,77,97,120,72,101,105,103,104,116,0,103,101,116,65,115,112,101,99,116,82,97,116,105,111,0,103,101,116,66,111,114,100,101,114,0,103,101,116,79,118,101,114,102,108,111,119,0,103,101,116,68,105,115,112,108,97,121,0,103,101,116,80,97,100,100,105,110,103,0,105,110,115,101,114,116,67,104,105,108,100,0,114,101,109,111,118,101,67,104,105,108,100,0,103,101,116,67,104,105,108,100,67,111,117,110,116,0,103,101,116,80,97,114,101,110,116,0,103,101,116,67,104,105,108,100,0,115,101,116,77,101,97,115,117,114,101,70,117,110,99,0,117,110,115,101,116,77,101,97,115,117,114,101,70,117,110,99,0,109,97,114,107,68,105,114,116,121,0,105,115,68,105,114,116,121,0,99,97,108,99,117,108,97,116,101,76,97,121,111,117,116,0,103,101,116,67,111,109,112,117,116,101,100,76,101,102,116,0,103,101,116,67,111,109,112,117,116,101,100,82,105,103,104,116,0,103,101,116,67,111,109,112,117,116,101,100,84,111,112,0,103,101,116,67,111,109,112,117,116,101,100,66,111,116,116,111,109,0,103,101,116,67,111,109,112,117,116,101,100,87,105,100,116,104,0,103,101,116,67,111,109,112,117,116,101,100,72,101,105,103,104,116,0,103,101,116,67,111,109,112,117,116,101,100,76,97,121,111,117,116,0,103,101,116,67,111,109,112,117,116,101,100,77,97,114,103,105,110,0,103,101,116,67,111,109,112,117,116,101,100,66,111,114,100,101,114,0,103,101,116,67,111,109,112,117,116,101,100,80,97,100,100,105,110,103,0,67,111,110,102,105,103,0,99,114,101,97,116,101,0,115,101,116,69,120,112,101,114,105,109,101,110,116,97,108,70,101,97,116,117,114,101,69,110,97,98,108,101,100,0,115,101,116,80,111,105,110,116,83,99,97,108,101,70,97,99,116,111,114,0,105,115,69,120,112,101,114,105,109,101,110,116,97,108,70,101,97,116,117,114,101,69,110,97,98,108,101,100,0,86,97,108,117,101,0,76,97,121,111,117,116,0,83,105,122,101,0,103,101,116,73,110,115,116,97,110,99,101,67,111,117,110,116,0,73,110,116,54,52,0,1,1,1,2,2,4,4,4,4,8,8,4,8,118,111,105,100,0,98,111,111,108,0,115,116,100,58,58,115,116,114,105,110,103,0,99,98,70,117,110,99,116,105,111,110,32,38,0,99,111,110,115,116,32,99,98,70,117,110,99,116,105,111,110,32,38,0,69,120,116,101,114,110,97,108,0,66,117,102,102,101,114,0,78,66,105,110,100,73,68,0,78,66,105,110,100,0,98,105,110,100,95,118,97,108,117,101,0,114,101,102,108,101,99,116,0,113,117,101,114,121,84,121,112,101,0,108,97,108,108,111,99,0,108,114,101,115,101,116,0,123,114,101,116,117,114,110,40,95,110,98,105,110,100,46,99,97,108,108,98,97,99,107,83,105,103,110,97,116,117,114,101,76,105,115,116,91,36,48,93,46,97,112,112,108,121,40,116,104,105,115,44,97,114,103,117,109,101,110,116,115,41,41,59,125,0,95,110,98,105,110,100,95,110,101,119,0,17,0,10,0,17,17,17,0,0,0,0,5,0,0,0,0,0,0,9,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,15,10,17,17,17,3,10,7,0,1,19,9,11,11,0,0,9,6,11,0,0,11,0,6,17,0,0,0,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,17,0,10,10,17,17,17,0,10,0,0,2,0,9,11,0,0,0,9,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,4,13,0,0,0,0,9,14,0,0,0,0,0,14,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,15,0,0,0,0,9,16,0,0,0,0,0,16,0,0,16,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0,0,18,18,18,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,10,0,0,0,0,9,11,0,0,0,0,0,11,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,12,0,0,0,0,9,12,0,0,0,0,0,12,0,0,12,0,0,45,43,32,32,32,48,88,48,120,0,40,110,117,108,108,41,0,45,48,88,43,48,88,32,48,88,45,48,120,43,48,120,32,48,120,0,105,110,102,0,73,78,70,0,110,97,110,0,78,65,78,0,48,49,50,51,52,53,54,55,56,57,65,66,67,68,69,70,46,0,84,33,34,25,13,1,2,3,17,75,28,12,16,4,11,29,18,30,39,104,110,111,112,113,98,32,5,6,15,19,20,21,26,8,22,7,40,36,23,24,9,10,14,27,31,37,35,131,130,125,38,42,43,60,61,62,63,67,71,74,77,88,89,90,91,92,93,94,95,96,97,99,100,101,102,103,105,106,107,108,114,115,116,121,122,123,124,0,73,108,108,101,103,97,108,32,98,121,116,101,32,115,101,113,117,101,110,99,101,0,68,111,109,97,105,110,32,101,114,114,111,114,0,82,101,115,117,108,116,32,110,111,116,32,114,101,112,114,101,115,101,110,116,97,98,108,101,0,78,111,116,32,97,32,116,116,121,0,80,101,114,109,105,115,115,105,111,110,32,100,101,110,105,101,100,0,79,112,101,114,97,116,105,111,110,32,110,111,116,32,112,101,114,109,105,116,116,101,100,0,78,111,32,115,117,99,104,32,102,105,108,101,32,111,114,32,100,105,114,101,99,116,111,114,121,0,78,111,32,115,117,99,104,32,112,114,111,99,101,115,115,0,70,105,108,101,32,101,120,105,115,116,115,0,86,97,108,117,101,32,116,111,111,32,108,97,114,103,101,32,102,111,114,32,100,97,116,97,32,116,121,112,101,0,78,111,32,115,112,97,99,101,32,108,101,102,116,32,111,110,32,100,101,118,105,99,101,0,79,117,116,32,111,102,32,109,101,109,111,114,121,0,82,101,115,111,117,114,99,101,32,98,117,115,121,0,73,110,116,101,114,114,117,112,116,101,100,32,115,121,115,116,101,109,32,99,97,108,108,0,82,101,115,111,117,114,99,101,32,116,101,109,112,111,114,97,114,105,108,121,32,117,110,97,118,97,105,108,97,98,108,101,0,73,110,118,97,108,105,100,32,115,101,101,107,0,67,114,111,115,115,45,100,101,118,105,99,101,32,108,105,110,107,0,82,101,97,100,45,111,110,108,121,32,102,105,108,101,32,115,121,115,116,101,109,0,68,105,114,101,99,116,111,114,121,32,110,111,116,32,101,109,112,116,121,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,112,101,101,114,0,79,112,101,114,97,116,105,111,110,32,116,105,109,101,100,32,111,117,116,0,67,111,110,110,101,99,116,105,111,110,32,114,101,102,117,115,101,100,0,72,111,115,116,32,105,115,32,100,111,119,110,0,72,111,115,116,32,105,115,32,117,110,114,101,97,99,104,97,98,108,101,0,65,100,100,114,101,115,115,32,105,110,32,117,115,101,0,66,114,111,107,101,110,32,112,105,112,101,0,73,47,79,32,101,114,114,111,114,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,32,111,114,32,97,100,100,114,101,115,115,0,66,108,111,99,107,32,100,101,118,105,99,101,32,114,101,113,117,105,114,101,100,0,78,111,32,115,117,99,104,32,100,101,118,105,99,101,0,78,111,116,32,97,32,100,105,114,101,99,116,111,114,121,0,73,115,32,97,32,100,105,114,101,99,116,111,114,121,0,84,101,120,116,32,102,105,108,101,32,98,117,115,121,0,69,120,101,99,32,102,111,114,109,97,116,32,101,114,114,111,114,0,73,110,118,97,108,105,100,32,97,114,103,117,109,101,110,116,0,65,114,103,117,109,101,110,116,32,108,105,115,116,32,116,111,111,32,108,111,110,103,0,83,121,109,98,111,108,105,99,32,108,105,110,107,32,108,111,111,112,0,70,105,108,101,110,97,109,101,32,116,111,111,32,108,111,110,103,0,84,111,111,32,109,97,110,121,32,111,112,101,110,32,102,105,108,101,115,32,105,110,32,115,121,115,116,101,109,0,78,111,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,115,32,97,118,97,105,108,97,98,108,101,0,66,97,100,32,102,105,108,101,32,100,101,115,99,114,105,112,116,111,114,0,78,111,32,99,104,105,108,100,32,112,114,111,99,101,115,115,0,66,97,100,32,97,100,100,114,101,115,115,0,70,105,108,101,32,116,111,111,32,108,97,114,103,101,0,84,111,111,32,109,97,110,121,32,108,105,110,107,115,0,78,111,32,108,111,99,107,115,32,97,118,97,105,108,97,98,108,101,0,82,101,115,111,117,114,99,101,32,100,101,97,100,108,111,99,107,32,119,111,117,108,100,32,111,99,99,117,114,0,83,116,97,116,101,32,110,111,116,32,114,101,99,111,118,101,114,97,98,108,101,0,80,114,101,118,105,111,117,115,32,111,119,110,101,114,32,100,105,101,100,0,79,112,101,114,97,116,105,111,110,32,99,97,110,99,101,108,101,100,0,70,117,110,99,116,105,111,110,32,110,111,116,32,105,109,112,108,101,109,101,110,116,101,100,0,78,111,32,109,101,115,115,97,103,101,32,111,102,32,100,101,115,105,114,101,100,32,116,121,112,101,0,73,100,101,110,116,105,102,105,101,114,32,114,101,109,111,118,101,100,0,68,101,118,105,99,101,32,110,111,116,32,97,32,115,116,114,101,97,109,0,78,111,32,100,97,116,97,32,97,118,97,105,108,97,98,108,101,0,68,101,118,105,99,101,32,116,105,109,101,111,117,116,0,79,117,116,32,111,102,32,115,116,114,101,97,109,115,32,114,101,115,111,117,114,99,101,115,0,76,105,110,107,32,104,97,115,32,98,101,101,110,32,115,101,118,101,114,101,100,0,80,114,111,116,111,99,111,108,32,101,114,114,111,114,0,66,97,100,32,109,101,115,115,97,103,101,0,70,105,108,101,32,100,101,115,99,114,105,112,116,111,114,32,105,110,32,98,97,100,32,115,116,97,116,101,0,78,111,116,32,97,32,115,111,99,107,101,116,0,68,101,115,116,105,110,97,116,105,111,110,32,97,100,100,114,101,115,115,32,114,101,113,117,105,114,101,100,0,77,101,115,115,97,103,101,32,116,111,111,32,108,97,114,103,101,0,80,114,111,116,111,99,111,108,32,119,114,111,110,103,32,116,121,112,101,32,102,111,114,32,115,111,99,107,101,116,0,80,114,111,116,111,99,111,108,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,80,114,111,116,111,99,111,108,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,83,111,99,107,101,116,32,116,121,112,101,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,78,111,116,32,115,117,112,112,111,114,116,101,100,0,80,114,111,116,111,99,111,108,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,0,65,100,100,114,101,115,115,32,102,97,109,105,108,121,32,110,111,116,32,115,117,112,112,111,114,116,101,100,32,98,121,32,112,114,111,116,111,99,111,108,0,65,100,100,114,101,115,115,32,110,111,116,32,97,118,97,105,108,97,98,108,101,0,78,101,116,119,111,114,107,32,105,115,32,100,111,119,110,0,78,101,116,119,111,114,107,32,117,110,114,101,97,99,104,97,98,108,101,0,67,111,110,110,101,99,116,105,111,110,32,114,101,115,101,116,32,98,121,32,110,101,116,119,111,114,107,0,67,111,110,110,101,99,116,105,111,110,32,97,98,111,114,116,101,100,0,78,111,32,98,117,102,102,101,114,32,115,112,97,99,101,32,97,118,97,105,108,97,98,108,101,0,83,111,99,107,101,116,32,105,115,32,99,111,110,110,101,99,116,101,100,0,83,111,99,107,101,116,32,110,111,116,32,99,111,110,110,101,99,116,101,100,0,67,97,110,110,111,116,32,115,101,110,100,32,97,102,116,101,114,32,115,111,99,107,101,116,32,115,104,117,116,100,111,119,110,0,79,112,101,114,97,116,105,111,110,32,97,108,114,101,97,100,121,32,105,110,32,112,114,111,103,114,101,115,115,0,79,112,101,114,97,116,105,111,110,32,105,110,32,112,114,111,103,114,101,115,115,0,83,116,97,108,101,32,102,105,108,101,32,104,97,110,100,108,101,0,82,101,109,111,116,101,32,73,47,79,32,101,114,114,111,114,0,81,117,111,116,97,32,101,120,99,101,101,100,101,100,0,78,111,32,109,101,100,105,117,109,32,102,111,117,110,100,0,87,114,111,110,103,32,109,101,100,105,117,109,32,116,121,112,101,0,78,111,32,101,114,114,111,114,32,105,110,102,111,114,109,97,116,105,111,110,0,0],"i8",ALLOC_NONE,Runtime.GLOBAL_BASE);var tempDoublePtr=STATICTOP;STATICTOP+=16;function _atexit(i,u){__ATEXIT__.unshift({func:i,arg:u})}function ___cxa_atexit(){return _atexit.apply(null,arguments)}function _abort(){Module.abort()}function __ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj(){Module.printErr("missing function: _ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj"),abort(-1)}function __decorate(i,u,f,c){var g=arguments.length,t=g<3?u:c===null?c=Object.getOwnPropertyDescriptor(u,f):c,C;if(typeof Reflect=="object"&&typeof Reflect.decorate=="function")t=Reflect.decorate(i,u,f,c);else for(var A=i.length-1;A>=0;A--)(C=i[A])&&(t=(g<3?C(t):g>3?C(u,f,t):C(u,f))||t);return g>3&&t&&Object.defineProperty(u,f,t),t}function _defineHidden(i){return function(u,f){Object.defineProperty(u,f,{configurable:!1,enumerable:!1,value:i,writable:!0})}}var _nbind={};function __nbind_free_external(i){_nbind.externalList[i].dereference(i)}function __nbind_reference_external(i){_nbind.externalList[i].reference()}function _llvm_stackrestore(i){var u=_llvm_stacksave,f=u.LLVM_SAVEDSTACKS[i];u.LLVM_SAVEDSTACKS.splice(i,1),Runtime.stackRestore(f)}function __nbind_register_pool(i,u,f,c){_nbind.Pool.pageSize=i,_nbind.Pool.usedPtr=u/4,_nbind.Pool.rootPtr=f,_nbind.Pool.pagePtr=c/4,HEAP32[u/4]=16909060,HEAP8[u]==1&&(_nbind.bigEndian=!0),HEAP32[u/4]=0,_nbind.makeTypeKindTbl=(t={},t[1024]=_nbind.PrimitiveType,t[64]=_nbind.Int64Type,t[2048]=_nbind.BindClass,t[3072]=_nbind.BindClassPtr,t[4096]=_nbind.SharedClassPtr,t[5120]=_nbind.ArrayType,t[6144]=_nbind.ArrayType,t[7168]=_nbind.CStringType,t[9216]=_nbind.CallbackType,t[10240]=_nbind.BindType,t),_nbind.makeTypeNameTbl={Buffer:_nbind.BufferType,External:_nbind.ExternalType,Int64:_nbind.Int64Type,_nbind_new:_nbind.CreateValueType,bool:_nbind.BooleanType,"cbFunction &":_nbind.CallbackType,"const cbFunction &":_nbind.CallbackType,"const std::string &":_nbind.StringType,"std::string":_nbind.StringType},Module.toggleLightGC=_nbind.toggleLightGC,_nbind.callUpcast=Module.dynCall_ii;var g=_nbind.makeType(_nbind.constructType,{flags:2048,id:0,name:""});g.proto=Module,_nbind.BindClass.list.push(g);var t}function _emscripten_set_main_loop_timing(i,u){if(Browser.mainLoop.timingMode=i,Browser.mainLoop.timingValue=u,!Browser.mainLoop.func)return 1;if(i==0)Browser.mainLoop.scheduler=function(){var C=Math.max(0,Browser.mainLoop.tickStartTime+u-_emscripten_get_now())|0;setTimeout(Browser.mainLoop.runner,C)},Browser.mainLoop.method="timeout";else if(i==1)Browser.mainLoop.scheduler=function(){Browser.requestAnimationFrame(Browser.mainLoop.runner)},Browser.mainLoop.method="rAF";else if(i==2){if(!window.setImmediate){let t=function(C){C.source===window&&C.data===c&&(C.stopPropagation(),f.shift()())};var g=t,f=[],c="setimmediate";window.addEventListener("message",t,!0),window.setImmediate=function(A){f.push(A),ENVIRONMENT_IS_WORKER?(Module.setImmediates===void 0&&(Module.setImmediates=[]),Module.setImmediates.push(A),window.postMessage({target:c})):window.postMessage(c,"*")}}Browser.mainLoop.scheduler=function(){window.setImmediate(Browser.mainLoop.runner)},Browser.mainLoop.method="immediate"}return 0}function _emscripten_get_now(){abort()}function _emscripten_set_main_loop(i,u,f,c,g){Module.noExitRuntime=!0,assert(!Browser.mainLoop.func,"emscripten_set_main_loop: there can only be one main loop function at once: call emscripten_cancel_main_loop to cancel the previous one before setting a new one with different parameters."),Browser.mainLoop.func=i,Browser.mainLoop.arg=c;var t;typeof c!="undefined"?t=function(){Module.dynCall_vi(i,c)}:t=function(){Module.dynCall_v(i)};var C=Browser.mainLoop.currentlyRunningMainloop;if(Browser.mainLoop.runner=function(){if(!ABORT){if(Browser.mainLoop.queue.length>0){var x=Date.now(),D=Browser.mainLoop.queue.shift();if(D.func(D.arg),Browser.mainLoop.remainingBlockers){var L=Browser.mainLoop.remainingBlockers,N=L%1==0?L-1:Math.floor(L);D.counted?Browser.mainLoop.remainingBlockers=N:(N=N+.5,Browser.mainLoop.remainingBlockers=(8*L+N)/9)}if(console.log('main loop blocker "'+D.name+'" took '+(Date.now()-x)+" ms"),Browser.mainLoop.updateStatus(),C1&&Browser.mainLoop.currentFrameNumber%Browser.mainLoop.timingValue!=0){Browser.mainLoop.scheduler();return}else Browser.mainLoop.timingMode==0&&(Browser.mainLoop.tickStartTime=_emscripten_get_now());Browser.mainLoop.method==="timeout"&&Module.ctx&&(Module.printErr("Looks like you are rendering without using requestAnimationFrame for the main loop. You should use 0 for the frame rate in emscripten_set_main_loop in order to use requestAnimationFrame, as that can greatly improve your frame rates!"),Browser.mainLoop.method=""),Browser.mainLoop.runIter(t),!(C0?_emscripten_set_main_loop_timing(0,1e3/u):_emscripten_set_main_loop_timing(1,1),Browser.mainLoop.scheduler()),f)throw"SimulateInfiniteLoop"}var Browser={mainLoop:{scheduler:null,method:"",currentlyRunningMainloop:0,func:null,arg:0,timingMode:0,timingValue:0,currentFrameNumber:0,queue:[],pause:function(){Browser.mainLoop.scheduler=null,Browser.mainLoop.currentlyRunningMainloop++},resume:function(){Browser.mainLoop.currentlyRunningMainloop++;var i=Browser.mainLoop.timingMode,u=Browser.mainLoop.timingValue,f=Browser.mainLoop.func;Browser.mainLoop.func=null,_emscripten_set_main_loop(f,0,!1,Browser.mainLoop.arg,!0),_emscripten_set_main_loop_timing(i,u),Browser.mainLoop.scheduler()},updateStatus:function(){if(Module.setStatus){var i=Module.statusMessage||"Please wait...",u=Browser.mainLoop.remainingBlockers,f=Browser.mainLoop.expectedBlockers;u?u=6;){var Le=J>>Te-6&63;Te-=6,De+=Se[Le]}return Te==2?(De+=Se[(J&3)<<4],De+=me+me):Te==4&&(De+=Se[(J&15)<<2],De+=me),De}h.src="data:audio/x-"+C.substr(-3)+";base64,"+Q(t),L(h)},h.src=$,Browser.safeSetTimeout(function(){L(h)},1e4)}else return N()},Module.preloadPlugins.push(u);function f(){Browser.pointerLock=document.pointerLockElement===Module.canvas||document.mozPointerLockElement===Module.canvas||document.webkitPointerLockElement===Module.canvas||document.msPointerLockElement===Module.canvas}var c=Module.canvas;c&&(c.requestPointerLock=c.requestPointerLock||c.mozRequestPointerLock||c.webkitRequestPointerLock||c.msRequestPointerLock||function(){},c.exitPointerLock=document.exitPointerLock||document.mozExitPointerLock||document.webkitExitPointerLock||document.msExitPointerLock||function(){},c.exitPointerLock=c.exitPointerLock.bind(document),document.addEventListener("pointerlockchange",f,!1),document.addEventListener("mozpointerlockchange",f,!1),document.addEventListener("webkitpointerlockchange",f,!1),document.addEventListener("mspointerlockchange",f,!1),Module.elementPointerLock&&c.addEventListener("click",function(g){!Browser.pointerLock&&Module.canvas.requestPointerLock&&(Module.canvas.requestPointerLock(),g.preventDefault())},!1))},createContext:function(i,u,f,c){if(u&&Module.ctx&&i==Module.canvas)return Module.ctx;var g,t;if(u){var C={antialias:!1,alpha:!1};if(c)for(var A in c)C[A]=c[A];t=GL.createContext(i,C),t&&(g=GL.getContext(t).GLctx)}else g=i.getContext("2d");return g?(f&&(u||assert(typeof GLctx=="undefined","cannot set in module if GLctx is used, but we are a non-GL context that would replace it"),Module.ctx=g,u&&GL.makeContextCurrent(t),Module.useWebGL=u,Browser.moduleContextCreatedCallbacks.forEach(function(x){x()}),Browser.init()),g):null},destroyContext:function(i,u,f){},fullscreenHandlersInstalled:!1,lockPointer:void 0,resizeCanvas:void 0,requestFullscreen:function(i,u,f){Browser.lockPointer=i,Browser.resizeCanvas=u,Browser.vrDevice=f,typeof Browser.lockPointer=="undefined"&&(Browser.lockPointer=!0),typeof Browser.resizeCanvas=="undefined"&&(Browser.resizeCanvas=!1),typeof Browser.vrDevice=="undefined"&&(Browser.vrDevice=null);var c=Module.canvas;function g(){Browser.isFullscreen=!1;var C=c.parentNode;(document.fullscreenElement||document.mozFullScreenElement||document.msFullscreenElement||document.webkitFullscreenElement||document.webkitCurrentFullScreenElement)===C?(c.exitFullscreen=document.exitFullscreen||document.cancelFullScreen||document.mozCancelFullScreen||document.msExitFullscreen||document.webkitCancelFullScreen||function(){},c.exitFullscreen=c.exitFullscreen.bind(document),Browser.lockPointer&&c.requestPointerLock(),Browser.isFullscreen=!0,Browser.resizeCanvas&&Browser.setFullscreenCanvasSize()):(C.parentNode.insertBefore(c,C),C.parentNode.removeChild(C),Browser.resizeCanvas&&Browser.setWindowedCanvasSize()),Module.onFullScreen&&Module.onFullScreen(Browser.isFullscreen),Module.onFullscreen&&Module.onFullscreen(Browser.isFullscreen),Browser.updateCanvasDimensions(c)}Browser.fullscreenHandlersInstalled||(Browser.fullscreenHandlersInstalled=!0,document.addEventListener("fullscreenchange",g,!1),document.addEventListener("mozfullscreenchange",g,!1),document.addEventListener("webkitfullscreenchange",g,!1),document.addEventListener("MSFullscreenChange",g,!1));var t=document.createElement("div");c.parentNode.insertBefore(t,c),t.appendChild(c),t.requestFullscreen=t.requestFullscreen||t.mozRequestFullScreen||t.msRequestFullscreen||(t.webkitRequestFullscreen?function(){t.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT)}:null)||(t.webkitRequestFullScreen?function(){t.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT)}:null),f?t.requestFullscreen({vrDisplay:f}):t.requestFullscreen()},requestFullScreen:function(i,u,f){return Module.printErr("Browser.requestFullScreen() is deprecated. Please call Browser.requestFullscreen instead."),Browser.requestFullScreen=function(c,g,t){return Browser.requestFullscreen(c,g,t)},Browser.requestFullscreen(i,u,f)},nextRAF:0,fakeRequestAnimationFrame:function(i){var u=Date.now();if(Browser.nextRAF===0)Browser.nextRAF=u+1e3/60;else for(;u+2>=Browser.nextRAF;)Browser.nextRAF+=1e3/60;var f=Math.max(Browser.nextRAF-u,0);setTimeout(i,f)},requestAnimationFrame:function(u){typeof window=="undefined"?Browser.fakeRequestAnimationFrame(u):(window.requestAnimationFrame||(window.requestAnimationFrame=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame||Browser.fakeRequestAnimationFrame),window.requestAnimationFrame(u))},safeCallback:function(i){return function(){if(!ABORT)return i.apply(null,arguments)}},allowAsyncCallbacks:!0,queuedAsyncCallbacks:[],pauseAsyncCallbacks:function(){Browser.allowAsyncCallbacks=!1},resumeAsyncCallbacks:function(){if(Browser.allowAsyncCallbacks=!0,Browser.queuedAsyncCallbacks.length>0){var i=Browser.queuedAsyncCallbacks;Browser.queuedAsyncCallbacks=[],i.forEach(function(u){u()})}},safeRequestAnimationFrame:function(i){return Browser.requestAnimationFrame(function(){ABORT||(Browser.allowAsyncCallbacks?i():Browser.queuedAsyncCallbacks.push(i))})},safeSetTimeout:function(i,u){return Module.noExitRuntime=!0,setTimeout(function(){ABORT||(Browser.allowAsyncCallbacks?i():Browser.queuedAsyncCallbacks.push(i))},u)},safeSetInterval:function(i,u){return Module.noExitRuntime=!0,setInterval(function(){ABORT||Browser.allowAsyncCallbacks&&i()},u)},getMimetype:function(i){return{jpg:"image/jpeg",jpeg:"image/jpeg",png:"image/png",bmp:"image/bmp",ogg:"audio/ogg",wav:"audio/wav",mp3:"audio/mpeg"}[i.substr(i.lastIndexOf(".")+1)]},getUserMedia:function(i){window.getUserMedia||(window.getUserMedia=navigator.getUserMedia||navigator.mozGetUserMedia),window.getUserMedia(i)},getMovementX:function(i){return i.movementX||i.mozMovementX||i.webkitMovementX||0},getMovementY:function(i){return i.movementY||i.mozMovementY||i.webkitMovementY||0},getMouseWheelDelta:function(i){var u=0;switch(i.type){case"DOMMouseScroll":u=i.detail;break;case"mousewheel":u=i.wheelDelta;break;case"wheel":u=i.deltaY;break;default:throw"unrecognized mouse wheel event: "+i.type}return u},mouseX:0,mouseY:0,mouseMovementX:0,mouseMovementY:0,touches:{},lastTouches:{},calculateMouseEvent:function(i){if(Browser.pointerLock)i.type!="mousemove"&&"mozMovementX"in i?Browser.mouseMovementX=Browser.mouseMovementY=0:(Browser.mouseMovementX=Browser.getMovementX(i),Browser.mouseMovementY=Browser.getMovementY(i)),typeof SDL!="undefined"?(Browser.mouseX=SDL.mouseX+Browser.mouseMovementX,Browser.mouseY=SDL.mouseY+Browser.mouseMovementY):(Browser.mouseX+=Browser.mouseMovementX,Browser.mouseY+=Browser.mouseMovementY);else{var u=Module.canvas.getBoundingClientRect(),f=Module.canvas.width,c=Module.canvas.height,g=typeof window.scrollX!="undefined"?window.scrollX:window.pageXOffset,t=typeof window.scrollY!="undefined"?window.scrollY:window.pageYOffset;if(i.type==="touchstart"||i.type==="touchend"||i.type==="touchmove"){var C=i.touch;if(C===void 0)return;var A=C.pageX-(g+u.left),x=C.pageY-(t+u.top);A=A*(f/u.width),x=x*(c/u.height);var D={x:A,y:x};if(i.type==="touchstart")Browser.lastTouches[C.identifier]=D,Browser.touches[C.identifier]=D;else if(i.type==="touchend"||i.type==="touchmove"){var L=Browser.touches[C.identifier];L||(L=D),Browser.lastTouches[C.identifier]=L,Browser.touches[C.identifier]=D}return}var N=i.pageX-(g+u.left),j=i.pageY-(t+u.top);N=N*(f/u.width),j=j*(c/u.height),Browser.mouseMovementX=N-Browser.mouseX,Browser.mouseMovementY=j-Browser.mouseY,Browser.mouseX=N,Browser.mouseY=j}},asyncLoad:function(i,u,f,c){var g=c?"":getUniqueRunDependency("al "+i);Module.readAsync(i,function(t){assert(t,'Loading data file "'+i+'" failed (no arrayBuffer).'),u(new Uint8Array(t)),g&&removeRunDependency(g)},function(t){if(f)f();else throw'Loading data file "'+i+'" failed.'}),g&&addRunDependency(g)},resizeListeners:[],updateResizeListeners:function(){var i=Module.canvas;Browser.resizeListeners.forEach(function(u){u(i.width,i.height)})},setCanvasSize:function(i,u,f){var c=Module.canvas;Browser.updateCanvasDimensions(c,i,u),f||Browser.updateResizeListeners()},windowedWidth:0,windowedHeight:0,setFullscreenCanvasSize:function(){if(typeof SDL!="undefined"){var i=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];i=i|8388608,HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=i}Browser.updateResizeListeners()},setWindowedCanvasSize:function(){if(typeof SDL!="undefined"){var i=HEAPU32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2];i=i&~8388608,HEAP32[SDL.screen+Runtime.QUANTUM_SIZE*0>>2]=i}Browser.updateResizeListeners()},updateCanvasDimensions:function(i,u,f){u&&f?(i.widthNative=u,i.heightNative=f):(u=i.widthNative,f=i.heightNative);var c=u,g=f;if(Module.forcedAspectRatio&&Module.forcedAspectRatio>0&&(c/g>2];return u},getStr:function(){var i=Pointer_stringify(SYSCALLS.get());return i},get64:function(){var i=SYSCALLS.get(),u=SYSCALLS.get();return i>=0?assert(u===0):assert(u===-1),i},getZero:function(){assert(SYSCALLS.get()===0)}};function ___syscall6(i,u){SYSCALLS.varargs=u;try{var f=SYSCALLS.getStreamFromFD();return FS.close(f),0}catch(c){return(typeof FS=="undefined"||!(c instanceof FS.ErrnoError))&&abort(c),-c.errno}}function ___syscall54(i,u){SYSCALLS.varargs=u;try{return 0}catch(f){return(typeof FS=="undefined"||!(f instanceof FS.ErrnoError))&&abort(f),-f.errno}}function _typeModule(i){var u=[[0,1,"X"],[1,1,"const X"],[128,1,"X *"],[256,1,"X &"],[384,1,"X &&"],[512,1,"std::shared_ptr"],[640,1,"std::unique_ptr"],[5120,1,"std::vector"],[6144,2,"std::array"],[9216,-1,"std::function"]];function f(x,D,L,N,j,$){if(D==1){var h=N&896;(h==128||h==256||h==384)&&(x="X const")}var re;return $?re=L.replace("X",x).replace("Y",j):re=x.replace("X",L).replace("Y",j),re.replace(/([*&]) (?=[*&])/g,"$1")}function c(x,D,L,N,j){throw new Error(x+" type "+L.replace("X",D+"?")+(N?" with flag "+N:"")+" in "+j)}function g(x,D,L,N,j,$,h,re){$===void 0&&($="X"),re===void 0&&(re=1);var ce=L(x);if(ce)return ce;var Q=N(x),oe=Q.placeholderFlag,Se=u[oe];h&&Se&&($=f(h[2],h[0],$,Se[0],"?",!0));var me;oe==0&&(me="Unbound"),oe>=10&&(me="Corrupt"),re>20&&(me="Deeply nested"),me&&c(me,x,$,oe,j||"?");var De=Q.paramList[0],J=g(De,D,L,N,j,$,Se,re+1),Te,Oe={flags:Se[0],id:x,name:"",paramList:[J]},Le=[],ot="?";switch(Q.placeholderFlag){case 1:Te=J.spec;break;case 2:if((J.flags&15360)==1024&&J.spec.ptrSize==1){Oe.flags=7168;break}case 3:case 6:case 5:Te=J.spec,(J.flags&15360)!=2048;break;case 8:ot=""+Q.paramList[1],Oe.paramList.push(Q.paramList[1]);break;case 9:for(var ct=0,Ue=Q.paramList[1];ct>2]=i),i}function _llvm_stacksave(){var i=_llvm_stacksave;return i.LLVM_SAVEDSTACKS||(i.LLVM_SAVEDSTACKS=[]),i.LLVM_SAVEDSTACKS.push(Runtime.stackSave()),i.LLVM_SAVEDSTACKS.length-1}function ___syscall140(i,u){SYSCALLS.varargs=u;try{var f=SYSCALLS.getStreamFromFD(),c=SYSCALLS.get(),g=SYSCALLS.get(),t=SYSCALLS.get(),C=SYSCALLS.get(),A=g;return FS.llseek(f,A,C),HEAP32[t>>2]=f.position,f.getdents&&A===0&&C===0&&(f.getdents=null),0}catch(x){return(typeof FS=="undefined"||!(x instanceof FS.ErrnoError))&&abort(x),-x.errno}}function ___syscall146(i,u){SYSCALLS.varargs=u;try{var f=SYSCALLS.get(),c=SYSCALLS.get(),g=SYSCALLS.get(),t=0;___syscall146.buffer||(___syscall146.buffers=[null,[],[]],___syscall146.printChar=function(L,N){var j=___syscall146.buffers[L];assert(j),N===0||N===10?((L===1?Module.print:Module.printErr)(UTF8ArrayToString(j,0)),j.length=0):j.push(N)});for(var C=0;C>2],x=HEAP32[c+(C*8+4)>>2],D=0;Di.pageSize/2||u>i.pageSize-f){var c=_nbind.typeNameTbl.NBind.proto;return c.lalloc(u)}else return HEAPU32[i.usedPtr]=f+u,i.rootPtr+f},i.lreset=function(u,f){var c=HEAPU32[i.pagePtr];if(c){var g=_nbind.typeNameTbl.NBind.proto;g.lreset(u,f)}else HEAPU32[i.usedPtr]=u},i}();_nbind.Pool=Pool;function constructType(i,u){var f=i==10240?_nbind.makeTypeNameTbl[u.name]||_nbind.BindType:_nbind.makeTypeKindTbl[i],c=new f(u);return typeIdTbl[u.id]=c,_nbind.typeNameTbl[u.name]=c,c}_nbind.constructType=constructType;function getType(i){return typeIdTbl[i]}_nbind.getType=getType;function queryType(i){var u=HEAPU8[i],f=_nbind.structureList[u][1];i/=4,f<0&&(++i,f=HEAPU32[i]+1);var c=Array.prototype.slice.call(HEAPU32.subarray(i+1,i+1+f));return u==9&&(c=[c[0],c.slice(1)]),{paramList:c,placeholderFlag:u}}_nbind.queryType=queryType;function getTypes(i,u){return i.map(function(f){return typeof f=="number"?_nbind.getComplexType(f,constructType,getType,queryType,u):_nbind.typeNameTbl[f]})}_nbind.getTypes=getTypes;function readTypeIdList(i,u){return Array.prototype.slice.call(HEAPU32,i/4,i/4+u)}_nbind.readTypeIdList=readTypeIdList;function readAsciiString(i){for(var u=i;HEAPU8[u++];);return String.fromCharCode.apply("",HEAPU8.subarray(i,u-1))}_nbind.readAsciiString=readAsciiString;function readPolicyList(i){var u={};if(i)for(;;){var f=HEAPU32[i/4];if(!f)break;u[readAsciiString(f)]=!0,i+=4}return u}_nbind.readPolicyList=readPolicyList;function getDynCall(i,u){var f={float32_t:"d",float64_t:"d",int64_t:"d",uint64_t:"d",void:"v"},c=i.map(function(t){return f[t.name]||"i"}).join(""),g=Module["dynCall_"+c];if(!g)throw new Error("dynCall_"+c+" not found for "+u+"("+i.map(function(t){return t.name}).join(", ")+")");return g}_nbind.getDynCall=getDynCall;function addMethod(i,u,f,c){var g=i[u];i.hasOwnProperty(u)&&g?((g.arity||g.arity===0)&&(g=_nbind.makeOverloader(g,g.arity),i[u]=g),g.addMethod(f,c)):(f.arity=c,i[u]=f)}_nbind.addMethod=addMethod;function throwError(i){throw new Error(i)}_nbind.throwError=throwError,_nbind.bigEndian=!1,_a=_typeModule(_typeModule),_nbind.Type=_a.Type,_nbind.makeType=_a.makeType,_nbind.getComplexType=_a.getComplexType,_nbind.structureList=_a.structureList;var BindType=function(i){__extends(u,i);function u(){var f=i!==null&&i.apply(this,arguments)||this;return f.heap=HEAPU32,f.ptrSize=4,f}return u.prototype.needsWireRead=function(f){return!!this.wireRead||!!this.makeWireRead},u.prototype.needsWireWrite=function(f){return!!this.wireWrite||!!this.makeWireWrite},u}(_nbind.Type);_nbind.BindType=BindType;var PrimitiveType=function(i){__extends(u,i);function u(f){var c=i.call(this,f)||this,g=f.flags&32?{32:HEAPF32,64:HEAPF64}:f.flags&8?{8:HEAPU8,16:HEAPU16,32:HEAPU32}:{8:HEAP8,16:HEAP16,32:HEAP32};return c.heap=g[f.ptrSize*8],c.ptrSize=f.ptrSize,c}return u.prototype.needsWireWrite=function(f){return!!f&&!!f.Strict},u.prototype.makeWireWrite=function(f,c){return c&&c.Strict&&function(g){if(typeof g=="number")return g;throw new Error("Type mismatch")}},u}(BindType);_nbind.PrimitiveType=PrimitiveType;function pushCString(i,u){if(i==null){if(u&&u.Nullable)return 0;throw new Error("Type mismatch")}if(u&&u.Strict){if(typeof i!="string")throw new Error("Type mismatch")}else i=i.toString();var f=Module.lengthBytesUTF8(i)+1,c=_nbind.Pool.lalloc(f);return Module.stringToUTF8Array(i,HEAPU8,c,f),c}_nbind.pushCString=pushCString;function popCString(i){return i===0?null:Module.Pointer_stringify(i)}_nbind.popCString=popCString;var CStringType=function(i){__extends(u,i);function u(){var f=i!==null&&i.apply(this,arguments)||this;return f.wireRead=popCString,f.wireWrite=pushCString,f.readResources=[_nbind.resources.pool],f.writeResources=[_nbind.resources.pool],f}return u.prototype.makeWireWrite=function(f,c){return function(g){return pushCString(g,c)}},u}(BindType);_nbind.CStringType=CStringType;var BooleanType=function(i){__extends(u,i);function u(){var f=i!==null&&i.apply(this,arguments)||this;return f.wireRead=function(c){return!!c},f}return u.prototype.needsWireWrite=function(f){return!!f&&!!f.Strict},u.prototype.makeWireRead=function(f){return"!!("+f+")"},u.prototype.makeWireWrite=function(f,c){return c&&c.Strict&&function(g){if(typeof g=="boolean")return g;throw new Error("Type mismatch")}||f},u}(BindType);_nbind.BooleanType=BooleanType;var Wrapper=function(){function i(){}return i.prototype.persist=function(){this.__nbindState|=1},i}();_nbind.Wrapper=Wrapper;function makeBound(i,u){var f=function(c){__extends(g,c);function g(t,C,A,x){var D=c.call(this)||this;if(!(D instanceof g))return new(Function.prototype.bind.apply(g,Array.prototype.concat.apply([null],arguments)));var L=C,N=A,j=x;if(t!==_nbind.ptrMarker){var $=D.__nbindConstructor.apply(D,arguments);L=4096|512,j=HEAPU32[$/4],N=HEAPU32[$/4+1]}var h={configurable:!0,enumerable:!1,value:null,writable:!1},re={__nbindFlags:L,__nbindPtr:N};j&&(re.__nbindShared=j,_nbind.mark(D));for(var ce=0,Q=Object.keys(re);ce>=1;var f=_nbind.valueList[i];return _nbind.valueList[i]=firstFreeValue,firstFreeValue=i,f}else{if(u)return _nbind.popShared(i,u);throw new Error("Invalid value slot "+i)}}_nbind.popValue=popValue;var valueBase=18446744073709552e3;function push64(i){return typeof i=="number"?i:pushValue(i)*4096+valueBase}function pop64(i){return i=3?C=Buffer.from(t):C=new Buffer(t),C.copy(c)}else getBuffer(c).set(t)}}_nbind.commitBuffer=commitBuffer;var dirtyList=[],gcTimer=0;function sweep(){for(var i=0,u=dirtyList;i>2]=DYNAMIC_BASE,staticSealed=!0;function invoke_viiiii(i,u,f,c,g,t){try{Module.dynCall_viiiii(i,u,f,c,g,t)}catch(C){if(typeof C!="number"&&C!=="longjmp")throw C;Module.setThrew(1,0)}}function invoke_vif(i,u,f){try{Module.dynCall_vif(i,u,f)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_vid(i,u,f){try{Module.dynCall_vid(i,u,f)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_fiff(i,u,f,c){try{return Module.dynCall_fiff(i,u,f,c)}catch(g){if(typeof g!="number"&&g!=="longjmp")throw g;Module.setThrew(1,0)}}function invoke_vi(i,u){try{Module.dynCall_vi(i,u)}catch(f){if(typeof f!="number"&&f!=="longjmp")throw f;Module.setThrew(1,0)}}function invoke_vii(i,u,f){try{Module.dynCall_vii(i,u,f)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_ii(i,u){try{return Module.dynCall_ii(i,u)}catch(f){if(typeof f!="number"&&f!=="longjmp")throw f;Module.setThrew(1,0)}}function invoke_viddi(i,u,f,c,g){try{Module.dynCall_viddi(i,u,f,c,g)}catch(t){if(typeof t!="number"&&t!=="longjmp")throw t;Module.setThrew(1,0)}}function invoke_vidd(i,u,f,c){try{Module.dynCall_vidd(i,u,f,c)}catch(g){if(typeof g!="number"&&g!=="longjmp")throw g;Module.setThrew(1,0)}}function invoke_iiii(i,u,f,c){try{return Module.dynCall_iiii(i,u,f,c)}catch(g){if(typeof g!="number"&&g!=="longjmp")throw g;Module.setThrew(1,0)}}function invoke_diii(i,u,f,c){try{return Module.dynCall_diii(i,u,f,c)}catch(g){if(typeof g!="number"&&g!=="longjmp")throw g;Module.setThrew(1,0)}}function invoke_di(i,u){try{return Module.dynCall_di(i,u)}catch(f){if(typeof f!="number"&&f!=="longjmp")throw f;Module.setThrew(1,0)}}function invoke_iid(i,u,f){try{return Module.dynCall_iid(i,u,f)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_iii(i,u,f){try{return Module.dynCall_iii(i,u,f)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_viiddi(i,u,f,c,g,t){try{Module.dynCall_viiddi(i,u,f,c,g,t)}catch(C){if(typeof C!="number"&&C!=="longjmp")throw C;Module.setThrew(1,0)}}function invoke_viiiiii(i,u,f,c,g,t,C){try{Module.dynCall_viiiiii(i,u,f,c,g,t,C)}catch(A){if(typeof A!="number"&&A!=="longjmp")throw A;Module.setThrew(1,0)}}function invoke_dii(i,u,f){try{return Module.dynCall_dii(i,u,f)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_i(i){try{return Module.dynCall_i(i)}catch(u){if(typeof u!="number"&&u!=="longjmp")throw u;Module.setThrew(1,0)}}function invoke_iiiiii(i,u,f,c,g,t){try{return Module.dynCall_iiiiii(i,u,f,c,g,t)}catch(C){if(typeof C!="number"&&C!=="longjmp")throw C;Module.setThrew(1,0)}}function invoke_viiid(i,u,f,c,g){try{Module.dynCall_viiid(i,u,f,c,g)}catch(t){if(typeof t!="number"&&t!=="longjmp")throw t;Module.setThrew(1,0)}}function invoke_viififi(i,u,f,c,g,t,C){try{Module.dynCall_viififi(i,u,f,c,g,t,C)}catch(A){if(typeof A!="number"&&A!=="longjmp")throw A;Module.setThrew(1,0)}}function invoke_viii(i,u,f,c){try{Module.dynCall_viii(i,u,f,c)}catch(g){if(typeof g!="number"&&g!=="longjmp")throw g;Module.setThrew(1,0)}}function invoke_v(i){try{Module.dynCall_v(i)}catch(u){if(typeof u!="number"&&u!=="longjmp")throw u;Module.setThrew(1,0)}}function invoke_viid(i,u,f,c){try{Module.dynCall_viid(i,u,f,c)}catch(g){if(typeof g!="number"&&g!=="longjmp")throw g;Module.setThrew(1,0)}}function invoke_idd(i,u,f){try{return Module.dynCall_idd(i,u,f)}catch(c){if(typeof c!="number"&&c!=="longjmp")throw c;Module.setThrew(1,0)}}function invoke_viiii(i,u,f,c,g){try{Module.dynCall_viiii(i,u,f,c,g)}catch(t){if(typeof t!="number"&&t!=="longjmp")throw t;Module.setThrew(1,0)}}Module.asmGlobalArg={Math,Int8Array,Int16Array,Int32Array,Uint8Array,Uint16Array,Uint32Array,Float32Array,Float64Array,NaN:NaN,Infinity:Infinity},Module.asmLibraryArg={abort,assert,enlargeMemory,getTotalMemory,abortOnCannotGrowMemory,invoke_viiiii,invoke_vif,invoke_vid,invoke_fiff,invoke_vi,invoke_vii,invoke_ii,invoke_viddi,invoke_vidd,invoke_iiii,invoke_diii,invoke_di,invoke_iid,invoke_iii,invoke_viiddi,invoke_viiiiii,invoke_dii,invoke_i,invoke_iiiiii,invoke_viiid,invoke_viififi,invoke_viii,invoke_v,invoke_viid,invoke_idd,invoke_viiii,_emscripten_asm_const_iiiii,_emscripten_asm_const_iiidddddd,_emscripten_asm_const_iiiid,__nbind_reference_external,_emscripten_asm_const_iiiiiiii,_removeAccessorPrefix,_typeModule,__nbind_register_pool,__decorate,_llvm_stackrestore,___cxa_atexit,__extends,__nbind_get_value_object,__ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj,_emscripten_set_main_loop_timing,__nbind_register_primitive,__nbind_register_type,_emscripten_memcpy_big,__nbind_register_function,___setErrNo,__nbind_register_class,__nbind_finish,_abort,_nbind_value,_llvm_stacksave,___syscall54,_defineHidden,_emscripten_set_main_loop,_emscripten_get_now,__nbind_register_callback_signature,_emscripten_asm_const_iiiiii,__nbind_free_external,_emscripten_asm_const_iiii,_emscripten_asm_const_iiididi,___syscall6,_atexit,___syscall140,___syscall146,DYNAMICTOP_PTR,tempDoublePtr,ABORT,STACKTOP,STACK_MAX,cttz_i8,___dso_handle};var asm=function(i,u,f){var c=new i.Int8Array(f),g=new i.Int16Array(f),t=new i.Int32Array(f),C=new i.Uint8Array(f),A=new i.Uint16Array(f),x=new i.Uint32Array(f),D=new i.Float32Array(f),L=new i.Float64Array(f),N=u.DYNAMICTOP_PTR|0,j=u.tempDoublePtr|0,$=u.ABORT|0,h=u.STACKTOP|0,re=u.STACK_MAX|0,ce=u.cttz_i8|0,Q=u.___dso_handle|0,oe=0,Se=0,me=0,De=0,J=i.NaN,Te=i.Infinity,Oe=0,Le=0,ot=0,ct=0,Ue=0,be=0,At=i.Math.floor,Ot=i.Math.abs,Nt=i.Math.sqrt,Je=i.Math.pow,V=i.Math.cos,ne=i.Math.sin,ge=i.Math.tan,Z=i.Math.acos,Ae=i.Math.asin,at=i.Math.atan,it=i.Math.atan2,Ft=i.Math.exp,jt=i.Math.log,hn=i.Math.ceil,Un=i.Math.imul,Jt=i.Math.min,Yt=i.Math.max,cr=i.Math.clz32,w=i.Math.fround,pt=u.abort,Mn=u.assert,Bn=u.enlargeMemory,Xn=u.getTotalMemory,vr=u.abortOnCannotGrowMemory,gr=u.invoke_viiiii,r0=u.invoke_vif,Ci=u.invoke_vid,yo=u.invoke_fiff,Ds=u.invoke_vi,Mu=u.invoke_vii,Gf=u.invoke_ii,iu=u.invoke_viddi,ou=u.invoke_vidd,ol=u.invoke_iiii,ul=u.invoke_diii,Es=u.invoke_di,Uo=u.invoke_iid,sl=u.invoke_iii,Ss=u.invoke_viiddi,Cs=u.invoke_viiiiii,Ti=u.invoke_dii,Fu=u.invoke_i,ll=u.invoke_iiiiii,fl=u.invoke_viiid,cl=u.invoke_viififi,al=u.invoke_viii,Ui=u.invoke_v,Mr=u.invoke_viid,Ac=u.invoke_idd,of=u.invoke_viiii,Ts=u._emscripten_asm_const_iiiii,xs=u._emscripten_asm_const_iiidddddd,dl=u._emscripten_asm_const_iiiid,qi=u.__nbind_reference_external,qo=u._emscripten_asm_const_iiiiiiii,kr=u._removeAccessorPrefix,Fr=u._typeModule,si=u.__nbind_register_pool,H0=u.__decorate,b0=u._llvm_stackrestore,Bt=u.___cxa_atexit,Lu=u.__extends,c0=u.__nbind_get_value_object,Ru=u.__ZN8facebook4yoga14YGNodeToStringEPNSt3__212basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEEP6YGNode14YGPrintOptionsj,ks=u._emscripten_set_main_loop_timing,As=u.__nbind_register_primitive,uu=u.__nbind_register_type,wo=u._emscripten_memcpy_big,zo=u.__nbind_register_function,Os=u.___setErrNo,Is=u.__nbind_register_class,uf=u.__nbind_finish,_n=u._abort,Nu=u._nbind_value,Wo=u._llvm_stacksave,su=u.___syscall54,Ps=u._defineHidden,pl=u._emscripten_set_main_loop,Vf=u._emscripten_get_now,hl=u.__nbind_register_callback_signature,Bu=u._emscripten_asm_const_iiiiii,ju=u.__nbind_free_external,sf=u._emscripten_asm_const_iiii,ro=u._emscripten_asm_const_iiididi,Ms=u.___syscall6,ml=u._atexit,Uu=u.___syscall140,G0=u.___syscall146,Fs=w(0);let tt=w(0);function zi(e){e=e|0;var n=0;return n=h,h=h+e|0,h=h+15&-16,n|0}function lu(){return h|0}function Ho(e){e=e|0,h=e}function O0(e,n){e=e|0,n=n|0,h=e,re=n}function vl(e,n){e=e|0,n=n|0,oe||(oe=e,Se=n)}function gl(e){e=e|0,be=e}function fu(){return be|0}function _l(){var e=0,n=0;vn(8104,8,400)|0,vn(8504,408,540)|0,e=9044,n=e+44|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));c[9088]=0,c[9089]=1,t[2273]=0,t[2274]=948,t[2275]=948,Bt(17,8104,Q|0)|0}function Sn(e){e=e|0,lf(e+948|0)}function gt(e){return e=w(e),((Ar(e)|0)&2147483647)>>>0>2139095040|0}function en(e,n,r){e=e|0,n=n|0,r=r|0;e:do if(t[e+(n<<3)+4>>2]|0)e=e+(n<<3)|0;else{if((n|2|0)==3?t[e+60>>2]|0:0){e=e+56|0;break}switch(n|0){case 0:case 2:case 4:case 5:{if(t[e+52>>2]|0){e=e+48|0;break e}break}default:}if(t[e+68>>2]|0){e=e+64|0;break}else{e=(n|1|0)==5?948:r;break}}while(0);return e|0}function I0(e){e=e|0;var n=0;return n=uh(1e3)|0,li(e,(n|0)!=0,2456),t[2276]=(t[2276]|0)+1,vn(n|0,8104,1e3)|0,c[e+2>>0]|0&&(t[n+4>>2]=2,t[n+12>>2]=4),t[n+976>>2]=e,n|0}function li(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;s=h,h=h+16|0,o=s,n||(t[o>>2]=r,zs(e,5,3197,o)),h=s}function qu(){return I0(956)|0}function Wi(e){e=e|0;var n=0;return n=Tt(1e3)|0,zu(n,e),li(t[e+976>>2]|0,1,2456),t[2276]=(t[2276]|0)+1,t[n+944>>2]=0,n|0}function zu(e,n){e=e|0,n=n|0;var r=0;vn(e|0,n|0,948)|0,af(e+948|0,n+948|0),r=e+960|0,e=n+960|0,n=r+40|0;do t[r>>2]=t[e>>2],r=r+4|0,e=e+4|0;while((r|0)<(n|0))}function Wu(e){e=e|0;var n=0,r=0,o=0,s=0;if(n=e+944|0,r=t[n>>2]|0,r|0&&(Ls(r+948|0,e)|0,t[n>>2]=0),r=fi(e)|0,r|0){n=0;do t[(e0(e,n)|0)+944>>2]=0,n=n+1|0;while((n|0)!=(r|0))}r=e+948|0,o=t[r>>2]|0,s=e+952|0,n=t[s>>2]|0,(n|0)!=(o|0)&&(t[s>>2]=n+(~((n+-4-o|0)>>>2)<<2)),io(r),sh(e),t[2276]=(t[2276]|0)+-1}function Ls(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0;o=t[e>>2]|0,_=e+4|0,r=t[_>>2]|0,l=r;e:do if((o|0)==(r|0))s=o,d=4;else for(e=o;;){if((t[e>>2]|0)==(n|0)){s=e,d=4;break e}if(e=e+4|0,(e|0)==(r|0)){e=0;break}}while(0);return(d|0)==4&&((s|0)!=(r|0)?(o=s+4|0,e=l-o|0,n=e>>2,n&&(Y1(s|0,o|0,e|0)|0,r=t[_>>2]|0),e=s+(n<<2)|0,(r|0)==(e|0)||(t[_>>2]=r+(~((r+-4-e|0)>>>2)<<2)),e=1):e=0),e|0}function fi(e){return e=e|0,(t[e+952>>2]|0)-(t[e+948>>2]|0)>>2|0}function e0(e,n){e=e|0,n=n|0;var r=0;return r=t[e+948>>2]|0,(t[e+952>>2]|0)-r>>2>>>0>n>>>0?e=t[r+(n<<2)>>2]|0:e=0,e|0}function io(e){e=e|0;var n=0,r=0,o=0,s=0;o=h,h=h+32|0,n=o,s=t[e>>2]|0,r=(t[e+4>>2]|0)-s|0,((t[e+8>>2]|0)-s|0)>>>0>r>>>0&&(s=r>>2,z(n,s,s,e+8|0),dr(e,n),Or(n)),h=o}function D0(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0;k=fi(e)|0;do if(k|0){if((t[(e0(e,0)|0)+944>>2]|0)==(e|0)){if(!(Ls(e+948|0,n)|0))break;vn(n+400|0,8504,540)|0,t[n+944>>2]=0,ln(e);break}d=t[(t[e+976>>2]|0)+12>>2]|0,_=e+948|0,y=(d|0)==0,r=0,l=0;do o=t[(t[_>>2]|0)+(l<<2)>>2]|0,(o|0)==(n|0)?ln(e):(s=Wi(o)|0,t[(t[_>>2]|0)+(r<<2)>>2]=s,t[s+944>>2]=e,y||Q4[d&15](o,s,e,r),r=r+1|0),l=l+1|0;while((l|0)!=(k|0));if(r>>>0>>0){y=e+948|0,_=e+952|0,d=r,r=t[_>>2]|0;do l=(t[y>>2]|0)+(d<<2)|0,o=l+4|0,s=r-o|0,n=s>>2,n&&(Y1(l|0,o|0,s|0)|0,r=t[_>>2]|0),s=r,o=l+(n<<2)|0,(s|0)!=(o|0)&&(r=s+(~((s+-4-o|0)>>>2)<<2)|0,t[_>>2]=r),d=d+1|0;while((d|0)!=(k|0))}}while(0)}function Do(e){e=e|0;var n=0,r=0,o=0,s=0;i0(e,(fi(e)|0)==0,2491),i0(e,(t[e+944>>2]|0)==0,2545),n=e+948|0,r=t[n>>2]|0,o=e+952|0,s=t[o>>2]|0,(s|0)!=(r|0)&&(t[o>>2]=s+(~((s+-4-r|0)>>>2)<<2)),io(n),n=e+976|0,r=t[n>>2]|0,vn(e|0,8104,1e3)|0,c[r+2>>0]|0&&(t[e+4>>2]=2,t[e+12>>2]=4),t[n>>2]=r}function i0(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;s=h,h=h+16|0,o=s,n||(t[o>>2]=r,wn(e,5,3197,o)),h=s}function Rs(){return t[2276]|0}function a0(){var e=0;return e=uh(20)|0,Hu((e|0)!=0,2592),t[2277]=(t[2277]|0)+1,t[e>>2]=t[239],t[e+4>>2]=t[240],t[e+8>>2]=t[241],t[e+12>>2]=t[242],t[e+16>>2]=t[243],e|0}function Hu(e,n){e=e|0,n=n|0;var r=0,o=0;o=h,h=h+16|0,r=o,e||(t[r>>2]=n,wn(0,5,3197,r)),h=o}function V0(e){e=e|0,sh(e),t[2277]=(t[2277]|0)+-1}function bu(e,n){e=e|0,n=n|0;var r=0;n?(i0(e,(fi(e)|0)==0,2629),r=1):(r=0,n=0),t[e+964>>2]=n,t[e+988>>2]=r}function Ns(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,l=o+8|0,s=o+4|0,d=o,t[s>>2]=n,i0(e,(t[n+944>>2]|0)==0,2709),i0(e,(t[e+964>>2]|0)==0,2763),bo(e),n=e+948|0,t[d>>2]=(t[n>>2]|0)+(r<<2),t[l>>2]=t[d>>2],P0(n,l,s)|0,t[(t[s>>2]|0)+944>>2]=e,ln(e),h=o}function bo(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0;if(r=fi(e)|0,r|0?(t[(e0(e,0)|0)+944>>2]|0)!=(e|0):0){o=t[(t[e+976>>2]|0)+12>>2]|0,s=e+948|0,l=(o|0)==0,n=0;do d=t[(t[s>>2]|0)+(n<<2)>>2]|0,_=Wi(d)|0,t[(t[s>>2]|0)+(n<<2)>>2]=_,t[_+944>>2]=e,l||Q4[o&15](d,_,e,n),n=n+1|0;while((n|0)!=(r|0))}}function P0(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0,Pe=0,ke=0;Pe=h,h=h+64|0,P=Pe+52|0,_=Pe+48|0,q=Pe+28|0,we=Pe+24|0,le=Pe+20|0,ie=Pe,o=t[e>>2]|0,l=o,n=o+((t[n>>2]|0)-l>>2<<2)|0,o=e+4|0,s=t[o>>2]|0,d=e+8|0;do if(s>>>0<(t[d>>2]|0)>>>0){if((n|0)==(s|0)){t[n>>2]=t[r>>2],t[o>>2]=(t[o>>2]|0)+4;break}Qn(e,n,s,n+4|0),n>>>0<=r>>>0&&(r=(t[o>>2]|0)>>>0>r>>>0?r+4|0:r),t[n>>2]=t[r>>2]}else{o=(s-l>>2)+1|0,s=Q0(e)|0,s>>>0>>0&&$n(e),T=t[e>>2]|0,k=(t[d>>2]|0)-T|0,l=k>>1,z(ie,k>>2>>>0>>1>>>0?l>>>0>>0?o:l:s,n-T>>2,e+8|0),T=ie+8|0,o=t[T>>2]|0,l=ie+12|0,k=t[l>>2]|0,d=k,y=o;do if((o|0)==(k|0)){if(k=ie+4|0,o=t[k>>2]|0,ke=t[ie>>2]|0,s=ke,o>>>0<=ke>>>0){o=d-s>>1,o=(o|0)==0?1:o,z(q,o,o>>>2,t[ie+16>>2]|0),t[we>>2]=t[k>>2],t[le>>2]=t[T>>2],t[_>>2]=t[we>>2],t[P>>2]=t[le>>2],s0(q,_,P),o=t[ie>>2]|0,t[ie>>2]=t[q>>2],t[q>>2]=o,o=q+4|0,ke=t[k>>2]|0,t[k>>2]=t[o>>2],t[o>>2]=ke,o=q+8|0,ke=t[T>>2]|0,t[T>>2]=t[o>>2],t[o>>2]=ke,o=q+12|0,ke=t[l>>2]|0,t[l>>2]=t[o>>2],t[o>>2]=ke,Or(q),o=t[T>>2]|0;break}l=o,d=((l-s>>2)+1|0)/-2|0,_=o+(d<<2)|0,s=y-l|0,l=s>>2,l&&(Y1(_|0,o|0,s|0)|0,o=t[k>>2]|0),ke=_+(l<<2)|0,t[T>>2]=ke,t[k>>2]=o+(d<<2),o=ke}while(0);t[o>>2]=t[r>>2],t[T>>2]=(t[T>>2]|0)+4,n=nn(e,ie,n)|0,Or(ie)}while(0);return h=Pe,n|0}function ln(e){e=e|0;var n=0;do{if(n=e+984|0,c[n>>0]|0)break;c[n>>0]=1,D[e+504>>2]=w(J),e=t[e+944>>2]|0}while((e|0)!=0)}function lf(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-4-o|0)>>>2)<<2)),Ve(r))}function nr(e){return e=e|0,t[e+944>>2]|0}function rr(e){e=e|0,i0(e,(t[e+964>>2]|0)!=0,2832),ln(e)}function Go(e){return e=e|0,(c[e+984>>0]|0)!=0|0}function Gu(e,n){e=e|0,n=n|0,fL(e,n,400)|0&&(vn(e|0,n|0,400)|0,ln(e))}function yl(e){e=e|0;var n=tt;return n=w(D[e+44>>2]),e=gt(n)|0,w(e?w(0):n)}function cu(e){e=e|0;var n=tt;return n=w(D[e+48>>2]),gt(n)|0&&(n=c[(t[e+976>>2]|0)+2>>0]|0?w(1):w(0)),w(n)}function Bs(e,n){e=e|0,n=n|0,t[e+980>>2]=n}function Vu(e){return e=e|0,t[e+980>>2]|0}function M0(e,n){e=e|0,n=n|0;var r=0;r=e+4|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function au(e){return e=e|0,t[e+4>>2]|0}function Lr(e,n){e=e|0,n=n|0;var r=0;r=e+8|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function F(e){return e=e|0,t[e+8>>2]|0}function R(e,n){e=e|0,n=n|0;var r=0;r=e+12|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function U(e){return e=e|0,t[e+12>>2]|0}function H(e,n){e=e|0,n=n|0;var r=0;r=e+16|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function fe(e){return e=e|0,t[e+16>>2]|0}function ue(e,n){e=e|0,n=n|0;var r=0;r=e+20|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function de(e){return e=e|0,t[e+20>>2]|0}function W(e,n){e=e|0,n=n|0;var r=0;r=e+24|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function ve(e){return e=e|0,t[e+24>>2]|0}function Fe(e,n){e=e|0,n=n|0;var r=0;r=e+28|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function Ge(e){return e=e|0,t[e+28>>2]|0}function K(e,n){e=e|0,n=n|0;var r=0;r=e+32|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function xe(e){return e=e|0,t[e+32>>2]|0}function je(e,n){e=e|0,n=n|0;var r=0;r=e+36|0,(t[r>>2]|0)!=(n|0)&&(t[r>>2]=n,ln(e))}function Xe(e){return e=e|0,t[e+36>>2]|0}function rt(e,n){e=e|0,n=w(n);var r=0;r=e+40|0,w(D[r>>2])!=n&&(D[r>>2]=n,ln(e))}function st(e,n){e=e|0,n=w(n);var r=0;r=e+44|0,w(D[r>>2])!=n&&(D[r>>2]=n,ln(e))}function xt(e,n){e=e|0,n=w(n);var r=0;r=e+48|0,w(D[r>>2])!=n&&(D[r>>2]=n,ln(e))}function wt(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=(l^1)&1,o=e+52|0,s=e+56|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function lt(e,n){e=e|0,n=w(n);var r=0,o=0;o=e+52|0,r=e+56|0,(w(D[o>>2])==n?(t[r>>2]|0)==2:0)||(D[o>>2]=n,o=gt(n)|0,t[r>>2]=o?3:2,ln(e))}function Rt(e,n){e=e|0,n=n|0;var r=0,o=0;o=n+52|0,r=t[o+4>>2]|0,n=e,t[n>>2]=t[o>>2],t[n+4>>2]=r}function yn(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0,l=0;l=gt(r)|0,o=(l^1)&1,s=e+132+(n<<3)|0,n=e+132+(n<<3)+4|0,(l|w(D[s>>2])==r?(t[n>>2]|0)==(o|0):0)||(D[s>>2]=r,t[n>>2]=o,ln(e))}function sn(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0,l=0;l=gt(r)|0,o=l?0:2,s=e+132+(n<<3)|0,n=e+132+(n<<3)+4|0,(l|w(D[s>>2])==r?(t[n>>2]|0)==(o|0):0)||(D[s>>2]=r,t[n>>2]=o,ln(e))}function ar(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=n+132+(r<<3)|0,n=t[o+4>>2]|0,r=e,t[r>>2]=t[o>>2],t[r+4>>2]=n}function rn(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0,l=0;l=gt(r)|0,o=(l^1)&1,s=e+60+(n<<3)|0,n=e+60+(n<<3)+4|0,(l|w(D[s>>2])==r?(t[n>>2]|0)==(o|0):0)||(D[s>>2]=r,t[n>>2]=o,ln(e))}function Hn(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0,l=0;l=gt(r)|0,o=l?0:2,s=e+60+(n<<3)|0,n=e+60+(n<<3)+4|0,(l|w(D[s>>2])==r?(t[n>>2]|0)==(o|0):0)||(D[s>>2]=r,t[n>>2]=o,ln(e))}function d0(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=n+60+(r<<3)|0,n=t[o+4>>2]|0,r=e,t[r>>2]=t[o>>2],t[r+4>>2]=n}function Cr(e,n){e=e|0,n=n|0;var r=0;r=e+60+(n<<3)+4|0,(t[r>>2]|0)!=3&&(D[e+60+(n<<3)>>2]=w(J),t[r>>2]=3,ln(e))}function He(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0,l=0;l=gt(r)|0,o=(l^1)&1,s=e+204+(n<<3)|0,n=e+204+(n<<3)+4|0,(l|w(D[s>>2])==r?(t[n>>2]|0)==(o|0):0)||(D[s>>2]=r,t[n>>2]=o,ln(e))}function Qe(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0,l=0;l=gt(r)|0,o=l?0:2,s=e+204+(n<<3)|0,n=e+204+(n<<3)+4|0,(l|w(D[s>>2])==r?(t[n>>2]|0)==(o|0):0)||(D[s>>2]=r,t[n>>2]=o,ln(e))}function Ne(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=n+204+(r<<3)|0,n=t[o+4>>2]|0,r=e,t[r>>2]=t[o>>2],t[r+4>>2]=n}function ft(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0,l=0;l=gt(r)|0,o=(l^1)&1,s=e+276+(n<<3)|0,n=e+276+(n<<3)+4|0,(l|w(D[s>>2])==r?(t[n>>2]|0)==(o|0):0)||(D[s>>2]=r,t[n>>2]=o,ln(e))}function St(e,n){return e=e|0,n=n|0,w(D[e+276+(n<<3)>>2])}function Qt(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=(l^1)&1,o=e+348|0,s=e+352|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function Cn(e,n){e=e|0,n=w(n);var r=0,o=0;o=e+348|0,r=e+352|0,(w(D[o>>2])==n?(t[r>>2]|0)==2:0)||(D[o>>2]=n,o=gt(n)|0,t[r>>2]=o?3:2,ln(e))}function bn(e){e=e|0;var n=0;n=e+352|0,(t[n>>2]|0)!=3&&(D[e+348>>2]=w(J),t[n>>2]=3,ln(e))}function p0(e,n){e=e|0,n=n|0;var r=0,o=0;o=n+348|0,r=t[o+4>>2]|0,n=e,t[n>>2]=t[o>>2],t[n+4>>2]=r}function h0(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=(l^1)&1,o=e+356|0,s=e+360|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function ci(e,n){e=e|0,n=w(n);var r=0,o=0;o=e+356|0,r=e+360|0,(w(D[o>>2])==n?(t[r>>2]|0)==2:0)||(D[o>>2]=n,o=gt(n)|0,t[r>>2]=o?3:2,ln(e))}function xi(e){e=e|0;var n=0;n=e+360|0,(t[n>>2]|0)!=3&&(D[e+356>>2]=w(J),t[n>>2]=3,ln(e))}function E0(e,n){e=e|0,n=n|0;var r=0,o=0;o=n+356|0,r=t[o+4>>2]|0,n=e,t[n>>2]=t[o>>2],t[n+4>>2]=r}function qr(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=(l^1)&1,o=e+364|0,s=e+368|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function Eo(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=l?0:2,o=e+364|0,s=e+368|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function So(e,n){e=e|0,n=n|0;var r=0,o=0;o=n+364|0,r=t[o+4>>2]|0,n=e,t[n>>2]=t[o>>2],t[n+4>>2]=r}function wl(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=(l^1)&1,o=e+372|0,s=e+376|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function js(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=l?0:2,o=e+372|0,s=e+376|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function Dl(e,n){e=e|0,n=n|0;var r=0,o=0;o=n+372|0,r=t[o+4>>2]|0,n=e,t[n>>2]=t[o>>2],t[n+4>>2]=r}function du(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=(l^1)&1,o=e+380|0,s=e+384|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function Yu(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=l?0:2,o=e+380|0,s=e+384|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function Us(e,n){e=e|0,n=n|0;var r=0,o=0;o=n+380|0,r=t[o+4>>2]|0,n=e,t[n>>2]=t[o>>2],t[n+4>>2]=r}function oo(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=(l^1)&1,o=e+388|0,s=e+392|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function Hi(e,n){e=e|0,n=w(n);var r=0,o=0,s=0,l=0;l=gt(n)|0,r=l?0:2,o=e+388|0,s=e+392|0,(l|w(D[o>>2])==n?(t[s>>2]|0)==(r|0):0)||(D[o>>2]=n,t[s>>2]=r,ln(e))}function qs(e,n){e=e|0,n=n|0;var r=0,o=0;o=n+388|0,r=t[o+4>>2]|0,n=e,t[n>>2]=t[o>>2],t[n+4>>2]=r}function F0(e,n){e=e|0,n=w(n);var r=0;r=e+396|0,w(D[r>>2])!=n&&(D[r>>2]=n,ln(e))}function Gr(e){return e=e|0,w(D[e+396>>2])}function ir(e){return e=e|0,w(D[e+400>>2])}function L0(e){return e=e|0,w(D[e+404>>2])}function Y0(e){return e=e|0,w(D[e+408>>2])}function Co(e){return e=e|0,w(D[e+412>>2])}function $u(e){return e=e|0,w(D[e+416>>2])}function Vo(e){return e=e|0,w(D[e+420>>2])}function Rr(e,n){switch(e=e|0,n=n|0,i0(e,(n|0)<6,2918),n|0){case 0:{n=(t[e+496>>2]|0)==2?5:4;break}case 2:{n=(t[e+496>>2]|0)==2?4:5;break}default:}return w(D[e+424+(n<<2)>>2])}function Jn(e,n){switch(e=e|0,n=n|0,i0(e,(n|0)<6,2918),n|0){case 0:{n=(t[e+496>>2]|0)==2?5:4;break}case 2:{n=(t[e+496>>2]|0)==2?4:5;break}default:}return w(D[e+448+(n<<2)>>2])}function ai(e,n){switch(e=e|0,n=n|0,i0(e,(n|0)<6,2918),n|0){case 0:{n=(t[e+496>>2]|0)==2?5:4;break}case 2:{n=(t[e+496>>2]|0)==2?4:5;break}default:}return w(D[e+472+(n<<2)>>2])}function o0(e,n){e=e|0,n=n|0;var r=0,o=tt;return r=t[e+4>>2]|0,(r|0)==(t[n+4>>2]|0)?r?(o=w(D[e>>2]),e=w(Ot(w(o-w(D[n>>2]))))>2]=0,t[o+4>>2]=0,t[o+8>>2]=0,Ru(o|0,e|0,n|0,0),wn(e,3,(c[o+11>>0]|0)<0?t[o>>2]|0:o,r),ML(o),h=r}function $0(e,n,r,o){e=w(e),n=w(n),r=r|0,o=o|0;var s=tt;e=w(e*n),s=w(V4(e,w(1)));do if(Vr(s,w(0))|0)e=w(e-s);else{if(e=w(e-s),Vr(s,w(1))|0){e=w(e+w(1));break}if(r){e=w(e+w(1));break}o||(s>w(.5)?s=w(1):(o=Vr(s,w(.5))|0,s=w(o?1:0)),e=w(e+s))}while(0);return w(e/n)}function K0(e,n,r,o,s,l,d,_,y,k,T,P,q){e=e|0,n=w(n),r=r|0,o=w(o),s=s|0,l=w(l),d=d|0,_=w(_),y=w(y),k=w(k),T=w(T),P=w(P),q=q|0;var we=0,le=tt,ie=tt,Pe=tt,ke=tt,qe=tt,pe=tt;return y>2]),le!=w(0)):0)?(Pe=w($0(n,le,0,0)),ke=w($0(o,le,0,0)),ie=w($0(l,le,0,0)),le=w($0(_,le,0,0))):(ie=l,Pe=n,le=_,ke=o),(s|0)==(e|0)?we=Vr(ie,Pe)|0:we=0,(d|0)==(r|0)?q=Vr(le,ke)|0:q=0,((we?0:(qe=w(n-T),!(ae(e,qe,y)|0)))?!(Be(e,qe,s,y)|0):0)?we=Ie(e,qe,s,l,y)|0:we=1,((q?0:(pe=w(o-P),!(ae(r,pe,k)|0)))?!(Be(r,pe,d,k)|0):0)?q=Ie(r,pe,d,_,k)|0:q=1,q=we&q),q|0}function ae(e,n,r){return e=e|0,n=w(n),r=w(r),(e|0)==1?e=Vr(n,r)|0:e=0,e|0}function Be(e,n,r,o){return e=e|0,n=w(n),r=r|0,o=w(o),(e|0)==2&(r|0)==0?n>=o?e=1:e=Vr(n,o)|0:e=0,e|0}function Ie(e,n,r,o,s){return e=e|0,n=w(n),r=r|0,o=w(o),s=w(s),(e|0)==2&(r|0)==2&o>n?s<=n?e=1:e=Vr(n,s)|0:e=0,e|0}function ht(e,n,r,o,s,l,d,_,y,k,T){e=e|0,n=w(n),r=w(r),o=o|0,s=s|0,l=l|0,d=w(d),_=w(_),y=y|0,k=k|0,T=T|0;var P=0,q=0,we=0,le=0,ie=tt,Pe=tt,ke=0,qe=0,pe=0,_e=0,vt=0,Ln=0,Ht=0,It=0,gn=0,Pn=0,zt=0,Dr=tt,Ki=tt,Xi=tt,Ji=0,Ro=0;zt=h,h=h+160|0,It=zt+152|0,Ht=zt+120|0,Ln=zt+104|0,pe=zt+72|0,le=zt+56|0,vt=zt+8|0,qe=zt,_e=(t[2279]|0)+1|0,t[2279]=_e,gn=e+984|0,((c[gn>>0]|0)!=0?(t[e+512>>2]|0)!=(t[2278]|0):0)?ke=4:(t[e+516>>2]|0)==(o|0)?Pn=0:ke=4,(ke|0)==4&&(t[e+520>>2]=0,t[e+924>>2]=-1,t[e+928>>2]=-1,D[e+932>>2]=w(-1),D[e+936>>2]=w(-1),Pn=1);e:do if(t[e+964>>2]|0)if(ie=w(mt(e,2,d)),Pe=w(mt(e,0,d)),P=e+916|0,Xi=w(D[P>>2]),Ki=w(D[e+920>>2]),Dr=w(D[e+932>>2]),K0(s,n,l,r,t[e+924>>2]|0,Xi,t[e+928>>2]|0,Ki,Dr,w(D[e+936>>2]),ie,Pe,T)|0)ke=22;else if(we=t[e+520>>2]|0,!we)ke=21;else for(q=0;;){if(P=e+524+(q*24|0)|0,Dr=w(D[P>>2]),Ki=w(D[e+524+(q*24|0)+4>>2]),Xi=w(D[e+524+(q*24|0)+16>>2]),K0(s,n,l,r,t[e+524+(q*24|0)+8>>2]|0,Dr,t[e+524+(q*24|0)+12>>2]|0,Ki,Xi,w(D[e+524+(q*24|0)+20>>2]),ie,Pe,T)|0){ke=22;break e}if(q=q+1|0,q>>>0>=we>>>0){ke=21;break}}else{if(y){if(P=e+916|0,!(Vr(w(D[P>>2]),n)|0)){ke=21;break}if(!(Vr(w(D[e+920>>2]),r)|0)){ke=21;break}if((t[e+924>>2]|0)!=(s|0)){ke=21;break}P=(t[e+928>>2]|0)==(l|0)?P:0,ke=22;break}if(we=t[e+520>>2]|0,!we)ke=21;else for(q=0;;){if(P=e+524+(q*24|0)|0,((Vr(w(D[P>>2]),n)|0?Vr(w(D[e+524+(q*24|0)+4>>2]),r)|0:0)?(t[e+524+(q*24|0)+8>>2]|0)==(s|0):0)?(t[e+524+(q*24|0)+12>>2]|0)==(l|0):0){ke=22;break e}if(q=q+1|0,q>>>0>=we>>>0){ke=21;break}}}while(0);do if((ke|0)==21)c[11697]|0?(P=0,ke=28):(P=0,ke=31);else if((ke|0)==22){if(q=(c[11697]|0)!=0,!((P|0)!=0&(Pn^1)))if(q){ke=28;break}else{ke=31;break}le=P+16|0,t[e+908>>2]=t[le>>2],we=P+20|0,t[e+912>>2]=t[we>>2],(c[11698]|0)==0|q^1||(t[qe>>2]=Gn(_e)|0,t[qe+4>>2]=_e,wn(e,4,2972,qe),q=t[e+972>>2]|0,q|0&&Nl[q&127](e),s=$t(s,y)|0,l=$t(l,y)|0,Ro=+w(D[le>>2]),Ji=+w(D[we>>2]),t[vt>>2]=s,t[vt+4>>2]=l,L[vt+8>>3]=+n,L[vt+16>>3]=+r,L[vt+24>>3]=Ro,L[vt+32>>3]=Ji,t[vt+40>>2]=k,wn(e,4,2989,vt))}while(0);return(ke|0)==28&&(q=Gn(_e)|0,t[le>>2]=q,t[le+4>>2]=_e,t[le+8>>2]=Pn?3047:11699,wn(e,4,3038,le),q=t[e+972>>2]|0,q|0&&Nl[q&127](e),vt=$t(s,y)|0,ke=$t(l,y)|0,t[pe>>2]=vt,t[pe+4>>2]=ke,L[pe+8>>3]=+n,L[pe+16>>3]=+r,t[pe+24>>2]=k,wn(e,4,3049,pe),ke=31),(ke|0)==31&&(X0(e,n,r,o,s,l,d,_,y,T),c[11697]|0&&(q=t[2279]|0,vt=Gn(q)|0,t[Ln>>2]=vt,t[Ln+4>>2]=q,t[Ln+8>>2]=Pn?3047:11699,wn(e,4,3083,Ln),q=t[e+972>>2]|0,q|0&&Nl[q&127](e),vt=$t(s,y)|0,Ln=$t(l,y)|0,Ji=+w(D[e+908>>2]),Ro=+w(D[e+912>>2]),t[Ht>>2]=vt,t[Ht+4>>2]=Ln,L[Ht+8>>3]=Ji,L[Ht+16>>3]=Ro,t[Ht+24>>2]=k,wn(e,4,3092,Ht)),t[e+516>>2]=o,P||(q=e+520|0,P=t[q>>2]|0,(P|0)==16&&(c[11697]|0&&wn(e,4,3124,It),t[q>>2]=0,P=0),y?P=e+916|0:(t[q>>2]=P+1,P=e+524+(P*24|0)|0),D[P>>2]=n,D[P+4>>2]=r,t[P+8>>2]=s,t[P+12>>2]=l,t[P+16>>2]=t[e+908>>2],t[P+20>>2]=t[e+912>>2],P=0)),y&&(t[e+416>>2]=t[e+908>>2],t[e+420>>2]=t[e+912>>2],c[e+985>>0]=1,c[gn>>0]=0),t[2279]=(t[2279]|0)+-1,t[e+512>>2]=t[2278],h=zt,Pn|(P|0)==0|0}function mt(e,n,r){e=e|0,n=n|0,r=w(r);var o=tt;return o=w(Tr(e,n,r)),w(o+w(R0(e,n,r)))}function wn(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=h,h=h+16|0,s=l,t[s>>2]=o,e?o=t[e+976>>2]|0:o=0,Ku(o,e,n,r,s),h=l}function Gn(e){return e=e|0,(e>>>0>60?3201:3201+(60-e)|0)|0}function $t(e,n){e=e|0,n=n|0;var r=0,o=0,s=0;return s=h,h=h+32|0,r=s+12|0,o=s,t[r>>2]=t[254],t[r+4>>2]=t[255],t[r+8>>2]=t[256],t[o>>2]=t[257],t[o+4>>2]=t[258],t[o+8>>2]=t[259],(e|0)>2?e=11699:e=t[(n?o:r)+(e<<2)>>2]|0,h=s,e|0}function X0(e,n,r,o,s,l,d,_,y,k){e=e|0,n=w(n),r=w(r),o=o|0,s=s|0,l=l|0,d=w(d),_=w(_),y=y|0,k=k|0;var T=0,P=0,q=0,we=0,le=tt,ie=tt,Pe=tt,ke=tt,qe=tt,pe=tt,_e=tt,vt=0,Ln=0,Ht=0,It=tt,gn=tt,Pn=0,zt=tt,Dr=0,Ki=0,Xi=0,Ji=0,Ro=0,kf=0,Af=0,Cu=0,Of=0,Js=0,Qs=0,If=0,Pf=0,Mf=0,Kn=0,Tu=0,Ff=0,us=0,Lf=tt,Rf=tt,Zs=tt,el=tt,ss=tt,Fi=0,nu=0,go=0,xu=0,jl=0,Ul=tt,tl=tt,ql=tt,zl=tt,Li=tt,Di=tt,ku=0,xr=tt,Wl=tt,Qi=tt,ls=tt,Zi=tt,fs=tt,Hl=0,bl=0,cs=tt,Ri=tt,Au=0,Gl=0,Vl=0,Yl=0,En=tt,br=0,Ei=0,eo=0,Ni=0,xn=0,Vt=0,Ou=0,kt=tt,$l=0,Qr=0;Ou=h,h=h+16|0,Fi=Ou+12|0,nu=Ou+8|0,go=Ou+4|0,xu=Ou,i0(e,(s|0)==0|(gt(n)|0)^1,3326),i0(e,(l|0)==0|(gt(r)|0)^1,3406),Ei=so(e,o)|0,t[e+496>>2]=Ei,xn=N0(2,Ei)|0,Vt=N0(0,Ei)|0,D[e+440>>2]=w(Tr(e,xn,d)),D[e+444>>2]=w(R0(e,xn,d)),D[e+428>>2]=w(Tr(e,Vt,d)),D[e+436>>2]=w(R0(e,Vt,d)),D[e+464>>2]=w(C0(e,xn)),D[e+468>>2]=w(di(e,xn)),D[e+452>>2]=w(C0(e,Vt)),D[e+460>>2]=w(di(e,Vt)),D[e+488>>2]=w(u0(e,xn,d)),D[e+492>>2]=w(v0(e,xn,d)),D[e+476>>2]=w(u0(e,Vt,d)),D[e+484>>2]=w(v0(e,Vt,d));do if(t[e+964>>2]|0)To(e,n,r,s,l,d,_);else{if(eo=e+948|0,Ni=(t[e+952>>2]|0)-(t[eo>>2]|0)>>2,!Ni){pu(e,n,r,s,l,d,_);break}if(y?0:Sl(e,n,r,s,l,d,_)|0)break;bo(e),Tu=e+508|0,c[Tu>>0]=0,xn=N0(t[e+4>>2]|0,Ei)|0,Vt=Cl(xn,Ei)|0,br=Nr(xn)|0,Ff=t[e+8>>2]|0,Gl=e+28|0,us=(t[Gl>>2]|0)!=0,Zi=br?d:_,cs=br?_:d,Lf=w(B0(e,xn,d)),Rf=w(hu(e,xn,d)),le=w(B0(e,Vt,d)),fs=w(Fn(e,xn,d)),Ri=w(Fn(e,Vt,d)),Ht=br?s:l,Au=br?l:s,En=br?fs:Ri,qe=br?Ri:fs,ls=w(mt(e,2,d)),ke=w(mt(e,0,d)),ie=w(w(Tn(e+364|0,d))-En),Pe=w(w(Tn(e+380|0,d))-En),pe=w(w(Tn(e+372|0,_))-qe),_e=w(w(Tn(e+388|0,_))-qe),Zs=br?ie:pe,el=br?Pe:_e,ls=w(n-ls),n=w(ls-En),gt(n)|0?En=n:En=w(Ur(w(cc(n,Pe)),ie)),Wl=w(r-ke),n=w(Wl-qe),gt(n)|0?Qi=n:Qi=w(Ur(w(cc(n,_e)),pe)),ie=br?En:Qi,xr=br?Qi:En;e:do if((Ht|0)==1)for(o=0,P=0;;){if(T=e0(e,P)|0,!o)(w(Br(T))>w(0)?w(zr(T))>w(0):0)?o=T:o=0;else if(pi(T)|0){we=0;break e}if(P=P+1|0,P>>>0>=Ni>>>0){we=o;break}}else we=0;while(0);vt=we+500|0,Ln=we+504|0,o=0,T=0,n=w(0),q=0;do{if(P=t[(t[eo>>2]|0)+(q<<2)>>2]|0,(t[P+36>>2]|0)==1)lo(P),c[P+985>>0]=1,c[P+984>>0]=0;else{$r(P),y&&Yo(P,so(P,Ei)|0,ie,xr,En);do if((t[P+24>>2]|0)!=1)if((P|0)==(we|0)){t[vt>>2]=t[2278],D[Ln>>2]=w(0);break}else{wr(e,P,En,s,Qi,En,Qi,l,Ei,k);break}else T|0&&(t[T+960>>2]=P),t[P+960>>2]=0,T=P,o=(o|0)==0?P:o;while(0);Di=w(D[P+504>>2]),n=w(n+w(Di+w(mt(P,xn,En))))}q=q+1|0}while((q|0)!=(Ni|0));for(Xi=n>ie,ku=us&((Ht|0)==2&Xi)?1:Ht,Dr=(Au|0)==1,Ro=Dr&(y^1),kf=(ku|0)==1,Af=(ku|0)==2,Cu=976+(xn<<2)|0,Of=(Au|2|0)==2,Mf=Dr&(us^1),Js=1040+(Vt<<2)|0,Qs=1040+(xn<<2)|0,If=976+(Vt<<2)|0,Pf=(Au|0)!=1,Xi=us&((Ht|0)!=0&Xi),Ki=e+976|0,Dr=Dr^1,n=ie,Pn=0,Ji=0,Di=w(0),ss=w(0);;){e:do if(Pn>>>0>>0)for(Ln=t[eo>>2]|0,q=0,_e=w(0),pe=w(0),Pe=w(0),ie=w(0),P=0,T=0,we=Pn;;){if(vt=t[Ln+(we<<2)>>2]|0,(t[vt+36>>2]|0)!=1?(t[vt+940>>2]=Ji,(t[vt+24>>2]|0)!=1):0){if(ke=w(mt(vt,xn,En)),Kn=t[Cu>>2]|0,r=w(Tn(vt+380+(Kn<<3)|0,Zi)),qe=w(D[vt+504>>2]),r=w(cc(r,qe)),r=w(Ur(w(Tn(vt+364+(Kn<<3)|0,Zi)),r)),us&(q|0)!=0&w(ke+w(pe+r))>n){l=q,ke=_e,Ht=we;break e}ke=w(ke+r),r=w(pe+ke),ke=w(_e+ke),pi(vt)|0&&(Pe=w(Pe+w(Br(vt))),ie=w(ie-w(qe*w(zr(vt))))),T|0&&(t[T+960>>2]=vt),t[vt+960>>2]=0,q=q+1|0,T=vt,P=(P|0)==0?vt:P}else ke=_e,r=pe;if(we=we+1|0,we>>>0>>0)_e=ke,pe=r;else{l=q,Ht=we;break}}else l=0,ke=w(0),Pe=w(0),ie=w(0),P=0,Ht=Pn;while(0);Kn=Pe>w(0)&Pew(0)&ieel&((gt(el)|0)^1))n=el,Kn=51;else if(c[(t[Ki>>2]|0)+3>>0]|0)Kn=51;else{if(It!=w(0)?w(Br(e))!=w(0):0){Kn=53;break}n=ke,Kn=53}while(0);if((Kn|0)==51&&(Kn=0,gt(n)|0?Kn=53:(gn=w(n-ke),zt=n)),(Kn|0)==53&&(Kn=0,ke>2]|0,we=gnw(0),pe=w(gn/It),Pe=w(0),ke=w(0),n=w(0),T=P;do r=w(Tn(T+380+(q<<3)|0,Zi)),ie=w(Tn(T+364+(q<<3)|0,Zi)),ie=w(cc(r,w(Ur(ie,w(D[T+504>>2]))))),we?(r=w(ie*w(zr(T))),(r!=w(-0)?(kt=w(ie-w(qe*r)),Ul=w(kn(T,xn,kt,zt,En)),kt!=Ul):0)&&(Pe=w(Pe-w(Ul-ie)),n=w(n+r))):((vt?(tl=w(Br(T)),tl!=w(0)):0)?(kt=w(ie+w(pe*tl)),ql=w(kn(T,xn,kt,zt,En)),kt!=ql):0)&&(Pe=w(Pe-w(ql-ie)),ke=w(ke-tl)),T=t[T+960>>2]|0;while((T|0)!=0);if(n=w(_e+n),ie=w(gn+Pe),jl)n=w(0);else{qe=w(It+ke),we=t[Cu>>2]|0,vt=iew(0),qe=w(ie/qe),n=w(0);do{kt=w(Tn(P+380+(we<<3)|0,Zi)),Pe=w(Tn(P+364+(we<<3)|0,Zi)),Pe=w(cc(kt,w(Ur(Pe,w(D[P+504>>2]))))),vt?(kt=w(Pe*w(zr(P))),ie=w(-kt),kt!=w(-0)?(kt=w(pe*ie),ie=w(kn(P,xn,w(Pe+(Ln?ie:kt)),zt,En))):ie=Pe):(q?(zl=w(Br(P)),zl!=w(0)):0)?ie=w(kn(P,xn,w(Pe+w(qe*zl)),zt,En)):ie=Pe,n=w(n-w(ie-Pe)),ke=w(mt(P,xn,En)),r=w(mt(P,Vt,En)),ie=w(ie+ke),D[nu>>2]=ie,t[xu>>2]=1,Pe=w(D[P+396>>2]);e:do if(gt(Pe)|0){T=gt(xr)|0;do if(!T){if(Xi|(m0(P,Vt,xr)|0|Dr)||(T0(e,P)|0)!=4||(t[(hi(P,Vt)|0)+4>>2]|0)==3||(t[(Ai(P,Vt)|0)+4>>2]|0)==3)break;D[Fi>>2]=xr,t[go>>2]=1;break e}while(0);if(m0(P,Vt,xr)|0){T=t[P+992+(t[If>>2]<<2)>>2]|0,kt=w(r+w(Tn(T,xr))),D[Fi>>2]=kt,T=Pf&(t[T+4>>2]|0)==2,t[go>>2]=((gt(kt)|0|T)^1)&1;break}else{D[Fi>>2]=xr,t[go>>2]=T?0:2;break}}else kt=w(ie-ke),It=w(kt/Pe),kt=w(Pe*kt),t[go>>2]=1,D[Fi>>2]=w(r+(br?It:kt));while(0);Kt(P,xn,zt,En,xu,nu),Kt(P,Vt,xr,En,go,Fi);do if(m0(P,Vt,xr)|0?0:(T0(e,P)|0)==4){if((t[(hi(P,Vt)|0)+4>>2]|0)==3){T=0;break}T=(t[(Ai(P,Vt)|0)+4>>2]|0)!=3}else T=0;while(0);kt=w(D[nu>>2]),It=w(D[Fi>>2]),$l=t[xu>>2]|0,Qr=t[go>>2]|0,ht(P,br?kt:It,br?It:kt,Ei,br?$l:Qr,br?Qr:$l,En,Qi,y&(T^1),3488,k)|0,c[Tu>>0]=c[Tu>>0]|c[P+508>>0],P=t[P+960>>2]|0}while((P|0)!=0)}}else n=w(0);if(n=w(gn+n),Qr=n>0]=Qr|C[Tu>>0],Af&n>w(0)?(T=t[Cu>>2]|0,((t[e+364+(T<<3)+4>>2]|0)!=0?(Li=w(Tn(e+364+(T<<3)|0,Zi)),Li>=w(0)):0)?ie=w(Ur(w(0),w(Li-w(zt-n)))):ie=w(0)):ie=n,vt=Pn>>>0>>0,vt){we=t[eo>>2]|0,q=Pn,T=0;do P=t[we+(q<<2)>>2]|0,t[P+24>>2]|0||(T=((t[(hi(P,xn)|0)+4>>2]|0)==3&1)+T|0,T=T+((t[(Ai(P,xn)|0)+4>>2]|0)==3&1)|0),q=q+1|0;while((q|0)!=(Ht|0));T?(ke=w(0),r=w(0)):Kn=101}else Kn=101;e:do if((Kn|0)==101)switch(Kn=0,Ff|0){case 1:{T=0,ke=w(ie*w(.5)),r=w(0);break e}case 2:{T=0,ke=ie,r=w(0);break e}case 3:{if(l>>>0<=1){T=0,ke=w(0),r=w(0);break e}r=w((l+-1|0)>>>0),T=0,ke=w(0),r=w(w(Ur(ie,w(0)))/r);break e}case 5:{r=w(ie/w((l+1|0)>>>0)),T=0,ke=r;break e}case 4:{r=w(ie/w(l>>>0)),T=0,ke=w(r*w(.5));break e}default:{T=0,ke=w(0),r=w(0);break e}}while(0);if(n=w(Lf+ke),vt){Pe=w(ie/w(T|0)),q=t[eo>>2]|0,P=Pn,ie=w(0);do{T=t[q+(P<<2)>>2]|0;e:do if((t[T+36>>2]|0)!=1){switch(t[T+24>>2]|0){case 1:{if(X(T,xn)|0){if(!y)break e;kt=w(Y(T,xn,zt)),kt=w(kt+w(C0(e,xn))),kt=w(kt+w(Tr(T,xn,En))),D[T+400+(t[Qs>>2]<<2)>>2]=kt;break e}break}case 0:if(Qr=(t[(hi(T,xn)|0)+4>>2]|0)==3,kt=w(Pe+n),n=Qr?kt:n,y&&(Qr=T+400+(t[Qs>>2]<<2)|0,D[Qr>>2]=w(n+w(D[Qr>>2]))),Qr=(t[(Ai(T,xn)|0)+4>>2]|0)==3,kt=w(Pe+n),n=Qr?kt:n,Ro){kt=w(r+w(mt(T,xn,En))),ie=xr,n=w(n+w(kt+w(D[T+504>>2])));break e}else{n=w(n+w(r+w(ye(T,xn,En)))),ie=w(Ur(ie,w(ye(T,Vt,En))));break e}default:}y&&(kt=w(ke+w(C0(e,xn))),Qr=T+400+(t[Qs>>2]<<2)|0,D[Qr>>2]=w(kt+w(D[Qr>>2])))}while(0);P=P+1|0}while((P|0)!=(Ht|0))}else ie=w(0);if(r=w(Rf+n),Of?ke=w(w(kn(e,Vt,w(Ri+ie),cs,d))-Ri):ke=xr,Pe=w(w(kn(e,Vt,w(Ri+(Mf?xr:ie)),cs,d))-Ri),vt&y){P=Pn;do{q=t[(t[eo>>2]|0)+(P<<2)>>2]|0;do if((t[q+36>>2]|0)!=1){if((t[q+24>>2]|0)==1){if(X(q,Vt)|0){if(kt=w(Y(q,Vt,xr)),kt=w(kt+w(C0(e,Vt))),kt=w(kt+w(Tr(q,Vt,En))),T=t[Js>>2]|0,D[q+400+(T<<2)>>2]=kt,!(gt(kt)|0))break}else T=t[Js>>2]|0;kt=w(C0(e,Vt)),D[q+400+(T<<2)>>2]=w(kt+w(Tr(q,Vt,En)));break}T=T0(e,q)|0;do if((T|0)==4){if((t[(hi(q,Vt)|0)+4>>2]|0)==3){Kn=139;break}if((t[(Ai(q,Vt)|0)+4>>2]|0)==3){Kn=139;break}if(m0(q,Vt,xr)|0){n=le;break}$l=t[q+908+(t[Cu>>2]<<2)>>2]|0,t[Fi>>2]=$l,n=w(D[q+396>>2]),Qr=gt(n)|0,ie=(t[j>>2]=$l,w(D[j>>2])),Qr?n=Pe:(gn=w(mt(q,Vt,En)),kt=w(ie/n),n=w(n*ie),n=w(gn+(br?kt:n))),D[nu>>2]=n,D[Fi>>2]=w(w(mt(q,xn,En))+ie),t[go>>2]=1,t[xu>>2]=1,Kt(q,xn,zt,En,go,Fi),Kt(q,Vt,xr,En,xu,nu),n=w(D[Fi>>2]),gn=w(D[nu>>2]),kt=br?n:gn,n=br?gn:n,Qr=((gt(kt)|0)^1)&1,ht(q,kt,n,Ei,Qr,((gt(n)|0)^1)&1,En,Qi,1,3493,k)|0,n=le}else Kn=139;while(0);e:do if((Kn|0)==139){Kn=0,n=w(ke-w(ye(q,Vt,En)));do if((t[(hi(q,Vt)|0)+4>>2]|0)==3){if((t[(Ai(q,Vt)|0)+4>>2]|0)!=3)break;n=w(le+w(Ur(w(0),w(n*w(.5)))));break e}while(0);if((t[(Ai(q,Vt)|0)+4>>2]|0)==3){n=le;break}if((t[(hi(q,Vt)|0)+4>>2]|0)==3){n=w(le+w(Ur(w(0),n)));break}switch(T|0){case 1:{n=le;break e}case 2:{n=w(le+w(n*w(.5)));break e}default:{n=w(le+n);break e}}}while(0);kt=w(Di+n),Qr=q+400+(t[Js>>2]<<2)|0,D[Qr>>2]=w(kt+w(D[Qr>>2]))}while(0);P=P+1|0}while((P|0)!=(Ht|0))}if(Di=w(Di+Pe),ss=w(Ur(ss,r)),l=Ji+1|0,Ht>>>0>=Ni>>>0)break;n=zt,Pn=Ht,Ji=l}do if(y){if(T=l>>>0>1,T?0:!(he(e)|0))break;if(!(gt(xr)|0)){n=w(xr-Di);e:do switch(t[e+12>>2]|0){case 3:{le=w(le+n),pe=w(0);break}case 2:{le=w(le+w(n*w(.5))),pe=w(0);break}case 4:{xr>Di?pe=w(n/w(l>>>0)):pe=w(0);break}case 7:if(xr>Di){le=w(le+w(n/w(l<<1>>>0))),pe=w(n/w(l>>>0)),pe=T?pe:w(0);break e}else{le=w(le+w(n*w(.5))),pe=w(0);break e}case 6:{pe=w(n/w(Ji>>>0)),pe=xr>Di&T?pe:w(0);break}default:pe=w(0)}while(0);if(l|0)for(vt=1040+(Vt<<2)|0,Ln=976+(Vt<<2)|0,we=0,P=0;;){e:do if(P>>>0>>0)for(ie=w(0),Pe=w(0),n=w(0),q=P;;){T=t[(t[eo>>2]|0)+(q<<2)>>2]|0;do if((t[T+36>>2]|0)!=1?(t[T+24>>2]|0)==0:0){if((t[T+940>>2]|0)!=(we|0))break e;if(We(T,Vt)|0&&(kt=w(D[T+908+(t[Ln>>2]<<2)>>2]),n=w(Ur(n,w(kt+w(mt(T,Vt,En)))))),(T0(e,T)|0)!=5)break;Li=w(et(T)),Li=w(Li+w(Tr(T,0,En))),kt=w(D[T+912>>2]),kt=w(w(kt+w(mt(T,0,En)))-Li),Li=w(Ur(Pe,Li)),kt=w(Ur(ie,kt)),ie=kt,Pe=Li,n=w(Ur(n,w(Li+kt)))}while(0);if(T=q+1|0,T>>>0>>0)q=T;else{q=T;break}}else Pe=w(0),n=w(0),q=P;while(0);if(qe=w(pe+n),r=le,le=w(le+qe),P>>>0>>0){ke=w(r+Pe),T=P;do{P=t[(t[eo>>2]|0)+(T<<2)>>2]|0;e:do if((t[P+36>>2]|0)!=1?(t[P+24>>2]|0)==0:0)switch(T0(e,P)|0){case 1:{kt=w(r+w(Tr(P,Vt,En))),D[P+400+(t[vt>>2]<<2)>>2]=kt;break e}case 3:{kt=w(w(le-w(R0(P,Vt,En)))-w(D[P+908+(t[Ln>>2]<<2)>>2])),D[P+400+(t[vt>>2]<<2)>>2]=kt;break e}case 2:{kt=w(r+w(w(qe-w(D[P+908+(t[Ln>>2]<<2)>>2]))*w(.5))),D[P+400+(t[vt>>2]<<2)>>2]=kt;break e}case 4:{if(kt=w(r+w(Tr(P,Vt,En))),D[P+400+(t[vt>>2]<<2)>>2]=kt,m0(P,Vt,xr)|0||(br?(ie=w(D[P+908>>2]),n=w(ie+w(mt(P,xn,En))),Pe=qe):(Pe=w(D[P+912>>2]),Pe=w(Pe+w(mt(P,Vt,En))),n=qe,ie=w(D[P+908>>2])),Vr(n,ie)|0?Vr(Pe,w(D[P+912>>2]))|0:0))break e;ht(P,n,Pe,Ei,1,1,En,Qi,1,3501,k)|0;break e}case 5:{D[P+404>>2]=w(w(ke-w(et(P)))+w(Y(P,0,xr)));break e}default:break e}while(0);T=T+1|0}while((T|0)!=(q|0))}if(we=we+1|0,(we|0)==(l|0))break;P=q}}}while(0);if(D[e+908>>2]=w(kn(e,2,ls,d,d)),D[e+912>>2]=w(kn(e,0,Wl,_,d)),((ku|0)!=0?(Hl=t[e+32>>2]|0,bl=(ku|0)==2,!(bl&(Hl|0)!=2)):0)?bl&(Hl|0)==2&&(n=w(fs+zt),n=w(Ur(w(cc(n,w(Dt(e,xn,ss,Zi)))),fs)),Kn=198):(n=w(kn(e,xn,ss,Zi,d)),Kn=198),(Kn|0)==198&&(D[e+908+(t[976+(xn<<2)>>2]<<2)>>2]=n),((Au|0)!=0?(Vl=t[e+32>>2]|0,Yl=(Au|0)==2,!(Yl&(Vl|0)!=2)):0)?Yl&(Vl|0)==2&&(n=w(Ri+xr),n=w(Ur(w(cc(n,w(Dt(e,Vt,w(Ri+Di),cs)))),Ri)),Kn=204):(n=w(kn(e,Vt,w(Ri+Di),cs,d)),Kn=204),(Kn|0)==204&&(D[e+908+(t[976+(Vt<<2)>>2]<<2)>>2]=n),y){if((t[Gl>>2]|0)==2){P=976+(Vt<<2)|0,q=1040+(Vt<<2)|0,T=0;do we=e0(e,T)|0,t[we+24>>2]|0||($l=t[P>>2]|0,kt=w(D[e+908+($l<<2)>>2]),Qr=we+400+(t[q>>2]<<2)|0,kt=w(kt-w(D[Qr>>2])),D[Qr>>2]=w(kt-w(D[we+908+($l<<2)>>2]))),T=T+1|0;while((T|0)!=(Ni|0))}if(o|0){T=br?ku:s;do bt(e,o,En,T,Qi,Ei,k),o=t[o+960>>2]|0;while((o|0)!=0)}if(T=(xn|2|0)==3,P=(Vt|2|0)==3,T|P){o=0;do q=t[(t[eo>>2]|0)+(o<<2)>>2]|0,(t[q+36>>2]|0)!=1&&(T&&Zt(e,q,xn),P&&Zt(e,q,Vt)),o=o+1|0;while((o|0)!=(Ni|0))}}}while(0);h=Ou}function ki(e,n){e=e|0,n=w(n);var r=0;li(e,n>=w(0),3147),r=n==w(0),D[e+4>>2]=r?w(0):n}function Yr(e,n,r,o){e=e|0,n=w(n),r=w(r),o=o|0;var s=tt,l=tt,d=0,_=0,y=0;t[2278]=(t[2278]|0)+1,$r(e),m0(e,2,n)|0?(s=w(Tn(t[e+992>>2]|0,n)),y=1,s=w(s+w(mt(e,2,n)))):(s=w(Tn(e+380|0,n)),s>=w(0)?y=2:(y=((gt(n)|0)^1)&1,s=n)),m0(e,0,r)|0?(l=w(Tn(t[e+996>>2]|0,r)),_=1,l=w(l+w(mt(e,0,n)))):(l=w(Tn(e+388|0,r)),l>=w(0)?_=2:(_=((gt(r)|0)^1)&1,l=r)),d=e+976|0,(ht(e,s,l,o,y,_,n,r,1,3189,t[d>>2]|0)|0?(Yo(e,t[e+496>>2]|0,n,r,n),bi(e,w(D[(t[d>>2]|0)+4>>2]),w(0),w(0)),c[11696]|0):0)&&ff(e,7)}function $r(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;_=h,h=h+32|0,d=_+24|0,l=_+16|0,o=_+8|0,s=_,r=0;do n=e+380+(r<<3)|0,((t[e+380+(r<<3)+4>>2]|0)!=0?(y=n,k=t[y+4>>2]|0,T=o,t[T>>2]=t[y>>2],t[T+4>>2]=k,T=e+364+(r<<3)|0,k=t[T+4>>2]|0,y=s,t[y>>2]=t[T>>2],t[y+4>>2]=k,t[l>>2]=t[o>>2],t[l+4>>2]=t[o+4>>2],t[d>>2]=t[s>>2],t[d+4>>2]=t[s+4>>2],o0(l,d)|0):0)||(n=e+348+(r<<3)|0),t[e+992+(r<<2)>>2]=n,r=r+1|0;while((r|0)!=2);h=_}function m0(e,n,r){e=e|0,n=n|0,r=w(r);var o=0;switch(e=t[e+992+(t[976+(n<<2)>>2]<<2)>>2]|0,t[e+4>>2]|0){case 0:case 3:{e=0;break}case 1:{w(D[e>>2])>2])>2]|0){case 2:{n=w(w(w(D[e>>2])*n)/w(100));break}case 1:{n=w(D[e>>2]);break}default:n=w(J)}return w(n)}function Yo(e,n,r,o,s){e=e|0,n=n|0,r=w(r),o=w(o),s=w(s);var l=0,d=tt;n=t[e+944>>2]|0?n:1,l=N0(t[e+4>>2]|0,n)|0,n=Cl(l,n)|0,r=w(Wr(e,l,r)),o=w(Wr(e,n,o)),d=w(r+w(Tr(e,l,s))),D[e+400+(t[1040+(l<<2)>>2]<<2)>>2]=d,r=w(r+w(R0(e,l,s))),D[e+400+(t[1e3+(l<<2)>>2]<<2)>>2]=r,r=w(o+w(Tr(e,n,s))),D[e+400+(t[1040+(n<<2)>>2]<<2)>>2]=r,s=w(o+w(R0(e,n,s))),D[e+400+(t[1e3+(n<<2)>>2]<<2)>>2]=s}function bi(e,n,r,o){e=e|0,n=w(n),r=w(r),o=w(o);var s=0,l=0,d=tt,_=tt,y=0,k=0,T=tt,P=0,q=tt,we=tt,le=tt,ie=tt;if(n!=w(0)&&(s=e+400|0,ie=w(D[s>>2]),l=e+404|0,le=w(D[l>>2]),P=e+416|0,we=w(D[P>>2]),k=e+420|0,d=w(D[k>>2]),q=w(ie+r),T=w(le+o),o=w(q+we),_=w(T+d),y=(t[e+988>>2]|0)==1,D[s>>2]=w($0(ie,n,0,y)),D[l>>2]=w($0(le,n,0,y)),r=w(V4(w(we*n),w(1))),Vr(r,w(0))|0?l=0:l=(Vr(r,w(1))|0)^1,r=w(V4(w(d*n),w(1))),Vr(r,w(0))|0?s=0:s=(Vr(r,w(1))|0)^1,ie=w($0(o,n,y&l,y&(l^1))),D[P>>2]=w(ie-w($0(q,n,0,y))),ie=w($0(_,n,y&s,y&(s^1))),D[k>>2]=w(ie-w($0(T,n,0,y))),l=(t[e+952>>2]|0)-(t[e+948>>2]|0)>>2,l|0)){s=0;do bi(e0(e,s)|0,n,q,T),s=s+1|0;while((s|0)!=(l|0))}}function or(e,n,r,o,s){switch(e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,r|0){case 5:case 0:{e=q8(t[489]|0,o,s)|0;break}default:e=AL(o,s)|0}return e|0}function zs(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;s=h,h=h+16|0,l=s,t[l>>2]=o,Ku(e,0,n,r,l),h=s}function Ku(e,n,r,o,s){if(e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,e=e|0?e:956,sD[t[e+8>>2]&1](e,n,r,o,s)|0,(r|0)==5)_n();else return}function J0(e,n,r){e=e|0,n=n|0,r=r|0,c[e+n>>0]=r&1}function af(e,n){e=e|0,n=n|0;var r=0,o=0;t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,r=n+4|0,o=(t[r>>2]|0)-(t[n>>2]|0)>>2,o|0&&(S0(e,o),El(e,t[n>>2]|0,t[r>>2]|0,o))}function S0(e,n){e=e|0,n=n|0;var r=0;if((Q0(e)|0)>>>0>>0&&$n(e),n>>>0>1073741823)_n();else{r=Tt(n<<2)|0,t[e+4>>2]=r,t[e>>2]=r,t[e+8>>2]=r+(n<<2);return}}function El(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,o=e+4|0,e=r-n|0,(e|0)>0&&(vn(t[o>>2]|0,n|0,e|0)|0,t[o>>2]=(t[o>>2]|0)+(e>>>2<<2))}function Q0(e){return e=e|0,1073741823}function Tr(e,n,r){return e=e|0,n=n|0,r=w(r),(Nr(n)|0?(t[e+96>>2]|0)!=0:0)?e=e+92|0:e=en(e+60|0,t[1040+(n<<2)>>2]|0,992)|0,w(uo(e,r))}function R0(e,n,r){return e=e|0,n=n|0,r=w(r),(Nr(n)|0?(t[e+104>>2]|0)!=0:0)?e=e+100|0:e=en(e+60|0,t[1e3+(n<<2)>>2]|0,992)|0,w(uo(e,r))}function Nr(e){return e=e|0,(e|1|0)==3|0}function uo(e,n){return e=e|0,n=w(n),(t[e+4>>2]|0)==3?n=w(0):n=w(Tn(e,n)),w(n)}function so(e,n){return e=e|0,n=n|0,e=t[e>>2]|0,((e|0)==0?(n|0)>1?n:1:e)|0}function N0(e,n){e=e|0,n=n|0;var r=0;e:do if((n|0)==2){switch(e|0){case 2:{e=3;break e}case 3:break;default:{r=4;break e}}e=2}else r=4;while(0);return e|0}function C0(e,n){e=e|0,n=n|0;var r=tt;return((Nr(n)|0?(t[e+312>>2]|0)!=0:0)?(r=w(D[e+308>>2]),r>=w(0)):0)||(r=w(Ur(w(D[(en(e+276|0,t[1040+(n<<2)>>2]|0,992)|0)>>2]),w(0)))),w(r)}function di(e,n){e=e|0,n=n|0;var r=tt;return((Nr(n)|0?(t[e+320>>2]|0)!=0:0)?(r=w(D[e+316>>2]),r>=w(0)):0)||(r=w(Ur(w(D[(en(e+276|0,t[1e3+(n<<2)>>2]|0,992)|0)>>2]),w(0)))),w(r)}function u0(e,n,r){e=e|0,n=n|0,r=w(r);var o=tt;return((Nr(n)|0?(t[e+240>>2]|0)!=0:0)?(o=w(Tn(e+236|0,r)),o>=w(0)):0)||(o=w(Ur(w(Tn(en(e+204|0,t[1040+(n<<2)>>2]|0,992)|0,r)),w(0)))),w(o)}function v0(e,n,r){e=e|0,n=n|0,r=w(r);var o=tt;return((Nr(n)|0?(t[e+248>>2]|0)!=0:0)?(o=w(Tn(e+244|0,r)),o>=w(0)):0)||(o=w(Ur(w(Tn(en(e+204|0,t[1e3+(n<<2)>>2]|0,992)|0,r)),w(0)))),w(o)}function To(e,n,r,o,s,l,d){e=e|0,n=w(n),r=w(r),o=o|0,s=s|0,l=w(l),d=w(d);var _=tt,y=tt,k=tt,T=tt,P=tt,q=tt,we=0,le=0,ie=0;ie=h,h=h+16|0,we=ie,le=e+964|0,i0(e,(t[le>>2]|0)!=0,3519),_=w(Fn(e,2,n)),y=w(Fn(e,0,n)),k=w(mt(e,2,n)),T=w(mt(e,0,n)),gt(n)|0?P=n:P=w(Ur(w(0),w(w(n-k)-_))),gt(r)|0?q=r:q=w(Ur(w(0),w(w(r-T)-y))),(o|0)==1&(s|0)==1?(D[e+908>>2]=w(kn(e,2,w(n-k),l,l)),n=w(kn(e,0,w(r-T),d,l))):(lD[t[le>>2]&1](we,e,P,o,q,s),P=w(_+w(D[we>>2])),q=w(n-k),D[e+908>>2]=w(kn(e,2,(o|2|0)==2?P:q,l,l)),q=w(y+w(D[we+4>>2])),n=w(r-T),n=w(kn(e,0,(s|2|0)==2?q:n,d,l))),D[e+912>>2]=n,h=ie}function pu(e,n,r,o,s,l,d){e=e|0,n=w(n),r=w(r),o=o|0,s=s|0,l=w(l),d=w(d);var _=tt,y=tt,k=tt,T=tt;k=w(Fn(e,2,l)),_=w(Fn(e,0,l)),T=w(mt(e,2,l)),y=w(mt(e,0,l)),n=w(n-T),D[e+908>>2]=w(kn(e,2,(o|2|0)==2?k:n,l,l)),r=w(r-y),D[e+912>>2]=w(kn(e,0,(s|2|0)==2?_:r,d,l))}function Sl(e,n,r,o,s,l,d){e=e|0,n=w(n),r=w(r),o=o|0,s=s|0,l=w(l),d=w(d);var _=0,y=tt,k=tt;return _=(o|0)==2,((n<=w(0)&_?0:!(r<=w(0)&(s|0)==2))?!((o|0)==1&(s|0)==1):0)?e=0:(y=w(mt(e,0,l)),k=w(mt(e,2,l)),_=n>2]=w(kn(e,2,_?w(0):n,l,l)),n=w(r-y),_=r>2]=w(kn(e,0,_?w(0):n,d,l)),e=1),e|0}function Cl(e,n){return e=e|0,n=n|0,qt(e)|0?e=N0(2,n)|0:e=0,e|0}function B0(e,n,r){return e=e|0,n=n|0,r=w(r),r=w(u0(e,n,r)),w(r+w(C0(e,n)))}function hu(e,n,r){return e=e|0,n=n|0,r=w(r),r=w(v0(e,n,r)),w(r+w(di(e,n)))}function Fn(e,n,r){e=e|0,n=n|0,r=w(r);var o=tt;return o=w(B0(e,n,r)),w(o+w(hu(e,n,r)))}function pi(e){return e=e|0,t[e+24>>2]|0?e=0:w(Br(e))!=w(0)?e=1:e=w(zr(e))!=w(0),e|0}function Br(e){e=e|0;var n=tt;if(t[e+944>>2]|0){if(n=w(D[e+44>>2]),gt(n)|0)return n=w(D[e+40>>2]),e=n>w(0)&((gt(n)|0)^1),w(e?n:w(0))}else n=w(0);return w(n)}function zr(e){e=e|0;var n=tt,r=0,o=tt;do if(t[e+944>>2]|0){if(n=w(D[e+48>>2]),gt(n)|0){if(r=c[(t[e+976>>2]|0)+2>>0]|0,r<<24>>24==0?(o=w(D[e+40>>2]),o>24?w(1):w(0)}}else n=w(0);while(0);return w(n)}function lo(e){e=e|0;var n=0,r=0;if(pa(e+400|0,0,540)|0,c[e+985>>0]=1,bo(e),r=fi(e)|0,r|0){n=e+948|0,e=0;do lo(t[(t[n>>2]|0)+(e<<2)>>2]|0),e=e+1|0;while((e|0)!=(r|0))}}function wr(e,n,r,o,s,l,d,_,y,k){e=e|0,n=n|0,r=w(r),o=o|0,s=w(s),l=w(l),d=w(d),_=_|0,y=y|0,k=k|0;var T=0,P=tt,q=0,we=0,le=tt,ie=tt,Pe=0,ke=tt,qe=0,pe=tt,_e=0,vt=0,Ln=0,Ht=0,It=0,gn=0,Pn=0,zt=0,Dr=0,Ki=0;Dr=h,h=h+16|0,Ln=Dr+12|0,Ht=Dr+8|0,It=Dr+4|0,gn=Dr,zt=N0(t[e+4>>2]|0,y)|0,_e=Nr(zt)|0,P=w(Tn(Ut(n)|0,_e?l:d)),vt=m0(n,2,l)|0,Pn=m0(n,0,d)|0;do if(gt(P)|0?0:!(gt(_e?r:s)|0)){if(T=n+504|0,!(gt(w(D[T>>2]))|0)&&(!(fn(t[n+976>>2]|0,0)|0)||(t[n+500>>2]|0)==(t[2278]|0)))break;D[T>>2]=w(Ur(P,w(Fn(n,zt,l))))}else q=7;while(0);do if((q|0)==7){if(qe=_e^1,!(qe|vt^1)){d=w(Tn(t[n+992>>2]|0,l)),D[n+504>>2]=w(Ur(d,w(Fn(n,2,l))));break}if(!(_e|Pn^1)){d=w(Tn(t[n+996>>2]|0,d)),D[n+504>>2]=w(Ur(d,w(Fn(n,0,l))));break}D[Ln>>2]=w(J),D[Ht>>2]=w(J),t[It>>2]=0,t[gn>>2]=0,ke=w(mt(n,2,l)),pe=w(mt(n,0,l)),vt?(le=w(ke+w(Tn(t[n+992>>2]|0,l))),D[Ln>>2]=le,t[It>>2]=1,we=1):(we=0,le=w(J)),Pn?(P=w(pe+w(Tn(t[n+996>>2]|0,d))),D[Ht>>2]=P,t[gn>>2]=1,T=1):(T=0,P=w(J)),q=t[e+32>>2]|0,_e&(q|0)==2?q=2:(gt(le)|0?!(gt(r)|0):0)&&(D[Ln>>2]=r,t[It>>2]=2,we=2,le=r),(((q|0)==2&qe?0:gt(P)|0)?!(gt(s)|0):0)&&(D[Ht>>2]=s,t[gn>>2]=2,T=2,P=s),ie=w(D[n+396>>2]),Pe=gt(ie)|0;do if(Pe)q=we;else{if((we|0)==1&qe){D[Ht>>2]=w(w(le-ke)/ie),t[gn>>2]=1,T=1,q=1;break}_e&(T|0)==1?(D[Ln>>2]=w(ie*w(P-pe)),t[It>>2]=1,T=1,q=1):q=we}while(0);Ki=gt(r)|0,we=(T0(e,n)|0)!=4,(_e|vt|((o|0)!=1|Ki)|(we|(q|0)==1)?0:(D[Ln>>2]=r,t[It>>2]=1,!Pe))&&(D[Ht>>2]=w(w(r-ke)/ie),t[gn>>2]=1,T=1),(Pn|qe|((_|0)!=1|(gt(s)|0))|(we|(T|0)==1)?0:(D[Ht>>2]=s,t[gn>>2]=1,!Pe))&&(D[Ln>>2]=w(ie*w(s-pe)),t[It>>2]=1),Kt(n,2,l,l,It,Ln),Kt(n,0,d,l,gn,Ht),r=w(D[Ln>>2]),s=w(D[Ht>>2]),ht(n,r,s,y,t[It>>2]|0,t[gn>>2]|0,l,d,0,3565,k)|0,d=w(D[n+908+(t[976+(zt<<2)>>2]<<2)>>2]),D[n+504>>2]=w(Ur(d,w(Fn(n,zt,l))))}while(0);t[n+500>>2]=t[2278],h=Dr}function kn(e,n,r,o,s){return e=e|0,n=n|0,r=w(r),o=w(o),s=w(s),o=w(Dt(e,n,r,o)),w(Ur(o,w(Fn(e,n,s))))}function T0(e,n){return e=e|0,n=n|0,n=n+20|0,n=t[((t[n>>2]|0)==0?e+16|0:n)>>2]|0,((n|0)==5?qt(t[e+4>>2]|0)|0:0)&&(n=1),n|0}function hi(e,n){return e=e|0,n=n|0,(Nr(n)|0?(t[e+96>>2]|0)!=0:0)?n=4:n=t[1040+(n<<2)>>2]|0,e+60+(n<<3)|0}function Ai(e,n){return e=e|0,n=n|0,(Nr(n)|0?(t[e+104>>2]|0)!=0:0)?n=5:n=t[1e3+(n<<2)>>2]|0,e+60+(n<<3)|0}function Kt(e,n,r,o,s,l){switch(e=e|0,n=n|0,r=w(r),o=w(o),s=s|0,l=l|0,r=w(Tn(e+380+(t[976+(n<<2)>>2]<<3)|0,r)),r=w(r+w(mt(e,n,o))),t[s>>2]|0){case 2:case 1:{s=gt(r)|0,o=w(D[l>>2]),D[l>>2]=s|o>2]=2,D[l>>2]=r);break}default:}}function X(e,n){return e=e|0,n=n|0,e=e+132|0,(Nr(n)|0?(t[(en(e,4,948)|0)+4>>2]|0)!=0:0)?e=1:e=(t[(en(e,t[1040+(n<<2)>>2]|0,948)|0)+4>>2]|0)!=0,e|0}function Y(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0;return e=e+132|0,(Nr(n)|0?(o=en(e,4,948)|0,(t[o+4>>2]|0)!=0):0)?s=4:(o=en(e,t[1040+(n<<2)>>2]|0,948)|0,t[o+4>>2]|0?s=4:r=w(0)),(s|0)==4&&(r=w(Tn(o,r))),w(r)}function ye(e,n,r){e=e|0,n=n|0,r=w(r);var o=tt;return o=w(D[e+908+(t[976+(n<<2)>>2]<<2)>>2]),o=w(o+w(Tr(e,n,r))),w(o+w(R0(e,n,r)))}function he(e){e=e|0;var n=0,r=0,o=0;e:do if(qt(t[e+4>>2]|0)|0)n=0;else if((t[e+16>>2]|0)!=5)if(r=fi(e)|0,!r)n=0;else for(n=0;;){if(o=e0(e,n)|0,(t[o+24>>2]|0)==0?(t[o+20>>2]|0)==5:0){n=1;break e}if(n=n+1|0,n>>>0>=r>>>0){n=0;break}}else n=1;while(0);return n|0}function We(e,n){e=e|0,n=n|0;var r=tt;return r=w(D[e+908+(t[976+(n<<2)>>2]<<2)>>2]),r>=w(0)&((gt(r)|0)^1)|0}function et(e){e=e|0;var n=tt,r=0,o=0,s=0,l=0,d=0,_=0,y=tt;if(r=t[e+968>>2]|0,r)y=w(D[e+908>>2]),n=w(D[e+912>>2]),n=w(rD[r&0](e,y,n)),i0(e,(gt(n)|0)^1,3573);else{l=fi(e)|0;do if(l|0){for(r=0,s=0;;){if(o=e0(e,s)|0,t[o+940>>2]|0){d=8;break}if((t[o+24>>2]|0)!=1)if(_=(T0(e,o)|0)==5,_){r=o;break}else r=(r|0)==0?o:r;if(s=s+1|0,s>>>0>=l>>>0){d=8;break}}if((d|0)==8&&!r)break;return n=w(et(r)),w(n+w(D[r+404>>2]))}while(0);n=w(D[e+912>>2])}return w(n)}function Dt(e,n,r,o){e=e|0,n=n|0,r=w(r),o=w(o);var s=tt,l=0;return qt(n)|0?(n=1,l=3):Nr(n)|0?(n=0,l=3):(o=w(J),s=w(J)),(l|0)==3&&(s=w(Tn(e+364+(n<<3)|0,o)),o=w(Tn(e+380+(n<<3)|0,o))),l=o=w(0)&((gt(o)|0)^1)),r=l?o:r,l=s>=w(0)&((gt(s)|0)^1)&r>2]|0,l)|0,le=Cl(Pe,l)|0,ie=Nr(Pe)|0,P=w(mt(n,2,r)),q=w(mt(n,0,r)),m0(n,2,r)|0?_=w(P+w(Tn(t[n+992>>2]|0,r))):(X(n,2)|0?_t(n,2)|0:0)?(_=w(D[e+908>>2]),y=w(C0(e,2)),y=w(_-w(y+w(di(e,2)))),_=w(Y(n,2,r)),_=w(kn(n,2,w(y-w(_+w(_r(n,2,r)))),r,r))):_=w(J),m0(n,0,s)|0?y=w(q+w(Tn(t[n+996>>2]|0,s))):(X(n,0)|0?_t(n,0)|0:0)?(y=w(D[e+912>>2]),qe=w(C0(e,0)),qe=w(y-w(qe+w(di(e,0)))),y=w(Y(n,0,s)),y=w(kn(n,0,w(qe-w(y+w(_r(n,0,s)))),s,r))):y=w(J),k=gt(_)|0,T=gt(y)|0;do if(k^T?(we=w(D[n+396>>2]),!(gt(we)|0)):0)if(k){_=w(P+w(w(y-q)*we));break}else{qe=w(q+w(w(_-P)/we)),y=T?qe:y;break}while(0);T=gt(_)|0,k=gt(y)|0,T|k&&(pe=(T^1)&1,o=r>w(0)&((o|0)!=0&T),_=ie?_:o?r:_,ht(n,_,y,l,ie?pe:o?2:pe,T&(k^1)&1,_,y,0,3623,d)|0,_=w(D[n+908>>2]),_=w(_+w(mt(n,2,r))),y=w(D[n+912>>2]),y=w(y+w(mt(n,0,r)))),ht(n,_,y,l,1,1,_,y,1,3635,d)|0,(_t(n,Pe)|0?!(X(n,Pe)|0):0)?(pe=t[976+(Pe<<2)>>2]|0,qe=w(D[e+908+(pe<<2)>>2]),qe=w(qe-w(D[n+908+(pe<<2)>>2])),qe=w(qe-w(di(e,Pe))),qe=w(qe-w(R0(n,Pe,r))),qe=w(qe-w(_r(n,Pe,ie?r:s))),D[n+400+(t[1040+(Pe<<2)>>2]<<2)>>2]=qe):ke=21;do if((ke|0)==21){if(X(n,Pe)|0?0:(t[e+8>>2]|0)==1){pe=t[976+(Pe<<2)>>2]|0,qe=w(D[e+908+(pe<<2)>>2]),qe=w(w(qe-w(D[n+908+(pe<<2)>>2]))*w(.5)),D[n+400+(t[1040+(Pe<<2)>>2]<<2)>>2]=qe;break}(X(n,Pe)|0?0:(t[e+8>>2]|0)==2)&&(pe=t[976+(Pe<<2)>>2]|0,qe=w(D[e+908+(pe<<2)>>2]),qe=w(qe-w(D[n+908+(pe<<2)>>2])),D[n+400+(t[1040+(Pe<<2)>>2]<<2)>>2]=qe)}while(0);(_t(n,le)|0?!(X(n,le)|0):0)?(pe=t[976+(le<<2)>>2]|0,qe=w(D[e+908+(pe<<2)>>2]),qe=w(qe-w(D[n+908+(pe<<2)>>2])),qe=w(qe-w(di(e,le))),qe=w(qe-w(R0(n,le,r))),qe=w(qe-w(_r(n,le,ie?s:r))),D[n+400+(t[1040+(le<<2)>>2]<<2)>>2]=qe):ke=30;do if((ke|0)==30?!(X(n,le)|0):0){if((T0(e,n)|0)==2){pe=t[976+(le<<2)>>2]|0,qe=w(D[e+908+(pe<<2)>>2]),qe=w(w(qe-w(D[n+908+(pe<<2)>>2]))*w(.5)),D[n+400+(t[1040+(le<<2)>>2]<<2)>>2]=qe;break}pe=(T0(e,n)|0)==3,pe^(t[e+28>>2]|0)==2&&(pe=t[976+(le<<2)>>2]|0,qe=w(D[e+908+(pe<<2)>>2]),qe=w(qe-w(D[n+908+(pe<<2)>>2])),D[n+400+(t[1040+(le<<2)>>2]<<2)>>2]=qe)}while(0)}function Zt(e,n,r){e=e|0,n=n|0,r=r|0;var o=tt,s=0;s=t[976+(r<<2)>>2]|0,o=w(D[n+908+(s<<2)>>2]),o=w(w(D[e+908+(s<<2)>>2])-o),o=w(o-w(D[n+400+(t[1040+(r<<2)>>2]<<2)>>2])),D[n+400+(t[1e3+(r<<2)>>2]<<2)>>2]=o}function qt(e){return e=e|0,(e|1|0)==1|0}function Ut(e){e=e|0;var n=tt;switch(t[e+56>>2]|0){case 0:case 3:{n=w(D[e+40>>2]),n>w(0)&((gt(n)|0)^1)?e=c[(t[e+976>>2]|0)+2>>0]|0?1056:992:e=1056;break}default:e=e+52|0}return e|0}function fn(e,n){return e=e|0,n=n|0,(c[e+n>>0]|0)!=0|0}function _t(e,n){return e=e|0,n=n|0,e=e+132|0,(Nr(n)|0?(t[(en(e,5,948)|0)+4>>2]|0)!=0:0)?e=1:e=(t[(en(e,t[1e3+(n<<2)>>2]|0,948)|0)+4>>2]|0)!=0,e|0}function _r(e,n,r){e=e|0,n=n|0,r=w(r);var o=0,s=0;return e=e+132|0,(Nr(n)|0?(o=en(e,5,948)|0,(t[o+4>>2]|0)!=0):0)?s=4:(o=en(e,t[1e3+(n<<2)>>2]|0,948)|0,t[o+4>>2]|0?s=4:r=w(0)),(s|0)==4&&(r=w(Tn(o,r))),w(r)}function Wr(e,n,r){return e=e|0,n=n|0,r=w(r),X(e,n)|0?r=w(Y(e,n,r)):r=w(-w(_r(e,n,r))),w(r)}function Ar(e){return e=w(e),D[j>>2]=e,t[j>>2]|0|0}function z(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>1073741823)_n();else{s=Tt(n<<2)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<2)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<2)}function dr(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>2)<<2)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Or(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-4-n|0)>>>2)<<2)),e=t[e>>2]|0,e|0&&Ve(e)}function Qn(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;if(d=e+4|0,_=t[d>>2]|0,s=_-o|0,l=s>>2,e=n+(l<<2)|0,e>>>0>>0){o=_;do t[o>>2]=t[e>>2],e=e+4|0,o=(t[d>>2]|0)+4|0,t[d>>2]=o;while(e>>>0>>0)}l|0&&Y1(_+(0-l<<2)|0,n|0,s|0)|0}function nn(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0;return _=n+4|0,y=t[_>>2]|0,s=t[e>>2]|0,d=r,l=d-s|0,o=y+(0-(l>>2)<<2)|0,t[_>>2]=o,(l|0)>0&&vn(o|0,s|0,l|0)|0,s=e+4|0,l=n+8|0,o=(t[s>>2]|0)-d|0,(o|0)>0&&(vn(t[l>>2]|0,r|0,o|0)|0,t[l>>2]=(t[l>>2]|0)+(o>>>2<<2)),d=t[e>>2]|0,t[e>>2]=t[_>>2],t[_>>2]=d,d=t[s>>2]|0,t[s>>2]=t[l>>2],t[l>>2]=d,d=e+8|0,r=n+12|0,e=t[d>>2]|0,t[d>>2]=t[r>>2],t[r>>2]=e,t[n>>2]=t[_>>2],y|0}function s0(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;if(d=t[n>>2]|0,l=t[r>>2]|0,(d|0)!=(l|0)){s=e+8|0,r=((l+-4-d|0)>>>2)+1|0,e=d,o=t[s>>2]|0;do t[o>>2]=t[e>>2],o=(t[s>>2]|0)+4|0,t[s>>2]=o,e=e+4|0;while((e|0)!=(l|0));t[n>>2]=d+(r<<2)}}function t0(){_l()}function g0(){var e=0;return e=Tt(4)|0,Kr(e),e|0}function Kr(e){e=e|0,t[e>>2]=a0()|0}function _0(e){e=e|0,e|0&&(Gi(e),Ve(e))}function Gi(e){e=e|0,V0(t[e>>2]|0)}function fo(e,n,r){e=e|0,n=n|0,r=r|0,J0(t[e>>2]|0,n,r)}function x0(e,n){e=e|0,n=w(n),ki(t[e>>2]|0,n)}function Xu(e,n){return e=e|0,n=n|0,fn(t[e>>2]|0,n)|0}function Z0(){var e=0;return e=Tt(8)|0,df(e,0),e|0}function df(e,n){e=e|0,n=n|0,n?n=I0(t[n>>2]|0)|0:n=qu()|0,t[e>>2]=n,t[e+4>>2]=0,Bs(n,e)}function Ba(e){e=e|0;var n=0;return n=Tt(8)|0,df(n,e),n|0}function Oc(e){e=e|0,e|0&&(mu(e),Ve(e))}function mu(e){e=e|0;var n=0;Wu(t[e>>2]|0),n=e+4|0,e=t[n>>2]|0,t[n>>2]=0,e|0&&(Ju(e),Ve(e))}function Ju(e){e=e|0,ei(e)}function ei(e){e=e|0,e=t[e>>2]|0,e|0&&ju(e|0)}function Yf(e){return e=e|0,Vu(e)|0}function pf(e){e=e|0;var n=0,r=0;r=e+4|0,n=t[r>>2]|0,t[r>>2]=0,n|0&&(Ju(n),Ve(n)),Do(t[e>>2]|0)}function ja(e,n){e=e|0,n=n|0,Gu(t[e>>2]|0,t[n>>2]|0)}function Ua(e,n){e=e|0,n=n|0,W(t[e>>2]|0,n)}function Ic(e,n,r){e=e|0,n=n|0,r=+r,yn(t[e>>2]|0,n,w(r))}function vu(e,n,r){e=e|0,n=n|0,r=+r,sn(t[e>>2]|0,n,w(r))}function $f(e,n){e=e|0,n=n|0,R(t[e>>2]|0,n)}function gu(e,n){e=e|0,n=n|0,H(t[e>>2]|0,n)}function co(e,n){e=e|0,n=n|0,ue(t[e>>2]|0,n)}function qa(e,n){e=e|0,n=n|0,M0(t[e>>2]|0,n)}function Ws(e,n){e=e|0,n=n|0,Fe(t[e>>2]|0,n)}function za(e,n){e=e|0,n=n|0,Lr(t[e>>2]|0,n)}function Pc(e,n,r){e=e|0,n=n|0,r=+r,rn(t[e>>2]|0,n,w(r))}function Qu(e,n,r){e=e|0,n=n|0,r=+r,Hn(t[e>>2]|0,n,w(r))}function Mc(e,n){e=e|0,n=n|0,Cr(t[e>>2]|0,n)}function Fc(e,n){e=e|0,n=n|0,K(t[e>>2]|0,n)}function Lc(e,n){e=e|0,n=n|0,je(t[e>>2]|0,n)}function Kf(e,n){e=e|0,n=+n,rt(t[e>>2]|0,w(n))}function Tl(e,n){e=e|0,n=+n,wt(t[e>>2]|0,w(n))}function xl(e,n){e=e|0,n=+n,lt(t[e>>2]|0,w(n))}function hf(e,n){e=e|0,n=+n,st(t[e>>2]|0,w(n))}function xo(e,n){e=e|0,n=+n,xt(t[e>>2]|0,w(n))}function mf(e,n){e=e|0,n=+n,Qt(t[e>>2]|0,w(n))}function Wa(e,n){e=e|0,n=+n,Cn(t[e>>2]|0,w(n))}function ti(e){e=e|0,bn(t[e>>2]|0)}function Hs(e,n){e=e|0,n=+n,h0(t[e>>2]|0,w(n))}function mi(e,n){e=e|0,n=+n,ci(t[e>>2]|0,w(n))}function vi(e){e=e|0,xi(t[e>>2]|0)}function Xf(e,n){e=e|0,n=+n,qr(t[e>>2]|0,w(n))}function Rc(e,n){e=e|0,n=+n,Eo(t[e>>2]|0,w(n))}function Jf(e,n){e=e|0,n=+n,wl(t[e>>2]|0,w(n))}function ao(e,n){e=e|0,n=+n,js(t[e>>2]|0,w(n))}function $o(e,n){e=e|0,n=+n,du(t[e>>2]|0,w(n))}function kl(e,n){e=e|0,n=+n,Yu(t[e>>2]|0,w(n))}function Nc(e,n){e=e|0,n=+n,oo(t[e>>2]|0,w(n))}function Al(e,n){e=e|0,n=+n,Hi(t[e>>2]|0,w(n))}function vf(e,n){e=e|0,n=+n,F0(t[e>>2]|0,w(n))}function Qf(e,n,r){e=e|0,n=n|0,r=+r,ft(t[e>>2]|0,n,w(r))}function k0(e,n,r){e=e|0,n=n|0,r=+r,He(t[e>>2]|0,n,w(r))}function v(e,n,r){e=e|0,n=n|0,r=+r,Qe(t[e>>2]|0,n,w(r))}function m(e){return e=e|0,ve(t[e>>2]|0)|0}function S(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;o=h,h=h+16|0,s=o,ar(s,t[n>>2]|0,r),O(e,s),h=o}function O(e,n){e=e|0,n=n|0,M(e,t[n+4>>2]|0,+w(D[n>>2]))}function M(e,n,r){e=e|0,n=n|0,r=+r,t[e>>2]=n,L[e+8>>3]=r}function b(e){return e=e|0,U(t[e>>2]|0)|0}function ee(e){return e=e|0,fe(t[e>>2]|0)|0}function Ye(e){return e=e|0,de(t[e>>2]|0)|0}function Ze(e){return e=e|0,au(t[e>>2]|0)|0}function ut(e){return e=e|0,Ge(t[e>>2]|0)|0}function In(e){return e=e|0,F(t[e>>2]|0)|0}function A0(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;o=h,h=h+16|0,s=o,d0(s,t[n>>2]|0,r),O(e,s),h=o}function jr(e){return e=e|0,xe(t[e>>2]|0)|0}function gi(e){return e=e|0,Xe(t[e>>2]|0)|0}function po(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,Rt(o,t[n>>2]|0),O(e,o),h=r}function _i(e){return e=e|0,+ +w(yl(t[e>>2]|0))}function Re(e){return e=e|0,+ +w(cu(t[e>>2]|0))}function Ce(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,p0(o,t[n>>2]|0),O(e,o),h=r}function ze(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,E0(o,t[n>>2]|0),O(e,o),h=r}function Et(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,So(o,t[n>>2]|0),O(e,o),h=r}function on(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,Dl(o,t[n>>2]|0),O(e,o),h=r}function sr(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,Us(o,t[n>>2]|0),O(e,o),h=r}function mn(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,qs(o,t[n>>2]|0),O(e,o),h=r}function pr(e){return e=e|0,+ +w(Gr(t[e>>2]|0))}function Hr(e,n){return e=e|0,n=n|0,+ +w(St(t[e>>2]|0,n))}function Vn(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;o=h,h=h+16|0,s=o,Ne(s,t[n>>2]|0,r),O(e,s),h=o}function ni(e,n,r){e=e|0,n=n|0,r=r|0,Ns(t[e>>2]|0,t[n>>2]|0,r)}function Zf(e,n){e=e|0,n=n|0,D0(t[e>>2]|0,t[n>>2]|0)}function Pm(e){return e=e|0,fi(t[e>>2]|0)|0}function Ha(e){return e=e|0,e=nr(t[e>>2]|0)|0,e?e=Yf(e)|0:e=0,e|0}function vd(e,n){return e=e|0,n=n|0,e=e0(t[e>>2]|0,n)|0,e?e=Yf(e)|0:e=0,e|0}function gd(e,n){e=e|0,n=n|0;var r=0,o=0;o=Tt(4)|0,ba(o,n),r=e+4|0,n=t[r>>2]|0,t[r>>2]=o,n|0&&(Ju(n),Ve(n)),bu(t[e>>2]|0,1)}function ba(e,n){e=e|0,n=n|0,Oo(e,n)}function Bc(e,n,r,o,s,l){e=e|0,n=n|0,r=w(r),o=o|0,s=w(s),l=l|0;var d=0,_=0;d=h,h=h+16|0,_=d,Mm(_,Vu(n)|0,+r,o,+s,l),D[e>>2]=w(+L[_>>3]),D[e+4>>2]=w(+L[_+8>>3]),h=d}function Mm(e,n,r,o,s,l){e=e|0,n=n|0,r=+r,o=o|0,s=+s,l=l|0;var d=0,_=0,y=0,k=0,T=0;d=h,h=h+32|0,T=d+8|0,k=d+20|0,y=d,_=d+16|0,L[T>>3]=r,t[k>>2]=o,L[y>>3]=s,t[_>>2]=l,_d(e,t[n+4>>2]|0,T,k,y,_),h=d}function _d(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0;var d=0,_=0;d=h,h=h+16|0,_=d,Zo(_),n=Oi(n)|0,Fm(e,n,+L[r>>3],t[o>>2]|0,+L[s>>3],t[l>>2]|0),eu(_),h=d}function Oi(e){return e=e|0,t[e>>2]|0}function Fm(e,n,r,o,s,l){e=e|0,n=n|0,r=+r,o=o|0,s=+s,l=l|0;var d=0;d=ko(yd()|0)|0,r=+Ko(r),o=jc(o)|0,s=+Ko(s),Ga(e,ro(0,d|0,n|0,+r,o|0,+s,jc(l)|0)|0)}function yd(){var e=0;return c[7608]|0||(Ed(9120),e=7608,t[e>>2]=1,t[e+4>>2]=0),9120}function ko(e){return e=e|0,t[e+8>>2]|0}function Ko(e){return e=+e,+ +Ol(e)}function jc(e){return e=e|0,Dd(e)|0}function Ga(e,n){e=e|0,n=n|0;var r=0,o=0,s=0;s=h,h=h+32|0,r=s,o=n,o&1?(Lm(r,0),c0(o|0,r|0)|0,Va(e,r),Wn(r)):(t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=t[n+8>>2],t[e+12>>2]=t[n+12>>2]),h=s}function Lm(e,n){e=e|0,n=n|0,wd(e,n),t[e+8>>2]=0,c[e+24>>0]=0}function Va(e,n){e=e|0,n=n|0,n=n+8|0,t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=t[n+8>>2],t[e+12>>2]=t[n+12>>2]}function Wn(e){e=e|0,c[e+24>>0]=0}function wd(e,n){e=e|0,n=n|0,t[e>>2]=n}function Dd(e){return e=e|0,e|0}function Ol(e){return e=+e,+e}function Ed(e){e=e|0,Ao(e,Rm()|0,4)}function Rm(){return 1064}function Ao(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r,t[e+8>>2]=hl(n|0,r+1|0)|0}function Oo(e,n){e=e|0,n=n|0,n=t[n>>2]|0,t[e>>2]=n,qi(n|0)}function Nm(e){e=e|0;var n=0,r=0;r=e+4|0,n=t[r>>2]|0,t[r>>2]=0,n|0&&(Ju(n),Ve(n)),bu(t[e>>2]|0,0)}function Uc(e){e=e|0,rr(t[e>>2]|0)}function Ya(e){return e=e|0,Go(t[e>>2]|0)|0}function Sd(e,n,r,o){e=e|0,n=+n,r=+r,o=o|0,Yr(t[e>>2]|0,w(n),w(r),o)}function Cd(e){return e=e|0,+ +w(ir(t[e>>2]|0))}function ho(e){return e=e|0,+ +w(Y0(t[e>>2]|0))}function bs(e){return e=e|0,+ +w(L0(t[e>>2]|0))}function $a(e){return e=e|0,+ +w(Co(t[e>>2]|0))}function Td(e){return e=e|0,+ +w($u(t[e>>2]|0))}function qc(e){return e=e|0,+ +w(Vo(t[e>>2]|0))}function xd(e,n){e=e|0,n=n|0,L[e>>3]=+w(ir(t[n>>2]|0)),L[e+8>>3]=+w(Y0(t[n>>2]|0)),L[e+16>>3]=+w(L0(t[n>>2]|0)),L[e+24>>3]=+w(Co(t[n>>2]|0)),L[e+32>>3]=+w($u(t[n>>2]|0)),L[e+40>>3]=+w(Vo(t[n>>2]|0))}function Ka(e,n){return e=e|0,n=n|0,+ +w(Rr(t[e>>2]|0,n))}function kd(e,n){return e=e|0,n=n|0,+ +w(Jn(t[e>>2]|0,n))}function Xa(e,n){return e=e|0,n=n|0,+ +w(ai(t[e>>2]|0,n))}function Ja(){return Rs()|0}function Gs(){Bm(),Vs(),Ad(),Od(),Qa(),jm()}function Bm(){hO(11713,4938,1)}function Vs(){FA(10448)}function Ad(){hA(10408)}function Od(){Bk(10324)}function Qa(){Gx(10096)}function jm(){Um(9132)}function Um(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0,Pe=0,ke=0,qe=0,pe=0,_e=0,vt=0,Ln=0,Ht=0,It=0,gn=0,Pn=0,zt=0,Dr=0,Ki=0,Xi=0,Ji=0,Ro=0,kf=0,Af=0,Cu=0,Of=0,Js=0,Qs=0,If=0,Pf=0,Mf=0,Kn=0,Tu=0,Ff=0,us=0,Lf=0,Rf=0,Zs=0,el=0,ss=0,Fi=0,nu=0,go=0,xu=0,jl=0,Ul=0,tl=0,ql=0,zl=0,Li=0,Di=0,ku=0,xr=0,Wl=0,Qi=0,ls=0,Zi=0,fs=0,Hl=0,bl=0,cs=0,Ri=0,Au=0,Gl=0,Vl=0,Yl=0,En=0,br=0,Ei=0,eo=0,Ni=0,xn=0,Vt=0,Ou=0;n=h,h=h+672|0,r=n+656|0,Ou=n+648|0,Vt=n+640|0,xn=n+632|0,Ni=n+624|0,eo=n+616|0,Ei=n+608|0,br=n+600|0,En=n+592|0,Yl=n+584|0,Vl=n+576|0,Gl=n+568|0,Au=n+560|0,Ri=n+552|0,cs=n+544|0,bl=n+536|0,Hl=n+528|0,fs=n+520|0,Zi=n+512|0,ls=n+504|0,Qi=n+496|0,Wl=n+488|0,xr=n+480|0,ku=n+472|0,Di=n+464|0,Li=n+456|0,zl=n+448|0,ql=n+440|0,tl=n+432|0,Ul=n+424|0,jl=n+416|0,xu=n+408|0,go=n+400|0,nu=n+392|0,Fi=n+384|0,ss=n+376|0,el=n+368|0,Zs=n+360|0,Rf=n+352|0,Lf=n+344|0,us=n+336|0,Ff=n+328|0,Tu=n+320|0,Kn=n+312|0,Mf=n+304|0,Pf=n+296|0,If=n+288|0,Qs=n+280|0,Js=n+272|0,Of=n+264|0,Cu=n+256|0,Af=n+248|0,kf=n+240|0,Ro=n+232|0,Ji=n+224|0,Xi=n+216|0,Ki=n+208|0,Dr=n+200|0,zt=n+192|0,Pn=n+184|0,gn=n+176|0,It=n+168|0,Ht=n+160|0,Ln=n+152|0,vt=n+144|0,_e=n+136|0,pe=n+128|0,qe=n+120|0,ke=n+112|0,Pe=n+104|0,ie=n+96|0,le=n+88|0,we=n+80|0,q=n+72|0,P=n+64|0,T=n+56|0,k=n+48|0,y=n+40|0,_=n+32|0,d=n+24|0,l=n+16|0,s=n+8|0,o=n,qm(e,3646),Id(e,3651,2)|0,Pd(e,3665,2)|0,zm(e,3682,18)|0,t[Ou>>2]=19,t[Ou+4>>2]=0,t[r>>2]=t[Ou>>2],t[r+4>>2]=t[Ou+4>>2],gf(e,3690,r)|0,t[Vt>>2]=1,t[Vt+4>>2]=0,t[r>>2]=t[Vt>>2],t[r+4>>2]=t[Vt+4>>2],Md(e,3696,r)|0,t[xn>>2]=2,t[xn+4>>2]=0,t[r>>2]=t[xn>>2],t[r+4>>2]=t[xn+4>>2],Xr(e,3706,r)|0,t[Ni>>2]=1,t[Ni+4>>2]=0,t[r>>2]=t[Ni>>2],t[r+4>>2]=t[Ni+4>>2],yi(e,3722,r)|0,t[eo>>2]=2,t[eo+4>>2]=0,t[r>>2]=t[eo>>2],t[r+4>>2]=t[eo+4>>2],yi(e,3734,r)|0,t[Ei>>2]=3,t[Ei+4>>2]=0,t[r>>2]=t[Ei>>2],t[r+4>>2]=t[Ei+4>>2],Xr(e,3753,r)|0,t[br>>2]=4,t[br+4>>2]=0,t[r>>2]=t[br>>2],t[r+4>>2]=t[br+4>>2],Xr(e,3769,r)|0,t[En>>2]=5,t[En+4>>2]=0,t[r>>2]=t[En>>2],t[r+4>>2]=t[En+4>>2],Xr(e,3783,r)|0,t[Yl>>2]=6,t[Yl+4>>2]=0,t[r>>2]=t[Yl>>2],t[r+4>>2]=t[Yl+4>>2],Xr(e,3796,r)|0,t[Vl>>2]=7,t[Vl+4>>2]=0,t[r>>2]=t[Vl>>2],t[r+4>>2]=t[Vl+4>>2],Xr(e,3813,r)|0,t[Gl>>2]=8,t[Gl+4>>2]=0,t[r>>2]=t[Gl>>2],t[r+4>>2]=t[Gl+4>>2],Xr(e,3825,r)|0,t[Au>>2]=3,t[Au+4>>2]=0,t[r>>2]=t[Au>>2],t[r+4>>2]=t[Au+4>>2],yi(e,3843,r)|0,t[Ri>>2]=4,t[Ri+4>>2]=0,t[r>>2]=t[Ri>>2],t[r+4>>2]=t[Ri+4>>2],yi(e,3853,r)|0,t[cs>>2]=9,t[cs+4>>2]=0,t[r>>2]=t[cs>>2],t[r+4>>2]=t[cs+4>>2],Xr(e,3870,r)|0,t[bl>>2]=10,t[bl+4>>2]=0,t[r>>2]=t[bl>>2],t[r+4>>2]=t[bl+4>>2],Xr(e,3884,r)|0,t[Hl>>2]=11,t[Hl+4>>2]=0,t[r>>2]=t[Hl>>2],t[r+4>>2]=t[Hl+4>>2],Xr(e,3896,r)|0,t[fs>>2]=1,t[fs+4>>2]=0,t[r>>2]=t[fs>>2],t[r+4>>2]=t[fs+4>>2],j0(e,3907,r)|0,t[Zi>>2]=2,t[Zi+4>>2]=0,t[r>>2]=t[Zi>>2],t[r+4>>2]=t[Zi+4>>2],j0(e,3915,r)|0,t[ls>>2]=3,t[ls+4>>2]=0,t[r>>2]=t[ls>>2],t[r+4>>2]=t[ls+4>>2],j0(e,3928,r)|0,t[Qi>>2]=4,t[Qi+4>>2]=0,t[r>>2]=t[Qi>>2],t[r+4>>2]=t[Qi+4>>2],j0(e,3948,r)|0,t[Wl>>2]=5,t[Wl+4>>2]=0,t[r>>2]=t[Wl>>2],t[r+4>>2]=t[Wl+4>>2],j0(e,3960,r)|0,t[xr>>2]=6,t[xr+4>>2]=0,t[r>>2]=t[xr>>2],t[r+4>>2]=t[xr+4>>2],j0(e,3974,r)|0,t[ku>>2]=7,t[ku+4>>2]=0,t[r>>2]=t[ku>>2],t[r+4>>2]=t[ku+4>>2],j0(e,3983,r)|0,t[Di>>2]=20,t[Di+4>>2]=0,t[r>>2]=t[Di>>2],t[r+4>>2]=t[Di+4>>2],gf(e,3999,r)|0,t[Li>>2]=8,t[Li+4>>2]=0,t[r>>2]=t[Li>>2],t[r+4>>2]=t[Li+4>>2],j0(e,4012,r)|0,t[zl>>2]=9,t[zl+4>>2]=0,t[r>>2]=t[zl>>2],t[r+4>>2]=t[zl+4>>2],j0(e,4022,r)|0,t[ql>>2]=21,t[ql+4>>2]=0,t[r>>2]=t[ql>>2],t[r+4>>2]=t[ql+4>>2],gf(e,4039,r)|0,t[tl>>2]=10,t[tl+4>>2]=0,t[r>>2]=t[tl>>2],t[r+4>>2]=t[tl+4>>2],j0(e,4053,r)|0,t[Ul>>2]=11,t[Ul+4>>2]=0,t[r>>2]=t[Ul>>2],t[r+4>>2]=t[Ul+4>>2],j0(e,4065,r)|0,t[jl>>2]=12,t[jl+4>>2]=0,t[r>>2]=t[jl>>2],t[r+4>>2]=t[jl+4>>2],j0(e,4084,r)|0,t[xu>>2]=13,t[xu+4>>2]=0,t[r>>2]=t[xu>>2],t[r+4>>2]=t[xu+4>>2],j0(e,4097,r)|0,t[go>>2]=14,t[go+4>>2]=0,t[r>>2]=t[go>>2],t[r+4>>2]=t[go+4>>2],j0(e,4117,r)|0,t[nu>>2]=15,t[nu+4>>2]=0,t[r>>2]=t[nu>>2],t[r+4>>2]=t[nu+4>>2],j0(e,4129,r)|0,t[Fi>>2]=16,t[Fi+4>>2]=0,t[r>>2]=t[Fi>>2],t[r+4>>2]=t[Fi+4>>2],j0(e,4148,r)|0,t[ss>>2]=17,t[ss+4>>2]=0,t[r>>2]=t[ss>>2],t[r+4>>2]=t[ss+4>>2],j0(e,4161,r)|0,t[el>>2]=18,t[el+4>>2]=0,t[r>>2]=t[el>>2],t[r+4>>2]=t[el+4>>2],j0(e,4181,r)|0,t[Zs>>2]=5,t[Zs+4>>2]=0,t[r>>2]=t[Zs>>2],t[r+4>>2]=t[Zs+4>>2],yi(e,4196,r)|0,t[Rf>>2]=6,t[Rf+4>>2]=0,t[r>>2]=t[Rf>>2],t[r+4>>2]=t[Rf+4>>2],yi(e,4206,r)|0,t[Lf>>2]=7,t[Lf+4>>2]=0,t[r>>2]=t[Lf>>2],t[r+4>>2]=t[Lf+4>>2],yi(e,4217,r)|0,t[us>>2]=3,t[us+4>>2]=0,t[r>>2]=t[us>>2],t[r+4>>2]=t[us+4>>2],Zu(e,4235,r)|0,t[Ff>>2]=1,t[Ff+4>>2]=0,t[r>>2]=t[Ff>>2],t[r+4>>2]=t[Ff+4>>2],_f(e,4251,r)|0,t[Tu>>2]=4,t[Tu+4>>2]=0,t[r>>2]=t[Tu>>2],t[r+4>>2]=t[Tu+4>>2],Zu(e,4263,r)|0,t[Kn>>2]=5,t[Kn+4>>2]=0,t[r>>2]=t[Kn>>2],t[r+4>>2]=t[Kn+4>>2],Zu(e,4279,r)|0,t[Mf>>2]=6,t[Mf+4>>2]=0,t[r>>2]=t[Mf>>2],t[r+4>>2]=t[Mf+4>>2],Zu(e,4293,r)|0,t[Pf>>2]=7,t[Pf+4>>2]=0,t[r>>2]=t[Pf>>2],t[r+4>>2]=t[Pf+4>>2],Zu(e,4306,r)|0,t[If>>2]=8,t[If+4>>2]=0,t[r>>2]=t[If>>2],t[r+4>>2]=t[If+4>>2],Zu(e,4323,r)|0,t[Qs>>2]=9,t[Qs+4>>2]=0,t[r>>2]=t[Qs>>2],t[r+4>>2]=t[Qs+4>>2],Zu(e,4335,r)|0,t[Js>>2]=2,t[Js+4>>2]=0,t[r>>2]=t[Js>>2],t[r+4>>2]=t[Js+4>>2],_f(e,4353,r)|0,t[Of>>2]=12,t[Of+4>>2]=0,t[r>>2]=t[Of>>2],t[r+4>>2]=t[Of+4>>2],Io(e,4363,r)|0,t[Cu>>2]=1,t[Cu+4>>2]=0,t[r>>2]=t[Cu>>2],t[r+4>>2]=t[Cu+4>>2],_u(e,4376,r)|0,t[Af>>2]=2,t[Af+4>>2]=0,t[r>>2]=t[Af>>2],t[r+4>>2]=t[Af+4>>2],_u(e,4388,r)|0,t[kf>>2]=13,t[kf+4>>2]=0,t[r>>2]=t[kf>>2],t[r+4>>2]=t[kf+4>>2],Io(e,4402,r)|0,t[Ro>>2]=14,t[Ro+4>>2]=0,t[r>>2]=t[Ro>>2],t[r+4>>2]=t[Ro+4>>2],Io(e,4411,r)|0,t[Ji>>2]=15,t[Ji+4>>2]=0,t[r>>2]=t[Ji>>2],t[r+4>>2]=t[Ji+4>>2],Io(e,4421,r)|0,t[Xi>>2]=16,t[Xi+4>>2]=0,t[r>>2]=t[Xi>>2],t[r+4>>2]=t[Xi+4>>2],Io(e,4433,r)|0,t[Ki>>2]=17,t[Ki+4>>2]=0,t[r>>2]=t[Ki>>2],t[r+4>>2]=t[Ki+4>>2],Io(e,4446,r)|0,t[Dr>>2]=18,t[Dr+4>>2]=0,t[r>>2]=t[Dr>>2],t[r+4>>2]=t[Dr+4>>2],Io(e,4458,r)|0,t[zt>>2]=3,t[zt+4>>2]=0,t[r>>2]=t[zt>>2],t[r+4>>2]=t[zt+4>>2],_u(e,4471,r)|0,t[Pn>>2]=1,t[Pn+4>>2]=0,t[r>>2]=t[Pn>>2],t[r+4>>2]=t[Pn+4>>2],ec(e,4486,r)|0,t[gn>>2]=10,t[gn+4>>2]=0,t[r>>2]=t[gn>>2],t[r+4>>2]=t[gn+4>>2],Zu(e,4496,r)|0,t[It>>2]=11,t[It+4>>2]=0,t[r>>2]=t[It>>2],t[r+4>>2]=t[It+4>>2],Zu(e,4508,r)|0,t[Ht>>2]=3,t[Ht+4>>2]=0,t[r>>2]=t[Ht>>2],t[r+4>>2]=t[Ht+4>>2],_f(e,4519,r)|0,t[Ln>>2]=4,t[Ln+4>>2]=0,t[r>>2]=t[Ln>>2],t[r+4>>2]=t[Ln+4>>2],Wm(e,4530,r)|0,t[vt>>2]=19,t[vt+4>>2]=0,t[r>>2]=t[vt>>2],t[r+4>>2]=t[vt+4>>2],Fd(e,4542,r)|0,t[_e>>2]=12,t[_e+4>>2]=0,t[r>>2]=t[_e>>2],t[r+4>>2]=t[_e+4>>2],yf(e,4554,r)|0,t[pe>>2]=13,t[pe+4>>2]=0,t[r>>2]=t[pe>>2],t[r+4>>2]=t[pe+4>>2],tc(e,4568,r)|0,t[qe>>2]=2,t[qe+4>>2]=0,t[r>>2]=t[qe>>2],t[r+4>>2]=t[qe+4>>2],Hm(e,4578,r)|0,t[ke>>2]=20,t[ke+4>>2]=0,t[r>>2]=t[ke>>2],t[r+4>>2]=t[ke+4>>2],Ld(e,4587,r)|0,t[Pe>>2]=22,t[Pe+4>>2]=0,t[r>>2]=t[Pe>>2],t[r+4>>2]=t[Pe+4>>2],gf(e,4602,r)|0,t[ie>>2]=23,t[ie+4>>2]=0,t[r>>2]=t[ie>>2],t[r+4>>2]=t[ie+4>>2],gf(e,4619,r)|0,t[le>>2]=14,t[le+4>>2]=0,t[r>>2]=t[le>>2],t[r+4>>2]=t[le+4>>2],Rd(e,4629,r)|0,t[we>>2]=1,t[we+4>>2]=0,t[r>>2]=t[we>>2],t[r+4>>2]=t[we+4>>2],zc(e,4637,r)|0,t[q>>2]=4,t[q+4>>2]=0,t[r>>2]=t[q>>2],t[r+4>>2]=t[q+4>>2],_u(e,4653,r)|0,t[P>>2]=5,t[P+4>>2]=0,t[r>>2]=t[P>>2],t[r+4>>2]=t[P+4>>2],_u(e,4669,r)|0,t[T>>2]=6,t[T+4>>2]=0,t[r>>2]=t[T>>2],t[r+4>>2]=t[T+4>>2],_u(e,4686,r)|0,t[k>>2]=7,t[k+4>>2]=0,t[r>>2]=t[k>>2],t[r+4>>2]=t[k+4>>2],_u(e,4701,r)|0,t[y>>2]=8,t[y+4>>2]=0,t[r>>2]=t[y>>2],t[r+4>>2]=t[y+4>>2],_u(e,4719,r)|0,t[_>>2]=9,t[_+4>>2]=0,t[r>>2]=t[_>>2],t[r+4>>2]=t[_+4>>2],_u(e,4736,r)|0,t[d>>2]=21,t[d+4>>2]=0,t[r>>2]=t[d>>2],t[r+4>>2]=t[d+4>>2],Nd(e,4754,r)|0,t[l>>2]=2,t[l+4>>2]=0,t[r>>2]=t[l>>2],t[r+4>>2]=t[l+4>>2],ec(e,4772,r)|0,t[s>>2]=3,t[s+4>>2]=0,t[r>>2]=t[s>>2],t[r+4>>2]=t[s+4>>2],ec(e,4790,r)|0,t[o>>2]=4,t[o+4>>2]=0,t[r>>2]=t[o>>2],t[r+4>>2]=t[o+4>>2],ec(e,4808,r)|0,h=n}function qm(e,n){e=e|0,n=n|0;var r=0;r=Nx()|0,t[e>>2]=r,Bx(r,n),Cf(t[e>>2]|0)}function Id(e,n,r){return e=e|0,n=n|0,r=r|0,Ex(e,Zn(n)|0,r,0),e|0}function Pd(e,n,r){return e=e|0,n=n|0,r=r|0,ux(e,Zn(n)|0,r,0),e|0}function zm(e,n,r){return e=e|0,n=n|0,r=r|0,V9(e,Zn(n)|0,r,0),e|0}function gf(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],I9(e,n,s),h=o,e|0}function Md(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],vo(e,n,s),h=o,e|0}function Xr(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],a(e,n,s),h=o,e|0}function yi(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],n4(e,n,s),h=o,e|0}function j0(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],b_(e,n,s),h=o,e|0}function Zu(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],L_(e,n,s),h=o,e|0}function _f(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Hp(e,n,s),h=o,e|0}function Io(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],e_(e,n,s),h=o,e|0}function _u(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Ip(e,n,s),h=o,e|0}function ec(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Ng(e,n,s),h=o,e|0}function Wm(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],l0(e,n,s),h=o,e|0}function Fd(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],hg(e,n,s),h=o,e|0}function yf(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],sg(e,n,s),h=o,e|0}function tc(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Kv(e,n,s),h=o,e|0}function Hm(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],y1(e,n,s),h=o,e|0}function Ld(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],wv(e,n,s),h=o,e|0}function Rd(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],fv(e,n,s),h=o,e|0}function zc(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Gd(e,n,s),h=o,e|0}function Nd(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Wc(e,n,s),h=o,e|0}function Wc(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Hc(e,r,s,1),h=o}function Zn(e){return e=e|0,e|0}function Hc(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=Za()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=Bd(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,bc(l,o)|0,o),h=s}function Za(){var e=0,n=0;if(c[7616]|0||(yu(9136),Bt(24,9136,Q|0)|0,n=7616,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9136)|0)){e=9136,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));yu(9136)}return 9136}function Bd(e){return e=e|0,0}function bc(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=Za()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],n1(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(jd(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function ur(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0;var d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0;d=h,h=h+32|0,q=d+24|0,P=d+20|0,y=d+16|0,T=d+12|0,k=d+8|0,_=d+4|0,we=d,t[P>>2]=n,t[y>>2]=r,t[T>>2]=o,t[k>>2]=s,t[_>>2]=l,l=e+28|0,t[we>>2]=t[l>>2],t[q>>2]=t[we>>2],e1(e+24|0,q,P,T,k,y,_)|0,t[l>>2]=t[t[l>>2]>>2],h=d}function e1(e,n,r,o,s,l,d){return e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,d=d|0,e=bm(n)|0,n=Tt(24)|0,t1(n+4|0,t[r>>2]|0,t[o>>2]|0,t[s>>2]|0,t[l>>2]|0,t[d>>2]|0),t[n>>2]=t[e>>2],t[e>>2]=n,n|0}function bm(e){return e=e|0,t[e>>2]|0}function t1(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,t[e>>2]=n,t[e+4>>2]=r,t[e+8>>2]=o,t[e+12>>2]=s,t[e+16>>2]=l}function Lt(e,n){return e=e|0,n=n|0,n|e|0}function n1(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function jd(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=Gm(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,Ud(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],n1(l,o,r),t[y>>2]=(t[y>>2]|0)+12,Vm(e,_),Ym(_),h=k;return}}function Gm(e){return e=e|0,357913941}function Ud(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function Vm(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Ym(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function yu(e){e=e|0,Gc(e)}function r1(e){e=e|0,i1(e+24|0)}function Dn(e){return e=e|0,t[e>>2]|0}function i1(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Gc(e){e=e|0;var n=0;n=An()|0,Nn(e,2,3,n,cn()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function An(){return 9228}function cn(){return 1140}function Vc(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0;return r=h,h=h+16|0,o=r+8|0,s=r,l=Il(e)|0,e=t[l+4>>2]|0,t[s>>2]=t[l>>2],t[s+4>>2]=e,t[o>>2]=t[s>>2],t[o+4>>2]=t[s+4>>2],n=$m(n,o)|0,h=r,n|0}function Nn(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,t[e>>2]=n,t[e+4>>2]=r,t[e+8>>2]=o,t[e+12>>2]=s,t[e+16>>2]=l}function Il(e){return e=e|0,(t[(Za()|0)+24>>2]|0)+(e*12|0)|0}function $m(e,n){e=e|0,n=n|0;var r=0,o=0,s=0;return s=h,h=h+48|0,o=s,r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),Bl[r&31](o,e),o=o1(o)|0,h=s,o|0}function o1(e){e=e|0;var n=0,r=0,o=0,s=0;return s=h,h=h+32|0,n=s+12|0,r=s,o=U0(u1()|0)|0,o?(s1(n,o),l1(r,n),qd(e,r),e=f1(n)|0):e=zd(e)|0,h=s,e|0}function u1(){var e=0;return c[7632]|0||(nc(9184),Bt(25,9184,Q|0)|0,e=7632,t[e>>2]=1,t[e+4>>2]=0),9184}function U0(e){return e=e|0,t[e+36>>2]|0}function s1(e,n){e=e|0,n=n|0,t[e>>2]=n,t[e+4>>2]=e,t[e+8>>2]=0}function l1(e,n){e=e|0,n=n|0,t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=0}function qd(e,n){e=e|0,n=n|0,Ii(n,e,e+8|0,e+16|0,e+24|0,e+32|0,e+40|0)|0}function f1(e){return e=e|0,t[(t[e+4>>2]|0)+8>>2]|0}function zd(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0,y=0;y=h,h=h+16|0,r=y+4|0,o=y,s=Qo(8)|0,l=s,d=Tt(48)|0,_=d,n=_+48|0;do t[_>>2]=t[e>>2],_=_+4|0,e=e+4|0;while((_|0)<(n|0));return n=l+4|0,t[n>>2]=d,_=Tt(8)|0,d=t[n>>2]|0,t[o>>2]=0,t[r>>2]=t[o>>2],Wd(_,d,r),t[s>>2]=_,h=y,l|0}function Wd(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=Tt(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1092,t[r+12>>2]=n,t[e+4>>2]=r}function Km(e){e=e|0,da(e),Ve(e)}function Xm(e){e=e|0,e=t[e+12>>2]|0,e|0&&Ve(e)}function es(e){e=e|0,Ve(e)}function Ii(e,n,r,o,s,l,d){return e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,d=d|0,l=c1(t[e>>2]|0,n,r,o,s,l,d)|0,d=e+4|0,t[(t[d>>2]|0)+8>>2]=l,t[(t[d>>2]|0)+8>>2]|0}function c1(e,n,r,o,s,l,d){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,d=d|0;var _=0,y=0;return _=h,h=h+16|0,y=_,Zo(y),e=Oi(e)|0,d=Jm(e,+L[n>>3],+L[r>>3],+L[o>>3],+L[s>>3],+L[l>>3],+L[d>>3])|0,eu(y),h=_,d|0}function Jm(e,n,r,o,s,l,d){e=e|0,n=+n,r=+r,o=+o,s=+s,l=+l,d=+d;var _=0;return _=ko(a1()|0)|0,n=+Ko(n),r=+Ko(r),o=+Ko(o),s=+Ko(s),l=+Ko(l),xs(0,_|0,e|0,+n,+r,+o,+s,+l,+ +Ko(d))|0}function a1(){var e=0;return c[7624]|0||(Qm(9172),e=7624,t[e>>2]=1,t[e+4>>2]=0),9172}function Qm(e){e=e|0,Ao(e,Zm()|0,6)}function Zm(){return 1112}function nc(e){e=e|0,Ys(e)}function Hd(e){e=e|0,d1(e+24|0),bd(e+16|0)}function d1(e){e=e|0,tv(e)}function bd(e){e=e|0,ev(e)}function ev(e){e=e|0;var n=0,r=0;if(n=t[e>>2]|0,n|0)do r=n,n=t[n>>2]|0,Ve(r);while((n|0)!=0);t[e>>2]=0}function tv(e){e=e|0;var n=0,r=0;if(n=t[e>>2]|0,n|0)do r=n,n=t[n>>2]|0,Ve(r);while((n|0)!=0);t[e>>2]=0}function Ys(e){e=e|0;var n=0;t[e+16>>2]=0,t[e+20>>2]=0,n=e+24|0,t[n>>2]=0,t[e+28>>2]=n,t[e+36>>2]=0,c[e+40>>0]=0,c[e+41>>0]=0}function Gd(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Vd(e,r,s,0),h=o}function Vd(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=p1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=h1(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,Yd(l,o)|0,o),h=s}function p1(){var e=0,n=0;if(c[7640]|0||(Xo(9232),Bt(26,9232,Q|0)|0,n=7640,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9232)|0)){e=9232,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Xo(9232)}return 9232}function h1(e){return e=e|0,0}function Yd(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=p1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],wf(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(m1(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function wf(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function m1(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=$d(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,Kd(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],wf(l,o,r),t[y>>2]=(t[y>>2]|0)+12,Yc(e,_),Xd(_),h=k;return}}function $d(e){return e=e|0,357913941}function Kd(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function Yc(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Xd(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Xo(e){e=e|0,Jd(e)}function Pl(e){e=e|0,nv(e+24|0)}function nv(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Jd(e){e=e|0;var n=0;n=An()|0,Nn(e,2,1,n,rv()|0,3),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function rv(){return 1144}function iv(e,n,r,o,s){e=e|0,n=n|0,r=+r,o=+o,s=s|0;var l=0,d=0,_=0,y=0;l=h,h=h+16|0,d=l+8|0,_=l,y=ov(e)|0,e=t[y+4>>2]|0,t[_>>2]=t[y>>2],t[_+4>>2]=e,t[d>>2]=t[_>>2],t[d+4>>2]=t[_+4>>2],uv(n,d,r,o,s),h=l}function ov(e){return e=e|0,(t[(p1()|0)+24>>2]|0)+(e*12|0)|0}function uv(e,n,r,o,s){e=e|0,n=n|0,r=+r,o=+o,s=s|0;var l=0,d=0,_=0,y=0,k=0;k=h,h=h+16|0,d=k+2|0,_=k+1|0,y=k,l=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(l=t[(t[e>>2]|0)+l>>2]|0),wu(d,r),r=+Du(d,r),wu(_,o),o=+Du(_,o),ts(y,s),y=ns(y,s)|0,iD[l&1](e,r,o,y),h=k}function wu(e,n){e=e|0,n=+n}function Du(e,n){return e=e|0,n=+n,+ +lv(n)}function ts(e,n){e=e|0,n=n|0}function ns(e,n){return e=e|0,n=n|0,sv(n)|0}function sv(e){return e=e|0,e|0}function lv(e){return e=+e,+e}function fv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Qd(e,r,s,1),h=o}function Qd(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=$c()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=Zd(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,cv(l,o)|0,o),h=s}function $c(){var e=0,n=0;if(c[7648]|0||(np(9268),Bt(27,9268,Q|0)|0,n=7648,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9268)|0)){e=9268,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));np(9268)}return 9268}function Zd(e){return e=e|0,0}function cv(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=$c()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],ep(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(av(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function ep(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function av(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=tp(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,dv(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],ep(l,o,r),t[y>>2]=(t[y>>2]|0)+12,pv(e,_),hv(_),h=k;return}}function tp(e){return e=e|0,357913941}function dv(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function pv(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function hv(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function np(e){e=e|0,Po(e)}function mv(e){e=e|0,vv(e+24|0)}function vv(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Po(e){e=e|0;var n=0;n=An()|0,Nn(e,2,4,n,gv()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function gv(){return 1160}function _v(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0;return r=h,h=h+16|0,o=r+8|0,s=r,l=yv(e)|0,e=t[l+4>>2]|0,t[s>>2]=t[l>>2],t[s+4>>2]=e,t[o>>2]=t[s>>2],t[o+4>>2]=t[s+4>>2],n=rp(n,o)|0,h=r,n|0}function yv(e){return e=e|0,(t[($c()|0)+24>>2]|0)+(e*12|0)|0}function rp(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),ip(dc[r&31](e)|0)|0}function ip(e){return e=e|0,e&1|0}function wv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Dv(e,r,s,0),h=o}function Dv(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=v1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=g1(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,Ev(l,o)|0,o),h=s}function v1(){var e=0,n=0;if(c[7656]|0||(up(9304),Bt(28,9304,Q|0)|0,n=7656,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9304)|0)){e=9304,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));up(9304)}return 9304}function g1(e){return e=e|0,0}function Ev(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=v1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],op(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Sv(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function op(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function Sv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=Cv(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,Tv(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],op(l,o,r),t[y>>2]=(t[y>>2]|0)+12,xv(e,_),kv(_),h=k;return}}function Cv(e){return e=e|0,357913941}function Tv(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function xv(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function kv(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function up(e){e=e|0,Iv(e)}function Av(e){e=e|0,Ov(e+24|0)}function Ov(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Iv(e){e=e|0;var n=0;n=An()|0,Nn(e,2,5,n,Pv()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Pv(){return 1164}function Mv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,s=o+8|0,l=o,d=Fv(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Lv(n,s,r),h=o}function Fv(e){return e=e|0,(t[(v1()|0)+24>>2]|0)+(e*12|0)|0}function Lv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),$s(s,r),r=Ks(s,r)|0,Bl[o&31](e,r),Xs(s),h=l}function $s(e,n){e=e|0,n=n|0,Rv(e,n)}function Ks(e,n){return e=e|0,n=n|0,e|0}function Xs(e){e=e|0,Ju(e)}function Rv(e,n){e=e|0,n=n|0,_1(e,n)}function _1(e,n){e=e|0,n=n|0,t[e>>2]=n}function y1(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],sp(e,r,s,0),h=o}function sp(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=w1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=Nv(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,Bv(l,o)|0,o),h=s}function w1(){var e=0,n=0;if(c[7664]|0||(cp(9340),Bt(29,9340,Q|0)|0,n=7664,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9340)|0)){e=9340,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));cp(9340)}return 9340}function Nv(e){return e=e|0,0}function Bv(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=w1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],lp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(jv(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function lp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function jv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=Uv(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,qv(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],lp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,zv(e,_),fp(_),h=k;return}}function Uv(e){return e=e|0,357913941}function qv(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function zv(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function fp(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function cp(e){e=e|0,Hv(e)}function Kc(e){e=e|0,Wv(e+24|0)}function Wv(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Hv(e){e=e|0;var n=0;n=An()|0,Nn(e,2,4,n,bv()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function bv(){return 1180}function Gv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=Vv(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],r=Yv(n,s,r)|0,h=o,r|0}function Vv(e){return e=e|0,(t[(w1()|0)+24>>2]|0)+(e*12|0)|0}function Yv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;return l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),Ml(s,r),s=Fl(s,r)|0,s=Xc(J4[o&15](e,s)|0)|0,h=l,s|0}function Ml(e,n){e=e|0,n=n|0}function Fl(e,n){return e=e|0,n=n|0,$v(n)|0}function Xc(e){return e=e|0,e|0}function $v(e){return e=e|0,e|0}function Kv(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Xv(e,r,s,0),h=o}function Xv(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=D1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=Jv(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,Qv(l,o)|0,o),h=s}function D1(){var e=0,n=0;if(c[7672]|0||(hp(9376),Bt(30,9376,Q|0)|0,n=7672,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9376)|0)){e=9376,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));hp(9376)}return 9376}function Jv(e){return e=e|0,0}function Qv(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=D1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],ap(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(dp(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function ap(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function dp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=pp(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,Zv(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],ap(l,o,r),t[y>>2]=(t[y>>2]|0)+12,eg(e,_),tg(_),h=k;return}}function pp(e){return e=e|0,357913941}function Zv(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function eg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function tg(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function hp(e){e=e|0,rg(e)}function Jc(e){e=e|0,ng(e+24|0)}function ng(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function rg(e){e=e|0;var n=0;n=An()|0,Nn(e,2,5,n,mp()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function mp(){return 1196}function ig(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0;return r=h,h=h+16|0,o=r+8|0,s=r,l=og(e)|0,e=t[l+4>>2]|0,t[s>>2]=t[l>>2],t[s+4>>2]=e,t[o>>2]=t[s>>2],t[o+4>>2]=t[s+4>>2],n=ug(n,o)|0,h=r,n|0}function og(e){return e=e|0,(t[(D1()|0)+24>>2]|0)+(e*12|0)|0}function ug(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),Xc(dc[r&31](e)|0)|0}function sg(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],lg(e,r,s,1),h=o}function lg(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=E1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=fg(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,cg(l,o)|0,o),h=s}function E1(){var e=0,n=0;if(c[7680]|0||(C1(9412),Bt(31,9412,Q|0)|0,n=7680,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9412)|0)){e=9412,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));C1(9412)}return 9412}function fg(e){return e=e|0,0}function cg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=E1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],rc(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(ag(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function rc(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function ag(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=vp(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,gp(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],rc(l,o,r),t[y>>2]=(t[y>>2]|0)+12,S1(e,_),_p(_),h=k;return}}function vp(e){return e=e|0,357913941}function gp(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function S1(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function _p(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function C1(e){e=e|0,dg(e)}function yp(e){e=e|0,wp(e+24|0)}function wp(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function dg(e){e=e|0;var n=0;n=An()|0,Nn(e,2,6,n,Dp()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Dp(){return 1200}function pg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0;return r=h,h=h+16|0,o=r+8|0,s=r,l=Qc(e)|0,e=t[l+4>>2]|0,t[s>>2]=t[l>>2],t[s+4>>2]=e,t[o>>2]=t[s>>2],t[o+4>>2]=t[s+4>>2],n=Zc(n,o)|0,h=r,n|0}function Qc(e){return e=e|0,(t[(E1()|0)+24>>2]|0)+(e*12|0)|0}function Zc(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),ea(dc[r&31](e)|0)|0}function ea(e){return e=e|0,e|0}function hg(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],T1(e,r,s,0),h=o}function T1(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=ta()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=mg(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,vg(l,o)|0,o),h=s}function ta(){var e=0,n=0;if(c[7688]|0||(Sp(9448),Bt(32,9448,Q|0)|0,n=7688,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9448)|0)){e=9448,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Sp(9448)}return 9448}function mg(e){return e=e|0,0}function vg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=ta()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Ep(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(gg(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Ep(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function gg(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=_g(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,yg(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Ep(l,o,r),t[y>>2]=(t[y>>2]|0)+12,wg(e,_),Dg(_),h=k;return}}function _g(e){return e=e|0,357913941}function yg(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function wg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Dg(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Sp(e){e=e|0,Cg(e)}function Eg(e){e=e|0,Sg(e+24|0)}function Sg(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Cg(e){e=e|0;var n=0;n=An()|0,Nn(e,2,6,n,Mo()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Mo(){return 1204}function Tg(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,s=o+8|0,l=o,d=xg(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Ll(n,s,r),h=o}function xg(e){return e=e|0,(t[(ta()|0)+24>>2]|0)+(e*12|0)|0}function Ll(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),On(s,r),s=x1(s,r)|0,Bl[o&31](e,s),h=l}function On(e,n){e=e|0,n=n|0}function x1(e,n){return e=e|0,n=n|0,Vi(n)|0}function Vi(e){return e=e|0,e|0}function l0(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],kg(e,r,s,0),h=o}function kg(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=Eu()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=Ag(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,Og(l,o)|0,o),h=s}function Eu(){var e=0,n=0;if(c[7696]|0||(A1(9484),Bt(33,9484,Q|0)|0,n=7696,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9484)|0)){e=9484,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));A1(9484)}return 9484}function Ag(e){return e=e|0,0}function Og(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=Eu()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Cp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Ig(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Cp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function Ig(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=Pg(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,k1(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Cp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,Mg(e,_),rs(_),h=k;return}}function Pg(e){return e=e|0,357913941}function k1(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function Mg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function rs(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function A1(e){e=e|0,n0(e)}function na(e){e=e|0,Jr(e+24|0)}function Jr(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function n0(e){e=e|0;var n=0;n=An()|0,Nn(e,2,1,n,Tp()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Tp(){return 1212}function Fg(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;s=h,h=h+16|0,l=s+8|0,d=s,_=Lg(e)|0,e=t[_+4>>2]|0,t[d>>2]=t[_>>2],t[d+4>>2]=e,t[l>>2]=t[d>>2],t[l+4>>2]=t[d+4>>2],Rg(n,l,r,o),h=s}function Lg(e){return e=e|0,(t[(Eu()|0)+24>>2]|0)+(e*12|0)|0}function Rg(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;_=h,h=h+16|0,l=_+1|0,d=_,s=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(s=t[(t[e>>2]|0)+s>>2]|0),On(l,r),l=x1(l,r)|0,Ml(d,o),d=Fl(d,o)|0,X1[s&15](e,l,d),h=_}function Ng(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Bg(e,r,s,1),h=o}function Bg(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=O1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=xp(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,ic(l,o)|0,o),h=s}function O1(){var e=0,n=0;if(c[7704]|0||(Ap(9520),Bt(34,9520,Q|0)|0,n=7704,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9520)|0)){e=9520,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Ap(9520)}return 9520}function xp(e){return e=e|0,0}function ic(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=O1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],ra(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(jg(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function ra(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function jg(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=kp(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,ia(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],ra(l,o,r),t[y>>2]=(t[y>>2]|0)+12,mo(e,_),Df(_),h=k;return}}function kp(e){return e=e|0,357913941}function ia(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function mo(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Df(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Ap(e){e=e|0,zg(e)}function Ug(e){e=e|0,qg(e+24|0)}function qg(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function zg(e){e=e|0;var n=0;n=An()|0,Nn(e,2,1,n,Wg()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Wg(){return 1224}function Op(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;return s=h,h=h+16|0,l=s+8|0,d=s,_=is(e)|0,e=t[_+4>>2]|0,t[d>>2]=t[_>>2],t[d+4>>2]=e,t[l>>2]=t[d>>2],t[l+4>>2]=t[d+4>>2],o=+jn(n,l,r),h=s,+o}function is(e){return e=e|0,(t[(O1()|0)+24>>2]|0)+(e*12|0)|0}function jn(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),ts(s,r),s=ns(s,r)|0,d=+Ol(+uD[o&7](e,s)),h=l,+d}function Ip(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Fo(e,r,s,1),h=o}function Fo(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=oa()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=Hg(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,yr(l,o)|0,o),h=s}function oa(){var e=0,n=0;if(c[7712]|0||(Fp(9556),Bt(35,9556,Q|0)|0,n=7712,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9556)|0)){e=9556,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Fp(9556)}return 9556}function Hg(e){return e=e|0,0}function yr(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=oa()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Pp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Mp(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Pp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function Mp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=ua(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,bg(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Pp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,Gg(e,_),Vg(_),h=k;return}}function ua(e){return e=e|0,357913941}function bg(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function Gg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Vg(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Fp(e){e=e|0,Kg(e)}function Yg(e){e=e|0,$g(e+24|0)}function $g(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Kg(e){e=e|0;var n=0;n=An()|0,Nn(e,2,5,n,Xg()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Xg(){return 1232}function Jg(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=Qg(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],r=+Zg(n,s),h=o,+r}function Qg(e){return e=e|0,(t[(oa()|0)+24>>2]|0)+(e*12|0)|0}function Zg(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),+ +Ol(+oD[r&15](e))}function e_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],t_(e,r,s,1),h=o}function t_(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=oc()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=n_(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,I1(l,o)|0,o),h=s}function oc(){var e=0,n=0;if(c[7720]|0||(Rp(9592),Bt(36,9592,Q|0)|0,n=7720,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9592)|0)){e=9592,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Rp(9592)}return 9592}function n_(e){return e=e|0,0}function I1(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=oc()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Lp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(r_(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Lp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function r_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=i_(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,q0(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Lp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,Yi(e,_),o_(_),h=k;return}}function i_(e){return e=e|0,357913941}function q0(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function Yi(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function o_(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Rp(e){e=e|0,s_(e)}function u_(e){e=e|0,Np(e+24|0)}function Np(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function s_(e){e=e|0;var n=0;n=An()|0,Nn(e,2,7,n,l_()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function l_(){return 1276}function f_(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0;return r=h,h=h+16|0,o=r+8|0,s=r,l=Bp(e)|0,e=t[l+4>>2]|0,t[s>>2]=t[l>>2],t[s+4>>2]=e,t[o>>2]=t[s>>2],t[o+4>>2]=t[s+4>>2],n=c_(n,o)|0,h=r,n|0}function Bp(e){return e=e|0,(t[(oc()|0)+24>>2]|0)+(e*12|0)|0}function c_(e,n){e=e|0,n=n|0;var r=0,o=0,s=0;return s=h,h=h+16|0,o=s,r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),Bl[r&31](o,e),o=jp(o)|0,h=s,o|0}function jp(e){e=e|0;var n=0,r=0,o=0,s=0;return s=h,h=h+32|0,n=s+12|0,r=s,o=U0(Up()|0)|0,o?(s1(n,o),l1(r,n),qp(e,r),e=f1(n)|0):e=zp(e)|0,h=s,e|0}function Up(){var e=0;return c[7736]|0||(Wp(9640),Bt(25,9640,Q|0)|0,e=7736,t[e>>2]=1,t[e+4>>2]=0),9640}function qp(e,n){e=e|0,n=n|0,Ef(n,e,e+8|0)|0}function zp(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0;return r=h,h=h+16|0,s=r+4|0,d=r,o=Qo(8)|0,n=o,_=Tt(16)|0,t[_>>2]=t[e>>2],t[_+4>>2]=t[e+4>>2],t[_+8>>2]=t[e+8>>2],t[_+12>>2]=t[e+12>>2],l=n+4|0,t[l>>2]=_,e=Tt(8)|0,l=t[l>>2]|0,t[d>>2]=0,t[s>>2]=t[d>>2],P1(e,l,s),t[o>>2]=e,h=r,n|0}function P1(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=Tt(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1244,t[r+12>>2]=n,t[e+4>>2]=r}function a_(e){e=e|0,da(e),Ve(e)}function d_(e){e=e|0,e=t[e+12>>2]|0,e|0&&Ve(e)}function p_(e){e=e|0,Ve(e)}function Ef(e,n,r){return e=e|0,n=n|0,r=r|0,n=h_(t[e>>2]|0,n,r)|0,r=e+4|0,t[(t[r>>2]|0)+8>>2]=n,t[(t[r>>2]|0)+8>>2]|0}function h_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;return o=h,h=h+16|0,s=o,Zo(s),e=Oi(e)|0,r=m_(e,t[n>>2]|0,+L[r>>3])|0,eu(s),h=o,r|0}function m_(e,n,r){e=e|0,n=n|0,r=+r;var o=0;return o=ko(v_()|0)|0,n=jc(n)|0,dl(0,o|0,e|0,n|0,+ +Ko(r))|0}function v_(){var e=0;return c[7728]|0||(g_(9628),e=7728,t[e>>2]=1,t[e+4>>2]=0),9628}function g_(e){e=e|0,Ao(e,__()|0,2)}function __(){return 1264}function Wp(e){e=e|0,Ys(e)}function Hp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],y_(e,r,s,1),h=o}function y_(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=M1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=w_(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,D_(l,o)|0,o),h=s}function M1(){var e=0,n=0;if(c[7744]|0||(Gp(9684),Bt(37,9684,Q|0)|0,n=7744,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9684)|0)){e=9684,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Gp(9684)}return 9684}function w_(e){return e=e|0,0}function D_(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=M1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],bp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(E_(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function bp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function E_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=S_(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,C_(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],bp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,T_(e,_),x_(_),h=k;return}}function S_(e){return e=e|0,357913941}function C_(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function T_(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function x_(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Gp(e){e=e|0,O_(e)}function k_(e){e=e|0,A_(e+24|0)}function A_(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function O_(e){e=e|0;var n=0;n=An()|0,Nn(e,2,5,n,I_()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function I_(){return 1280}function P_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=M_(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],r=F_(n,s,r)|0,h=o,r|0}function M_(e){return e=e|0,(t[(M1()|0)+24>>2]|0)+(e*12|0)|0}function F_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return d=h,h=h+32|0,s=d,l=d+16|0,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),ts(l,r),l=ns(l,r)|0,X1[o&15](s,e,l),l=jp(s)|0,h=d,l|0}function L_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],R_(e,r,s,1),h=o}function R_(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=F1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=N_(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,B_(l,o)|0,o),h=s}function F1(){var e=0,n=0;if(c[7752]|0||(Kp(9720),Bt(38,9720,Q|0)|0,n=7752,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9720)|0)){e=9720,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Kp(9720)}return 9720}function N_(e){return e=e|0,0}function B_(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=F1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Vp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(j_(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Vp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function j_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=L1(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,Yp(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Vp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,$p(e,_),U_(_),h=k;return}}function L1(e){return e=e|0,357913941}function Yp(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function $p(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function U_(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Kp(e){e=e|0,z_(e)}function q_(e){e=e|0,R1(e+24|0)}function R1(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function z_(e){e=e|0;var n=0;n=An()|0,Nn(e,2,8,n,W_()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function W_(){return 1288}function H_(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0;return r=h,h=h+16|0,o=r+8|0,s=r,l=$i(e)|0,e=t[l+4>>2]|0,t[s>>2]=t[l>>2],t[s+4>>2]=e,t[o>>2]=t[s>>2],t[o+4>>2]=t[s+4>>2],n=N1(n,o)|0,h=r,n|0}function $i(e){return e=e|0,(t[(F1()|0)+24>>2]|0)+(e*12|0)|0}function N1(e,n){e=e|0,n=n|0;var r=0;return r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),Dd(dc[r&31](e)|0)|0}function b_(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],G_(e,r,s,0),h=o}function G_(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=B1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=V_(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,j1(l,o)|0,o),h=s}function B1(){var e=0,n=0;if(c[7760]|0||(q1(9756),Bt(39,9756,Q|0)|0,n=7760,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9756)|0)){e=9756,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));q1(9756)}return 9756}function V_(e){return e=e|0,0}function j1(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=B1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Xp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(U1(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Xp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function U1(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=Y_(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,$_(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Xp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,K_(e,_),X_(_),h=k;return}}function Y_(e){return e=e|0,357913941}function $_(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function K_(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function X_(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function q1(e){e=e|0,Z_(e)}function J_(e){e=e|0,Q_(e+24|0)}function Q_(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function Z_(e){e=e|0;var n=0;n=An()|0,Nn(e,2,8,n,z1()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function z1(){return 1292}function W1(e,n,r){e=e|0,n=n|0,r=+r;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,s=o+8|0,l=o,d=e4(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],t4(n,s,r),h=o}function e4(e){return e=e|0,(t[(B1()|0)+24>>2]|0)+(e*12|0)|0}function t4(e,n,r){e=e|0,n=n|0,r=+r;var o=0,s=0,l=0;l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),wu(s,r),r=+Du(s,r),nD[o&31](e,r),h=l}function n4(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],r4(e,r,s,0),h=o}function r4(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=H1()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=i4(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,o4(l,o)|0,o),h=s}function H1(){var e=0,n=0;if(c[7768]|0||(Qp(9792),Bt(40,9792,Q|0)|0,n=7768,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9792)|0)){e=9792,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Qp(9792)}return 9792}function i4(e){return e=e|0,0}function o4(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=H1()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Jp(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(u4(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Jp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function u4(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=s4(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,l4(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Jp(l,o,r),t[y>>2]=(t[y>>2]|0)+12,f4(e,_),c4(_),h=k;return}}function s4(e){return e=e|0,357913941}function l4(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function f4(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function c4(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Qp(e){e=e|0,p4(e)}function a4(e){e=e|0,d4(e+24|0)}function d4(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function p4(e){e=e|0;var n=0;n=An()|0,Nn(e,2,1,n,h4()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function h4(){return 1300}function m4(e,n,r,o){e=e|0,n=n|0,r=r|0,o=+o;var s=0,l=0,d=0,_=0;s=h,h=h+16|0,l=s+8|0,d=s,_=v4(e)|0,e=t[_+4>>2]|0,t[d>>2]=t[_>>2],t[d+4>>2]=e,t[l>>2]=t[d>>2],t[l+4>>2]=t[d+4>>2],g4(n,l,r,o),h=s}function v4(e){return e=e|0,(t[(H1()|0)+24>>2]|0)+(e*12|0)|0}function g4(e,n,r,o){e=e|0,n=n|0,r=r|0,o=+o;var s=0,l=0,d=0,_=0;_=h,h=h+16|0,l=_+1|0,d=_,s=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(s=t[(t[e>>2]|0)+s>>2]|0),ts(l,r),l=ns(l,r)|0,wu(d,o),o=+Du(d,o),cD[s&15](e,l,o),h=_}function a(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],p(e,r,s,0),h=o}function p(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=E()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=I(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,B(l,o)|0,o),h=s}function E(){var e=0,n=0;if(c[7776]|0||(nt(9828),Bt(41,9828,Q|0)|0,n=7776,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9828)|0)){e=9828,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));nt(9828)}return 9828}function I(e){return e=e|0,0}function B(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=E()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],G(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(te(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function G(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function te(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=se(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,Ee(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],G(l,o,r),t[y>>2]=(t[y>>2]|0)+12,$e(e,_),Ke(_),h=k;return}}function se(e){return e=e|0,357913941}function Ee(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function $e(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Ke(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function nt(e){e=e|0,an(e)}function Ct(e){e=e|0,Gt(e+24|0)}function Gt(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function an(e){e=e|0;var n=0;n=An()|0,Nn(e,2,7,n,qn()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function qn(){return 1312}function dn(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,s=o+8|0,l=o,d=Yn(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],er(n,s,r),h=o}function Yn(e){return e=e|0,(t[(E()|0)+24>>2]|0)+(e*12|0)|0}function er(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),ts(s,r),s=ns(s,r)|0,Bl[o&31](e,s),h=l}function vo(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Pi(e,r,s,0),h=o}function Pi(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=Mi()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=f0(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,Jo(l,o)|0,o),h=s}function Mi(){var e=0,n=0;if(c[7784]|0||(kw(9864),Bt(42,9864,Q|0)|0,n=7784,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9864)|0)){e=9864,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));kw(9864)}return 9864}function f0(e){return e=e|0,0}function Jo(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=Mi()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Su(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(Zp(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Su(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function Zp(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=v9(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,g9(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Su(l,o,r),t[y>>2]=(t[y>>2]|0)+12,_9(e,_),y9(_),h=k;return}}function v9(e){return e=e|0,357913941}function g9(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function _9(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function y9(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function kw(e){e=e|0,E9(e)}function w9(e){e=e|0,D9(e+24|0)}function D9(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function E9(e){e=e|0;var n=0;n=An()|0,Nn(e,2,8,n,S9()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function S9(){return 1320}function C9(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,s=o+8|0,l=o,d=T9(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],x9(n,s,r),h=o}function T9(e){return e=e|0,(t[(Mi()|0)+24>>2]|0)+(e*12|0)|0}function x9(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),k9(s,r),s=A9(s,r)|0,Bl[o&31](e,s),h=l}function k9(e,n){e=e|0,n=n|0}function A9(e,n){return e=e|0,n=n|0,O9(n)|0}function O9(e){return e=e|0,e|0}function I9(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],P9(e,r,s,0),h=o}function P9(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=_4()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=M9(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,F9(l,o)|0,o),h=s}function _4(){var e=0,n=0;if(c[7792]|0||(Ow(9900),Bt(43,9900,Q|0)|0,n=7792,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9900)|0)){e=9900,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Ow(9900)}return 9900}function M9(e){return e=e|0,0}function F9(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=_4()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Aw(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(L9(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Aw(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function L9(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=R9(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,N9(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Aw(l,o,r),t[y>>2]=(t[y>>2]|0)+12,B9(e,_),j9(_),h=k;return}}function R9(e){return e=e|0,357913941}function N9(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function B9(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function j9(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Ow(e){e=e|0,z9(e)}function U9(e){e=e|0,q9(e+24|0)}function q9(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function z9(e){e=e|0;var n=0;n=An()|0,Nn(e,2,22,n,W9()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function W9(){return 1344}function H9(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0;r=h,h=h+16|0,o=r+8|0,s=r,l=b9(e)|0,e=t[l+4>>2]|0,t[s>>2]=t[l>>2],t[s+4>>2]=e,t[o>>2]=t[s>>2],t[o+4>>2]=t[s+4>>2],G9(n,o),h=r}function b9(e){return e=e|0,(t[(_4()|0)+24>>2]|0)+(e*12|0)|0}function G9(e,n){e=e|0,n=n|0;var r=0;r=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(r=t[(t[e>>2]|0)+r>>2]|0),Nl[r&127](e)}function V9(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=y4()|0,e=Y9(r)|0,ur(l,n,s,e,$9(r,o)|0,o)}function y4(){var e=0,n=0;if(c[7800]|0||(Pw(9936),Bt(44,9936,Q|0)|0,n=7800,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9936)|0)){e=9936,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Pw(9936)}return 9936}function Y9(e){return e=e|0,e|0}function $9(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=y4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(Iw(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(K9(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function Iw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function K9(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=X9(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,J9(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,Iw(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,Q9(e,s),Z9(s),h=_;return}}function X9(e){return e=e|0,536870911}function J9(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function Q9(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Z9(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function Pw(e){e=e|0,nx(e)}function ex(e){e=e|0,tx(e+24|0)}function tx(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function nx(e){e=e|0;var n=0;n=An()|0,Nn(e,1,23,n,Mo()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function rx(e,n){e=e|0,n=n|0,ox(t[(ix(e)|0)>>2]|0,n)}function ix(e){return e=e|0,(t[(y4()|0)+24>>2]|0)+(e<<3)|0}function ox(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,On(o,n),n=x1(o,n)|0,Nl[e&127](n),h=r}function ux(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=w4()|0,e=sx(r)|0,ur(l,n,s,e,lx(r,o)|0,o)}function w4(){var e=0,n=0;if(c[7808]|0||(Fw(9972),Bt(45,9972,Q|0)|0,n=7808,t[n>>2]=1,t[n+4>>2]=0),!(Dn(9972)|0)){e=9972,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Fw(9972)}return 9972}function sx(e){return e=e|0,e|0}function lx(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=w4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(Mw(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(fx(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function Mw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function fx(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=cx(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,ax(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,Mw(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,dx(e,s),px(s),h=_;return}}function cx(e){return e=e|0,536870911}function ax(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function dx(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function px(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function Fw(e){e=e|0,vx(e)}function hx(e){e=e|0,mx(e+24|0)}function mx(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function vx(e){e=e|0;var n=0;n=An()|0,Nn(e,1,9,n,gx()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function gx(){return 1348}function _x(e,n){return e=e|0,n=n|0,wx(t[(yx(e)|0)>>2]|0,n)|0}function yx(e){return e=e|0,(t[(w4()|0)+24>>2]|0)+(e<<3)|0}function wx(e,n){e=e|0,n=n|0;var r=0,o=0;return r=h,h=h+16|0,o=r,Lw(o,n),n=Rw(o,n)|0,n=Xc(dc[e&31](n)|0)|0,h=r,n|0}function Lw(e,n){e=e|0,n=n|0}function Rw(e,n){return e=e|0,n=n|0,Dx(n)|0}function Dx(e){return e=e|0,e|0}function Ex(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=D4()|0,e=Sx(r)|0,ur(l,n,s,e,Cx(r,o)|0,o)}function D4(){var e=0,n=0;if(c[7816]|0||(Bw(10008),Bt(46,10008,Q|0)|0,n=7816,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10008)|0)){e=10008,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Bw(10008)}return 10008}function Sx(e){return e=e|0,e|0}function Cx(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=D4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(Nw(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(Tx(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function Nw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function Tx(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=xx(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,kx(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,Nw(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,Ax(e,s),Ox(s),h=_;return}}function xx(e){return e=e|0,536870911}function kx(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function Ax(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function Ox(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function Bw(e){e=e|0,Mx(e)}function Ix(e){e=e|0,Px(e+24|0)}function Px(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function Mx(e){e=e|0;var n=0;n=An()|0,Nn(e,1,15,n,mp()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Fx(e){return e=e|0,Rx(t[(Lx(e)|0)>>2]|0)|0}function Lx(e){return e=e|0,(t[(D4()|0)+24>>2]|0)+(e<<3)|0}function Rx(e){return e=e|0,Xc(ph[e&7]()|0)|0}function Nx(){var e=0;return c[7832]|0||(bx(10052),Bt(25,10052,Q|0)|0,e=7832,t[e>>2]=1,t[e+4>>2]=0),10052}function Bx(e,n){e=e|0,n=n|0,t[e>>2]=jx()|0,t[e+4>>2]=Ux()|0,t[e+12>>2]=n,t[e+8>>2]=qx()|0,t[e+32>>2]=2}function jx(){return 11709}function Ux(){return 1188}function qx(){return eh()|0}function zx(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(Wx(r),Ve(r)):n|0&&(mu(n),Ve(n))}function Sf(e,n){return e=e|0,n=n|0,n&e|0}function Wx(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function eh(){var e=0;return c[7824]|0||(t[2511]=Hx()|0,t[2512]=0,e=7824,t[e>>2]=1,t[e+4>>2]=0),10044}function Hx(){return 0}function bx(e){e=e|0,Ys(e)}function Gx(e){e=e|0;var n=0,r=0,o=0,s=0,l=0;n=h,h=h+32|0,r=n+24|0,l=n+16|0,s=n+8|0,o=n,Vx(e,4827),Yx(e,4834,3)|0,$x(e,3682,47)|0,t[l>>2]=9,t[l+4>>2]=0,t[r>>2]=t[l>>2],t[r+4>>2]=t[l+4>>2],Kx(e,4841,r)|0,t[s>>2]=1,t[s+4>>2]=0,t[r>>2]=t[s>>2],t[r+4>>2]=t[s+4>>2],Xx(e,4871,r)|0,t[o>>2]=10,t[o+4>>2]=0,t[r>>2]=t[o>>2],t[r+4>>2]=t[o+4>>2],Jx(e,4891,r)|0,h=n}function Vx(e,n){e=e|0,n=n|0;var r=0;r=Ok()|0,t[e>>2]=r,Ik(r,n),Cf(t[e>>2]|0)}function Yx(e,n,r){return e=e|0,n=n|0,r=r|0,pk(e,Zn(n)|0,r,0),e|0}function $x(e,n,r){return e=e|0,n=n|0,r=r|0,Q7(e,Zn(n)|0,r,0),e|0}function Kx(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],F7(e,n,s),h=o,e|0}function Xx(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],h7(e,n,s),h=o,e|0}function Jx(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=t[r+4>>2]|0,t[l>>2]=t[r>>2],t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Qx(e,n,s),h=o,e|0}function Qx(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],Zx(e,r,s,1),h=o}function Zx(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=E4()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=e7(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,t7(l,o)|0,o),h=s}function E4(){var e=0,n=0;if(c[7840]|0||(Uw(10100),Bt(48,10100,Q|0)|0,n=7840,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10100)|0)){e=10100,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Uw(10100)}return 10100}function e7(e){return e=e|0,0}function t7(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=E4()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],jw(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(n7(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function jw(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function n7(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=r7(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,i7(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],jw(l,o,r),t[y>>2]=(t[y>>2]|0)+12,o7(e,_),u7(_),h=k;return}}function r7(e){return e=e|0,357913941}function i7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function o7(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function u7(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Uw(e){e=e|0,f7(e)}function s7(e){e=e|0,l7(e+24|0)}function l7(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function f7(e){e=e|0;var n=0;n=An()|0,Nn(e,2,6,n,c7()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function c7(){return 1364}function a7(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;return o=h,h=h+16|0,s=o+8|0,l=o,d=d7(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],r=p7(n,s,r)|0,h=o,r|0}function d7(e){return e=e|0,(t[(E4()|0)+24>>2]|0)+(e*12|0)|0}function p7(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;return l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),ts(s,r),s=ns(s,r)|0,s=ip(J4[o&15](e,s)|0)|0,h=l,s|0}function h7(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],m7(e,r,s,0),h=o}function m7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=S4()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=v7(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,g7(l,o)|0,o),h=s}function S4(){var e=0,n=0;if(c[7848]|0||(zw(10136),Bt(49,10136,Q|0)|0,n=7848,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10136)|0)){e=10136,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));zw(10136)}return 10136}function v7(e){return e=e|0,0}function g7(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=S4()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],qw(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(_7(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function qw(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function _7(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=y7(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,w7(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],qw(l,o,r),t[y>>2]=(t[y>>2]|0)+12,D7(e,_),E7(_),h=k;return}}function y7(e){return e=e|0,357913941}function w7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function D7(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function E7(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function zw(e){e=e|0,T7(e)}function S7(e){e=e|0,C7(e+24|0)}function C7(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function T7(e){e=e|0;var n=0;n=An()|0,Nn(e,2,9,n,x7()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function x7(){return 1372}function k7(e,n,r){e=e|0,n=n|0,r=+r;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,s=o+8|0,l=o,d=A7(e)|0,e=t[d+4>>2]|0,t[l>>2]=t[d>>2],t[l+4>>2]=e,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],O7(n,s,r),h=o}function A7(e){return e=e|0,(t[(S4()|0)+24>>2]|0)+(e*12|0)|0}function O7(e,n,r){e=e|0,n=n|0,r=+r;var o=0,s=0,l=0,d=tt;l=h,h=h+16|0,s=l,o=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(o=t[(t[e>>2]|0)+o>>2]|0),I7(s,r),d=w(P7(s,r)),tD[o&1](e,d),h=l}function I7(e,n){e=e|0,n=+n}function P7(e,n){return e=e|0,n=+n,w(M7(n))}function M7(e){return e=+e,w(e)}function F7(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,s=o+8|0,l=o,_=t[r>>2]|0,d=t[r+4>>2]|0,r=Zn(n)|0,t[l>>2]=_,t[l+4>>2]=d,t[s>>2]=t[l>>2],t[s+4>>2]=t[l+4>>2],L7(e,r,s,0),h=o}function L7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0,y=0,k=0,T=0;s=h,h=h+32|0,l=s+16|0,T=s+8|0,_=s,k=t[r>>2]|0,y=t[r+4>>2]|0,d=t[e>>2]|0,e=C4()|0,t[T>>2]=k,t[T+4>>2]=y,t[l>>2]=t[T>>2],t[l+4>>2]=t[T+4>>2],r=R7(l)|0,t[_>>2]=k,t[_+4>>2]=y,t[l>>2]=t[_>>2],t[l+4>>2]=t[_+4>>2],ur(d,n,e,r,N7(l,o)|0,o),h=s}function C4(){var e=0,n=0;if(c[7856]|0||(Hw(10172),Bt(50,10172,Q|0)|0,n=7856,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10172)|0)){e=10172,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Hw(10172)}return 10172}function R7(e){return e=e|0,0}function N7(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0;return T=h,h=h+32|0,s=T+24|0,d=T+16|0,_=T,y=T+8|0,l=t[e>>2]|0,o=t[e+4>>2]|0,t[_>>2]=l,t[_+4>>2]=o,P=C4()|0,k=P+24|0,e=Lt(n,4)|0,t[y>>2]=e,n=P+28|0,r=t[n>>2]|0,r>>>0<(t[P+32>>2]|0)>>>0?(t[d>>2]=l,t[d+4>>2]=o,t[s>>2]=t[d>>2],t[s+4>>2]=t[d+4>>2],Ww(r,s,e),e=(t[n>>2]|0)+12|0,t[n>>2]=e):(B7(k,_,y),e=t[n>>2]|0),h=T,((e-(t[k>>2]|0)|0)/12|0)+-1|0}function Ww(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=t[n+4>>2]|0,t[e>>2]=t[n>>2],t[e+4>>2]=o,t[e+8>>2]=r}function B7(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;if(k=h,h=h+48|0,o=k+32|0,d=k+24|0,_=k,y=e+4|0,s=(((t[y>>2]|0)-(t[e>>2]|0)|0)/12|0)+1|0,l=j7(e)|0,l>>>0>>0)$n(e);else{T=t[e>>2]|0,q=((t[e+8>>2]|0)-T|0)/12|0,P=q<<1,U7(_,q>>>0>>1>>>0?P>>>0>>0?s:P:l,((t[y>>2]|0)-T|0)/12|0,e+8|0),y=_+8|0,l=t[y>>2]|0,s=t[n+4>>2]|0,r=t[r>>2]|0,t[d>>2]=t[n>>2],t[d+4>>2]=s,t[o>>2]=t[d>>2],t[o+4>>2]=t[d+4>>2],Ww(l,o,r),t[y>>2]=(t[y>>2]|0)+12,q7(e,_),z7(_),h=k;return}}function j7(e){return e=e|0,357913941}function U7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>357913941)_n();else{s=Tt(n*12|0)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r*12|0)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n*12|0)}function q7(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(((s|0)/-12|0)*12|0)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function z7(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~(((o+-12-n|0)>>>0)/12|0)*12|0)),e=t[e>>2]|0,e|0&&Ve(e)}function Hw(e){e=e|0,b7(e)}function W7(e){e=e|0,H7(e+24|0)}function H7(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~(((n+-12-o|0)>>>0)/12|0)*12|0)),Ve(r))}function b7(e){e=e|0;var n=0;n=An()|0,Nn(e,2,3,n,G7()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function G7(){return 1380}function V7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;s=h,h=h+16|0,l=s+8|0,d=s,_=Y7(e)|0,e=t[_+4>>2]|0,t[d>>2]=t[_>>2],t[d+4>>2]=e,t[l>>2]=t[d>>2],t[l+4>>2]=t[d+4>>2],$7(n,l,r,o),h=s}function Y7(e){return e=e|0,(t[(C4()|0)+24>>2]|0)+(e*12|0)|0}function $7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;_=h,h=h+16|0,l=_+1|0,d=_,s=t[n>>2]|0,n=t[n+4>>2]|0,e=e+(n>>1)|0,n&1&&(s=t[(t[e>>2]|0)+s>>2]|0),ts(l,r),l=ns(l,r)|0,K7(d,o),d=X7(d,o)|0,X1[s&15](e,l,d),h=_}function K7(e,n){e=e|0,n=n|0}function X7(e,n){return e=e|0,n=n|0,J7(n)|0}function J7(e){return e=e|0,(e|0)!=0|0}function Q7(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=T4()|0,e=Z7(r)|0,ur(l,n,s,e,ek(r,o)|0,o)}function T4(){var e=0,n=0;if(c[7864]|0||(Gw(10208),Bt(51,10208,Q|0)|0,n=7864,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10208)|0)){e=10208,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Gw(10208)}return 10208}function Z7(e){return e=e|0,e|0}function ek(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=T4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(bw(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(tk(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function bw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function tk(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=nk(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,rk(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,bw(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,ik(e,s),ok(s),h=_;return}}function nk(e){return e=e|0,536870911}function rk(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function ik(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function ok(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function Gw(e){e=e|0,lk(e)}function uk(e){e=e|0,sk(e+24|0)}function sk(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function lk(e){e=e|0;var n=0;n=An()|0,Nn(e,1,24,n,fk()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function fk(){return 1392}function ck(e,n){e=e|0,n=n|0,dk(t[(ak(e)|0)>>2]|0,n)}function ak(e){return e=e|0,(t[(T4()|0)+24>>2]|0)+(e<<3)|0}function dk(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,Lw(o,n),n=Rw(o,n)|0,Nl[e&127](n),h=r}function pk(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=x4()|0,e=hk(r)|0,ur(l,n,s,e,mk(r,o)|0,o)}function x4(){var e=0,n=0;if(c[7872]|0||(Yw(10244),Bt(52,10244,Q|0)|0,n=7872,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10244)|0)){e=10244,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));Yw(10244)}return 10244}function hk(e){return e=e|0,e|0}function mk(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=x4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(Vw(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(vk(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function Vw(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function vk(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=gk(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,_k(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,Vw(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,yk(e,s),wk(s),h=_;return}}function gk(e){return e=e|0,536870911}function _k(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function yk(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function wk(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function Yw(e){e=e|0,Sk(e)}function Dk(e){e=e|0,Ek(e+24|0)}function Ek(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function Sk(e){e=e|0;var n=0;n=An()|0,Nn(e,1,16,n,Ck()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Ck(){return 1400}function Tk(e){return e=e|0,kk(t[(xk(e)|0)>>2]|0)|0}function xk(e){return e=e|0,(t[(x4()|0)+24>>2]|0)+(e<<3)|0}function kk(e){return e=e|0,Ak(ph[e&7]()|0)|0}function Ak(e){return e=e|0,e|0}function Ok(){var e=0;return c[7880]|0||(Nk(10280),Bt(25,10280,Q|0)|0,e=7880,t[e>>2]=1,t[e+4>>2]=0),10280}function Ik(e,n){e=e|0,n=n|0,t[e>>2]=Pk()|0,t[e+4>>2]=Mk()|0,t[e+12>>2]=n,t[e+8>>2]=Fk()|0,t[e+32>>2]=4}function Pk(){return 11711}function Mk(){return 1356}function Fk(){return eh()|0}function Lk(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(Rk(r),Ve(r)):n|0&&(Gi(n),Ve(n))}function Rk(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function Nk(e){e=e|0,Ys(e)}function Bk(e){e=e|0,jk(e,4920),Uk(e)|0,qk(e)|0}function jk(e,n){e=e|0,n=n|0;var r=0;r=Up()|0,t[e>>2]=r,sA(r,n),Cf(t[e>>2]|0)}function Uk(e){e=e|0;var n=0;return n=t[e>>2]|0,uc(n,Jk()|0),e|0}function qk(e){e=e|0;var n=0;return n=t[e>>2]|0,uc(n,zk()|0),e|0}function zk(){var e=0;return c[7888]|0||($w(10328),Bt(53,10328,Q|0)|0,e=7888,t[e>>2]=1,t[e+4>>2]=0),Dn(10328)|0||$w(10328),10328}function uc(e,n){e=e|0,n=n|0,ur(e,0,n,0,0,0)}function $w(e){e=e|0,bk(e),sc(e,10)}function Wk(e){e=e|0,Hk(e+24|0)}function Hk(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function bk(e){e=e|0;var n=0;n=An()|0,Nn(e,5,1,n,$k()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function Gk(e,n,r){e=e|0,n=n|0,r=+r,Vk(e,n,r)}function sc(e,n){e=e|0,n=n|0,t[e+20>>2]=n}function Vk(e,n,r){e=e|0,n=n|0,r=+r;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+16|0,l=o+8|0,_=o+13|0,s=o,d=o+12|0,ts(_,n),t[l>>2]=ns(_,n)|0,wu(d,r),L[s>>3]=+Du(d,r),Yk(e,l,s),h=o}function Yk(e,n,r){e=e|0,n=n|0,r=r|0,M(e+8|0,t[n>>2]|0,+L[r>>3]),c[e+24>>0]=1}function $k(){return 1404}function Kk(e,n){return e=e|0,n=+n,Xk(e,n)|0}function Xk(e,n){e=e|0,n=+n;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return o=h,h=h+16|0,l=o+4|0,d=o+8|0,_=o,s=Qo(8)|0,r=s,y=Tt(16)|0,ts(l,e),e=ns(l,e)|0,wu(d,n),M(y,e,+Du(d,n)),d=r+4|0,t[d>>2]=y,e=Tt(8)|0,d=t[d>>2]|0,t[_>>2]=0,t[l>>2]=t[_>>2],P1(e,d,l),t[s>>2]=e,h=o,r|0}function Jk(){var e=0;return c[7896]|0||(Kw(10364),Bt(54,10364,Q|0)|0,e=7896,t[e>>2]=1,t[e+4>>2]=0),Dn(10364)|0||Kw(10364),10364}function Kw(e){e=e|0,eA(e),sc(e,55)}function Qk(e){e=e|0,Zk(e+24|0)}function Zk(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function eA(e){e=e|0;var n=0;n=An()|0,Nn(e,5,4,n,iA()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function tA(e){e=e|0,nA(e)}function nA(e){e=e|0,rA(e)}function rA(e){e=e|0,Xw(e+8|0),c[e+24>>0]=1}function Xw(e){e=e|0,t[e>>2]=0,L[e+8>>3]=0}function iA(){return 1424}function oA(){return uA()|0}function uA(){var e=0,n=0,r=0,o=0,s=0,l=0,d=0;return n=h,h=h+16|0,s=n+4|0,d=n,r=Qo(8)|0,e=r,o=Tt(16)|0,Xw(o),l=e+4|0,t[l>>2]=o,o=Tt(8)|0,l=t[l>>2]|0,t[d>>2]=0,t[s>>2]=t[d>>2],P1(o,l,s),t[r>>2]=o,h=n,e|0}function sA(e,n){e=e|0,n=n|0,t[e>>2]=lA()|0,t[e+4>>2]=fA()|0,t[e+12>>2]=n,t[e+8>>2]=cA()|0,t[e+32>>2]=5}function lA(){return 11710}function fA(){return 1416}function cA(){return th()|0}function aA(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(dA(r),Ve(r)):n|0&&Ve(n)}function dA(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function th(){var e=0;return c[7904]|0||(t[2600]=pA()|0,t[2601]=0,e=7904,t[e>>2]=1,t[e+4>>2]=0),10400}function pA(){return t[357]|0}function hA(e){e=e|0,mA(e,4926),vA(e)|0}function mA(e,n){e=e|0,n=n|0;var r=0;r=u1()|0,t[e>>2]=r,kA(r,n),Cf(t[e>>2]|0)}function vA(e){e=e|0;var n=0;return n=t[e>>2]|0,uc(n,gA()|0),e|0}function gA(){var e=0;return c[7912]|0||(Jw(10412),Bt(56,10412,Q|0)|0,e=7912,t[e>>2]=1,t[e+4>>2]=0),Dn(10412)|0||Jw(10412),10412}function Jw(e){e=e|0,wA(e),sc(e,57)}function _A(e){e=e|0,yA(e+24|0)}function yA(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function wA(e){e=e|0;var n=0;n=An()|0,Nn(e,5,5,n,CA()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function DA(e){e=e|0,EA(e)}function EA(e){e=e|0,SA(e)}function SA(e){e=e|0;var n=0,r=0;n=e+8|0,r=n+48|0;do t[n>>2]=0,n=n+4|0;while((n|0)<(r|0));c[e+56>>0]=1}function CA(){return 1432}function TA(){return xA()|0}function xA(){var e=0,n=0,r=0,o=0,s=0,l=0,d=0,_=0;d=h,h=h+16|0,e=d+4|0,n=d,r=Qo(8)|0,o=r,s=Tt(48)|0,l=s,_=l+48|0;do t[l>>2]=0,l=l+4|0;while((l|0)<(_|0));return l=o+4|0,t[l>>2]=s,_=Tt(8)|0,l=t[l>>2]|0,t[n>>2]=0,t[e>>2]=t[n>>2],Wd(_,l,e),t[r>>2]=_,h=d,o|0}function kA(e,n){e=e|0,n=n|0,t[e>>2]=AA()|0,t[e+4>>2]=OA()|0,t[e+12>>2]=n,t[e+8>>2]=IA()|0,t[e+32>>2]=6}function AA(){return 11704}function OA(){return 1436}function IA(){return th()|0}function PA(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(MA(r),Ve(r)):n|0&&Ve(n)}function MA(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function FA(e){e=e|0,LA(e,4933),RA(e)|0,NA(e)|0}function LA(e,n){e=e|0,n=n|0;var r=0;r=uO()|0,t[e>>2]=r,sO(r,n),Cf(t[e>>2]|0)}function RA(e){e=e|0;var n=0;return n=t[e>>2]|0,uc(n,XA()|0),e|0}function NA(e){e=e|0;var n=0;return n=t[e>>2]|0,uc(n,BA()|0),e|0}function BA(){var e=0;return c[7920]|0||(Qw(10452),Bt(58,10452,Q|0)|0,e=7920,t[e>>2]=1,t[e+4>>2]=0),Dn(10452)|0||Qw(10452),10452}function Qw(e){e=e|0,qA(e),sc(e,1)}function jA(e){e=e|0,UA(e+24|0)}function UA(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function qA(e){e=e|0;var n=0;n=An()|0,Nn(e,5,1,n,bA()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function zA(e,n,r){e=e|0,n=+n,r=+r,WA(e,n,r)}function WA(e,n,r){e=e|0,n=+n,r=+r;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+32|0,l=o+8|0,_=o+17|0,s=o,d=o+16|0,wu(_,n),L[l>>3]=+Du(_,n),wu(d,r),L[s>>3]=+Du(d,r),HA(e,l,s),h=o}function HA(e,n,r){e=e|0,n=n|0,r=r|0,Zw(e+8|0,+L[n>>3],+L[r>>3]),c[e+24>>0]=1}function Zw(e,n,r){e=e|0,n=+n,r=+r,L[e>>3]=n,L[e+8>>3]=r}function bA(){return 1472}function GA(e,n){return e=+e,n=+n,VA(e,n)|0}function VA(e,n){e=+e,n=+n;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return o=h,h=h+16|0,d=o+4|0,_=o+8|0,y=o,s=Qo(8)|0,r=s,l=Tt(16)|0,wu(d,e),e=+Du(d,e),wu(_,n),Zw(l,e,+Du(_,n)),_=r+4|0,t[_>>2]=l,l=Tt(8)|0,_=t[_>>2]|0,t[y>>2]=0,t[d>>2]=t[y>>2],e8(l,_,d),t[s>>2]=l,h=o,r|0}function e8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=Tt(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1452,t[r+12>>2]=n,t[e+4>>2]=r}function YA(e){e=e|0,da(e),Ve(e)}function $A(e){e=e|0,e=t[e+12>>2]|0,e|0&&Ve(e)}function KA(e){e=e|0,Ve(e)}function XA(){var e=0;return c[7928]|0||(t8(10488),Bt(59,10488,Q|0)|0,e=7928,t[e>>2]=1,t[e+4>>2]=0),Dn(10488)|0||t8(10488),10488}function t8(e){e=e|0,ZA(e),sc(e,60)}function JA(e){e=e|0,QA(e+24|0)}function QA(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function ZA(e){e=e|0;var n=0;n=An()|0,Nn(e,5,6,n,rO()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function eO(e){e=e|0,tO(e)}function tO(e){e=e|0,nO(e)}function nO(e){e=e|0,n8(e+8|0),c[e+24>>0]=1}function n8(e){e=e|0,t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,t[e+12>>2]=0}function rO(){return 1492}function iO(){return oO()|0}function oO(){var e=0,n=0,r=0,o=0,s=0,l=0,d=0;return n=h,h=h+16|0,s=n+4|0,d=n,r=Qo(8)|0,e=r,o=Tt(16)|0,n8(o),l=e+4|0,t[l>>2]=o,o=Tt(8)|0,l=t[l>>2]|0,t[d>>2]=0,t[s>>2]=t[d>>2],e8(o,l,s),t[r>>2]=o,h=n,e|0}function uO(){var e=0;return c[7936]|0||(pO(10524),Bt(25,10524,Q|0)|0,e=7936,t[e>>2]=1,t[e+4>>2]=0),10524}function sO(e,n){e=e|0,n=n|0,t[e>>2]=lO()|0,t[e+4>>2]=fO()|0,t[e+12>>2]=n,t[e+8>>2]=cO()|0,t[e+32>>2]=7}function lO(){return 11700}function fO(){return 1484}function cO(){return th()|0}function aO(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(dO(r),Ve(r)):n|0&&Ve(n)}function dO(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function pO(e){e=e|0,Ys(e)}function hO(e,n,r){e=e|0,n=n|0,r=r|0,e=Zn(n)|0,n=mO(r)|0,r=vO(r,0)|0,VO(e,n,r,k4()|0,0)}function mO(e){return e=e|0,e|0}function vO(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=k4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(i8(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(SO(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function k4(){var e=0,n=0;if(c[7944]|0||(r8(10568),Bt(61,10568,Q|0)|0,n=7944,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10568)|0)){e=10568,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));r8(10568)}return 10568}function r8(e){e=e|0,yO(e)}function gO(e){e=e|0,_O(e+24|0)}function _O(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function yO(e){e=e|0;var n=0;n=An()|0,Nn(e,1,17,n,Dp()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function wO(e){return e=e|0,EO(t[(DO(e)|0)>>2]|0)|0}function DO(e){return e=e|0,(t[(k4()|0)+24>>2]|0)+(e<<3)|0}function EO(e){return e=e|0,ea(ph[e&7]()|0)|0}function i8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function SO(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=CO(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,TO(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,i8(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,xO(e,s),kO(s),h=_;return}}function CO(e){return e=e|0,536870911}function TO(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function xO(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function kO(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function AO(){OO()}function OO(){IO(10604)}function IO(e){e=e|0,PO(e,4955)}function PO(e,n){e=e|0,n=n|0;var r=0;r=MO()|0,t[e>>2]=r,FO(r,n),Cf(t[e>>2]|0)}function MO(){var e=0;return c[7952]|0||(WO(10612),Bt(25,10612,Q|0)|0,e=7952,t[e>>2]=1,t[e+4>>2]=0),10612}function FO(e,n){e=e|0,n=n|0,t[e>>2]=BO()|0,t[e+4>>2]=jO()|0,t[e+12>>2]=n,t[e+8>>2]=UO()|0,t[e+32>>2]=8}function Cf(e){e=e|0;var n=0,r=0;n=h,h=h+16|0,r=n,sa()|0,t[r>>2]=e,LO(10608,r),h=n}function sa(){return c[11714]|0||(t[2652]=0,Bt(62,10608,Q|0)|0,c[11714]=1),10608}function LO(e,n){e=e|0,n=n|0;var r=0;r=Tt(8)|0,t[r+4>>2]=t[n>>2],t[r>>2]=t[e>>2],t[e>>2]=r}function RO(e){e=e|0,NO(e)}function NO(e){e=e|0;var n=0,r=0;if(n=t[e>>2]|0,n|0)do r=n,n=t[n>>2]|0,Ve(r);while((n|0)!=0);t[e>>2]=0}function BO(){return 11715}function jO(){return 1496}function UO(){return eh()|0}function qO(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(zO(r),Ve(r)):n|0&&Ve(n)}function zO(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function WO(e){e=e|0,Ys(e)}function HO(e,n){e=e|0,n=n|0;var r=0,o=0;sa()|0,r=t[2652]|0;e:do if(r|0){for(;o=t[r+4>>2]|0,!(o|0?(U8(A4(o)|0,e)|0)==0:0);)if(r=t[r>>2]|0,!r)break e;bO(o,n)}while(0)}function A4(e){return e=e|0,t[e+12>>2]|0}function bO(e,n){e=e|0,n=n|0;var r=0;e=e+36|0,r=t[e>>2]|0,r|0&&(Ju(r),Ve(r)),r=Tt(4)|0,ba(r,n),t[e>>2]=r}function O4(){return c[11716]|0||(t[2664]=0,Bt(63,10656,Q|0)|0,c[11716]=1),10656}function o8(){var e=0;return c[11717]|0?e=t[2665]|0:(GO(),t[2665]=1504,c[11717]=1,e=1504),e|0}function GO(){c[11740]|0||(c[11718]=Lt(Lt(8,0)|0,0)|0,c[11719]=Lt(Lt(0,0)|0,0)|0,c[11720]=Lt(Lt(0,16)|0,0)|0,c[11721]=Lt(Lt(8,0)|0,0)|0,c[11722]=Lt(Lt(0,0)|0,0)|0,c[11723]=Lt(Lt(8,0)|0,0)|0,c[11724]=Lt(Lt(0,0)|0,0)|0,c[11725]=Lt(Lt(8,0)|0,0)|0,c[11726]=Lt(Lt(0,0)|0,0)|0,c[11727]=Lt(Lt(8,0)|0,0)|0,c[11728]=Lt(Lt(0,0)|0,0)|0,c[11729]=Lt(Lt(0,0)|0,32)|0,c[11730]=Lt(Lt(0,0)|0,32)|0,c[11740]=1)}function u8(){return 1572}function VO(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0,k=0,T=0;l=h,h=h+32|0,T=l+16|0,k=l+12|0,y=l+8|0,_=l+4|0,d=l,t[T>>2]=e,t[k>>2]=n,t[y>>2]=r,t[_>>2]=o,t[d>>2]=s,O4()|0,YO(10656,T,k,y,_,d),h=l}function YO(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0;var d=0;d=Tt(24)|0,t1(d+4|0,t[n>>2]|0,t[r>>2]|0,t[o>>2]|0,t[s>>2]|0,t[l>>2]|0),t[d>>2]=t[e>>2],t[e>>2]=d}function s8(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0,Pe=0,ke=0,qe=0;if(qe=h,h=h+32|0,le=qe+20|0,ie=qe+8|0,Pe=qe+4|0,ke=qe,n=t[n>>2]|0,n|0){we=le+4|0,y=le+8|0,k=ie+4|0,T=ie+8|0,P=ie+8|0,q=le+8|0;do{if(d=n+4|0,_=I4(d)|0,_|0){if(s=b1(_)|0,t[le>>2]=0,t[we>>2]=0,t[y>>2]=0,o=(G1(_)|0)+1|0,$O(le,o),o|0)for(;o=o+-1|0,os(ie,t[s>>2]|0),l=t[we>>2]|0,l>>>0<(t[q>>2]|0)>>>0?(t[l>>2]=t[ie>>2],t[we>>2]=(t[we>>2]|0)+4):P4(le,ie),o;)s=s+4|0;o=V1(_)|0,t[ie>>2]=0,t[k>>2]=0,t[T>>2]=0;e:do if(t[o>>2]|0)for(s=0,l=0;;){if((s|0)==(l|0)?KO(ie,o):(t[s>>2]=t[o>>2],t[k>>2]=(t[k>>2]|0)+4),o=o+4|0,!(t[o>>2]|0))break e;s=t[k>>2]|0,l=t[P>>2]|0}while(0);t[Pe>>2]=nh(d)|0,t[ke>>2]=Dn(_)|0,XO(r,e,Pe,ke,le,ie),M4(ie),Rl(le)}n=t[n>>2]|0}while((n|0)!=0)}h=qe}function I4(e){return e=e|0,t[e+12>>2]|0}function b1(e){return e=e|0,t[e+12>>2]|0}function G1(e){return e=e|0,t[e+16>>2]|0}function $O(e,n){e=e|0,n=n|0;var r=0,o=0,s=0;s=h,h=h+32|0,r=s,o=t[e>>2]|0,(t[e+8>>2]|0)-o>>2>>>0>>0&&(m8(r,n,(t[e+4>>2]|0)-o>>2,e+8|0),v8(e,r),g8(r)),h=s}function P4(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0;if(d=h,h=h+32|0,r=d,o=e+4|0,s=((t[o>>2]|0)-(t[e>>2]|0)>>2)+1|0,l=h8(e)|0,l>>>0>>0)$n(e);else{_=t[e>>2]|0,k=(t[e+8>>2]|0)-_|0,y=k>>1,m8(r,k>>2>>>0>>1>>>0?y>>>0>>0?s:y:l,(t[o>>2]|0)-_>>2,e+8|0),l=r+8|0,t[t[l>>2]>>2]=t[n>>2],t[l>>2]=(t[l>>2]|0)+4,v8(e,r),g8(r),h=d;return}}function V1(e){return e=e|0,t[e+8>>2]|0}function KO(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0;if(d=h,h=h+32|0,r=d,o=e+4|0,s=((t[o>>2]|0)-(t[e>>2]|0)>>2)+1|0,l=p8(e)|0,l>>>0>>0)$n(e);else{_=t[e>>2]|0,k=(t[e+8>>2]|0)-_|0,y=k>>1,mI(r,k>>2>>>0>>1>>>0?y>>>0>>0?s:y:l,(t[o>>2]|0)-_>>2,e+8|0),l=r+8|0,t[t[l>>2]>>2]=t[n>>2],t[l>>2]=(t[l>>2]|0)+4,vI(e,r),gI(r),h=d;return}}function nh(e){return e=e|0,t[e>>2]|0}function XO(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,JO(e,n,r,o,s,l)}function M4(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-4-o|0)>>>2)<<2)),Ve(r))}function Rl(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-4-o|0)>>>2)<<2)),Ve(r))}function JO(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0;var d=0,_=0,y=0,k=0,T=0,P=0;d=h,h=h+48|0,T=d+40|0,_=d+32|0,P=d+24|0,y=d+12|0,k=d,Zo(_),e=Oi(e)|0,t[P>>2]=t[n>>2],r=t[r>>2]|0,o=t[o>>2]|0,F4(y,s),QO(k,l),t[T>>2]=t[P>>2],ZO(e,T,r,o,y,k),M4(k),Rl(y),eu(_),h=d}function F4(e,n){e=e|0,n=n|0;var r=0,o=0;t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,r=n+4|0,o=(t[r>>2]|0)-(t[n>>2]|0)>>2,o|0&&(pI(e,o),hI(e,t[n>>2]|0,t[r>>2]|0,o))}function QO(e,n){e=e|0,n=n|0;var r=0,o=0;t[e>>2]=0,t[e+4>>2]=0,t[e+8>>2]=0,r=n+4|0,o=(t[r>>2]|0)-(t[n>>2]|0)>>2,o|0&&(aI(e,o),dI(e,t[n>>2]|0,t[r>>2]|0,o))}function ZO(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0;var d=0,_=0,y=0,k=0,T=0,P=0;d=h,h=h+32|0,T=d+28|0,P=d+24|0,_=d+12|0,y=d,k=ko(eI()|0)|0,t[P>>2]=t[n>>2],t[T>>2]=t[P>>2],n=lc(T)|0,r=l8(r)|0,o=L4(o)|0,t[_>>2]=t[s>>2],T=s+4|0,t[_+4>>2]=t[T>>2],P=s+8|0,t[_+8>>2]=t[P>>2],t[P>>2]=0,t[T>>2]=0,t[s>>2]=0,s=R4(_)|0,t[y>>2]=t[l>>2],T=l+4|0,t[y+4>>2]=t[T>>2],P=l+8|0,t[y+8>>2]=t[P>>2],t[P>>2]=0,t[T>>2]=0,t[l>>2]=0,qo(0,k|0,e|0,n|0,r|0,o|0,s|0,tI(y)|0)|0,M4(y),Rl(_),h=d}function eI(){var e=0;return c[7968]|0||(fI(10708),e=7968,t[e>>2]=1,t[e+4>>2]=0),10708}function lc(e){return e=e|0,c8(e)|0}function l8(e){return e=e|0,f8(e)|0}function L4(e){return e=e|0,ea(e)|0}function R4(e){return e=e|0,rI(e)|0}function tI(e){return e=e|0,nI(e)|0}function nI(e){e=e|0;var n=0,r=0,o=0;if(o=(t[e+4>>2]|0)-(t[e>>2]|0)|0,r=o>>2,o=Qo(o+4|0)|0,t[o>>2]=r,r|0){n=0;do t[o+4+(n<<2)>>2]=f8(t[(t[e>>2]|0)+(n<<2)>>2]|0)|0,n=n+1|0;while((n|0)!=(r|0))}return o|0}function f8(e){return e=e|0,e|0}function rI(e){e=e|0;var n=0,r=0,o=0;if(o=(t[e+4>>2]|0)-(t[e>>2]|0)|0,r=o>>2,o=Qo(o+4|0)|0,t[o>>2]=r,r|0){n=0;do t[o+4+(n<<2)>>2]=c8((t[e>>2]|0)+(n<<2)|0)|0,n=n+1|0;while((n|0)!=(r|0))}return o|0}function c8(e){e=e|0;var n=0,r=0,o=0,s=0;return s=h,h=h+32|0,n=s+12|0,r=s,o=U0(a8()|0)|0,o?(s1(n,o),l1(r,n),UF(e,r),e=f1(n)|0):e=iI(e)|0,h=s,e|0}function a8(){var e=0;return c[7960]|0||(lI(10664),Bt(25,10664,Q|0)|0,e=7960,t[e>>2]=1,t[e+4>>2]=0),10664}function iI(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0;return r=h,h=h+16|0,s=r+4|0,d=r,o=Qo(8)|0,n=o,_=Tt(4)|0,t[_>>2]=t[e>>2],l=n+4|0,t[l>>2]=_,e=Tt(8)|0,l=t[l>>2]|0,t[d>>2]=0,t[s>>2]=t[d>>2],d8(e,l,s),t[o>>2]=e,h=r,n|0}function d8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=Tt(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1656,t[r+12>>2]=n,t[e+4>>2]=r}function oI(e){e=e|0,da(e),Ve(e)}function uI(e){e=e|0,e=t[e+12>>2]|0,e|0&&Ve(e)}function sI(e){e=e|0,Ve(e)}function lI(e){e=e|0,Ys(e)}function fI(e){e=e|0,Ao(e,cI()|0,5)}function cI(){return 1676}function aI(e,n){e=e|0,n=n|0;var r=0;if((p8(e)|0)>>>0>>0&&$n(e),n>>>0>1073741823)_n();else{r=Tt(n<<2)|0,t[e+4>>2]=r,t[e>>2]=r,t[e+8>>2]=r+(n<<2);return}}function dI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,o=e+4|0,e=r-n|0,(e|0)>0&&(vn(t[o>>2]|0,n|0,e|0)|0,t[o>>2]=(t[o>>2]|0)+(e>>>2<<2))}function p8(e){return e=e|0,1073741823}function pI(e,n){e=e|0,n=n|0;var r=0;if((h8(e)|0)>>>0>>0&&$n(e),n>>>0>1073741823)_n();else{r=Tt(n<<2)|0,t[e+4>>2]=r,t[e>>2]=r,t[e+8>>2]=r+(n<<2);return}}function hI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,o=e+4|0,e=r-n|0,(e|0)>0&&(vn(t[o>>2]|0,n|0,e|0)|0,t[o>>2]=(t[o>>2]|0)+(e>>>2<<2))}function h8(e){return e=e|0,1073741823}function mI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>1073741823)_n();else{s=Tt(n<<2)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<2)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<2)}function vI(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>2)<<2)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function gI(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-4-n|0)>>>2)<<2)),e=t[e>>2]|0,e|0&&Ve(e)}function m8(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>1073741823)_n();else{s=Tt(n<<2)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<2)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<2)}function v8(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>2)<<2)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function g8(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-4-n|0)>>>2)<<2)),e=t[e>>2]|0,e|0&&Ve(e)}function _I(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0;if(ie=h,h=h+32|0,T=ie+20|0,P=ie+12|0,k=ie+16|0,q=ie+4|0,we=ie,le=ie+8|0,_=o8()|0,l=t[_>>2]|0,d=t[l>>2]|0,d|0)for(y=t[_+8>>2]|0,_=t[_+4>>2]|0;os(T,d),yI(e,T,_,y),l=l+4|0,d=t[l>>2]|0,d;)y=y+1|0,_=_+1|0;if(l=u8()|0,d=t[l>>2]|0,d|0)do os(T,d),t[P>>2]=t[l+4>>2],wI(n,T,P),l=l+8|0,d=t[l>>2]|0;while((d|0)!=0);if(l=t[(sa()|0)>>2]|0,l|0)do n=t[l+4>>2]|0,os(T,t[(la(n)|0)>>2]|0),t[P>>2]=A4(n)|0,DI(r,T,P),l=t[l>>2]|0;while((l|0)!=0);if(os(k,0),l=O4()|0,t[T>>2]=t[k>>2],s8(T,l,s),l=t[(sa()|0)>>2]|0,l|0){e=T+4|0,n=T+8|0,r=T+8|0;do{if(y=t[l+4>>2]|0,os(P,t[(la(y)|0)>>2]|0),EI(q,_8(y)|0),d=t[q>>2]|0,d|0){t[T>>2]=0,t[e>>2]=0,t[n>>2]=0;do os(we,t[(la(t[d+4>>2]|0)|0)>>2]|0),_=t[e>>2]|0,_>>>0<(t[r>>2]|0)>>>0?(t[_>>2]=t[we>>2],t[e>>2]=(t[e>>2]|0)+4):P4(T,we),d=t[d>>2]|0;while((d|0)!=0);SI(o,P,T),Rl(T)}t[le>>2]=t[P>>2],k=y8(y)|0,t[T>>2]=t[le>>2],s8(T,k,s),bd(q),l=t[l>>2]|0}while((l|0)!=0)}h=ie}function yI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,RI(e,n,r,o)}function wI(e,n,r){e=e|0,n=n|0,r=r|0,LI(e,n,r)}function la(e){return e=e|0,e|0}function DI(e,n,r){e=e|0,n=n|0,r=r|0,II(e,n,r)}function _8(e){return e=e|0,e+16|0}function EI(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;if(l=h,h=h+16|0,s=l+8|0,r=l,t[e>>2]=0,o=t[n>>2]|0,t[s>>2]=o,t[r>>2]=e,r=OI(r)|0,o|0){if(o=Tt(12)|0,d=(w8(s)|0)+4|0,e=t[d+4>>2]|0,n=o+4|0,t[n>>2]=t[d>>2],t[n+4>>2]=e,n=t[t[s>>2]>>2]|0,t[s>>2]=n,!n)e=o;else for(n=o;e=Tt(12)|0,y=(w8(s)|0)+4|0,_=t[y+4>>2]|0,d=e+4|0,t[d>>2]=t[y>>2],t[d+4>>2]=_,t[n>>2]=e,d=t[t[s>>2]>>2]|0,t[s>>2]=d,d;)n=e;t[e>>2]=t[r>>2],t[r>>2]=o}h=l}function SI(e,n,r){e=e|0,n=n|0,r=r|0,CI(e,n,r)}function y8(e){return e=e|0,e+24|0}function CI(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+32|0,d=o+24|0,s=o+16|0,_=o+12|0,l=o,Zo(s),e=Oi(e)|0,t[_>>2]=t[n>>2],F4(l,r),t[d>>2]=t[_>>2],TI(e,d,l),Rl(l),eu(s),h=o}function TI(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=h,h=h+32|0,d=o+16|0,_=o+12|0,s=o,l=ko(xI()|0)|0,t[_>>2]=t[n>>2],t[d>>2]=t[_>>2],n=lc(d)|0,t[s>>2]=t[r>>2],d=r+4|0,t[s+4>>2]=t[d>>2],_=r+8|0,t[s+8>>2]=t[_>>2],t[_>>2]=0,t[d>>2]=0,t[r>>2]=0,Ts(0,l|0,e|0,n|0,R4(s)|0)|0,Rl(s),h=o}function xI(){var e=0;return c[7976]|0||(kI(10720),e=7976,t[e>>2]=1,t[e+4>>2]=0),10720}function kI(e){e=e|0,Ao(e,AI()|0,2)}function AI(){return 1732}function OI(e){return e=e|0,t[e>>2]|0}function w8(e){return e=e|0,t[e>>2]|0}function II(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+32|0,l=o+16|0,s=o+8|0,d=o,Zo(s),e=Oi(e)|0,t[d>>2]=t[n>>2],r=t[r>>2]|0,t[l>>2]=t[d>>2],D8(e,l,r),eu(s),h=o}function D8(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+16|0,l=o+4|0,d=o,s=ko(PI()|0)|0,t[d>>2]=t[n>>2],t[l>>2]=t[d>>2],n=lc(l)|0,Ts(0,s|0,e|0,n|0,l8(r)|0)|0,h=o}function PI(){var e=0;return c[7984]|0||(MI(10732),e=7984,t[e>>2]=1,t[e+4>>2]=0),10732}function MI(e){e=e|0,Ao(e,FI()|0,2)}function FI(){return 1744}function LI(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;o=h,h=h+32|0,l=o+16|0,s=o+8|0,d=o,Zo(s),e=Oi(e)|0,t[d>>2]=t[n>>2],r=t[r>>2]|0,t[l>>2]=t[d>>2],D8(e,l,r),eu(s),h=o}function RI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;s=h,h=h+32|0,d=s+16|0,l=s+8|0,_=s,Zo(l),e=Oi(e)|0,t[_>>2]=t[n>>2],r=c[r>>0]|0,o=c[o>>0]|0,t[d>>2]=t[_>>2],NI(e,d,r,o),eu(l),h=s}function NI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;s=h,h=h+16|0,d=s+4|0,_=s,l=ko(BI()|0)|0,t[_>>2]=t[n>>2],t[d>>2]=t[_>>2],n=lc(d)|0,r=fa(r)|0,Bu(0,l|0,e|0,n|0,r|0,fa(o)|0)|0,h=s}function BI(){var e=0;return c[7992]|0||(UI(10744),e=7992,t[e>>2]=1,t[e+4>>2]=0),10744}function fa(e){return e=e|0,jI(e)|0}function jI(e){return e=e|0,e&255|0}function UI(e){e=e|0,Ao(e,qI()|0,3)}function qI(){return 1756}function zI(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;switch(q=h,h=h+32|0,_=q+8|0,y=q+4|0,k=q+20|0,T=q,_1(e,0),o=jF(n)|0,t[_>>2]=0,P=_+4|0,t[P>>2]=0,t[_+8>>2]=0,o<<24>>24){case 0:{c[k>>0]=0,WI(y,r,k),rh(e,y)|0,ei(y);break}case 8:{P=z4(n)|0,c[k>>0]=8,os(T,t[P+4>>2]|0),HI(y,r,k,T,P+8|0),rh(e,y)|0,ei(y);break}case 9:{if(l=z4(n)|0,n=t[l+4>>2]|0,n|0)for(d=_+8|0,s=l+12|0;n=n+-1|0,os(y,t[s>>2]|0),o=t[P>>2]|0,o>>>0<(t[d>>2]|0)>>>0?(t[o>>2]=t[y>>2],t[P>>2]=(t[P>>2]|0)+4):P4(_,y),n;)s=s+4|0;c[k>>0]=9,os(T,t[l+8>>2]|0),bI(y,r,k,T,_),rh(e,y)|0,ei(y);break}default:P=z4(n)|0,c[k>>0]=o,os(T,t[P+4>>2]|0),GI(y,r,k,T),rh(e,y)|0,ei(y)}Rl(_),h=q}function WI(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;o=h,h=h+16|0,s=o,Zo(s),n=Oi(n)|0,iP(e,n,c[r>>0]|0),eu(s),h=o}function rh(e,n){e=e|0,n=n|0;var r=0;return r=t[e>>2]|0,r|0&&ju(r|0),t[e>>2]=t[n>>2],t[n>>2]=0,e|0}function HI(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0;l=h,h=h+32|0,_=l+16|0,d=l+8|0,y=l,Zo(d),n=Oi(n)|0,r=c[r>>0]|0,t[y>>2]=t[o>>2],s=t[s>>2]|0,t[_>>2]=t[y>>2],eP(e,n,r,_,s),eu(d),h=l}function bI(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0,k=0;l=h,h=h+32|0,y=l+24|0,d=l+16|0,k=l+12|0,_=l,Zo(d),n=Oi(n)|0,r=c[r>>0]|0,t[k>>2]=t[o>>2],F4(_,s),t[y>>2]=t[k>>2],XI(e,n,r,y,_),Rl(_),eu(d),h=l}function GI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;s=h,h=h+32|0,d=s+16|0,l=s+8|0,_=s,Zo(l),n=Oi(n)|0,r=c[r>>0]|0,t[_>>2]=t[o>>2],t[d>>2]=t[_>>2],VI(e,n,r,d),eu(l),h=s}function VI(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0,d=0,_=0;s=h,h=h+16|0,l=s+4|0,_=s,d=ko(YI()|0)|0,r=fa(r)|0,t[_>>2]=t[o>>2],t[l>>2]=t[_>>2],ih(e,Ts(0,d|0,n|0,r|0,lc(l)|0)|0),h=s}function YI(){var e=0;return c[8e3]|0||($I(10756),e=8e3,t[e>>2]=1,t[e+4>>2]=0),10756}function ih(e,n){e=e|0,n=n|0,_1(e,n)}function $I(e){e=e|0,Ao(e,KI()|0,2)}function KI(){return 1772}function XI(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0,k=0;l=h,h=h+32|0,y=l+16|0,k=l+12|0,d=l,_=ko(JI()|0)|0,r=fa(r)|0,t[k>>2]=t[o>>2],t[y>>2]=t[k>>2],o=lc(y)|0,t[d>>2]=t[s>>2],y=s+4|0,t[d+4>>2]=t[y>>2],k=s+8|0,t[d+8>>2]=t[k>>2],t[k>>2]=0,t[y>>2]=0,t[s>>2]=0,ih(e,Bu(0,_|0,n|0,r|0,o|0,R4(d)|0)|0),Rl(d),h=l}function JI(){var e=0;return c[8008]|0||(QI(10768),e=8008,t[e>>2]=1,t[e+4>>2]=0),10768}function QI(e){e=e|0,Ao(e,ZI()|0,3)}function ZI(){return 1784}function eP(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0;l=h,h=h+16|0,_=l+4|0,y=l,d=ko(tP()|0)|0,r=fa(r)|0,t[y>>2]=t[o>>2],t[_>>2]=t[y>>2],o=lc(_)|0,ih(e,Bu(0,d|0,n|0,r|0,o|0,L4(s)|0)|0),h=l}function tP(){var e=0;return c[8016]|0||(nP(10780),e=8016,t[e>>2]=1,t[e+4>>2]=0),10780}function nP(e){e=e|0,Ao(e,rP()|0,3)}function rP(){return 1800}function iP(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;o=ko(oP()|0)|0,ih(e,sf(0,o|0,n|0,fa(r)|0)|0)}function oP(){var e=0;return c[8024]|0||(uP(10792),e=8024,t[e>>2]=1,t[e+4>>2]=0),10792}function uP(e){e=e|0,Ao(e,sP()|0,1)}function sP(){return 1816}function lP(){fP(),cP(),aP()}function fP(){t[2702]=K8(65536)|0}function cP(){PP(10856)}function aP(){dP(10816)}function dP(e){e=e|0,pP(e,5044),hP(e)|0}function pP(e,n){e=e|0,n=n|0;var r=0;r=a8()|0,t[e>>2]=r,TP(r,n),Cf(t[e>>2]|0)}function hP(e){e=e|0;var n=0;return n=t[e>>2]|0,uc(n,mP()|0),e|0}function mP(){var e=0;return c[8032]|0||(E8(10820),Bt(64,10820,Q|0)|0,e=8032,t[e>>2]=1,t[e+4>>2]=0),Dn(10820)|0||E8(10820),10820}function E8(e){e=e|0,_P(e),sc(e,25)}function vP(e){e=e|0,gP(e+24|0)}function gP(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function _P(e){e=e|0;var n=0;n=An()|0,Nn(e,5,18,n,EP()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function yP(e,n){e=e|0,n=n|0,wP(e,n)}function wP(e,n){e=e|0,n=n|0;var r=0,o=0,s=0;r=h,h=h+16|0,o=r,s=r+4|0,Ml(s,n),t[o>>2]=Fl(s,n)|0,DP(e,o),h=r}function DP(e,n){e=e|0,n=n|0,S8(e+4|0,t[n>>2]|0),c[e+8>>0]=1}function S8(e,n){e=e|0,n=n|0,t[e>>2]=n}function EP(){return 1824}function SP(e){return e=e|0,CP(e)|0}function CP(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0;return r=h,h=h+16|0,s=r+4|0,d=r,o=Qo(8)|0,n=o,_=Tt(4)|0,Ml(s,e),S8(_,Fl(s,e)|0),l=n+4|0,t[l>>2]=_,e=Tt(8)|0,l=t[l>>2]|0,t[d>>2]=0,t[s>>2]=t[d>>2],d8(e,l,s),t[o>>2]=e,h=r,n|0}function Qo(e){e=e|0;var n=0,r=0;return e=e+7&-8,(e>>>0<=32768?(n=t[2701]|0,e>>>0<=(65536-n|0)>>>0):0)?(r=(t[2702]|0)+n|0,t[2701]=n+e,e=r):(e=K8(e+8|0)|0,t[e>>2]=t[2703],t[2703]=e,e=e+8|0),e|0}function TP(e,n){e=e|0,n=n|0,t[e>>2]=xP()|0,t[e+4>>2]=kP()|0,t[e+12>>2]=n,t[e+8>>2]=AP()|0,t[e+32>>2]=9}function xP(){return 11744}function kP(){return 1832}function AP(){return th()|0}function OP(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(IP(r),Ve(r)):n|0&&Ve(n)}function IP(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function PP(e){e=e|0,MP(e,5052),FP(e)|0,LP(e,5058,26)|0,RP(e,5069,1)|0,NP(e,5077,10)|0,BP(e,5087,19)|0,jP(e,5094,27)|0}function MP(e,n){e=e|0,n=n|0;var r=0;r=IF()|0,t[e>>2]=r,PF(r,n),Cf(t[e>>2]|0)}function FP(e){e=e|0;var n=0;return n=t[e>>2]|0,uc(n,vF()|0),e|0}function LP(e,n,r){return e=e|0,n=n|0,r=r|0,QM(e,Zn(n)|0,r,0),e|0}function RP(e,n,r){return e=e|0,n=n|0,r=r|0,BM(e,Zn(n)|0,r,0),e|0}function NP(e,n,r){return e=e|0,n=n|0,r=r|0,mM(e,Zn(n)|0,r,0),e|0}function BP(e,n,r){return e=e|0,n=n|0,r=r|0,eM(e,Zn(n)|0,r,0),e|0}function C8(e,n){e=e|0,n=n|0;var r=0,o=0;e:for(;;){for(r=t[2703]|0;;){if((r|0)==(n|0))break e;if(o=t[r>>2]|0,t[2703]=o,!r)r=o;else break}Ve(r)}t[2701]=e}function jP(e,n,r){return e=e|0,n=n|0,r=r|0,UP(e,Zn(n)|0,r,0),e|0}function UP(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=N4()|0,e=qP(r)|0,ur(l,n,s,e,zP(r,o)|0,o)}function N4(){var e=0,n=0;if(c[8040]|0||(x8(10860),Bt(65,10860,Q|0)|0,n=8040,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10860)|0)){e=10860,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));x8(10860)}return 10860}function qP(e){return e=e|0,e|0}function zP(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=N4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(T8(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(WP(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function T8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function WP(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=HP(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,bP(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,T8(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,GP(e,s),VP(s),h=_;return}}function HP(e){return e=e|0,536870911}function bP(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function GP(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function VP(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function x8(e){e=e|0,KP(e)}function YP(e){e=e|0,$P(e+24|0)}function $P(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function KP(e){e=e|0;var n=0;n=An()|0,Nn(e,1,11,n,XP()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function XP(){return 1840}function JP(e,n,r){e=e|0,n=n|0,r=r|0,ZP(t[(QP(e)|0)>>2]|0,n,r)}function QP(e){return e=e|0,(t[(N4()|0)+24>>2]|0)+(e<<3)|0}function ZP(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;o=h,h=h+16|0,l=o+1|0,s=o,Ml(l,n),n=Fl(l,n)|0,Ml(s,r),r=Fl(s,r)|0,Bl[e&31](n,r),h=o}function eM(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=B4()|0,e=tM(r)|0,ur(l,n,s,e,nM(r,o)|0,o)}function B4(){var e=0,n=0;if(c[8048]|0||(A8(10896),Bt(66,10896,Q|0)|0,n=8048,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10896)|0)){e=10896,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));A8(10896)}return 10896}function tM(e){return e=e|0,e|0}function nM(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=B4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(k8(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(rM(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function k8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function rM(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=iM(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,oM(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,k8(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,uM(e,s),sM(s),h=_;return}}function iM(e){return e=e|0,536870911}function oM(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function uM(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function sM(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function A8(e){e=e|0,cM(e)}function lM(e){e=e|0,fM(e+24|0)}function fM(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function cM(e){e=e|0;var n=0;n=An()|0,Nn(e,1,11,n,aM()|0,1),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function aM(){return 1852}function dM(e,n){return e=e|0,n=n|0,hM(t[(pM(e)|0)>>2]|0,n)|0}function pM(e){return e=e|0,(t[(B4()|0)+24>>2]|0)+(e<<3)|0}function hM(e,n){e=e|0,n=n|0;var r=0,o=0;return r=h,h=h+16|0,o=r,Ml(o,n),n=Fl(o,n)|0,n=ea(dc[e&31](n)|0)|0,h=r,n|0}function mM(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=j4()|0,e=vM(r)|0,ur(l,n,s,e,gM(r,o)|0,o)}function j4(){var e=0,n=0;if(c[8056]|0||(I8(10932),Bt(67,10932,Q|0)|0,n=8056,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10932)|0)){e=10932,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));I8(10932)}return 10932}function vM(e){return e=e|0,e|0}function gM(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=j4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(O8(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(_M(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function O8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function _M(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=yM(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,wM(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,O8(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,DM(e,s),EM(s),h=_;return}}function yM(e){return e=e|0,536870911}function wM(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function DM(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function EM(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function I8(e){e=e|0,TM(e)}function SM(e){e=e|0,CM(e+24|0)}function CM(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function TM(e){e=e|0;var n=0;n=An()|0,Nn(e,1,7,n,xM()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function xM(){return 1860}function kM(e,n,r){return e=e|0,n=n|0,r=r|0,OM(t[(AM(e)|0)>>2]|0,n,r)|0}function AM(e){return e=e|0,(t[(j4()|0)+24>>2]|0)+(e<<3)|0}function OM(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0;return o=h,h=h+32|0,d=o+12|0,l=o+8|0,_=o,y=o+16|0,s=o+4|0,IM(y,n),PM(_,y,n),$s(s,r),r=Ks(s,r)|0,t[d>>2]=t[_>>2],X1[e&15](l,d,r),r=MM(l)|0,ei(l),Xs(s),h=o,r|0}function IM(e,n){e=e|0,n=n|0}function PM(e,n,r){e=e|0,n=n|0,r=r|0,FM(e,r)}function MM(e){return e=e|0,Oi(e)|0}function FM(e,n){e=e|0,n=n|0;var r=0,o=0,s=0;s=h,h=h+16|0,r=s,o=n,o&1?(LM(r,0),c0(o|0,r|0)|0,RM(e,r),NM(r)):t[e>>2]=t[n>>2],h=s}function LM(e,n){e=e|0,n=n|0,wd(e,n),t[e+4>>2]=0,c[e+8>>0]=0}function RM(e,n){e=e|0,n=n|0,t[e>>2]=t[n+4>>2]}function NM(e){e=e|0,c[e+8>>0]=0}function BM(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=U4()|0,e=jM(r)|0,ur(l,n,s,e,UM(r,o)|0,o)}function U4(){var e=0,n=0;if(c[8064]|0||(M8(10968),Bt(68,10968,Q|0)|0,n=8064,t[n>>2]=1,t[n+4>>2]=0),!(Dn(10968)|0)){e=10968,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));M8(10968)}return 10968}function jM(e){return e=e|0,e|0}function UM(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=U4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(P8(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(qM(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function P8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function qM(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=zM(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,WM(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,P8(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,HM(e,s),bM(s),h=_;return}}function zM(e){return e=e|0,536870911}function WM(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function HM(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function bM(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function M8(e){e=e|0,YM(e)}function GM(e){e=e|0,VM(e+24|0)}function VM(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function YM(e){e=e|0;var n=0;n=An()|0,Nn(e,1,1,n,$M()|0,5),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function $M(){return 1872}function KM(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,JM(t[(XM(e)|0)>>2]|0,n,r,o,s,l)}function XM(e){return e=e|0,(t[(U4()|0)+24>>2]|0)+(e<<3)|0}function JM(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0;var d=0,_=0,y=0,k=0,T=0,P=0;d=h,h=h+32|0,_=d+16|0,y=d+12|0,k=d+8|0,T=d+4|0,P=d,$s(_,n),n=Ks(_,n)|0,$s(y,r),r=Ks(y,r)|0,$s(k,o),o=Ks(k,o)|0,$s(T,s),s=Ks(T,s)|0,$s(P,l),l=Ks(P,l)|0,eD[e&1](n,r,o,s,l),Xs(P),Xs(T),Xs(k),Xs(y),Xs(_),h=d}function QM(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;l=t[e>>2]|0,s=q4()|0,e=ZM(r)|0,ur(l,n,s,e,eF(r,o)|0,o)}function q4(){var e=0,n=0;if(c[8072]|0||(L8(11004),Bt(69,11004,Q|0)|0,n=8072,t[n>>2]=1,t[n+4>>2]=0),!(Dn(11004)|0)){e=11004,n=e+36|0;do t[e>>2]=0,e=e+4|0;while((e|0)<(n|0));L8(11004)}return 11004}function ZM(e){return e=e|0,e|0}function eF(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0,_=0,y=0;return _=h,h=h+16|0,s=_,l=_+4|0,t[s>>2]=e,y=q4()|0,d=y+24|0,n=Lt(n,4)|0,t[l>>2]=n,r=y+28|0,o=t[r>>2]|0,o>>>0<(t[y+32>>2]|0)>>>0?(F8(o,e,n),n=(t[r>>2]|0)+8|0,t[r>>2]=n):(tF(d,s,l),n=t[r>>2]|0),h=_,(n-(t[d>>2]|0)>>3)+-1|0}function F8(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,t[e+4>>2]=r}function tF(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0;if(_=h,h=h+32|0,s=_,l=e+4|0,d=((t[l>>2]|0)-(t[e>>2]|0)>>3)+1|0,o=nF(e)|0,o>>>0>>0)$n(e);else{y=t[e>>2]|0,T=(t[e+8>>2]|0)-y|0,k=T>>2,rF(s,T>>3>>>0>>1>>>0?k>>>0>>0?d:k:o,(t[l>>2]|0)-y>>3,e+8|0),d=s+8|0,F8(t[d>>2]|0,t[n>>2]|0,t[r>>2]|0),t[d>>2]=(t[d>>2]|0)+8,iF(e,s),oF(s),h=_;return}}function nF(e){return e=e|0,536870911}function rF(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0;t[e+12>>2]=0,t[e+16>>2]=o;do if(n)if(n>>>0>536870911)_n();else{s=Tt(n<<3)|0;break}else s=0;while(0);t[e>>2]=s,o=s+(r<<3)|0,t[e+8>>2]=o,t[e+4>>2]=o,t[e+12>>2]=s+(n<<3)}function iF(e,n){e=e|0,n=n|0;var r=0,o=0,s=0,l=0,d=0;o=t[e>>2]|0,d=e+4|0,l=n+4|0,s=(t[d>>2]|0)-o|0,r=(t[l>>2]|0)+(0-(s>>3)<<3)|0,t[l>>2]=r,(s|0)>0?(vn(r|0,o|0,s|0)|0,o=l,r=t[l>>2]|0):o=l,l=t[e>>2]|0,t[e>>2]=r,t[o>>2]=l,l=n+8|0,s=t[d>>2]|0,t[d>>2]=t[l>>2],t[l>>2]=s,l=e+8|0,d=n+12|0,e=t[l>>2]|0,t[l>>2]=t[d>>2],t[d>>2]=e,t[n>>2]=t[o>>2]}function oF(e){e=e|0;var n=0,r=0,o=0;n=t[e+4>>2]|0,r=e+8|0,o=t[r>>2]|0,(o|0)!=(n|0)&&(t[r>>2]=o+(~((o+-8-n|0)>>>3)<<3)),e=t[e>>2]|0,e|0&&Ve(e)}function L8(e){e=e|0,lF(e)}function uF(e){e=e|0,sF(e+24|0)}function sF(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function lF(e){e=e|0;var n=0;n=An()|0,Nn(e,1,12,n,fF()|0,2),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function fF(){return 1896}function cF(e,n,r){e=e|0,n=n|0,r=r|0,dF(t[(aF(e)|0)>>2]|0,n,r)}function aF(e){return e=e|0,(t[(q4()|0)+24>>2]|0)+(e<<3)|0}function dF(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;o=h,h=h+16|0,l=o+4|0,s=o,pF(l,n),n=hF(l,n)|0,$s(s,r),r=Ks(s,r)|0,Bl[e&31](n,r),Xs(s),h=o}function pF(e,n){e=e|0,n=n|0}function hF(e,n){return e=e|0,n=n|0,mF(n)|0}function mF(e){return e=e|0,e|0}function vF(){var e=0;return c[8080]|0||(R8(11040),Bt(70,11040,Q|0)|0,e=8080,t[e>>2]=1,t[e+4>>2]=0),Dn(11040)|0||R8(11040),11040}function R8(e){e=e|0,yF(e),sc(e,71)}function gF(e){e=e|0,_F(e+24|0)}function _F(e){e=e|0;var n=0,r=0,o=0;r=t[e>>2]|0,o=r,r|0&&(e=e+4|0,n=t[e>>2]|0,(n|0)!=(r|0)&&(t[e>>2]=n+(~((n+-8-o|0)>>>3)<<3)),Ve(r))}function yF(e){e=e|0;var n=0;n=An()|0,Nn(e,5,7,n,SF()|0,0),t[e+24>>2]=0,t[e+28>>2]=0,t[e+32>>2]=0}function wF(e){e=e|0,DF(e)}function DF(e){e=e|0,EF(e)}function EF(e){e=e|0,c[e+8>>0]=1}function SF(){return 1936}function CF(){return TF()|0}function TF(){var e=0,n=0,r=0,o=0,s=0,l=0,d=0;return n=h,h=h+16|0,s=n+4|0,d=n,r=Qo(8)|0,e=r,l=e+4|0,t[l>>2]=Tt(1)|0,o=Tt(8)|0,l=t[l>>2]|0,t[d>>2]=0,t[s>>2]=t[d>>2],xF(o,l,s),t[r>>2]=o,h=n,e|0}function xF(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]=n,r=Tt(16)|0,t[r+4>>2]=0,t[r+8>>2]=0,t[r>>2]=1916,t[r+12>>2]=n,t[e+4>>2]=r}function kF(e){e=e|0,da(e),Ve(e)}function AF(e){e=e|0,e=t[e+12>>2]|0,e|0&&Ve(e)}function OF(e){e=e|0,Ve(e)}function IF(){var e=0;return c[8088]|0||(BF(11076),Bt(25,11076,Q|0)|0,e=8088,t[e>>2]=1,t[e+4>>2]=0),11076}function PF(e,n){e=e|0,n=n|0,t[e>>2]=MF()|0,t[e+4>>2]=FF()|0,t[e+12>>2]=n,t[e+8>>2]=LF()|0,t[e+32>>2]=10}function MF(){return 11745}function FF(){return 1940}function LF(){return eh()|0}function RF(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,(Sf(o,896)|0)==512?r|0&&(NF(r),Ve(r)):n|0&&Ve(n)}function NF(e){e=e|0,e=t[e+4>>2]|0,e|0&&Tf(e)}function BF(e){e=e|0,Ys(e)}function os(e,n){e=e|0,n=n|0,t[e>>2]=n}function z4(e){return e=e|0,t[e>>2]|0}function jF(e){return e=e|0,c[t[e>>2]>>0]|0}function UF(e,n){e=e|0,n=n|0;var r=0,o=0;r=h,h=h+16|0,o=r,t[o>>2]=t[e>>2],qF(n,o)|0,h=r}function qF(e,n){e=e|0,n=n|0;var r=0;return r=zF(t[e>>2]|0,n)|0,n=e+4|0,t[(t[n>>2]|0)+8>>2]=r,t[(t[n>>2]|0)+8>>2]|0}function zF(e,n){e=e|0,n=n|0;var r=0,o=0;return r=h,h=h+16|0,o=r,Zo(o),e=Oi(e)|0,n=WF(e,t[n>>2]|0)|0,eu(o),h=r,n|0}function Zo(e){e=e|0,t[e>>2]=t[2701],t[e+4>>2]=t[2703]}function WF(e,n){e=e|0,n=n|0;var r=0;return r=ko(HF()|0)|0,sf(0,r|0,e|0,L4(n)|0)|0}function eu(e){e=e|0,C8(t[e>>2]|0,t[e+4>>2]|0)}function HF(){var e=0;return c[8096]|0||(bF(11120),e=8096,t[e>>2]=1,t[e+4>>2]=0),11120}function bF(e){e=e|0,Ao(e,GF()|0,1)}function GF(){return 1948}function VF(){YF()}function YF(){var e=0,n=0,r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0;if(le=h,h=h+16|0,T=le+4|0,P=le,si(65536,10804,t[2702]|0,10812),r=o8()|0,n=t[r>>2]|0,e=t[n>>2]|0,e|0)for(o=t[r+8>>2]|0,r=t[r+4>>2]|0;As(e|0,C[r>>0]|0|0,c[o>>0]|0),n=n+4|0,e=t[n>>2]|0,e;)o=o+1|0,r=r+1|0;if(e=u8()|0,n=t[e>>2]|0,n|0)do uu(n|0,t[e+4>>2]|0),e=e+8|0,n=t[e>>2]|0;while((n|0)!=0);uu($F()|0,5167),k=sa()|0,e=t[k>>2]|0;e:do if(e|0){do KF(t[e+4>>2]|0),e=t[e>>2]|0;while((e|0)!=0);if(e=t[k>>2]|0,e|0){y=k;do{for(;s=e,e=t[e>>2]|0,s=t[s+4>>2]|0,!!(XF(s)|0);)if(t[P>>2]=y,t[T>>2]=t[P>>2],JF(k,T)|0,!e)break e;if(QF(s),y=t[y>>2]|0,n=N8(s)|0,l=Wo()|0,d=h,h=h+((1*(n<<2)|0)+15&-16)|0,_=h,h=h+((1*(n<<2)|0)+15&-16)|0,n=t[(_8(s)|0)>>2]|0,n|0)for(r=d,o=_;t[r>>2]=t[(la(t[n+4>>2]|0)|0)>>2],t[o>>2]=t[n+8>>2],n=t[n>>2]|0,n;)r=r+4|0,o=o+4|0;ie=la(s)|0,n=ZF(s)|0,r=N8(s)|0,o=eL(s)|0,Is(ie|0,n|0,d|0,_|0,r|0,o|0,A4(s)|0),b0(l|0)}while((e|0)!=0)}}while(0);if(e=t[(O4()|0)>>2]|0,e|0)do ie=e+4|0,k=I4(ie)|0,s=V1(k)|0,l=b1(k)|0,d=(G1(k)|0)+1|0,_=oh(k)|0,y=B8(ie)|0,k=Dn(k)|0,T=nh(ie)|0,P=W4(ie)|0,zo(0,s|0,l|0,d|0,_|0,y|0,k|0,T|0,P|0,H4(ie)|0),e=t[e>>2]|0;while((e|0)!=0);e=t[(sa()|0)>>2]|0;e:do if(e|0){t:for(;;){if(n=t[e+4>>2]|0,n|0?(q=t[(la(n)|0)>>2]|0,we=t[(y8(n)|0)>>2]|0,we|0):0){r=we;do{n=r+4|0,o=I4(n)|0;n:do if(o|0)switch(Dn(o)|0){case 0:break t;case 4:case 3:case 2:{_=V1(o)|0,y=b1(o)|0,k=(G1(o)|0)+1|0,T=oh(o)|0,P=Dn(o)|0,ie=nh(n)|0,zo(q|0,_|0,y|0,k|0,T|0,0,P|0,ie|0,W4(n)|0,H4(n)|0);break n}case 1:{d=V1(o)|0,_=b1(o)|0,y=(G1(o)|0)+1|0,k=oh(o)|0,T=B8(n)|0,P=Dn(o)|0,ie=nh(n)|0,zo(q|0,d|0,_|0,y|0,k|0,T|0,P|0,ie|0,W4(n)|0,H4(n)|0);break n}case 5:{k=V1(o)|0,T=b1(o)|0,P=(G1(o)|0)+1|0,ie=oh(o)|0,zo(q|0,k|0,T|0,P|0,ie|0,tL(o)|0,Dn(o)|0,0,0,0);break n}default:break n}while(0);r=t[r>>2]|0}while((r|0)!=0)}if(e=t[e>>2]|0,!e)break e}_n()}while(0);uf(),h=le}function $F(){return 11703}function KF(e){e=e|0,c[e+40>>0]=0}function XF(e){return e=e|0,(c[e+40>>0]|0)!=0|0}function JF(e,n){return e=e|0,n=n|0,n=nL(n)|0,e=t[n>>2]|0,t[n>>2]=t[e>>2],Ve(e),t[n>>2]|0}function QF(e){e=e|0,c[e+40>>0]=1}function N8(e){return e=e|0,t[e+20>>2]|0}function ZF(e){return e=e|0,t[e+8>>2]|0}function eL(e){return e=e|0,t[e+32>>2]|0}function oh(e){return e=e|0,t[e+4>>2]|0}function B8(e){return e=e|0,t[e+4>>2]|0}function W4(e){return e=e|0,t[e+8>>2]|0}function H4(e){return e=e|0,t[e+16>>2]|0}function tL(e){return e=e|0,t[e+20>>2]|0}function nL(e){return e=e|0,t[e>>2]|0}function uh(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0,Pe=0,ke=0,qe=0,pe=0,_e=0,vt=0;vt=h,h=h+16|0,q=vt;do if(e>>>0<245){if(k=e>>>0<11?16:e+11&-8,e=k>>>3,P=t[2783]|0,r=P>>>e,r&3|0)return n=(r&1^1)+e|0,e=11172+(n<<1<<2)|0,r=e+8|0,o=t[r>>2]|0,s=o+8|0,l=t[s>>2]|0,(e|0)==(l|0)?t[2783]=P&~(1<>2]=e,t[r>>2]=l),_e=n<<3,t[o+4>>2]=_e|3,_e=o+_e+4|0,t[_e>>2]=t[_e>>2]|1,_e=s,h=vt,_e|0;if(T=t[2785]|0,k>>>0>T>>>0){if(r|0)return n=2<>>12&16,n=n>>>d,r=n>>>5&8,n=n>>>r,s=n>>>2&4,n=n>>>s,e=n>>>1&2,n=n>>>e,o=n>>>1&1,o=(r|d|s|e|o)+(n>>>o)|0,n=11172+(o<<1<<2)|0,e=n+8|0,s=t[e>>2]|0,d=s+8|0,r=t[d>>2]|0,(n|0)==(r|0)?(e=P&~(1<>2]=n,t[e>>2]=r,e=P),l=(o<<3)-k|0,t[s+4>>2]=k|3,o=s+k|0,t[o+4>>2]=l|1,t[o+l>>2]=l,T|0&&(s=t[2788]|0,n=T>>>3,r=11172+(n<<1<<2)|0,n=1<>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=s,t[n+12>>2]=s,t[s+8>>2]=n,t[s+12>>2]=r),t[2785]=l,t[2788]=o,_e=d,h=vt,_e|0;if(_=t[2784]|0,_){if(r=(_&0-_)+-1|0,d=r>>>12&16,r=r>>>d,l=r>>>5&8,r=r>>>l,y=r>>>2&4,r=r>>>y,o=r>>>1&2,r=r>>>o,e=r>>>1&1,e=t[11436+((l|d|y|o|e)+(r>>>e)<<2)>>2]|0,r=(t[e+4>>2]&-8)-k|0,o=t[e+16+(((t[e+16>>2]|0)==0&1)<<2)>>2]|0,!o)y=e,l=r;else{do d=(t[o+4>>2]&-8)-k|0,y=d>>>0>>0,r=y?d:r,e=y?o:e,o=t[o+16+(((t[o+16>>2]|0)==0&1)<<2)>>2]|0;while((o|0)!=0);y=e,l=r}if(d=y+k|0,y>>>0>>0){s=t[y+24>>2]|0,n=t[y+12>>2]|0;do if((n|0)==(y|0)){if(e=y+20|0,n=t[e>>2]|0,!n&&(e=y+16|0,n=t[e>>2]|0,!n)){r=0;break}for(;;){if(r=n+20|0,o=t[r>>2]|0,o|0){n=o,e=r;continue}if(r=n+16|0,o=t[r>>2]|0,o)n=o,e=r;else break}t[e>>2]=0,r=n}else r=t[y+8>>2]|0,t[r+12>>2]=n,t[n+8>>2]=r,r=n;while(0);do if(s|0){if(n=t[y+28>>2]|0,e=11436+(n<<2)|0,(y|0)==(t[e>>2]|0)){if(t[e>>2]=r,!r){t[2784]=_&~(1<>2]|0)!=(y|0)&1)<<2)>>2]=r,!r)break;t[r+24>>2]=s,n=t[y+16>>2]|0,n|0&&(t[r+16>>2]=n,t[n+24>>2]=r),n=t[y+20>>2]|0,n|0&&(t[r+20>>2]=n,t[n+24>>2]=r)}while(0);return l>>>0<16?(_e=l+k|0,t[y+4>>2]=_e|3,_e=y+_e+4|0,t[_e>>2]=t[_e>>2]|1):(t[y+4>>2]=k|3,t[d+4>>2]=l|1,t[d+l>>2]=l,T|0&&(o=t[2788]|0,n=T>>>3,r=11172+(n<<1<<2)|0,n=1<>2]|0):(t[2783]=P|n,n=r,e=r+8|0),t[e>>2]=o,t[n+12>>2]=o,t[o+8>>2]=n,t[o+12>>2]=r),t[2785]=l,t[2788]=d),_e=y+8|0,h=vt,_e|0}else P=k}else P=k}else P=k}else if(e>>>0<=4294967231)if(e=e+11|0,k=e&-8,y=t[2784]|0,y){o=0-k|0,e=e>>>8,e?k>>>0>16777215?_=31:(P=(e+1048320|0)>>>16&8,pe=e<>>16&4,pe=pe<>>16&2,_=14-(T|P|_)+(pe<<_>>>15)|0,_=k>>>(_+7|0)&1|_<<1):_=0,r=t[11436+(_<<2)>>2]|0;e:do if(!r)r=0,e=0,pe=57;else for(e=0,d=k<<((_|0)==31?0:25-(_>>>1)|0),l=0;;){if(s=(t[r+4>>2]&-8)-k|0,s>>>0>>0)if(s)e=r,o=s;else{e=r,o=0,s=r,pe=61;break e}if(s=t[r+20>>2]|0,r=t[r+16+(d>>>31<<2)>>2]|0,l=(s|0)==0|(s|0)==(r|0)?l:s,s=(r|0)==0,s){r=l,pe=57;break}else d=d<<((s^1)&1)}while(0);if((pe|0)==57){if((r|0)==0&(e|0)==0){if(e=2<<_,e=y&(e|0-e),!e){P=k;break}P=(e&0-e)+-1|0,d=P>>>12&16,P=P>>>d,l=P>>>5&8,P=P>>>l,_=P>>>2&4,P=P>>>_,T=P>>>1&2,P=P>>>T,r=P>>>1&1,e=0,r=t[11436+((l|d|_|T|r)+(P>>>r)<<2)>>2]|0}r?(s=r,pe=61):(_=e,d=o)}if((pe|0)==61)for(;;)if(pe=0,r=(t[s+4>>2]&-8)-k|0,P=r>>>0>>0,r=P?r:o,e=P?s:e,s=t[s+16+(((t[s+16>>2]|0)==0&1)<<2)>>2]|0,s)o=r,pe=61;else{_=e,d=r;break}if((_|0)!=0?d>>>0<((t[2785]|0)-k|0)>>>0:0){if(l=_+k|0,_>>>0>=l>>>0)return _e=0,h=vt,_e|0;s=t[_+24>>2]|0,n=t[_+12>>2]|0;do if((n|0)==(_|0)){if(e=_+20|0,n=t[e>>2]|0,!n&&(e=_+16|0,n=t[e>>2]|0,!n)){n=0;break}for(;;){if(r=n+20|0,o=t[r>>2]|0,o|0){n=o,e=r;continue}if(r=n+16|0,o=t[r>>2]|0,o)n=o,e=r;else break}t[e>>2]=0}else _e=t[_+8>>2]|0,t[_e+12>>2]=n,t[n+8>>2]=_e;while(0);do if(s){if(e=t[_+28>>2]|0,r=11436+(e<<2)|0,(_|0)==(t[r>>2]|0)){if(t[r>>2]=n,!n){o=y&~(1<>2]|0)!=(_|0)&1)<<2)>>2]=n,!n){o=y;break}t[n+24>>2]=s,e=t[_+16>>2]|0,e|0&&(t[n+16>>2]=e,t[e+24>>2]=n),e=t[_+20>>2]|0,e&&(t[n+20>>2]=e,t[e+24>>2]=n),o=y}else o=y;while(0);do if(d>>>0>=16){if(t[_+4>>2]=k|3,t[l+4>>2]=d|1,t[l+d>>2]=d,n=d>>>3,d>>>0<256){r=11172+(n<<1<<2)|0,e=t[2783]|0,n=1<>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=l,t[n+12>>2]=l,t[l+8>>2]=n,t[l+12>>2]=r;break}if(n=d>>>8,n?d>>>0>16777215?n=31:(pe=(n+1048320|0)>>>16&8,_e=n<>>16&4,_e=_e<>>16&2,n=14-(qe|pe|n)+(_e<>>15)|0,n=d>>>(n+7|0)&1|n<<1):n=0,r=11436+(n<<2)|0,t[l+28>>2]=n,e=l+16|0,t[e+4>>2]=0,t[e>>2]=0,e=1<>2]=l,t[l+24>>2]=r,t[l+12>>2]=l,t[l+8>>2]=l;break}for(e=d<<((n|0)==31?0:25-(n>>>1)|0),r=t[r>>2]|0;;){if((t[r+4>>2]&-8|0)==(d|0)){pe=97;break}if(o=r+16+(e>>>31<<2)|0,n=t[o>>2]|0,n)e=e<<1,r=n;else{pe=96;break}}if((pe|0)==96){t[o>>2]=l,t[l+24>>2]=r,t[l+12>>2]=l,t[l+8>>2]=l;break}else if((pe|0)==97){pe=r+8|0,_e=t[pe>>2]|0,t[_e+12>>2]=l,t[pe>>2]=l,t[l+8>>2]=_e,t[l+12>>2]=r,t[l+24>>2]=0;break}}else _e=d+k|0,t[_+4>>2]=_e|3,_e=_+_e+4|0,t[_e>>2]=t[_e>>2]|1;while(0);return _e=_+8|0,h=vt,_e|0}else P=k}else P=k;else P=-1;while(0);if(r=t[2785]|0,r>>>0>=P>>>0)return n=r-P|0,e=t[2788]|0,n>>>0>15?(_e=e+P|0,t[2788]=_e,t[2785]=n,t[_e+4>>2]=n|1,t[_e+n>>2]=n,t[e+4>>2]=P|3):(t[2785]=0,t[2788]=0,t[e+4>>2]=r|3,_e=e+r+4|0,t[_e>>2]=t[_e>>2]|1),_e=e+8|0,h=vt,_e|0;if(d=t[2786]|0,d>>>0>P>>>0)return qe=d-P|0,t[2786]=qe,_e=t[2789]|0,pe=_e+P|0,t[2789]=pe,t[pe+4>>2]=qe|1,t[_e+4>>2]=P|3,_e=_e+8|0,h=vt,_e|0;if(t[2901]|0?e=t[2903]|0:(t[2903]=4096,t[2902]=4096,t[2904]=-1,t[2905]=-1,t[2906]=0,t[2894]=0,e=q&-16^1431655768,t[q>>2]=e,t[2901]=e,e=4096),_=P+48|0,y=P+47|0,l=e+y|0,s=0-e|0,k=l&s,k>>>0<=P>>>0||(e=t[2893]|0,e|0?(T=t[2891]|0,q=T+k|0,q>>>0<=T>>>0|q>>>0>e>>>0):0))return _e=0,h=vt,_e|0;e:do if(t[2894]&4)n=0,pe=133;else{r=t[2789]|0;t:do if(r){for(o=11580;e=t[o>>2]|0,!(e>>>0<=r>>>0?(ie=o+4|0,(e+(t[ie>>2]|0)|0)>>>0>r>>>0):0);)if(e=t[o+8>>2]|0,e)o=e;else{pe=118;break t}if(n=l-d&s,n>>>0<2147483647)if(e=xf(n|0)|0,(e|0)==((t[o>>2]|0)+(t[ie>>2]|0)|0)){if((e|0)!=(-1|0)){d=n,l=e,pe=135;break e}}else o=e,pe=126;else n=0}else pe=118;while(0);do if((pe|0)==118)if(r=xf(0)|0,(r|0)!=(-1|0)?(n=r,we=t[2902]|0,le=we+-1|0,n=((le&n|0)==0?0:(le+n&0-we)-n|0)+k|0,we=t[2891]|0,le=n+we|0,n>>>0>P>>>0&n>>>0<2147483647):0){if(ie=t[2893]|0,ie|0?le>>>0<=we>>>0|le>>>0>ie>>>0:0){n=0;break}if(e=xf(n|0)|0,(e|0)==(r|0)){d=n,l=r,pe=135;break e}else o=e,pe=126}else n=0;while(0);do if((pe|0)==126){if(r=0-n|0,!(_>>>0>n>>>0&(n>>>0<2147483647&(o|0)!=(-1|0))))if((o|0)==(-1|0)){n=0;break}else{d=n,l=o,pe=135;break e}if(e=t[2903]|0,e=y-n+e&0-e,e>>>0>=2147483647){d=n,l=o,pe=135;break e}if((xf(e|0)|0)==(-1|0)){xf(r|0)|0,n=0;break}else{d=e+n|0,l=o,pe=135;break e}}while(0);t[2894]=t[2894]|4,pe=133}while(0);if((((pe|0)==133?k>>>0<2147483647:0)?(qe=xf(k|0)|0,ie=xf(0)|0,Pe=ie-qe|0,ke=Pe>>>0>(P+40|0)>>>0,!((qe|0)==(-1|0)|ke^1|qe>>>0>>0&((qe|0)!=(-1|0)&(ie|0)!=(-1|0))^1)):0)&&(d=ke?Pe:n,l=qe,pe=135),(pe|0)==135){n=(t[2891]|0)+d|0,t[2891]=n,n>>>0>(t[2892]|0)>>>0&&(t[2892]=n),y=t[2789]|0;do if(y){for(n=11580;;){if(e=t[n>>2]|0,r=n+4|0,o=t[r>>2]|0,(l|0)==(e+o|0)){pe=145;break}if(s=t[n+8>>2]|0,s)n=s;else break}if(((pe|0)==145?(t[n+12>>2]&8|0)==0:0)?y>>>0>>0&y>>>0>=e>>>0:0){t[r>>2]=o+d,_e=y+8|0,_e=(_e&7|0)==0?0:0-_e&7,pe=y+_e|0,_e=(t[2786]|0)+(d-_e)|0,t[2789]=pe,t[2786]=_e,t[pe+4>>2]=_e|1,t[pe+_e+4>>2]=40,t[2790]=t[2905];break}for(l>>>0<(t[2787]|0)>>>0&&(t[2787]=l),r=l+d|0,n=11580;;){if((t[n>>2]|0)==(r|0)){pe=153;break}if(e=t[n+8>>2]|0,e)n=e;else break}if((pe|0)==153?(t[n+12>>2]&8|0)==0:0){t[n>>2]=l,T=n+4|0,t[T>>2]=(t[T>>2]|0)+d,T=l+8|0,T=l+((T&7|0)==0?0:0-T&7)|0,n=r+8|0,n=r+((n&7|0)==0?0:0-n&7)|0,k=T+P|0,_=n-T-P|0,t[T+4>>2]=P|3;do if((n|0)!=(y|0)){if((n|0)==(t[2788]|0)){_e=(t[2785]|0)+_|0,t[2785]=_e,t[2788]=k,t[k+4>>2]=_e|1,t[k+_e>>2]=_e;break}if(e=t[n+4>>2]|0,(e&3|0)==1){d=e&-8,o=e>>>3;e:do if(e>>>0<256)if(e=t[n+8>>2]|0,r=t[n+12>>2]|0,(r|0)==(e|0)){t[2783]=t[2783]&~(1<>2]=r,t[r+8>>2]=e;break}else{l=t[n+24>>2]|0,e=t[n+12>>2]|0;do if((e|0)==(n|0)){if(o=n+16|0,r=o+4|0,e=t[r>>2]|0,!e)if(e=t[o>>2]|0,e)r=o;else{e=0;break}for(;;){if(o=e+20|0,s=t[o>>2]|0,s|0){e=s,r=o;continue}if(o=e+16|0,s=t[o>>2]|0,s)e=s,r=o;else break}t[r>>2]=0}else _e=t[n+8>>2]|0,t[_e+12>>2]=e,t[e+8>>2]=_e;while(0);if(!l)break;r=t[n+28>>2]|0,o=11436+(r<<2)|0;do if((n|0)!=(t[o>>2]|0)){if(t[l+16+(((t[l+16>>2]|0)!=(n|0)&1)<<2)>>2]=e,!e)break e}else{if(t[o>>2]=e,e|0)break;t[2784]=t[2784]&~(1<>2]=l,r=n+16|0,o=t[r>>2]|0,o|0&&(t[e+16>>2]=o,t[o+24>>2]=e),r=t[r+4>>2]|0,!r)break;t[e+20>>2]=r,t[r+24>>2]=e}while(0);n=n+d|0,s=d+_|0}else s=_;if(n=n+4|0,t[n>>2]=t[n>>2]&-2,t[k+4>>2]=s|1,t[k+s>>2]=s,n=s>>>3,s>>>0<256){r=11172+(n<<1<<2)|0,e=t[2783]|0,n=1<>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=k,t[n+12>>2]=k,t[k+8>>2]=n,t[k+12>>2]=r;break}n=s>>>8;do if(!n)n=0;else{if(s>>>0>16777215){n=31;break}pe=(n+1048320|0)>>>16&8,_e=n<>>16&4,_e=_e<>>16&2,n=14-(qe|pe|n)+(_e<>>15)|0,n=s>>>(n+7|0)&1|n<<1}while(0);if(o=11436+(n<<2)|0,t[k+28>>2]=n,e=k+16|0,t[e+4>>2]=0,t[e>>2]=0,e=t[2784]|0,r=1<>2]=k,t[k+24>>2]=o,t[k+12>>2]=k,t[k+8>>2]=k;break}for(e=s<<((n|0)==31?0:25-(n>>>1)|0),r=t[o>>2]|0;;){if((t[r+4>>2]&-8|0)==(s|0)){pe=194;break}if(o=r+16+(e>>>31<<2)|0,n=t[o>>2]|0,n)e=e<<1,r=n;else{pe=193;break}}if((pe|0)==193){t[o>>2]=k,t[k+24>>2]=r,t[k+12>>2]=k,t[k+8>>2]=k;break}else if((pe|0)==194){pe=r+8|0,_e=t[pe>>2]|0,t[_e+12>>2]=k,t[pe>>2]=k,t[k+8>>2]=_e,t[k+12>>2]=r,t[k+24>>2]=0;break}}else _e=(t[2786]|0)+_|0,t[2786]=_e,t[2789]=k,t[k+4>>2]=_e|1;while(0);return _e=T+8|0,h=vt,_e|0}for(n=11580;e=t[n>>2]|0,!(e>>>0<=y>>>0?(_e=e+(t[n+4>>2]|0)|0,_e>>>0>y>>>0):0);)n=t[n+8>>2]|0;s=_e+-47|0,e=s+8|0,e=s+((e&7|0)==0?0:0-e&7)|0,s=y+16|0,e=e>>>0>>0?y:e,n=e+8|0,r=l+8|0,r=(r&7|0)==0?0:0-r&7,pe=l+r|0,r=d+-40-r|0,t[2789]=pe,t[2786]=r,t[pe+4>>2]=r|1,t[pe+r+4>>2]=40,t[2790]=t[2905],r=e+4|0,t[r>>2]=27,t[n>>2]=t[2895],t[n+4>>2]=t[2896],t[n+8>>2]=t[2897],t[n+12>>2]=t[2898],t[2895]=l,t[2896]=d,t[2898]=0,t[2897]=n,n=e+24|0;do pe=n,n=n+4|0,t[n>>2]=7;while((pe+8|0)>>>0<_e>>>0);if((e|0)!=(y|0)){if(l=e-y|0,t[r>>2]=t[r>>2]&-2,t[y+4>>2]=l|1,t[e>>2]=l,n=l>>>3,l>>>0<256){r=11172+(n<<1<<2)|0,e=t[2783]|0,n=1<>2]|0):(t[2783]=e|n,n=r,e=r+8|0),t[e>>2]=y,t[n+12>>2]=y,t[y+8>>2]=n,t[y+12>>2]=r;break}if(n=l>>>8,n?l>>>0>16777215?r=31:(pe=(n+1048320|0)>>>16&8,_e=n<>>16&4,_e=_e<>>16&2,r=14-(qe|pe|r)+(_e<>>15)|0,r=l>>>(r+7|0)&1|r<<1):r=0,o=11436+(r<<2)|0,t[y+28>>2]=r,t[y+20>>2]=0,t[s>>2]=0,n=t[2784]|0,e=1<>2]=y,t[y+24>>2]=o,t[y+12>>2]=y,t[y+8>>2]=y;break}for(e=l<<((r|0)==31?0:25-(r>>>1)|0),r=t[o>>2]|0;;){if((t[r+4>>2]&-8|0)==(l|0)){pe=216;break}if(o=r+16+(e>>>31<<2)|0,n=t[o>>2]|0,n)e=e<<1,r=n;else{pe=215;break}}if((pe|0)==215){t[o>>2]=y,t[y+24>>2]=r,t[y+12>>2]=y,t[y+8>>2]=y;break}else if((pe|0)==216){pe=r+8|0,_e=t[pe>>2]|0,t[_e+12>>2]=y,t[pe>>2]=y,t[y+8>>2]=_e,t[y+12>>2]=r,t[y+24>>2]=0;break}}}else{_e=t[2787]|0,(_e|0)==0|l>>>0<_e>>>0&&(t[2787]=l),t[2895]=l,t[2896]=d,t[2898]=0,t[2792]=t[2901],t[2791]=-1,n=0;do _e=11172+(n<<1<<2)|0,t[_e+12>>2]=_e,t[_e+8>>2]=_e,n=n+1|0;while((n|0)!=32);_e=l+8|0,_e=(_e&7|0)==0?0:0-_e&7,pe=l+_e|0,_e=d+-40-_e|0,t[2789]=pe,t[2786]=_e,t[pe+4>>2]=_e|1,t[pe+_e+4>>2]=40,t[2790]=t[2905]}while(0);if(n=t[2786]|0,n>>>0>P>>>0)return qe=n-P|0,t[2786]=qe,_e=t[2789]|0,pe=_e+P|0,t[2789]=pe,t[pe+4>>2]=qe|1,t[_e+4>>2]=P|3,_e=_e+8|0,h=vt,_e|0}return t[(ca()|0)>>2]=12,_e=0,h=vt,_e|0}function sh(e){e=e|0;var n=0,r=0,o=0,s=0,l=0,d=0,_=0,y=0;if(!!e){r=e+-8|0,s=t[2787]|0,e=t[e+-4>>2]|0,n=e&-8,y=r+n|0;do if(e&1)_=r,d=r;else{if(o=t[r>>2]|0,!(e&3)||(d=r+(0-o)|0,l=o+n|0,d>>>0>>0))return;if((d|0)==(t[2788]|0)){if(e=y+4|0,n=t[e>>2]|0,(n&3|0)!=3){_=d,n=l;break}t[2785]=l,t[e>>2]=n&-2,t[d+4>>2]=l|1,t[d+l>>2]=l;return}if(r=o>>>3,o>>>0<256)if(e=t[d+8>>2]|0,n=t[d+12>>2]|0,(n|0)==(e|0)){t[2783]=t[2783]&~(1<>2]=n,t[n+8>>2]=e,_=d,n=l;break}s=t[d+24>>2]|0,e=t[d+12>>2]|0;do if((e|0)==(d|0)){if(r=d+16|0,n=r+4|0,e=t[n>>2]|0,!e)if(e=t[r>>2]|0,e)n=r;else{e=0;break}for(;;){if(r=e+20|0,o=t[r>>2]|0,o|0){e=o,n=r;continue}if(r=e+16|0,o=t[r>>2]|0,o)e=o,n=r;else break}t[n>>2]=0}else _=t[d+8>>2]|0,t[_+12>>2]=e,t[e+8>>2]=_;while(0);if(s){if(n=t[d+28>>2]|0,r=11436+(n<<2)|0,(d|0)==(t[r>>2]|0)){if(t[r>>2]=e,!e){t[2784]=t[2784]&~(1<>2]|0)!=(d|0)&1)<<2)>>2]=e,!e){_=d,n=l;break}t[e+24>>2]=s,n=d+16|0,r=t[n>>2]|0,r|0&&(t[e+16>>2]=r,t[r+24>>2]=e),n=t[n+4>>2]|0,n?(t[e+20>>2]=n,t[n+24>>2]=e,_=d,n=l):(_=d,n=l)}else _=d,n=l}while(0);if(!(d>>>0>=y>>>0)&&(e=y+4|0,o=t[e>>2]|0,!!(o&1))){if(o&2)t[e>>2]=o&-2,t[_+4>>2]=n|1,t[d+n>>2]=n,s=n;else{if(e=t[2788]|0,(y|0)==(t[2789]|0)){if(y=(t[2786]|0)+n|0,t[2786]=y,t[2789]=_,t[_+4>>2]=y|1,(_|0)!=(e|0))return;t[2788]=0,t[2785]=0;return}if((y|0)==(e|0)){y=(t[2785]|0)+n|0,t[2785]=y,t[2788]=d,t[_+4>>2]=y|1,t[d+y>>2]=y;return}s=(o&-8)+n|0,r=o>>>3;do if(o>>>0<256)if(n=t[y+8>>2]|0,e=t[y+12>>2]|0,(e|0)==(n|0)){t[2783]=t[2783]&~(1<>2]=e,t[e+8>>2]=n;break}else{l=t[y+24>>2]|0,e=t[y+12>>2]|0;do if((e|0)==(y|0)){if(r=y+16|0,n=r+4|0,e=t[n>>2]|0,!e)if(e=t[r>>2]|0,e)n=r;else{r=0;break}for(;;){if(r=e+20|0,o=t[r>>2]|0,o|0){e=o,n=r;continue}if(r=e+16|0,o=t[r>>2]|0,o)e=o,n=r;else break}t[n>>2]=0,r=e}else r=t[y+8>>2]|0,t[r+12>>2]=e,t[e+8>>2]=r,r=e;while(0);if(l|0){if(e=t[y+28>>2]|0,n=11436+(e<<2)|0,(y|0)==(t[n>>2]|0)){if(t[n>>2]=r,!r){t[2784]=t[2784]&~(1<>2]|0)!=(y|0)&1)<<2)>>2]=r,!r)break;t[r+24>>2]=l,e=y+16|0,n=t[e>>2]|0,n|0&&(t[r+16>>2]=n,t[n+24>>2]=r),e=t[e+4>>2]|0,e|0&&(t[r+20>>2]=e,t[e+24>>2]=r)}}while(0);if(t[_+4>>2]=s|1,t[d+s>>2]=s,(_|0)==(t[2788]|0)){t[2785]=s;return}}if(e=s>>>3,s>>>0<256){r=11172+(e<<1<<2)|0,n=t[2783]|0,e=1<>2]|0):(t[2783]=n|e,e=r,n=r+8|0),t[n>>2]=_,t[e+12>>2]=_,t[_+8>>2]=e,t[_+12>>2]=r;return}e=s>>>8,e?s>>>0>16777215?e=31:(d=(e+1048320|0)>>>16&8,y=e<>>16&4,y=y<>>16&2,e=14-(l|d|e)+(y<>>15)|0,e=s>>>(e+7|0)&1|e<<1):e=0,o=11436+(e<<2)|0,t[_+28>>2]=e,t[_+20>>2]=0,t[_+16>>2]=0,n=t[2784]|0,r=1<>>1)|0),r=t[o>>2]|0;;){if((t[r+4>>2]&-8|0)==(s|0)){e=73;break}if(o=r+16+(n>>>31<<2)|0,e=t[o>>2]|0,e)n=n<<1,r=e;else{e=72;break}}if((e|0)==72){t[o>>2]=_,t[_+24>>2]=r,t[_+12>>2]=_,t[_+8>>2]=_;break}else if((e|0)==73){d=r+8|0,y=t[d>>2]|0,t[y+12>>2]=_,t[d>>2]=_,t[_+8>>2]=y,t[_+12>>2]=r,t[_+24>>2]=0;break}}else t[2784]=n|r,t[o>>2]=_,t[_+24>>2]=o,t[_+12>>2]=_,t[_+8>>2]=_;while(0);if(y=(t[2791]|0)+-1|0,t[2791]=y,!y)e=11588;else return;for(;e=t[e>>2]|0,e;)e=e+8|0;t[2791]=-1}}}function rL(){return 11628}function iL(e){e=e|0;var n=0,r=0;return n=h,h=h+16|0,r=n,t[r>>2]=sL(t[e+60>>2]|0)|0,e=lh(Ms(6,r|0)|0)|0,h=n,e|0}function j8(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0;P=h,h=h+48|0,k=P+16|0,l=P,s=P+32|0,_=e+28|0,o=t[_>>2]|0,t[s>>2]=o,y=e+20|0,o=(t[y>>2]|0)-o|0,t[s+4>>2]=o,t[s+8>>2]=n,t[s+12>>2]=r,o=o+r|0,d=e+60|0,t[l>>2]=t[d>>2],t[l+4>>2]=s,t[l+8>>2]=2,l=lh(G0(146,l|0)|0)|0;e:do if((o|0)!=(l|0)){for(n=2;!((l|0)<0);)if(o=o-l|0,we=t[s+4>>2]|0,q=l>>>0>we>>>0,s=q?s+8|0:s,n=(q<<31>>31)+n|0,we=l-(q?we:0)|0,t[s>>2]=(t[s>>2]|0)+we,q=s+4|0,t[q>>2]=(t[q>>2]|0)-we,t[k>>2]=t[d>>2],t[k+4>>2]=s,t[k+8>>2]=n,l=lh(G0(146,k|0)|0)|0,(o|0)==(l|0)){T=3;break e}t[e+16>>2]=0,t[_>>2]=0,t[y>>2]=0,t[e>>2]=t[e>>2]|32,(n|0)==2?r=0:r=r-(t[s+4>>2]|0)|0}else T=3;while(0);return(T|0)==3&&(we=t[e+44>>2]|0,t[e+16>>2]=we+(t[e+48>>2]|0),t[_>>2]=we,t[y>>2]=we),h=P,r|0}function oL(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;return s=h,h=h+32|0,l=s,o=s+20|0,t[l>>2]=t[e+60>>2],t[l+4>>2]=0,t[l+8>>2]=n,t[l+12>>2]=o,t[l+16>>2]=r,(lh(Uu(140,l|0)|0)|0)<0?(t[o>>2]=-1,e=-1):e=t[o>>2]|0,h=s,e|0}function lh(e){return e=e|0,e>>>0>4294963200&&(t[(ca()|0)>>2]=0-e,e=-1),e|0}function ca(){return(uL()|0)+64|0}function uL(){return b4()|0}function b4(){return 2084}function sL(e){return e=e|0,e|0}function lL(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;return s=h,h=h+32|0,o=s,t[e+36>>2]=1,((t[e>>2]&64|0)==0?(t[o>>2]=t[e+60>>2],t[o+4>>2]=21523,t[o+8>>2]=s+16,su(54,o|0)|0):0)&&(c[e+75>>0]=-1),o=j8(e,n,r)|0,h=s,o|0}function U8(e,n){e=e|0,n=n|0;var r=0,o=0;if(r=c[e>>0]|0,o=c[n>>0]|0,r<<24>>24==0?1:r<<24>>24!=o<<24>>24)e=o;else{do e=e+1|0,n=n+1|0,r=c[e>>0]|0,o=c[n>>0]|0;while(!(r<<24>>24==0?1:r<<24>>24!=o<<24>>24));e=o}return(r&255)-(e&255)|0}function fL(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0;e:do if(!r)e=0;else{for(;o=c[e>>0]|0,s=c[n>>0]|0,o<<24>>24==s<<24>>24;)if(r=r+-1|0,r)e=e+1|0,n=n+1|0;else{e=0;break e}e=(o&255)-(s&255)|0}while(0);return e|0}function q8(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0;ie=h,h=h+224|0,T=ie+120|0,P=ie+80|0,we=ie,le=ie+136|0,o=P,s=o+40|0;do t[o>>2]=0,o=o+4|0;while((o|0)<(s|0));return t[T>>2]=t[r>>2],(G4(0,n,T,we,P)|0)<0?r=-1:((t[e+76>>2]|0)>-1?q=cL(e)|0:q=0,r=t[e>>2]|0,k=r&32,(c[e+74>>0]|0)<1&&(t[e>>2]=r&-33),o=e+48|0,t[o>>2]|0?r=G4(e,n,T,we,P)|0:(s=e+44|0,l=t[s>>2]|0,t[s>>2]=le,d=e+28|0,t[d>>2]=le,_=e+20|0,t[_>>2]=le,t[o>>2]=80,y=e+16|0,t[y>>2]=le+80,r=G4(e,n,T,we,P)|0,l&&(dh[t[e+36>>2]&7](e,0,0)|0,r=(t[_>>2]|0)==0?-1:r,t[s>>2]=l,t[o>>2]=0,t[y>>2]=0,t[d>>2]=0,t[_>>2]=0)),o=t[e>>2]|0,t[e>>2]=o|k,q|0&&aL(e),r=(o&32|0)==0?r:-1),h=ie,r|0}function G4(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0,Pe=0,ke=0,qe=0,pe=0,_e=0,vt=0,Ln=0,Ht=0,It=0,gn=0,Pn=0,zt=0;zt=h,h=h+64|0,Ht=zt+16|0,It=zt,vt=zt+24|0,gn=zt+8|0,Pn=zt+20|0,t[Ht>>2]=n,qe=(e|0)!=0,pe=vt+40|0,_e=pe,vt=vt+39|0,Ln=gn+4|0,d=0,l=0,T=0;e:for(;;){do if((l|0)>-1)if((d|0)>(2147483647-l|0)){t[(ca()|0)>>2]=75,l=-1;break}else{l=d+l|0;break}while(0);if(d=c[n>>0]|0,d<<24>>24)_=n;else{ke=87;break}t:for(;;){switch(d<<24>>24){case 37:{d=_,ke=9;break t}case 0:{d=_;break t}default:}Pe=_+1|0,t[Ht>>2]=Pe,d=c[Pe>>0]|0,_=Pe}t:do if((ke|0)==9)for(;;){if(ke=0,(c[_+1>>0]|0)!=37)break t;if(d=d+1|0,_=_+2|0,t[Ht>>2]=_,(c[_>>0]|0)==37)ke=9;else break}while(0);if(d=d-n|0,qe&&ri(e,n,d),d|0){n=_;continue}y=_+1|0,d=(c[y>>0]|0)+-48|0,d>>>0<10?(Pe=(c[_+2>>0]|0)==36,ie=Pe?d:-1,T=Pe?1:T,y=Pe?_+3|0:y):ie=-1,t[Ht>>2]=y,d=c[y>>0]|0,_=(d<<24>>24)+-32|0;t:do if(_>>>0<32)for(k=0,P=d;;){if(d=1<<_,!(d&75913)){d=P;break t}if(k=d|k,y=y+1|0,t[Ht>>2]=y,d=c[y>>0]|0,_=(d<<24>>24)+-32|0,_>>>0>=32)break;P=d}else k=0;while(0);if(d<<24>>24==42){if(_=y+1|0,d=(c[_>>0]|0)+-48|0,d>>>0<10?(c[y+2>>0]|0)==36:0)t[s+(d<<2)>>2]=10,d=t[o+((c[_>>0]|0)+-48<<3)>>2]|0,T=1,y=y+3|0;else{if(T|0){l=-1;break}qe?(T=(t[r>>2]|0)+(4-1)&~(4-1),d=t[T>>2]|0,t[r>>2]=T+4,T=0,y=_):(d=0,T=0,y=_)}t[Ht>>2]=y,Pe=(d|0)<0,d=Pe?0-d|0:d,k=Pe?k|8192:k}else{if(d=z8(Ht)|0,(d|0)<0){l=-1;break}y=t[Ht>>2]|0}do if((c[y>>0]|0)==46){if((c[y+1>>0]|0)!=42){t[Ht>>2]=y+1,_=z8(Ht)|0,y=t[Ht>>2]|0;break}if(P=y+2|0,_=(c[P>>0]|0)+-48|0,_>>>0<10?(c[y+3>>0]|0)==36:0){t[s+(_<<2)>>2]=10,_=t[o+((c[P>>0]|0)+-48<<3)>>2]|0,y=y+4|0,t[Ht>>2]=y;break}if(T|0){l=-1;break e}qe?(Pe=(t[r>>2]|0)+(4-1)&~(4-1),_=t[Pe>>2]|0,t[r>>2]=Pe+4):_=0,t[Ht>>2]=P,y=P}else _=-1;while(0);for(le=0;;){if(((c[y>>0]|0)+-65|0)>>>0>57){l=-1;break e}if(Pe=y+1|0,t[Ht>>2]=Pe,P=c[(c[y>>0]|0)+-65+(5178+(le*58|0))>>0]|0,q=P&255,(q+-1|0)>>>0<8)le=q,y=Pe;else break}if(!(P<<24>>24)){l=-1;break}we=(ie|0)>-1;do if(P<<24>>24==19)if(we){l=-1;break e}else ke=49;else{if(we){t[s+(ie<<2)>>2]=q,we=o+(ie<<3)|0,ie=t[we+4>>2]|0,ke=It,t[ke>>2]=t[we>>2],t[ke+4>>2]=ie,ke=49;break}if(!qe){l=0;break e}W8(It,q,r)}while(0);if((ke|0)==49?(ke=0,!qe):0){d=0,n=Pe;continue}y=c[y>>0]|0,y=(le|0)!=0&(y&15|0)==3?y&-33:y,we=k&-65537,ie=(k&8192|0)==0?k:we;t:do switch(y|0){case 110:switch((le&255)<<24>>24){case 0:{t[t[It>>2]>>2]=l,d=0,n=Pe;continue e}case 1:{t[t[It>>2]>>2]=l,d=0,n=Pe;continue e}case 2:{d=t[It>>2]|0,t[d>>2]=l,t[d+4>>2]=((l|0)<0)<<31>>31,d=0,n=Pe;continue e}case 3:{g[t[It>>2]>>1]=l,d=0,n=Pe;continue e}case 4:{c[t[It>>2]>>0]=l,d=0,n=Pe;continue e}case 6:{t[t[It>>2]>>2]=l,d=0,n=Pe;continue e}case 7:{d=t[It>>2]|0,t[d>>2]=l,t[d+4>>2]=((l|0)<0)<<31>>31,d=0,n=Pe;continue e}default:{d=0,n=Pe;continue e}}case 112:{y=120,_=_>>>0>8?_:8,n=ie|8,ke=61;break}case 88:case 120:{n=ie,ke=61;break}case 111:{y=It,n=t[y>>2]|0,y=t[y+4>>2]|0,q=pL(n,y,pe)|0,we=_e-q|0,k=0,P=5642,_=(ie&8|0)==0|(_|0)>(we|0)?_:we+1|0,we=ie,ke=67;break}case 105:case 100:if(y=It,n=t[y>>2]|0,y=t[y+4>>2]|0,(y|0)<0){n=fh(0,0,n|0,y|0)|0,y=be,k=It,t[k>>2]=n,t[k+4>>2]=y,k=1,P=5642,ke=66;break t}else{k=(ie&2049|0)!=0&1,P=(ie&2048|0)==0?(ie&1|0)==0?5642:5644:5643,ke=66;break t}case 117:{y=It,k=0,P=5642,n=t[y>>2]|0,y=t[y+4>>2]|0,ke=66;break}case 99:{c[vt>>0]=t[It>>2],n=vt,k=0,P=5642,q=pe,y=1,_=we;break}case 109:{y=hL(t[(ca()|0)>>2]|0)|0,ke=71;break}case 115:{y=t[It>>2]|0,y=y|0?y:5652,ke=71;break}case 67:{t[gn>>2]=t[It>>2],t[Ln>>2]=0,t[It>>2]=gn,q=-1,y=gn,ke=75;break}case 83:{n=t[It>>2]|0,_?(q=_,y=n,ke=75):(wi(e,32,d,0,ie),n=0,ke=84);break}case 65:case 71:case 70:case 69:case 97:case 103:case 102:case 101:{d=vL(e,+L[It>>3],d,_,ie,y)|0,n=Pe;continue e}default:k=0,P=5642,q=pe,y=_,_=ie}while(0);t:do if((ke|0)==61)ie=It,le=t[ie>>2]|0,ie=t[ie+4>>2]|0,q=dL(le,ie,pe,y&32)|0,P=(n&8|0)==0|(le|0)==0&(ie|0)==0,k=P?0:2,P=P?5642:5642+(y>>4)|0,we=n,n=le,y=ie,ke=67;else if((ke|0)==66)q=aa(n,y,pe)|0,we=ie,ke=67;else if((ke|0)==71)ke=0,ie=mL(y,0,_)|0,le=(ie|0)==0,n=y,k=0,P=5642,q=le?y+_|0:ie,y=le?_:ie-y|0,_=we;else if((ke|0)==75){for(ke=0,P=y,n=0,_=0;k=t[P>>2]|0,!(!k||(_=H8(Pn,k)|0,(_|0)<0|_>>>0>(q-n|0)>>>0));)if(n=_+n|0,q>>>0>n>>>0)P=P+4|0;else break;if((_|0)<0){l=-1;break e}if(wi(e,32,d,n,ie),!n)n=0,ke=84;else for(k=0;;){if(_=t[y>>2]|0,!_){ke=84;break t}if(_=H8(Pn,_)|0,k=_+k|0,(k|0)>(n|0)){ke=84;break t}if(ri(e,Pn,_),k>>>0>=n>>>0){ke=84;break}else y=y+4|0}}while(0);if((ke|0)==67)ke=0,y=(n|0)!=0|(y|0)!=0,ie=(_|0)!=0|y,y=((y^1)&1)+(_e-q)|0,n=ie?q:pe,q=pe,y=ie?(_|0)>(y|0)?_:y:_,_=(_|0)>-1?we&-65537:we;else if((ke|0)==84){ke=0,wi(e,32,d,n,ie^8192),d=(d|0)>(n|0)?d:n,n=Pe;continue}le=q-n|0,we=(y|0)<(le|0)?le:y,ie=we+k|0,d=(d|0)<(ie|0)?ie:d,wi(e,32,d,ie,_),ri(e,P,k),wi(e,48,d,ie,_^65536),wi(e,48,we,le,0),ri(e,n,le),wi(e,32,d,ie,_^8192),n=Pe}e:do if((ke|0)==87&&!e)if(!T)l=0;else{for(l=1;n=t[s+(l<<2)>>2]|0,!!n;)if(W8(o+(l<<3)|0,n,r),l=l+1|0,(l|0)>=10){l=1;break e}for(;;){if(t[s+(l<<2)>>2]|0){l=-1;break e}if(l=l+1|0,(l|0)>=10){l=1;break}}}while(0);return h=zt,l|0}function cL(e){return e=e|0,0}function aL(e){e=e|0}function ri(e,n,r){e=e|0,n=n|0,r=r|0,t[e>>2]&32||TL(n,r,e)|0}function z8(e){e=e|0;var n=0,r=0,o=0;if(r=t[e>>2]|0,o=(c[r>>0]|0)+-48|0,o>>>0<10){n=0;do n=o+(n*10|0)|0,r=r+1|0,t[e>>2]=r,o=(c[r>>0]|0)+-48|0;while(o>>>0<10)}else n=0;return n|0}function W8(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;e:do if(n>>>0<=20)do switch(n|0){case 9:{o=(t[r>>2]|0)+(4-1)&~(4-1),n=t[o>>2]|0,t[r>>2]=o+4,t[e>>2]=n;break e}case 10:{o=(t[r>>2]|0)+(4-1)&~(4-1),n=t[o>>2]|0,t[r>>2]=o+4,o=e,t[o>>2]=n,t[o+4>>2]=((n|0)<0)<<31>>31;break e}case 11:{o=(t[r>>2]|0)+(4-1)&~(4-1),n=t[o>>2]|0,t[r>>2]=o+4,o=e,t[o>>2]=n,t[o+4>>2]=0;break e}case 12:{o=(t[r>>2]|0)+(8-1)&~(8-1),n=o,s=t[n>>2]|0,n=t[n+4>>2]|0,t[r>>2]=o+8,o=e,t[o>>2]=s,t[o+4>>2]=n;break e}case 13:{s=(t[r>>2]|0)+(4-1)&~(4-1),o=t[s>>2]|0,t[r>>2]=s+4,o=(o&65535)<<16>>16,s=e,t[s>>2]=o,t[s+4>>2]=((o|0)<0)<<31>>31;break e}case 14:{s=(t[r>>2]|0)+(4-1)&~(4-1),o=t[s>>2]|0,t[r>>2]=s+4,s=e,t[s>>2]=o&65535,t[s+4>>2]=0;break e}case 15:{s=(t[r>>2]|0)+(4-1)&~(4-1),o=t[s>>2]|0,t[r>>2]=s+4,o=(o&255)<<24>>24,s=e,t[s>>2]=o,t[s+4>>2]=((o|0)<0)<<31>>31;break e}case 16:{s=(t[r>>2]|0)+(4-1)&~(4-1),o=t[s>>2]|0,t[r>>2]=s+4,s=e,t[s>>2]=o&255,t[s+4>>2]=0;break e}case 17:{s=(t[r>>2]|0)+(8-1)&~(8-1),l=+L[s>>3],t[r>>2]=s+8,L[e>>3]=l;break e}case 18:{s=(t[r>>2]|0)+(8-1)&~(8-1),l=+L[s>>3],t[r>>2]=s+8,L[e>>3]=l;break e}default:break e}while(0);while(0)}function dL(e,n,r,o){if(e=e|0,n=n|0,r=r|0,o=o|0,!((e|0)==0&(n|0)==0))do r=r+-1|0,c[r>>0]=C[5694+(e&15)>>0]|0|o,e=ch(e|0,n|0,4)|0,n=be;while(!((e|0)==0&(n|0)==0));return r|0}function pL(e,n,r){if(e=e|0,n=n|0,r=r|0,!((e|0)==0&(n|0)==0))do r=r+-1|0,c[r>>0]=e&7|48,e=ch(e|0,n|0,3)|0,n=be;while(!((e|0)==0&(n|0)==0));return r|0}function aa(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;if(n>>>0>0|(n|0)==0&e>>>0>4294967295){for(;o=K4(e|0,n|0,10,0)|0,r=r+-1|0,c[r>>0]=o&255|48,o=e,e=$4(e|0,n|0,10,0)|0,n>>>0>9|(n|0)==9&o>>>0>4294967295;)n=be;n=e}else n=e;if(n)for(;r=r+-1|0,c[r>>0]=(n>>>0)%10|0|48,!(n>>>0<10);)n=(n>>>0)/10|0;return r|0}function hL(e){return e=e|0,DL(e,t[(wL()|0)+188>>2]|0)|0}function mL(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;l=n&255,o=(r|0)!=0;e:do if(o&(e&3|0)!=0)for(s=n&255;;){if((c[e>>0]|0)==s<<24>>24){d=6;break e}if(e=e+1|0,r=r+-1|0,o=(r|0)!=0,!(o&(e&3|0)!=0)){d=5;break}}else d=5;while(0);(d|0)==5&&(o?d=6:r=0);e:do if((d|0)==6&&(s=n&255,(c[e>>0]|0)!=s<<24>>24)){o=Un(l,16843009)|0;t:do if(r>>>0>3){for(;l=t[e>>2]^o,!((l&-2139062144^-2139062144)&l+-16843009|0);)if(e=e+4|0,r=r+-4|0,r>>>0<=3){d=11;break t}}else d=11;while(0);if((d|0)==11&&!r){r=0;break}for(;;){if((c[e>>0]|0)==s<<24>>24)break e;if(e=e+1|0,r=r+-1|0,!r){r=0;break}}}while(0);return(r|0?e:0)|0}function wi(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0;if(d=h,h=h+256|0,l=d,(r|0)>(o|0)&(s&73728|0)==0){if(s=r-o|0,pa(l|0,n|0,(s>>>0<256?s:256)|0)|0,s>>>0>255){n=r-o|0;do ri(e,l,256),s=s+-256|0;while(s>>>0>255);s=n&255}ri(e,l,s)}h=d}function H8(e,n){return e=e|0,n=n|0,e?e=_L(e,n,0)|0:e=0,e|0}function vL(e,n,r,o,s,l){e=e|0,n=+n,r=r|0,o=o|0,s=s|0,l=l|0;var d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0,ie=0,Pe=0,ke=0,qe=0,pe=0,_e=0,vt=0,Ln=0,Ht=0,It=0,gn=0,Pn=0,zt=0,Dr=0;Dr=h,h=h+560|0,y=Dr+8|0,Pe=Dr,zt=Dr+524|0,Pn=zt,k=Dr+512|0,t[Pe>>2]=0,gn=k+12|0,b8(n)|0,(be|0)<0?(n=-n,Ht=1,Ln=5659):(Ht=(s&2049|0)!=0&1,Ln=(s&2048|0)==0?(s&1|0)==0?5660:5665:5662),b8(n)|0,It=be&2146435072;do if(It>>>0<2146435072|(It|0)==2146435072&0<0){if(we=+gL(n,Pe)*2,d=we!=0,d&&(t[Pe>>2]=(t[Pe>>2]|0)+-1),qe=l|32,(qe|0)==97){le=l&32,q=(le|0)==0?Ln:Ln+9|0,P=Ht|2,d=12-o|0;do if(o>>>0>11|(d|0)==0)n=we;else{n=8;do d=d+-1|0,n=n*16;while((d|0)!=0);if((c[q>>0]|0)==45){n=-(n+(-we-n));break}else{n=we+n-n;break}}while(0);_=t[Pe>>2]|0,d=(_|0)<0?0-_|0:_,d=aa(d,((d|0)<0)<<31>>31,gn)|0,(d|0)==(gn|0)&&(d=k+11|0,c[d>>0]=48),c[d+-1>>0]=(_>>31&2)+43,T=d+-2|0,c[T>>0]=l+15,k=(o|0)<1,y=(s&8|0)==0,d=zt;do It=~~n,_=d+1|0,c[d>>0]=C[5694+It>>0]|le,n=(n-+(It|0))*16,((_-Pn|0)==1?!(y&(k&n==0)):0)?(c[_>>0]=46,d=d+2|0):d=_;while(n!=0);It=d-Pn|0,Pn=gn-T|0,gn=(o|0)!=0&(It+-2|0)<(o|0)?o+2|0:It,d=Pn+P+gn|0,wi(e,32,r,d,s),ri(e,q,P),wi(e,48,r,d,s^65536),ri(e,zt,It),wi(e,48,gn-It|0,0,0),ri(e,T,Pn),wi(e,32,r,d,s^8192);break}_=(o|0)<0?6:o,d?(d=(t[Pe>>2]|0)+-28|0,t[Pe>>2]=d,n=we*268435456):(n=we,d=t[Pe>>2]|0),It=(d|0)<0?y:y+288|0,y=It;do _e=~~n>>>0,t[y>>2]=_e,y=y+4|0,n=(n-+(_e>>>0))*1e9;while(n!=0);if((d|0)>0)for(k=It,P=y;;){if(T=(d|0)<29?d:29,d=P+-4|0,d>>>0>=k>>>0){y=0;do pe=X8(t[d>>2]|0,0,T|0)|0,pe=Y4(pe|0,be|0,y|0,0)|0,_e=be,ke=K4(pe|0,_e|0,1e9,0)|0,t[d>>2]=ke,y=$4(pe|0,_e|0,1e9,0)|0,d=d+-4|0;while(d>>>0>=k>>>0);y&&(k=k+-4|0,t[k>>2]=y)}for(y=P;!(y>>>0<=k>>>0);)if(d=y+-4|0,!(t[d>>2]|0))y=d;else break;if(d=(t[Pe>>2]|0)-T|0,t[Pe>>2]=d,(d|0)>0)P=y;else break}else k=It;if((d|0)<0){o=((_+25|0)/9|0)+1|0,ie=(qe|0)==102;do{if(le=0-d|0,le=(le|0)<9?le:9,k>>>0>>0){T=(1<>>le,q=0,d=k;do _e=t[d>>2]|0,t[d>>2]=(_e>>>le)+q,q=Un(_e&T,P)|0,d=d+4|0;while(d>>>0>>0);d=(t[k>>2]|0)==0?k+4|0:k,q?(t[y>>2]=q,k=d,d=y+4|0):(k=d,d=y)}else k=(t[k>>2]|0)==0?k+4|0:k,d=y;y=ie?It:k,y=(d-y>>2|0)>(o|0)?y+(o<<2)|0:d,d=(t[Pe>>2]|0)+le|0,t[Pe>>2]=d}while((d|0)<0);d=k,o=y}else d=k,o=y;if(_e=It,d>>>0>>0){if(y=(_e-d>>2)*9|0,T=t[d>>2]|0,T>>>0>=10){k=10;do k=k*10|0,y=y+1|0;while(T>>>0>=k>>>0)}}else y=0;if(ie=(qe|0)==103,ke=(_|0)!=0,k=_-((qe|0)!=102?y:0)+((ke&ie)<<31>>31)|0,(k|0)<(((o-_e>>2)*9|0)+-9|0)){if(k=k+9216|0,le=It+4+(((k|0)/9|0)+-1024<<2)|0,k=((k|0)%9|0)+1|0,(k|0)<9){T=10;do T=T*10|0,k=k+1|0;while((k|0)!=9)}else T=10;if(P=t[le>>2]|0,q=(P>>>0)%(T>>>0)|0,k=(le+4|0)==(o|0),k&(q|0)==0)k=le;else if(we=(((P>>>0)/(T>>>0)|0)&1|0)==0?9007199254740992:9007199254740994,pe=(T|0)/2|0,n=q>>>0>>0?.5:k&(q|0)==(pe|0)?1:1.5,Ht&&(pe=(c[Ln>>0]|0)==45,n=pe?-n:n,we=pe?-we:we),k=P-q|0,t[le>>2]=k,we+n!=we){if(pe=k+T|0,t[le>>2]=pe,pe>>>0>999999999)for(y=le;k=y+-4|0,t[y>>2]=0,k>>>0>>0&&(d=d+-4|0,t[d>>2]=0),pe=(t[k>>2]|0)+1|0,t[k>>2]=pe,pe>>>0>999999999;)y=k;else k=le;if(y=(_e-d>>2)*9|0,P=t[d>>2]|0,P>>>0>=10){T=10;do T=T*10|0,y=y+1|0;while(P>>>0>=T>>>0)}}else k=le;k=k+4|0,k=o>>>0>k>>>0?k:o,pe=d}else k=o,pe=d;for(qe=k;;){if(qe>>>0<=pe>>>0){Pe=0;break}if(d=qe+-4|0,!(t[d>>2]|0))qe=d;else{Pe=1;break}}o=0-y|0;do if(ie)if(d=((ke^1)&1)+_|0,(d|0)>(y|0)&(y|0)>-5?(T=l+-1|0,_=d+-1-y|0):(T=l+-2|0,_=d+-1|0),d=s&8,d)le=d;else{if(Pe?(vt=t[qe+-4>>2]|0,(vt|0)!=0):0)if((vt>>>0)%10|0)k=0;else{k=0,d=10;do d=d*10|0,k=k+1|0;while(!((vt>>>0)%(d>>>0)|0|0))}else k=9;if(d=((qe-_e>>2)*9|0)+-9|0,(T|32|0)==102){le=d-k|0,le=(le|0)>0?le:0,_=(_|0)<(le|0)?_:le,le=0;break}else{le=d+y-k|0,le=(le|0)>0?le:0,_=(_|0)<(le|0)?_:le,le=0;break}}else T=l,le=s&8;while(0);if(ie=_|le,P=(ie|0)!=0&1,q=(T|32|0)==102,q)ke=0,d=(y|0)>0?y:0;else{if(d=(y|0)<0?o:y,d=aa(d,((d|0)<0)<<31>>31,gn)|0,k=gn,(k-d|0)<2)do d=d+-1|0,c[d>>0]=48;while((k-d|0)<2);c[d+-1>>0]=(y>>31&2)+43,d=d+-2|0,c[d>>0]=T,ke=d,d=k-d|0}if(d=Ht+1+_+P+d|0,wi(e,32,r,d,s),ri(e,Ln,Ht),wi(e,48,r,d,s^65536),q){T=pe>>>0>It>>>0?It:pe,le=zt+9|0,P=le,q=zt+8|0,k=T;do{if(y=aa(t[k>>2]|0,0,le)|0,(k|0)==(T|0))(y|0)==(le|0)&&(c[q>>0]=48,y=q);else if(y>>>0>zt>>>0){pa(zt|0,48,y-Pn|0)|0;do y=y+-1|0;while(y>>>0>zt>>>0)}ri(e,y,P-y|0),k=k+4|0}while(k>>>0<=It>>>0);if(ie|0&&ri(e,5710,1),k>>>0>>0&(_|0)>0)for(;;){if(y=aa(t[k>>2]|0,0,le)|0,y>>>0>zt>>>0){pa(zt|0,48,y-Pn|0)|0;do y=y+-1|0;while(y>>>0>zt>>>0)}if(ri(e,y,(_|0)<9?_:9),k=k+4|0,y=_+-9|0,k>>>0>>0&(_|0)>9)_=y;else{_=y;break}}wi(e,48,_+9|0,9,0)}else{if(ie=Pe?qe:pe+4|0,(_|0)>-1){Pe=zt+9|0,le=(le|0)==0,o=Pe,P=0-Pn|0,q=zt+8|0,T=pe;do{y=aa(t[T>>2]|0,0,Pe)|0,(y|0)==(Pe|0)&&(c[q>>0]=48,y=q);do if((T|0)==(pe|0)){if(k=y+1|0,ri(e,y,1),le&(_|0)<1){y=k;break}ri(e,5710,1),y=k}else{if(y>>>0<=zt>>>0)break;pa(zt|0,48,y+P|0)|0;do y=y+-1|0;while(y>>>0>zt>>>0)}while(0);Pn=o-y|0,ri(e,y,(_|0)>(Pn|0)?Pn:_),_=_-Pn|0,T=T+4|0}while(T>>>0>>0&(_|0)>-1)}wi(e,48,_+18|0,18,0),ri(e,ke,gn-ke|0)}wi(e,32,r,d,s^8192)}else zt=(l&32|0)!=0,d=Ht+3|0,wi(e,32,r,d,s&-65537),ri(e,Ln,Ht),ri(e,n!=n|!1?zt?5686:5690:zt?5678:5682,3),wi(e,32,r,d,s^8192);while(0);return h=Dr,((d|0)<(r|0)?r:d)|0}function b8(e){e=+e;var n=0;return L[j>>3]=e,n=t[j>>2]|0,be=t[j+4>>2]|0,n|0}function gL(e,n){return e=+e,n=n|0,+ +G8(e,n)}function G8(e,n){e=+e,n=n|0;var r=0,o=0,s=0;switch(L[j>>3]=e,r=t[j>>2]|0,o=t[j+4>>2]|0,s=ch(r|0,o|0,52)|0,s&2047){case 0:{e!=0?(e=+G8(e*18446744073709552e3,n),r=(t[n>>2]|0)+-64|0):r=0,t[n>>2]=r;break}case 2047:break;default:t[n>>2]=(s&2047)+-1022,t[j>>2]=r,t[j+4>>2]=o&-2146435073|1071644672,e=+L[j>>3]}return+e}function _L(e,n,r){e=e|0,n=n|0,r=r|0;do if(e){if(n>>>0<128){c[e>>0]=n,e=1;break}if(!(t[t[(yL()|0)+188>>2]>>2]|0))if((n&-128|0)==57216){c[e>>0]=n,e=1;break}else{t[(ca()|0)>>2]=84,e=-1;break}if(n>>>0<2048){c[e>>0]=n>>>6|192,c[e+1>>0]=n&63|128,e=2;break}if(n>>>0<55296|(n&-8192|0)==57344){c[e>>0]=n>>>12|224,c[e+1>>0]=n>>>6&63|128,c[e+2>>0]=n&63|128,e=3;break}if((n+-65536|0)>>>0<1048576){c[e>>0]=n>>>18|240,c[e+1>>0]=n>>>12&63|128,c[e+2>>0]=n>>>6&63|128,c[e+3>>0]=n&63|128,e=4;break}else{t[(ca()|0)>>2]=84,e=-1;break}}else e=1;while(0);return e|0}function yL(){return b4()|0}function wL(){return b4()|0}function DL(e,n){e=e|0,n=n|0;var r=0,o=0;for(o=0;;){if((C[5712+o>>0]|0)==(e|0)){e=2;break}if(r=o+1|0,(r|0)==87){r=5800,o=87,e=5;break}else o=r}if((e|0)==2&&(o?(r=5800,e=5):r=5800),(e|0)==5)for(;;){do e=r,r=r+1|0;while((c[e>>0]|0)!=0);if(o=o+-1|0,o)e=5;else break}return EL(r,t[n+20>>2]|0)|0}function EL(e,n){return e=e|0,n=n|0,SL(e,n)|0}function SL(e,n){return e=e|0,n=n|0,n?n=CL(t[n>>2]|0,t[n+4>>2]|0,e)|0:n=0,(n|0?n:e)|0}function CL(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0;q=(t[e>>2]|0)+1794895138|0,l=fc(t[e+8>>2]|0,q)|0,o=fc(t[e+12>>2]|0,q)|0,s=fc(t[e+16>>2]|0,q)|0;e:do if((l>>>0>>2>>>0?(P=n-(l<<2)|0,o>>>0

    >>0&s>>>0

    >>0):0)?((s|o)&3|0)==0:0){for(P=o>>>2,T=s>>>2,k=0;;){if(_=l>>>1,y=k+_|0,d=y<<1,s=d+P|0,o=fc(t[e+(s<<2)>>2]|0,q)|0,s=fc(t[e+(s+1<<2)>>2]|0,q)|0,!(s>>>0>>0&o>>>0<(n-s|0)>>>0)){o=0;break e}if(c[e+(s+o)>>0]|0){o=0;break e}if(o=U8(r,e+s|0)|0,!o)break;if(o=(o|0)<0,(l|0)==1){o=0;break e}else k=o?k:y,l=o?_:l-_|0}o=d+T|0,s=fc(t[e+(o<<2)>>2]|0,q)|0,o=fc(t[e+(o+1<<2)>>2]|0,q)|0,o>>>0>>0&s>>>0<(n-o|0)>>>0?o=(c[e+(o+s)>>0]|0)==0?e+o|0:0:o=0}else o=0;while(0);return o|0}function fc(e,n){e=e|0,n=n|0;var r=0;return r=Z8(e|0)|0,((n|0)==0?e:r)|0}function TL(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0,_=0;o=r+16|0,s=t[o>>2]|0,s?l=5:xL(r)|0?o=0:(s=t[o>>2]|0,l=5);e:do if((l|0)==5){if(_=r+20|0,d=t[_>>2]|0,o=d,(s-d|0)>>>0>>0){o=dh[t[r+36>>2]&7](r,e,n)|0;break}t:do if((c[r+75>>0]|0)>-1){for(d=n;;){if(!d){l=0,s=e;break t}if(s=d+-1|0,(c[e+s>>0]|0)==10)break;d=s}if(o=dh[t[r+36>>2]&7](r,e,d)|0,o>>>0>>0)break e;l=d,s=e+d|0,n=n-d|0,o=t[_>>2]|0}else l=0,s=e;while(0);vn(o|0,s|0,n|0)|0,t[_>>2]=(t[_>>2]|0)+n,o=l+n|0}while(0);return o|0}function xL(e){e=e|0;var n=0,r=0;return n=e+74|0,r=c[n>>0]|0,c[n>>0]=r+255|r,n=t[e>>2]|0,n&8?(t[e>>2]=n|32,e=-1):(t[e+8>>2]=0,t[e+4>>2]=0,r=t[e+44>>2]|0,t[e+28>>2]=r,t[e+20>>2]=r,t[e+16>>2]=r+(t[e+48>>2]|0),e=0),e|0}function Ur(e,n){e=w(e),n=w(n);var r=0,o=0;r=V8(e)|0;do if((r&2147483647)>>>0<=2139095040){if(o=V8(n)|0,(o&2147483647)>>>0<=2139095040)if((o^r|0)<0){e=(r|0)<0?n:e;break}else{e=e>2]=e,t[j>>2]|0|0}function cc(e,n){e=w(e),n=w(n);var r=0,o=0;r=Y8(e)|0;do if((r&2147483647)>>>0<=2139095040){if(o=Y8(n)|0,(o&2147483647)>>>0<=2139095040)if((o^r|0)<0){e=(r|0)<0?e:n;break}else{e=e>2]=e,t[j>>2]|0|0}function V4(e,n){e=w(e),n=w(n);var r=0,o=0,s=0,l=0,d=0,_=0,y=0,k=0;l=(D[j>>2]=e,t[j>>2]|0),_=(D[j>>2]=n,t[j>>2]|0),r=l>>>23&255,d=_>>>23&255,y=l&-2147483648,s=_<<1;e:do if((s|0)!=0?!((r|0)==255|((kL(n)|0)&2147483647)>>>0>2139095040):0){if(o=l<<1,o>>>0<=s>>>0)return n=w(e*w(0)),w((o|0)==(s|0)?n:e);if(r)o=l&8388607|8388608;else{if(r=l<<9,(r|0)>-1){o=r,r=0;do r=r+-1|0,o=o<<1;while((o|0)>-1)}else r=0;o=l<<1-r}if(d)_=_&8388607|8388608;else{if(l=_<<9,(l|0)>-1){s=0;do s=s+-1|0,l=l<<1;while((l|0)>-1)}else s=0;d=s,_=_<<1-s}s=o-_|0,l=(s|0)>-1;t:do if((r|0)>(d|0)){for(;;){if(l)if(s)o=s;else break;if(o=o<<1,r=r+-1|0,s=o-_|0,l=(s|0)>-1,(r|0)<=(d|0))break t}n=w(e*w(0));break e}while(0);if(l)if(s)o=s;else{n=w(e*w(0));break}if(o>>>0<8388608)do o=o<<1,r=r+-1|0;while(o>>>0<8388608);(r|0)>0?r=o+-8388608|r<<23:r=o>>>(1-r|0),n=(t[j>>2]=r|y,w(D[j>>2]))}else k=3;while(0);return(k|0)==3&&(n=w(e*n),n=w(n/n)),w(n)}function kL(e){return e=w(e),D[j>>2]=e,t[j>>2]|0|0}function AL(e,n){return e=e|0,n=n|0,q8(t[582]|0,e,n)|0}function $n(e){e=e|0,_n()}function da(e){e=e|0}function OL(e,n){return e=e|0,n=n|0,0}function IL(e){return e=e|0,($8(e+4|0)|0)==-1?(Nl[t[(t[e>>2]|0)+8>>2]&127](e),e=1):e=0,e|0}function $8(e){e=e|0;var n=0;return n=t[e>>2]|0,t[e>>2]=n+-1,n+-1|0}function Tf(e){e=e|0,IL(e)|0&&PL(e)}function PL(e){e=e|0;var n=0;n=e+8|0,((t[n>>2]|0)!=0?($8(n)|0)!=-1:0)||Nl[t[(t[e>>2]|0)+16>>2]&127](e)}function Tt(e){e=e|0;var n=0;for(n=(e|0)==0?1:e;e=uh(n)|0,!(e|0);){if(e=FL()|0,!e){e=0;break}fD[e&0]()}return e|0}function K8(e){return e=e|0,Tt(e)|0}function Ve(e){e=e|0,sh(e)}function ML(e){e=e|0,(c[e+11>>0]|0)<0&&Ve(t[e>>2]|0)}function FL(){var e=0;return e=t[2923]|0,t[2923]=e+0,e|0}function LL(){}function fh(e,n,r,o){return e=e|0,n=n|0,r=r|0,o=o|0,o=n-o-(r>>>0>e>>>0|0)>>>0,be=o,e-r>>>0|0|0}function Y4(e,n,r,o){return e=e|0,n=n|0,r=r|0,o=o|0,r=e+r>>>0,be=n+o+(r>>>0>>0|0)>>>0,r|0|0}function pa(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0,d=0;if(l=e+r|0,n=n&255,(r|0)>=67){for(;e&3;)c[e>>0]=n,e=e+1|0;for(o=l&-4|0,s=o-64|0,d=n|n<<8|n<<16|n<<24;(e|0)<=(s|0);)t[e>>2]=d,t[e+4>>2]=d,t[e+8>>2]=d,t[e+12>>2]=d,t[e+16>>2]=d,t[e+20>>2]=d,t[e+24>>2]=d,t[e+28>>2]=d,t[e+32>>2]=d,t[e+36>>2]=d,t[e+40>>2]=d,t[e+44>>2]=d,t[e+48>>2]=d,t[e+52>>2]=d,t[e+56>>2]=d,t[e+60>>2]=d,e=e+64|0;for(;(e|0)<(o|0);)t[e>>2]=d,e=e+4|0}for(;(e|0)<(l|0);)c[e>>0]=n,e=e+1|0;return l-r|0}function X8(e,n,r){return e=e|0,n=n|0,r=r|0,(r|0)<32?(be=n<>>32-r,e<>>r,e>>>r|(n&(1<>>r-32|0)}function vn(e,n,r){e=e|0,n=n|0,r=r|0;var o=0,s=0,l=0;if((r|0)>=8192)return wo(e|0,n|0,r|0)|0;if(l=e|0,s=e+r|0,(e&3)==(n&3)){for(;e&3;){if(!r)return l|0;c[e>>0]=c[n>>0]|0,e=e+1|0,n=n+1|0,r=r-1|0}for(r=s&-4|0,o=r-64|0;(e|0)<=(o|0);)t[e>>2]=t[n>>2],t[e+4>>2]=t[n+4>>2],t[e+8>>2]=t[n+8>>2],t[e+12>>2]=t[n+12>>2],t[e+16>>2]=t[n+16>>2],t[e+20>>2]=t[n+20>>2],t[e+24>>2]=t[n+24>>2],t[e+28>>2]=t[n+28>>2],t[e+32>>2]=t[n+32>>2],t[e+36>>2]=t[n+36>>2],t[e+40>>2]=t[n+40>>2],t[e+44>>2]=t[n+44>>2],t[e+48>>2]=t[n+48>>2],t[e+52>>2]=t[n+52>>2],t[e+56>>2]=t[n+56>>2],t[e+60>>2]=t[n+60>>2],e=e+64|0,n=n+64|0;for(;(e|0)<(r|0);)t[e>>2]=t[n>>2],e=e+4|0,n=n+4|0}else for(r=s-4|0;(e|0)<(r|0);)c[e>>0]=c[n>>0]|0,c[e+1>>0]=c[n+1>>0]|0,c[e+2>>0]=c[n+2>>0]|0,c[e+3>>0]=c[n+3>>0]|0,e=e+4|0,n=n+4|0;for(;(e|0)<(s|0);)c[e>>0]=c[n>>0]|0,e=e+1|0,n=n+1|0;return l|0}function J8(e){e=e|0;var n=0;return n=c[ce+(e&255)>>0]|0,(n|0)<8?n|0:(n=c[ce+(e>>8&255)>>0]|0,(n|0)<8?n+8|0:(n=c[ce+(e>>16&255)>>0]|0,(n|0)<8?n+16|0:(c[ce+(e>>>24)>>0]|0)+24|0))}function Q8(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0;var l=0,d=0,_=0,y=0,k=0,T=0,P=0,q=0,we=0,le=0;if(T=e,y=n,k=y,d=r,q=o,_=q,!k)return l=(s|0)!=0,_?l?(t[s>>2]=e|0,t[s+4>>2]=n&0,q=0,s=0,be=q,s|0):(q=0,s=0,be=q,s|0):(l&&(t[s>>2]=(T>>>0)%(d>>>0),t[s+4>>2]=0),q=0,s=(T>>>0)/(d>>>0)>>>0,be=q,s|0);l=(_|0)==0;do if(d){if(!l){if(l=(cr(_|0)|0)-(cr(k|0)|0)|0,l>>>0<=31){P=l+1|0,_=31-l|0,n=l-31>>31,d=P,e=T>>>(P>>>0)&n|k<<_,n=k>>>(P>>>0)&n,l=0,_=T<<_;break}return s?(t[s>>2]=e|0,t[s+4>>2]=y|n&0,q=0,s=0,be=q,s|0):(q=0,s=0,be=q,s|0)}if(l=d-1|0,l&d|0){_=(cr(d|0)|0)+33-(cr(k|0)|0)|0,le=64-_|0,P=32-_|0,y=P>>31,we=_-32|0,n=we>>31,d=_,e=P-1>>31&k>>>(we>>>0)|(k<>>(_>>>0))&n,n=n&k>>>(_>>>0),l=T<>>(we>>>0))&y|T<>31;break}return s|0&&(t[s>>2]=l&T,t[s+4>>2]=0),(d|0)==1?(we=y|n&0,le=e|0|0,be=we,le|0):(le=J8(d|0)|0,we=k>>>(le>>>0)|0,le=k<<32-le|T>>>(le>>>0)|0,be=we,le|0)}else{if(l)return s|0&&(t[s>>2]=(k>>>0)%(d>>>0),t[s+4>>2]=0),we=0,le=(k>>>0)/(d>>>0)>>>0,be=we,le|0;if(!T)return s|0&&(t[s>>2]=0,t[s+4>>2]=(k>>>0)%(_>>>0)),we=0,le=(k>>>0)/(_>>>0)>>>0,be=we,le|0;if(l=_-1|0,!(l&_))return s|0&&(t[s>>2]=e|0,t[s+4>>2]=l&k|n&0),we=0,le=k>>>((J8(_|0)|0)>>>0),be=we,le|0;if(l=(cr(_|0)|0)-(cr(k|0)|0)|0,l>>>0<=30){n=l+1|0,_=31-l|0,d=n,e=k<<_|T>>>(n>>>0),n=k>>>(n>>>0),l=0,_=T<<_;break}return s?(t[s>>2]=e|0,t[s+4>>2]=y|n&0,we=0,le=0,be=we,le|0):(we=0,le=0,be=we,le|0)}while(0);if(!d)k=_,y=0,_=0;else{P=r|0|0,T=q|o&0,k=Y4(P|0,T|0,-1,-1)|0,r=be,y=_,_=0;do o=y,y=l>>>31|y<<1,l=_|l<<1,o=e<<1|o>>>31|0,q=e>>>31|n<<1|0,fh(k|0,r|0,o|0,q|0)|0,le=be,we=le>>31|((le|0)<0?-1:0)<<1,_=we&1,e=fh(o|0,q|0,we&P|0,(((le|0)<0?-1:0)>>31|((le|0)<0?-1:0)<<1)&T|0)|0,n=be,d=d-1|0;while((d|0)!=0);k=y,y=0}return d=0,s|0&&(t[s>>2]=e,t[s+4>>2]=n),we=(l|0)>>>31|(k|d)<<1|(d<<1|l>>>31)&0|y,le=(l<<1|0>>>31)&-2|_,be=we,le|0}function $4(e,n,r,o){return e=e|0,n=n|0,r=r|0,o=o|0,Q8(e,n,r,o,0)|0}function xf(e){e=e|0;var n=0,r=0;return r=e+15&-16|0,n=t[N>>2]|0,e=n+r|0,(r|0)>0&(e|0)<(n|0)|(e|0)<0?(vr()|0,Os(12),-1):(t[N>>2]=e,((e|0)>(Xn()|0)?(Bn()|0)==0:0)?(t[N>>2]=n,Os(12),-1):n|0)}function Y1(e,n,r){e=e|0,n=n|0,r=r|0;var o=0;if((n|0)<(e|0)&(e|0)<(n+r|0)){for(o=e,n=n+r|0,e=e+r|0;(r|0)>0;)e=e-1|0,n=n-1|0,r=r-1|0,c[e>>0]=c[n>>0]|0;e=o}else vn(e,n,r)|0;return e|0}function K4(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0;var s=0,l=0;return l=h,h=h+16|0,s=l|0,Q8(e,n,r,o,s)|0,h=l,be=t[s+4>>2]|0,t[s>>2]|0|0}function Z8(e){return e=e|0,(e&255)<<24|(e>>8&255)<<16|(e>>16&255)<<8|e>>>24|0}function RL(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,eD[e&1](n|0,r|0,o|0,s|0,l|0)}function NL(e,n,r){e=e|0,n=n|0,r=w(r),tD[e&1](n|0,w(r))}function BL(e,n,r){e=e|0,n=n|0,r=+r,nD[e&31](n|0,+r)}function jL(e,n,r,o){return e=e|0,n=n|0,r=w(r),o=w(o),w(rD[e&0](n|0,w(r),w(o)))}function UL(e,n){e=e|0,n=n|0,Nl[e&127](n|0)}function qL(e,n,r){e=e|0,n=n|0,r=r|0,Bl[e&31](n|0,r|0)}function zL(e,n){return e=e|0,n=n|0,dc[e&31](n|0)|0}function WL(e,n,r,o,s){e=e|0,n=n|0,r=+r,o=+o,s=s|0,iD[e&1](n|0,+r,+o,s|0)}function HL(e,n,r,o){e=e|0,n=n|0,r=+r,o=+o,CR[e&1](n|0,+r,+o)}function bL(e,n,r,o){return e=e|0,n=n|0,r=r|0,o=o|0,dh[e&7](n|0,r|0,o|0)|0}function VL(e,n,r,o){return e=e|0,n=n|0,r=r|0,o=o|0,+TR[e&1](n|0,r|0,o|0)}function YL(e,n){return e=e|0,n=n|0,+oD[e&15](n|0)}function $L(e,n,r){return e=e|0,n=n|0,r=+r,xR[e&1](n|0,+r)|0}function KL(e,n,r){return e=e|0,n=n|0,r=r|0,J4[e&15](n|0,r|0)|0}function XL(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=+o,s=+s,l=l|0,kR[e&1](n|0,r|0,+o,+s,l|0)}function JL(e,n,r,o,s,l,d){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,d=d|0,AR[e&1](n|0,r|0,o|0,s|0,l|0,d|0)}function QL(e,n,r){return e=e|0,n=n|0,r=r|0,+uD[e&7](n|0,r|0)}function ZL(e){return e=e|0,ph[e&7]()|0}function eR(e,n,r,o,s,l){return e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,sD[e&1](n|0,r|0,o|0,s|0,l|0)|0}function tR(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=+s,OR[e&1](n|0,r|0,o|0,+s)}function nR(e,n,r,o,s,l,d){e=e|0,n=n|0,r=r|0,o=w(o),s=s|0,l=w(l),d=d|0,lD[e&1](n|0,r|0,w(o),s|0,w(l),d|0)}function rR(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,X1[e&15](n|0,r|0,o|0)}function iR(e){e=e|0,fD[e&0]()}function oR(e,n,r,o){e=e|0,n=n|0,r=r|0,o=+o,cD[e&15](n|0,r|0,+o)}function uR(e,n,r){return e=e|0,n=+n,r=+r,IR[e&1](+n,+r)|0}function sR(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,Q4[e&15](n|0,r|0,o|0,s|0)}function lR(e,n,r,o,s){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,pt(0)}function fR(e,n){e=e|0,n=w(n),pt(1)}function Lo(e,n){e=e|0,n=+n,pt(2)}function cR(e,n,r){return e=e|0,n=w(n),r=w(r),pt(3),tt}function tn(e){e=e|0,pt(4)}function $1(e,n){e=e|0,n=n|0,pt(5)}function tu(e){return e=e|0,pt(6),0}function aR(e,n,r,o){e=e|0,n=+n,r=+r,o=o|0,pt(7)}function dR(e,n,r){e=e|0,n=+n,r=+r,pt(8)}function pR(e,n,r){return e=e|0,n=n|0,r=r|0,pt(9),0}function hR(e,n,r){return e=e|0,n=n|0,r=r|0,pt(10),0}function ac(e){return e=e|0,pt(11),0}function mR(e,n){return e=e|0,n=+n,pt(12),0}function K1(e,n){return e=e|0,n=n|0,pt(13),0}function vR(e,n,r,o,s){e=e|0,n=n|0,r=+r,o=+o,s=s|0,pt(14)}function gR(e,n,r,o,s,l){e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,l=l|0,pt(15)}function X4(e,n){return e=e|0,n=n|0,pt(16),0}function _R(){return pt(17),0}function yR(e,n,r,o,s){return e=e|0,n=n|0,r=r|0,o=o|0,s=s|0,pt(18),0}function wR(e,n,r,o){e=e|0,n=n|0,r=r|0,o=+o,pt(19)}function DR(e,n,r,o,s,l){e=e|0,n=n|0,r=w(r),o=o|0,s=w(s),l=l|0,pt(20)}function ah(e,n,r){e=e|0,n=n|0,r=r|0,pt(21)}function ER(){pt(22)}function ha(e,n,r){e=e|0,n=n|0,r=+r,pt(23)}function SR(e,n){return e=+e,n=+n,pt(24),0}function ma(e,n,r,o){e=e|0,n=n|0,r=r|0,o=o|0,pt(25)}var eD=[lR,_I],tD=[fR,x0],nD=[Lo,Kf,Tl,xl,hf,xo,mf,Wa,Hs,mi,Xf,Rc,Jf,ao,$o,kl,Nc,Al,vf,Lo,Lo,Lo,Lo,Lo,Lo,Lo,Lo,Lo,Lo,Lo,Lo,Lo],rD=[cR],Nl=[tn,da,Km,Xm,es,a_,d_,p_,YA,$A,KA,oI,uI,sI,kF,AF,OF,Sn,Oc,pf,ti,vi,Nm,Uc,r1,Hd,Pl,mv,Av,Kc,Jc,yp,Eg,na,Ug,Yg,u_,k_,q_,J_,a4,Ct,w9,U9,ex,hx,Ix,_0,s7,S7,W7,uk,Dk,Wk,Qk,tA,_A,DA,jA,JA,eO,gO,RO,d1,vP,YP,lM,SM,GM,uF,gF,wF,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn,tn],Bl=[$1,ja,Ua,$f,gu,co,qa,Ws,za,Mc,Fc,Lc,po,Ce,ze,Et,on,sr,mn,Zf,gd,xd,H9,rx,ck,yP,HO,C8,$1,$1,$1,$1],dc=[tu,iL,Ba,m,b,ee,Ye,Ze,ut,In,jr,gi,Pm,Ha,Ya,Fx,Tk,wO,SP,Qo,tu,tu,tu,tu,tu,tu,tu,tu,tu,tu,tu,tu],iD=[aR,Sd],CR=[dR,zA],dh=[pR,j8,oL,lL,Gv,P_,a7,kM],TR=[hR,Op],oD=[ac,_i,Re,pr,Cd,ho,bs,$a,Td,qc,ac,ac,ac,ac,ac,ac],xR=[mR,Kk],J4=[K1,OL,vd,Vc,_v,ig,pg,f_,H_,_x,Xu,dM,K1,K1,K1,K1],kR=[vR,iv],AR=[gR,KM],uD=[X4,Hr,Ka,kd,Xa,Jg,X4,X4],ph=[_R,Ja,Z0,g0,oA,TA,iO,CF],sD=[yR,or],OR=[wR,m4],lD=[DR,Bc],X1=[ah,S,A0,Vn,ni,Mv,Tg,dn,C9,fo,zI,JP,cF,ah,ah,ah],fD=[ER],cD=[ha,Ic,vu,Pc,Qu,Qf,k0,v,W1,k7,Gk,ha,ha,ha,ha,ha],IR=[SR,GA],Q4=[ma,Fg,zx,V7,Lk,aA,PA,aO,qO,OP,RF,ma,ma,ma,ma,ma];return{_llvm_bswap_i32:Z8,dynCall_idd:uR,dynCall_i:ZL,_i64Subtract:fh,___udivdi3:$4,dynCall_vif:NL,setThrew:vl,dynCall_viii:rR,_bitshift64Lshr:ch,_bitshift64Shl:X8,dynCall_vi:UL,dynCall_viiddi:XL,dynCall_diii:VL,dynCall_iii:KL,_memset:pa,_sbrk:xf,_memcpy:vn,__GLOBAL__sub_I_Yoga_cpp:t0,dynCall_vii:qL,___uremdi3:K4,dynCall_vid:BL,stackAlloc:zi,_nbind_init:VF,getTempRet0:fu,dynCall_di:YL,dynCall_iid:$L,setTempRet0:gl,_i64Add:Y4,dynCall_fiff:jL,dynCall_iiii:bL,_emscripten_get_global_libc:rL,dynCall_viid:oR,dynCall_viiid:tR,dynCall_viififi:nR,dynCall_ii:zL,__GLOBAL__sub_I_Binding_cc:lP,dynCall_viiii:sR,dynCall_iiiiii:eR,stackSave:lu,dynCall_viiiii:RL,__GLOBAL__sub_I_nbind_cc:Gs,dynCall_vidd:HL,_free:sh,runPostSets:LL,dynCall_viiiiii:JL,establishStackSpace:O0,_memmove:Y1,stackRestore:Ho,_malloc:uh,__GLOBAL__sub_I_common_cc:AO,dynCall_viddi:WL,dynCall_dii:QL,dynCall_v:iR}}(Module.asmGlobalArg,Module.asmLibraryArg,buffer),_llvm_bswap_i32=Module._llvm_bswap_i32=asm._llvm_bswap_i32,getTempRet0=Module.getTempRet0=asm.getTempRet0,___udivdi3=Module.___udivdi3=asm.___udivdi3,setThrew=Module.setThrew=asm.setThrew,_bitshift64Lshr=Module._bitshift64Lshr=asm._bitshift64Lshr,_bitshift64Shl=Module._bitshift64Shl=asm._bitshift64Shl,_memset=Module._memset=asm._memset,_sbrk=Module._sbrk=asm._sbrk,_memcpy=Module._memcpy=asm._memcpy,stackAlloc=Module.stackAlloc=asm.stackAlloc,___uremdi3=Module.___uremdi3=asm.___uremdi3,_nbind_init=Module._nbind_init=asm._nbind_init,_i64Subtract=Module._i64Subtract=asm._i64Subtract,setTempRet0=Module.setTempRet0=asm.setTempRet0,_i64Add=Module._i64Add=asm._i64Add,_emscripten_get_global_libc=Module._emscripten_get_global_libc=asm._emscripten_get_global_libc,__GLOBAL__sub_I_Yoga_cpp=Module.__GLOBAL__sub_I_Yoga_cpp=asm.__GLOBAL__sub_I_Yoga_cpp,__GLOBAL__sub_I_Binding_cc=Module.__GLOBAL__sub_I_Binding_cc=asm.__GLOBAL__sub_I_Binding_cc,stackSave=Module.stackSave=asm.stackSave,__GLOBAL__sub_I_nbind_cc=Module.__GLOBAL__sub_I_nbind_cc=asm.__GLOBAL__sub_I_nbind_cc,_free=Module._free=asm._free,runPostSets=Module.runPostSets=asm.runPostSets,establishStackSpace=Module.establishStackSpace=asm.establishStackSpace,_memmove=Module._memmove=asm._memmove,stackRestore=Module.stackRestore=asm.stackRestore,_malloc=Module._malloc=asm._malloc,__GLOBAL__sub_I_common_cc=Module.__GLOBAL__sub_I_common_cc=asm.__GLOBAL__sub_I_common_cc,dynCall_viiiii=Module.dynCall_viiiii=asm.dynCall_viiiii,dynCall_vif=Module.dynCall_vif=asm.dynCall_vif,dynCall_vid=Module.dynCall_vid=asm.dynCall_vid,dynCall_fiff=Module.dynCall_fiff=asm.dynCall_fiff,dynCall_vi=Module.dynCall_vi=asm.dynCall_vi,dynCall_vii=Module.dynCall_vii=asm.dynCall_vii,dynCall_ii=Module.dynCall_ii=asm.dynCall_ii,dynCall_viddi=Module.dynCall_viddi=asm.dynCall_viddi,dynCall_vidd=Module.dynCall_vidd=asm.dynCall_vidd,dynCall_iiii=Module.dynCall_iiii=asm.dynCall_iiii,dynCall_diii=Module.dynCall_diii=asm.dynCall_diii,dynCall_di=Module.dynCall_di=asm.dynCall_di,dynCall_iid=Module.dynCall_iid=asm.dynCall_iid,dynCall_iii=Module.dynCall_iii=asm.dynCall_iii,dynCall_viiddi=Module.dynCall_viiddi=asm.dynCall_viiddi,dynCall_viiiiii=Module.dynCall_viiiiii=asm.dynCall_viiiiii,dynCall_dii=Module.dynCall_dii=asm.dynCall_dii,dynCall_i=Module.dynCall_i=asm.dynCall_i,dynCall_iiiiii=Module.dynCall_iiiiii=asm.dynCall_iiiiii,dynCall_viiid=Module.dynCall_viiid=asm.dynCall_viiid,dynCall_viififi=Module.dynCall_viififi=asm.dynCall_viififi,dynCall_viii=Module.dynCall_viii=asm.dynCall_viii,dynCall_v=Module.dynCall_v=asm.dynCall_v,dynCall_viid=Module.dynCall_viid=asm.dynCall_viid,dynCall_idd=Module.dynCall_idd=asm.dynCall_idd,dynCall_viiii=Module.dynCall_viiii=asm.dynCall_viiii;Runtime.stackAlloc=Module.stackAlloc,Runtime.stackSave=Module.stackSave,Runtime.stackRestore=Module.stackRestore,Runtime.establishStackSpace=Module.establishStackSpace,Runtime.setTempRet0=Module.setTempRet0,Runtime.getTempRet0=Module.getTempRet0,Module.asm=asm;function ExitStatus(i){this.name="ExitStatus",this.message="Program terminated with exit("+i+")",this.status=i}ExitStatus.prototype=new Error,ExitStatus.prototype.constructor=ExitStatus;var initialStackTop,preloadStartTime=null,calledMain=!1;dependenciesFulfilled=function i(){Module.calledRun||run(),Module.calledRun||(dependenciesFulfilled=i)},Module.callMain=Module.callMain=function(u){u=u||[],ensureInitRuntime();var f=u.length+1;function c(){for(var x=0;x<4-1;x++)g.push(0)}var g=[allocate(intArrayFromString(Module.thisProgram),"i8",ALLOC_NORMAL)];c();for(var t=0;t0||(preRun(),runDependencies>0)||Module.calledRun)return;function u(){Module.calledRun||(Module.calledRun=!0,!ABORT&&(ensureInitRuntime(),preMain(),Module.onRuntimeInitialized&&Module.onRuntimeInitialized(),Module._main&&shouldRunNow&&Module.callMain(i),postRun()))}Module.setStatus?(Module.setStatus("Running..."),setTimeout(function(){setTimeout(function(){Module.setStatus("")},1),u()},1)):u()}Module.run=Module.run=run;function exit(i,u){u&&Module.noExitRuntime||(Module.noExitRuntime||(ABORT=!0,EXITSTATUS=i,STACKTOP=initialStackTop,exitRuntime(),Module.onExit&&Module.onExit(i)),ENVIRONMENT_IS_NODE&&process.exit(i),Module.quit(i,new ExitStatus(i)))}Module.exit=Module.exit=exit;var abortDecorators=[];function abort(i){Module.onAbort&&Module.onAbort(i),i!==void 0?(Module.print(i),Module.printErr(i),i=JSON.stringify(i)):i="",ABORT=!0,EXITSTATUS=1;var u=` -If this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.`,f="abort("+i+") at "+stackTrace()+u;throw abortDecorators&&abortDecorators.forEach(function(c){f=c(f,i)}),f}if(Module.abort=Module.abort=abort,Module.preInit)for(typeof Module.preInit=="function"&&(Module.preInit=[Module.preInit]);Module.preInit.length>0;)Module.preInit.pop()();var shouldRunNow=!0;Module.noInitialRun&&(shouldRunNow=!1),run()})});var hc=Me((hb,vE)=>{"use strict";var wN=hE(),DN=mE(),Py=!1,My=null;DN({},function(i,u){if(!Py){if(Py=!0,i)throw i;My=u}});if(!Py)throw new Error("Failed to load the yoga module - it needed to be loaded synchronously, but didn't");vE.exports=wN(My.bind,My.lib)});var _E=Me((mb,gE)=>{"use strict";gE.exports=({onlyFirst:i=!1}={})=>{let u=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(u,i?void 0:"g")}});var Fy=Me((vb,yE)=>{"use strict";var EN=_E();yE.exports=i=>typeof i=="string"?i.replace(EN(),""):i});var Ry=Me((gb,Ly)=>{"use strict";var wE=i=>Number.isNaN(i)?!1:i>=4352&&(i<=4447||i===9001||i===9002||11904<=i&&i<=12871&&i!==12351||12880<=i&&i<=19903||19968<=i&&i<=42182||43360<=i&&i<=43388||44032<=i&&i<=55203||63744<=i&&i<=64255||65040<=i&&i<=65049||65072<=i&&i<=65131||65281<=i&&i<=65376||65504<=i&&i<=65510||110592<=i&&i<=110593||127488<=i&&i<=127569||131072<=i&&i<=262141);Ly.exports=wE;Ly.exports.default=wE});var EE=Me((_b,DE)=>{"use strict";DE.exports=function(){return/\uD83C\uDFF4\uDB40\uDC67\uDB40\uDC62(?:\uDB40\uDC65\uDB40\uDC6E\uDB40\uDC67|\uDB40\uDC73\uDB40\uDC63\uDB40\uDC74|\uDB40\uDC77\uDB40\uDC6C\uDB40\uDC73)\uDB40\uDC7F|\uD83D\uDC68(?:\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68\uD83C\uDFFB|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFE])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83D\uDC68|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D[\uDC66\uDC67])|[\u2695\u2696\u2708]\uFE0F|\uD83D[\uDC66\uDC67]|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|(?:\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708])\uFE0F|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C[\uDFFB-\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFB\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)\uD83C\uDFFB|\uD83E\uDDD1(?:\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])|\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1)|(?:\uD83E\uDDD1\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFE])|(?:\uD83E\uDDD1\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)(?:\uD83C[\uDFFB\uDFFC])|\uD83D\uDC69(?:\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFC-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|(?:\uD83E\uDDD1\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D\uD83D\uDC69)(?:\uD83C[\uDFFB-\uDFFD])|\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D\uDC41\uFE0F\u200D\uD83D\uDDE8|\uD83D\uDC69(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|(?:(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)\uFE0F|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF])\u200D[\u2640\u2642]|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD6-\uDDDD])(?:(?:\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|\u200D[\u2640\u2642])|\uD83C\uDFF4\u200D\u2620)\uFE0F|\uD83D\uDC69\u200D\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|\uD83C\uDFF3\uFE0F\u200D\uD83C\uDF08|\uD83D\uDC15\u200D\uD83E\uDDBA|\uD83D\uDC69\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC67|\uD83C\uDDFD\uD83C\uDDF0|\uD83C\uDDF4\uD83C\uDDF2|\uD83C\uDDF6\uD83C\uDDE6|[#\*0-9]\uFE0F\u20E3|\uD83C\uDDE7(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF])|\uD83C\uDDF9(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF])|\uD83C\uDDEA(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA])|\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])|\uD83C\uDDF7(?:\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC])|\uD83D\uDC69(?:\uD83C[\uDFFB-\uDFFF])|\uD83C\uDDF2(?:\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF])|\uD83C\uDDE6(?:\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF])|\uD83C\uDDF0(?:\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF])|\uD83C\uDDED(?:\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA])|\uD83C\uDDE9(?:\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF])|\uD83C\uDDFE(?:\uD83C[\uDDEA\uDDF9])|\uD83C\uDDEC(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE])|\uD83C\uDDF8(?:\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF])|\uD83C\uDDEB(?:\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7])|\uD83C\uDDF5(?:\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE])|\uD83C\uDDFB(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA])|\uD83C\uDDF3(?:\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF])|\uD83C\uDDE8(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF5\uDDF7\uDDFA-\uDDFF])|\uD83C\uDDF1(?:\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE])|\uD83C\uDDFF(?:\uD83C[\uDDE6\uDDF2\uDDFC])|\uD83C\uDDFC(?:\uD83C[\uDDEB\uDDF8])|\uD83C\uDDFA(?:\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF])|\uD83C\uDDEE(?:\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9])|\uD83C\uDDEF(?:\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5])|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u261D\u270A-\u270D]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC70\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDCAA\uDD74\uDD7A\uDD90\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD36\uDDB5\uDDB6\uDDBB\uDDD2-\uDDD5])(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDED5\uDEEB\uDEEC\uDEF4-\uDEFA\uDFE0-\uDFEB]|\uD83E[\uDD0D-\uDD3A\uDD3C-\uDD45\uDD47-\uDD71\uDD73-\uDD76\uDD7A-\uDDA2\uDDA5-\uDDAA\uDDAE-\uDDCA\uDDCD-\uDDFF\uDE70-\uDE73\uDE78-\uDE7A\uDE80-\uDE82\uDE90-\uDE95])|(?:[#\*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEFA\uDFE0-\uDFEB]|\uD83E[\uDD0D-\uDD3A\uDD3C-\uDD45\uDD47-\uDD71\uDD73-\uDD76\uDD7A-\uDDA2\uDDA5-\uDDAA\uDDAE-\uDDCA\uDDCD-\uDDFF\uDE70-\uDE73\uDE78-\uDE7A\uDE80-\uDE82\uDE90-\uDE95])\uFE0F|(?:[\u261D\u26F9\u270A-\u270D]|\uD83C[\uDF85\uDFC2-\uDFC4\uDFC7\uDFCA-\uDFCC]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66-\uDC78\uDC7C\uDC81-\uDC83\uDC85-\uDC87\uDC8F\uDC91\uDCAA\uDD74\uDD75\uDD7A\uDD90\uDD95\uDD96\uDE45-\uDE47\uDE4B-\uDE4F\uDEA3\uDEB4-\uDEB6\uDEC0\uDECC]|\uD83E[\uDD0F\uDD18-\uDD1F\uDD26\uDD30-\uDD39\uDD3C-\uDD3E\uDDB5\uDDB6\uDDB8\uDDB9\uDDBB\uDDCD-\uDDCF\uDDD1-\uDDDD])/g}});var Mh=Me((yb,Ny)=>{"use strict";var SN=Fy(),CN=Ry(),TN=EE(),SE=i=>{if(i=i.replace(TN()," "),typeof i!="string"||i.length===0)return 0;i=SN(i);let u=0;for(let f=0;f=127&&c<=159||c>=768&&c<=879||(c>65535&&f++,u+=CN(c)?2:1)}return u};Ny.exports=SE;Ny.exports.default=SE});var jy=Me((wb,By)=>{"use strict";var xN=Mh(),CE=i=>{let u=0;for(let f of i.split(` -`))u=Math.max(u,xN(f));return u};By.exports=CE;By.exports.default=CE});var TE=Me(a2=>{"use strict";var kN=a2&&a2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(a2,"__esModule",{value:!0});var AN=kN(jy()),Uy={};a2.default=i=>{if(i.length===0)return{width:0,height:0};if(Uy[i])return Uy[i];let u=AN.default(i),f=i.split(` -`).length;return Uy[i]={width:u,height:f},{width:u,height:f}}});var xE=Me(d2=>{"use strict";var ON=d2&&d2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(d2,"__esModule",{value:!0});var hr=ON(hc()),IN=(i,u)=>{"position"in u&&i.setPositionType(u.position==="absolute"?hr.default.POSITION_TYPE_ABSOLUTE:hr.default.POSITION_TYPE_RELATIVE)},PN=(i,u)=>{"marginLeft"in u&&i.setMargin(hr.default.EDGE_START,u.marginLeft||0),"marginRight"in u&&i.setMargin(hr.default.EDGE_END,u.marginRight||0),"marginTop"in u&&i.setMargin(hr.default.EDGE_TOP,u.marginTop||0),"marginBottom"in u&&i.setMargin(hr.default.EDGE_BOTTOM,u.marginBottom||0)},MN=(i,u)=>{"paddingLeft"in u&&i.setPadding(hr.default.EDGE_LEFT,u.paddingLeft||0),"paddingRight"in u&&i.setPadding(hr.default.EDGE_RIGHT,u.paddingRight||0),"paddingTop"in u&&i.setPadding(hr.default.EDGE_TOP,u.paddingTop||0),"paddingBottom"in u&&i.setPadding(hr.default.EDGE_BOTTOM,u.paddingBottom||0)},FN=(i,u)=>{var f;"flexGrow"in u&&i.setFlexGrow((f=u.flexGrow)!==null&&f!==void 0?f:0),"flexShrink"in u&&i.setFlexShrink(typeof u.flexShrink=="number"?u.flexShrink:1),"flexDirection"in u&&(u.flexDirection==="row"&&i.setFlexDirection(hr.default.FLEX_DIRECTION_ROW),u.flexDirection==="row-reverse"&&i.setFlexDirection(hr.default.FLEX_DIRECTION_ROW_REVERSE),u.flexDirection==="column"&&i.setFlexDirection(hr.default.FLEX_DIRECTION_COLUMN),u.flexDirection==="column-reverse"&&i.setFlexDirection(hr.default.FLEX_DIRECTION_COLUMN_REVERSE)),"flexBasis"in u&&(typeof u.flexBasis=="number"?i.setFlexBasis(u.flexBasis):typeof u.flexBasis=="string"?i.setFlexBasisPercent(Number.parseInt(u.flexBasis,10)):i.setFlexBasis(NaN)),"alignItems"in u&&((u.alignItems==="stretch"||!u.alignItems)&&i.setAlignItems(hr.default.ALIGN_STRETCH),u.alignItems==="flex-start"&&i.setAlignItems(hr.default.ALIGN_FLEX_START),u.alignItems==="center"&&i.setAlignItems(hr.default.ALIGN_CENTER),u.alignItems==="flex-end"&&i.setAlignItems(hr.default.ALIGN_FLEX_END)),"alignSelf"in u&&((u.alignSelf==="auto"||!u.alignSelf)&&i.setAlignSelf(hr.default.ALIGN_AUTO),u.alignSelf==="flex-start"&&i.setAlignSelf(hr.default.ALIGN_FLEX_START),u.alignSelf==="center"&&i.setAlignSelf(hr.default.ALIGN_CENTER),u.alignSelf==="flex-end"&&i.setAlignSelf(hr.default.ALIGN_FLEX_END)),"justifyContent"in u&&((u.justifyContent==="flex-start"||!u.justifyContent)&&i.setJustifyContent(hr.default.JUSTIFY_FLEX_START),u.justifyContent==="center"&&i.setJustifyContent(hr.default.JUSTIFY_CENTER),u.justifyContent==="flex-end"&&i.setJustifyContent(hr.default.JUSTIFY_FLEX_END),u.justifyContent==="space-between"&&i.setJustifyContent(hr.default.JUSTIFY_SPACE_BETWEEN),u.justifyContent==="space-around"&&i.setJustifyContent(hr.default.JUSTIFY_SPACE_AROUND))},LN=(i,u)=>{var f,c;"width"in u&&(typeof u.width=="number"?i.setWidth(u.width):typeof u.width=="string"?i.setWidthPercent(Number.parseInt(u.width,10)):i.setWidthAuto()),"height"in u&&(typeof u.height=="number"?i.setHeight(u.height):typeof u.height=="string"?i.setHeightPercent(Number.parseInt(u.height,10)):i.setHeightAuto()),"minWidth"in u&&(typeof u.minWidth=="string"?i.setMinWidthPercent(Number.parseInt(u.minWidth,10)):i.setMinWidth((f=u.minWidth)!==null&&f!==void 0?f:0)),"minHeight"in u&&(typeof u.minHeight=="string"?i.setMinHeightPercent(Number.parseInt(u.minHeight,10)):i.setMinHeight((c=u.minHeight)!==null&&c!==void 0?c:0))},RN=(i,u)=>{"display"in u&&i.setDisplay(u.display==="flex"?hr.default.DISPLAY_FLEX:hr.default.DISPLAY_NONE)},NN=(i,u)=>{if("borderStyle"in u){let f=typeof u.borderStyle=="string"?1:0;i.setBorder(hr.default.EDGE_TOP,f),i.setBorder(hr.default.EDGE_BOTTOM,f),i.setBorder(hr.default.EDGE_LEFT,f),i.setBorder(hr.default.EDGE_RIGHT,f)}};d2.default=(i,u={})=>{IN(i,u),PN(i,u),MN(i,u),FN(i,u),LN(i,u),RN(i,u),NN(i,u)}});var AE=Me((Sb,kE)=>{"use strict";kE.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}});var qy=Me((Cb,OE)=>{var p2=AE(),IE={};for(let i of Object.keys(p2))IE[p2[i]]=i;var Xt={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};OE.exports=Xt;for(let i of Object.keys(Xt)){if(!("channels"in Xt[i]))throw new Error("missing channels property: "+i);if(!("labels"in Xt[i]))throw new Error("missing channel labels property: "+i);if(Xt[i].labels.length!==Xt[i].channels)throw new Error("channel and label counts mismatch: "+i);let{channels:u,labels:f}=Xt[i];delete Xt[i].channels,delete Xt[i].labels,Object.defineProperty(Xt[i],"channels",{value:u}),Object.defineProperty(Xt[i],"labels",{value:f})}Xt.rgb.hsl=function(i){let u=i[0]/255,f=i[1]/255,c=i[2]/255,g=Math.min(u,f,c),t=Math.max(u,f,c),C=t-g,A,x;t===g?A=0:u===t?A=(f-c)/C:f===t?A=2+(c-u)/C:c===t&&(A=4+(u-f)/C),A=Math.min(A*60,360),A<0&&(A+=360);let D=(g+t)/2;return t===g?x=0:D<=.5?x=C/(t+g):x=C/(2-t-g),[A,x*100,D*100]};Xt.rgb.hsv=function(i){let u,f,c,g,t,C=i[0]/255,A=i[1]/255,x=i[2]/255,D=Math.max(C,A,x),L=D-Math.min(C,A,x),N=function(j){return(D-j)/6/L+1/2};return L===0?(g=0,t=0):(t=L/D,u=N(C),f=N(A),c=N(x),C===D?g=c-f:A===D?g=1/3+u-c:x===D&&(g=2/3+f-u),g<0?g+=1:g>1&&(g-=1)),[g*360,t*100,D*100]};Xt.rgb.hwb=function(i){let u=i[0],f=i[1],c=i[2],g=Xt.rgb.hsl(i)[0],t=1/255*Math.min(u,Math.min(f,c));return c=1-1/255*Math.max(u,Math.max(f,c)),[g,t*100,c*100]};Xt.rgb.cmyk=function(i){let u=i[0]/255,f=i[1]/255,c=i[2]/255,g=Math.min(1-u,1-f,1-c),t=(1-u-g)/(1-g)||0,C=(1-f-g)/(1-g)||0,A=(1-c-g)/(1-g)||0;return[t*100,C*100,A*100,g*100]};function BN(i,u){return(i[0]-u[0])**2+(i[1]-u[1])**2+(i[2]-u[2])**2}Xt.rgb.keyword=function(i){let u=IE[i];if(u)return u;let f=Infinity,c;for(let g of Object.keys(p2)){let t=p2[g],C=BN(i,t);C.04045?((u+.055)/1.055)**2.4:u/12.92,f=f>.04045?((f+.055)/1.055)**2.4:f/12.92,c=c>.04045?((c+.055)/1.055)**2.4:c/12.92;let g=u*.4124+f*.3576+c*.1805,t=u*.2126+f*.7152+c*.0722,C=u*.0193+f*.1192+c*.9505;return[g*100,t*100,C*100]};Xt.rgb.lab=function(i){let u=Xt.rgb.xyz(i),f=u[0],c=u[1],g=u[2];f/=95.047,c/=100,g/=108.883,f=f>.008856?f**(1/3):7.787*f+16/116,c=c>.008856?c**(1/3):7.787*c+16/116,g=g>.008856?g**(1/3):7.787*g+16/116;let t=116*c-16,C=500*(f-c),A=200*(c-g);return[t,C,A]};Xt.hsl.rgb=function(i){let u=i[0]/360,f=i[1]/100,c=i[2]/100,g,t,C;if(f===0)return C=c*255,[C,C,C];c<.5?g=c*(1+f):g=c+f-c*f;let A=2*c-g,x=[0,0,0];for(let D=0;D<3;D++)t=u+1/3*-(D-1),t<0&&t++,t>1&&t--,6*t<1?C=A+(g-A)*6*t:2*t<1?C=g:3*t<2?C=A+(g-A)*(2/3-t)*6:C=A,x[D]=C*255;return x};Xt.hsl.hsv=function(i){let u=i[0],f=i[1]/100,c=i[2]/100,g=f,t=Math.max(c,.01);c*=2,f*=c<=1?c:2-c,g*=t<=1?t:2-t;let C=(c+f)/2,A=c===0?2*g/(t+g):2*f/(c+f);return[u,A*100,C*100]};Xt.hsv.rgb=function(i){let u=i[0]/60,f=i[1]/100,c=i[2]/100,g=Math.floor(u)%6,t=u-Math.floor(u),C=255*c*(1-f),A=255*c*(1-f*t),x=255*c*(1-f*(1-t));switch(c*=255,g){case 0:return[c,x,C];case 1:return[A,c,C];case 2:return[C,c,x];case 3:return[C,A,c];case 4:return[x,C,c];case 5:return[c,C,A]}};Xt.hsv.hsl=function(i){let u=i[0],f=i[1]/100,c=i[2]/100,g=Math.max(c,.01),t,C;C=(2-f)*c;let A=(2-f)*g;return t=f*g,t/=A<=1?A:2-A,t=t||0,C/=2,[u,t*100,C*100]};Xt.hwb.rgb=function(i){let u=i[0]/360,f=i[1]/100,c=i[2]/100,g=f+c,t;g>1&&(f/=g,c/=g);let C=Math.floor(6*u),A=1-c;t=6*u-C,(C&1)!=0&&(t=1-t);let x=f+t*(A-f),D,L,N;switch(C){default:case 6:case 0:D=A,L=x,N=f;break;case 1:D=x,L=A,N=f;break;case 2:D=f,L=A,N=x;break;case 3:D=f,L=x,N=A;break;case 4:D=x,L=f,N=A;break;case 5:D=A,L=f,N=x;break}return[D*255,L*255,N*255]};Xt.cmyk.rgb=function(i){let u=i[0]/100,f=i[1]/100,c=i[2]/100,g=i[3]/100,t=1-Math.min(1,u*(1-g)+g),C=1-Math.min(1,f*(1-g)+g),A=1-Math.min(1,c*(1-g)+g);return[t*255,C*255,A*255]};Xt.xyz.rgb=function(i){let u=i[0]/100,f=i[1]/100,c=i[2]/100,g,t,C;return g=u*3.2406+f*-1.5372+c*-.4986,t=u*-.9689+f*1.8758+c*.0415,C=u*.0557+f*-.204+c*1.057,g=g>.0031308?1.055*g**(1/2.4)-.055:g*12.92,t=t>.0031308?1.055*t**(1/2.4)-.055:t*12.92,C=C>.0031308?1.055*C**(1/2.4)-.055:C*12.92,g=Math.min(Math.max(0,g),1),t=Math.min(Math.max(0,t),1),C=Math.min(Math.max(0,C),1),[g*255,t*255,C*255]};Xt.xyz.lab=function(i){let u=i[0],f=i[1],c=i[2];u/=95.047,f/=100,c/=108.883,u=u>.008856?u**(1/3):7.787*u+16/116,f=f>.008856?f**(1/3):7.787*f+16/116,c=c>.008856?c**(1/3):7.787*c+16/116;let g=116*f-16,t=500*(u-f),C=200*(f-c);return[g,t,C]};Xt.lab.xyz=function(i){let u=i[0],f=i[1],c=i[2],g,t,C;t=(u+16)/116,g=f/500+t,C=t-c/200;let A=t**3,x=g**3,D=C**3;return t=A>.008856?A:(t-16/116)/7.787,g=x>.008856?x:(g-16/116)/7.787,C=D>.008856?D:(C-16/116)/7.787,g*=95.047,t*=100,C*=108.883,[g,t,C]};Xt.lab.lch=function(i){let u=i[0],f=i[1],c=i[2],g;g=Math.atan2(c,f)*360/2/Math.PI,g<0&&(g+=360);let C=Math.sqrt(f*f+c*c);return[u,C,g]};Xt.lch.lab=function(i){let u=i[0],f=i[1],g=i[2]/360*2*Math.PI,t=f*Math.cos(g),C=f*Math.sin(g);return[u,t,C]};Xt.rgb.ansi16=function(i,u=null){let[f,c,g]=i,t=u===null?Xt.rgb.hsv(i)[2]:u;if(t=Math.round(t/50),t===0)return 30;let C=30+(Math.round(g/255)<<2|Math.round(c/255)<<1|Math.round(f/255));return t===2&&(C+=60),C};Xt.hsv.ansi16=function(i){return Xt.rgb.ansi16(Xt.hsv.rgb(i),i[2])};Xt.rgb.ansi256=function(i){let u=i[0],f=i[1],c=i[2];return u===f&&f===c?u<8?16:u>248?231:Math.round((u-8)/247*24)+232:16+36*Math.round(u/255*5)+6*Math.round(f/255*5)+Math.round(c/255*5)};Xt.ansi16.rgb=function(i){let u=i%10;if(u===0||u===7)return i>50&&(u+=3.5),u=u/10.5*255,[u,u,u];let f=(~~(i>50)+1)*.5,c=(u&1)*f*255,g=(u>>1&1)*f*255,t=(u>>2&1)*f*255;return[c,g,t]};Xt.ansi256.rgb=function(i){if(i>=232){let t=(i-232)*10+8;return[t,t,t]}i-=16;let u,f=Math.floor(i/36)/5*255,c=Math.floor((u=i%36)/6)/5*255,g=u%6/5*255;return[f,c,g]};Xt.rgb.hex=function(i){let f=(((Math.round(i[0])&255)<<16)+((Math.round(i[1])&255)<<8)+(Math.round(i[2])&255)).toString(16).toUpperCase();return"000000".substring(f.length)+f};Xt.hex.rgb=function(i){let u=i.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!u)return[0,0,0];let f=u[0];u[0].length===3&&(f=f.split("").map(A=>A+A).join(""));let c=parseInt(f,16),g=c>>16&255,t=c>>8&255,C=c&255;return[g,t,C]};Xt.rgb.hcg=function(i){let u=i[0]/255,f=i[1]/255,c=i[2]/255,g=Math.max(Math.max(u,f),c),t=Math.min(Math.min(u,f),c),C=g-t,A,x;return C<1?A=t/(1-C):A=0,C<=0?x=0:g===u?x=(f-c)/C%6:g===f?x=2+(c-u)/C:x=4+(u-f)/C,x/=6,x%=1,[x*360,C*100,A*100]};Xt.hsl.hcg=function(i){let u=i[1]/100,f=i[2]/100,c=f<.5?2*u*f:2*u*(1-f),g=0;return c<1&&(g=(f-.5*c)/(1-c)),[i[0],c*100,g*100]};Xt.hsv.hcg=function(i){let u=i[1]/100,f=i[2]/100,c=u*f,g=0;return c<1&&(g=(f-c)/(1-c)),[i[0],c*100,g*100]};Xt.hcg.rgb=function(i){let u=i[0]/360,f=i[1]/100,c=i[2]/100;if(f===0)return[c*255,c*255,c*255];let g=[0,0,0],t=u%1*6,C=t%1,A=1-C,x=0;switch(Math.floor(t)){case 0:g[0]=1,g[1]=C,g[2]=0;break;case 1:g[0]=A,g[1]=1,g[2]=0;break;case 2:g[0]=0,g[1]=1,g[2]=C;break;case 3:g[0]=0,g[1]=A,g[2]=1;break;case 4:g[0]=C,g[1]=0,g[2]=1;break;default:g[0]=1,g[1]=0,g[2]=A}return x=(1-f)*c,[(f*g[0]+x)*255,(f*g[1]+x)*255,(f*g[2]+x)*255]};Xt.hcg.hsv=function(i){let u=i[1]/100,f=i[2]/100,c=u+f*(1-u),g=0;return c>0&&(g=u/c),[i[0],g*100,c*100]};Xt.hcg.hsl=function(i){let u=i[1]/100,c=i[2]/100*(1-u)+.5*u,g=0;return c>0&&c<.5?g=u/(2*c):c>=.5&&c<1&&(g=u/(2*(1-c))),[i[0],g*100,c*100]};Xt.hcg.hwb=function(i){let u=i[1]/100,f=i[2]/100,c=u+f*(1-u);return[i[0],(c-u)*100,(1-c)*100]};Xt.hwb.hcg=function(i){let u=i[1]/100,f=i[2]/100,c=1-f,g=c-u,t=0;return g<1&&(t=(c-g)/(1-g)),[i[0],g*100,t*100]};Xt.apple.rgb=function(i){return[i[0]/65535*255,i[1]/65535*255,i[2]/65535*255]};Xt.rgb.apple=function(i){return[i[0]/255*65535,i[1]/255*65535,i[2]/255*65535]};Xt.gray.rgb=function(i){return[i[0]/100*255,i[0]/100*255,i[0]/100*255]};Xt.gray.hsl=function(i){return[0,0,i[0]]};Xt.gray.hsv=Xt.gray.hsl;Xt.gray.hwb=function(i){return[0,100,i[0]]};Xt.gray.cmyk=function(i){return[0,0,0,i[0]]};Xt.gray.lab=function(i){return[i[0],0,0]};Xt.gray.hex=function(i){let u=Math.round(i[0]/100*255)&255,c=((u<<16)+(u<<8)+u).toString(16).toUpperCase();return"000000".substring(c.length)+c};Xt.rgb.gray=function(i){return[(i[0]+i[1]+i[2])/3/255*100]}});var ME=Me((Tb,PE)=>{var Fh=qy();function jN(){let i={},u=Object.keys(Fh);for(let f=u.length,c=0;c{var zy=qy(),WN=ME(),Ca={},HN=Object.keys(zy);function bN(i){let u=function(...f){let c=f[0];return c==null?c:(c.length>1&&(f=c),i(f))};return"conversion"in i&&(u.conversion=i.conversion),u}function GN(i){let u=function(...f){let c=f[0];if(c==null)return c;c.length>1&&(f=c);let g=i(f);if(typeof g=="object")for(let t=g.length,C=0;C{Ca[i]={},Object.defineProperty(Ca[i],"channels",{value:zy[i].channels}),Object.defineProperty(Ca[i],"labels",{value:zy[i].labels});let u=WN(i);Object.keys(u).forEach(c=>{let g=u[c];Ca[i][c]=GN(g),Ca[i][c].raw=bN(g)})});FE.exports=Ca});var Rh=Me((kb,RE)=>{"use strict";var NE=(i,u)=>(...f)=>`[${i(...f)+u}m`,BE=(i,u)=>(...f)=>{let c=i(...f);return`[${38+u};5;${c}m`},jE=(i,u)=>(...f)=>{let c=i(...f);return`[${38+u};2;${c[0]};${c[1]};${c[2]}m`},Lh=i=>i,UE=(i,u,f)=>[i,u,f],Ta=(i,u,f)=>{Object.defineProperty(i,u,{get:()=>{let c=f();return Object.defineProperty(i,u,{value:c,enumerable:!0,configurable:!0}),c},enumerable:!0,configurable:!0})},Wy,xa=(i,u,f,c)=>{Wy===void 0&&(Wy=LE());let g=c?10:0,t={};for(let[C,A]of Object.entries(Wy)){let x=C==="ansi16"?"ansi":C;C===u?t[x]=i(f,g):typeof A=="object"&&(t[x]=i(A[u],g))}return t};function VN(){let i=new Map,u={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};u.color.gray=u.color.blackBright,u.bgColor.bgGray=u.bgColor.bgBlackBright,u.color.grey=u.color.blackBright,u.bgColor.bgGrey=u.bgColor.bgBlackBright;for(let[f,c]of Object.entries(u)){for(let[g,t]of Object.entries(c))u[g]={open:`[${t[0]}m`,close:`[${t[1]}m`},c[g]=u[g],i.set(t[0],t[1]);Object.defineProperty(u,f,{value:c,enumerable:!1})}return Object.defineProperty(u,"codes",{value:i,enumerable:!1}),u.color.close="",u.bgColor.close="",Ta(u.color,"ansi",()=>xa(NE,"ansi16",Lh,!1)),Ta(u.color,"ansi256",()=>xa(BE,"ansi256",Lh,!1)),Ta(u.color,"ansi16m",()=>xa(jE,"rgb",UE,!1)),Ta(u.bgColor,"ansi",()=>xa(NE,"ansi16",Lh,!0)),Ta(u.bgColor,"ansi256",()=>xa(BE,"ansi256",Lh,!0)),Ta(u.bgColor,"ansi16m",()=>xa(jE,"rgb",UE,!0)),u}Object.defineProperty(RE,"exports",{enumerable:!0,get:VN})});var WE=Me((Ab,qE)=>{"use strict";var h2=Mh(),YN=Fy(),$N=Rh(),Hy=new Set(["","\x9B"]),KN=39,zE=i=>`${Hy.values().next().value}[${i}m`,XN=i=>i.split(" ").map(u=>h2(u)),by=(i,u,f)=>{let c=[...u],g=!1,t=h2(YN(i[i.length-1]));for(let[C,A]of c.entries()){let x=h2(A);if(t+x<=f?i[i.length-1]+=A:(i.push(A),t=0),Hy.has(A))g=!0;else if(g&&A==="m"){g=!1;continue}g||(t+=x,t===f&&C0&&i.length>1&&(i[i.length-2]+=i.pop())},JN=i=>{let u=i.split(" "),f=u.length;for(;f>0&&!(h2(u[f-1])>0);)f--;return f===u.length?i:u.slice(0,f).join(" ")+u.slice(f).join("")},QN=(i,u,f={})=>{if(f.trim!==!1&&i.trim()==="")return"";let c="",g="",t,C=XN(i),A=[""];for(let[x,D]of i.split(" ").entries()){f.trim!==!1&&(A[A.length-1]=A[A.length-1].trimLeft());let L=h2(A[A.length-1]);if(x!==0&&(L>=u&&(f.wordWrap===!1||f.trim===!1)&&(A.push(""),L=0),(L>0||f.trim===!1)&&(A[A.length-1]+=" ",L++)),f.hard&&C[x]>u){let N=u-L,j=1+Math.floor((C[x]-N-1)/u);Math.floor((C[x]-1)/u)u&&L>0&&C[x]>0){if(f.wordWrap===!1&&Lu&&f.wordWrap===!1){by(A,D,u);continue}A[A.length-1]+=D}f.trim!==!1&&(A=A.map(JN)),c=A.join(` -`);for(let[x,D]of[...c].entries()){if(g+=D,Hy.has(D)){let N=parseFloat(/\d[^m]*/.exec(c.slice(x,x+4)));t=N===KN?null:N}let L=$N.codes.get(Number(t));t&&L&&(c[x+1]===` -`?g+=zE(L):D===` -`&&(g+=zE(t)))}return g};qE.exports=(i,u,f)=>String(i).normalize().replace(/\r\n/g,` -`).split(` -`).map(c=>QN(c,u,f)).join(` -`)});var GE=Me((Ob,HE)=>{"use strict";var bE="[\uD800-\uDBFF][\uDC00-\uDFFF]",ZN=i=>i&&i.exact?new RegExp(`^${bE}$`):new RegExp(bE,"g");HE.exports=ZN});var Gy=Me((Ib,VE)=>{"use strict";var eB=Ry(),tB=GE(),YE=Rh(),$E=["","\x9B"],Nh=i=>`${$E[0]}[${i}m`,KE=(i,u,f)=>{let c=[];i=[...i];for(let g of i){let t=g;g.match(";")&&(g=g.split(";")[0][0]+"0");let C=YE.codes.get(parseInt(g,10));if(C){let A=i.indexOf(C.toString());A>=0?i.splice(A,1):c.push(Nh(u?C:t))}else if(u){c.push(Nh(0));break}else c.push(Nh(t))}if(u&&(c=c.filter((g,t)=>c.indexOf(g)===t),f!==void 0)){let g=Nh(YE.codes.get(parseInt(f,10)));c=c.reduce((t,C)=>C===g?[C,...t]:[...t,C],[])}return c.join("")};VE.exports=(i,u,f)=>{let c=[...i.normalize()],g=[];f=typeof f=="number"?f:c.length;let t=!1,C,A=0,x="";for(let[D,L]of c.entries()){let N=!1;if($E.includes(L)){let j=/\d[^m]*/.exec(i.slice(D,D+18));C=j&&j.length>0?j[0]:void 0,Au&&A<=f)x+=L;else if(A===u&&!t&&C!==void 0)x=KE(g);else if(A>=f){x+=KE(g,!0,C);break}}return x}});var JE=Me((Pb,XE)=>{"use strict";var Bf=Gy(),nB=Mh();function Bh(i,u,f){if(i.charAt(u)===" ")return u;for(let c=1;c<=3;c++)if(f){if(i.charAt(u+c)===" ")return u+c}else if(i.charAt(u-c)===" ")return u-c;return u}XE.exports=(i,u,f)=>{f=dt({position:"end",preferTruncationOnSpace:!1},f);let{position:c,space:g,preferTruncationOnSpace:t}=f,C="\u2026",A=1;if(typeof i!="string")throw new TypeError(`Expected \`input\` to be a string, got ${typeof i}`);if(typeof u!="number")throw new TypeError(`Expected \`columns\` to be a number, got ${typeof u}`);if(u<1)return"";if(u===1)return C;let x=nB(i);if(x<=u)return i;if(c==="start"){if(t){let D=Bh(i,x-u+1,!0);return C+Bf(i,D,x).trim()}return g===!0&&(C+=" ",A=2),C+Bf(i,x-u+A,x)}if(c==="middle"){g===!0&&(C=" "+C+" ",A=3);let D=Math.floor(u/2);if(t){let L=Bh(i,D),N=Bh(i,x-(u-D)+1,!0);return Bf(i,0,L)+C+Bf(i,N,x).trim()}return Bf(i,0,D)+C+Bf(i,x-(u-D)+A,x)}if(c==="end"){if(t){let D=Bh(i,u-1);return Bf(i,0,D)+C}return g===!0&&(C=" "+C,A=2),Bf(i,0,u-A)+C}throw new Error(`Expected \`options.position\` to be either \`start\`, \`middle\` or \`end\`, got ${c}`)}});var Yy=Me(m2=>{"use strict";var QE=m2&&m2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(m2,"__esModule",{value:!0});var rB=QE(WE()),iB=QE(JE()),Vy={};m2.default=(i,u,f)=>{let c=i+String(u)+String(f);if(Vy[c])return Vy[c];let g=i;if(f==="wrap"&&(g=rB.default(i,u,{trim:!1,hard:!0})),f.startsWith("truncate")){let t="end";f==="truncate-middle"&&(t="middle"),f==="truncate-start"&&(t="start"),g=iB.default(i,u,{position:t})}return Vy[c]=g,g}});var Ky=Me($y=>{"use strict";Object.defineProperty($y,"__esModule",{value:!0});var ZE=i=>{let u="";if(i.childNodes.length>0)for(let f of i.childNodes){let c="";f.nodeName==="#text"?c=f.nodeValue:((f.nodeName==="ink-text"||f.nodeName==="ink-virtual-text")&&(c=ZE(f)),c.length>0&&typeof f.internal_transform=="function"&&(c=f.internal_transform(c))),u+=c}return u};$y.default=ZE});var Xy=Me(Zr=>{"use strict";var v2=Zr&&Zr.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Zr,"__esModule",{value:!0});Zr.setTextNodeValue=Zr.createTextNode=Zr.setStyle=Zr.setAttribute=Zr.removeChildNode=Zr.insertBeforeNode=Zr.appendChildNode=Zr.createNode=Zr.TEXT_NAME=void 0;var oB=v2(hc()),e6=v2(TE()),uB=v2(xE()),sB=v2(Yy()),lB=v2(Ky());Zr.TEXT_NAME="#text";Zr.createNode=i=>{var u;let f={nodeName:i,style:{},attributes:{},childNodes:[],parentNode:null,yogaNode:i==="ink-virtual-text"?void 0:oB.default.Node.create()};return i==="ink-text"&&((u=f.yogaNode)===null||u===void 0||u.setMeasureFunc(fB.bind(null,f))),f};Zr.appendChildNode=(i,u)=>{var f;u.parentNode&&Zr.removeChildNode(u.parentNode,u),u.parentNode=i,i.childNodes.push(u),u.yogaNode&&((f=i.yogaNode)===null||f===void 0||f.insertChild(u.yogaNode,i.yogaNode.getChildCount())),(i.nodeName==="ink-text"||i.nodeName==="ink-virtual-text")&&jh(i)};Zr.insertBeforeNode=(i,u,f)=>{var c,g;u.parentNode&&Zr.removeChildNode(u.parentNode,u),u.parentNode=i;let t=i.childNodes.indexOf(f);if(t>=0){i.childNodes.splice(t,0,u),u.yogaNode&&((c=i.yogaNode)===null||c===void 0||c.insertChild(u.yogaNode,t));return}i.childNodes.push(u),u.yogaNode&&((g=i.yogaNode)===null||g===void 0||g.insertChild(u.yogaNode,i.yogaNode.getChildCount())),(i.nodeName==="ink-text"||i.nodeName==="ink-virtual-text")&&jh(i)};Zr.removeChildNode=(i,u)=>{var f,c;u.yogaNode&&((c=(f=u.parentNode)===null||f===void 0?void 0:f.yogaNode)===null||c===void 0||c.removeChild(u.yogaNode)),u.parentNode=null;let g=i.childNodes.indexOf(u);g>=0&&i.childNodes.splice(g,1),(i.nodeName==="ink-text"||i.nodeName==="ink-virtual-text")&&jh(i)};Zr.setAttribute=(i,u,f)=>{i.attributes[u]=f};Zr.setStyle=(i,u)=>{i.style=u,i.yogaNode&&uB.default(i.yogaNode,u)};Zr.createTextNode=i=>{let u={nodeName:"#text",nodeValue:i,yogaNode:void 0,parentNode:null,style:{}};return Zr.setTextNodeValue(u,i),u};var fB=function(i,u){var f,c;let g=i.nodeName==="#text"?i.nodeValue:lB.default(i),t=e6.default(g);if(t.width<=u||t.width>=1&&u>0&&u<1)return t;let C=(c=(f=i.style)===null||f===void 0?void 0:f.textWrap)!==null&&c!==void 0?c:"wrap",A=sB.default(g,u,C);return e6.default(A)},t6=i=>{var u;if(!(!i||!i.parentNode))return(u=i.yogaNode)!==null&&u!==void 0?u:t6(i.parentNode)},jh=i=>{let u=t6(i);u==null||u.markDirty()};Zr.setTextNodeValue=(i,u)=>{typeof u!="string"&&(u=String(u)),i.nodeValue=u,jh(i)}});var mc=Me((Rb,n6)=>{"use strict";n6.exports={BINARY_TYPES:["nodebuffer","arraybuffer","fragments"],GUID:"258EAFA5-E914-47DA-95CA-C5AB0DC85B11",kStatusCode:Symbol("status-code"),kWebSocket:Symbol("websocket"),EMPTY_BUFFER:Buffer.alloc(0),NOOP:()=>{}}});var g2=Me((Nb,Jy)=>{"use strict";var{EMPTY_BUFFER:cB}=mc();function r6(i,u){if(i.length===0)return cB;if(i.length===1)return i[0];let f=Buffer.allocUnsafe(u),c=0;for(let g=0;g{"use strict";var l6=Symbol("kDone"),Qy=Symbol("kRun"),f6=class{constructor(u){this[l6]=()=>{this.pending--,this[Qy]()},this.concurrency=u||Infinity,this.jobs=[],this.pending=0}add(u){this.jobs.push(u),this[Qy]()}[Qy](){if(this.pending!==this.concurrency&&this.jobs.length){let u=this.jobs.shift();this.pending++,u(this[l6])}}};s6.exports=f6});var w2=Me((jb,a6)=>{"use strict";var _2=require("zlib"),d6=g2(),aB=c6(),{kStatusCode:p6,NOOP:dB}=mc(),pB=Buffer.from([0,0,255,255]),qh=Symbol("permessage-deflate"),Xl=Symbol("total-length"),y2=Symbol("callback"),jf=Symbol("buffers"),Zy=Symbol("error"),zh,h6=class{constructor(u,f,c){if(this._maxPayload=c|0,this._options=u||{},this._threshold=this._options.threshold!==void 0?this._options.threshold:1024,this._isServer=!!f,this._deflate=null,this._inflate=null,this.params=null,!zh){let g=this._options.concurrencyLimit!==void 0?this._options.concurrencyLimit:10;zh=new aB(g)}}static get extensionName(){return"permessage-deflate"}offer(){let u={};return this._options.serverNoContextTakeover&&(u.server_no_context_takeover=!0),this._options.clientNoContextTakeover&&(u.client_no_context_takeover=!0),this._options.serverMaxWindowBits&&(u.server_max_window_bits=this._options.serverMaxWindowBits),this._options.clientMaxWindowBits?u.client_max_window_bits=this._options.clientMaxWindowBits:this._options.clientMaxWindowBits==null&&(u.client_max_window_bits=!0),u}accept(u){return u=this.normalizeParams(u),this.params=this._isServer?this.acceptAsServer(u):this.acceptAsClient(u),this.params}cleanup(){if(this._inflate&&(this._inflate.close(),this._inflate=null),this._deflate){let u=this._deflate[y2];this._deflate.close(),this._deflate=null,u&&u(new Error("The deflate stream was closed while data was being processed"))}}acceptAsServer(u){let f=this._options,c=u.find(g=>!(f.serverNoContextTakeover===!1&&g.server_no_context_takeover||g.server_max_window_bits&&(f.serverMaxWindowBits===!1||typeof f.serverMaxWindowBits=="number"&&f.serverMaxWindowBits>g.server_max_window_bits)||typeof f.clientMaxWindowBits=="number"&&!g.client_max_window_bits));if(!c)throw new Error("None of the extension offers can be accepted");return f.serverNoContextTakeover&&(c.server_no_context_takeover=!0),f.clientNoContextTakeover&&(c.client_no_context_takeover=!0),typeof f.serverMaxWindowBits=="number"&&(c.server_max_window_bits=f.serverMaxWindowBits),typeof f.clientMaxWindowBits=="number"?c.client_max_window_bits=f.clientMaxWindowBits:(c.client_max_window_bits===!0||f.clientMaxWindowBits===!1)&&delete c.client_max_window_bits,c}acceptAsClient(u){let f=u[0];if(this._options.clientNoContextTakeover===!1&&f.client_no_context_takeover)throw new Error('Unexpected parameter "client_no_context_takeover"');if(!f.client_max_window_bits)typeof this._options.clientMaxWindowBits=="number"&&(f.client_max_window_bits=this._options.clientMaxWindowBits);else if(this._options.clientMaxWindowBits===!1||typeof this._options.clientMaxWindowBits=="number"&&f.client_max_window_bits>this._options.clientMaxWindowBits)throw new Error('Unexpected or invalid parameter "client_max_window_bits"');return f}normalizeParams(u){return u.forEach(f=>{Object.keys(f).forEach(c=>{let g=f[c];if(g.length>1)throw new Error(`Parameter "${c}" must have only a single value`);if(g=g[0],c==="client_max_window_bits"){if(g!==!0){let t=+g;if(!Number.isInteger(t)||t<8||t>15)throw new TypeError(`Invalid value for parameter "${c}": ${g}`);g=t}else if(!this._isServer)throw new TypeError(`Invalid value for parameter "${c}": ${g}`)}else if(c==="server_max_window_bits"){let t=+g;if(!Number.isInteger(t)||t<8||t>15)throw new TypeError(`Invalid value for parameter "${c}": ${g}`);g=t}else if(c==="client_no_context_takeover"||c==="server_no_context_takeover"){if(g!==!0)throw new TypeError(`Invalid value for parameter "${c}": ${g}`)}else throw new Error(`Unknown parameter "${c}"`);f[c]=g})}),u}decompress(u,f,c){zh.add(g=>{this._decompress(u,f,(t,C)=>{g(),c(t,C)})})}compress(u,f,c){zh.add(g=>{this._compress(u,f,(t,C)=>{g(),c(t,C)})})}_decompress(u,f,c){let g=this._isServer?"client":"server";if(!this._inflate){let t=`${g}_max_window_bits`,C=typeof this.params[t]!="number"?_2.Z_DEFAULT_WINDOWBITS:this.params[t];this._inflate=_2.createInflateRaw(zn(dt({},this._options.zlibInflateOptions),{windowBits:C})),this._inflate[qh]=this,this._inflate[Xl]=0,this._inflate[jf]=[],this._inflate.on("error",mB),this._inflate.on("data",m6)}this._inflate[y2]=c,this._inflate.write(u),f&&this._inflate.write(pB),this._inflate.flush(()=>{let t=this._inflate[Zy];if(t){this._inflate.close(),this._inflate=null,c(t);return}let C=d6.concat(this._inflate[jf],this._inflate[Xl]);this._inflate._readableState.endEmitted?(this._inflate.close(),this._inflate=null):(this._inflate[Xl]=0,this._inflate[jf]=[],f&&this.params[`${g}_no_context_takeover`]&&this._inflate.reset()),c(null,C)})}_compress(u,f,c){let g=this._isServer?"server":"client";if(!this._deflate){let t=`${g}_max_window_bits`,C=typeof this.params[t]!="number"?_2.Z_DEFAULT_WINDOWBITS:this.params[t];this._deflate=_2.createDeflateRaw(zn(dt({},this._options.zlibDeflateOptions),{windowBits:C})),this._deflate[Xl]=0,this._deflate[jf]=[],this._deflate.on("error",dB),this._deflate.on("data",hB)}this._deflate[y2]=c,this._deflate.write(u),this._deflate.flush(_2.Z_SYNC_FLUSH,()=>{if(!this._deflate)return;let t=d6.concat(this._deflate[jf],this._deflate[Xl]);f&&(t=t.slice(0,t.length-4)),this._deflate[y2]=null,this._deflate[Xl]=0,this._deflate[jf]=[],f&&this.params[`${g}_no_context_takeover`]&&this._deflate.reset(),c(null,t)})}};a6.exports=h6;function hB(i){this[jf].push(i),this[Xl]+=i.length}function m6(i){if(this[Xl]+=i.length,this[qh]._maxPayload<1||this[Xl]<=this[qh]._maxPayload){this[jf].push(i);return}this[Zy]=new RangeError("Max payload size exceeded"),this[Zy][p6]=1009,this.removeListener("data",m6),this.reset()}function mB(i){this[qh]._inflate=null,i[p6]=1007,this[y2](i)}});var t3=Me((Ub,e3)=>{"use strict";function v6(i){return i>=1e3&&i<=1014&&i!==1004&&i!==1005&&i!==1006||i>=3e3&&i<=4999}function g6(i){let u=i.length,f=0;for(;f=u||(i[f+1]&192)!=128||(i[f+2]&192)!=128||i[f]===224&&(i[f+1]&224)==128||i[f]===237&&(i[f+1]&224)==160)return!1;f+=3}else if((i[f]&248)==240){if(f+3>=u||(i[f+1]&192)!=128||(i[f+2]&192)!=128||(i[f+3]&192)!=128||i[f]===240&&(i[f+1]&240)==128||i[f]===244&&i[f+1]>143||i[f]>244)return!1;f+=4}else return!1;return!0}try{let i=require("utf-8-validate");typeof i=="object"&&(i=i.Validation.isValidUTF8),e3.exports={isValidStatusCode:v6,isValidUTF8(u){return u.length<150?g6(u):i(u)}}}catch(i){e3.exports={isValidStatusCode:v6,isValidUTF8:g6}}});var i3=Me((qb,_6)=>{"use strict";var{Writable:vB}=require("stream"),y6=w2(),{BINARY_TYPES:gB,EMPTY_BUFFER:_B,kStatusCode:yB,kWebSocket:wB}=mc(),{concat:n3,toArrayBuffer:DB,unmask:EB}=g2(),{isValidStatusCode:SB,isValidUTF8:w6}=t3(),D2=0,D6=1,E6=2,S6=3,r3=4,CB=5,C6=class extends vB{constructor(u,f,c,g){super();this._binaryType=u||gB[0],this[wB]=void 0,this._extensions=f||{},this._isServer=!!c,this._maxPayload=g|0,this._bufferedBytes=0,this._buffers=[],this._compressed=!1,this._payloadLength=0,this._mask=void 0,this._fragmented=0,this._masked=!1,this._fin=!1,this._opcode=0,this._totalPayloadLength=0,this._messageLength=0,this._fragments=[],this._state=D2,this._loop=!1}_write(u,f,c){if(this._opcode===8&&this._state==D2)return c();this._bufferedBytes+=u.length,this._buffers.push(u),this.startLoop(c)}consume(u){if(this._bufferedBytes-=u,u===this._buffers[0].length)return this._buffers.shift();if(u=c.length?f.set(this._buffers.shift(),g):(f.set(new Uint8Array(c.buffer,c.byteOffset,u),g),this._buffers[0]=c.slice(u)),u-=c.length}while(u>0);return f}startLoop(u){let f;this._loop=!0;do switch(this._state){case D2:f=this.getInfo();break;case D6:f=this.getPayloadLength16();break;case E6:f=this.getPayloadLength64();break;case S6:this.getMask();break;case r3:f=this.getData(u);break;default:this._loop=!1;return}while(this._loop);u(f)}getInfo(){if(this._bufferedBytes<2){this._loop=!1;return}let u=this.consume(2);if((u[0]&48)!=0)return this._loop=!1,ii(RangeError,"RSV2 and RSV3 must be clear",!0,1002);let f=(u[0]&64)==64;if(f&&!this._extensions[y6.extensionName])return this._loop=!1,ii(RangeError,"RSV1 must be clear",!0,1002);if(this._fin=(u[0]&128)==128,this._opcode=u[0]&15,this._payloadLength=u[1]&127,this._opcode===0){if(f)return this._loop=!1,ii(RangeError,"RSV1 must be clear",!0,1002);if(!this._fragmented)return this._loop=!1,ii(RangeError,"invalid opcode 0",!0,1002);this._opcode=this._fragmented}else if(this._opcode===1||this._opcode===2){if(this._fragmented)return this._loop=!1,ii(RangeError,`invalid opcode ${this._opcode}`,!0,1002);this._compressed=f}else if(this._opcode>7&&this._opcode<11){if(!this._fin)return this._loop=!1,ii(RangeError,"FIN must be set",!0,1002);if(f)return this._loop=!1,ii(RangeError,"RSV1 must be clear",!0,1002);if(this._payloadLength>125)return this._loop=!1,ii(RangeError,`invalid payload length ${this._payloadLength}`,!0,1002)}else return this._loop=!1,ii(RangeError,`invalid opcode ${this._opcode}`,!0,1002);if(!this._fin&&!this._fragmented&&(this._fragmented=this._opcode),this._masked=(u[1]&128)==128,this._isServer){if(!this._masked)return this._loop=!1,ii(RangeError,"MASK must be set",!0,1002)}else if(this._masked)return this._loop=!1,ii(RangeError,"MASK must be clear",!0,1002);if(this._payloadLength===126)this._state=D6;else if(this._payloadLength===127)this._state=E6;else return this.haveLength()}getPayloadLength16(){if(this._bufferedBytes<2){this._loop=!1;return}return this._payloadLength=this.consume(2).readUInt16BE(0),this.haveLength()}getPayloadLength64(){if(this._bufferedBytes<8){this._loop=!1;return}let u=this.consume(8),f=u.readUInt32BE(0);return f>Math.pow(2,53-32)-1?(this._loop=!1,ii(RangeError,"Unsupported WebSocket frame: payload length > 2^53 - 1",!1,1009)):(this._payloadLength=f*Math.pow(2,32)+u.readUInt32BE(4),this.haveLength())}haveLength(){if(this._payloadLength&&this._opcode<8&&(this._totalPayloadLength+=this._payloadLength,this._totalPayloadLength>this._maxPayload&&this._maxPayload>0))return this._loop=!1,ii(RangeError,"Max payload size exceeded",!1,1009);this._masked?this._state=S6:this._state=r3}getMask(){if(this._bufferedBytes<4){this._loop=!1;return}this._mask=this.consume(4),this._state=r3}getData(u){let f=_B;if(this._payloadLength){if(this._bufferedBytes7)return this.controlMessage(f);if(this._compressed){this._state=CB,this.decompress(f,u);return}return f.length&&(this._messageLength=this._totalPayloadLength,this._fragments.push(f)),this.dataMessage()}decompress(u,f){this._extensions[y6.extensionName].decompress(u,this._fin,(g,t)=>{if(g)return f(g);if(t.length){if(this._messageLength+=t.length,this._messageLength>this._maxPayload&&this._maxPayload>0)return f(ii(RangeError,"Max payload size exceeded",!1,1009));this._fragments.push(t)}let C=this.dataMessage();if(C)return f(C);this.startLoop(f)})}dataMessage(){if(this._fin){let u=this._messageLength,f=this._fragments;if(this._totalPayloadLength=0,this._messageLength=0,this._fragmented=0,this._fragments=[],this._opcode===2){let c;this._binaryType==="nodebuffer"?c=n3(f,u):this._binaryType==="arraybuffer"?c=DB(n3(f,u)):c=f,this.emit("message",c)}else{let c=n3(f,u);if(!w6(c))return this._loop=!1,ii(Error,"invalid UTF-8 sequence",!0,1007);this.emit("message",c.toString())}}this._state=D2}controlMessage(u){if(this._opcode===8)if(this._loop=!1,u.length===0)this.emit("conclude",1005,""),this.end();else{if(u.length===1)return ii(RangeError,"invalid payload length 1",!0,1002);{let f=u.readUInt16BE(0);if(!SB(f))return ii(RangeError,`invalid status code ${f}`,!0,1002);let c=u.slice(2);if(!w6(c))return ii(Error,"invalid UTF-8 sequence",!0,1007);this.emit("conclude",f,c.toString()),this.end()}}else this._opcode===9?this.emit("ping",u):this.emit("pong",u);this._state=D2}};_6.exports=C6;function ii(i,u,f,c){let g=new i(f?`Invalid WebSocket frame: ${u}`:u);return Error.captureStackTrace(g,ii),g[yB]=c,g}});var o3=Me((zb,T6)=>{"use strict";var{randomFillSync:TB}=require("crypto"),x6=w2(),{EMPTY_BUFFER:xB}=mc(),{isValidStatusCode:kB}=t3(),{mask:k6,toBuffer:Jl}=g2(),vc=Buffer.alloc(4),Ql=class{constructor(u,f){this._extensions=f||{},this._socket=u,this._firstFragment=!0,this._compress=!1,this._bufferedBytes=0,this._deflating=!1,this._queue=[]}static frame(u,f){let c=f.mask&&f.readOnly,g=f.mask?6:2,t=u.length;u.length>=65536?(g+=8,t=127):u.length>125&&(g+=2,t=126);let C=Buffer.allocUnsafe(c?u.length+g:g);return C[0]=f.fin?f.opcode|128:f.opcode,f.rsv1&&(C[0]|=64),C[1]=t,t===126?C.writeUInt16BE(u.length,2):t===127&&(C.writeUInt32BE(0,2),C.writeUInt32BE(u.length,6)),f.mask?(TB(vc,0,4),C[1]|=128,C[g-4]=vc[0],C[g-3]=vc[1],C[g-2]=vc[2],C[g-1]=vc[3],c?(k6(u,vc,C,g,u.length),[C]):(k6(u,vc,u,0,u.length),[C,u])):[C,u]}close(u,f,c,g){let t;if(u===void 0)t=xB;else{if(typeof u!="number"||!kB(u))throw new TypeError("First argument must be a valid error code number");if(f===void 0||f==="")t=Buffer.allocUnsafe(2),t.writeUInt16BE(u,0);else{let C=Buffer.byteLength(f);if(C>123)throw new RangeError("The message must not be greater than 123 bytes");t=Buffer.allocUnsafe(2+C),t.writeUInt16BE(u,0),t.write(f,2)}}this._deflating?this.enqueue([this.doClose,t,c,g]):this.doClose(t,c,g)}doClose(u,f,c){this.sendFrame(Ql.frame(u,{fin:!0,rsv1:!1,opcode:8,mask:f,readOnly:!1}),c)}ping(u,f,c){let g=Jl(u);if(g.length>125)throw new RangeError("The data size must not be greater than 125 bytes");this._deflating?this.enqueue([this.doPing,g,f,Jl.readOnly,c]):this.doPing(g,f,Jl.readOnly,c)}doPing(u,f,c,g){this.sendFrame(Ql.frame(u,{fin:!0,rsv1:!1,opcode:9,mask:f,readOnly:c}),g)}pong(u,f,c){let g=Jl(u);if(g.length>125)throw new RangeError("The data size must not be greater than 125 bytes");this._deflating?this.enqueue([this.doPong,g,f,Jl.readOnly,c]):this.doPong(g,f,Jl.readOnly,c)}doPong(u,f,c,g){this.sendFrame(Ql.frame(u,{fin:!0,rsv1:!1,opcode:10,mask:f,readOnly:c}),g)}send(u,f,c){let g=Jl(u),t=this._extensions[x6.extensionName],C=f.binary?2:1,A=f.compress;if(this._firstFragment?(this._firstFragment=!1,A&&t&&(A=g.length>=t._threshold),this._compress=A):(A=!1,C=0),f.fin&&(this._firstFragment=!0),t){let x={fin:f.fin,rsv1:A,opcode:C,mask:f.mask,readOnly:Jl.readOnly};this._deflating?this.enqueue([this.dispatch,g,this._compress,x,c]):this.dispatch(g,this._compress,x,c)}else this.sendFrame(Ql.frame(g,{fin:f.fin,rsv1:!1,opcode:C,mask:f.mask,readOnly:Jl.readOnly}),c)}dispatch(u,f,c,g){if(!f){this.sendFrame(Ql.frame(u,c),g);return}let t=this._extensions[x6.extensionName];this._bufferedBytes+=u.length,this._deflating=!0,t.compress(u,c.fin,(C,A)=>{if(this._socket.destroyed){let x=new Error("The socket was closed while data was being compressed");typeof g=="function"&&g(x);for(let D=0;D{"use strict";var E2=class{constructor(u,f){this.target=f,this.type=u}},O6=class extends E2{constructor(u,f){super("message",f);this.data=u}},I6=class extends E2{constructor(u,f,c){super("close",c);this.wasClean=c._closeFrameReceived&&c._closeFrameSent,this.reason=f,this.code=u}},P6=class extends E2{constructor(u){super("open",u)}},M6=class extends E2{constructor(u,f){super("error",f);this.message=u.message,this.error=u}},AB={addEventListener(i,u,f){if(typeof u!="function")return;function c(x){u.call(this,new O6(x,this))}function g(x,D){u.call(this,new I6(x,D,this))}function t(x){u.call(this,new M6(x,this))}function C(){u.call(this,new P6(this))}let A=f&&f.once?"once":"on";i==="message"?(c._listener=u,this[A](i,c)):i==="close"?(g._listener=u,this[A](i,g)):i==="error"?(t._listener=u,this[A](i,t)):i==="open"?(C._listener=u,this[A](i,C)):this[A](i,u)},removeEventListener(i,u){let f=this.listeners(i);for(let c=0;c{"use strict";var S2=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,1,1,1,1,0,0,1,1,0,1,1,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,0];function rl(i,u,f){i[u]===void 0?i[u]=[f]:i[u].push(f)}function OB(i){let u=Object.create(null);if(i===void 0||i==="")return u;let f=Object.create(null),c=!1,g=!1,t=!1,C,A,x=-1,D=-1,L=0;for(;L{let f=i[u];return Array.isArray(f)||(f=[f]),f.map(c=>[u].concat(Object.keys(c).map(g=>{let t=c[g];return Array.isArray(t)||(t=[t]),t.map(C=>C===!0?g:`${g}=${C}`).join("; ")})).join("; ")).join(", ")}).join(", ")}L6.exports={format:IB,parse:OB}});var a3=Me((bb,R6)=>{"use strict";var PB=require("events"),MB=require("https"),FB=require("http"),N6=require("net"),LB=require("tls"),{randomBytes:RB,createHash:NB}=require("crypto"),{URL:s3}=require("url"),Uf=w2(),BB=i3(),jB=o3(),{BINARY_TYPES:B6,EMPTY_BUFFER:l3,GUID:UB,kStatusCode:qB,kWebSocket:No,NOOP:j6}=mc(),{addEventListener:zB,removeEventListener:WB}=F6(),{format:HB,parse:bB}=u3(),{toBuffer:GB}=g2(),U6=["CONNECTING","OPEN","CLOSING","CLOSED"],f3=[8,13],VB=30*1e3,mr=class extends PB{constructor(u,f,c){super();this._binaryType=B6[0],this._closeCode=1006,this._closeFrameReceived=!1,this._closeFrameSent=!1,this._closeMessage="",this._closeTimer=null,this._extensions={},this._protocol="",this._readyState=mr.CONNECTING,this._receiver=null,this._sender=null,this._socket=null,u!==null?(this._bufferedAmount=0,this._isServer=!1,this._redirects=0,Array.isArray(f)?f=f.join(", "):typeof f=="object"&&f!==null&&(c=f,f=void 0),q6(this,u,f,c)):this._isServer=!0}get binaryType(){return this._binaryType}set binaryType(u){!B6.includes(u)||(this._binaryType=u,this._receiver&&(this._receiver._binaryType=u))}get bufferedAmount(){return this._socket?this._socket._writableState.length+this._sender._bufferedBytes:this._bufferedAmount}get extensions(){return Object.keys(this._extensions).join()}get protocol(){return this._protocol}get readyState(){return this._readyState}get url(){return this._url}setSocket(u,f,c){let g=new BB(this.binaryType,this._extensions,this._isServer,c);this._sender=new jB(u,this._extensions),this._receiver=g,this._socket=u,g[No]=this,u[No]=this,g.on("conclude",YB),g.on("drain",$B),g.on("error",KB),g.on("message",XB),g.on("ping",JB),g.on("pong",QB),u.setTimeout(0),u.setNoDelay(),f.length>0&&u.unshift(f),u.on("close",z6),u.on("data",Wh),u.on("end",W6),u.on("error",H6),this._readyState=mr.OPEN,this.emit("open")}emitClose(){if(!this._socket){this._readyState=mr.CLOSED,this.emit("close",this._closeCode,this._closeMessage);return}this._extensions[Uf.extensionName]&&this._extensions[Uf.extensionName].cleanup(),this._receiver.removeAllListeners(),this._readyState=mr.CLOSED,this.emit("close",this._closeCode,this._closeMessage)}close(u,f){if(this.readyState!==mr.CLOSED){if(this.readyState===mr.CONNECTING){let c="WebSocket was closed before the connection was established";return Zl(this,this._req,c)}if(this.readyState===mr.CLOSING){this._closeFrameSent&&this._closeFrameReceived&&this._socket.end();return}this._readyState=mr.CLOSING,this._sender.close(u,f,!this._isServer,c=>{c||(this._closeFrameSent=!0,this._closeFrameReceived&&this._socket.end())}),this._closeTimer=setTimeout(this._socket.destroy.bind(this._socket),VB)}}ping(u,f,c){if(this.readyState===mr.CONNECTING)throw new Error("WebSocket is not open: readyState 0 (CONNECTING)");if(typeof u=="function"?(c=u,u=f=void 0):typeof f=="function"&&(c=f,f=void 0),typeof u=="number"&&(u=u.toString()),this.readyState!==mr.OPEN){c3(this,u,c);return}f===void 0&&(f=!this._isServer),this._sender.ping(u||l3,f,c)}pong(u,f,c){if(this.readyState===mr.CONNECTING)throw new Error("WebSocket is not open: readyState 0 (CONNECTING)");if(typeof u=="function"?(c=u,u=f=void 0):typeof f=="function"&&(c=f,f=void 0),typeof u=="number"&&(u=u.toString()),this.readyState!==mr.OPEN){c3(this,u,c);return}f===void 0&&(f=!this._isServer),this._sender.pong(u||l3,f,c)}send(u,f,c){if(this.readyState===mr.CONNECTING)throw new Error("WebSocket is not open: readyState 0 (CONNECTING)");if(typeof f=="function"&&(c=f,f={}),typeof u=="number"&&(u=u.toString()),this.readyState!==mr.OPEN){c3(this,u,c);return}let g=dt({binary:typeof u!="string",mask:!this._isServer,compress:!0,fin:!0},f);this._extensions[Uf.extensionName]||(g.compress=!1),this._sender.send(u||l3,g,c)}terminate(){if(this.readyState!==mr.CLOSED){if(this.readyState===mr.CONNECTING){let u="WebSocket was closed before the connection was established";return Zl(this,this._req,u)}this._socket&&(this._readyState=mr.CLOSING,this._socket.destroy())}}};U6.forEach((i,u)=>{let f={enumerable:!0,value:u};Object.defineProperty(mr.prototype,i,f),Object.defineProperty(mr,i,f)});["binaryType","bufferedAmount","extensions","protocol","readyState","url"].forEach(i=>{Object.defineProperty(mr.prototype,i,{enumerable:!0})});["open","error","close","message"].forEach(i=>{Object.defineProperty(mr.prototype,`on${i}`,{configurable:!0,enumerable:!0,get(){let u=this.listeners(i);for(let f=0;f{Zl(i,j,"Opening handshake has timed out")}),j.on("error",$=>{j===null||j.aborted||(j=i._req=null,i._readyState=mr.CLOSING,i.emit("error",$),i.emitClose())}),j.on("response",$=>{let h=$.headers.location,re=$.statusCode;if(h&&g.followRedirects&&re>=300&&re<400){if(++i._redirects>g.maxRedirects){Zl(i,j,"Maximum redirects exceeded");return}j.abort();let ce=new s3(h,u);q6(i,ce,f,c)}else i.emit("unexpected-response",j,$)||Zl(i,j,`Unexpected server response: ${$.statusCode}`)}),j.on("upgrade",($,h,re)=>{if(i.emit("upgrade",$),i.readyState!==mr.CONNECTING)return;j=i._req=null;let ce=NB("sha1").update(D+UB).digest("base64");if($.headers["sec-websocket-accept"]!==ce){Zl(i,h,"Invalid Sec-WebSocket-Accept header");return}let Q=$.headers["sec-websocket-protocol"],oe=(f||"").split(/, */),Se;if(!f&&Q?Se="Server sent a subprotocol but none was requested":f&&!Q?Se="Server sent no subprotocol":Q&&!oe.includes(Q)&&(Se="Server sent an invalid subprotocol"),Se){Zl(i,h,Se);return}if(Q&&(i._protocol=Q),N)try{let me=bB($.headers["sec-websocket-extensions"]);me[Uf.extensionName]&&(N.accept(me[Uf.extensionName]),i._extensions[Uf.extensionName]=N)}catch(me){Zl(i,h,"Invalid Sec-WebSocket-Extensions header");return}i.setSocket(h,re,g.maxPayload)})}function ZB(i){return i.path=i.socketPath,N6.connect(i)}function ej(i){return i.path=void 0,!i.servername&&i.servername!==""&&(i.servername=N6.isIP(i.host)?"":i.host),LB.connect(i)}function Zl(i,u,f){i._readyState=mr.CLOSING;let c=new Error(f);Error.captureStackTrace(c,Zl),u.setHeader?(u.abort(),u.socket&&!u.socket.destroyed&&u.socket.destroy(),u.once("abort",i.emitClose.bind(i)),i.emit("error",c)):(u.destroy(c),u.once("error",i.emit.bind(i,"error")),u.once("close",i.emitClose.bind(i)))}function c3(i,u,f){if(u){let c=GB(u).length;i._socket?i._sender._bufferedBytes+=c:i._bufferedAmount+=c}if(f){let c=new Error(`WebSocket is not open: readyState ${i.readyState} (${U6[i.readyState]})`);f(c)}}function YB(i,u){let f=this[No];f._socket.removeListener("data",Wh),f._socket.resume(),f._closeFrameReceived=!0,f._closeMessage=u,f._closeCode=i,i===1005?f.close():f.close(i,u)}function $B(){this[No]._socket.resume()}function KB(i){let u=this[No];u._socket.removeListener("data",Wh),u._readyState=mr.CLOSING,u._closeCode=i[qB],u.emit("error",i),u._socket.destroy()}function b6(){this[No].emitClose()}function XB(i){this[No].emit("message",i)}function JB(i){let u=this[No];u.pong(i,!u._isServer,j6),u.emit("ping",i)}function QB(i){this[No].emit("pong",i)}function z6(){let i=this[No];this.removeListener("close",z6),this.removeListener("end",W6),i._readyState=mr.CLOSING,i._socket.read(),i._receiver.end(),this.removeListener("data",Wh),this[No]=void 0,clearTimeout(i._closeTimer),i._receiver._writableState.finished||i._receiver._writableState.errorEmitted?i.emitClose():(i._receiver.on("error",b6),i._receiver.on("finish",b6))}function Wh(i){this[No]._receiver.write(i)||this.pause()}function W6(){let i=this[No];i._readyState=mr.CLOSING,i._receiver.end(),this.end()}function H6(){let i=this[No];this.removeListener("error",H6),this.on("error",j6),i&&(i._readyState=mr.CLOSING,this.destroy())}});var $6=Me((Gb,G6)=>{"use strict";var{Duplex:tj}=require("stream");function V6(i){i.emit("close")}function nj(){!this.destroyed&&this._writableState.finished&&this.destroy()}function Y6(i){this.removeListener("error",Y6),this.destroy(),this.listenerCount("error")===0&&this.emit("error",i)}function rj(i,u){let f=!0;function c(){f&&i._socket.resume()}i.readyState===i.CONNECTING?i.once("open",function(){i._receiver.removeAllListeners("drain"),i._receiver.on("drain",c)}):(i._receiver.removeAllListeners("drain"),i._receiver.on("drain",c));let g=new tj(zn(dt({},u),{autoDestroy:!1,emitClose:!1,objectMode:!1,writableObjectMode:!1}));return i.on("message",function(C){g.push(C)||(f=!1,i._socket.pause())}),i.once("error",function(C){g.destroyed||g.destroy(C)}),i.once("close",function(){g.destroyed||g.push(null)}),g._destroy=function(t,C){if(i.readyState===i.CLOSED){C(t),process.nextTick(V6,g);return}let A=!1;i.once("error",function(D){A=!0,C(D)}),i.once("close",function(){A||C(t),process.nextTick(V6,g)}),i.terminate()},g._final=function(t){if(i.readyState===i.CONNECTING){i.once("open",function(){g._final(t)});return}i._socket!==null&&(i._socket._writableState.finished?(t(),g._readableState.endEmitted&&g.destroy()):(i._socket.once("finish",function(){t()}),i.close()))},g._read=function(){i.readyState===i.OPEN&&!f&&(f=!0,i._receiver._writableState.needDrain||i._socket.resume())},g._write=function(t,C,A){if(i.readyState===i.CONNECTING){i.once("open",function(){g._write(t,C,A)});return}i.send(t,A)},g.on("end",nj),g.on("error",Y6),g}G6.exports=rj});var J6=Me((Vb,K6)=>{"use strict";var ij=require("events"),{createHash:oj}=require("crypto"),{createServer:uj,STATUS_CODES:d3}=require("http"),gc=w2(),sj=a3(),{format:lj,parse:fj}=u3(),{GUID:cj,kWebSocket:aj}=mc(),dj=/^[+/0-9A-Za-z]{22}==$/,X6=class extends ij{constructor(u,f){super();if(u=dt({maxPayload:100*1024*1024,perMessageDeflate:!1,handleProtocols:null,clientTracking:!0,verifyClient:null,noServer:!1,backlog:null,server:null,host:null,path:null,port:null},u),u.port==null&&!u.server&&!u.noServer)throw new TypeError('One of the "port", "server", or "noServer" options must be specified');if(u.port!=null?(this._server=uj((c,g)=>{let t=d3[426];g.writeHead(426,{"Content-Length":t.length,"Content-Type":"text/plain"}),g.end(t)}),this._server.listen(u.port,u.host,u.backlog,f)):u.server&&(this._server=u.server),this._server){let c=this.emit.bind(this,"connection");this._removeListeners=pj(this._server,{listening:this.emit.bind(this,"listening"),error:this.emit.bind(this,"error"),upgrade:(g,t,C)=>{this.handleUpgrade(g,t,C,c)}})}u.perMessageDeflate===!0&&(u.perMessageDeflate={}),u.clientTracking&&(this.clients=new Set),this.options=u}address(){if(this.options.noServer)throw new Error('The server is operating in "noServer" mode');return this._server?this._server.address():null}close(u){if(u&&this.once("close",u),this.clients)for(let c of this.clients)c.terminate();let f=this._server;if(f&&(this._removeListeners(),this._removeListeners=this._server=null,this.options.port!=null)){f.close(()=>this.emit("close"));return}process.nextTick(hj,this)}shouldHandle(u){if(this.options.path){let f=u.url.indexOf("?");if((f!==-1?u.url.slice(0,f):u.url)!==this.options.path)return!1}return!0}handleUpgrade(u,f,c,g){f.on("error",p3);let t=u.headers["sec-websocket-key"]!==void 0?u.headers["sec-websocket-key"].trim():!1,C=+u.headers["sec-websocket-version"],A={};if(u.method!=="GET"||u.headers.upgrade.toLowerCase()!=="websocket"||!t||!dj.test(t)||C!==8&&C!==13||!this.shouldHandle(u))return Hh(f,400);if(this.options.perMessageDeflate){let x=new gc(this.options.perMessageDeflate,!0,this.options.maxPayload);try{let D=fj(u.headers["sec-websocket-extensions"]);D[gc.extensionName]&&(x.accept(D[gc.extensionName]),A[gc.extensionName]=x)}catch(D){return Hh(f,400)}}if(this.options.verifyClient){let x={origin:u.headers[`${C===8?"sec-websocket-origin":"origin"}`],secure:!!(u.socket.authorized||u.socket.encrypted),req:u};if(this.options.verifyClient.length===2){this.options.verifyClient(x,(D,L,N,j)=>{if(!D)return Hh(f,L||401,N,j);this.completeUpgrade(t,A,u,f,c,g)});return}if(!this.options.verifyClient(x))return Hh(f,401)}this.completeUpgrade(t,A,u,f,c,g)}completeUpgrade(u,f,c,g,t,C){if(!g.readable||!g.writable)return g.destroy();if(g[aj])throw new Error("server.handleUpgrade() was called more than once with the same socket, possibly due to a misconfiguration");let A=oj("sha1").update(u+cj).digest("base64"),x=["HTTP/1.1 101 Switching Protocols","Upgrade: websocket","Connection: Upgrade",`Sec-WebSocket-Accept: ${A}`],D=new sj(null),L=c.headers["sec-websocket-protocol"];if(L&&(L=L.split(",").map(mj),this.options.handleProtocols?L=this.options.handleProtocols(L,c):L=L[0],L&&(x.push(`Sec-WebSocket-Protocol: ${L}`),D._protocol=L)),f[gc.extensionName]){let N=f[gc.extensionName].params,j=lj({[gc.extensionName]:[N]});x.push(`Sec-WebSocket-Extensions: ${j}`),D._extensions=f}this.emit("headers",x,c),g.write(x.concat(`\r -`).join(`\r -`)),g.removeListener("error",p3),D.setSocket(g,t,this.options.maxPayload),this.clients&&(this.clients.add(D),D.on("close",()=>this.clients.delete(D))),C(D,c)}};K6.exports=X6;function pj(i,u){for(let f of Object.keys(u))i.on(f,u[f]);return function(){for(let c of Object.keys(u))i.removeListener(c,u[c])}}function hj(i){i.emit("close")}function p3(){this.destroy()}function Hh(i,u,f,c){i.writable&&(f=f||d3[u],c=dt({Connection:"close","Content-Type":"text/html","Content-Length":Buffer.byteLength(f)},c),i.write(`HTTP/1.1 ${u} ${d3[u]}\r -`+Object.keys(c).map(g=>`${g}: ${c[g]}`).join(`\r -`)+`\r -\r -`+f)),i.removeListener("error",p3),i.destroy()}function mj(i){return i.trim()}});var Z6=Me((Yb,Q6)=>{"use strict";var C2=a3();C2.createWebSocketStream=$6();C2.Server=J6();C2.Receiver=i3();C2.Sender=o3();Q6.exports=C2});var eS=Me(bh=>{"use strict";var vj=bh&&bh.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(bh,"__esModule",{value:!0});var gj=vj(Z6()),T2=global;T2.WebSocket||(T2.WebSocket=gj.default);T2.window||(T2.window=global);T2.window.__REACT_DEVTOOLS_COMPONENT_FILTERS__=[{type:1,value:7,isEnabled:!0},{type:2,value:"InternalApp",isEnabled:!0,isValid:!0},{type:2,value:"InternalAppContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalStdoutContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalStderrContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalStdinContext",isEnabled:!0,isValid:!0},{type:2,value:"InternalFocusContext",isEnabled:!0,isValid:!0}]});var tS=Me((Gh,h3)=>{(function(i,u){typeof Gh=="object"&&typeof h3=="object"?h3.exports=u():typeof define=="function"&&define.amd?define([],u):typeof Gh=="object"?Gh.ReactDevToolsBackend=u():i.ReactDevToolsBackend=u()})(window,function(){return function(i){var u={};function f(c){if(u[c])return u[c].exports;var g=u[c]={i:c,l:!1,exports:{}};return i[c].call(g.exports,g,g.exports,f),g.l=!0,g.exports}return f.m=i,f.c=u,f.d=function(c,g,t){f.o(c,g)||Object.defineProperty(c,g,{enumerable:!0,get:t})},f.r=function(c){typeof Symbol!="undefined"&&Symbol.toStringTag&&Object.defineProperty(c,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(c,"__esModule",{value:!0})},f.t=function(c,g){if(1&g&&(c=f(c)),8&g||4&g&&typeof c=="object"&&c&&c.__esModule)return c;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:c}),2&g&&typeof c!="string")for(var C in c)f.d(t,C,function(A){return c[A]}.bind(null,C));return t},f.n=function(c){var g=c&&c.__esModule?function(){return c.default}:function(){return c};return f.d(g,"a",g),g},f.o=function(c,g){return Object.prototype.hasOwnProperty.call(c,g)},f.p="",f(f.s=20)}([function(i,u,f){"use strict";i.exports=f(12)},function(i,u,f){"use strict";var c=Object.getOwnPropertySymbols,g=Object.prototype.hasOwnProperty,t=Object.prototype.propertyIsEnumerable;function C(A){if(A==null)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(A)}i.exports=function(){try{if(!Object.assign)return!1;var A=new String("abc");if(A[5]="de",Object.getOwnPropertyNames(A)[0]==="5")return!1;for(var x={},D=0;D<10;D++)x["_"+String.fromCharCode(D)]=D;if(Object.getOwnPropertyNames(x).map(function(N){return x[N]}).join("")!=="0123456789")return!1;var L={};return"abcdefghijklmnopqrst".split("").forEach(function(N){L[N]=N}),Object.keys(Object.assign({},L)).join("")==="abcdefghijklmnopqrst"}catch(N){return!1}}()?Object.assign:function(A,x){for(var D,L,N=C(A),j=1;j=J||Ft<0||Nt&&it-At>=ot}function Z(){var it=ce();if(ge(it))return Ae(it);Ue=setTimeout(Z,function(Ft){var jt=J-(Ft-be);return Nt?re(jt,ot-(Ft-At)):jt}(it))}function Ae(it){return Ue=void 0,Je&&Oe?V(it):(Oe=Le=void 0,ct)}function at(){var it=ce(),Ft=ge(it);if(Oe=arguments,Le=this,be=it,Ft){if(Ue===void 0)return ne(be);if(Nt)return Ue=setTimeout(Z,J),V(be)}return Ue===void 0&&(Ue=setTimeout(Z,J)),ct}return J=me(J)||0,oe(Te)&&(Ot=!!Te.leading,ot=(Nt="maxWait"in Te)?h(me(Te.maxWait)||0,J):ot,Je="trailing"in Te?!!Te.trailing:Je),at.cancel=function(){Ue!==void 0&&clearTimeout(Ue),At=0,Oe=be=Le=Ue=void 0},at.flush=function(){return Ue===void 0?ct:Ae(ce())},at}function oe(De){var J=g(De);return!!De&&(J=="object"||J=="function")}function Se(De){return g(De)=="symbol"||function(J){return!!J&&g(J)=="object"}(De)&&$.call(De)=="[object Symbol]"}function me(De){if(typeof De=="number")return De;if(Se(De))return NaN;if(oe(De)){var J=typeof De.valueOf=="function"?De.valueOf():De;De=oe(J)?J+"":J}if(typeof De!="string")return De===0?De:+De;De=De.replace(t,"");var Te=A.test(De);return Te||x.test(De)?D(De.slice(2),Te?2:8):C.test(De)?NaN:+De}i.exports=function(De,J,Te){var Oe=!0,Le=!0;if(typeof De!="function")throw new TypeError("Expected a function");return oe(Te)&&(Oe="leading"in Te?!!Te.leading:Oe,Le="trailing"in Te?!!Te.trailing:Le),Q(De,J,{leading:Oe,maxWait:J,trailing:Le})}}).call(this,f(4))},function(i,u,f){(function(c){function g(V){return(g=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(ne){return typeof ne}:function(ne){return ne&&typeof Symbol=="function"&&ne.constructor===Symbol&&ne!==Symbol.prototype?"symbol":typeof ne})(V)}var t;u=i.exports=h,t=(c===void 0?"undefined":g(c))==="object"&&c.env&&c.env.NODE_DEBUG&&/\bsemver\b/i.test(c.env.NODE_DEBUG)?function(){var V=Array.prototype.slice.call(arguments,0);V.unshift("SEMVER"),console.log.apply(console,V)}:function(){},u.SEMVER_SPEC_VERSION="2.0.0";var C=Number.MAX_SAFE_INTEGER||9007199254740991,A=u.re=[],x=u.src=[],D=u.tokens={},L=0;function N(V){D[V]=L++}N("NUMERICIDENTIFIER"),x[D.NUMERICIDENTIFIER]="0|[1-9]\\d*",N("NUMERICIDENTIFIERLOOSE"),x[D.NUMERICIDENTIFIERLOOSE]="[0-9]+",N("NONNUMERICIDENTIFIER"),x[D.NONNUMERICIDENTIFIER]="\\d*[a-zA-Z-][a-zA-Z0-9-]*",N("MAINVERSION"),x[D.MAINVERSION]="("+x[D.NUMERICIDENTIFIER]+")\\.("+x[D.NUMERICIDENTIFIER]+")\\.("+x[D.NUMERICIDENTIFIER]+")",N("MAINVERSIONLOOSE"),x[D.MAINVERSIONLOOSE]="("+x[D.NUMERICIDENTIFIERLOOSE]+")\\.("+x[D.NUMERICIDENTIFIERLOOSE]+")\\.("+x[D.NUMERICIDENTIFIERLOOSE]+")",N("PRERELEASEIDENTIFIER"),x[D.PRERELEASEIDENTIFIER]="(?:"+x[D.NUMERICIDENTIFIER]+"|"+x[D.NONNUMERICIDENTIFIER]+")",N("PRERELEASEIDENTIFIERLOOSE"),x[D.PRERELEASEIDENTIFIERLOOSE]="(?:"+x[D.NUMERICIDENTIFIERLOOSE]+"|"+x[D.NONNUMERICIDENTIFIER]+")",N("PRERELEASE"),x[D.PRERELEASE]="(?:-("+x[D.PRERELEASEIDENTIFIER]+"(?:\\."+x[D.PRERELEASEIDENTIFIER]+")*))",N("PRERELEASELOOSE"),x[D.PRERELEASELOOSE]="(?:-?("+x[D.PRERELEASEIDENTIFIERLOOSE]+"(?:\\."+x[D.PRERELEASEIDENTIFIERLOOSE]+")*))",N("BUILDIDENTIFIER"),x[D.BUILDIDENTIFIER]="[0-9A-Za-z-]+",N("BUILD"),x[D.BUILD]="(?:\\+("+x[D.BUILDIDENTIFIER]+"(?:\\."+x[D.BUILDIDENTIFIER]+")*))",N("FULL"),N("FULLPLAIN"),x[D.FULLPLAIN]="v?"+x[D.MAINVERSION]+x[D.PRERELEASE]+"?"+x[D.BUILD]+"?",x[D.FULL]="^"+x[D.FULLPLAIN]+"$",N("LOOSEPLAIN"),x[D.LOOSEPLAIN]="[v=\\s]*"+x[D.MAINVERSIONLOOSE]+x[D.PRERELEASELOOSE]+"?"+x[D.BUILD]+"?",N("LOOSE"),x[D.LOOSE]="^"+x[D.LOOSEPLAIN]+"$",N("GTLT"),x[D.GTLT]="((?:<|>)?=?)",N("XRANGEIDENTIFIERLOOSE"),x[D.XRANGEIDENTIFIERLOOSE]=x[D.NUMERICIDENTIFIERLOOSE]+"|x|X|\\*",N("XRANGEIDENTIFIER"),x[D.XRANGEIDENTIFIER]=x[D.NUMERICIDENTIFIER]+"|x|X|\\*",N("XRANGEPLAIN"),x[D.XRANGEPLAIN]="[v=\\s]*("+x[D.XRANGEIDENTIFIER]+")(?:\\.("+x[D.XRANGEIDENTIFIER]+")(?:\\.("+x[D.XRANGEIDENTIFIER]+")(?:"+x[D.PRERELEASE]+")?"+x[D.BUILD]+"?)?)?",N("XRANGEPLAINLOOSE"),x[D.XRANGEPLAINLOOSE]="[v=\\s]*("+x[D.XRANGEIDENTIFIERLOOSE]+")(?:\\.("+x[D.XRANGEIDENTIFIERLOOSE]+")(?:\\.("+x[D.XRANGEIDENTIFIERLOOSE]+")(?:"+x[D.PRERELEASELOOSE]+")?"+x[D.BUILD]+"?)?)?",N("XRANGE"),x[D.XRANGE]="^"+x[D.GTLT]+"\\s*"+x[D.XRANGEPLAIN]+"$",N("XRANGELOOSE"),x[D.XRANGELOOSE]="^"+x[D.GTLT]+"\\s*"+x[D.XRANGEPLAINLOOSE]+"$",N("COERCE"),x[D.COERCE]="(^|[^\\d])(\\d{1,16})(?:\\.(\\d{1,16}))?(?:\\.(\\d{1,16}))?(?:$|[^\\d])",N("COERCERTL"),A[D.COERCERTL]=new RegExp(x[D.COERCE],"g"),N("LONETILDE"),x[D.LONETILDE]="(?:~>?)",N("TILDETRIM"),x[D.TILDETRIM]="(\\s*)"+x[D.LONETILDE]+"\\s+",A[D.TILDETRIM]=new RegExp(x[D.TILDETRIM],"g"),N("TILDE"),x[D.TILDE]="^"+x[D.LONETILDE]+x[D.XRANGEPLAIN]+"$",N("TILDELOOSE"),x[D.TILDELOOSE]="^"+x[D.LONETILDE]+x[D.XRANGEPLAINLOOSE]+"$",N("LONECARET"),x[D.LONECARET]="(?:\\^)",N("CARETTRIM"),x[D.CARETTRIM]="(\\s*)"+x[D.LONECARET]+"\\s+",A[D.CARETTRIM]=new RegExp(x[D.CARETTRIM],"g"),N("CARET"),x[D.CARET]="^"+x[D.LONECARET]+x[D.XRANGEPLAIN]+"$",N("CARETLOOSE"),x[D.CARETLOOSE]="^"+x[D.LONECARET]+x[D.XRANGEPLAINLOOSE]+"$",N("COMPARATORLOOSE"),x[D.COMPARATORLOOSE]="^"+x[D.GTLT]+"\\s*("+x[D.LOOSEPLAIN]+")$|^$",N("COMPARATOR"),x[D.COMPARATOR]="^"+x[D.GTLT]+"\\s*("+x[D.FULLPLAIN]+")$|^$",N("COMPARATORTRIM"),x[D.COMPARATORTRIM]="(\\s*)"+x[D.GTLT]+"\\s*("+x[D.LOOSEPLAIN]+"|"+x[D.XRANGEPLAIN]+")",A[D.COMPARATORTRIM]=new RegExp(x[D.COMPARATORTRIM],"g"),N("HYPHENRANGE"),x[D.HYPHENRANGE]="^\\s*("+x[D.XRANGEPLAIN]+")\\s+-\\s+("+x[D.XRANGEPLAIN]+")\\s*$",N("HYPHENRANGELOOSE"),x[D.HYPHENRANGELOOSE]="^\\s*("+x[D.XRANGEPLAINLOOSE]+")\\s+-\\s+("+x[D.XRANGEPLAINLOOSE]+")\\s*$",N("STAR"),x[D.STAR]="(<|>)?=?\\s*\\*";for(var j=0;j256||!(ne.loose?A[D.LOOSE]:A[D.FULL]).test(V))return null;try{return new h(V,ne)}catch(ge){return null}}function h(V,ne){if(ne&&g(ne)==="object"||(ne={loose:!!ne,includePrerelease:!1}),V instanceof h){if(V.loose===ne.loose)return V;V=V.version}else if(typeof V!="string")throw new TypeError("Invalid Version: "+V);if(V.length>256)throw new TypeError("version is longer than 256 characters");if(!(this instanceof h))return new h(V,ne);t("SemVer",V,ne),this.options=ne,this.loose=!!ne.loose;var ge=V.trim().match(ne.loose?A[D.LOOSE]:A[D.FULL]);if(!ge)throw new TypeError("Invalid Version: "+V);if(this.raw=V,this.major=+ge[1],this.minor=+ge[2],this.patch=+ge[3],this.major>C||this.major<0)throw new TypeError("Invalid major version");if(this.minor>C||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>C||this.patch<0)throw new TypeError("Invalid patch version");ge[4]?this.prerelease=ge[4].split(".").map(function(Z){if(/^[0-9]+$/.test(Z)){var Ae=+Z;if(Ae>=0&&Ae=0;)typeof this.prerelease[ge]=="number"&&(this.prerelease[ge]++,ge=-2);ge===-1&&this.prerelease.push(0)}ne&&(this.prerelease[0]===ne?isNaN(this.prerelease[1])&&(this.prerelease=[ne,0]):this.prerelease=[ne,0]);break;default:throw new Error("invalid increment argument: "+V)}return this.format(),this.raw=this.version,this},u.inc=function(V,ne,ge,Z){typeof ge=="string"&&(Z=ge,ge=void 0);try{return new h(V,ge).inc(ne,Z).version}catch(Ae){return null}},u.diff=function(V,ne){if(me(V,ne))return null;var ge=$(V),Z=$(ne),Ae="";if(ge.prerelease.length||Z.prerelease.length){Ae="pre";var at="prerelease"}for(var it in ge)if((it==="major"||it==="minor"||it==="patch")&&ge[it]!==Z[it])return Ae+it;return at},u.compareIdentifiers=ce;var re=/^[0-9]+$/;function ce(V,ne){var ge=re.test(V),Z=re.test(ne);return ge&&Z&&(V=+V,ne=+ne),V===ne?0:ge&&!Z?-1:Z&&!ge?1:V0}function Se(V,ne,ge){return Q(V,ne,ge)<0}function me(V,ne,ge){return Q(V,ne,ge)===0}function De(V,ne,ge){return Q(V,ne,ge)!==0}function J(V,ne,ge){return Q(V,ne,ge)>=0}function Te(V,ne,ge){return Q(V,ne,ge)<=0}function Oe(V,ne,ge,Z){switch(ne){case"===":return g(V)==="object"&&(V=V.version),g(ge)==="object"&&(ge=ge.version),V===ge;case"!==":return g(V)==="object"&&(V=V.version),g(ge)==="object"&&(ge=ge.version),V!==ge;case"":case"=":case"==":return me(V,ge,Z);case"!=":return De(V,ge,Z);case">":return oe(V,ge,Z);case">=":return J(V,ge,Z);case"<":return Se(V,ge,Z);case"<=":return Te(V,ge,Z);default:throw new TypeError("Invalid operator: "+ne)}}function Le(V,ne){if(ne&&g(ne)==="object"||(ne={loose:!!ne,includePrerelease:!1}),V instanceof Le){if(V.loose===!!ne.loose)return V;V=V.value}if(!(this instanceof Le))return new Le(V,ne);t("comparator",V,ne),this.options=ne,this.loose=!!ne.loose,this.parse(V),this.semver===ot?this.value="":this.value=this.operator+this.semver.version,t("comp",this)}u.rcompareIdentifiers=function(V,ne){return ce(ne,V)},u.major=function(V,ne){return new h(V,ne).major},u.minor=function(V,ne){return new h(V,ne).minor},u.patch=function(V,ne){return new h(V,ne).patch},u.compare=Q,u.compareLoose=function(V,ne){return Q(V,ne,!0)},u.compareBuild=function(V,ne,ge){var Z=new h(V,ge),Ae=new h(ne,ge);return Z.compare(Ae)||Z.compareBuild(Ae)},u.rcompare=function(V,ne,ge){return Q(ne,V,ge)},u.sort=function(V,ne){return V.sort(function(ge,Z){return u.compareBuild(ge,Z,ne)})},u.rsort=function(V,ne){return V.sort(function(ge,Z){return u.compareBuild(Z,ge,ne)})},u.gt=oe,u.lt=Se,u.eq=me,u.neq=De,u.gte=J,u.lte=Te,u.cmp=Oe,u.Comparator=Le;var ot={};function ct(V,ne){if(ne&&g(ne)==="object"||(ne={loose:!!ne,includePrerelease:!1}),V instanceof ct)return V.loose===!!ne.loose&&V.includePrerelease===!!ne.includePrerelease?V:new ct(V.raw,ne);if(V instanceof Le)return new ct(V.value,ne);if(!(this instanceof ct))return new ct(V,ne);if(this.options=ne,this.loose=!!ne.loose,this.includePrerelease=!!ne.includePrerelease,this.raw=V,this.set=V.split(/\s*\|\|\s*/).map(function(ge){return this.parseRange(ge.trim())},this).filter(function(ge){return ge.length}),!this.set.length)throw new TypeError("Invalid SemVer Range: "+V);this.format()}function Ue(V,ne){for(var ge=!0,Z=V.slice(),Ae=Z.pop();ge&&Z.length;)ge=Z.every(function(at){return Ae.intersects(at,ne)}),Ae=Z.pop();return ge}function be(V){return!V||V.toLowerCase()==="x"||V==="*"}function At(V,ne,ge,Z,Ae,at,it,Ft,jt,hn,Un,Jt,Yt){return((ne=be(ge)?"":be(Z)?">="+ge+".0.0":be(Ae)?">="+ge+"."+Z+".0":">="+ne)+" "+(Ft=be(jt)?"":be(hn)?"<"+(+jt+1)+".0.0":be(Un)?"<"+jt+"."+(+hn+1)+".0":Jt?"<="+jt+"."+hn+"."+Un+"-"+Jt:"<="+Ft)).trim()}function Ot(V,ne,ge){for(var Z=0;Z0){var Ae=V[Z].semver;if(Ae.major===ne.major&&Ae.minor===ne.minor&&Ae.patch===ne.patch)return!0}return!1}return!0}function Nt(V,ne,ge){try{ne=new ct(ne,ge)}catch(Z){return!1}return ne.test(V)}function Je(V,ne,ge,Z){var Ae,at,it,Ft,jt;switch(V=new h(V,Z),ne=new ct(ne,Z),ge){case">":Ae=oe,at=Te,it=Se,Ft=">",jt=">=";break;case"<":Ae=Se,at=J,it=oe,Ft="<",jt="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(Nt(V,ne,Z))return!1;for(var hn=0;hn=0.0.0")),Jt=Jt||cr,Yt=Yt||cr,Ae(cr.semver,Jt.semver,Z)?Jt=cr:it(cr.semver,Yt.semver,Z)&&(Yt=cr)}),Jt.operator===Ft||Jt.operator===jt||(!Yt.operator||Yt.operator===Ft)&&at(V,Yt.semver)||Yt.operator===jt&&it(V,Yt.semver))return!1}return!0}Le.prototype.parse=function(V){var ne=this.options.loose?A[D.COMPARATORLOOSE]:A[D.COMPARATOR],ge=V.match(ne);if(!ge)throw new TypeError("Invalid comparator: "+V);this.operator=ge[1]!==void 0?ge[1]:"",this.operator==="="&&(this.operator=""),ge[2]?this.semver=new h(ge[2],this.options.loose):this.semver=ot},Le.prototype.toString=function(){return this.value},Le.prototype.test=function(V){if(t("Comparator.test",V,this.options.loose),this.semver===ot||V===ot)return!0;if(typeof V=="string")try{V=new h(V,this.options)}catch(ne){return!1}return Oe(V,this.operator,this.semver,this.options)},Le.prototype.intersects=function(V,ne){if(!(V instanceof Le))throw new TypeError("a Comparator is required");var ge;if(ne&&g(ne)==="object"||(ne={loose:!!ne,includePrerelease:!1}),this.operator==="")return this.value===""||(ge=new ct(V.value,ne),Nt(this.value,ge,ne));if(V.operator==="")return V.value===""||(ge=new ct(this.value,ne),Nt(V.semver,ge,ne));var Z=!(this.operator!==">="&&this.operator!==">"||V.operator!==">="&&V.operator!==">"),Ae=!(this.operator!=="<="&&this.operator!=="<"||V.operator!=="<="&&V.operator!=="<"),at=this.semver.version===V.semver.version,it=!(this.operator!==">="&&this.operator!=="<="||V.operator!==">="&&V.operator!=="<="),Ft=Oe(this.semver,"<",V.semver,ne)&&(this.operator===">="||this.operator===">")&&(V.operator==="<="||V.operator==="<"),jt=Oe(this.semver,">",V.semver,ne)&&(this.operator==="<="||this.operator==="<")&&(V.operator===">="||V.operator===">");return Z||Ae||at&&it||Ft||jt},u.Range=ct,ct.prototype.format=function(){return this.range=this.set.map(function(V){return V.join(" ").trim()}).join("||").trim(),this.range},ct.prototype.toString=function(){return this.range},ct.prototype.parseRange=function(V){var ne=this.options.loose;V=V.trim();var ge=ne?A[D.HYPHENRANGELOOSE]:A[D.HYPHENRANGE];V=V.replace(ge,At),t("hyphen replace",V),V=V.replace(A[D.COMPARATORTRIM],"$1$2$3"),t("comparator trim",V,A[D.COMPARATORTRIM]),V=(V=(V=V.replace(A[D.TILDETRIM],"$1~")).replace(A[D.CARETTRIM],"$1^")).split(/\s+/).join(" ");var Z=ne?A[D.COMPARATORLOOSE]:A[D.COMPARATOR],Ae=V.split(" ").map(function(at){return function(it,Ft){return t("comp",it,Ft),it=function(jt,hn){return jt.trim().split(/\s+/).map(function(Un){return function(Jt,Yt){t("caret",Jt,Yt);var cr=Yt.loose?A[D.CARETLOOSE]:A[D.CARET];return Jt.replace(cr,function(w,pt,Mn,Bn,Xn){var vr;return t("caret",Jt,w,pt,Mn,Bn,Xn),be(pt)?vr="":be(Mn)?vr=">="+pt+".0.0 <"+(+pt+1)+".0.0":be(Bn)?vr=pt==="0"?">="+pt+"."+Mn+".0 <"+pt+"."+(+Mn+1)+".0":">="+pt+"."+Mn+".0 <"+(+pt+1)+".0.0":Xn?(t("replaceCaret pr",Xn),vr=pt==="0"?Mn==="0"?">="+pt+"."+Mn+"."+Bn+"-"+Xn+" <"+pt+"."+Mn+"."+(+Bn+1):">="+pt+"."+Mn+"."+Bn+"-"+Xn+" <"+pt+"."+(+Mn+1)+".0":">="+pt+"."+Mn+"."+Bn+"-"+Xn+" <"+(+pt+1)+".0.0"):(t("no pr"),vr=pt==="0"?Mn==="0"?">="+pt+"."+Mn+"."+Bn+" <"+pt+"."+Mn+"."+(+Bn+1):">="+pt+"."+Mn+"."+Bn+" <"+pt+"."+(+Mn+1)+".0":">="+pt+"."+Mn+"."+Bn+" <"+(+pt+1)+".0.0"),t("caret return",vr),vr})}(Un,hn)}).join(" ")}(it,Ft),t("caret",it),it=function(jt,hn){return jt.trim().split(/\s+/).map(function(Un){return function(Jt,Yt){var cr=Yt.loose?A[D.TILDELOOSE]:A[D.TILDE];return Jt.replace(cr,function(w,pt,Mn,Bn,Xn){var vr;return t("tilde",Jt,w,pt,Mn,Bn,Xn),be(pt)?vr="":be(Mn)?vr=">="+pt+".0.0 <"+(+pt+1)+".0.0":be(Bn)?vr=">="+pt+"."+Mn+".0 <"+pt+"."+(+Mn+1)+".0":Xn?(t("replaceTilde pr",Xn),vr=">="+pt+"."+Mn+"."+Bn+"-"+Xn+" <"+pt+"."+(+Mn+1)+".0"):vr=">="+pt+"."+Mn+"."+Bn+" <"+pt+"."+(+Mn+1)+".0",t("tilde return",vr),vr})}(Un,hn)}).join(" ")}(it,Ft),t("tildes",it),it=function(jt,hn){return t("replaceXRanges",jt,hn),jt.split(/\s+/).map(function(Un){return function(Jt,Yt){Jt=Jt.trim();var cr=Yt.loose?A[D.XRANGELOOSE]:A[D.XRANGE];return Jt.replace(cr,function(w,pt,Mn,Bn,Xn,vr){t("xRange",Jt,w,pt,Mn,Bn,Xn,vr);var gr=be(Mn),r0=gr||be(Bn),Ci=r0||be(Xn),yo=Ci;return pt==="="&&yo&&(pt=""),vr=Yt.includePrerelease?"-0":"",gr?w=pt===">"||pt==="<"?"<0.0.0-0":"*":pt&&yo?(r0&&(Bn=0),Xn=0,pt===">"?(pt=">=",r0?(Mn=+Mn+1,Bn=0,Xn=0):(Bn=+Bn+1,Xn=0)):pt==="<="&&(pt="<",r0?Mn=+Mn+1:Bn=+Bn+1),w=pt+Mn+"."+Bn+"."+Xn+vr):r0?w=">="+Mn+".0.0"+vr+" <"+(+Mn+1)+".0.0"+vr:Ci&&(w=">="+Mn+"."+Bn+".0"+vr+" <"+Mn+"."+(+Bn+1)+".0"+vr),t("xRange return",w),w})}(Un,hn)}).join(" ")}(it,Ft),t("xrange",it),it=function(jt,hn){return t("replaceStars",jt,hn),jt.trim().replace(A[D.STAR],"")}(it,Ft),t("stars",it),it}(at,this.options)},this).join(" ").split(/\s+/);return this.options.loose&&(Ae=Ae.filter(function(at){return!!at.match(Z)})),Ae=Ae.map(function(at){return new Le(at,this.options)},this)},ct.prototype.intersects=function(V,ne){if(!(V instanceof ct))throw new TypeError("a Range is required");return this.set.some(function(ge){return Ue(ge,ne)&&V.set.some(function(Z){return Ue(Z,ne)&&ge.every(function(Ae){return Z.every(function(at){return Ae.intersects(at,ne)})})})})},u.toComparators=function(V,ne){return new ct(V,ne).set.map(function(ge){return ge.map(function(Z){return Z.value}).join(" ").trim().split(" ")})},ct.prototype.test=function(V){if(!V)return!1;if(typeof V=="string")try{V=new h(V,this.options)}catch(ge){return!1}for(var ne=0;ne":at.prerelease.length===0?at.patch++:at.prerelease.push(0),at.raw=at.format();case"":case">=":ge&&!oe(ge,at)||(ge=at);break;case"<":case"<=":break;default:throw new Error("Unexpected operation: "+Ae.operator)}});return ge&&V.test(ge)?ge:null},u.validRange=function(V,ne){try{return new ct(V,ne).range||"*"}catch(ge){return null}},u.ltr=function(V,ne,ge){return Je(V,ne,"<",ge)},u.gtr=function(V,ne,ge){return Je(V,ne,">",ge)},u.outside=Je,u.prerelease=function(V,ne){var ge=$(V,ne);return ge&&ge.prerelease.length?ge.prerelease:null},u.intersects=function(V,ne,ge){return V=new ct(V,ge),ne=new ct(ne,ge),V.intersects(ne)},u.coerce=function(V,ne){if(V instanceof h)return V;if(typeof V=="number"&&(V=String(V)),typeof V!="string")return null;var ge=null;if((ne=ne||{}).rtl){for(var Z;(Z=A[D.COERCERTL].exec(V))&&(!ge||ge.index+ge[0].length!==V.length);)ge&&Z.index+Z[0].length===ge.index+ge[0].length||(ge=Z),A[D.COERCERTL].lastIndex=Z.index+Z[1].length+Z[2].length;A[D.COERCERTL].lastIndex=-1}else ge=V.match(A[D.COERCE]);return ge===null?null:$(ge[2]+"."+(ge[3]||"0")+"."+(ge[4]||"0"),ne)}}).call(this,f(5))},function(i,u){function f(g){return(f=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(t){return typeof t}:function(t){return t&&typeof Symbol=="function"&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(g)}var c;c=function(){return this}();try{c=c||new Function("return this")()}catch(g){(typeof window=="undefined"?"undefined":f(window))==="object"&&(c=window)}i.exports=c},function(i,u){var f,c,g=i.exports={};function t(){throw new Error("setTimeout has not been defined")}function C(){throw new Error("clearTimeout has not been defined")}function A(ce){if(f===setTimeout)return setTimeout(ce,0);if((f===t||!f)&&setTimeout)return f=setTimeout,setTimeout(ce,0);try{return f(ce,0)}catch(Q){try{return f.call(null,ce,0)}catch(oe){return f.call(this,ce,0)}}}(function(){try{f=typeof setTimeout=="function"?setTimeout:t}catch(ce){f=t}try{c=typeof clearTimeout=="function"?clearTimeout:C}catch(ce){c=C}})();var x,D=[],L=!1,N=-1;function j(){L&&x&&(L=!1,x.length?D=x.concat(D):N=-1,D.length&&$())}function $(){if(!L){var ce=A(j);L=!0;for(var Q=D.length;Q;){for(x=D,D=[];++N1)for(var oe=1;oethis[C])return De(this,this[h].get(Ue)),!1;var Je=this[h].get(Ue).value;return this[N]&&(this[j]||this[N](Ue,Je.value)),Je.now=Ot,Je.maxAge=At,Je.value=be,this[A]+=Nt-Je.length,Je.length=Nt,this.get(Ue),me(this),!0}var V=new J(Ue,be,Nt,Ot,At);return V.length>this[C]?(this[N]&&this[N](Ue,be),!1):(this[A]+=V.length,this[$].unshift(V),this[h].set(Ue,this[$].head),me(this),!0)}},{key:"has",value:function(Ue){if(!this[h].has(Ue))return!1;var be=this[h].get(Ue).value;return!Se(this,be)}},{key:"get",value:function(Ue){return oe(this,Ue,!0)}},{key:"peek",value:function(Ue){return oe(this,Ue,!1)}},{key:"pop",value:function(){var Ue=this[$].tail;return Ue?(De(this,Ue),Ue.value):null}},{key:"del",value:function(Ue){De(this,this[h].get(Ue))}},{key:"load",value:function(Ue){this.reset();for(var be=Date.now(),At=Ue.length-1;At>=0;At--){var Ot=Ue[At],Nt=Ot.e||0;if(Nt===0)this.set(Ot.k,Ot.v);else{var Je=Nt-be;Je>0&&this.set(Ot.k,Ot.v,Je)}}}},{key:"prune",value:function(){var Ue=this;this[h].forEach(function(be,At){return oe(Ue,At,!1)})}},{key:"max",set:function(Ue){if(typeof Ue!="number"||Ue<0)throw new TypeError("max must be a non-negative number");this[C]=Ue||1/0,me(this)},get:function(){return this[C]}},{key:"allowStale",set:function(Ue){this[D]=!!Ue},get:function(){return this[D]}},{key:"maxAge",set:function(Ue){if(typeof Ue!="number")throw new TypeError("maxAge must be a non-negative number");this[L]=Ue,me(this)},get:function(){return this[L]}},{key:"lengthCalculator",set:function(Ue){var be=this;typeof Ue!="function"&&(Ue=ce),Ue!==this[x]&&(this[x]=Ue,this[A]=0,this[$].forEach(function(At){At.length=be[x](At.value,At.key),be[A]+=At.length})),me(this)},get:function(){return this[x]}},{key:"length",get:function(){return this[A]}},{key:"itemCount",get:function(){return this[$].length}}])&&g(Le.prototype,ot),ct&&g(Le,ct),Oe}(),oe=function(Oe,Le,ot){var ct=Oe[h].get(Le);if(ct){var Ue=ct.value;if(Se(Oe,Ue)){if(De(Oe,ct),!Oe[D])return}else ot&&(Oe[re]&&(ct.value.now=Date.now()),Oe[$].unshiftNode(ct));return Ue.value}},Se=function(Oe,Le){if(!Le||!Le.maxAge&&!Oe[L])return!1;var ot=Date.now()-Le.now;return Le.maxAge?ot>Le.maxAge:Oe[L]&&ot>Oe[L]},me=function(Oe){if(Oe[A]>Oe[C])for(var Le=Oe[$].tail;Oe[A]>Oe[C]&&Le!==null;){var ot=Le.prev;De(Oe,Le),Le=ot}},De=function(Oe,Le){if(Le){var ot=Le.value;Oe[N]&&Oe[N](ot.key,ot.value),Oe[A]-=ot.length,Oe[h].delete(ot.key),Oe[$].removeNode(Le)}},J=function Oe(Le,ot,ct,Ue,be){c(this,Oe),this.key=Le,this.value=ot,this.length=ct,this.now=Ue,this.maxAge=be||0},Te=function(Oe,Le,ot,ct){var Ue=ot.value;Se(Oe,Ue)&&(De(Oe,ot),Oe[D]||(Ue=void 0)),Ue&&Le.call(ct,Ue.value,Ue.key,Oe)};i.exports=Q},function(i,u,f){(function(c){function g(t){return(g=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(C){return typeof C}:function(C){return C&&typeof Symbol=="function"&&C.constructor===Symbol&&C!==Symbol.prototype?"symbol":typeof C})(t)}i.exports=function(){if(typeof document=="undefined"||!document.addEventListener)return null;var t,C,A,x={};return x.copy=function(){var D=!1,L=null,N=!1;function j(){D=!1,L=null,N&&window.getSelection().removeAllRanges(),N=!1}return document.addEventListener("copy",function($){if(D){for(var h in L)$.clipboardData.setData(h,L[h]);$.preventDefault()}}),function($){return new Promise(function(h,re){D=!0,typeof $=="string"?L={"text/plain":$}:$ instanceof Node?L={"text/html":new XMLSerializer().serializeToString($)}:$ instanceof Object?L=$:re("Invalid data type. Must be string, DOM node, or an object mapping MIME types to strings."),function ce(Q){try{if(document.execCommand("copy"))j(),h();else{if(Q)throw j(),new Error("Unable to copy. Perhaps it's not available in your browser?");(function(){var oe=document.getSelection();if(!document.queryCommandEnabled("copy")&&oe.isCollapsed){var Se=document.createRange();Se.selectNodeContents(document.body),oe.removeAllRanges(),oe.addRange(Se),N=!0}})(),ce(!0)}}catch(oe){j(),re(oe)}}(!1)})}}(),x.paste=(A=!1,document.addEventListener("paste",function(D){if(A){A=!1,D.preventDefault();var L=t;t=null,L(D.clipboardData.getData(C))}}),function(D){return new Promise(function(L,N){A=!0,t=L,C=D||"text/plain";try{document.execCommand("paste")||(A=!1,N(new Error("Unable to paste. Pasting only works in Internet Explorer at the moment.")))}catch(j){A=!1,N(new Error(j))}})}),typeof ClipboardEvent=="undefined"&&window.clipboardData!==void 0&&window.clipboardData.setData!==void 0&&(function(D){function L(me,De){return function(){me.apply(De,arguments)}}function N(me){if(g(this)!="object")throw new TypeError("Promises must be constructed via new");if(typeof me!="function")throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],Q(me,L($,this),L(h,this))}function j(me){var De=this;return this._state===null?void this._deferreds.push(me):void oe(function(){var J=De._state?me.onFulfilled:me.onRejected;if(J!==null){var Te;try{Te=J(De._value)}catch(Oe){return void me.reject(Oe)}me.resolve(Te)}else(De._state?me.resolve:me.reject)(De._value)})}function $(me){try{if(me===this)throw new TypeError("A promise cannot be resolved with itself.");if(me&&(g(me)=="object"||typeof me=="function")){var De=me.then;if(typeof De=="function")return void Q(L(De,me),L($,this),L(h,this))}this._state=!0,this._value=me,re.call(this)}catch(J){h.call(this,J)}}function h(me){this._state=!1,this._value=me,re.call(this)}function re(){for(var me=0,De=this._deferreds.length;De>me;me++)j.call(this,this._deferreds[me]);this._deferreds=null}function ce(me,De,J,Te){this.onFulfilled=typeof me=="function"?me:null,this.onRejected=typeof De=="function"?De:null,this.resolve=J,this.reject=Te}function Q(me,De,J){var Te=!1;try{me(function(Oe){Te||(Te=!0,De(Oe))},function(Oe){Te||(Te=!0,J(Oe))})}catch(Oe){if(Te)return;Te=!0,J(Oe)}}var oe=N.immediateFn||typeof c=="function"&&c||function(me){setTimeout(me,1)},Se=Array.isArray||function(me){return Object.prototype.toString.call(me)==="[object Array]"};N.prototype.catch=function(me){return this.then(null,me)},N.prototype.then=function(me,De){var J=this;return new N(function(Te,Oe){j.call(J,new ce(me,De,Te,Oe))})},N.all=function(){var me=Array.prototype.slice.call(arguments.length===1&&Se(arguments[0])?arguments[0]:arguments);return new N(function(De,J){function Te(ot,ct){try{if(ct&&(g(ct)=="object"||typeof ct=="function")){var Ue=ct.then;if(typeof Ue=="function")return void Ue.call(ct,function(be){Te(ot,be)},J)}me[ot]=ct,--Oe==0&&De(me)}catch(be){J(be)}}if(me.length===0)return De([]);for(var Oe=me.length,Le=0;LeTe;Te++)me[Te].then(De,J)})},i.exports?i.exports=N:D.Promise||(D.Promise=N)}(this),x.copy=function(D){return new Promise(function(L,N){if(typeof D!="string"&&!("text/plain"in D))throw new Error("You must provide a text/plain type.");var j=typeof D=="string"?D:D["text/plain"];window.clipboardData.setData("Text",j)?L():N(new Error("Copying was rejected."))})},x.paste=function(){return new Promise(function(D,L){var N=window.clipboardData.getData("Text");N?D(N):L(new Error("Pasting was rejected."))})}),x}()}).call(this,f(13).setImmediate)},function(i,u,f){"use strict";i.exports=f(15)},function(i,u,f){"use strict";f.r(u),u.default=`:root { - /** - * IMPORTANT: When new theme variables are added below\u2013 also add them to SettingsContext updateThemeVariables() - */ - - /* Light theme */ - --light-color-attribute-name: #ef6632; - --light-color-attribute-name-not-editable: #23272f; - --light-color-attribute-name-inverted: rgba(255, 255, 255, 0.7); - --light-color-attribute-value: #1a1aa6; - --light-color-attribute-value-inverted: #ffffff; - --light-color-attribute-editable-value: #1a1aa6; - --light-color-background: #ffffff; - --light-color-background-hover: rgba(0, 136, 250, 0.1); - --light-color-background-inactive: #e5e5e5; - --light-color-background-invalid: #fff0f0; - --light-color-background-selected: #0088fa; - --light-color-button-background: #ffffff; - --light-color-button-background-focus: #ededed; - --light-color-button: #5f6673; - --light-color-button-disabled: #cfd1d5; - --light-color-button-active: #0088fa; - --light-color-button-focus: #23272f; - --light-color-button-hover: #23272f; - --light-color-border: #eeeeee; - --light-color-commit-did-not-render-fill: #cfd1d5; - --light-color-commit-did-not-render-fill-text: #000000; - --light-color-commit-did-not-render-pattern: #cfd1d5; - --light-color-commit-did-not-render-pattern-text: #333333; - --light-color-commit-gradient-0: #37afa9; - --light-color-commit-gradient-1: #63b19e; - --light-color-commit-gradient-2: #80b393; - --light-color-commit-gradient-3: #97b488; - --light-color-commit-gradient-4: #abb67d; - --light-color-commit-gradient-5: #beb771; - --light-color-commit-gradient-6: #cfb965; - --light-color-commit-gradient-7: #dfba57; - --light-color-commit-gradient-8: #efbb49; - --light-color-commit-gradient-9: #febc38; - --light-color-commit-gradient-text: #000000; - --light-color-component-name: #6a51b2; - --light-color-component-name-inverted: #ffffff; - --light-color-component-badge-background: rgba(0, 0, 0, 0.1); - --light-color-component-badge-background-inverted: rgba(255, 255, 255, 0.25); - --light-color-component-badge-count: #777d88; - --light-color-component-badge-count-inverted: rgba(255, 255, 255, 0.7); - --light-color-context-background: rgba(0,0,0,.9); - --light-color-context-background-hover: rgba(255, 255, 255, 0.1); - --light-color-context-background-selected: #178fb9; - --light-color-context-border: #3d424a; - --light-color-context-text: #ffffff; - --light-color-context-text-selected: #ffffff; - --light-color-dim: #777d88; - --light-color-dimmer: #cfd1d5; - --light-color-dimmest: #eff0f1; - --light-color-error-background: hsl(0, 100%, 97%); - --light-color-error-border: hsl(0, 100%, 92%); - --light-color-error-text: #ff0000; - --light-color-expand-collapse-toggle: #777d88; - --light-color-link: #0000ff; - --light-color-modal-background: rgba(255, 255, 255, 0.75); - --light-color-record-active: #fc3a4b; - --light-color-record-hover: #3578e5; - --light-color-record-inactive: #0088fa; - --light-color-scroll-thumb: #c2c2c2; - --light-color-scroll-track: #fafafa; - --light-color-search-match: yellow; - --light-color-search-match-current: #f7923b; - --light-color-selected-tree-highlight-active: rgba(0, 136, 250, 0.1); - --light-color-selected-tree-highlight-inactive: rgba(0, 0, 0, 0.05); - --light-color-shadow: rgba(0, 0, 0, 0.25); - --light-color-tab-selected-border: #0088fa; - --light-color-text: #000000; - --light-color-text-invalid: #ff0000; - --light-color-text-selected: #ffffff; - --light-color-toggle-background-invalid: #fc3a4b; - --light-color-toggle-background-on: #0088fa; - --light-color-toggle-background-off: #cfd1d5; - --light-color-toggle-text: #ffffff; - --light-color-tooltip-background: rgba(0, 0, 0, 0.9); - --light-color-tooltip-text: #ffffff; - - /* Dark theme */ - --dark-color-attribute-name: #9d87d2; - --dark-color-attribute-name-not-editable: #ededed; - --dark-color-attribute-name-inverted: #282828; - --dark-color-attribute-value: #cedae0; - --dark-color-attribute-value-inverted: #ffffff; - --dark-color-attribute-editable-value: yellow; - --dark-color-background: #282c34; - --dark-color-background-hover: rgba(255, 255, 255, 0.1); - --dark-color-background-inactive: #3d424a; - --dark-color-background-invalid: #5c0000; - --dark-color-background-selected: #178fb9; - --dark-color-button-background: #282c34; - --dark-color-button-background-focus: #3d424a; - --dark-color-button: #afb3b9; - --dark-color-button-active: #61dafb; - --dark-color-button-disabled: #4f5766; - --dark-color-button-focus: #a2e9fc; - --dark-color-button-hover: #ededed; - --dark-color-border: #3d424a; - --dark-color-commit-did-not-render-fill: #777d88; - --dark-color-commit-did-not-render-fill-text: #000000; - --dark-color-commit-did-not-render-pattern: #666c77; - --dark-color-commit-did-not-render-pattern-text: #ffffff; - --dark-color-commit-gradient-0: #37afa9; - --dark-color-commit-gradient-1: #63b19e; - --dark-color-commit-gradient-2: #80b393; - --dark-color-commit-gradient-3: #97b488; - --dark-color-commit-gradient-4: #abb67d; - --dark-color-commit-gradient-5: #beb771; - --dark-color-commit-gradient-6: #cfb965; - --dark-color-commit-gradient-7: #dfba57; - --dark-color-commit-gradient-8: #efbb49; - --dark-color-commit-gradient-9: #febc38; - --dark-color-commit-gradient-text: #000000; - --dark-color-component-name: #61dafb; - --dark-color-component-name-inverted: #282828; - --dark-color-component-badge-background: rgba(255, 255, 255, 0.25); - --dark-color-component-badge-background-inverted: rgba(0, 0, 0, 0.25); - --dark-color-component-badge-count: #8f949d; - --dark-color-component-badge-count-inverted: rgba(255, 255, 255, 0.7); - --dark-color-context-background: rgba(255,255,255,.9); - --dark-color-context-background-hover: rgba(0, 136, 250, 0.1); - --dark-color-context-background-selected: #0088fa; - --dark-color-context-border: #eeeeee; - --dark-color-context-text: #000000; - --dark-color-context-text-selected: #ffffff; - --dark-color-dim: #8f949d; - --dark-color-dimmer: #777d88; - --dark-color-dimmest: #4f5766; - --dark-color-error-background: #200; - --dark-color-error-border: #900; - --dark-color-error-text: #f55; - --dark-color-expand-collapse-toggle: #8f949d; - --dark-color-link: #61dafb; - --dark-color-modal-background: rgba(0, 0, 0, 0.75); - --dark-color-record-active: #fc3a4b; - --dark-color-record-hover: #a2e9fc; - --dark-color-record-inactive: #61dafb; - --dark-color-scroll-thumb: #afb3b9; - --dark-color-scroll-track: #313640; - --dark-color-search-match: yellow; - --dark-color-search-match-current: #f7923b; - --dark-color-selected-tree-highlight-active: rgba(23, 143, 185, 0.15); - --dark-color-selected-tree-highlight-inactive: rgba(255, 255, 255, 0.05); - --dark-color-shadow: rgba(0, 0, 0, 0.5); - --dark-color-tab-selected-border: #178fb9; - --dark-color-text: #ffffff; - --dark-color-text-invalid: #ff8080; - --dark-color-text-selected: #ffffff; - --dark-color-toggle-background-invalid: #fc3a4b; - --dark-color-toggle-background-on: #178fb9; - --dark-color-toggle-background-off: #777d88; - --dark-color-toggle-text: #ffffff; - --dark-color-tooltip-background: rgba(255, 255, 255, 0.9); - --dark-color-tooltip-text: #000000; - - /* Font smoothing */ - --light-font-smoothing: auto; - --dark-font-smoothing: antialiased; - --font-smoothing: auto; - - /* Compact density */ - --compact-font-size-monospace-small: 9px; - --compact-font-size-monospace-normal: 11px; - --compact-font-size-monospace-large: 15px; - --compact-font-size-sans-small: 10px; - --compact-font-size-sans-normal: 12px; - --compact-font-size-sans-large: 14px; - --compact-line-height-data: 18px; - --compact-root-font-size: 16px; - - /* Comfortable density */ - --comfortable-font-size-monospace-small: 10px; - --comfortable-font-size-monospace-normal: 13px; - --comfortable-font-size-monospace-large: 17px; - --comfortable-font-size-sans-small: 12px; - --comfortable-font-size-sans-normal: 14px; - --comfortable-font-size-sans-large: 16px; - --comfortable-line-height-data: 22px; - --comfortable-root-font-size: 20px; - - /* GitHub.com system fonts */ - --font-family-monospace: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, - Courier, monospace; - --font-family-sans: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, - Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol; - - /* Constant values shared between JS and CSS */ - --interaction-commit-size: 10px; - --interaction-label-width: 200px; -} -`},function(i,u,f){"use strict";function c(x){var D=this;if(D instanceof c||(D=new c),D.tail=null,D.head=null,D.length=0,x&&typeof x.forEach=="function")x.forEach(function(j){D.push(j)});else if(arguments.length>0)for(var L=0,N=arguments.length;L1)L=D;else{if(!this.head)throw new TypeError("Reduce of empty list with no initial value");N=this.head.next,L=this.head.value}for(var j=0;N!==null;j++)L=x(L,N.value,j),N=N.next;return L},c.prototype.reduceReverse=function(x,D){var L,N=this.tail;if(arguments.length>1)L=D;else{if(!this.tail)throw new TypeError("Reduce of empty list with no initial value");N=this.tail.prev,L=this.tail.value}for(var j=this.length-1;N!==null;j--)L=x(L,N.value,j),N=N.prev;return L},c.prototype.toArray=function(){for(var x=new Array(this.length),D=0,L=this.head;L!==null;D++)x[D]=L.value,L=L.next;return x},c.prototype.toArrayReverse=function(){for(var x=new Array(this.length),D=0,L=this.tail;L!==null;D++)x[D]=L.value,L=L.prev;return x},c.prototype.slice=function(x,D){(D=D||this.length)<0&&(D+=this.length),(x=x||0)<0&&(x+=this.length);var L=new c;if(Dthis.length&&(D=this.length);for(var N=0,j=this.head;j!==null&&Nthis.length&&(D=this.length);for(var N=this.length,j=this.tail;j!==null&&N>D;N--)j=j.prev;for(;j!==null&&N>x;N--,j=j.prev)L.push(j.value);return L},c.prototype.splice=function(x,D){x>this.length&&(x=this.length-1),x<0&&(x=this.length+x);for(var L=0,N=this.head;N!==null&&L=0&&(A._idleTimeoutId=setTimeout(function(){A._onTimeout&&A._onTimeout()},x))},f(14),u.setImmediate=typeof self!="undefined"&&self.setImmediate||c!==void 0&&c.setImmediate||this&&this.setImmediate,u.clearImmediate=typeof self!="undefined"&&self.clearImmediate||c!==void 0&&c.clearImmediate||this&&this.clearImmediate}).call(this,f(4))},function(i,u,f){(function(c,g){(function(t,C){"use strict";if(!t.setImmediate){var A,x,D,L,N,j=1,$={},h=!1,re=t.document,ce=Object.getPrototypeOf&&Object.getPrototypeOf(t);ce=ce&&ce.setTimeout?ce:t,{}.toString.call(t.process)==="[object process]"?A=function(Se){g.nextTick(function(){oe(Se)})}:function(){if(t.postMessage&&!t.importScripts){var Se=!0,me=t.onmessage;return t.onmessage=function(){Se=!1},t.postMessage("","*"),t.onmessage=me,Se}}()?(L="setImmediate$"+Math.random()+"$",N=function(Se){Se.source===t&&typeof Se.data=="string"&&Se.data.indexOf(L)===0&&oe(+Se.data.slice(L.length))},t.addEventListener?t.addEventListener("message",N,!1):t.attachEvent("onmessage",N),A=function(Se){t.postMessage(L+Se,"*")}):t.MessageChannel?((D=new MessageChannel).port1.onmessage=function(Se){oe(Se.data)},A=function(Se){D.port2.postMessage(Se)}):re&&"onreadystatechange"in re.createElement("script")?(x=re.documentElement,A=function(Se){var me=re.createElement("script");me.onreadystatechange=function(){oe(Se),me.onreadystatechange=null,x.removeChild(me),me=null},x.appendChild(me)}):A=function(Se){setTimeout(oe,0,Se)},ce.setImmediate=function(Se){typeof Se!="function"&&(Se=new Function(""+Se));for(var me=new Array(arguments.length-1),De=0;Dene;ne++)if((V=Q(Je,Ot,ne))!==-1){ce=ne,Ot=V;break e}Ot=-1}}e:{if(Je=Nt,(V=j().get(At.primitive))!==void 0){for(ne=0;neOt-Je?null:Nt.slice(Je,Ot-1))!==null){if(Ot=0,Le!==null){for(;OtOt;Le--)ot=Ue.pop()}for(Le=Nt.length-Ot-1;1<=Le;Le--)Ot=[],ot.push({id:null,isStateEditable:!1,name:Se(Nt[Le-1].functionName),value:void 0,subHooks:Ot}),Ue.push(ot),ot=Ot;Le=Nt}Ot=(Nt=At.primitive)==="Context"||Nt==="DebugValue"?null:ct++,ot.push({id:Ot,isStateEditable:Nt==="Reducer"||Nt==="State",name:Nt,value:At.value,subHooks:[]})}return function ge(Z,Ae){for(var at=[],it=0;it-1&&($=$.replace(/eval code/g,"eval").replace(/(\(eval at [^()]*)|(\),.*$)/g,""));var h=$.replace(/^\s+/,"").replace(/\(eval code/g,"("),re=h.match(/ (\((.+):(\d+):(\d+)\)$)/),ce=(h=re?h.replace(re[0],""):h).split(/\s+/).slice(1),Q=this.extractLocation(re?re[1]:ce.pop()),oe=ce.join(" ")||void 0,Se=["eval",""].indexOf(Q[0])>-1?void 0:Q[0];return new x({functionName:oe,fileName:Se,lineNumber:Q[1],columnNumber:Q[2],source:$})},this)},parseFFOrSafari:function(j){return j.stack.split(` -`).filter(function($){return!$.match(N)},this).map(function($){if($.indexOf(" > eval")>-1&&($=$.replace(/ line (\d+)(?: > eval line \d+)* > eval:\d+:\d+/g,":$1")),$.indexOf("@")===-1&&$.indexOf(":")===-1)return new x({functionName:$});var h=/((.*".+"[^@]*)?[^@]*)(?:@)/,re=$.match(h),ce=re&&re[1]?re[1]:void 0,Q=this.extractLocation($.replace(h,""));return new x({functionName:ce,fileName:Q[0],lineNumber:Q[1],columnNumber:Q[2],source:$})},this)},parseOpera:function(j){return!j.stacktrace||j.message.indexOf(` -`)>-1&&j.message.split(` -`).length>j.stacktrace.split(` -`).length?this.parseOpera9(j):j.stack?this.parseOpera11(j):this.parseOpera10(j)},parseOpera9:function(j){for(var $=/Line (\d+).*script (?:in )?(\S+)/i,h=j.message.split(` -`),re=[],ce=2,Q=h.length;ce/,"$2").replace(/\([^)]*\)/g,"")||void 0;Q.match(/\(([^)]*)\)/)&&(h=Q.replace(/^[^(]+\(([^)]*)\)$/,"$1"));var Se=h===void 0||h==="[arguments not available]"?void 0:h.split(",");return new x({functionName:oe,args:Se,fileName:ce[0],lineNumber:ce[1],columnNumber:ce[2],source:$})},this)}}})=="function"?c.apply(u,g):c)===void 0||(i.exports=t)})()},function(i,u,f){var c,g,t;(function(C,A){"use strict";g=[],(t=typeof(c=function(){function x(oe){return oe.charAt(0).toUpperCase()+oe.substring(1)}function D(oe){return function(){return this[oe]}}var L=["isConstructor","isEval","isNative","isToplevel"],N=["columnNumber","lineNumber"],j=["fileName","functionName","source"],$=L.concat(N,j,["args"]);function h(oe){if(oe)for(var Se=0;Se<$.length;Se++)oe[$[Se]]!==void 0&&this["set"+x($[Se])](oe[$[Se]])}h.prototype={getArgs:function(){return this.args},setArgs:function(oe){if(Object.prototype.toString.call(oe)!=="[object Array]")throw new TypeError("Args must be an Array");this.args=oe},getEvalOrigin:function(){return this.evalOrigin},setEvalOrigin:function(oe){if(oe instanceof h)this.evalOrigin=oe;else{if(!(oe instanceof Object))throw new TypeError("Eval Origin must be an Object or StackFrame");this.evalOrigin=new h(oe)}},toString:function(){var oe=this.getFileName()||"",Se=this.getLineNumber()||"",me=this.getColumnNumber()||"",De=this.getFunctionName()||"";return this.getIsEval()?oe?"[eval] ("+oe+":"+Se+":"+me+")":"[eval]:"+Se+":"+me:De?De+" ("+oe+":"+Se+":"+me+")":oe+":"+Se+":"+me}},h.fromString=function(oe){var Se=oe.indexOf("("),me=oe.lastIndexOf(")"),De=oe.substring(0,Se),J=oe.substring(Se+1,me).split(","),Te=oe.substring(me+1);if(Te.indexOf("@")===0)var Oe=/@(.+?)(?::(\d+))?(?::(\d+))?$/.exec(Te,""),Le=Oe[1],ot=Oe[2],ct=Oe[3];return new h({functionName:De,args:J||void 0,fileName:Le,lineNumber:ot||void 0,columnNumber:ct||void 0})};for(var re=0;re1?de-1:0),ve=1;ve=0&&de.splice(W,1)}}}])&&c(R.prototype,U),H&&c(R,H),F}(),t=f(2),C=f.n(t);try{var A=f(9).default,x=function(F){var R=new RegExp("".concat(F,": ([0-9]+)")),U=A.match(R);return parseInt(U[1],10)};x("comfortable-line-height-data"),x("compact-line-height-data")}catch(F){}function D(F){try{return sessionStorage.getItem(F)}catch(R){return null}}function L(F){try{sessionStorage.removeItem(F)}catch(R){}}function N(F,R){try{return sessionStorage.setItem(F,R)}catch(U){}}var j=function(F,R){return F===R},$=f(1),h=f.n($);function re(F){return F.ownerDocument?F.ownerDocument.defaultView:null}function ce(F){var R=re(F);return R?R.frameElement:null}function Q(F){var R=me(F);return oe([F.getBoundingClientRect(),{top:R.borderTop,left:R.borderLeft,bottom:R.borderBottom,right:R.borderRight,width:0,height:0}])}function oe(F){return F.reduce(function(R,U){return R==null?U:{top:R.top+U.top,left:R.left+U.left,width:R.width,height:R.height,bottom:R.bottom+U.bottom,right:R.right+U.right}})}function Se(F,R){var U=ce(F);if(U&&U!==R){for(var H=[F.getBoundingClientRect()],fe=U,ue=!1;fe;){var de=Q(fe);if(H.push(de),fe=ce(fe),ue)break;fe&&re(fe)===R&&(ue=!0)}return oe(H)}return F.getBoundingClientRect()}function me(F){var R=window.getComputedStyle(F);return{borderLeft:parseInt(R.borderLeftWidth,10),borderRight:parseInt(R.borderRightWidth,10),borderTop:parseInt(R.borderTopWidth,10),borderBottom:parseInt(R.borderBottomWidth,10),marginLeft:parseInt(R.marginLeft,10),marginRight:parseInt(R.marginRight,10),marginTop:parseInt(R.marginTop,10),marginBottom:parseInt(R.marginBottom,10),paddingLeft:parseInt(R.paddingLeft,10),paddingRight:parseInt(R.paddingRight,10),paddingTop:parseInt(R.paddingTop,10),paddingBottom:parseInt(R.paddingBottom,10)}}function De(F,R){var U;if(typeof Symbol=="undefined"||F[Symbol.iterator]==null){if(Array.isArray(F)||(U=function(ve,Fe){if(!!ve){if(typeof ve=="string")return J(ve,Fe);var Ge=Object.prototype.toString.call(ve).slice(8,-1);if(Ge==="Object"&&ve.constructor&&(Ge=ve.constructor.name),Ge==="Map"||Ge==="Set")return Array.from(ve);if(Ge==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(Ge))return J(ve,Fe)}}(F))||R&&F&&typeof F.length=="number"){U&&(F=U);var H=0,fe=function(){};return{s:fe,n:function(){return H>=F.length?{done:!0}:{done:!1,value:F[H++]}},e:function(ve){throw ve},f:fe}}throw new TypeError(`Invalid attempt to iterate non-iterable instance. -In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var ue,de=!0,W=!1;return{s:function(){U=F[Symbol.iterator]()},n:function(){var ve=U.next();return de=ve.done,ve},e:function(ve){W=!0,ue=ve},f:function(){try{de||U.return==null||U.return()}finally{if(W)throw ue}}}}function J(F,R){(R==null||R>F.length)&&(R=F.length);for(var U=0,H=new Array(R);Ude.left+de.width&&(K=de.left+de.width-Ge-5),{style:{top:ve+="px",left:K+="px"}}}(R,U,{width:H.width,height:H.height});h()(this.tip.style,fe.style)}}]),F}(),Ue=function(){function F(){Te(this,F);var R=window.__REACT_DEVTOOLS_TARGET_WINDOW__||window;this.window=R;var U=window.__REACT_DEVTOOLS_TARGET_WINDOW__||window;this.tipBoundsWindow=U;var H=R.document;this.container=H.createElement("div"),this.container.style.zIndex="10000000",this.tip=new ct(H,this.container),this.rects=[],H.body.appendChild(this.container)}return Le(F,[{key:"remove",value:function(){this.tip.remove(),this.rects.forEach(function(R){R.remove()}),this.rects.length=0,this.container.parentNode&&this.container.parentNode.removeChild(this.container)}},{key:"inspect",value:function(R,U){for(var H=this,fe=R.filter(function(Xe){return Xe.nodeType===Node.ELEMENT_NODE});this.rects.length>fe.length;)this.rects.pop().remove();if(fe.length!==0){for(;this.rects.length1&&arguments[1]!==void 0?arguments[1]:j,je=void 0,Xe=[],rt=void 0,st=!1,xt=function(lt,Rt){return xe(lt,Xe[Rt])},wt=function(){for(var lt=arguments.length,Rt=Array(lt),yn=0;yn5&&arguments[5]!==void 0?arguments[5]:0,W=cl(F);switch(W){case"html_element":return R.push(H),{inspectable:!1,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:F.tagName,type:W};case"function":return R.push(H),{inspectable:!1,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:typeof F.name!="function"&&F.name?F.name:"function",type:W};case"string":return F.length<=500?F:F.slice(0,500)+"...";case"bigint":case"symbol":return R.push(H),{inspectable:!1,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:F.toString(),type:W};case"react_element":return R.push(H),{inspectable:!1,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:al(F)||"Unknown",type:W};case"array_buffer":case"data_view":return R.push(H),{inspectable:!1,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:W==="data_view"?"DataView":"ArrayBuffer",size:F.byteLength,type:W};case"array":return ue=fe(H),de>=2&&!ue?yo(W,!0,F,R,H):F.map(function(Ge,K){return Ds(Ge,R,U,H.concat([K]),fe,ue?1:de+1)});case"html_all_collection":case"typed_array":case"iterator":if(ue=fe(H),de>=2&&!ue)return yo(W,!0,F,R,H);var ve={unserializable:!0,type:W,readonly:!0,size:W==="typed_array"?F.length:void 0,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:F.constructor&&F.constructor.name!=="Object"?F.constructor.name:""};return r0(F[Symbol.iterator])&&Array.from(F).forEach(function(Ge,K){return ve[K]=Ds(Ge,R,U,H.concat([K]),fe,ue?1:de+1)}),U.push(H),ve;case"opaque_iterator":return R.push(H),{inspectable:!1,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:F[Symbol.toStringTag],type:W};case"date":case"regexp":return R.push(H),{inspectable:!1,preview_short:Mr(F,!1),preview_long:Mr(F,!0),name:F.toString(),type:W};case"object":if(ue=fe(H),de>=2&&!ue)return yo(W,!0,F,R,H);var Fe={};return Es(F).forEach(function(Ge){var K=Ge.toString();Fe[K]=Ds(F[Ge],R,U,H.concat([K]),fe,ue?1:de+1)}),Fe;case"infinity":case"nan":case"undefined":return R.push(H),{type:W};default:return F}}function Mu(F){return(Mu=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(R){return typeof R}:function(R){return R&&typeof Symbol=="function"&&R.constructor===Symbol&&R!==Symbol.prototype?"symbol":typeof R})(F)}function Gf(F){return function(R){if(Array.isArray(R))return iu(R)}(F)||function(R){if(typeof Symbol!="undefined"&&Symbol.iterator in Object(R))return Array.from(R)}(F)||function(R,U){if(!!R){if(typeof R=="string")return iu(R,U);var H=Object.prototype.toString.call(R).slice(8,-1);if(H==="Object"&&R.constructor&&(H=R.constructor.name),H==="Map"||H==="Set")return Array.from(R);if(H==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(H))return iu(R,U)}}(F)||function(){throw new TypeError(`Invalid attempt to spread non-iterable instance. -In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}()}function iu(F,R){(R==null||R>F.length)&&(R=F.length);for(var U=0,H=new Array(R);UR.toString()?1:R.toString()>F.toString()?-1:0}function Es(F){for(var R=[],U=F,H=function(){var fe=[].concat(Gf(Object.keys(U)),Gf(Object.getOwnPropertySymbols(U))),ue=Object.getOwnPropertyDescriptors(U);fe.forEach(function(de){ue[de].enumerable&&R.push(de)}),U=Object.getPrototypeOf(U)};U!=null;)H();return R}function Uo(F){var R=arguments.length>1&&arguments[1]!==void 0?arguments[1]:"Anonymous",U=ou.get(F);if(U!=null)return U;var H=R;return typeof F.displayName=="string"?H=F.displayName:typeof F.name=="string"&&F.name!==""&&(H=F.name),ou.set(F,H),H}var sl=0;function Ss(){return++sl}function Cs(F){var R=ol.get(F);if(R!==void 0)return R;for(var U=new Array(F.length),H=0;H1&&arguments[1]!==void 0?arguments[1]:50;return F.length>R?F.substr(0,R)+"\u2026":F}function Mr(F,R){if(F!=null&&hasOwnProperty.call(F,Ci.type))return R?F[Ci.preview_long]:F[Ci.preview_short];switch(cl(F)){case"html_element":return"<".concat(Ui(F.tagName.toLowerCase())," />");case"function":return Ui("\u0192 ".concat(typeof F.name=="function"?"":F.name,"() {}"));case"string":return'"'.concat(F,'"');case"bigint":return Ui(F.toString()+"n");case"regexp":case"symbol":return Ui(F.toString());case"react_element":return"<".concat(Ui(al(F)||"Unknown")," />");case"array_buffer":return"ArrayBuffer(".concat(F.byteLength,")");case"data_view":return"DataView(".concat(F.buffer.byteLength,")");case"array":if(R){for(var U="",H=0;H0&&(U+=", "),!((U+=Mr(F[H],!1)).length>50));H++);return"[".concat(Ui(U),"]")}var fe=hasOwnProperty.call(F,Ci.size)?F[Ci.size]:F.length;return"Array(".concat(fe,")");case"typed_array":var ue="".concat(F.constructor.name,"(").concat(F.length,")");if(R){for(var de="",W=0;W0&&(de+=", "),!((de+=F[W]).length>50));W++);return"".concat(ue," [").concat(Ui(de),"]")}return ue;case"iterator":var ve=F.constructor.name;if(R){for(var Fe=Array.from(F),Ge="",K=0;K0&&(Ge+=", "),Array.isArray(xe)){var je=Mr(xe[0],!0),Xe=Mr(xe[1],!1);Ge+="".concat(je," => ").concat(Xe)}else Ge+=Mr(xe,!1);if(Ge.length>50)break}return"".concat(ve,"(").concat(F.size,") {").concat(Ui(Ge),"}")}return"".concat(ve,"(").concat(F.size,")");case"opaque_iterator":return F[Symbol.toStringTag];case"date":return F.toString();case"object":if(R){for(var rt=Es(F).sort(ul),st="",xt=0;xt0&&(st+=", "),(st+="".concat(wt.toString(),": ").concat(Mr(F[wt],!1))).length>50)break}return"{".concat(Ui(st),"}")}return"{\u2026}";case"boolean":case"number":case"infinity":case"nan":case"null":case"undefined":return F;default:try{return Ui(""+F)}catch(lt){return"unserializable"}}}var Ac=f(7);function of(F){return(of=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(R){return typeof R}:function(R){return R&&typeof Symbol=="function"&&R.constructor===Symbol&&R!==Symbol.prototype?"symbol":typeof R})(F)}function Ts(F,R){var U=Object.keys(F);if(Object.getOwnPropertySymbols){var H=Object.getOwnPropertySymbols(F);R&&(H=H.filter(function(fe){return Object.getOwnPropertyDescriptor(F,fe).enumerable})),U.push.apply(U,H)}return U}function xs(F){for(var R=1;R2&&arguments[2]!==void 0?arguments[2]:[];if(F!==null){var H=[],fe=[],ue=Ds(F,H,fe,U,R);return{data:ue,cleaned:H,unserializable:fe}}return null}function qo(F){var R,U,H=(R=F,U=new Set,JSON.stringify(R,function(de,W){if(of(W)==="object"&&W!==null){if(U.has(W))return;U.add(W)}return typeof W=="bigint"?W.toString()+"n":W})),fe=H===void 0?"undefined":H,ue=window.__REACT_DEVTOOLS_GLOBAL_HOOK__.clipboardCopyText;typeof ue=="function"?ue(fe).catch(function(de){}):Object(Ac.copy)(fe)}function kr(F,R){var U=arguments.length>2&&arguments[2]!==void 0?arguments[2]:0,H=R[U],fe=Array.isArray(F)?F.slice():xs({},F);return U+1===R.length?Array.isArray(fe)?fe.splice(H,1):delete fe[H]:fe[H]=kr(F[H],R,U+1),fe}function Fr(F,R,U){var H=arguments.length>3&&arguments[3]!==void 0?arguments[3]:0,fe=R[H],ue=Array.isArray(F)?F.slice():xs({},F);if(H+1===R.length){var de=U[H];ue[de]=ue[fe],Array.isArray(ue)?ue.splice(fe,1):delete ue[fe]}else ue[fe]=Fr(F[fe],R,U,H+1);return ue}function si(F,R,U){var H=arguments.length>3&&arguments[3]!==void 0?arguments[3]:0;if(H>=R.length)return U;var fe=R[H],ue=Array.isArray(F)?F.slice():xs({},F);return ue[fe]=si(F[fe],R,U,H+1),ue}var H0=f(8);function b0(F,R){var U=Object.keys(F);if(Object.getOwnPropertySymbols){var H=Object.getOwnPropertySymbols(F);R&&(H=H.filter(function(fe){return Object.getOwnPropertyDescriptor(F,fe).enumerable})),U.push.apply(U,H)}return U}function Bt(F){for(var R=1;R=F.length?{done:!0}:{done:!1,value:F[H++]}},e:function(ve){throw ve},f:fe}}throw new TypeError(`Invalid attempt to iterate non-iterable instance. -In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var ue,de=!0,W=!1;return{s:function(){U=F[Symbol.iterator]()},n:function(){var ve=U.next();return de=ve.done,ve},e:function(ve){W=!0,ue=ve},f:function(){try{de||U.return==null||U.return()}finally{if(W)throw ue}}}}function As(F,R){if(F){if(typeof F=="string")return uu(F,R);var U=Object.prototype.toString.call(F).slice(8,-1);return U==="Object"&&F.constructor&&(U=F.constructor.name),U==="Map"||U==="Set"?Array.from(F):U==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(U)?uu(F,R):void 0}}function uu(F,R){(R==null||R>F.length)&&(R=F.length);for(var U=0,H=new Array(R);U0){var et=ue(X);if(et!=null){var Dt,bt=ks(du);try{for(bt.s();!(Dt=bt.n()).done;)if(Dt.value.test(et))return!0}catch(fn){bt.e(fn)}finally{bt.f()}}}if(Y!=null&&Yu.size>0){var Zt,qt=Y.fileName,Ut=ks(Yu);try{for(Ut.s();!(Zt=Ut.n()).done;)if(Zt.value.test(qt))return!0}catch(fn){Ut.e(fn)}finally{Ut.f()}}return!1}function Gr(X){var Y=X.type;switch(X.tag){case Xe:case ar:return 1;case je:case rn:return 5;case wt:return 6;case lt:return 11;case yn:return 7;case Rt:case sn:case xt:return 9;case Hn:case Cr:return 8;case He:return 12;case Qe:return 13;default:switch(de(Y)){case 60111:case"Symbol(react.concurrent_mode)":case"Symbol(react.async_mode)":return 9;case 60109:case"Symbol(react.provider)":return 2;case 60110:case"Symbol(react.context)":return 2;case 60108:case"Symbol(react.strict_mode)":return 9;case 60114:case"Symbol(react.profiler)":return 10;default:return 9}}}function ir(X){if(Co.has(X))return X;var Y=X.alternate;return Y!=null&&Co.has(Y)?Y:(Co.add(X),X)}window.__REACT_DEVTOOLS_COMPONENT_FILTERS__!=null?qs(window.__REACT_DEVTOOLS_COMPONENT_FILTERS__):qs([{type:1,value:7,isEnabled:!0}]);var L0=new Map,Y0=new Map,Co=new Set,$u=new Map,Vo=new Map,Rr=-1;function Jn(X){if(!L0.has(X)){var Y=Ss();L0.set(X,Y),Y0.set(Y,X)}return L0.get(X)}function ai(X){switch(Gr(X)){case 1:if(N0!==null){var Y=Jn(ir(X)),ye=Vr(X);ye!==null&&N0.set(Y,ye)}}}var o0={};function Vr(X){switch(Gr(X)){case 1:var Y=X.stateNode,ye=o0,he=o0;return Y!=null&&(Y.constructor&&Y.constructor.contextType!=null?he=Y.context:(ye=Y.context)&&Object.keys(ye).length===0&&(ye=o0)),[ye,he];default:return null}}function ff(X){switch(Gr(X)){case 1:if(N0!==null){var Y=Jn(ir(X)),ye=N0.has(Y)?N0.get(Y):null,he=Vr(X);if(ye==null||he==null)return null;var We=Ru(ye,2),et=We[0],Dt=We[1],bt=Ru(he,2),Zt=bt[0],qt=bt[1];if(Zt!==o0)return $0(et,Zt);if(qt!==o0)return Dt!==qt}}return null}function cf(X,Y){if(X==null||Y==null)return!1;if(Y.hasOwnProperty("baseState")&&Y.hasOwnProperty("memoizedState")&&Y.hasOwnProperty("next")&&Y.hasOwnProperty("queue"))for(;Y!==null;){if(Y.memoizedState!==X.memoizedState)return!0;Y=Y.next,X=X.next}return!1}function $0(X,Y){if(X==null||Y==null||Y.hasOwnProperty("baseState")&&Y.hasOwnProperty("memoizedState")&&Y.hasOwnProperty("next")&&Y.hasOwnProperty("queue"))return null;var ye,he=[],We=ks(new Set([].concat(c0(Object.keys(X)),c0(Object.keys(Y)))));try{for(We.s();!(ye=We.n()).done;){var et=ye.value;X[et]!==Y[et]&&he.push(et)}}catch(Dt){We.e(Dt)}finally{We.f()}return he}function K0(X,Y){switch(Y.tag){case Xe:case je:case rt:case Hn:case Cr:return(zo(Y)&K)===K;default:return X.memoizedProps!==Y.memoizedProps||X.memoizedState!==Y.memoizedState||X.ref!==Y.ref}}var ae=[],Be=[],Ie=[],ht=[],mt=new Map,wn=0,Gn=null;function $t(X){ae.push(X)}function X0(X){if(ae.length!==0||Be.length!==0||Ie.length!==0||Gn!==null||u0){var Y=Be.length+Ie.length+(Gn===null?0:1),ye=new Array(3+wn+(Y>0?2+Y:0)+ae.length),he=0;if(ye[he++]=R,ye[he++]=Rr,ye[he++]=wn,mt.forEach(function(bt,Zt){ye[he++]=Zt.length;for(var qt=Cs(Zt),Ut=0;Ut0){ye[he++]=2,ye[he++]=Y;for(var We=Be.length-1;We>=0;We--)ye[he++]=Be[We];for(var et=0;et0?X.forEach(function(Y){F.emit("operations",Y)}):(Fn!==null&&(zr=!0),F.getFiberRoots(R).forEach(function(Y){T0(Rr=Jn(ir(Y.current)),Y.current),u0&&Y.memoizedInteractions!=null&&(uo={changeDescriptions:To?new Map:null,durations:[],commitTime:Os()-v0,interactions:Array.from(Y.memoizedInteractions).map(function(ye){return Bt(Bt({},ye),{},{timestamp:ye.timestamp-v0})}),maxActualDuration:0,priorityLevel:null}),$r(Y.current,null,!1,!1),X0(),Rr=-1}))},getBestMatchForTrackedPath:function(){if(Fn===null||pi===null)return null;for(var X=pi;X!==null&&F0(X);)X=X.return;return X===null?null:{id:Jn(ir(X)),isFullMatch:Br===Fn.length-1}},getDisplayNameForFiberID:function(X){var Y=Y0.get(X);return Y!=null?ue(Y):null},getFiberIDForNative:function(X){var Y=arguments.length>1&&arguments[1]!==void 0&&arguments[1],ye=U.findFiberByHostInstance(X);if(ye!=null){if(Y)for(;ye!==null&&F0(ye);)ye=ye.return;return Jn(ir(ye))}return null},getInstanceAndStyle:function(X){var Y=null,ye=null,he=J0(X);return he!==null&&(Y=he.stateNode,he.memoizedProps!==null&&(ye=he.memoizedProps.style)),{instance:Y,style:ye}},getOwnersList:function(X){var Y=J0(X);if(Y==null)return null;var ye=Y._debugOwner,he=[{displayName:ue(Y)||"Anonymous",id:X,type:Gr(Y)}];if(ye)for(var We=ye;We!==null;)he.unshift({displayName:ue(We)||"Anonymous",id:Jn(ir(We)),type:Gr(We)}),We=We._debugOwner||null;return he},getPathForElement:function(X){var Y=Y0.get(X);if(Y==null)return null;for(var ye=[];Y!==null;)ye.push(Ai(Y)),Y=Y.return;return ye.reverse(),ye},getProfilingData:function(){var X=[];if(pu===null)throw Error("getProfilingData() called before any profiling data was recorded");return pu.forEach(function(Y,ye){var he=[],We=[],et=new Map,Dt=new Map,bt=so!==null&&so.get(ye)||"Unknown";C0!=null&&C0.forEach(function(Zt,qt){di!=null&&di.get(qt)===ye&&We.push([qt,Zt])}),Y.forEach(function(Zt,qt){var Ut=Zt.changeDescriptions,fn=Zt.durations,_t=Zt.interactions,_r=Zt.maxActualDuration,Wr=Zt.priorityLevel,Ar=Zt.commitTime,z=[];_t.forEach(function(s0){et.has(s0.id)||et.set(s0.id,s0),z.push(s0.id);var t0=Dt.get(s0.id);t0!=null?t0.push(qt):Dt.set(s0.id,[qt])});for(var dr=[],Or=[],Qn=0;Qn1?kn.set(Ut,fn-1):kn.delete(Ut),wr.delete(Zt)}(Rr),Yr(ye,!1))}else T0(Rr,ye),$r(ye,null,!1,!1);if(u0&&We){var bt=pu.get(Rr);bt!=null?bt.push(uo):pu.set(Rr,[uo])}X0(),oo&&F.emit("traceUpdates",Hi),Rr=-1},handleCommitFiberUnmount:function(X){Yr(X,!1)},inspectElement:function(X,Y){if(Tr(X)){if(Y!=null){R0(Y);var ye=null;return Y[0]==="hooks"&&(ye="hooks"),{id:X,type:"hydrated-path",path:Y,value:qi(Ti(S0,Y),Nr(null,ye),Y)}}return{id:X,type:"no-change"}}if(El=!1,S0!==null&&S0.id===X||(Q0={}),(S0=af(X))===null)return{id:X,type:"not-found"};Y!=null&&R0(Y),function(We){var et=We.hooks,Dt=We.id,bt=We.props,Zt=Y0.get(Dt);if(Zt!=null){var qt=Zt.elementType,Ut=Zt.stateNode,fn=Zt.tag,_t=Zt.type;switch(fn){case Xe:case ar:case rn:H.$r=Ut;break;case je:H.$r={hooks:et,props:bt,type:_t};break;case wt:H.$r={props:bt,type:_t.render};break;case Hn:case Cr:H.$r={props:bt,type:qt!=null&&qt.type!=null?qt.type:_t};break;default:H.$r=null}}else console.warn('Could not find Fiber with id "'.concat(Dt,'"'))}(S0);var he=Bt({},S0);return he.context=qi(he.context,Nr("context",null)),he.hooks=qi(he.hooks,Nr("hooks","hooks")),he.props=qi(he.props,Nr("props",null)),he.state=qi(he.state,Nr("state",null)),{id:X,type:"full-data",value:he}},logElementToConsole:function(X){var Y=Tr(X)?S0:af(X);if(Y!==null){var ye=typeof console.groupCollapsed=="function";ye&&console.groupCollapsed("[Click to expand] %c<".concat(Y.displayName||"Component"," />"),"color: var(--dom-tag-name-color); font-weight: normal;"),Y.props!==null&&console.log("Props:",Y.props),Y.state!==null&&console.log("State:",Y.state),Y.hooks!==null&&console.log("Hooks:",Y.hooks);var he=zs(X);he!==null&&console.log("Nodes:",he),Y.source!==null&&console.log("Location:",Y.source),(window.chrome||/firefox/i.test(navigator.userAgent))&&console.log("Right-click any value to save it as a global variable for further inspection."),ye&&console.groupEnd()}else console.warn('Could not find Fiber with id "'.concat(X,'"'))},prepareViewAttributeSource:function(X,Y){Tr(X)&&(window.$attribute=Ti(S0,Y))},prepareViewElementSource:function(X){var Y=Y0.get(X);if(Y!=null){var ye=Y.elementType,he=Y.tag,We=Y.type;switch(he){case Xe:case ar:case rn:case je:H.$type=We;break;case wt:H.$type=We.render;break;case Hn:case Cr:H.$type=ye!=null&&ye.type!=null?ye.type:We;break;default:H.$type=null}}else console.warn('Could not find Fiber with id "'.concat(X,'"'))},overrideSuspense:function(X,Y){if(typeof Eo!="function"||typeof So!="function")throw new Error("Expected overrideSuspense() to not get called for earlier React versions.");Y?(B0.add(X),B0.size===1&&Eo(hu)):(B0.delete(X),B0.size===0&&Eo(Cl));var ye=Y0.get(X);ye!=null&&So(ye)},overrideValueAtPath:function(X,Y,ye,he,We){var et=J0(Y);if(et!==null){var Dt=et.stateNode;switch(X){case"context":switch(he=he.slice(1),et.tag){case Xe:he.length===0?Dt.context=We:fl(Dt.context,he,We),Dt.forceUpdate()}break;case"hooks":typeof p0=="function"&&p0(et,ye,he,We);break;case"props":switch(et.tag){case Xe:et.pendingProps=si(Dt.props,he,We),Dt.forceUpdate();break;default:typeof xi=="function"&&xi(et,he,We)}break;case"state":switch(et.tag){case Xe:fl(Dt.state,he,We),Dt.forceUpdate()}}}},renamePath:function(X,Y,ye,he,We){var et=J0(Y);if(et!==null){var Dt=et.stateNode;switch(X){case"context":switch(he=he.slice(1),We=We.slice(1),et.tag){case Xe:he.length===0||ll(Dt.context,he,We),Dt.forceUpdate()}break;case"hooks":typeof ci=="function"&&ci(et,ye,he,We);break;case"props":Dt===null?typeof qr=="function"&&qr(et,he,We):(et.pendingProps=Fr(Dt.props,he,We),Dt.forceUpdate());break;case"state":ll(Dt.state,he,We),Dt.forceUpdate()}}},renderer:U,setTraceUpdatesEnabled:function(X){oo=X},setTrackedPath:lo,startProfiling:Sl,stopProfiling:function(){u0=!1,To=!1},storeAsGlobal:function(X,Y,ye){if(Tr(X)){var he=Ti(S0,Y),We="$reactTemp".concat(ye);window[We]=he,console.log(We),console.log(he)}},updateComponentFilters:function(X){if(u0)throw Error("Cannot modify filter preferences while profiling");F.getFiberRoots(R).forEach(function(Y){Rr=Jn(ir(Y.current)),m0(Y.current),Yr(Y.current,!1),Rr=-1}),qs(X),kn.clear(),F.getFiberRoots(R).forEach(function(Y){T0(Rr=Jn(ir(Y.current)),Y.current),$r(Y.current,null,!1,!1),X0(Y),Rr=-1})}}}var _n;function Nu(F){return(Nu=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(R){return typeof R}:function(R){return R&&typeof Symbol=="function"&&R.constructor===Symbol&&R!==Symbol.prototype?"symbol":typeof R})(F)}function Wo(F,R,U){if(_n===void 0)try{throw Error()}catch(fe){var H=fe.stack.trim().match(/\n( *(at )?)/);_n=H&&H[1]||""}return` -`+_n+F}var su=!1;function Ps(F,R,U){if(!F||su)return"";var H,fe=Error.prepareStackTrace;Error.prepareStackTrace=void 0,su=!0;var ue=U.current;U.current=null;try{if(R){var de=function(){throw Error()};if(Object.defineProperty(de.prototype,"props",{set:function(){throw Error()}}),(typeof Reflect=="undefined"?"undefined":Nu(Reflect))==="object"&&Reflect.construct){try{Reflect.construct(de,[])}catch(xe){H=xe}Reflect.construct(F,[],de)}else{try{de.call()}catch(xe){H=xe}F.call(de.prototype)}}else{try{throw Error()}catch(xe){H=xe}F()}}catch(xe){if(xe&&H&&typeof xe.stack=="string"){for(var W=xe.stack.split(` -`),ve=H.stack.split(` -`),Fe=W.length-1,Ge=ve.length-1;Fe>=1&&Ge>=0&&W[Fe]!==ve[Ge];)Ge--;for(;Fe>=1&&Ge>=0;Fe--,Ge--)if(W[Fe]!==ve[Ge]){if(Fe!==1||Ge!==1)do if(Fe--,--Ge<0||W[Fe]!==ve[Ge])return` -`+W[Fe].replace(" at new "," at ");while(Fe>=1&&Ge>=0);break}}}finally{su=!1,Error.prepareStackTrace=fe,U.current=ue}var K=F?F.displayName||F.name:"";return K?Wo(K):""}function pl(F,R,U,H){return Ps(F,!1,H)}function Vf(F,R,U){var H=F.HostComponent,fe=F.LazyComponent,ue=F.SuspenseComponent,de=F.SuspenseListComponent,W=F.FunctionComponent,ve=F.IndeterminateComponent,Fe=F.SimpleMemoComponent,Ge=F.ForwardRef,K=F.Block,xe=F.ClassComponent;switch(R.tag){case H:return Wo(R.type);case fe:return Wo("Lazy");case ue:return Wo("Suspense");case de:return Wo("SuspenseList");case W:case ve:case Fe:return pl(R.type,0,0,U);case Ge:return pl(R.type.render,0,0,U);case K:return pl(R.type._render,0,0,U);case xe:return function(je,Xe,rt,st){return Ps(je,!0,st)}(R.type,0,0,U);default:return""}}function hl(F,R,U){try{var H="",fe=R;do H+=Vf(F,fe,U),fe=fe.return;while(fe);return H}catch(ue){return` -Error generating stack: `+ue.message+` -`+ue.stack}}function Bu(F,R){var U;if(typeof Symbol=="undefined"||F[Symbol.iterator]==null){if(Array.isArray(F)||(U=function(ve,Fe){if(!!ve){if(typeof ve=="string")return ju(ve,Fe);var Ge=Object.prototype.toString.call(ve).slice(8,-1);if(Ge==="Object"&&ve.constructor&&(Ge=ve.constructor.name),Ge==="Map"||Ge==="Set")return Array.from(ve);if(Ge==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(Ge))return ju(ve,Fe)}}(F))||R&&F&&typeof F.length=="number"){U&&(F=U);var H=0,fe=function(){};return{s:fe,n:function(){return H>=F.length?{done:!0}:{done:!1,value:F[H++]}},e:function(ve){throw ve},f:fe}}throw new TypeError(`Invalid attempt to iterate non-iterable instance. -In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var ue,de=!0,W=!1;return{s:function(){U=F[Symbol.iterator]()},n:function(){var ve=U.next();return de=ve.done,ve},e:function(ve){W=!0,ue=ve},f:function(){try{de||U.return==null||U.return()}finally{if(W)throw ue}}}}function ju(F,R){(R==null||R>F.length)&&(R=F.length);for(var U=0,H=new Array(R);U0?Fe[Fe.length-1]:null,xe=K!==null&&(ro.test(K)||Ms.test(K));if(!xe){var je,Xe=Bu(ml.values());try{for(Xe.s();!(je=Xe.n()).done;){var rt=je.value,st=rt.currentDispatcherRef,xt=rt.getCurrentFiber,wt=rt.workTagMap,lt=xt();if(lt!=null){var Rt=hl(wt,lt,st);Rt!==""&&Fe.push(Rt);break}}}catch(yn){Xe.e(yn)}finally{Xe.f()}}}catch(yn){}ue.apply(void 0,Fe)};de.__REACT_DEVTOOLS_ORIGINAL_METHOD__=ue,Uu[fe]=de}catch(W){}})}}function O0(F){return(O0=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(R){return typeof R}:function(R){return R&&typeof Symbol=="function"&&R.constructor===Symbol&&R!==Symbol.prototype?"symbol":typeof R})(F)}function vl(F,R){for(var U=0;UF.length)&&(R=F.length);for(var U=0,H=new Array(R);U1?W-1:0),Fe=1;Fe0?K[K.length-1]:0),K.push(St),W.set(Ne,Fe(ft._topLevelWrapper));try{var Qt=He.apply(this,Qe);return K.pop(),Qt}catch(bn){throw K=[],bn}finally{if(K.length===0){var Cn=W.get(Ne);if(Cn===void 0)throw new Error("Expected to find root ID.");yn(Cn)}}},performUpdateIfNecessary:function(He,Qe){var Ne=Qe[0];if(P0(Ne)===9)return He.apply(this,Qe);var ft=Fe(Ne);K.push(ft);var St=ln(Ne);try{var Qt=He.apply(this,Qe),Cn=ln(Ne);return Ge(St,Cn)||Xe(Ne,ft,Cn),K.pop(),Qt}catch(p0){throw K=[],p0}finally{if(K.length===0){var bn=W.get(Ne);if(bn===void 0)throw new Error("Expected to find root ID.");yn(bn)}}},receiveComponent:function(He,Qe){var Ne=Qe[0];if(P0(Ne)===9)return He.apply(this,Qe);var ft=Fe(Ne);K.push(ft);var St=ln(Ne);try{var Qt=He.apply(this,Qe),Cn=ln(Ne);return Ge(St,Cn)||Xe(Ne,ft,Cn),K.pop(),Qt}catch(p0){throw K=[],p0}finally{if(K.length===0){var bn=W.get(Ne);if(bn===void 0)throw new Error("Expected to find root ID.");yn(bn)}}},unmountComponent:function(He,Qe){var Ne=Qe[0];if(P0(Ne)===9)return He.apply(this,Qe);var ft=Fe(Ne);K.push(ft);try{var St=He.apply(this,Qe);return K.pop(),function(Cn,bn){wt.push(bn),ue.delete(bn)}(0,ft),St}catch(Cn){throw K=[],Cn}finally{if(K.length===0){var Qt=W.get(Ne);if(Qt===void 0)throw new Error("Expected to find root ID.");yn(Qt)}}}}));var st=[],xt=new Map,wt=[],lt=0,Rt=null;function yn(He){if(st.length!==0||wt.length!==0||Rt!==null){var Qe=wt.length+(Rt===null?0:1),Ne=new Array(3+lt+(Qe>0?2+Qe:0)+st.length),ft=0;if(Ne[ft++]=R,Ne[ft++]=He,Ne[ft++]=lt,xt.forEach(function(Cn,bn){Ne[ft++]=bn.length;for(var p0=Cs(bn),h0=0;h00){Ne[ft++]=2,Ne[ft++]=Qe;for(var St=0;St"),"color: var(--dom-tag-name-color); font-weight: normal;"),Qe.props!==null&&console.log("Props:",Qe.props),Qe.state!==null&&console.log("State:",Qe.state),Qe.context!==null&&console.log("Context:",Qe.context);var ft=fe(He);ft!==null&&console.log("Node:",ft),(window.chrome||/firefox/i.test(navigator.userAgent))&&console.log("Right-click any value to save it as a global variable for further inspection."),Ne&&console.groupEnd()}else console.warn('Could not find element with id "'.concat(He,'"'))},overrideSuspense:function(){throw new Error("overrideSuspense not supported by this renderer")},overrideValueAtPath:function(He,Qe,Ne,ft,St){var Qt=ue.get(Qe);if(Qt!=null){var Cn=Qt._instance;if(Cn!=null)switch(He){case"context":fl(Cn.context,ft,St),a0(Cn);break;case"hooks":throw new Error("Hooks not supported by this renderer");case"props":var bn=Qt._currentElement;Qt._currentElement=V0(V0({},bn),{},{props:si(bn.props,ft,St)}),a0(Cn);break;case"state":fl(Cn.state,ft,St),a0(Cn)}}},renamePath:function(He,Qe,Ne,ft,St){var Qt=ue.get(Qe);if(Qt!=null){var Cn=Qt._instance;if(Cn!=null)switch(He){case"context":ll(Cn.context,ft,St),a0(Cn);break;case"hooks":throw new Error("Hooks not supported by this renderer");case"props":var bn=Qt._currentElement;Qt._currentElement=V0(V0({},bn),{},{props:Fr(bn.props,ft,St)}),a0(Cn);break;case"state":ll(Cn.state,ft,St),a0(Cn)}}},prepareViewAttributeSource:function(He,Qe){var Ne=Cr(He);Ne!==null&&(window.$attribute=Ti(Ne,Qe))},prepareViewElementSource:function(He){var Qe=ue.get(He);if(Qe!=null){var Ne=Qe._currentElement;Ne!=null?H.$type=Ne.type:console.warn('Could not find element with id "'.concat(He,'"'))}else console.warn('Could not find instance with id "'.concat(He,'"'))},renderer:U,setTraceUpdatesEnabled:function(He){},setTrackedPath:function(He){},startProfiling:function(){},stopProfiling:function(){},storeAsGlobal:function(He,Qe,Ne){var ft=Cr(He);if(ft!==null){var St=Ti(ft,Qe),Qt="$reactTemp".concat(Ne);window[Qt]=St,console.log(Qt),console.log(St)}},updateComponentFilters:function(He){}}}function nr(F,R){var U=!1,H={bottom:0,left:0,right:0,top:0},fe=R[F];if(fe!=null){for(var ue=0,de=Object.keys(H);ue0?"development":"production";var st=Function.prototype.toString;if(rt.Mount&&rt.Mount._renderNewRootComponent){var xt=st.call(rt.Mount._renderNewRootComponent);return xt.indexOf("function")!==0?"production":xt.indexOf("storedMeasure")!==-1?"development":xt.indexOf("should be a pure function")!==-1?xt.indexOf("NODE_ENV")!==-1||xt.indexOf("development")!==-1||xt.indexOf("true")!==-1?"development":xt.indexOf("nextElement")!==-1||xt.indexOf("nextComponent")!==-1?"unminified":"development":xt.indexOf("nextElement")!==-1||xt.indexOf("nextComponent")!==-1?"unminified":"outdated"}}catch(wt){}return"production"}(ve);try{var K=window.__REACT_DEVTOOLS_APPEND_COMPONENT_STACK__!==!1,xe=window.__REACT_DEVTOOLS_BREAK_ON_CONSOLE_ERRORS__===!0;(K||xe)&&(zi(ve),Ho({appendComponentStack:K,breakOnConsoleErrors:xe}))}catch(rt){}var je=F.__REACT_DEVTOOLS_ATTACH__;if(typeof je=="function"){var Xe=je(W,Fe,ve,F);W.rendererInterfaces.set(Fe,Xe)}return W.emit("renderer",{id:Fe,renderer:ve,reactBuildType:Ge}),Fe},on:function(ve,Fe){ue[ve]||(ue[ve]=[]),ue[ve].push(Fe)},off:function(ve,Fe){if(ue[ve]){var Ge=ue[ve].indexOf(Fe);Ge!==-1&&ue[ve].splice(Ge,1),ue[ve].length||delete ue[ve]}},sub:function(ve,Fe){return W.on(ve,Fe),function(){return W.off(ve,Fe)}},supportsFiber:!0,checkDCE:function(ve){try{Function.prototype.toString.call(ve).indexOf("^_^")>-1&&(U=!0,setTimeout(function(){throw new Error("React is running in production mode, but dead code elimination has not been applied. Read how to correctly configure React for production: https://reactjs.org/link/perf-use-production-build")}))}catch(Fe){}},onCommitFiberUnmount:function(ve,Fe){var Ge=fe.get(ve);Ge!=null&&Ge.handleCommitFiberUnmount(Fe)},onCommitFiberRoot:function(ve,Fe,Ge){var K=W.getFiberRoots(ve),xe=Fe.current,je=K.has(Fe),Xe=xe.memoizedState==null||xe.memoizedState.element==null;je||Xe?je&&Xe&&K.delete(Fe):K.add(Fe);var rt=fe.get(ve);rt!=null&&rt.handleCommitFiberRoot(Fe,Ge)}};Object.defineProperty(F,"__REACT_DEVTOOLS_GLOBAL_HOOK__",{configurable:!1,enumerable:!1,get:function(){return W}})})(window);var M0=window.__REACT_DEVTOOLS_GLOBAL_HOOK__,au=[{type:1,value:7,isEnabled:!0}];function Lr(F){if(M0!=null){var R=F||{},U=R.host,H=U===void 0?"localhost":U,fe=R.nativeStyleEditorValidAttributes,ue=R.useHttps,de=ue!==void 0&&ue,W=R.port,ve=W===void 0?8097:W,Fe=R.websocket,Ge=R.resolveRNStyle,K=Ge===void 0?null:Ge,xe=R.isAppActive,je=de?"wss":"ws",Xe=null;if((xe===void 0?function(){return!0}:xe)()){var rt=null,st=[],xt=je+"://"+H+":"+ve,wt=Fe||new window.WebSocket(xt);wt.onclose=function(){rt!==null&&rt.emit("shutdown"),lt()},wt.onerror=function(){lt()},wt.onmessage=function(Rt){var yn;try{if(typeof Rt.data!="string")throw Error();yn=JSON.parse(Rt.data)}catch(sn){return void console.error("[React DevTools] Failed to parse JSON: "+Rt.data)}st.forEach(function(sn){try{sn(yn)}catch(ar){throw console.log("[React DevTools] Error calling listener",yn),console.log("error:",ar),ar}})},wt.onopen=function(){(rt=new Do({listen:function(rn){return st.push(rn),function(){var Hn=st.indexOf(rn);Hn>=0&&st.splice(Hn,1)}},send:function(rn,Hn,d0){wt.readyState===wt.OPEN?wt.send(JSON.stringify({event:rn,payload:Hn})):(rt!==null&&rt.shutdown(),lt())}})).addListener("inspectElement",function(rn){var Hn=rn.id,d0=rn.rendererID,Cr=Rt.rendererInterfaces[d0];if(Cr!=null){var He=Cr.findNativeNodesForFiberID(Hn);He!=null&&He[0]!=null&&Rt.emit("showNativeHighlight",He[0])}}),rt.addListener("updateComponentFilters",function(rn){au=rn}),window.__REACT_DEVTOOLS_COMPONENT_FILTERS__==null&&rt.send("overrideComponentFilters",au);var Rt=new I0(rt);if(Rt.addListener("shutdown",function(){M0.emit("shutdown")}),function(rn,Hn,d0){if(rn==null)return function(){};var Cr=[rn.sub("renderer-attached",function(Ne){var ft=Ne.id,St=(Ne.renderer,Ne.rendererInterface);Hn.setRendererInterface(ft,St),St.flushInitialOperations()}),rn.sub("unsupported-renderer-version",function(Ne){Hn.onUnsupportedRenderer(Ne)}),rn.sub("operations",Hn.onHookOperations),rn.sub("traceUpdates",Hn.onTraceUpdates)],He=function(Ne,ft){var St=rn.rendererInterfaces.get(Ne);St==null&&(typeof ft.findFiberByHostInstance=="function"?St=uf(rn,Ne,ft,d0):ft.ComponentTree&&(St=lf(rn,Ne,ft,d0)),St!=null&&rn.rendererInterfaces.set(Ne,St)),St!=null?rn.emit("renderer-attached",{id:Ne,renderer:ft,rendererInterface:St}):rn.emit("unsupported-renderer-version",Ne)};rn.renderers.forEach(function(Ne,ft){He(ft,Ne)}),Cr.push(rn.sub("renderer",function(Ne){var ft=Ne.id,St=Ne.renderer;He(ft,St)})),rn.emit("react-devtools",Hn),rn.reactDevtoolsAgent=Hn;var Qe=function(){Cr.forEach(function(Ne){return Ne()}),rn.rendererInterfaces.forEach(function(Ne){Ne.cleanup()}),rn.reactDevtoolsAgent=null};Hn.addListener("shutdown",Qe),Cr.push(function(){Hn.removeListener("shutdown",Qe)})}(M0,Rt,window),K!=null||M0.resolveRNStyle!=null)Gu(rt,Rt,K||M0.resolveRNStyle,fe||M0.nativeStyleEditorValidAttributes||null);else{var yn,sn,ar=function(){rt!==null&&Gu(rt,Rt,yn,sn)};M0.hasOwnProperty("resolveRNStyle")||Object.defineProperty(M0,"resolveRNStyle",{enumerable:!1,get:function(){return yn},set:function(rn){yn=rn,ar()}}),M0.hasOwnProperty("nativeStyleEditorValidAttributes")||Object.defineProperty(M0,"nativeStyleEditorValidAttributes",{enumerable:!1,get:function(){return sn},set:function(rn){sn=rn,ar()}})}}}else lt()}function lt(){Xe===null&&(Xe=setTimeout(function(){return Lr(F)},2e3))}}}])})});var rS=Me(nS=>{"use strict";Object.defineProperty(nS,"__esModule",{value:!0});eS();var _j=tS();_j.connectToDevTools()});var lS=Me(x2=>{"use strict";var iS=x2&&x2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(x2,"__esModule",{value:!0});var oS=Ay(),yj=iS(lE()),uS=iS(hc()),no=Xy();process.env.DEV==="true"&&rS();var sS=i=>{i==null||i.unsetMeasureFunc(),i==null||i.freeRecursive()};x2.default=yj.default({schedulePassiveEffects:oS.unstable_scheduleCallback,cancelPassiveEffects:oS.unstable_cancelCallback,now:Date.now,getRootHostContext:()=>({isInsideText:!1}),prepareForCommit:()=>{},resetAfterCommit:i=>{if(i.isStaticDirty){i.isStaticDirty=!1,typeof i.onImmediateRender=="function"&&i.onImmediateRender();return}typeof i.onRender=="function"&&i.onRender()},getChildHostContext:(i,u)=>{let f=i.isInsideText,c=u==="ink-text"||u==="ink-virtual-text";return f===c?i:{isInsideText:c}},shouldSetTextContent:()=>!1,createInstance:(i,u,f,c)=>{if(c.isInsideText&&i==="ink-box")throw new Error(" can\u2019t be nested inside component");let g=i==="ink-text"&&c.isInsideText?"ink-virtual-text":i,t=no.createNode(g);for(let[C,A]of Object.entries(u))C!=="children"&&(C==="style"?no.setStyle(t,A):C==="internal_transform"?t.internal_transform=A:C==="internal_static"?t.internal_static=!0:no.setAttribute(t,C,A));return t},createTextInstance:(i,u,f)=>{if(!f.isInsideText)throw new Error(`Text string "${i}" must be rendered inside component`);return no.createTextNode(i)},resetTextContent:()=>{},hideTextInstance:i=>{no.setTextNodeValue(i,"")},unhideTextInstance:(i,u)=>{no.setTextNodeValue(i,u)},getPublicInstance:i=>i,hideInstance:i=>{var u;(u=i.yogaNode)===null||u===void 0||u.setDisplay(uS.default.DISPLAY_NONE)},unhideInstance:i=>{var u;(u=i.yogaNode)===null||u===void 0||u.setDisplay(uS.default.DISPLAY_FLEX)},appendInitialChild:no.appendChildNode,appendChild:no.appendChildNode,insertBefore:no.insertBeforeNode,finalizeInitialChildren:(i,u,f,c)=>(i.internal_static&&(c.isStaticDirty=!0,c.staticNode=i),!1),supportsMutation:!0,appendChildToContainer:no.appendChildNode,insertInContainerBefore:no.insertBeforeNode,removeChildFromContainer:(i,u)=>{no.removeChildNode(i,u),sS(u.yogaNode)},prepareUpdate:(i,u,f,c,g)=>{i.internal_static&&(g.isStaticDirty=!0);let t={},C=Object.keys(c);for(let A of C)if(c[A]!==f[A]){if(A==="style"&&typeof c.style=="object"&&typeof f.style=="object"){let D=c.style,L=f.style,N=Object.keys(D);for(let j of N){if(j==="borderStyle"||j==="borderColor"){if(typeof t.style!="object"){let $={};t.style=$}t.style.borderStyle=D.borderStyle,t.style.borderColor=D.borderColor}if(D[j]!==L[j]){if(typeof t.style!="object"){let $={};t.style=$}t.style[j]=D[j]}}continue}t[A]=c[A]}return t},commitUpdate:(i,u)=>{for(let[f,c]of Object.entries(u))f!=="children"&&(f==="style"?no.setStyle(i,c):f==="internal_transform"?i.internal_transform=c:f==="internal_static"?i.internal_static=!0:no.setAttribute(i,f,c))},commitTextUpdate:(i,u,f)=>{no.setTextNodeValue(i,f)},removeChild:(i,u)=>{no.removeChildNode(i,u),sS(u.yogaNode)}})});var cS=Me((Jb,fS)=>{"use strict";fS.exports=(i,u=1,f)=>{if(f=dt({indent:" ",includeEmptyLines:!1},f),typeof i!="string")throw new TypeError(`Expected \`input\` to be a \`string\`, got \`${typeof i}\``);if(typeof u!="number")throw new TypeError(`Expected \`count\` to be a \`number\`, got \`${typeof u}\``);if(typeof f.indent!="string")throw new TypeError(`Expected \`options.indent\` to be a \`string\`, got \`${typeof f.indent}\``);if(u===0)return i;let c=f.includeEmptyLines?/^/gm:/^(?!\s*$)/gm;return i.replace(c,f.indent.repeat(u))}});var aS=Me(k2=>{"use strict";var wj=k2&&k2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(k2,"__esModule",{value:!0});var Vh=wj(hc());k2.default=i=>i.getComputedWidth()-i.getComputedPadding(Vh.default.EDGE_LEFT)-i.getComputedPadding(Vh.default.EDGE_RIGHT)-i.getComputedBorder(Vh.default.EDGE_LEFT)-i.getComputedBorder(Vh.default.EDGE_RIGHT)});var pS=Me((Zb,dS)=>{dS.exports={single:{topLeft:"\u250C",topRight:"\u2510",bottomRight:"\u2518",bottomLeft:"\u2514",vertical:"\u2502",horizontal:"\u2500"},double:{topLeft:"\u2554",topRight:"\u2557",bottomRight:"\u255D",bottomLeft:"\u255A",vertical:"\u2551",horizontal:"\u2550"},round:{topLeft:"\u256D",topRight:"\u256E",bottomRight:"\u256F",bottomLeft:"\u2570",vertical:"\u2502",horizontal:"\u2500"},bold:{topLeft:"\u250F",topRight:"\u2513",bottomRight:"\u251B",bottomLeft:"\u2517",vertical:"\u2503",horizontal:"\u2501"},singleDouble:{topLeft:"\u2553",topRight:"\u2556",bottomRight:"\u255C",bottomLeft:"\u2559",vertical:"\u2551",horizontal:"\u2500"},doubleSingle:{topLeft:"\u2552",topRight:"\u2555",bottomRight:"\u255B",bottomLeft:"\u2558",vertical:"\u2502",horizontal:"\u2550"},classic:{topLeft:"+",topRight:"+",bottomRight:"+",bottomLeft:"+",vertical:"|",horizontal:"-"}}});var mS=Me((eG,m3)=>{"use strict";var hS=pS();m3.exports=hS;m3.exports.default=hS});var gS=Me((tG,vS)=>{"use strict";vS.exports=(i,u=process.argv)=>{let f=i.startsWith("-")?"":i.length===1?"-":"--",c=u.indexOf(f+i),g=u.indexOf("--");return c!==-1&&(g===-1||c{"use strict";var Dj=require("os"),yS=require("tty"),Pu=gS(),{env:oi}=process,qf;Pu("no-color")||Pu("no-colors")||Pu("color=false")||Pu("color=never")?qf=0:(Pu("color")||Pu("colors")||Pu("color=true")||Pu("color=always"))&&(qf=1);"FORCE_COLOR"in oi&&(oi.FORCE_COLOR==="true"?qf=1:oi.FORCE_COLOR==="false"?qf=0:qf=oi.FORCE_COLOR.length===0?1:Math.min(parseInt(oi.FORCE_COLOR,10),3));function v3(i){return i===0?!1:{level:i,hasBasic:!0,has256:i>=2,has16m:i>=3}}function g3(i,u){if(qf===0)return 0;if(Pu("color=16m")||Pu("color=full")||Pu("color=truecolor"))return 3;if(Pu("color=256"))return 2;if(i&&!u&&qf===void 0)return 0;let f=qf||0;if(oi.TERM==="dumb")return f;if(process.platform==="win32"){let c=Dj.release().split(".");return Number(c[0])>=10&&Number(c[2])>=10586?Number(c[2])>=14931?3:2:1}if("CI"in oi)return["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI"].some(c=>c in oi)||oi.CI_NAME==="codeship"?1:f;if("TEAMCITY_VERSION"in oi)return/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(oi.TEAMCITY_VERSION)?1:0;if("GITHUB_ACTIONS"in oi)return 1;if(oi.COLORTERM==="truecolor")return 3;if("TERM_PROGRAM"in oi){let c=parseInt((oi.TERM_PROGRAM_VERSION||"").split(".")[0],10);switch(oi.TERM_PROGRAM){case"iTerm.app":return c>=3?3:2;case"Apple_Terminal":return 2}}return/-256(color)?$/i.test(oi.TERM)?2:/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(oi.TERM)||"COLORTERM"in oi?1:f}function Ej(i){let u=g3(i,i&&i.isTTY);return v3(u)}_S.exports={supportsColor:Ej,stdout:v3(g3(!0,yS.isatty(1))),stderr:v3(g3(!0,yS.isatty(2)))}});var ES=Me((rG,DS)=>{"use strict";var Sj=(i,u,f)=>{let c=i.indexOf(u);if(c===-1)return i;let g=u.length,t=0,C="";do C+=i.substr(t,c-t)+u+f,t=c+g,c=i.indexOf(u,t);while(c!==-1);return C+=i.substr(t),C},Cj=(i,u,f,c)=>{let g=0,t="";do{let C=i[c-1]==="\r";t+=i.substr(g,(C?c-1:c)-g)+u+(C?`\r -`:` -`)+f,g=c+1,c=i.indexOf(` -`,g)}while(c!==-1);return t+=i.substr(g),t};DS.exports={stringReplaceAll:Sj,stringEncaseCRLFWithFirstIndex:Cj}});var kS=Me((iG,SS)=>{"use strict";var Tj=/(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi,CS=/(?:^|\.)(\w+)(?:\(([^)]*)\))?/g,xj=/^(['"])((?:\\.|(?!\1)[^\\])*)\1$/,kj=/\\(u(?:[a-f\d]{4}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi,Aj=new Map([["n",` -`],["r","\r"],["t"," "],["b","\b"],["f","\f"],["v","\v"],["0","\0"],["\\","\\"],["e",""],["a","\x07"]]);function TS(i){let u=i[0]==="u",f=i[1]==="{";return u&&!f&&i.length===5||i[0]==="x"&&i.length===3?String.fromCharCode(parseInt(i.slice(1),16)):u&&f?String.fromCodePoint(parseInt(i.slice(2,-1),16)):Aj.get(i)||i}function Oj(i,u){let f=[],c=u.trim().split(/\s*,\s*/g),g;for(let t of c){let C=Number(t);if(!Number.isNaN(C))f.push(C);else if(g=t.match(xj))f.push(g[2].replace(kj,(A,x,D)=>x?TS(x):D));else throw new Error(`Invalid Chalk template style argument: ${t} (in style '${i}')`)}return f}function Ij(i){CS.lastIndex=0;let u=[],f;for(;(f=CS.exec(i))!==null;){let c=f[1];if(f[2]){let g=Oj(c,f[2]);u.push([c].concat(g))}else u.push([c])}return u}function xS(i,u){let f={};for(let g of u)for(let t of g.styles)f[t[0]]=g.inverse?null:t.slice(1);let c=i;for(let[g,t]of Object.entries(f))if(!!Array.isArray(t)){if(!(g in c))throw new Error(`Unknown Chalk style: ${g}`);c=t.length>0?c[g](...t):c[g]}return c}SS.exports=(i,u)=>{let f=[],c=[],g=[];if(u.replace(Tj,(t,C,A,x,D,L)=>{if(C)g.push(TS(C));else if(x){let N=g.join("");g=[],c.push(f.length===0?N:xS(i,f)(N)),f.push({inverse:A,styles:Ij(x)})}else if(D){if(f.length===0)throw new Error("Found extraneous } in Chalk template literal");c.push(xS(i,f)(g.join(""))),g=[],f.pop()}else g.push(L)}),c.push(g.join("")),f.length>0){let t=`Chalk template literal is missing ${f.length} closing bracket${f.length===1?"":"s"} (\`}\`)`;throw new Error(t)}return c.join("")}});var Jh=Me((oG,AS)=>{"use strict";var A2=Rh(),{stdout:_3,stderr:y3}=wS(),{stringReplaceAll:Pj,stringEncaseCRLFWithFirstIndex:Mj}=ES(),{isArray:Yh}=Array,OS=["ansi","ansi","ansi256","ansi16m"],ka=Object.create(null),Fj=(i,u={})=>{if(u.level&&!(Number.isInteger(u.level)&&u.level>=0&&u.level<=3))throw new Error("The `level` option should be an integer from 0 to 3");let f=_3?_3.level:0;i.level=u.level===void 0?f:u.level},IS=class{constructor(u){return PS(u)}},PS=i=>{let u={};return Fj(u,i),u.template=(...f)=>MS(u.template,...f),Object.setPrototypeOf(u,$h.prototype),Object.setPrototypeOf(u.template,u),u.template.constructor=()=>{throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.")},u.template.Instance=IS,u.template};function $h(i){return PS(i)}for(let[i,u]of Object.entries(A2))ka[i]={get(){let f=Kh(this,w3(u.open,u.close,this._styler),this._isEmpty);return Object.defineProperty(this,i,{value:f}),f}};ka.visible={get(){let i=Kh(this,this._styler,!0);return Object.defineProperty(this,"visible",{value:i}),i}};var LS=["rgb","hex","keyword","hsl","hsv","hwb","ansi","ansi256"];for(let i of LS)ka[i]={get(){let{level:u}=this;return function(...f){let c=w3(A2.color[OS[u]][i](...f),A2.color.close,this._styler);return Kh(this,c,this._isEmpty)}}};for(let i of LS){let u="bg"+i[0].toUpperCase()+i.slice(1);ka[u]={get(){let{level:f}=this;return function(...c){let g=w3(A2.bgColor[OS[f]][i](...c),A2.bgColor.close,this._styler);return Kh(this,g,this._isEmpty)}}}}var Lj=Object.defineProperties(()=>{},zn(dt({},ka),{level:{enumerable:!0,get(){return this._generator.level},set(i){this._generator.level=i}}})),w3=(i,u,f)=>{let c,g;return f===void 0?(c=i,g=u):(c=f.openAll+i,g=u+f.closeAll),{open:i,close:u,openAll:c,closeAll:g,parent:f}},Kh=(i,u,f)=>{let c=(...g)=>Yh(g[0])&&Yh(g[0].raw)?RS(c,MS(c,...g)):RS(c,g.length===1?""+g[0]:g.join(" "));return Object.setPrototypeOf(c,Lj),c._generator=i,c._styler=u,c._isEmpty=f,c},RS=(i,u)=>{if(i.level<=0||!u)return i._isEmpty?"":u;let f=i._styler;if(f===void 0)return u;let{openAll:c,closeAll:g}=f;if(u.indexOf("")!==-1)for(;f!==void 0;)u=Pj(u,f.close,f.open),f=f.parent;let t=u.indexOf(` -`);return t!==-1&&(u=Mj(u,g,c,t)),c+u+g},D3,MS=(i,...u)=>{let[f]=u;if(!Yh(f)||!Yh(f.raw))return u.join(" ");let c=u.slice(1),g=[f.raw[0]];for(let t=1;t{"use strict";var Rj=O2&&O2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(O2,"__esModule",{value:!0});var I2=Rj(Jh()),Nj=/^(rgb|hsl|hsv|hwb)\(\s?(\d+),\s?(\d+),\s?(\d+)\s?\)$/,Bj=/^(ansi|ansi256)\(\s?(\d+)\s?\)$/,Qh=(i,u)=>u==="foreground"?i:"bg"+i[0].toUpperCase()+i.slice(1);O2.default=(i,u,f)=>{if(!u)return i;if(u in I2.default){let g=Qh(u,f);return I2.default[g](i)}if(u.startsWith("#")){let g=Qh("hex",f);return I2.default[g](u)(i)}if(u.startsWith("ansi")){let g=Bj.exec(u);if(!g)return i;let t=Qh(g[1],f),C=Number(g[2]);return I2.default[t](C)(i)}if(u.startsWith("rgb")||u.startsWith("hsl")||u.startsWith("hsv")||u.startsWith("hwb")){let g=Nj.exec(u);if(!g)return i;let t=Qh(g[1],f),C=Number(g[2]),A=Number(g[3]),x=Number(g[4]);return I2.default[t](C,A,x)(i)}return i}});var BS=Me(P2=>{"use strict";var NS=P2&&P2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(P2,"__esModule",{value:!0});var jj=NS(mS()),S3=NS(E3());P2.default=(i,u,f,c)=>{if(typeof f.style.borderStyle=="string"){let g=f.yogaNode.getComputedWidth(),t=f.yogaNode.getComputedHeight(),C=f.style.borderColor,A=jj.default[f.style.borderStyle],x=S3.default(A.topLeft+A.horizontal.repeat(g-2)+A.topRight,C,"foreground"),D=(S3.default(A.vertical,C,"foreground")+` -`).repeat(t-2),L=S3.default(A.bottomLeft+A.horizontal.repeat(g-2)+A.bottomRight,C,"foreground");c.write(i,u,x,{transformers:[]}),c.write(i,u+1,D,{transformers:[]}),c.write(i+g-1,u+1,D,{transformers:[]}),c.write(i,u+t-1,L,{transformers:[]})}}});var US=Me(M2=>{"use strict";var _c=M2&&M2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(M2,"__esModule",{value:!0});var Uj=_c(hc()),qj=_c(jy()),zj=_c(cS()),Wj=_c(Yy()),Hj=_c(aS()),bj=_c(Ky()),Gj=_c(BS()),Vj=(i,u)=>{var f;let c=(f=i.childNodes[0])===null||f===void 0?void 0:f.yogaNode;if(c){let g=c.getComputedLeft(),t=c.getComputedTop();u=` -`.repeat(t)+zj.default(u,g)}return u},jS=(i,u,f)=>{var c;let{offsetX:g=0,offsetY:t=0,transformers:C=[],skipStaticElements:A}=f;if(A&&i.internal_static)return;let{yogaNode:x}=i;if(x){if(x.getDisplay()===Uj.default.DISPLAY_NONE)return;let D=g+x.getComputedLeft(),L=t+x.getComputedTop(),N=C;if(typeof i.internal_transform=="function"&&(N=[i.internal_transform,...C]),i.nodeName==="ink-text"){let j=bj.default(i);if(j.length>0){let $=qj.default(j),h=Hj.default(x);if($>h){let re=(c=i.style.textWrap)!==null&&c!==void 0?c:"wrap";j=Wj.default(j,h,re)}j=Vj(i,j),u.write(D,L,j,{transformers:N})}return}if(i.nodeName==="ink-box"&&Gj.default(D,L,i,u),i.nodeName==="ink-root"||i.nodeName==="ink-box")for(let j of i.childNodes)jS(j,u,{offsetX:D,offsetY:L,transformers:N,skipStaticElements:A})}};M2.default=jS});var zS=Me((fG,qS)=>{"use strict";qS.exports=i=>{i=Object.assign({onlyFirst:!1},i);let u=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(u,i.onlyFirst?void 0:"g")}});var HS=Me((cG,C3)=>{"use strict";var Yj=zS(),WS=i=>typeof i=="string"?i.replace(Yj(),""):i;C3.exports=WS;C3.exports.default=WS});var VS=Me((aG,bS)=>{"use strict";var GS="[\uD800-\uDBFF][\uDC00-\uDFFF]";bS.exports=i=>i&&i.exact?new RegExp(`^${GS}$`):new RegExp(GS,"g")});var $S=Me((dG,T3)=>{"use strict";var $j=HS(),Kj=VS(),YS=i=>$j(i).replace(Kj()," ").length;T3.exports=YS;T3.exports.default=YS});var QS=Me(F2=>{"use strict";var KS=F2&&F2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(F2,"__esModule",{value:!0});var XS=KS(Gy()),Xj=KS($S()),JS=class{constructor(u){this.writes=[];let{width:f,height:c}=u;this.width=f,this.height=c}write(u,f,c,g){let{transformers:t}=g;!c||this.writes.push({x:u,y:f,text:c,transformers:t})}get(){let u=[];for(let c=0;cc.trimRight()).join(` -`),height:u.length}}};F2.default=JS});var t5=Me(L2=>{"use strict";var x3=L2&&L2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(L2,"__esModule",{value:!0});var Jj=x3(hc()),ZS=x3(US()),e5=x3(QS());L2.default=(i,u)=>{var f;if(i.yogaNode.setWidth(u),i.yogaNode){i.yogaNode.calculateLayout(void 0,void 0,Jj.default.DIRECTION_LTR);let c=new e5.default({width:i.yogaNode.getComputedWidth(),height:i.yogaNode.getComputedHeight()});ZS.default(i,c,{skipStaticElements:!0});let g;((f=i.staticNode)===null||f===void 0?void 0:f.yogaNode)&&(g=new e5.default({width:i.staticNode.yogaNode.getComputedWidth(),height:i.staticNode.yogaNode.getComputedHeight()}),ZS.default(i.staticNode,g,{skipStaticElements:!1}));let{output:t,height:C}=c.get();return{output:t,outputHeight:C,staticOutput:g?`${g.get().output} -`:""}}return{output:"",outputHeight:0,staticOutput:""}}});var o5=Me((mG,n5)=>{"use strict";var r5=require("stream"),i5=["assert","count","countReset","debug","dir","dirxml","error","group","groupCollapsed","groupEnd","info","log","table","time","timeEnd","timeLog","trace","warn"],k3={},Qj=i=>{let u=new r5.PassThrough,f=new r5.PassThrough;u.write=g=>i("stdout",g),f.write=g=>i("stderr",g);let c=new console.Console(u,f);for(let g of i5)k3[g]=console[g],console[g]=c[g];return()=>{for(let g of i5)console[g]=k3[g];k3={}}};n5.exports=Qj});var O3=Me(A3=>{"use strict";Object.defineProperty(A3,"__esModule",{value:!0});A3.default=new WeakMap});var P3=Me(I3=>{"use strict";Object.defineProperty(I3,"__esModule",{value:!0});var Zj=lr(),u5=Zj.createContext({exit:()=>{}});u5.displayName="InternalAppContext";I3.default=u5});var F3=Me(M3=>{"use strict";Object.defineProperty(M3,"__esModule",{value:!0});var eU=lr(),s5=eU.createContext({stdin:void 0,setRawMode:()=>{},isRawModeSupported:!1,internal_exitOnCtrlC:!0});s5.displayName="InternalStdinContext";M3.default=s5});var R3=Me(L3=>{"use strict";Object.defineProperty(L3,"__esModule",{value:!0});var tU=lr(),l5=tU.createContext({stdout:void 0,write:()=>{}});l5.displayName="InternalStdoutContext";L3.default=l5});var B3=Me(N3=>{"use strict";Object.defineProperty(N3,"__esModule",{value:!0});var nU=lr(),f5=nU.createContext({stderr:void 0,write:()=>{}});f5.displayName="InternalStderrContext";N3.default=f5});var Zh=Me(j3=>{"use strict";Object.defineProperty(j3,"__esModule",{value:!0});var rU=lr(),c5=rU.createContext({activeId:void 0,add:()=>{},remove:()=>{},activate:()=>{},deactivate:()=>{},enableFocus:()=>{},disableFocus:()=>{},focusNext:()=>{},focusPrevious:()=>{}});c5.displayName="InternalFocusContext";j3.default=c5});var d5=Me((EG,a5)=>{"use strict";var iU=/[|\\{}()[\]^$+*?.-]/g;a5.exports=i=>{if(typeof i!="string")throw new TypeError("Expected a string");return i.replace(iU,"\\$&")}});var v5=Me((SG,p5)=>{"use strict";var oU=d5(),h5=[].concat(require("module").builtinModules,"bootstrap_node","node").map(i=>new RegExp(`(?:\\(${i}\\.js:\\d+:\\d+\\)$|^\\s*at ${i}\\.js:\\d+:\\d+$)`));h5.push(/\(internal\/[^:]+:\d+:\d+\)$/,/\s*at internal\/[^:]+:\d+:\d+$/,/\/\.node-spawn-wrap-\w+-\w+\/node:\d+:\d+\)?$/);var em=class{constructor(u){u=dt({ignoredPackages:[]},u),"internals"in u||(u.internals=em.nodeInternals()),"cwd"in u||(u.cwd=process.cwd()),this._cwd=u.cwd.replace(/\\/g,"/"),this._internals=[].concat(u.internals,uU(u.ignoredPackages)),this._wrapCallSite=u.wrapCallSite||!1}static nodeInternals(){return[...h5]}clean(u,f=0){f=" ".repeat(f),Array.isArray(u)||(u=u.split(` -`)),!/^\s*at /.test(u[0])&&/^\s*at /.test(u[1])&&(u=u.slice(1));let c=!1,g=null,t=[];return u.forEach(C=>{if(C=C.replace(/\\/g,"/"),this._internals.some(x=>x.test(C)))return;let A=/^\s*at /.test(C);c?C=C.trimEnd().replace(/^(\s+)at /,"$1"):(C=C.trim(),A&&(C=C.slice(3))),C=C.replace(`${this._cwd}/`,""),C&&(A?(g&&(t.push(g),g=null),t.push(C)):(c=!0,g=C))}),t.map(C=>`${f}${C} -`).join("")}captureString(u,f=this.captureString){typeof u=="function"&&(f=u,u=Infinity);let{stackTraceLimit:c}=Error;u&&(Error.stackTraceLimit=u);let g={};Error.captureStackTrace(g,f);let{stack:t}=g;return Error.stackTraceLimit=c,this.clean(t)}capture(u,f=this.capture){typeof u=="function"&&(f=u,u=Infinity);let{prepareStackTrace:c,stackTraceLimit:g}=Error;Error.prepareStackTrace=(A,x)=>this._wrapCallSite?x.map(this._wrapCallSite):x,u&&(Error.stackTraceLimit=u);let t={};Error.captureStackTrace(t,f);let{stack:C}=t;return Object.assign(Error,{prepareStackTrace:c,stackTraceLimit:g}),C}at(u=this.at){let[f]=this.capture(1,u);if(!f)return{};let c={line:f.getLineNumber(),column:f.getColumnNumber()};m5(c,f.getFileName(),this._cwd),f.isConstructor()&&(c.constructor=!0),f.isEval()&&(c.evalOrigin=f.getEvalOrigin()),f.isNative()&&(c.native=!0);let g;try{g=f.getTypeName()}catch(A){}g&&g!=="Object"&&g!=="[object Object]"&&(c.type=g);let t=f.getFunctionName();t&&(c.function=t);let C=f.getMethodName();return C&&t!==C&&(c.method=C),c}parseLine(u){let f=u&&u.match(sU);if(!f)return null;let c=f[1]==="new",g=f[2],t=f[3],C=f[4],A=Number(f[5]),x=Number(f[6]),D=f[7],L=f[8],N=f[9],j=f[10]==="native",$=f[11]===")",h,re={};if(L&&(re.line=Number(L)),N&&(re.column=Number(N)),$&&D){let ce=0;for(let Q=D.length-1;Q>0;Q--)if(D.charAt(Q)===")")ce++;else if(D.charAt(Q)==="("&&D.charAt(Q-1)===" "&&(ce--,ce===-1&&D.charAt(Q-1)===" ")){let oe=D.slice(0,Q-1);D=D.slice(Q+1),g+=` (${oe}`;break}}if(g){let ce=g.match(lU);ce&&(g=ce[1],h=ce[2])}return m5(re,D,this._cwd),c&&(re.constructor=!0),t&&(re.evalOrigin=t,re.evalLine=A,re.evalColumn=x,re.evalFile=C&&C.replace(/\\/g,"/")),j&&(re.native=!0),g&&(re.function=g),h&&g!==h&&(re.method=h),re}};function m5(i,u,f){u&&(u=u.replace(/\\/g,"/"),u.startsWith(`${f}/`)&&(u=u.slice(f.length+1)),i.file=u)}function uU(i){if(i.length===0)return[];let u=i.map(f=>oU(f));return new RegExp(`[/\\\\]node_modules[/\\\\](?:${u.join("|")})[/\\\\][^:]+:\\d+:\\d+`)}var sU=new RegExp("^(?:\\s*at )?(?:(new) )?(?:(.*?) \\()?(?:eval at ([^ ]+) \\((.+?):(\\d+):(\\d+)\\), )?(?:(.+?):(\\d+):(\\d+)|(native))(\\)?)$"),lU=/^(.*?) \[as (.*?)\]$/;p5.exports=em});var _5=Me((CG,g5)=>{"use strict";g5.exports=(i,u)=>i.replace(/^\t+/gm,f=>" ".repeat(f.length*(u||2)))});var w5=Me((TG,y5)=>{"use strict";var fU=_5(),cU=(i,u)=>{let f=[],c=i-u,g=i+u;for(let t=c;t<=g;t++)f.push(t);return f};y5.exports=(i,u,f)=>{if(typeof i!="string")throw new TypeError("Source code is missing.");if(!u||u<1)throw new TypeError("Line number must start from `1`.");if(i=fU(i).split(/\r?\n/),!(u>i.length))return f=dt({around:3},f),cU(u,f.around).filter(c=>i[c-1]!==void 0).map(c=>({line:c,value:i[c-1]}))}});var tm=Me(hs=>{"use strict";var aU=hs&&hs.__createBinding||(Object.create?function(i,u,f,c){c===void 0&&(c=f),Object.defineProperty(i,c,{enumerable:!0,get:function(){return u[f]}})}:function(i,u,f,c){c===void 0&&(c=f),i[c]=u[f]}),dU=hs&&hs.__setModuleDefault||(Object.create?function(i,u){Object.defineProperty(i,"default",{enumerable:!0,value:u})}:function(i,u){i.default=u}),pU=hs&&hs.__importStar||function(i){if(i&&i.__esModule)return i;var u={};if(i!=null)for(var f in i)f!=="default"&&Object.hasOwnProperty.call(i,f)&&aU(u,i,f);return dU(u,i),u},hU=hs&&hs.__rest||function(i,u){var f={};for(var c in i)Object.prototype.hasOwnProperty.call(i,c)&&u.indexOf(c)<0&&(f[c]=i[c]);if(i!=null&&typeof Object.getOwnPropertySymbols=="function")for(var g=0,c=Object.getOwnPropertySymbols(i);g{var{children:f}=i,c=hU(i,["children"]);let g=Object.assign(Object.assign({},c),{marginLeft:c.marginLeft||c.marginX||c.margin||0,marginRight:c.marginRight||c.marginX||c.margin||0,marginTop:c.marginTop||c.marginY||c.margin||0,marginBottom:c.marginBottom||c.marginY||c.margin||0,paddingLeft:c.paddingLeft||c.paddingX||c.padding||0,paddingRight:c.paddingRight||c.paddingX||c.padding||0,paddingTop:c.paddingTop||c.paddingY||c.padding||0,paddingBottom:c.paddingBottom||c.paddingY||c.padding||0});return D5.default.createElement("ink-box",{ref:u,style:g},f)});U3.displayName="Box";U3.defaultProps={flexDirection:"row",flexGrow:0,flexShrink:1};hs.default=U3});var W3=Me(R2=>{"use strict";var q3=R2&&R2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(R2,"__esModule",{value:!0});var mU=q3(lr()),Aa=q3(Jh()),E5=q3(E3()),z3=({color:i,backgroundColor:u,dimColor:f,bold:c,italic:g,underline:t,strikethrough:C,inverse:A,wrap:x,children:D})=>{if(D==null)return null;let L=N=>(f&&(N=Aa.default.dim(N)),i&&(N=E5.default(N,i,"foreground")),u&&(N=E5.default(N,u,"background")),c&&(N=Aa.default.bold(N)),g&&(N=Aa.default.italic(N)),t&&(N=Aa.default.underline(N)),C&&(N=Aa.default.strikethrough(N)),A&&(N=Aa.default.inverse(N)),N);return mU.default.createElement("ink-text",{style:{flexGrow:0,flexShrink:1,flexDirection:"row",textWrap:x},internal_transform:L},D)};z3.displayName="Text";z3.defaultProps={dimColor:!1,bold:!1,italic:!1,underline:!1,strikethrough:!1,wrap:"wrap"};R2.default=z3});var x5=Me(ms=>{"use strict";var vU=ms&&ms.__createBinding||(Object.create?function(i,u,f,c){c===void 0&&(c=f),Object.defineProperty(i,c,{enumerable:!0,get:function(){return u[f]}})}:function(i,u,f,c){c===void 0&&(c=f),i[c]=u[f]}),gU=ms&&ms.__setModuleDefault||(Object.create?function(i,u){Object.defineProperty(i,"default",{enumerable:!0,value:u})}:function(i,u){i.default=u}),_U=ms&&ms.__importStar||function(i){if(i&&i.__esModule)return i;var u={};if(i!=null)for(var f in i)f!=="default"&&Object.hasOwnProperty.call(i,f)&&vU(u,i,f);return gU(u,i),u},N2=ms&&ms.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(ms,"__esModule",{value:!0});var S5=_U(require("fs")),ui=N2(lr()),C5=N2(v5()),yU=N2(w5()),ef=N2(tm()),il=N2(W3()),T5=new C5.default({cwd:process.cwd(),internals:C5.default.nodeInternals()}),wU=({error:i})=>{let u=i.stack?i.stack.split(` -`).slice(1):void 0,f=u?T5.parseLine(u[0]):void 0,c,g=0;if((f==null?void 0:f.file)&&(f==null?void 0:f.line)&&S5.existsSync(f.file)){let t=S5.readFileSync(f.file,"utf8");if(c=yU.default(t,f.line),c)for(let{line:C}of c)g=Math.max(g,String(C).length)}return ui.default.createElement(ef.default,{flexDirection:"column",padding:1},ui.default.createElement(ef.default,null,ui.default.createElement(il.default,{backgroundColor:"red",color:"white"}," ","ERROR"," "),ui.default.createElement(il.default,null," ",i.message)),f&&ui.default.createElement(ef.default,{marginTop:1},ui.default.createElement(il.default,{dimColor:!0},f.file,":",f.line,":",f.column)),f&&c&&ui.default.createElement(ef.default,{marginTop:1,flexDirection:"column"},c.map(({line:t,value:C})=>ui.default.createElement(ef.default,{key:t},ui.default.createElement(ef.default,{width:g+1},ui.default.createElement(il.default,{dimColor:t!==f.line,backgroundColor:t===f.line?"red":void 0,color:t===f.line?"white":void 0},String(t).padStart(g," "),":")),ui.default.createElement(il.default,{key:t,backgroundColor:t===f.line?"red":void 0,color:t===f.line?"white":void 0}," "+C)))),i.stack&&ui.default.createElement(ef.default,{marginTop:1,flexDirection:"column"},i.stack.split(` -`).slice(1).map(t=>{let C=T5.parseLine(t);return C?ui.default.createElement(ef.default,{key:t},ui.default.createElement(il.default,{dimColor:!0},"- "),ui.default.createElement(il.default,{dimColor:!0,bold:!0},C.function),ui.default.createElement(il.default,{dimColor:!0,color:"gray"}," ","(",C.file,":",C.line,":",C.column,")")):ui.default.createElement(ef.default,{key:t},ui.default.createElement(il.default,{dimColor:!0},"- "),ui.default.createElement(il.default,{dimColor:!0,bold:!0},t))})))};ms.default=wU});var A5=Me(vs=>{"use strict";var DU=vs&&vs.__createBinding||(Object.create?function(i,u,f,c){c===void 0&&(c=f),Object.defineProperty(i,c,{enumerable:!0,get:function(){return u[f]}})}:function(i,u,f,c){c===void 0&&(c=f),i[c]=u[f]}),EU=vs&&vs.__setModuleDefault||(Object.create?function(i,u){Object.defineProperty(i,"default",{enumerable:!0,value:u})}:function(i,u){i.default=u}),SU=vs&&vs.__importStar||function(i){if(i&&i.__esModule)return i;var u={};if(i!=null)for(var f in i)f!=="default"&&Object.hasOwnProperty.call(i,f)&&DU(u,i,f);return EU(u,i),u},yc=vs&&vs.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(vs,"__esModule",{value:!0});var wc=SU(lr()),k5=yc(gy()),CU=yc(P3()),TU=yc(F3()),xU=yc(R3()),kU=yc(B3()),AU=yc(Zh()),OU=yc(x5()),IU=" ",PU="",MU="",H3=class extends wc.PureComponent{constructor(){super(...arguments);this.state={isFocusEnabled:!0,activeFocusId:void 0,focusables:[],error:void 0},this.rawModeEnabledCount=0,this.handleSetRawMode=u=>{let{stdin:f}=this.props;if(!this.isRawModeSupported())throw f===process.stdin?new Error(`Raw mode is not supported on the current process.stdin, which Ink uses as input stream by default. -Read about how to prevent this error on https://github.com/vadimdemedes/ink/#israwmodesupported`):new Error(`Raw mode is not supported on the stdin provided to Ink. -Read about how to prevent this error on https://github.com/vadimdemedes/ink/#israwmodesupported`);if(f.setEncoding("utf8"),u){this.rawModeEnabledCount===0&&(f.addListener("data",this.handleInput),f.resume(),f.setRawMode(!0)),this.rawModeEnabledCount++;return}--this.rawModeEnabledCount==0&&(f.setRawMode(!1),f.removeListener("data",this.handleInput),f.pause())},this.handleInput=u=>{u===""&&this.props.exitOnCtrlC&&this.handleExit(),u===MU&&this.state.activeFocusId&&this.setState({activeFocusId:void 0}),this.state.isFocusEnabled&&this.state.focusables.length>0&&(u===IU&&this.focusNext(),u===PU&&this.focusPrevious())},this.handleExit=u=>{this.isRawModeSupported()&&this.handleSetRawMode(!1),this.props.onExit(u)},this.enableFocus=()=>{this.setState({isFocusEnabled:!0})},this.disableFocus=()=>{this.setState({isFocusEnabled:!1})},this.focusNext=()=>{this.setState(u=>{let f=u.focusables[0].id;return{activeFocusId:this.findNextFocusable(u)||f}})},this.focusPrevious=()=>{this.setState(u=>{let f=u.focusables[u.focusables.length-1].id;return{activeFocusId:this.findPreviousFocusable(u)||f}})},this.addFocusable=(u,{autoFocus:f})=>{this.setState(c=>{let g=c.activeFocusId;return!g&&f&&(g=u),{activeFocusId:g,focusables:[...c.focusables,{id:u,isActive:!0}]}})},this.removeFocusable=u=>{this.setState(f=>({activeFocusId:f.activeFocusId===u?void 0:f.activeFocusId,focusables:f.focusables.filter(c=>c.id!==u)}))},this.activateFocusable=u=>{this.setState(f=>({focusables:f.focusables.map(c=>c.id!==u?c:{id:u,isActive:!0})}))},this.deactivateFocusable=u=>{this.setState(f=>({activeFocusId:f.activeFocusId===u?void 0:f.activeFocusId,focusables:f.focusables.map(c=>c.id!==u?c:{id:u,isActive:!1})}))},this.findNextFocusable=u=>{let f=u.focusables.findIndex(c=>c.id===u.activeFocusId);for(let c=f+1;c{let f=u.focusables.findIndex(c=>c.id===u.activeFocusId);for(let c=f-1;c>=0;c--)if(u.focusables[c].isActive)return u.focusables[c].id}}static getDerivedStateFromError(u){return{error:u}}isRawModeSupported(){return this.props.stdin.isTTY}render(){return wc.default.createElement(CU.default.Provider,{value:{exit:this.handleExit}},wc.default.createElement(TU.default.Provider,{value:{stdin:this.props.stdin,setRawMode:this.handleSetRawMode,isRawModeSupported:this.isRawModeSupported(),internal_exitOnCtrlC:this.props.exitOnCtrlC}},wc.default.createElement(xU.default.Provider,{value:{stdout:this.props.stdout,write:this.props.writeToStdout}},wc.default.createElement(kU.default.Provider,{value:{stderr:this.props.stderr,write:this.props.writeToStderr}},wc.default.createElement(AU.default.Provider,{value:{activeId:this.state.activeFocusId,add:this.addFocusable,remove:this.removeFocusable,activate:this.activateFocusable,deactivate:this.deactivateFocusable,enableFocus:this.enableFocus,disableFocus:this.disableFocus,focusNext:this.focusNext,focusPrevious:this.focusPrevious}},this.state.error?wc.default.createElement(OU.default,{error:this.state.error}):this.props.children)))))}componentDidMount(){k5.default.hide(this.props.stdout)}componentWillUnmount(){k5.default.show(this.props.stdout),this.isRawModeSupported()&&this.handleSetRawMode(!1)}componentDidCatch(u){this.handleExit(u)}};vs.default=H3;H3.displayName="InternalApp"});var M5=Me(gs=>{"use strict";var FU=gs&&gs.__createBinding||(Object.create?function(i,u,f,c){c===void 0&&(c=f),Object.defineProperty(i,c,{enumerable:!0,get:function(){return u[f]}})}:function(i,u,f,c){c===void 0&&(c=f),i[c]=u[f]}),LU=gs&&gs.__setModuleDefault||(Object.create?function(i,u){Object.defineProperty(i,"default",{enumerable:!0,value:u})}:function(i,u){i.default=u}),RU=gs&&gs.__importStar||function(i){if(i&&i.__esModule)return i;var u={};if(i!=null)for(var f in i)f!=="default"&&Object.hasOwnProperty.call(i,f)&&FU(u,i,f);return LU(u,i),u},_s=gs&&gs.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(gs,"__esModule",{value:!0});var NU=_s(lr()),O5=AD(),BU=_s(WD()),jU=_s(ay()),UU=_s(KD()),qU=_s(JD()),nm=_s(lS()),zU=_s(t5()),WU=_s(vy()),HU=_s(o5()),bU=RU(Xy()),GU=_s(O3()),VU=_s(A5()),Oa=process.env.CI==="false"?!1:UU.default,I5=()=>{},P5=class{constructor(u){this.resolveExitPromise=()=>{},this.rejectExitPromise=()=>{},this.unsubscribeExit=()=>{},this.onRender=()=>{if(this.isUnmounted)return;let{output:f,outputHeight:c,staticOutput:g}=zU.default(this.rootNode,this.options.stdout.columns||80),t=g&&g!==` -`;if(this.options.debug){t&&(this.fullStaticOutput+=g),this.options.stdout.write(this.fullStaticOutput+f);return}if(Oa){t&&this.options.stdout.write(g),this.lastOutput=f;return}if(t&&(this.fullStaticOutput+=g),c>=this.options.stdout.rows){this.options.stdout.write(jU.default.clearTerminal+this.fullStaticOutput+f),this.lastOutput=f;return}t&&(this.log.clear(),this.options.stdout.write(g),this.log(f)),!t&&f!==this.lastOutput&&this.throttledLog(f),this.lastOutput=f},qU.default(this),this.options=u,this.rootNode=bU.createNode("ink-root"),this.rootNode.onRender=u.debug?this.onRender:O5.throttle(this.onRender,32,{leading:!0,trailing:!0}),this.rootNode.onImmediateRender=this.onRender,this.log=BU.default.create(u.stdout),this.throttledLog=u.debug?this.log:O5.throttle(this.log,void 0,{leading:!0,trailing:!0}),this.isUnmounted=!1,this.lastOutput="",this.fullStaticOutput="",this.container=nm.default.createContainer(this.rootNode,!1,!1),this.unsubscribeExit=WU.default(this.unmount,{alwaysLast:!1}),process.env.DEV==="true"&&nm.default.injectIntoDevTools({bundleType:0,version:"16.13.1",rendererPackageName:"ink"}),u.patchConsole&&this.patchConsole(),Oa||(u.stdout.on("resize",this.onRender),this.unsubscribeResize=()=>{u.stdout.off("resize",this.onRender)})}render(u){let f=NU.default.createElement(VU.default,{stdin:this.options.stdin,stdout:this.options.stdout,stderr:this.options.stderr,writeToStdout:this.writeToStdout,writeToStderr:this.writeToStderr,exitOnCtrlC:this.options.exitOnCtrlC,onExit:this.unmount},u);nm.default.updateContainer(f,this.container,null,I5)}writeToStdout(u){if(!this.isUnmounted){if(this.options.debug){this.options.stdout.write(u+this.fullStaticOutput+this.lastOutput);return}if(Oa){this.options.stdout.write(u);return}this.log.clear(),this.options.stdout.write(u),this.log(this.lastOutput)}}writeToStderr(u){if(!this.isUnmounted){if(this.options.debug){this.options.stderr.write(u),this.options.stdout.write(this.fullStaticOutput+this.lastOutput);return}if(Oa){this.options.stderr.write(u);return}this.log.clear(),this.options.stderr.write(u),this.log(this.lastOutput)}}unmount(u){this.isUnmounted||(this.onRender(),this.unsubscribeExit(),typeof this.restoreConsole=="function"&&this.restoreConsole(),typeof this.unsubscribeResize=="function"&&this.unsubscribeResize(),Oa?this.options.stdout.write(this.lastOutput+` -`):this.options.debug||this.log.done(),this.isUnmounted=!0,nm.default.updateContainer(null,this.container,null,I5),GU.default.delete(this.options.stdout),u instanceof Error?this.rejectExitPromise(u):this.resolveExitPromise())}waitUntilExit(){return this.exitPromise||(this.exitPromise=new Promise((u,f)=>{this.resolveExitPromise=u,this.rejectExitPromise=f})),this.exitPromise}clear(){!Oa&&!this.options.debug&&this.log.clear()}patchConsole(){this.options.debug||(this.restoreConsole=HU.default((u,f)=>{u==="stdout"&&this.writeToStdout(f),u==="stderr"&&(f.startsWith("The above error occurred")||this.writeToStderr(f))}))}};gs.default=P5});var L5=Me(B2=>{"use strict";var F5=B2&&B2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(B2,"__esModule",{value:!0});var YU=F5(M5()),rm=F5(O3()),$U=require("stream"),JU=(i,u)=>{let f=Object.assign({stdout:process.stdout,stdin:process.stdin,stderr:process.stderr,debug:!1,exitOnCtrlC:!0,patchConsole:!0},KU(u)),c=XU(f.stdout,()=>new YU.default(f));return c.render(i),{rerender:c.render,unmount:()=>c.unmount(),waitUntilExit:c.waitUntilExit,cleanup:()=>rm.default.delete(f.stdout),clear:c.clear}};B2.default=JU;var KU=(i={})=>i instanceof $U.Stream?{stdout:i,stdin:process.stdin}:i,XU=(i,u)=>{let f;return rm.default.has(i)?f=rm.default.get(i):(f=u(),rm.default.set(i,f)),f}});var N5=Me(tf=>{"use strict";var QU=tf&&tf.__createBinding||(Object.create?function(i,u,f,c){c===void 0&&(c=f),Object.defineProperty(i,c,{enumerable:!0,get:function(){return u[f]}})}:function(i,u,f,c){c===void 0&&(c=f),i[c]=u[f]}),ZU=tf&&tf.__setModuleDefault||(Object.create?function(i,u){Object.defineProperty(i,"default",{enumerable:!0,value:u})}:function(i,u){i.default=u}),eq=tf&&tf.__importStar||function(i){if(i&&i.__esModule)return i;var u={};if(i!=null)for(var f in i)f!=="default"&&Object.hasOwnProperty.call(i,f)&&QU(u,i,f);return ZU(u,i),u};Object.defineProperty(tf,"__esModule",{value:!0});var j2=eq(lr()),R5=i=>{let{items:u,children:f,style:c}=i,[g,t]=j2.useState(0),C=j2.useMemo(()=>u.slice(g),[u,g]);j2.useLayoutEffect(()=>{t(u.length)},[u.length]);let A=C.map((D,L)=>f(D,g+L)),x=j2.useMemo(()=>Object.assign({position:"absolute",flexDirection:"column"},c),[c]);return j2.default.createElement("ink-box",{internal_static:!0,style:x},A)};R5.displayName="Static";tf.default=R5});var j5=Me(U2=>{"use strict";var tq=U2&&U2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(U2,"__esModule",{value:!0});var nq=tq(lr()),B5=({children:i,transform:u})=>i==null?null:nq.default.createElement("ink-text",{style:{flexGrow:0,flexShrink:1,flexDirection:"row"},internal_transform:u},i);B5.displayName="Transform";U2.default=B5});var q5=Me(q2=>{"use strict";var rq=q2&&q2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(q2,"__esModule",{value:!0});var iq=rq(lr()),U5=({count:i=1})=>iq.default.createElement("ink-text",null,` -`.repeat(i));U5.displayName="Newline";q2.default=U5});var H5=Me(z2=>{"use strict";var z5=z2&&z2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(z2,"__esModule",{value:!0});var oq=z5(lr()),uq=z5(tm()),W5=()=>oq.default.createElement(uq.default,{flexGrow:1});W5.displayName="Spacer";z2.default=W5});var im=Me(W2=>{"use strict";var sq=W2&&W2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(W2,"__esModule",{value:!0});var lq=lr(),fq=sq(F3()),cq=()=>lq.useContext(fq.default);W2.default=cq});var G5=Me(H2=>{"use strict";var aq=H2&&H2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(H2,"__esModule",{value:!0});var b5=lr(),dq=aq(im()),pq=(i,u={})=>{let{stdin:f,setRawMode:c,internal_exitOnCtrlC:g}=dq.default();b5.useEffect(()=>{if(u.isActive!==!1)return c(!0),()=>{c(!1)}},[u.isActive,c]),b5.useEffect(()=>{if(u.isActive===!1)return;let t=C=>{let A=String(C),x={upArrow:A==="",downArrow:A==="",leftArrow:A==="",rightArrow:A==="",pageDown:A==="[6~",pageUp:A==="[5~",return:A==="\r",escape:A==="",ctrl:!1,shift:!1,tab:A===" "||A==="",backspace:A==="\b",delete:A==="\x7F"||A==="[3~",meta:!1};A<=""&&!x.return&&(A=String.fromCharCode(A.charCodeAt(0)+"a".charCodeAt(0)-1),x.ctrl=!0),A.startsWith("")&&(A=A.slice(1),x.meta=!0);let D=A>="A"&&A<="Z",L=A>="\u0410"&&A<="\u042F";A.length===1&&(D||L)&&(x.shift=!0),x.tab&&A==="[Z"&&(x.shift=!0),(x.tab||x.backspace||x.delete)&&(A=""),(!(A==="c"&&x.ctrl)||!g)&&i(A,x)};return f==null||f.on("data",t),()=>{f==null||f.off("data",t)}},[u.isActive,f,g,i])};H2.default=pq});var V5=Me(b2=>{"use strict";var hq=b2&&b2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(b2,"__esModule",{value:!0});var mq=lr(),vq=hq(P3()),gq=()=>mq.useContext(vq.default);b2.default=gq});var Y5=Me(G2=>{"use strict";var _q=G2&&G2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(G2,"__esModule",{value:!0});var yq=lr(),wq=_q(R3()),Dq=()=>yq.useContext(wq.default);G2.default=Dq});var $5=Me(V2=>{"use strict";var Eq=V2&&V2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(V2,"__esModule",{value:!0});var Sq=lr(),Cq=Eq(B3()),Tq=()=>Sq.useContext(Cq.default);V2.default=Tq});var X5=Me(Y2=>{"use strict";var K5=Y2&&Y2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(Y2,"__esModule",{value:!0});var $2=lr(),xq=K5(Zh()),kq=K5(im()),Aq=({isActive:i=!0,autoFocus:u=!1}={})=>{let{isRawModeSupported:f,setRawMode:c}=kq.default(),{activeId:g,add:t,remove:C,activate:A,deactivate:x}=$2.useContext(xq.default),D=$2.useMemo(()=>Math.random().toString().slice(2,7),[]);return $2.useEffect(()=>(t(D,{autoFocus:u}),()=>{C(D)}),[D,u]),$2.useEffect(()=>{i?A(D):x(D)},[i,D]),$2.useEffect(()=>{if(!(!f||!i))return c(!0),()=>{c(!1)}},[i]),{isFocused:Boolean(D)&&g===D}};Y2.default=Aq});var J5=Me(K2=>{"use strict";var Oq=K2&&K2.__importDefault||function(i){return i&&i.__esModule?i:{default:i}};Object.defineProperty(K2,"__esModule",{value:!0});var Iq=lr(),Pq=Oq(Zh()),Mq=()=>{let i=Iq.useContext(Pq.default);return{enableFocus:i.enableFocus,disableFocus:i.disableFocus,focusNext:i.focusNext,focusPrevious:i.focusPrevious}};K2.default=Mq});var Q5=Me(b3=>{"use strict";Object.defineProperty(b3,"__esModule",{value:!0});b3.default=i=>{var u,f,c,g;return{width:(f=(u=i.yogaNode)===null||u===void 0?void 0:u.getComputedWidth())!==null&&f!==void 0?f:0,height:(g=(c=i.yogaNode)===null||c===void 0?void 0:c.getComputedHeight())!==null&&g!==void 0?g:0}}});var ys=Me(ji=>{"use strict";Object.defineProperty(ji,"__esModule",{value:!0});var Fq=L5();Object.defineProperty(ji,"render",{enumerable:!0,get:function(){return Fq.default}});var Lq=tm();Object.defineProperty(ji,"Box",{enumerable:!0,get:function(){return Lq.default}});var Rq=W3();Object.defineProperty(ji,"Text",{enumerable:!0,get:function(){return Rq.default}});var Nq=N5();Object.defineProperty(ji,"Static",{enumerable:!0,get:function(){return Nq.default}});var Bq=j5();Object.defineProperty(ji,"Transform",{enumerable:!0,get:function(){return Bq.default}});var jq=q5();Object.defineProperty(ji,"Newline",{enumerable:!0,get:function(){return jq.default}});var Uq=H5();Object.defineProperty(ji,"Spacer",{enumerable:!0,get:function(){return Uq.default}});var qq=G5();Object.defineProperty(ji,"useInput",{enumerable:!0,get:function(){return qq.default}});var zq=V5();Object.defineProperty(ji,"useApp",{enumerable:!0,get:function(){return zq.default}});var Wq=im();Object.defineProperty(ji,"useStdin",{enumerable:!0,get:function(){return Wq.default}});var Hq=Y5();Object.defineProperty(ji,"useStdout",{enumerable:!0,get:function(){return Hq.default}});var bq=$5();Object.defineProperty(ji,"useStderr",{enumerable:!0,get:function(){return bq.default}});var Gq=X5();Object.defineProperty(ji,"useFocus",{enumerable:!0,get:function(){return Gq.default}});var Vq=J5();Object.defineProperty(ji,"useFocusManager",{enumerable:!0,get:function(){return Vq.default}});var Yq=Q5();Object.defineProperty(ji,"measureElement",{enumerable:!0,get:function(){return Yq.default}})});var lC=Me(X2=>{"use strict";Object.defineProperty(X2,"__esModule",{value:!0});X2.UncontrolledTextInput=void 0;var oC=lr(),Y3=lr(),uC=ys(),Sc=Jh(),sC=({value:i,placeholder:u="",focus:f=!0,mask:c,highlightPastedText:g=!1,showCursor:t=!0,onChange:C,onSubmit:A})=>{let[{cursorOffset:x,cursorWidth:D},L]=Y3.useState({cursorOffset:(i||"").length,cursorWidth:0});Y3.useEffect(()=>{L(re=>{if(!f||!t)return re;let ce=i||"";return re.cursorOffset>ce.length-1?{cursorOffset:ce.length,cursorWidth:0}:re})},[i,f,t]);let N=g?D:0,j=c?c.repeat(i.length):i,$=j,h=u?Sc.grey(u):void 0;if(t&&f){h=u.length>0?Sc.inverse(u[0])+Sc.grey(u.slice(1)):Sc.inverse(" "),$=j.length>0?"":Sc.inverse(" ");let re=0;for(let ce of j)re>=x-N&&re<=x?$+=Sc.inverse(ce):$+=ce,re++;j.length>0&&x===j.length&&($+=Sc.inverse(" "))}return uC.useInput((re,ce)=>{if(ce.upArrow||ce.downArrow||ce.ctrl&&re==="c"||ce.tab||ce.shift&&ce.tab)return;if(ce.return){A&&A(i);return}let Q=x,oe=i,Se=0;ce.leftArrow?t&&Q--:ce.rightArrow?t&&Q++:ce.backspace||ce.delete?x>0&&(oe=i.slice(0,x-1)+i.slice(x,i.length),Q--):(oe=i.slice(0,x)+re+i.slice(x,i.length),Q+=re.length,re.length>1&&(Se=re.length)),x<0&&(Q=0),x>i.length&&(Q=i.length),L({cursorOffset:Q,cursorWidth:Se}),oe!==i&&C(oe)},{isActive:f}),oC.createElement(uC.Text,null,u?j.length>0?$:h:$)};X2.default=sC;X2.UncontrolledTextInput=i=>{let[u,f]=Y3.useState("");return oC.createElement(sC,Object.assign({},i,{value:u,onChange:f}))}});var cC=Me(pm=>{"use strict";Object.defineProperty(pm,"__esModule",{value:!0});function J2(i){let u=[...i.caches],f=u.shift();return f===void 0?fC():{get(c,g,t={miss:()=>Promise.resolve()}){return f.get(c,g,t).catch(()=>J2({caches:u}).get(c,g,t))},set(c,g){return f.set(c,g).catch(()=>J2({caches:u}).set(c,g))},delete(c){return f.delete(c).catch(()=>J2({caches:u}).delete(c))},clear(){return f.clear().catch(()=>J2({caches:u}).clear())}}}function fC(){return{get(i,u,f={miss:()=>Promise.resolve()}){return u().then(g=>Promise.all([g,f.miss(g)])).then(([g])=>g)},set(i,u){return Promise.resolve(u)},delete(i){return Promise.resolve()},clear(){return Promise.resolve()}}}pm.createFallbackableCache=J2;pm.createNullCache=fC});var dC=Me((fV,aC)=>{aC.exports=cC()});var pC=Me($3=>{"use strict";Object.defineProperty($3,"__esModule",{value:!0});function $q(i={serializable:!0}){let u={};return{get(f,c,g={miss:()=>Promise.resolve()}){let t=JSON.stringify(f);if(t in u)return Promise.resolve(i.serializable?JSON.parse(u[t]):u[t]);let C=c(),A=g&&g.miss||(()=>Promise.resolve());return C.then(x=>A(x)).then(()=>C)},set(f,c){return u[JSON.stringify(f)]=i.serializable?JSON.stringify(c):c,Promise.resolve(c)},delete(f){return delete u[JSON.stringify(f)],Promise.resolve()},clear(){return u={},Promise.resolve()}}}$3.createInMemoryCache=$q});var mC=Me((aV,hC)=>{hC.exports=pC()});var gC=Me(ws=>{"use strict";Object.defineProperty(ws,"__esModule",{value:!0});function Kq(i,u,f){let c={"x-algolia-api-key":f,"x-algolia-application-id":u};return{headers(){return i===K3.WithinHeaders?c:{}},queryParameters(){return i===K3.WithinQueryParameters?c:{}}}}function Xq(i){let u=0,f=()=>(u++,new Promise(c=>{setTimeout(()=>{c(i(f))},Math.min(100*u,1e3))}));return i(f)}function vC(i,u=(f,c)=>Promise.resolve()){return Object.assign(i,{wait(f){return vC(i.then(c=>Promise.all([u(c,f),c])).then(c=>c[1]))}})}function Jq(i){let u=i.length-1;for(u;u>0;u--){let f=Math.floor(Math.random()*(u+1)),c=i[u];i[u]=i[f],i[f]=c}return i}function Qq(i,u){return Object.keys(u!==void 0?u:{}).forEach(f=>{i[f]=u[f](i)}),i}function Zq(i,...u){let f=0;return i.replace(/%s/g,()=>encodeURIComponent(u[f++]))}var ez="4.2.0",tz=i=>()=>i.transporter.requester.destroy(),K3={WithinQueryParameters:0,WithinHeaders:1};ws.AuthMode=K3;ws.addMethods=Qq;ws.createAuth=Kq;ws.createRetryablePromise=Xq;ws.createWaitablePromise=vC;ws.destroy=tz;ws.encode=Zq;ws.shuffle=Jq;ws.version=ez});var Q2=Me((pV,_C)=>{_C.exports=gC()});var yC=Me(X3=>{"use strict";Object.defineProperty(X3,"__esModule",{value:!0});var nz={Delete:"DELETE",Get:"GET",Post:"POST",Put:"PUT"};X3.MethodEnum=nz});var Z2=Me((mV,wC)=>{wC.exports=yC()});var RC=Me(y0=>{"use strict";Object.defineProperty(y0,"__esModule",{value:!0});var DC=Z2();function J3(i,u){let f=i||{},c=f.data||{};return Object.keys(f).forEach(g=>{["timeout","headers","queryParameters","data","cacheable"].indexOf(g)===-1&&(c[g]=f[g])}),{data:Object.entries(c).length>0?c:void 0,timeout:f.timeout||u,headers:f.headers||{},queryParameters:f.queryParameters||{},cacheable:f.cacheable}}var hm={Read:1,Write:2,Any:3},Ia={Up:1,Down:2,Timeouted:3},EC=2*60*1e3;function Q3(i,u=Ia.Up){return zn(dt({},i),{status:u,lastUpdate:Date.now()})}function SC(i){return i.status===Ia.Up||Date.now()-i.lastUpdate>EC}function CC(i){return i.status===Ia.Timeouted&&Date.now()-i.lastUpdate<=EC}function Z3(i){return{protocol:i.protocol||"https",url:i.url,accept:i.accept||hm.Any}}function rz(i,u){return Promise.all(u.map(f=>i.get(f,()=>Promise.resolve(Q3(f))))).then(f=>{let c=f.filter(A=>SC(A)),g=f.filter(A=>CC(A)),t=[...c,...g],C=t.length>0?t.map(A=>Z3(A)):u;return{getTimeout(A,x){return(g.length===0&&A===0?1:g.length+3+A)*x},statelessHosts:C}})}var iz=({isTimedOut:i,status:u})=>!i&&~~u==0,oz=i=>{let u=i.status;return i.isTimedOut||iz(i)||~~(u/100)!=2&&~~(u/100)!=4},uz=({status:i})=>~~(i/100)==2,sz=(i,u)=>oz(i)?u.onRetry(i):uz(i)?u.onSucess(i):u.onFail(i);function PC(i,u,f,c){let g=[],t=AC(f,c),C=OC(i,c),A=f.method,x=f.method!==DC.MethodEnum.Get?{}:dt(dt({},f.data),c.data),D=dt(dt(dt({"x-algolia-agent":i.userAgent.value},i.queryParameters),x),c.queryParameters),L=0,N=(j,$)=>{let h=j.pop();if(h===void 0)throw IC(ew(g));let re={data:t,headers:C,method:A,url:kC(h,f.path,D),connectTimeout:$(L,i.timeouts.connect),responseTimeout:$(L,c.timeout)},ce=oe=>{let Se={request:re,response:oe,host:h,triesLeft:j.length};return g.push(Se),Se},Q={onSucess:oe=>TC(oe),onRetry(oe){let Se=ce(oe);return oe.isTimedOut&&L++,Promise.all([i.logger.info("Retryable failure",tw(Se)),i.hostsCache.set(h,Q3(h,oe.isTimedOut?Ia.Timeouted:Ia.Down))]).then(()=>N(j,$))},onFail(oe){throw ce(oe),xC(oe,ew(g))}};return i.requester.send(re).then(oe=>sz(oe,Q))};return rz(i.hostsCache,u).then(j=>N([...j.statelessHosts].reverse(),j.getTimeout))}function lz(i){let{hostsCache:u,logger:f,requester:c,requestsCache:g,responsesCache:t,timeouts:C,userAgent:A,hosts:x,queryParameters:D,headers:L}=i,N={hostsCache:u,logger:f,requester:c,requestsCache:g,responsesCache:t,timeouts:C,userAgent:A,headers:L,queryParameters:D,hosts:x.map(j=>Z3(j)),read(j,$){let h=J3($,N.timeouts.read),re=()=>PC(N,N.hosts.filter(oe=>(oe.accept&hm.Read)!=0),j,h);if((h.cacheable!==void 0?h.cacheable:j.cacheable)!==!0)return re();let Q={request:j,mappedRequestOptions:h,transporter:{queryParameters:N.queryParameters,headers:N.headers}};return N.responsesCache.get(Q,()=>N.requestsCache.get(Q,()=>N.requestsCache.set(Q,re()).then(oe=>Promise.all([N.requestsCache.delete(Q),oe]),oe=>Promise.all([N.requestsCache.delete(Q),Promise.reject(oe)])).then(([oe,Se])=>Se)),{miss:oe=>N.responsesCache.set(Q,oe)})},write(j,$){return PC(N,N.hosts.filter(h=>(h.accept&hm.Write)!=0),j,J3($,N.timeouts.write))}};return N}function fz(i){let u={value:`Algolia for JavaScript (${i})`,add(f){let c=`; ${f.segment}${f.version!==void 0?` (${f.version})`:""}`;return u.value.indexOf(c)===-1&&(u.value=`${u.value}${c}`),u}};return u}function TC(i){try{return JSON.parse(i.content)}catch(u){throw MC(u.message,i)}}function xC({content:i,status:u},f){let c=i;try{c=JSON.parse(i).message}catch(g){}return FC(c,u,f)}function cz(i,...u){let f=0;return i.replace(/%s/g,()=>encodeURIComponent(u[f++]))}function kC(i,u,f){let c=LC(f),g=`${i.protocol}://${i.url}/${u.charAt(0)==="/"?u.substr(1):u}`;return c.length&&(g+=`?${c}`),g}function LC(i){let u=f=>Object.prototype.toString.call(f)==="[object Object]"||Object.prototype.toString.call(f)==="[object Array]";return Object.keys(i).map(f=>cz("%s=%s",f,u(i[f])?JSON.stringify(i[f]):i[f])).join("&")}function AC(i,u){if(i.method===DC.MethodEnum.Get||i.data===void 0&&u.data===void 0)return;let f=Array.isArray(i.data)?i.data:dt(dt({},i.data),u.data);return JSON.stringify(f)}function OC(i,u){let f=dt(dt({},i.headers),u.headers),c={};return Object.keys(f).forEach(g=>{let t=f[g];c[g.toLowerCase()]=t}),c}function ew(i){return i.map(u=>tw(u))}function tw(i){let u=i.request.headers["x-algolia-api-key"]?{"x-algolia-api-key":"*****"}:{};return zn(dt({},i),{request:zn(dt({},i.request),{headers:dt(dt({},i.request.headers),u)})})}function FC(i,u,f){return{name:"ApiError",message:i,status:u,transporterStackTrace:f}}function MC(i,u){return{name:"DeserializationError",message:i,response:u}}function IC(i){return{name:"RetryError",message:"Unreachable hosts - your application id may be incorrect. If the error persists, contact support@algolia.com.",transporterStackTrace:i}}y0.CallEnum=hm;y0.HostStatusEnum=Ia;y0.createApiError=FC;y0.createDeserializationError=MC;y0.createMappedRequestOptions=J3;y0.createRetryError=IC;y0.createStatefulHost=Q3;y0.createStatelessHost=Z3;y0.createTransporter=lz;y0.createUserAgent=fz;y0.deserializeFailure=xC;y0.deserializeSuccess=TC;y0.isStatefulHostTimeouted=CC;y0.isStatefulHostUp=SC;y0.serializeData=AC;y0.serializeHeaders=OC;y0.serializeQueryParameters=LC;y0.serializeUrl=kC;y0.stackFrameWithoutCredentials=tw;y0.stackTraceWithoutCredentials=ew});var ed=Me((gV,NC)=>{NC.exports=RC()});var BC=Me(Hf=>{"use strict";Object.defineProperty(Hf,"__esModule",{value:!0});var Pa=Q2(),az=ed(),td=Z2(),dz=i=>{let u=i.region||"us",f=Pa.createAuth(Pa.AuthMode.WithinHeaders,i.appId,i.apiKey),c=az.createTransporter(zn(dt({hosts:[{url:`analytics.${u}.algolia.com`}]},i),{headers:dt(zn(dt({},f.headers()),{"content-type":"application/json"}),i.headers),queryParameters:dt(dt({},f.queryParameters()),i.queryParameters)})),g=i.appId;return Pa.addMethods({appId:g,transporter:c},i.methods)},pz=i=>(u,f)=>i.transporter.write({method:td.MethodEnum.Post,path:"2/abtests",data:u},f),hz=i=>(u,f)=>i.transporter.write({method:td.MethodEnum.Delete,path:Pa.encode("2/abtests/%s",u)},f),mz=i=>(u,f)=>i.transporter.read({method:td.MethodEnum.Get,path:Pa.encode("2/abtests/%s",u)},f),vz=i=>u=>i.transporter.read({method:td.MethodEnum.Get,path:"2/abtests"},u),gz=i=>(u,f)=>i.transporter.write({method:td.MethodEnum.Post,path:Pa.encode("2/abtests/%s/stop",u)},f);Hf.addABTest=pz;Hf.createAnalyticsClient=dz;Hf.deleteABTest=hz;Hf.getABTest=mz;Hf.getABTests=vz;Hf.stopABTest=gz});var UC=Me((yV,jC)=>{jC.exports=BC()});var zC=Me(nd=>{"use strict";Object.defineProperty(nd,"__esModule",{value:!0});var nw=Q2(),_z=ed(),qC=Z2(),yz=i=>{let u=i.region||"us",f=nw.createAuth(nw.AuthMode.WithinHeaders,i.appId,i.apiKey),c=_z.createTransporter(zn(dt({hosts:[{url:`recommendation.${u}.algolia.com`}]},i),{headers:dt(zn(dt({},f.headers()),{"content-type":"application/json"}),i.headers),queryParameters:dt(dt({},f.queryParameters()),i.queryParameters)}));return nw.addMethods({appId:i.appId,transporter:c},i.methods)},wz=i=>u=>i.transporter.read({method:qC.MethodEnum.Get,path:"1/strategies/personalization"},u),Dz=i=>(u,f)=>i.transporter.write({method:qC.MethodEnum.Post,path:"1/strategies/personalization",data:u},f);nd.createRecommendationClient=yz;nd.getPersonalizationStrategy=wz;nd.setPersonalizationStrategy=Dz});var HC=Me((DV,WC)=>{WC.exports=zC()});var nT=Me(yt=>{"use strict";Object.defineProperty(yt,"__esModule",{value:!0});var Wt=Q2(),jo=ed(),Rn=Z2(),Ez=require("crypto");function mm(i){let u=f=>i.request(f).then(c=>{if(i.batch!==void 0&&i.batch(c.hits),!i.shouldStop(c))return c.cursor?u({cursor:c.cursor}):u({page:(f.page||0)+1})});return u({})}var Sz=i=>{let u=i.appId,f=Wt.createAuth(i.authMode!==void 0?i.authMode:Wt.AuthMode.WithinHeaders,u,i.apiKey),c=jo.createTransporter(zn(dt({hosts:[{url:`${u}-dsn.algolia.net`,accept:jo.CallEnum.Read},{url:`${u}.algolia.net`,accept:jo.CallEnum.Write}].concat(Wt.shuffle([{url:`${u}-1.algolianet.com`},{url:`${u}-2.algolianet.com`},{url:`${u}-3.algolianet.com`}]))},i),{headers:dt(zn(dt({},f.headers()),{"content-type":"application/x-www-form-urlencoded"}),i.headers),queryParameters:dt(dt({},f.queryParameters()),i.queryParameters)})),g={transporter:c,appId:u,addAlgoliaAgent(t,C){c.userAgent.add({segment:t,version:C})},clearCache(){return Promise.all([c.requestsCache.clear(),c.responsesCache.clear()]).then(()=>{})}};return Wt.addMethods(g,i.methods)};function bC(){return{name:"MissingObjectIDError",message:"All objects must have an unique objectID (like a primary key) to be valid. Algolia is also able to generate objectIDs automatically but *it's not recommended*. To do it, use the `{'autoGenerateObjectIDIfNotExist': true}` option."}}function GC(){return{name:"ObjectNotFoundError",message:"Object not found."}}function VC(){return{name:"ValidUntilNotFoundError",message:"ValidUntil not found in given secured api key."}}var Cz=i=>(u,f)=>{let A=f||{},{queryParameters:c}=A,g=Si(A,["queryParameters"]),t=dt({acl:u},c!==void 0?{queryParameters:c}:{}),C=(x,D)=>Wt.createRetryablePromise(L=>rd(i)(x.key,D).catch(N=>{if(N.status!==404)throw N;return L()}));return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:"1/keys",data:t},g),C)},Tz=i=>(u,f,c)=>{let g=jo.createMappedRequestOptions(c);return g.queryParameters["X-Algolia-User-ID"]=u,i.transporter.write({method:Rn.MethodEnum.Post,path:"1/clusters/mapping",data:{cluster:f}},g)},xz=i=>(u,f,c)=>i.transporter.write({method:Rn.MethodEnum.Post,path:"1/clusters/mapping/batch",data:{users:u,cluster:f}},c),vm=i=>(u,f,c)=>{let g=(t,C)=>id(i)(u,{methods:{waitTask:z0}}).waitTask(t.taskID,C);return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/operation",u),data:{operation:"copy",destination:f}},c),g)},kz=i=>(u,f,c)=>vm(i)(u,f,zn(dt({},c),{scope:[gm.Rules]})),Az=i=>(u,f,c)=>vm(i)(u,f,zn(dt({},c),{scope:[gm.Settings]})),Oz=i=>(u,f,c)=>vm(i)(u,f,zn(dt({},c),{scope:[gm.Synonyms]})),Iz=i=>(u,f)=>{let c=(g,t)=>Wt.createRetryablePromise(C=>rd(i)(u,t).then(C).catch(A=>{if(A.status!==404)throw A}));return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Delete,path:Wt.encode("1/keys/%s",u)},f),c)},Pz=()=>(i,u)=>{let f=jo.serializeQueryParameters(u),c=Ez.createHmac("sha256",i).update(f).digest("hex");return Buffer.from(c+f).toString("base64")},rd=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Get,path:Wt.encode("1/keys/%s",u)},f),Mz=i=>u=>i.transporter.read({method:Rn.MethodEnum.Get,path:"1/logs"},u),Fz=()=>i=>{let u=Buffer.from(i,"base64").toString("ascii"),f=/validUntil=(\d+)/,c=u.match(f);if(c===null)throw VC();return parseInt(c[1],10)-Math.round(new Date().getTime()/1e3)},Lz=i=>u=>i.transporter.read({method:Rn.MethodEnum.Get,path:"1/clusters/mapping/top"},u),Rz=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Get,path:Wt.encode("1/clusters/mapping/%s",u)},f),Nz=i=>u=>{let g=u||{},{retrieveMappings:f}=g,c=Si(g,["retrieveMappings"]);return f===!0&&(c.getClusters=!0),i.transporter.read({method:Rn.MethodEnum.Get,path:"1/clusters/mapping/pending"},c)},id=i=>(u,f={})=>{let c={transporter:i.transporter,appId:i.appId,indexName:u};return Wt.addMethods(c,f.methods)},Bz=i=>u=>i.transporter.read({method:Rn.MethodEnum.Get,path:"1/keys"},u),jz=i=>u=>i.transporter.read({method:Rn.MethodEnum.Get,path:"1/clusters"},u),Uz=i=>u=>i.transporter.read({method:Rn.MethodEnum.Get,path:"1/indexes"},u),qz=i=>u=>i.transporter.read({method:Rn.MethodEnum.Get,path:"1/clusters/mapping"},u),zz=i=>(u,f,c)=>{let g=(t,C)=>id(i)(u,{methods:{waitTask:z0}}).waitTask(t.taskID,C);return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/operation",u),data:{operation:"move",destination:f}},c),g)},Wz=i=>(u,f)=>{let c=(g,t)=>Promise.all(Object.keys(g.taskID).map(C=>id(i)(C,{methods:{waitTask:z0}}).waitTask(g.taskID[C],t)));return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:"1/indexes/*/batch",data:{requests:u}},f),c)},Hz=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:u}},f),bz=i=>(u,f)=>{let c=u.map(g=>zn(dt({},g),{params:jo.serializeQueryParameters(g.params||{})}));return i.transporter.read({method:Rn.MethodEnum.Post,path:"1/indexes/*/queries",data:{requests:c},cacheable:!0},f)},Gz=i=>(u,f)=>Promise.all(u.map(c=>{let A=c.params,{facetName:g,facetQuery:t}=A,C=Si(A,["facetName","facetQuery"]);return id(i)(c.indexName,{methods:{searchForFacetValues:YC}}).searchForFacetValues(g,t,dt(dt({},f),C))})),Vz=i=>(u,f)=>{let c=jo.createMappedRequestOptions(f);return c.queryParameters["X-Algolia-User-ID"]=u,i.transporter.write({method:Rn.MethodEnum.Delete,path:"1/clusters/mapping"},c)},Yz=i=>(u,f)=>{let c=(g,t)=>Wt.createRetryablePromise(C=>rd(i)(u,t).catch(A=>{if(A.status!==404)throw A;return C()}));return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/keys/%s/restore",u)},f),c)},$z=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Post,path:"1/clusters/mapping/search",data:{query:u}},f),Kz=i=>(u,f)=>{let c=Object.assign({},f),L=f||{},{queryParameters:g}=L,t=Si(L,["queryParameters"]),C=g?{queryParameters:g}:{},A=["acl","indexes","referers","restrictSources","queryParameters","description","maxQueriesPerIPPerHour","maxHitsPerQuery"],x=N=>Object.keys(c).filter(j=>A.indexOf(j)!==-1).every(j=>N[j]===c[j]),D=(N,j)=>Wt.createRetryablePromise($=>rd(i)(u,j).then(h=>x(h)?Promise.resolve():$()));return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Put,path:Wt.encode("1/keys/%s",u),data:C},t),D)},$C=i=>(u,f)=>{let c=(g,t)=>z0(i)(g.taskID,t);return Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/batch",i.indexName),data:{requests:u}},f),c)},Xz=i=>u=>mm(zn(dt({},u),{shouldStop:f=>f.cursor===void 0,request:f=>i.transporter.read({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/browse",i.indexName),data:f},u)})),Jz=i=>u=>{let f=dt({hitsPerPage:1e3},u);return mm(zn(dt({},f),{shouldStop:c=>c.hits.lengthzn(dt({},g),{hits:g.hits.map(t=>(delete t._highlightResult,t))}))}}))},Qz=i=>u=>{let f=dt({hitsPerPage:1e3},u);return mm(zn(dt({},f),{shouldStop:c=>c.hits.lengthzn(dt({},g),{hits:g.hits.map(t=>(delete t._highlightResult,t))}))}}))},_m=i=>(u,f,c)=>{let x=c||{},{batchSize:g}=x,t=Si(x,["batchSize"]),C={taskIDs:[],objectIDs:[]},A=(D=0)=>{let L=[],N;for(N=D;N({action:f,body:j})),t).then(j=>(C.objectIDs=C.objectIDs.concat(j.objectIDs),C.taskIDs.push(j.taskID),N++,A(N)))};return Wt.createWaitablePromise(A(),(D,L)=>Promise.all(D.taskIDs.map(N=>z0(i)(N,L))))},Zz=i=>u=>Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/clear",i.indexName)},u),(f,c)=>z0(i)(f.taskID,c)),eW=i=>u=>{let t=u||{},{forwardToReplicas:f}=t,c=Si(t,["forwardToReplicas"]),g=jo.createMappedRequestOptions(c);return f&&(g.queryParameters.forwardToReplicas=1),Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/rules/clear",i.indexName)},g),(C,A)=>z0(i)(C.taskID,A))},tW=i=>u=>{let t=u||{},{forwardToReplicas:f}=t,c=Si(t,["forwardToReplicas"]),g=jo.createMappedRequestOptions(c);return f&&(g.queryParameters.forwardToReplicas=1),Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/synonyms/clear",i.indexName)},g),(C,A)=>z0(i)(C.taskID,A))},nW=i=>(u,f)=>Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/deleteByQuery",i.indexName),data:u},f),(c,g)=>z0(i)(c.taskID,g)),rW=i=>u=>Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Delete,path:Wt.encode("1/indexes/%s",i.indexName)},u),(f,c)=>z0(i)(f.taskID,c)),iW=i=>(u,f)=>Wt.createWaitablePromise(JC(i)([u],f).then(c=>({taskID:c.taskIDs[0]})),(c,g)=>z0(i)(c.taskID,g)),JC=i=>(u,f)=>{let c=u.map(g=>({objectID:g}));return _m(i)(c,Cc.DeleteObject,f)},oW=i=>(u,f)=>{let C=f||{},{forwardToReplicas:c}=C,g=Si(C,["forwardToReplicas"]),t=jo.createMappedRequestOptions(g);return c&&(t.queryParameters.forwardToReplicas=1),Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Delete,path:Wt.encode("1/indexes/%s/rules/%s",i.indexName,u)},t),(A,x)=>z0(i)(A.taskID,x))},uW=i=>(u,f)=>{let C=f||{},{forwardToReplicas:c}=C,g=Si(C,["forwardToReplicas"]),t=jo.createMappedRequestOptions(g);return c&&(t.queryParameters.forwardToReplicas=1),Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Delete,path:Wt.encode("1/indexes/%s/synonyms/%s",i.indexName,u)},t),(A,x)=>z0(i)(A.taskID,x))},sW=i=>u=>QC(i)(u).then(()=>!0).catch(f=>{if(f.status!==404)throw f;return!1}),lW=i=>(u,f)=>{let x=f||{},{query:c,paginate:g}=x,t=Si(x,["query","paginate"]),C=0,A=()=>ZC(i)(c||"",zn(dt({},t),{page:C})).then(D=>{for(let[L,N]of Object.entries(D.hits))if(u(N))return{object:N,position:parseInt(L,10),page:C};if(C++,g===!1||C>=D.nbPages)throw GC();return A()});return A()},fW=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Get,path:Wt.encode("1/indexes/%s/%s",i.indexName,u)},f),cW=()=>(i,u)=>{for(let[f,c]of Object.entries(i.hits))if(c.objectID===u)return parseInt(f,10);return-1},aW=i=>(u,f)=>{let C=f||{},{attributesToRetrieve:c}=C,g=Si(C,["attributesToRetrieve"]),t=u.map(A=>dt({indexName:i.indexName,objectID:A},c?{attributesToRetrieve:c}:{}));return i.transporter.read({method:Rn.MethodEnum.Post,path:"1/indexes/*/objects",data:{requests:t}},g)},dW=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Get,path:Wt.encode("1/indexes/%s/rules/%s",i.indexName,u)},f),QC=i=>u=>i.transporter.read({method:Rn.MethodEnum.Get,path:Wt.encode("1/indexes/%s/settings",i.indexName),data:{getVersion:2}},u),pW=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Get,path:Wt.encode("1/indexes/%s/synonyms/%s",i.indexName,u)},f),eT=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Get,path:Wt.encode("1/indexes/%s/task/%s",i.indexName,u.toString())},f),hW=i=>(u,f)=>Wt.createWaitablePromise(tT(i)([u],f).then(c=>({objectID:c.objectIDs[0],taskID:c.taskIDs[0]})),(c,g)=>z0(i)(c.taskID,g)),tT=i=>(u,f)=>{let C=f||{},{createIfNotExists:c}=C,g=Si(C,["createIfNotExists"]),t=c?Cc.PartialUpdateObject:Cc.PartialUpdateObjectNoCreate;return _m(i)(u,t,g)},mW=i=>(u,f)=>{let h=f||{},{safe:c,autoGenerateObjectIDIfNotExist:g,batchSize:t}=h,C=Si(h,["safe","autoGenerateObjectIDIfNotExist","batchSize"]),A=(re,ce,Q,oe)=>Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/operation",re),data:{operation:Q,destination:ce}},oe),(Se,me)=>z0(i)(Se.taskID,me)),x=Math.random().toString(36).substring(7),D=`${i.indexName}_tmp_${x}`,L=rw({appId:i.appId,transporter:i.transporter,indexName:D}),N=[],j=A(i.indexName,D,"copy",zn(dt({},C),{scope:["settings","synonyms","rules"]}));N.push(j);let $=(c?j.wait(C):j).then(()=>{let re=L(u,zn(dt({},C),{autoGenerateObjectIDIfNotExist:g,batchSize:t}));return N.push(re),c?re.wait(C):re}).then(()=>{let re=A(D,i.indexName,"move",C);return N.push(re),c?re.wait(C):re}).then(()=>Promise.all(N)).then(([re,ce,Q])=>({objectIDs:ce.objectIDs,taskIDs:[re.taskID,...ce.taskIDs,Q.taskID]}));return Wt.createWaitablePromise($,(re,ce)=>Promise.all(N.map(Q=>Q.wait(ce))))},vW=i=>(u,f)=>iw(i)(u,zn(dt({},f),{clearExistingRules:!0})),gW=i=>(u,f)=>ow(i)(u,zn(dt({},f),{replaceExistingSynonyms:!0})),_W=i=>(u,f)=>Wt.createWaitablePromise(rw(i)([u],f).then(c=>({objectID:c.objectIDs[0],taskID:c.taskIDs[0]})),(c,g)=>z0(i)(c.taskID,g)),rw=i=>(u,f)=>{let C=f||{},{autoGenerateObjectIDIfNotExist:c}=C,g=Si(C,["autoGenerateObjectIDIfNotExist"]),t=c?Cc.AddObject:Cc.UpdateObject;if(t===Cc.UpdateObject){for(let A of u)if(A.objectID===void 0)return Wt.createWaitablePromise(Promise.reject(bC()))}return _m(i)(u,t,g)},yW=i=>(u,f)=>iw(i)([u],f),iw=i=>(u,f)=>{let A=f||{},{forwardToReplicas:c,clearExistingRules:g}=A,t=Si(A,["forwardToReplicas","clearExistingRules"]),C=jo.createMappedRequestOptions(t);return c&&(C.queryParameters.forwardToReplicas=1),g&&(C.queryParameters.clearExistingRules=1),Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/rules/batch",i.indexName),data:u},C),(x,D)=>z0(i)(x.taskID,D))},wW=i=>(u,f)=>ow(i)([u],f),ow=i=>(u,f)=>{let A=f||{},{forwardToReplicas:c,replaceExistingSynonyms:g}=A,t=Si(A,["forwardToReplicas","replaceExistingSynonyms"]),C=jo.createMappedRequestOptions(t);return c&&(C.queryParameters.forwardToReplicas=1),g&&(C.queryParameters.replaceExistingSynonyms=1),Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/synonyms/batch",i.indexName),data:u},C),(x,D)=>z0(i)(x.taskID,D))},ZC=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/query",i.indexName),data:{query:u},cacheable:!0},f),YC=i=>(u,f,c)=>i.transporter.read({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/facets/%s/query",i.indexName,u),data:{facetQuery:f},cacheable:!0},c),KC=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/rules/search",i.indexName),data:{query:u}},f),XC=i=>(u,f)=>i.transporter.read({method:Rn.MethodEnum.Post,path:Wt.encode("1/indexes/%s/synonyms/search",i.indexName),data:{query:u}},f),DW=i=>(u,f)=>{let C=f||{},{forwardToReplicas:c}=C,g=Si(C,["forwardToReplicas"]),t=jo.createMappedRequestOptions(g);return c&&(t.queryParameters.forwardToReplicas=1),Wt.createWaitablePromise(i.transporter.write({method:Rn.MethodEnum.Put,path:Wt.encode("1/indexes/%s/settings",i.indexName),data:u},t),(A,x)=>z0(i)(A.taskID,x))},z0=i=>(u,f)=>Wt.createRetryablePromise(c=>eT(i)(u,f).then(g=>g.status!=="published"?c():void 0)),EW={AddObject:"addObject",Analytics:"analytics",Browser:"browse",DeleteIndex:"deleteIndex",DeleteObject:"deleteObject",EditSettings:"editSettings",ListIndexes:"listIndexes",Logs:"logs",Recommendation:"recommendation",Search:"search",SeeUnretrievableAttributes:"seeUnretrievableAttributes",Settings:"settings",Usage:"usage"},Cc={AddObject:"addObject",UpdateObject:"updateObject",PartialUpdateObject:"partialUpdateObject",PartialUpdateObjectNoCreate:"partialUpdateObjectNoCreate",DeleteObject:"deleteObject"},gm={Settings:"settings",Synonyms:"synonyms",Rules:"rules"},SW={None:"none",StopIfEnoughMatches:"stopIfEnoughMatches"},CW={Synonym:"synonym",OneWaySynonym:"oneWaySynonym",AltCorrection1:"altCorrection1",AltCorrection2:"altCorrection2",Placeholder:"placeholder"};yt.ApiKeyACLEnum=EW;yt.BatchActionEnum=Cc;yt.ScopeEnum=gm;yt.StrategyEnum=SW;yt.SynonymEnum=CW;yt.addApiKey=Cz;yt.assignUserID=Tz;yt.assignUserIDs=xz;yt.batch=$C;yt.browseObjects=Xz;yt.browseRules=Jz;yt.browseSynonyms=Qz;yt.chunkedBatch=_m;yt.clearObjects=Zz;yt.clearRules=eW;yt.clearSynonyms=tW;yt.copyIndex=vm;yt.copyRules=kz;yt.copySettings=Az;yt.copySynonyms=Oz;yt.createBrowsablePromise=mm;yt.createMissingObjectIDError=bC;yt.createObjectNotFoundError=GC;yt.createSearchClient=Sz;yt.createValidUntilNotFoundError=VC;yt.deleteApiKey=Iz;yt.deleteBy=nW;yt.deleteIndex=rW;yt.deleteObject=iW;yt.deleteObjects=JC;yt.deleteRule=oW;yt.deleteSynonym=uW;yt.exists=sW;yt.findObject=lW;yt.generateSecuredApiKey=Pz;yt.getApiKey=rd;yt.getLogs=Mz;yt.getObject=fW;yt.getObjectPosition=cW;yt.getObjects=aW;yt.getRule=dW;yt.getSecuredApiKeyRemainingValidity=Fz;yt.getSettings=QC;yt.getSynonym=pW;yt.getTask=eT;yt.getTopUserIDs=Lz;yt.getUserID=Rz;yt.hasPendingMappings=Nz;yt.initIndex=id;yt.listApiKeys=Bz;yt.listClusters=jz;yt.listIndices=Uz;yt.listUserIDs=qz;yt.moveIndex=zz;yt.multipleBatch=Wz;yt.multipleGetObjects=Hz;yt.multipleQueries=bz;yt.multipleSearchForFacetValues=Gz;yt.partialUpdateObject=hW;yt.partialUpdateObjects=tT;yt.removeUserID=Vz;yt.replaceAllObjects=mW;yt.replaceAllRules=vW;yt.replaceAllSynonyms=gW;yt.restoreApiKey=Yz;yt.saveObject=_W;yt.saveObjects=rw;yt.saveRule=yW;yt.saveRules=iw;yt.saveSynonym=wW;yt.saveSynonyms=ow;yt.search=ZC;yt.searchForFacetValues=YC;yt.searchRules=KC;yt.searchSynonyms=XC;yt.searchUserIDs=$z;yt.setSettings=DW;yt.updateApiKey=Kz;yt.waitTask=z0});var iT=Me((SV,rT)=>{rT.exports=nT()});var oT=Me(ym=>{"use strict";Object.defineProperty(ym,"__esModule",{value:!0});function TW(){return{debug(i,u){return Promise.resolve()},info(i,u){return Promise.resolve()},error(i,u){return Promise.resolve()}}}var xW={Debug:1,Info:2,Error:3};ym.LogLevelEnum=xW;ym.createNullLogger=TW});var sT=Me((TV,uT)=>{uT.exports=oT()});var cT=Me(uw=>{"use strict";Object.defineProperty(uw,"__esModule",{value:!0});var lT=require("http"),fT=require("https"),kW=require("url");function AW(){let i={keepAlive:!0},u=new lT.Agent(i),f=new fT.Agent(i);return{send(c){return new Promise(g=>{let t=kW.parse(c.url),C=t.query===null?t.pathname:`${t.pathname}?${t.query}`,A=dt({agent:t.protocol==="https:"?f:u,hostname:t.hostname,path:C,method:c.method,headers:c.headers},t.port!==void 0?{port:t.port||""}:{}),x=(t.protocol==="https:"?fT:lT).request(A,j=>{let $="";j.on("data",h=>$+=h),j.on("end",()=>{clearTimeout(L),clearTimeout(N),g({status:j.statusCode||0,content:$,isTimedOut:!1})})}),D=(j,$)=>setTimeout(()=>{x.abort(),g({status:0,content:$,isTimedOut:!0})},j*1e3),L=D(c.connectTimeout,"Connection timeout"),N;x.on("error",j=>{clearTimeout(L),clearTimeout(N),g({status:0,content:j.message,isTimedOut:!1})}),x.once("response",()=>{clearTimeout(L),N=D(c.responseTimeout,"Socket timeout")}),c.data!==void 0&&x.write(c.data),x.end()})},destroy(){return u.destroy(),f.destroy(),Promise.resolve()}}}uw.createNodeHttpRequester=AW});var dT=Me((kV,aT)=>{aT.exports=cT()});var vT=Me((AV,pT)=>{"use strict";var hT=dC(),OW=mC(),Ma=UC(),sw=Q2(),lw=HC(),Mt=iT(),IW=sT(),PW=dT(),MW=ed();function mT(i,u,f){let c={appId:i,apiKey:u,timeouts:{connect:2,read:5,write:30},requester:PW.createNodeHttpRequester(),logger:IW.createNullLogger(),responsesCache:hT.createNullCache(),requestsCache:hT.createNullCache(),hostsCache:OW.createInMemoryCache(),userAgent:MW.createUserAgent(sw.version).add({segment:"Node.js",version:process.versions.node})};return Mt.createSearchClient(zn(dt(dt({},c),f),{methods:{search:Mt.multipleQueries,searchForFacetValues:Mt.multipleSearchForFacetValues,multipleBatch:Mt.multipleBatch,multipleGetObjects:Mt.multipleGetObjects,multipleQueries:Mt.multipleQueries,copyIndex:Mt.copyIndex,copySettings:Mt.copySettings,copyRules:Mt.copyRules,copySynonyms:Mt.copySynonyms,moveIndex:Mt.moveIndex,listIndices:Mt.listIndices,getLogs:Mt.getLogs,listClusters:Mt.listClusters,multipleSearchForFacetValues:Mt.multipleSearchForFacetValues,getApiKey:Mt.getApiKey,addApiKey:Mt.addApiKey,listApiKeys:Mt.listApiKeys,updateApiKey:Mt.updateApiKey,deleteApiKey:Mt.deleteApiKey,restoreApiKey:Mt.restoreApiKey,assignUserID:Mt.assignUserID,assignUserIDs:Mt.assignUserIDs,getUserID:Mt.getUserID,searchUserIDs:Mt.searchUserIDs,listUserIDs:Mt.listUserIDs,getTopUserIDs:Mt.getTopUserIDs,removeUserID:Mt.removeUserID,hasPendingMappings:Mt.hasPendingMappings,generateSecuredApiKey:Mt.generateSecuredApiKey,getSecuredApiKeyRemainingValidity:Mt.getSecuredApiKeyRemainingValidity,destroy:sw.destroy,initIndex:g=>t=>Mt.initIndex(g)(t,{methods:{batch:Mt.batch,delete:Mt.deleteIndex,getObject:Mt.getObject,getObjects:Mt.getObjects,saveObject:Mt.saveObject,saveObjects:Mt.saveObjects,search:Mt.search,searchForFacetValues:Mt.searchForFacetValues,waitTask:Mt.waitTask,setSettings:Mt.setSettings,getSettings:Mt.getSettings,partialUpdateObject:Mt.partialUpdateObject,partialUpdateObjects:Mt.partialUpdateObjects,deleteObject:Mt.deleteObject,deleteObjects:Mt.deleteObjects,deleteBy:Mt.deleteBy,clearObjects:Mt.clearObjects,browseObjects:Mt.browseObjects,getObjectPosition:Mt.getObjectPosition,findObject:Mt.findObject,exists:Mt.exists,saveSynonym:Mt.saveSynonym,saveSynonyms:Mt.saveSynonyms,getSynonym:Mt.getSynonym,searchSynonyms:Mt.searchSynonyms,browseSynonyms:Mt.browseSynonyms,deleteSynonym:Mt.deleteSynonym,clearSynonyms:Mt.clearSynonyms,replaceAllObjects:Mt.replaceAllObjects,replaceAllSynonyms:Mt.replaceAllSynonyms,searchRules:Mt.searchRules,getRule:Mt.getRule,deleteRule:Mt.deleteRule,saveRule:Mt.saveRule,saveRules:Mt.saveRules,replaceAllRules:Mt.replaceAllRules,browseRules:Mt.browseRules,clearRules:Mt.clearRules}}),initAnalytics:()=>g=>Ma.createAnalyticsClient(zn(dt(dt({},c),g),{methods:{addABTest:Ma.addABTest,getABTest:Ma.getABTest,getABTests:Ma.getABTests,stopABTest:Ma.stopABTest,deleteABTest:Ma.deleteABTest}})),initRecommendation:()=>g=>lw.createRecommendationClient(zn(dt(dt({},c),g),{methods:{getPersonalizationStrategy:lw.getPersonalizationStrategy,setPersonalizationStrategy:lw.setPersonalizationStrategy}}))}}))}mT.version=sw.version;pT.exports=mT});var _T=Me((OV,fw)=>{var gT=vT();fw.exports=gT;fw.exports.default=gT});var rf=Me(dw=>{"use strict";Object.defineProperty(dw,"__esModule",{value:!0});dw.default=kT;function kT(){}kT.prototype={diff:function(u,f){var c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},g=c.callback;typeof c=="function"&&(g=c,c={}),this.options=c;var t=this;function C(re){return g?(setTimeout(function(){g(void 0,re)},0),!0):re}u=this.castInput(u),f=this.castInput(f),u=this.removeEmpty(this.tokenize(u)),f=this.removeEmpty(this.tokenize(f));var A=f.length,x=u.length,D=1,L=A+x,N=[{newPos:-1,components:[]}],j=this.extractCommon(N[0],f,u,0);if(N[0].newPos+1>=A&&j+1>=x)return C([{value:this.join(f),count:f.length}]);function $(){for(var re=-1*D;re<=D;re+=2){var ce=void 0,Q=N[re-1],oe=N[re+1],Se=(oe?oe.newPos:0)-re;Q&&(N[re-1]=void 0);var me=Q&&Q.newPos+1=A&&Se+1>=x)return C(LW(t,ce.components,f,u,t.useLongestToken));N[re]=ce}D++}if(g)(function re(){setTimeout(function(){if(D>L)return g();$()||re()},0)})();else for(;D<=L;){var h=$();if(h)return h}},pushComponent:function(u,f,c){var g=u[u.length-1];g&&g.added===f&&g.removed===c?u[u.length-1]={count:g.count+1,added:f,removed:c}:u.push({count:1,added:f,removed:c})},extractCommon:function(u,f,c,g){for(var t=f.length,C=c.length,A=u.newPos,x=A-g,D=0;A+1$.length?re:$}),D.value=i.join(L)}else D.value=i.join(f.slice(A,A+D.count));A+=D.count,D.added||(x+=D.count)}}var j=u[C-1];return C>1&&typeof j.value=="string"&&(j.added||j.removed)&&i.equals("",j.value)&&(u[C-2].value+=j.value,u.pop()),u}function RW(i){return{newPos:i.newPos,components:i.components.slice(0)}}});var OT=Me(ld=>{"use strict";Object.defineProperty(ld,"__esModule",{value:!0});ld.diffChars=NW;ld.characterDiff=void 0;var jW=BW(rf());function BW(i){return i&&i.__esModule?i:{default:i}}var AT=new jW.default;ld.characterDiff=AT;function NW(i,u,f){return AT.diff(i,u,f)}});var hw=Me(pw=>{"use strict";Object.defineProperty(pw,"__esModule",{value:!0});pw.generateOptions=UW;function UW(i,u){if(typeof i=="function")u.callback=i;else if(i)for(var f in i)i.hasOwnProperty(f)&&(u[f]=i[f]);return u}});var MT=Me(Fa=>{"use strict";Object.defineProperty(Fa,"__esModule",{value:!0});Fa.diffWords=qW;Fa.diffWordsWithSpace=zW;Fa.wordDiff=void 0;var HW=WW(rf()),bW=hw();function WW(i){return i&&i.__esModule?i:{default:i}}var IT=/^[A-Za-z\xC0-\u02C6\u02C8-\u02D7\u02DE-\u02FF\u1E00-\u1EFF]+$/,PT=/\S/,fd=new HW.default;Fa.wordDiff=fd;fd.equals=function(i,u){return this.options.ignoreCase&&(i=i.toLowerCase(),u=u.toLowerCase()),i===u||this.options.ignoreWhitespace&&!PT.test(i)&&!PT.test(u)};fd.tokenize=function(i){for(var u=i.split(/(\s+|[()[\]{}'"]|\b)/),f=0;f{"use strict";Object.defineProperty(La,"__esModule",{value:!0});La.diffLines=GW;La.diffTrimmedLines=VW;La.lineDiff=void 0;var $W=YW(rf()),KW=hw();function YW(i){return i&&i.__esModule?i:{default:i}}var Dm=new $W.default;La.lineDiff=Dm;Dm.tokenize=function(i){var u=[],f=i.split(/(\n|\r\n)/);f[f.length-1]||f.pop();for(var c=0;c{"use strict";Object.defineProperty(cd,"__esModule",{value:!0});cd.diffSentences=XW;cd.sentenceDiff=void 0;var QW=JW(rf());function JW(i){return i&&i.__esModule?i:{default:i}}var mw=new QW.default;cd.sentenceDiff=mw;mw.tokenize=function(i){return i.split(/(\S.+?[.!?])(?=\s+|$)/)};function XW(i,u,f){return mw.diff(i,u,f)}});var LT=Me(ad=>{"use strict";Object.defineProperty(ad,"__esModule",{value:!0});ad.diffCss=ZW;ad.cssDiff=void 0;var tH=eH(rf());function eH(i){return i&&i.__esModule?i:{default:i}}var vw=new tH.default;ad.cssDiff=vw;vw.tokenize=function(i){return i.split(/([{}:;,]|\s+)/)};function ZW(i,u,f){return vw.diff(i,u,f)}});var NT=Me(Ra=>{"use strict";Object.defineProperty(Ra,"__esModule",{value:!0});Ra.diffJson=nH;Ra.canonicalize=Sm;Ra.jsonDiff=void 0;var RT=rH(rf()),iH=Em();function rH(i){return i&&i.__esModule?i:{default:i}}function Cm(i){return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?Cm=function(f){return typeof f}:Cm=function(f){return f&&typeof Symbol=="function"&&f.constructor===Symbol&&f!==Symbol.prototype?"symbol":typeof f},Cm(i)}var oH=Object.prototype.toString,xc=new RT.default;Ra.jsonDiff=xc;xc.useLongestToken=!0;xc.tokenize=iH.lineDiff.tokenize;xc.castInput=function(i){var u=this.options,f=u.undefinedReplacement,c=u.stringifyReplacer,g=c===void 0?function(t,C){return typeof C=="undefined"?f:C}:c;return typeof i=="string"?i:JSON.stringify(Sm(i,null,null,g),g," ")};xc.equals=function(i,u){return RT.default.prototype.equals.call(xc,i.replace(/,([\r\n])/g,"$1"),u.replace(/,([\r\n])/g,"$1"))};function nH(i,u,f){return xc.diff(i,u,f)}function Sm(i,u,f,c,g){u=u||[],f=f||[],c&&(i=c(g,i));var t;for(t=0;t{"use strict";Object.defineProperty(dd,"__esModule",{value:!0});dd.diffArrays=uH;dd.arrayDiff=void 0;var lH=sH(rf());function sH(i){return i&&i.__esModule?i:{default:i}}var pd=new lH.default;dd.arrayDiff=pd;pd.tokenize=function(i){return i.slice()};pd.join=pd.removeEmpty=function(i){return i};function uH(i,u,f){return pd.diff(i,u,f)}});var Tm=Me(gw=>{"use strict";Object.defineProperty(gw,"__esModule",{value:!0});gw.parsePatch=fH;function fH(i){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},f=i.split(/\r\n|[\n\v\f\r\x85]/),c=i.match(/\r\n|[\n\v\f\r\x85]/g)||[],g=[],t=0;function C(){var D={};for(g.push(D);t{"use strict";Object.defineProperty(_w,"__esModule",{value:!0});_w.default=cH;function cH(i,u,f){var c=!0,g=!1,t=!1,C=1;return function A(){if(c&&!t){if(g?C++:c=!1,i+C<=f)return C;t=!0}if(!g)return t||(c=!0),u<=i-C?-C++:(g=!0,A())}}});var zT=Me(xm=>{"use strict";Object.defineProperty(xm,"__esModule",{value:!0});xm.applyPatch=UT;xm.applyPatches=aH;var qT=Tm(),pH=dH(jT());function dH(i){return i&&i.__esModule?i:{default:i}}function UT(i,u){var f=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};if(typeof u=="string"&&(u=(0,qT.parsePatch)(u)),Array.isArray(u)){if(u.length>1)throw new Error("applyPatch only works with a single input.");u=u[0]}var c=i.split(/\r\n|[\n\v\f\r\x85]/),g=i.match(/\r\n|[\n\v\f\r\x85]/g)||[],t=u.hunks,C=f.compareLine||function(Ot,Nt,Je,V){return Nt===V},A=0,x=f.fuzzFactor||0,D=0,L=0,N,j;function $(Ot,Nt){for(var Je=0;Je0?V[0]:" ",ge=V.length>0?V.substr(1):V;if(ne===" "||ne==="-"){if(!C(Nt+1,c[Nt],ne,ge)&&(A++,A>x))return!1;Nt++}}return!0}for(var h=0;h0?Le[0]:" ",ct=Le.length>0?Le.substr(1):Le,Ue=J.linedelimiters[Oe];if(ot===" ")Te++;else if(ot==="-")c.splice(Te,1),g.splice(Te,1);else if(ot==="+")c.splice(Te,0,ct),g.splice(Te,0,Ue),Te++;else if(ot==="\\"){var be=J.lines[Oe-1]?J.lines[Oe-1][0]:null;be==="+"?N=!0:be==="-"&&(j=!0)}}}if(N)for(;!c[c.length-1];)c.pop(),g.pop();else j&&(c.push(""),g.push(` -`));for(var At=0;At{"use strict";Object.defineProperty(hd,"__esModule",{value:!0});hd.structuredPatch=WT;hd.createTwoFilesPatch=HT;hd.createPatch=hH;var mH=Em();function yw(i){return _H(i)||gH(i)||vH()}function vH(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function gH(i){if(Symbol.iterator in Object(i)||Object.prototype.toString.call(i)==="[object Arguments]")return Array.from(i)}function _H(i){if(Array.isArray(i)){for(var u=0,f=new Array(i.length);u0?x(J.lines.slice(-C.context)):[],L-=j.length,N-=j.length)}(De=j).push.apply(De,yw(me.map(function(At){return(Se.added?"+":"-")+At}))),Se.added?h+=me.length:$+=me.length}else{if(L)if(me.length<=C.context*2&&oe=A.length-2&&me.length<=C.context){var ct=/\n$/.test(f),Ue=/\n$/.test(c),be=me.length==0&&j.length>ot.oldLines;!ct&&be&&j.splice(ot.oldLines,0,"\\ No newline at end of file"),(!ct&&!be||!Ue)&&j.push("\\ No newline at end of file")}D.push(ot),L=0,N=0,j=[]}$+=me.length,h+=me.length}},ce=0;ce{"use strict";Object.defineProperty(km,"__esModule",{value:!0});km.arrayEqual=yH;km.arrayStartsWith=bT;function yH(i,u){return i.length!==u.length?!1:bT(i,u)}function bT(i,u){if(u.length>i.length)return!1;for(var f=0;f{"use strict";Object.defineProperty(Am,"__esModule",{value:!0});Am.calcLineCount=VT;Am.merge=wH;var DH=ww(),EH=Tm(),Dw=GT();function Na(i){return TH(i)||CH(i)||SH()}function SH(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function CH(i){if(Symbol.iterator in Object(i)||Object.prototype.toString.call(i)==="[object Arguments]")return Array.from(i)}function TH(i){if(Array.isArray(i)){for(var u=0,f=new Array(i.length);u{"use strict";Object.defineProperty(Cw,"__esModule",{value:!0});Cw.convertChangesToDMP=OH;function OH(i){for(var u=[],f,c,g=0;g{"use strict";Object.defineProperty(Tw,"__esModule",{value:!0});Tw.convertChangesToXML=IH;function IH(i){for(var u=[],f=0;f"):c.removed&&u.push(""),u.push(PH(c.value)),c.added?u.push(""):c.removed&&u.push("")}return u.join("")}function PH(i){var u=i;return u=u.replace(/&/g,"&"),u=u.replace(//g,">"),u=u.replace(/"/g,"""),u}});var f9=Me(w0=>{"use strict";Object.defineProperty(w0,"__esModule",{value:!0});Object.defineProperty(w0,"Diff",{enumerable:!0,get:function(){return MH.default}});Object.defineProperty(w0,"diffChars",{enumerable:!0,get:function(){return FH.diffChars}});Object.defineProperty(w0,"diffWords",{enumerable:!0,get:function(){return o9.diffWords}});Object.defineProperty(w0,"diffWordsWithSpace",{enumerable:!0,get:function(){return o9.diffWordsWithSpace}});Object.defineProperty(w0,"diffLines",{enumerable:!0,get:function(){return u9.diffLines}});Object.defineProperty(w0,"diffTrimmedLines",{enumerable:!0,get:function(){return u9.diffTrimmedLines}});Object.defineProperty(w0,"diffSentences",{enumerable:!0,get:function(){return LH.diffSentences}});Object.defineProperty(w0,"diffCss",{enumerable:!0,get:function(){return RH.diffCss}});Object.defineProperty(w0,"diffJson",{enumerable:!0,get:function(){return s9.diffJson}});Object.defineProperty(w0,"canonicalize",{enumerable:!0,get:function(){return s9.canonicalize}});Object.defineProperty(w0,"diffArrays",{enumerable:!0,get:function(){return NH.diffArrays}});Object.defineProperty(w0,"applyPatch",{enumerable:!0,get:function(){return l9.applyPatch}});Object.defineProperty(w0,"applyPatches",{enumerable:!0,get:function(){return l9.applyPatches}});Object.defineProperty(w0,"parsePatch",{enumerable:!0,get:function(){return BH.parsePatch}});Object.defineProperty(w0,"merge",{enumerable:!0,get:function(){return jH.merge}});Object.defineProperty(w0,"structuredPatch",{enumerable:!0,get:function(){return xw.structuredPatch}});Object.defineProperty(w0,"createTwoFilesPatch",{enumerable:!0,get:function(){return xw.createTwoFilesPatch}});Object.defineProperty(w0,"createPatch",{enumerable:!0,get:function(){return xw.createPatch}});Object.defineProperty(w0,"convertChangesToDMP",{enumerable:!0,get:function(){return UH.convertChangesToDMP}});Object.defineProperty(w0,"convertChangesToXML",{enumerable:!0,get:function(){return qH.convertChangesToXML}});var MH=zH(rf()),FH=OT(),o9=MT(),u9=Em(),LH=FT(),RH=LT(),s9=NT(),NH=BT(),l9=zT(),BH=Tm(),jH=n9(),xw=ww(),UH=r9(),qH=i9();function zH(i){return i&&i.__esModule?i:{default:i}}});var HH={};jR(HH,{default:()=>GH});var wT=Er(require("@yarnpkg/cli")),Tc=Er(require("@yarnpkg/core"));var Z5=Er(ys()),Dc=Er(lr()),om=(0,Dc.memo)(({active:i})=>{let u=(0,Dc.useMemo)(()=>i?"\u25C9":"\u25EF",[i]),f=(0,Dc.useMemo)(()=>i?"green":"yellow",[i]);return Dc.default.createElement(Z5.Text,{color:f},u)});var Wf=Er(ys()),Bo=Er(lr());var eC=Er(ys()),um=Er(lr());function zf({active:i},u,f){let{stdin:c}=(0,eC.useStdin)(),g=(0,um.useCallback)((t,C)=>u(t,C),f);(0,um.useEffect)(()=>{if(!(!i||!c))return c.on("keypress",g),()=>{c.off("keypress",g)}},[i,g,c])}var sm;(function(f){f.BEFORE="before",f.AFTER="after"})(sm||(sm={}));var tC=function({active:i},u,f){zf({active:i},(c,g)=>{g.name==="tab"&&(g.shift?u(sm.BEFORE):u(sm.AFTER))},f)};var lm=function(i,u,{active:f,minus:c,plus:g,set:t,loop:C=!0}){zf({active:f},(A,x)=>{let D=u.indexOf(i);switch(x.name){case c:{let L=D-1;if(C){t(u[(u.length+L)%u.length]);return}if(L<0)return;t(u[L])}break;case g:{let L=D+1;if(C){t(u[L%u.length]);return}if(L>=u.length)return;t(u[L])}break}},[u,i,g,t,C])};var fm=({active:i=!0,children:u=[],radius:f=10,size:c=1,loop:g=!0,onFocusRequest:t,willReachEnd:C})=>{let A=ce=>{if(ce.key===null)throw new Error("Expected all children to have a key");return ce.key},x=Bo.default.Children.map(u,ce=>A(ce)),D=x[0],[L,N]=(0,Bo.useState)(D),j=x.indexOf(L);(0,Bo.useEffect)(()=>{x.includes(L)||N(D)},[u]),(0,Bo.useEffect)(()=>{C&&j>=x.length-2&&C()},[j]),tC({active:i&&!!t},ce=>{t==null||t(ce)},[t]),lm(L,x,{active:i,minus:"up",plus:"down",set:N,loop:g});let $=j-f,h=j+f;h>x.length&&($-=h-x.length,h=x.length),$<0&&(h+=-$,$=0),h>=x.length&&(h=x.length-1);let re=[];for(let ce=$;ce<=h;++ce){let Q=x[ce],oe=i&&Q===L;re.push(Bo.default.createElement(Wf.Box,{key:Q,height:c},Bo.default.createElement(Wf.Box,{marginLeft:1,marginRight:1},Bo.default.createElement(Wf.Text,null,oe?Bo.default.createElement(Wf.Text,{color:"cyan",bold:!0},">"):" ")),Bo.default.createElement(Wf.Box,null,Bo.default.cloneElement(u[ce],{active:oe}))))}return Bo.default.createElement(Wf.Box,{flexDirection:"column",width:"100%"},re)};var cm=Er(lr());var nC=Er(ys()),nf=Er(lr()),rC=Er(require("readline")),G3=nf.default.createContext(null),iC=({children:i})=>{let{stdin:u,setRawMode:f}=(0,nC.useStdin)();(0,nf.useEffect)(()=>{f&&f(!0),u&&(0,rC.emitKeypressEvents)(u)},[u,f]);let[c,g]=(0,nf.useState)(new Map),t=(0,nf.useMemo)(()=>({getAll:()=>c,get:C=>c.get(C),set:(C,A)=>g(new Map([...c,[C,A]]))}),[c,g]);return nf.default.createElement(G3.Provider,{value:t,children:i})};function Ec(i,u){let f=(0,cm.useContext)(G3);if(f===null)throw new Error("Expected this hook to run with a ministore context attached");if(typeof i=="undefined")return f.getAll();let c=(0,cm.useCallback)(t=>{f.set(i,t)},[i,f.set]),g=f.get(i);return typeof g=="undefined"&&(g=u),[g,c]}var am=Er(ys()),V3=Er(lr());async function dm(i,u){let f,c=t=>{let{exit:C}=(0,am.useApp)();zf({active:!0},(A,x)=>{x.name==="return"&&(f=t,C())},[C,t])},{waitUntilExit:g}=(0,am.render)(V3.default.createElement(iC,null,V3.default.createElement(i,zn(dt({},u),{useSubmit:c}))));return await g(),f}var DT=Er(require("clipanion")),ET=Er(lC()),un=Er(ys()),Pt=Er(lr());var yT=Er(_T()),cw={appId:"OFCNCOG2CU",apiKey:"6fe4476ee5a1832882e326b506d14126",indexName:"npm-search"},FW=(0,yT.default)(cw.appId,cw.apiKey).initIndex(cw.indexName),aw=async(i,u=0)=>await FW.search(i,{analyticsTags:["yarn-plugin-interactive-tools"],attributesToRetrieve:["name","version","owner","repository","humanDownloadsLast30Days"],page:u,hitsPerPage:10});var od=["regular","dev","peer"],ud=class extends wT.BaseCommand{async execute(){let u=await Tc.Configuration.find(this.context.cwd,this.context.plugins),f=()=>Pt.default.createElement(un.Box,{flexDirection:"row"},Pt.default.createElement(un.Box,{flexDirection:"column",width:48},Pt.default.createElement(un.Box,null,Pt.default.createElement(un.Text,null,"Press ",Pt.default.createElement(un.Text,{bold:!0,color:"cyanBright"},""),"/",Pt.default.createElement(un.Text,{bold:!0,color:"cyanBright"},"")," to move between packages.")),Pt.default.createElement(un.Box,null,Pt.default.createElement(un.Text,null,"Press ",Pt.default.createElement(un.Text,{bold:!0,color:"cyanBright"},"")," to select a package.")),Pt.default.createElement(un.Box,null,Pt.default.createElement(un.Text,null,"Press ",Pt.default.createElement(un.Text,{bold:!0,color:"cyanBright"},"")," again to change the target."))),Pt.default.createElement(un.Box,{flexDirection:"column"},Pt.default.createElement(un.Box,{marginLeft:1},Pt.default.createElement(un.Text,null,"Press ",Pt.default.createElement(un.Text,{bold:!0,color:"cyanBright"},"")," to install the selected packages.")),Pt.default.createElement(un.Box,{marginLeft:1},Pt.default.createElement(un.Text,null,"Press ",Pt.default.createElement(un.Text,{bold:!0,color:"cyanBright"},"")," to abort.")))),c=()=>Pt.default.createElement(Pt.default.Fragment,null,Pt.default.createElement(un.Box,{width:15},Pt.default.createElement(un.Text,{bold:!0,underline:!0,color:"gray"},"Owner")),Pt.default.createElement(un.Box,{width:11},Pt.default.createElement(un.Text,{bold:!0,underline:!0,color:"gray"},"Version")),Pt.default.createElement(un.Box,{width:10},Pt.default.createElement(un.Text,{bold:!0,underline:!0,color:"gray"},"Downloads"))),g=()=>Pt.default.createElement(un.Box,{width:17},Pt.default.createElement(un.Text,{bold:!0,underline:!0,color:"gray"},"Target")),t=({hit:$,active:h})=>{let[re,ce]=Ec($.name,null);zf({active:h},(Se,me)=>{if(me.name!=="space")return;if(!re){ce(od[0]);return}let De=od.indexOf(re)+1;De===od.length?ce(null):ce(od[De])},[re,ce]);let Q=Tc.structUtils.parseIdent($.name),oe=Tc.structUtils.prettyIdent(u,Q);return Pt.default.createElement(un.Box,null,Pt.default.createElement(un.Box,{width:45},Pt.default.createElement(un.Text,{bold:!0,wrap:"wrap"},oe)),Pt.default.createElement(un.Box,{width:14,marginLeft:1},Pt.default.createElement(un.Text,{bold:!0,wrap:"truncate"},$.owner.name)),Pt.default.createElement(un.Box,{width:10,marginLeft:1},Pt.default.createElement(un.Text,{italic:!0,wrap:"truncate"},$.version)),Pt.default.createElement(un.Box,{width:16,marginLeft:1},Pt.default.createElement(un.Text,null,$.humanDownloadsLast30Days)))},C=({name:$,active:h})=>{let[re]=Ec($,null),ce=Tc.structUtils.parseIdent($);return Pt.default.createElement(un.Box,null,Pt.default.createElement(un.Box,{width:47},Pt.default.createElement(un.Text,{bold:!0}," - ",Tc.structUtils.prettyIdent(u,ce))),od.map(Q=>Pt.default.createElement(un.Box,{key:Q,width:14,marginLeft:1},Pt.default.createElement(un.Text,null," ",Pt.default.createElement(om,{active:re===Q})," ",Pt.default.createElement(un.Text,{bold:!0},Q)))))},A=()=>Pt.default.createElement(un.Box,{marginTop:1},Pt.default.createElement(un.Text,null,"Powered by Algolia.")),D=await dm(({useSubmit:$})=>{let h=Ec();$(h);let re=Array.from(h.keys()).filter(Le=>h.get(Le)!==null),[ce,Q]=(0,Pt.useState)(""),[oe,Se]=(0,Pt.useState)(0),[me,De]=(0,Pt.useState)([]),J=Le=>{Le.match(/\t| /)||Q(Le)},Te=async()=>{Se(0);let Le=await aw(ce);Le.query===ce&&De(Le.hits)},Oe=async()=>{let Le=await aw(ce,oe+1);Le.query===ce&&Le.page-1===oe&&(Se(Le.page),De([...me,...Le.hits]))};return(0,Pt.useEffect)(()=>{ce?Te():De([])},[ce]),Pt.default.createElement(un.Box,{flexDirection:"column"},Pt.default.createElement(f,null),Pt.default.createElement(un.Box,{flexDirection:"row",marginTop:1},Pt.default.createElement(un.Text,{bold:!0},"Search: "),Pt.default.createElement(un.Box,{width:41},Pt.default.createElement(ET.default,{value:ce,onChange:J,placeholder:"i.e. babel, webpack, react...",showCursor:!1})),Pt.default.createElement(c,null)),me.length?Pt.default.createElement(fm,{radius:2,loop:!1,children:me.map(Le=>Pt.default.createElement(t,{key:Le.name,hit:Le,active:!1})),willReachEnd:Oe}):Pt.default.createElement(un.Text,{color:"gray"},"Start typing..."),Pt.default.createElement(un.Box,{flexDirection:"row",marginTop:1},Pt.default.createElement(un.Box,{width:49},Pt.default.createElement(un.Text,{bold:!0},"Selected:")),Pt.default.createElement(g,null)),re.length?re.map(Le=>Pt.default.createElement(C,{key:Le,name:Le,active:!1})):Pt.default.createElement(un.Text,{color:"gray"},"No selected packages..."),Pt.default.createElement(A,null))},{});if(typeof D=="undefined")return 1;let L=Array.from(D.keys()).filter($=>D.get($)==="regular"),N=Array.from(D.keys()).filter($=>D.get($)==="dev"),j=Array.from(D.keys()).filter($=>D.get($)==="peer");return L.length&&await this.cli.run(["add",...L]),N.length&&await this.cli.run(["add","--dev",...N]),j&&await this.cli.run(["add","--peer",...j]),0}};ud.paths=[["search"]],ud.usage=DT.Command.Usage({category:"Interactive commands",description:"open the search interface",details:` - This command opens a fullscreen terminal interface where you can search for and install packages from the npm registry. - `,examples:[["Open the search window","yarn search"]]});var ST=ud;var Im=Er(require("@yarnpkg/cli")),W0=Er(require("@yarnpkg/core"));var sd=Er(ys()),bf=Er(lr());var CT=Er(ys()),TT=Er(lr()),wm=({length:i,active:u})=>{if(i===0)return null;let f=i>1?` ${"-".repeat(i-1)}`:" ";return TT.default.createElement(CT.Text,{dimColor:!u},f)};var xT=function({active:i,skewer:u,options:f,value:c,onChange:g,sizes:t=[]}){let C=f.filter(({label:x})=>!!x).map(({value:x})=>x),A=f.findIndex(x=>x.value===c&&x.label!="");return lm(c,C,{active:i,minus:"left",plus:"right",set:g}),bf.default.createElement(bf.default.Fragment,null,f.map(({label:x},D)=>{let L=D===A,N=t[D]-1||0,j=x.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,""),$=Math.max(0,N-j.length-2);return x?bf.default.createElement(sd.Box,{key:x,width:N,marginLeft:1},bf.default.createElement(sd.Text,{wrap:"truncate"},bf.default.createElement(om,{active:L})," ",x),u?bf.default.createElement(wm,{active:i,length:$}):null):bf.default.createElement(sd.Box,{key:`spacer-${D}`,width:N,marginLeft:1})}))};var c9=Er(require("@yarnpkg/plugin-essentials")),a9=Er(require("clipanion")),d9=Er(f9()),tr=Er(ys()),pn=Er(lr()),p9=Er(require("semver")),h9=/^((?:[\^~]|>=?)?)([0-9]+)(\.[0-9]+)(\.[0-9]+)((?:-\S+)?)$/,WH=10,md=class extends Im.BaseCommand{async execute(){let u=await W0.Configuration.find(this.context.cwd,this.context.plugins),{project:f,workspace:c}=await W0.Project.find(u,this.context.cwd),g=await W0.Cache.find(u);if(!c)throw new Im.WorkspaceRequiredError(f.cwd,this.context.cwd);await f.restoreInstallState({restoreResolutions:!1});let t=(Q,oe)=>{let Se=(0,d9.diffWords)(Q,oe),me="";for(let De of Se)De.added?me+=W0.formatUtils.pretty(u,De.value,"green"):De.removed||(me+=De.value);return me},C=(Q,oe)=>{if(Q===oe)return oe;let Se=W0.structUtils.parseRange(Q),me=W0.structUtils.parseRange(oe),De=Se.selector.match(h9),J=me.selector.match(h9);if(!De||!J)return t(Q,oe);let Te=["gray","red","yellow","green","magenta"],Oe=null,Le="";for(let ot=1;ot{let me=await c9.suggestUtils.fetchDescriptorFrom(Q,Se,{project:f,cache:g,preserveModifier:oe,workspace:c});return me!==null?me.range:Q.range},x=async Q=>{let oe=p9.default.valid(Q.range)?`^${Q.range}`:Q.range,[Se,me]=await Promise.all([A(Q,Q.range,oe).catch(()=>null),A(Q,Q.range,"latest").catch(()=>null)]),De=[{value:null,label:Q.range}];return Se&&Se!==Q.range?De.push({value:Se,label:C(Q.range,Se)}):De.push({value:null,label:""}),me&&me!==Se&&me!==Q.range?De.push({value:me,label:C(Q.range,me)}):De.push({value:null,label:""}),De},D=()=>pn.default.createElement(tr.Box,{flexDirection:"row"},pn.default.createElement(tr.Box,{flexDirection:"column",width:49},pn.default.createElement(tr.Box,{marginLeft:1},pn.default.createElement(tr.Text,null,"Press ",pn.default.createElement(tr.Text,{bold:!0,color:"cyanBright"},""),"/",pn.default.createElement(tr.Text,{bold:!0,color:"cyanBright"},"")," to select packages.")),pn.default.createElement(tr.Box,{marginLeft:1},pn.default.createElement(tr.Text,null,"Press ",pn.default.createElement(tr.Text,{bold:!0,color:"cyanBright"},""),"/",pn.default.createElement(tr.Text,{bold:!0,color:"cyanBright"},"")," to select versions."))),pn.default.createElement(tr.Box,{flexDirection:"column"},pn.default.createElement(tr.Box,{marginLeft:1},pn.default.createElement(tr.Text,null,"Press ",pn.default.createElement(tr.Text,{bold:!0,color:"cyanBright"},"")," to install.")),pn.default.createElement(tr.Box,{marginLeft:1},pn.default.createElement(tr.Text,null,"Press ",pn.default.createElement(tr.Text,{bold:!0,color:"cyanBright"},"")," to abort.")))),L=()=>pn.default.createElement(tr.Box,{flexDirection:"row",paddingTop:1,paddingBottom:1},pn.default.createElement(tr.Box,{width:50},pn.default.createElement(tr.Text,{bold:!0},pn.default.createElement(tr.Text,{color:"greenBright"},"?")," Pick the packages you want to upgrade.")),pn.default.createElement(tr.Box,{width:17},pn.default.createElement(tr.Text,{bold:!0,underline:!0,color:"gray"},"Current")),pn.default.createElement(tr.Box,{width:17},pn.default.createElement(tr.Text,{bold:!0,underline:!0,color:"gray"},"Range")),pn.default.createElement(tr.Box,{width:17},pn.default.createElement(tr.Text,{bold:!0,underline:!0,color:"gray"},"Latest"))),N=({active:Q,descriptor:oe,suggestions:Se})=>{let[me,De]=Ec(oe.descriptorHash,null),J=W0.structUtils.stringifyIdent(oe),Te=Math.max(0,45-J.length);return pn.default.createElement(pn.default.Fragment,null,pn.default.createElement(tr.Box,null,pn.default.createElement(tr.Box,{width:45},pn.default.createElement(tr.Text,{bold:!0},W0.structUtils.prettyIdent(u,oe)),pn.default.createElement(wm,{active:Q,length:Te})),Se!==null?pn.default.createElement(xT,{active:Q,options:Se,value:me,skewer:!0,onChange:De,sizes:[17,17,17]}):pn.default.createElement(tr.Box,{marginLeft:2},pn.default.createElement(tr.Text,{color:"gray"},"Fetching suggestions..."))))},j=({dependencies:Q})=>{let[oe,Se]=(0,pn.useState)(null),me=(0,pn.useRef)(!0);return(0,pn.useEffect)(()=>()=>{me.current=!1}),(0,pn.useEffect)(()=>{Promise.all(Q.map(De=>x(De))).then(De=>{let J=Q.map((Te,Oe)=>{let Le=De[Oe];return[Te,Le]}).filter(([Te,Oe])=>Oe.filter(Le=>Le.label!=="").length>1);me.current&&Se(J)})},[]),oe?oe.length?pn.default.createElement(fm,{radius:WH,children:oe.map(([De,J])=>pn.default.createElement(N,{key:De.descriptorHash,active:!1,descriptor:De,suggestions:J}))}):pn.default.createElement(tr.Text,null,"No upgrades found"):pn.default.createElement(tr.Text,null,"Fetching suggestions...")},h=await dm(({useSubmit:Q})=>{Q(Ec());let oe=new Map;for(let me of f.workspaces)for(let De of["dependencies","devDependencies"])for(let J of me.manifest[De].values())f.tryWorkspaceByDescriptor(J)===null&&oe.set(J.descriptorHash,J);let Se=W0.miscUtils.sortMap(oe.values(),me=>W0.structUtils.stringifyDescriptor(me));return pn.default.createElement(tr.Box,{flexDirection:"column"},pn.default.createElement(D,null),pn.default.createElement(L,null),pn.default.createElement(j,{dependencies:Se}))},{});if(typeof h=="undefined")return 1;let re=!1;for(let Q of f.workspaces)for(let oe of["dependencies","devDependencies"]){let Se=Q.manifest[oe];for(let me of Se.values()){let De=h.get(me.descriptorHash);typeof De!="undefined"&&De!==null&&(Se.set(me.identHash,W0.structUtils.makeDescriptor(me,De)),re=!0)}}return re?(await W0.StreamReport.start({configuration:u,stdout:this.context.stdout,includeLogs:!this.context.quiet},async Q=>{await f.install({cache:g,report:Q})})).exitCode():0}};md.paths=[["upgrade-interactive"]],md.usage=a9.Command.Usage({category:"Interactive commands",description:"open the upgrade interface",details:` - This command opens a fullscreen terminal interface where you can see any out of date packages used by your application, their status compared to the latest versions available on the remote registry, and select packages to upgrade. - `,examples:[["Open the upgrade window","yarn upgrade-interactive"]]});var m9=md;var bH={commands:[ST,m9]},GH=bH;return HH;})(); -/* -object-assign -(c) Sindre Sorhus -@license MIT -*/ -/** - * @license - * Lodash - * Copyright OpenJS Foundation and other contributors - * Released under MIT license - * Based on Underscore.js 1.8.3 - * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors - */ -/** @license React v0.0.0-experimental-51a3aa6af - * react-debug-tools.production.min.js - * - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ -/** @license React v0.0.0-experimental-51a3aa6af - * react-is.production.min.js - * - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ -/** @license React v0.0.0-experimental-51a3aa6af - * react.production.min.js - * - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ -/** @license React v0.18.0 - * scheduler.production.min.js - * - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ -/** @license React v0.24.0 - * react-reconciler.production.min.js - * - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ -/** @license React v16.13.1 - * react.production.min.js - * - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ -return plugin; -} -}; diff --git a/tgui/.yarn/releases/yarn-3.3.1.cjs b/tgui/.yarn/releases/yarn-3.3.1.cjs deleted file mode 100644 index 53a282e439a..00000000000 --- a/tgui/.yarn/releases/yarn-3.3.1.cjs +++ /dev/null @@ -1,823 +0,0 @@ -#!/usr/bin/env node -/* eslint-disable */ -//prettier-ignore -(()=>{var dfe=Object.create;var jS=Object.defineProperty;var Cfe=Object.getOwnPropertyDescriptor;var mfe=Object.getOwnPropertyNames;var Efe=Object.getPrototypeOf,Ife=Object.prototype.hasOwnProperty;var J=(r=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(r,{get:(e,t)=>(typeof require<"u"?require:e)[t]}):r)(function(r){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+r+'" is not supported')});var y=(r,e)=>()=>(e||r((e={exports:{}}).exports,e),e.exports),ht=(r,e)=>{for(var t in e)jS(r,t,{get:e[t],enumerable:!0})},yfe=(r,e,t,i)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of mfe(e))!Ife.call(r,n)&&n!==t&&jS(r,n,{get:()=>e[n],enumerable:!(i=Cfe(e,n))||i.enumerable});return r};var ne=(r,e,t)=>(t=r!=null?dfe(Efe(r)):{},yfe(e||!r||!r.__esModule?jS(t,"default",{value:r,enumerable:!0}):t,r));var aK=y((uZe,oK)=>{oK.exports=sK;sK.sync=Gfe;var iK=J("fs");function Hfe(r,e){var t=e.pathExt!==void 0?e.pathExt:process.env.PATHEXT;if(!t||(t=t.split(";"),t.indexOf("")!==-1))return!0;for(var i=0;i{uK.exports=lK;lK.sync=Yfe;var AK=J("fs");function lK(r,e,t){AK.stat(r,function(i,n){t(i,i?!1:cK(n,e))})}function Yfe(r,e){return cK(AK.statSync(r),e)}function cK(r,e){return r.isFile()&&jfe(r,e)}function jfe(r,e){var t=r.mode,i=r.uid,n=r.gid,s=e.uid!==void 0?e.uid:process.getuid&&process.getuid(),o=e.gid!==void 0?e.gid:process.getgid&&process.getgid(),a=parseInt("100",8),l=parseInt("010",8),c=parseInt("001",8),u=a|l,g=t&c||t&l&&n===o||t&a&&i===s||t&u&&s===0;return g}});var hK=y((hZe,fK)=>{var fZe=J("fs"),OI;process.platform==="win32"||global.TESTING_WINDOWS?OI=aK():OI=gK();fK.exports=av;av.sync=qfe;function av(r,e,t){if(typeof e=="function"&&(t=e,e={}),!t){if(typeof Promise!="function")throw new TypeError("callback not provided");return new Promise(function(i,n){av(r,e||{},function(s,o){s?n(s):i(o)})})}OI(r,e||{},function(i,n){i&&(i.code==="EACCES"||e&&e.ignoreErrors)&&(i=null,n=!1),t(i,n)})}function qfe(r,e){try{return OI.sync(r,e||{})}catch(t){if(e&&e.ignoreErrors||t.code==="EACCES")return!1;throw t}}});var yK=y((pZe,IK)=>{var _g=process.platform==="win32"||process.env.OSTYPE==="cygwin"||process.env.OSTYPE==="msys",pK=J("path"),Jfe=_g?";":":",dK=hK(),CK=r=>Object.assign(new Error(`not found: ${r}`),{code:"ENOENT"}),mK=(r,e)=>{let t=e.colon||Jfe,i=r.match(/\//)||_g&&r.match(/\\/)?[""]:[..._g?[process.cwd()]:[],...(e.path||process.env.PATH||"").split(t)],n=_g?e.pathExt||process.env.PATHEXT||".EXE;.CMD;.BAT;.COM":"",s=_g?n.split(t):[""];return _g&&r.indexOf(".")!==-1&&s[0]!==""&&s.unshift(""),{pathEnv:i,pathExt:s,pathExtExe:n}},EK=(r,e,t)=>{typeof e=="function"&&(t=e,e={}),e||(e={});let{pathEnv:i,pathExt:n,pathExtExe:s}=mK(r,e),o=[],a=c=>new Promise((u,g)=>{if(c===i.length)return e.all&&o.length?u(o):g(CK(r));let f=i[c],h=/^".*"$/.test(f)?f.slice(1,-1):f,p=pK.join(h,r),C=!h&&/^\.[\\\/]/.test(r)?r.slice(0,2)+p:p;u(l(C,c,0))}),l=(c,u,g)=>new Promise((f,h)=>{if(g===n.length)return f(a(u+1));let p=n[g];dK(c+p,{pathExt:s},(C,w)=>{if(!C&&w)if(e.all)o.push(c+p);else return f(c+p);return f(l(c,u,g+1))})});return t?a(0).then(c=>t(null,c),t):a(0)},Wfe=(r,e)=>{e=e||{};let{pathEnv:t,pathExt:i,pathExtExe:n}=mK(r,e),s=[];for(let o=0;o{"use strict";var wK=(r={})=>{let e=r.env||process.env;return(r.platform||process.platform)!=="win32"?"PATH":Object.keys(e).reverse().find(i=>i.toUpperCase()==="PATH")||"Path"};Av.exports=wK;Av.exports.default=wK});var vK=y((CZe,SK)=>{"use strict";var bK=J("path"),zfe=yK(),Vfe=BK();function QK(r,e){let t=r.options.env||process.env,i=process.cwd(),n=r.options.cwd!=null,s=n&&process.chdir!==void 0&&!process.chdir.disabled;if(s)try{process.chdir(r.options.cwd)}catch{}let o;try{o=zfe.sync(r.command,{path:t[Vfe({env:t})],pathExt:e?bK.delimiter:void 0})}catch{}finally{s&&process.chdir(i)}return o&&(o=bK.resolve(n?r.options.cwd:"",o)),o}function Xfe(r){return QK(r)||QK(r,!0)}SK.exports=Xfe});var xK=y((mZe,cv)=>{"use strict";var lv=/([()\][%!^"`<>&|;, *?])/g;function _fe(r){return r=r.replace(lv,"^$1"),r}function Zfe(r,e){return r=`${r}`,r=r.replace(/(\\*)"/g,'$1$1\\"'),r=r.replace(/(\\*)$/,"$1$1"),r=`"${r}"`,r=r.replace(lv,"^$1"),e&&(r=r.replace(lv,"^$1")),r}cv.exports.command=_fe;cv.exports.argument=Zfe});var DK=y((EZe,PK)=>{"use strict";PK.exports=/^#!(.*)/});var RK=y((IZe,kK)=>{"use strict";var $fe=DK();kK.exports=(r="")=>{let e=r.match($fe);if(!e)return null;let[t,i]=e[0].replace(/#! ?/,"").split(" "),n=t.split("/").pop();return n==="env"?i:i?`${n} ${i}`:n}});var NK=y((yZe,FK)=>{"use strict";var uv=J("fs"),ehe=RK();function the(r){let t=Buffer.alloc(150),i;try{i=uv.openSync(r,"r"),uv.readSync(i,t,0,150,0),uv.closeSync(i)}catch{}return ehe(t.toString())}FK.exports=the});var MK=y((wZe,OK)=>{"use strict";var rhe=J("path"),TK=vK(),LK=xK(),ihe=NK(),nhe=process.platform==="win32",she=/\.(?:com|exe)$/i,ohe=/node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;function ahe(r){r.file=TK(r);let e=r.file&&ihe(r.file);return e?(r.args.unshift(r.file),r.command=e,TK(r)):r.file}function Ahe(r){if(!nhe)return r;let e=ahe(r),t=!she.test(e);if(r.options.forceShell||t){let i=ohe.test(e);r.command=rhe.normalize(r.command),r.command=LK.command(r.command),r.args=r.args.map(s=>LK.argument(s,i));let n=[r.command].concat(r.args).join(" ");r.args=["/d","/s","/c",`"${n}"`],r.command=process.env.comspec||"cmd.exe",r.options.windowsVerbatimArguments=!0}return r}function lhe(r,e,t){e&&!Array.isArray(e)&&(t=e,e=null),e=e?e.slice(0):[],t=Object.assign({},t);let i={command:r,args:e,options:t,file:void 0,original:{command:r,args:e}};return t.shell?i:Ahe(i)}OK.exports=lhe});var HK=y((BZe,KK)=>{"use strict";var gv=process.platform==="win32";function fv(r,e){return Object.assign(new Error(`${e} ${r.command} ENOENT`),{code:"ENOENT",errno:"ENOENT",syscall:`${e} ${r.command}`,path:r.command,spawnargs:r.args})}function che(r,e){if(!gv)return;let t=r.emit;r.emit=function(i,n){if(i==="exit"){let s=UK(n,e,"spawn");if(s)return t.call(r,"error",s)}return t.apply(r,arguments)}}function UK(r,e){return gv&&r===1&&!e.file?fv(e.original,"spawn"):null}function uhe(r,e){return gv&&r===1&&!e.file?fv(e.original,"spawnSync"):null}KK.exports={hookChildProcess:che,verifyENOENT:UK,verifyENOENTSync:uhe,notFoundError:fv}});var dv=y((bZe,Zg)=>{"use strict";var GK=J("child_process"),hv=MK(),pv=HK();function YK(r,e,t){let i=hv(r,e,t),n=GK.spawn(i.command,i.args,i.options);return pv.hookChildProcess(n,i),n}function ghe(r,e,t){let i=hv(r,e,t),n=GK.spawnSync(i.command,i.args,i.options);return n.error=n.error||pv.verifyENOENTSync(n.status,i),n}Zg.exports=YK;Zg.exports.spawn=YK;Zg.exports.sync=ghe;Zg.exports._parse=hv;Zg.exports._enoent=pv});var qK=y((QZe,jK)=>{"use strict";function fhe(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function uc(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,uc)}fhe(uc,Error);uc.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g0){for(g=1,f=1;g>",re=de(">>",!1),me=">&",tt=de(">&",!1),Rt=">",It=de(">",!1),Ur="<<<",oi=de("<<<",!1),pi="<&",pr=de("<&",!1),di="<",ai=de("<",!1),Os=function(m){return{type:"argument",segments:[].concat(...m)}},dr=function(m){return m},Bi="$'",_n=de("$'",!1),pa="'",EA=de("'",!1),kg=function(m){return[{type:"text",text:m}]},Zn='""',IA=de('""',!1),da=function(){return{type:"text",text:""}},Jp='"',yA=de('"',!1),wA=function(m){return m},Br=function(m){return{type:"arithmetic",arithmetic:m,quoted:!0}},Vl=function(m){return{type:"shell",shell:m,quoted:!0}},Rg=function(m){return{type:"variable",...m,quoted:!0}},Eo=function(m){return{type:"text",text:m}},Fg=function(m){return{type:"arithmetic",arithmetic:m,quoted:!1}},Wp=function(m){return{type:"shell",shell:m,quoted:!1}},zp=function(m){return{type:"variable",...m,quoted:!1}},Pr=function(m){return{type:"glob",pattern:m}},oe=/^[^']/,Io=Ye(["'"],!0,!1),kn=function(m){return m.join("")},Ng=/^[^$"]/,bt=Ye(["$",'"'],!0,!1),Xl=`\\ -`,Rn=de(`\\ -`,!1),$n=function(){return""},es="\\",ut=de("\\",!1),yo=/^[\\$"`]/,at=Ye(["\\","$",'"',"`"],!1,!1),ln=function(m){return m},S="\\a",Lt=de("\\a",!1),Tg=function(){return"a"},_l="\\b",Vp=de("\\b",!1),Xp=function(){return"\b"},_p=/^[Ee]/,Zp=Ye(["E","e"],!1,!1),$p=function(){return"\x1B"},G="\\f",yt=de("\\f",!1),BA=function(){return"\f"},Wi="\\n",Zl=de("\\n",!1),We=function(){return` -`},Ca="\\r",Lg=de("\\r",!1),uI=function(){return"\r"},ed="\\t",gI=de("\\t",!1),ar=function(){return" "},Fn="\\v",$l=de("\\v",!1),td=function(){return"\v"},Ms=/^[\\'"?]/,ma=Ye(["\\","'",'"',"?"],!1,!1),cn=function(m){return String.fromCharCode(parseInt(m,16))},ke="\\x",Og=de("\\x",!1),ec="\\u",Us=de("\\u",!1),tc="\\U",bA=de("\\U",!1),Mg=function(m){return String.fromCodePoint(parseInt(m,16))},Ug=/^[0-7]/,Ea=Ye([["0","7"]],!1,!1),Ia=/^[0-9a-fA-f]/,$e=Ye([["0","9"],["a","f"],["A","f"]],!1,!1),wo=rt(),QA="-",rc=de("-",!1),Ks="+",ic=de("+",!1),fI=".",rd=de(".",!1),Kg=function(m,Q,F){return{type:"number",value:(m==="-"?-1:1)*parseFloat(Q.join("")+"."+F.join(""))}},id=function(m,Q){return{type:"number",value:(m==="-"?-1:1)*parseInt(Q.join(""))}},hI=function(m){return{type:"variable",...m}},nc=function(m){return{type:"variable",name:m}},pI=function(m){return m},Hg="*",SA=de("*",!1),Nr="/",dI=de("/",!1),Hs=function(m,Q,F){return{type:Q==="*"?"multiplication":"division",right:F}},Gs=function(m,Q){return Q.reduce((F,K)=>({left:F,...K}),m)},Gg=function(m,Q,F){return{type:Q==="+"?"addition":"subtraction",right:F}},vA="$((",R=de("$((",!1),q="))",pe=de("))",!1),Ne=function(m){return m},xe="$(",qe=de("$(",!1),dt=function(m){return m},Ft="${",Nn=de("${",!1),vS=":-",AU=de(":-",!1),lU=function(m,Q){return{name:m,defaultValue:Q}},xS=":-}",cU=de(":-}",!1),uU=function(m){return{name:m,defaultValue:[]}},PS=":+",gU=de(":+",!1),fU=function(m,Q){return{name:m,alternativeValue:Q}},DS=":+}",hU=de(":+}",!1),pU=function(m){return{name:m,alternativeValue:[]}},kS=function(m){return{name:m}},dU="$",CU=de("$",!1),mU=function(m){return e.isGlobPattern(m)},EU=function(m){return m},RS=/^[a-zA-Z0-9_]/,FS=Ye([["a","z"],["A","Z"],["0","9"],"_"],!1,!1),NS=function(){return O()},TS=/^[$@*?#a-zA-Z0-9_\-]/,LS=Ye(["$","@","*","?","#",["a","z"],["A","Z"],["0","9"],"_","-"],!1,!1),IU=/^[(){}<>$|&; \t"']/,Yg=Ye(["(",")","{","}","<",">","$","|","&",";"," "," ",'"',"'"],!1,!1),OS=/^[<>&; \t"']/,MS=Ye(["<",">","&",";"," "," ",'"',"'"],!1,!1),CI=/^[ \t]/,mI=Ye([" "," "],!1,!1),b=0,Fe=0,xA=[{line:1,column:1}],d=0,E=[],I=0,k;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function O(){return r.substring(Fe,b)}function X(){return Et(Fe,b)}function te(m,Q){throw Q=Q!==void 0?Q:Et(Fe,b),Fi([At(m)],r.substring(Fe,b),Q)}function ye(m,Q){throw Q=Q!==void 0?Q:Et(Fe,b),Tn(m,Q)}function de(m,Q){return{type:"literal",text:m,ignoreCase:Q}}function Ye(m,Q,F){return{type:"class",parts:m,inverted:Q,ignoreCase:F}}function rt(){return{type:"any"}}function wt(){return{type:"end"}}function At(m){return{type:"other",description:m}}function et(m){var Q=xA[m],F;if(Q)return Q;for(F=m-1;!xA[F];)F--;for(Q=xA[F],Q={line:Q.line,column:Q.column};Fd&&(d=b,E=[]),E.push(m))}function Tn(m,Q){return new uc(m,null,null,Q)}function Fi(m,Q,F){return new uc(uc.buildMessage(m,Q),m,Q,F)}function PA(){var m,Q;return m=b,Q=Kr(),Q===t&&(Q=null),Q!==t&&(Fe=m,Q=s(Q)),m=Q,m}function Kr(){var m,Q,F,K,ce;if(m=b,Q=Hr(),Q!==t){for(F=[],K=Me();K!==t;)F.push(K),K=Me();F!==t?(K=ya(),K!==t?(ce=ts(),ce===t&&(ce=null),ce!==t?(Fe=m,Q=o(Q,K,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;if(m===t)if(m=b,Q=Hr(),Q!==t){for(F=[],K=Me();K!==t;)F.push(K),K=Me();F!==t?(K=ya(),K===t&&(K=null),K!==t?(Fe=m,Q=a(Q,K),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;return m}function ts(){var m,Q,F,K,ce;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t)if(F=Kr(),F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();K!==t?(Fe=m,Q=l(F),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t;return m}function ya(){var m;return r.charCodeAt(b)===59?(m=c,b++):(m=t,I===0&&Be(u)),m===t&&(r.charCodeAt(b)===38?(m=g,b++):(m=t,I===0&&Be(f))),m}function Hr(){var m,Q,F;return m=b,Q=yU(),Q!==t?(F=$ge(),F===t&&(F=null),F!==t?(Fe=m,Q=h(Q,F),m=Q):(b=m,m=t)):(b=m,m=t),m}function $ge(){var m,Q,F,K,ce,Qe,ft;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t)if(F=efe(),F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();if(K!==t)if(ce=Hr(),ce!==t){for(Qe=[],ft=Me();ft!==t;)Qe.push(ft),ft=Me();Qe!==t?(Fe=m,Q=p(F,ce),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;return m}function efe(){var m;return r.substr(b,2)===C?(m=C,b+=2):(m=t,I===0&&Be(w)),m===t&&(r.substr(b,2)===B?(m=B,b+=2):(m=t,I===0&&Be(v))),m}function yU(){var m,Q,F;return m=b,Q=ife(),Q!==t?(F=tfe(),F===t&&(F=null),F!==t?(Fe=m,Q=D(Q,F),m=Q):(b=m,m=t)):(b=m,m=t),m}function tfe(){var m,Q,F,K,ce,Qe,ft;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t)if(F=rfe(),F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();if(K!==t)if(ce=yU(),ce!==t){for(Qe=[],ft=Me();ft!==t;)Qe.push(ft),ft=Me();Qe!==t?(Fe=m,Q=T(F,ce),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;return m}function rfe(){var m;return r.substr(b,2)===H?(m=H,b+=2):(m=t,I===0&&Be(j)),m===t&&(r.charCodeAt(b)===124?(m=$,b++):(m=t,I===0&&Be(V))),m}function EI(){var m,Q,F,K,ce,Qe;if(m=b,Q=FU(),Q!==t)if(r.charCodeAt(b)===61?(F=W,b++):(F=t,I===0&&Be(Z)),F!==t)if(K=bU(),K!==t){for(ce=[],Qe=Me();Qe!==t;)ce.push(Qe),Qe=Me();ce!==t?(Fe=m,Q=A(Q,K),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t;else b=m,m=t;if(m===t)if(m=b,Q=FU(),Q!==t)if(r.charCodeAt(b)===61?(F=W,b++):(F=t,I===0&&Be(Z)),F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();K!==t?(Fe=m,Q=ae(Q),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t;return m}function ife(){var m,Q,F,K,ce,Qe,ft,Bt,Vr,Ci,rs;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t)if(r.charCodeAt(b)===40?(F=ge,b++):(F=t,I===0&&Be(_)),F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();if(K!==t)if(ce=Kr(),ce!==t){for(Qe=[],ft=Me();ft!==t;)Qe.push(ft),ft=Me();if(Qe!==t)if(r.charCodeAt(b)===41?(ft=L,b++):(ft=t,I===0&&Be(N)),ft!==t){for(Bt=[],Vr=Me();Vr!==t;)Bt.push(Vr),Vr=Me();if(Bt!==t){for(Vr=[],Ci=nd();Ci!==t;)Vr.push(Ci),Ci=nd();if(Vr!==t){for(Ci=[],rs=Me();rs!==t;)Ci.push(rs),rs=Me();Ci!==t?(Fe=m,Q=ue(ce,Vr),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;if(m===t){for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t)if(r.charCodeAt(b)===123?(F=we,b++):(F=t,I===0&&Be(Te)),F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();if(K!==t)if(ce=Kr(),ce!==t){for(Qe=[],ft=Me();ft!==t;)Qe.push(ft),ft=Me();if(Qe!==t)if(r.charCodeAt(b)===125?(ft=Pe,b++):(ft=t,I===0&&Be(Le)),ft!==t){for(Bt=[],Vr=Me();Vr!==t;)Bt.push(Vr),Vr=Me();if(Bt!==t){for(Vr=[],Ci=nd();Ci!==t;)Vr.push(Ci),Ci=nd();if(Vr!==t){for(Ci=[],rs=Me();rs!==t;)Ci.push(rs),rs=Me();Ci!==t?(Fe=m,Q=se(ce,Vr),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t}else b=m,m=t;else b=m,m=t;if(m===t){for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t){for(F=[],K=EI();K!==t;)F.push(K),K=EI();if(F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();if(K!==t){if(ce=[],Qe=BU(),Qe!==t)for(;Qe!==t;)ce.push(Qe),Qe=BU();else ce=t;if(ce!==t){for(Qe=[],ft=Me();ft!==t;)Qe.push(ft),ft=Me();Qe!==t?(Fe=m,Q=Ae(F,ce),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}else b=m,m=t}else b=m,m=t;if(m===t){for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t){if(F=[],K=EI(),K!==t)for(;K!==t;)F.push(K),K=EI();else F=t;if(F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();K!==t?(Fe=m,Q=be(F),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t}}}return m}function wU(){var m,Q,F,K,ce;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t){if(F=[],K=II(),K!==t)for(;K!==t;)F.push(K),K=II();else F=t;if(F!==t){for(K=[],ce=Me();ce!==t;)K.push(ce),ce=Me();K!==t?(Fe=m,Q=fe(F),m=Q):(b=m,m=t)}else b=m,m=t}else b=m,m=t;return m}function BU(){var m,Q,F;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();if(Q!==t?(F=nd(),F!==t?(Fe=m,Q=le(F),m=Q):(b=m,m=t)):(b=m,m=t),m===t){for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();Q!==t?(F=II(),F!==t?(Fe=m,Q=le(F),m=Q):(b=m,m=t)):(b=m,m=t)}return m}function nd(){var m,Q,F,K,ce;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();return Q!==t?(Ge.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(ie)),F===t&&(F=null),F!==t?(K=nfe(),K!==t?(ce=II(),ce!==t?(Fe=m,Q=Y(F,K,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function nfe(){var m;return r.substr(b,2)===he?(m=he,b+=2):(m=t,I===0&&Be(re)),m===t&&(r.substr(b,2)===me?(m=me,b+=2):(m=t,I===0&&Be(tt)),m===t&&(r.charCodeAt(b)===62?(m=Rt,b++):(m=t,I===0&&Be(It)),m===t&&(r.substr(b,3)===Ur?(m=Ur,b+=3):(m=t,I===0&&Be(oi)),m===t&&(r.substr(b,2)===pi?(m=pi,b+=2):(m=t,I===0&&Be(pr)),m===t&&(r.charCodeAt(b)===60?(m=di,b++):(m=t,I===0&&Be(ai))))))),m}function II(){var m,Q,F;for(m=b,Q=[],F=Me();F!==t;)Q.push(F),F=Me();return Q!==t?(F=bU(),F!==t?(Fe=m,Q=le(F),m=Q):(b=m,m=t)):(b=m,m=t),m}function bU(){var m,Q,F;if(m=b,Q=[],F=QU(),F!==t)for(;F!==t;)Q.push(F),F=QU();else Q=t;return Q!==t&&(Fe=m,Q=Os(Q)),m=Q,m}function QU(){var m,Q;return m=b,Q=sfe(),Q!==t&&(Fe=m,Q=dr(Q)),m=Q,m===t&&(m=b,Q=ofe(),Q!==t&&(Fe=m,Q=dr(Q)),m=Q,m===t&&(m=b,Q=afe(),Q!==t&&(Fe=m,Q=dr(Q)),m=Q,m===t&&(m=b,Q=Afe(),Q!==t&&(Fe=m,Q=dr(Q)),m=Q))),m}function sfe(){var m,Q,F,K;return m=b,r.substr(b,2)===Bi?(Q=Bi,b+=2):(Q=t,I===0&&Be(_n)),Q!==t?(F=ufe(),F!==t?(r.charCodeAt(b)===39?(K=pa,b++):(K=t,I===0&&Be(EA)),K!==t?(Fe=m,Q=kg(F),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function ofe(){var m,Q,F,K;return m=b,r.charCodeAt(b)===39?(Q=pa,b++):(Q=t,I===0&&Be(EA)),Q!==t?(F=lfe(),F!==t?(r.charCodeAt(b)===39?(K=pa,b++):(K=t,I===0&&Be(EA)),K!==t?(Fe=m,Q=kg(F),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function afe(){var m,Q,F,K;if(m=b,r.substr(b,2)===Zn?(Q=Zn,b+=2):(Q=t,I===0&&Be(IA)),Q!==t&&(Fe=m,Q=da()),m=Q,m===t)if(m=b,r.charCodeAt(b)===34?(Q=Jp,b++):(Q=t,I===0&&Be(yA)),Q!==t){for(F=[],K=SU();K!==t;)F.push(K),K=SU();F!==t?(r.charCodeAt(b)===34?(K=Jp,b++):(K=t,I===0&&Be(yA)),K!==t?(Fe=m,Q=wA(F),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;return m}function Afe(){var m,Q,F;if(m=b,Q=[],F=vU(),F!==t)for(;F!==t;)Q.push(F),F=vU();else Q=t;return Q!==t&&(Fe=m,Q=wA(Q)),m=Q,m}function SU(){var m,Q;return m=b,Q=kU(),Q!==t&&(Fe=m,Q=Br(Q)),m=Q,m===t&&(m=b,Q=RU(),Q!==t&&(Fe=m,Q=Vl(Q)),m=Q,m===t&&(m=b,Q=GS(),Q!==t&&(Fe=m,Q=Rg(Q)),m=Q,m===t&&(m=b,Q=cfe(),Q!==t&&(Fe=m,Q=Eo(Q)),m=Q))),m}function vU(){var m,Q;return m=b,Q=kU(),Q!==t&&(Fe=m,Q=Fg(Q)),m=Q,m===t&&(m=b,Q=RU(),Q!==t&&(Fe=m,Q=Wp(Q)),m=Q,m===t&&(m=b,Q=GS(),Q!==t&&(Fe=m,Q=zp(Q)),m=Q,m===t&&(m=b,Q=hfe(),Q!==t&&(Fe=m,Q=Pr(Q)),m=Q,m===t&&(m=b,Q=ffe(),Q!==t&&(Fe=m,Q=Eo(Q)),m=Q)))),m}function lfe(){var m,Q,F;for(m=b,Q=[],oe.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(Io));F!==t;)Q.push(F),oe.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(Io));return Q!==t&&(Fe=m,Q=kn(Q)),m=Q,m}function cfe(){var m,Q,F;if(m=b,Q=[],F=xU(),F===t&&(Ng.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(bt))),F!==t)for(;F!==t;)Q.push(F),F=xU(),F===t&&(Ng.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(bt)));else Q=t;return Q!==t&&(Fe=m,Q=kn(Q)),m=Q,m}function xU(){var m,Q,F;return m=b,r.substr(b,2)===Xl?(Q=Xl,b+=2):(Q=t,I===0&&Be(Rn)),Q!==t&&(Fe=m,Q=$n()),m=Q,m===t&&(m=b,r.charCodeAt(b)===92?(Q=es,b++):(Q=t,I===0&&Be(ut)),Q!==t?(yo.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(at)),F!==t?(Fe=m,Q=ln(F),m=Q):(b=m,m=t)):(b=m,m=t)),m}function ufe(){var m,Q,F;for(m=b,Q=[],F=PU(),F===t&&(oe.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(Io)));F!==t;)Q.push(F),F=PU(),F===t&&(oe.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(Io)));return Q!==t&&(Fe=m,Q=kn(Q)),m=Q,m}function PU(){var m,Q,F;return m=b,r.substr(b,2)===S?(Q=S,b+=2):(Q=t,I===0&&Be(Lt)),Q!==t&&(Fe=m,Q=Tg()),m=Q,m===t&&(m=b,r.substr(b,2)===_l?(Q=_l,b+=2):(Q=t,I===0&&Be(Vp)),Q!==t&&(Fe=m,Q=Xp()),m=Q,m===t&&(m=b,r.charCodeAt(b)===92?(Q=es,b++):(Q=t,I===0&&Be(ut)),Q!==t?(_p.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(Zp)),F!==t?(Fe=m,Q=$p(),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===G?(Q=G,b+=2):(Q=t,I===0&&Be(yt)),Q!==t&&(Fe=m,Q=BA()),m=Q,m===t&&(m=b,r.substr(b,2)===Wi?(Q=Wi,b+=2):(Q=t,I===0&&Be(Zl)),Q!==t&&(Fe=m,Q=We()),m=Q,m===t&&(m=b,r.substr(b,2)===Ca?(Q=Ca,b+=2):(Q=t,I===0&&Be(Lg)),Q!==t&&(Fe=m,Q=uI()),m=Q,m===t&&(m=b,r.substr(b,2)===ed?(Q=ed,b+=2):(Q=t,I===0&&Be(gI)),Q!==t&&(Fe=m,Q=ar()),m=Q,m===t&&(m=b,r.substr(b,2)===Fn?(Q=Fn,b+=2):(Q=t,I===0&&Be($l)),Q!==t&&(Fe=m,Q=td()),m=Q,m===t&&(m=b,r.charCodeAt(b)===92?(Q=es,b++):(Q=t,I===0&&Be(ut)),Q!==t?(Ms.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(ma)),F!==t?(Fe=m,Q=ln(F),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=gfe()))))))))),m}function gfe(){var m,Q,F,K,ce,Qe,ft,Bt,Vr,Ci,rs,YS;return m=b,r.charCodeAt(b)===92?(Q=es,b++):(Q=t,I===0&&Be(ut)),Q!==t?(F=US(),F!==t?(Fe=m,Q=cn(F),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===ke?(Q=ke,b+=2):(Q=t,I===0&&Be(Og)),Q!==t?(F=b,K=b,ce=US(),ce!==t?(Qe=Ln(),Qe!==t?(ce=[ce,Qe],K=ce):(b=K,K=t)):(b=K,K=t),K===t&&(K=US()),K!==t?F=r.substring(F,b):F=K,F!==t?(Fe=m,Q=cn(F),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===ec?(Q=ec,b+=2):(Q=t,I===0&&Be(Us)),Q!==t?(F=b,K=b,ce=Ln(),ce!==t?(Qe=Ln(),Qe!==t?(ft=Ln(),ft!==t?(Bt=Ln(),Bt!==t?(ce=[ce,Qe,ft,Bt],K=ce):(b=K,K=t)):(b=K,K=t)):(b=K,K=t)):(b=K,K=t),K!==t?F=r.substring(F,b):F=K,F!==t?(Fe=m,Q=cn(F),m=Q):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===tc?(Q=tc,b+=2):(Q=t,I===0&&Be(bA)),Q!==t?(F=b,K=b,ce=Ln(),ce!==t?(Qe=Ln(),Qe!==t?(ft=Ln(),ft!==t?(Bt=Ln(),Bt!==t?(Vr=Ln(),Vr!==t?(Ci=Ln(),Ci!==t?(rs=Ln(),rs!==t?(YS=Ln(),YS!==t?(ce=[ce,Qe,ft,Bt,Vr,Ci,rs,YS],K=ce):(b=K,K=t)):(b=K,K=t)):(b=K,K=t)):(b=K,K=t)):(b=K,K=t)):(b=K,K=t)):(b=K,K=t)):(b=K,K=t),K!==t?F=r.substring(F,b):F=K,F!==t?(Fe=m,Q=Mg(F),m=Q):(b=m,m=t)):(b=m,m=t)))),m}function US(){var m;return Ug.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&Be(Ea)),m}function Ln(){var m;return Ia.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&Be($e)),m}function ffe(){var m,Q,F,K,ce;if(m=b,Q=[],F=b,r.charCodeAt(b)===92?(K=es,b++):(K=t,I===0&&Be(ut)),K!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&Be(wo)),ce!==t?(Fe=F,K=ln(ce),F=K):(b=F,F=t)):(b=F,F=t),F===t&&(F=b,K=b,I++,ce=NU(),I--,ce===t?K=void 0:(b=K,K=t),K!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&Be(wo)),ce!==t?(Fe=F,K=ln(ce),F=K):(b=F,F=t)):(b=F,F=t)),F!==t)for(;F!==t;)Q.push(F),F=b,r.charCodeAt(b)===92?(K=es,b++):(K=t,I===0&&Be(ut)),K!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&Be(wo)),ce!==t?(Fe=F,K=ln(ce),F=K):(b=F,F=t)):(b=F,F=t),F===t&&(F=b,K=b,I++,ce=NU(),I--,ce===t?K=void 0:(b=K,K=t),K!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&Be(wo)),ce!==t?(Fe=F,K=ln(ce),F=K):(b=F,F=t)):(b=F,F=t));else Q=t;return Q!==t&&(Fe=m,Q=kn(Q)),m=Q,m}function KS(){var m,Q,F,K,ce,Qe;if(m=b,r.charCodeAt(b)===45?(Q=QA,b++):(Q=t,I===0&&Be(rc)),Q===t&&(r.charCodeAt(b)===43?(Q=Ks,b++):(Q=t,I===0&&Be(ic))),Q===t&&(Q=null),Q!==t){if(F=[],Ge.test(r.charAt(b))?(K=r.charAt(b),b++):(K=t,I===0&&Be(ie)),K!==t)for(;K!==t;)F.push(K),Ge.test(r.charAt(b))?(K=r.charAt(b),b++):(K=t,I===0&&Be(ie));else F=t;if(F!==t)if(r.charCodeAt(b)===46?(K=fI,b++):(K=t,I===0&&Be(rd)),K!==t){if(ce=[],Ge.test(r.charAt(b))?(Qe=r.charAt(b),b++):(Qe=t,I===0&&Be(ie)),Qe!==t)for(;Qe!==t;)ce.push(Qe),Ge.test(r.charAt(b))?(Qe=r.charAt(b),b++):(Qe=t,I===0&&Be(ie));else ce=t;ce!==t?(Fe=m,Q=Kg(Q,F,ce),m=Q):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;if(m===t){if(m=b,r.charCodeAt(b)===45?(Q=QA,b++):(Q=t,I===0&&Be(rc)),Q===t&&(r.charCodeAt(b)===43?(Q=Ks,b++):(Q=t,I===0&&Be(ic))),Q===t&&(Q=null),Q!==t){if(F=[],Ge.test(r.charAt(b))?(K=r.charAt(b),b++):(K=t,I===0&&Be(ie)),K!==t)for(;K!==t;)F.push(K),Ge.test(r.charAt(b))?(K=r.charAt(b),b++):(K=t,I===0&&Be(ie));else F=t;F!==t?(Fe=m,Q=id(Q,F),m=Q):(b=m,m=t)}else b=m,m=t;if(m===t&&(m=b,Q=GS(),Q!==t&&(Fe=m,Q=hI(Q)),m=Q,m===t&&(m=b,Q=sc(),Q!==t&&(Fe=m,Q=nc(Q)),m=Q,m===t)))if(m=b,r.charCodeAt(b)===40?(Q=ge,b++):(Q=t,I===0&&Be(_)),Q!==t){for(F=[],K=Me();K!==t;)F.push(K),K=Me();if(F!==t)if(K=DU(),K!==t){for(ce=[],Qe=Me();Qe!==t;)ce.push(Qe),Qe=Me();ce!==t?(r.charCodeAt(b)===41?(Qe=L,b++):(Qe=t,I===0&&Be(N)),Qe!==t?(Fe=m,Q=pI(K),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t}return m}function HS(){var m,Q,F,K,ce,Qe,ft,Bt;if(m=b,Q=KS(),Q!==t){for(F=[],K=b,ce=[],Qe=Me();Qe!==t;)ce.push(Qe),Qe=Me();if(ce!==t)if(r.charCodeAt(b)===42?(Qe=Hg,b++):(Qe=t,I===0&&Be(SA)),Qe===t&&(r.charCodeAt(b)===47?(Qe=Nr,b++):(Qe=t,I===0&&Be(dI))),Qe!==t){for(ft=[],Bt=Me();Bt!==t;)ft.push(Bt),Bt=Me();ft!==t?(Bt=KS(),Bt!==t?(Fe=K,ce=Hs(Q,Qe,Bt),K=ce):(b=K,K=t)):(b=K,K=t)}else b=K,K=t;else b=K,K=t;for(;K!==t;){for(F.push(K),K=b,ce=[],Qe=Me();Qe!==t;)ce.push(Qe),Qe=Me();if(ce!==t)if(r.charCodeAt(b)===42?(Qe=Hg,b++):(Qe=t,I===0&&Be(SA)),Qe===t&&(r.charCodeAt(b)===47?(Qe=Nr,b++):(Qe=t,I===0&&Be(dI))),Qe!==t){for(ft=[],Bt=Me();Bt!==t;)ft.push(Bt),Bt=Me();ft!==t?(Bt=KS(),Bt!==t?(Fe=K,ce=Hs(Q,Qe,Bt),K=ce):(b=K,K=t)):(b=K,K=t)}else b=K,K=t;else b=K,K=t}F!==t?(Fe=m,Q=Gs(Q,F),m=Q):(b=m,m=t)}else b=m,m=t;return m}function DU(){var m,Q,F,K,ce,Qe,ft,Bt;if(m=b,Q=HS(),Q!==t){for(F=[],K=b,ce=[],Qe=Me();Qe!==t;)ce.push(Qe),Qe=Me();if(ce!==t)if(r.charCodeAt(b)===43?(Qe=Ks,b++):(Qe=t,I===0&&Be(ic)),Qe===t&&(r.charCodeAt(b)===45?(Qe=QA,b++):(Qe=t,I===0&&Be(rc))),Qe!==t){for(ft=[],Bt=Me();Bt!==t;)ft.push(Bt),Bt=Me();ft!==t?(Bt=HS(),Bt!==t?(Fe=K,ce=Gg(Q,Qe,Bt),K=ce):(b=K,K=t)):(b=K,K=t)}else b=K,K=t;else b=K,K=t;for(;K!==t;){for(F.push(K),K=b,ce=[],Qe=Me();Qe!==t;)ce.push(Qe),Qe=Me();if(ce!==t)if(r.charCodeAt(b)===43?(Qe=Ks,b++):(Qe=t,I===0&&Be(ic)),Qe===t&&(r.charCodeAt(b)===45?(Qe=QA,b++):(Qe=t,I===0&&Be(rc))),Qe!==t){for(ft=[],Bt=Me();Bt!==t;)ft.push(Bt),Bt=Me();ft!==t?(Bt=HS(),Bt!==t?(Fe=K,ce=Gg(Q,Qe,Bt),K=ce):(b=K,K=t)):(b=K,K=t)}else b=K,K=t;else b=K,K=t}F!==t?(Fe=m,Q=Gs(Q,F),m=Q):(b=m,m=t)}else b=m,m=t;return m}function kU(){var m,Q,F,K,ce,Qe;if(m=b,r.substr(b,3)===vA?(Q=vA,b+=3):(Q=t,I===0&&Be(R)),Q!==t){for(F=[],K=Me();K!==t;)F.push(K),K=Me();if(F!==t)if(K=DU(),K!==t){for(ce=[],Qe=Me();Qe!==t;)ce.push(Qe),Qe=Me();ce!==t?(r.substr(b,2)===q?(Qe=q,b+=2):(Qe=t,I===0&&Be(pe)),Qe!==t?(Fe=m,Q=Ne(K),m=Q):(b=m,m=t)):(b=m,m=t)}else b=m,m=t;else b=m,m=t}else b=m,m=t;return m}function RU(){var m,Q,F,K;return m=b,r.substr(b,2)===xe?(Q=xe,b+=2):(Q=t,I===0&&Be(qe)),Q!==t?(F=Kr(),F!==t?(r.charCodeAt(b)===41?(K=L,b++):(K=t,I===0&&Be(N)),K!==t?(Fe=m,Q=dt(F),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m}function GS(){var m,Q,F,K,ce,Qe;return m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&Be(Nn)),Q!==t?(F=sc(),F!==t?(r.substr(b,2)===vS?(K=vS,b+=2):(K=t,I===0&&Be(AU)),K!==t?(ce=wU(),ce!==t?(r.charCodeAt(b)===125?(Qe=Pe,b++):(Qe=t,I===0&&Be(Le)),Qe!==t?(Fe=m,Q=lU(F,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&Be(Nn)),Q!==t?(F=sc(),F!==t?(r.substr(b,3)===xS?(K=xS,b+=3):(K=t,I===0&&Be(cU)),K!==t?(Fe=m,Q=uU(F),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&Be(Nn)),Q!==t?(F=sc(),F!==t?(r.substr(b,2)===PS?(K=PS,b+=2):(K=t,I===0&&Be(gU)),K!==t?(ce=wU(),ce!==t?(r.charCodeAt(b)===125?(Qe=Pe,b++):(Qe=t,I===0&&Be(Le)),Qe!==t?(Fe=m,Q=fU(F,ce),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&Be(Nn)),Q!==t?(F=sc(),F!==t?(r.substr(b,3)===DS?(K=DS,b+=3):(K=t,I===0&&Be(hU)),K!==t?(Fe=m,Q=pU(F),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.substr(b,2)===Ft?(Q=Ft,b+=2):(Q=t,I===0&&Be(Nn)),Q!==t?(F=sc(),F!==t?(r.charCodeAt(b)===125?(K=Pe,b++):(K=t,I===0&&Be(Le)),K!==t?(Fe=m,Q=kS(F),m=Q):(b=m,m=t)):(b=m,m=t)):(b=m,m=t),m===t&&(m=b,r.charCodeAt(b)===36?(Q=dU,b++):(Q=t,I===0&&Be(CU)),Q!==t?(F=sc(),F!==t?(Fe=m,Q=kS(F),m=Q):(b=m,m=t)):(b=m,m=t)))))),m}function hfe(){var m,Q,F;return m=b,Q=pfe(),Q!==t?(Fe=b,F=mU(Q),F?F=void 0:F=t,F!==t?(Fe=m,Q=EU(Q),m=Q):(b=m,m=t)):(b=m,m=t),m}function pfe(){var m,Q,F,K,ce;if(m=b,Q=[],F=b,K=b,I++,ce=TU(),I--,ce===t?K=void 0:(b=K,K=t),K!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&Be(wo)),ce!==t?(Fe=F,K=ln(ce),F=K):(b=F,F=t)):(b=F,F=t),F!==t)for(;F!==t;)Q.push(F),F=b,K=b,I++,ce=TU(),I--,ce===t?K=void 0:(b=K,K=t),K!==t?(r.length>b?(ce=r.charAt(b),b++):(ce=t,I===0&&Be(wo)),ce!==t?(Fe=F,K=ln(ce),F=K):(b=F,F=t)):(b=F,F=t);else Q=t;return Q!==t&&(Fe=m,Q=kn(Q)),m=Q,m}function FU(){var m,Q,F;if(m=b,Q=[],RS.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(FS)),F!==t)for(;F!==t;)Q.push(F),RS.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(FS));else Q=t;return Q!==t&&(Fe=m,Q=NS()),m=Q,m}function sc(){var m,Q,F;if(m=b,Q=[],TS.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(LS)),F!==t)for(;F!==t;)Q.push(F),TS.test(r.charAt(b))?(F=r.charAt(b),b++):(F=t,I===0&&Be(LS));else Q=t;return Q!==t&&(Fe=m,Q=NS()),m=Q,m}function NU(){var m;return IU.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&Be(Yg)),m}function TU(){var m;return OS.test(r.charAt(b))?(m=r.charAt(b),b++):(m=t,I===0&&Be(MS)),m}function Me(){var m,Q;if(m=[],CI.test(r.charAt(b))?(Q=r.charAt(b),b++):(Q=t,I===0&&Be(mI)),Q!==t)for(;Q!==t;)m.push(Q),CI.test(r.charAt(b))?(Q=r.charAt(b),b++):(Q=t,I===0&&Be(mI));else m=t;return m}if(k=n(),k!==t&&b===r.length)return k;throw k!==t&&b{"use strict";function phe(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function fc(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,fc)}phe(fc,Error);fc.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g0){for(g=1,f=1;gH&&(H=v,j=[]),j.push(ie))}function Le(ie,Y){return new fc(ie,null,null,Y)}function se(ie,Y,he){return new fc(fc.buildMessage(ie,Y),ie,Y,he)}function Ae(){var ie,Y,he,re;return ie=v,Y=be(),Y!==t?(r.charCodeAt(v)===47?(he=s,v++):(he=t,$===0&&Pe(o)),he!==t?(re=be(),re!==t?(D=ie,Y=a(Y,re),ie=Y):(v=ie,ie=t)):(v=ie,ie=t)):(v=ie,ie=t),ie===t&&(ie=v,Y=be(),Y!==t&&(D=ie,Y=l(Y)),ie=Y),ie}function be(){var ie,Y,he,re;return ie=v,Y=fe(),Y!==t?(r.charCodeAt(v)===64?(he=c,v++):(he=t,$===0&&Pe(u)),he!==t?(re=Ge(),re!==t?(D=ie,Y=g(Y,re),ie=Y):(v=ie,ie=t)):(v=ie,ie=t)):(v=ie,ie=t),ie===t&&(ie=v,Y=fe(),Y!==t&&(D=ie,Y=f(Y)),ie=Y),ie}function fe(){var ie,Y,he,re,me;return ie=v,r.charCodeAt(v)===64?(Y=c,v++):(Y=t,$===0&&Pe(u)),Y!==t?(he=le(),he!==t?(r.charCodeAt(v)===47?(re=s,v++):(re=t,$===0&&Pe(o)),re!==t?(me=le(),me!==t?(D=ie,Y=h(),ie=Y):(v=ie,ie=t)):(v=ie,ie=t)):(v=ie,ie=t)):(v=ie,ie=t),ie===t&&(ie=v,Y=le(),Y!==t&&(D=ie,Y=h()),ie=Y),ie}function le(){var ie,Y,he;if(ie=v,Y=[],p.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Pe(C)),he!==t)for(;he!==t;)Y.push(he),p.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Pe(C));else Y=t;return Y!==t&&(D=ie,Y=h()),ie=Y,ie}function Ge(){var ie,Y,he;if(ie=v,Y=[],w.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Pe(B)),he!==t)for(;he!==t;)Y.push(he),w.test(r.charAt(v))?(he=r.charAt(v),v++):(he=t,$===0&&Pe(B));else Y=t;return Y!==t&&(D=ie,Y=h()),ie=Y,ie}if(V=n(),V!==t&&v===r.length)return V;throw V!==t&&v{"use strict";function XK(r){return typeof r>"u"||r===null}function Che(r){return typeof r=="object"&&r!==null}function mhe(r){return Array.isArray(r)?r:XK(r)?[]:[r]}function Ehe(r,e){var t,i,n,s;if(e)for(s=Object.keys(e),t=0,i=s.length;t{"use strict";function md(r,e){Error.call(this),this.name="YAMLException",this.reason=r,this.mark=e,this.message=(this.reason||"(unknown reason)")+(this.mark?" "+this.mark.toString():""),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack||""}md.prototype=Object.create(Error.prototype);md.prototype.constructor=md;md.prototype.toString=function(e){var t=this.name+": ";return t+=this.reason||"(unknown reason)",!e&&this.mark&&(t+=" "+this.mark.toString()),t};_K.exports=md});var e2=y((YZe,$K)=>{"use strict";var ZK=pc();function wv(r,e,t,i,n){this.name=r,this.buffer=e,this.position=t,this.line=i,this.column=n}wv.prototype.getSnippet=function(e,t){var i,n,s,o,a;if(!this.buffer)return null;for(e=e||4,t=t||75,i="",n=this.position;n>0&&`\0\r -\x85\u2028\u2029`.indexOf(this.buffer.charAt(n-1))===-1;)if(n-=1,this.position-n>t/2-1){i=" ... ",n+=5;break}for(s="",o=this.position;ot/2-1){s=" ... ",o-=5;break}return a=this.buffer.slice(n,o),ZK.repeat(" ",e)+i+a+s+` -`+ZK.repeat(" ",e+this.position-n+i.length)+"^"};wv.prototype.toString=function(e){var t,i="";return this.name&&(i+='in "'+this.name+'" '),i+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet(),t&&(i+=`: -`+t)),i};$K.exports=wv});var Ai=y((jZe,r2)=>{"use strict";var t2=tf(),whe=["kind","resolve","construct","instanceOf","predicate","represent","defaultStyle","styleAliases"],Bhe=["scalar","sequence","mapping"];function bhe(r){var e={};return r!==null&&Object.keys(r).forEach(function(t){r[t].forEach(function(i){e[String(i)]=t})}),e}function Qhe(r,e){if(e=e||{},Object.keys(e).forEach(function(t){if(whe.indexOf(t)===-1)throw new t2('Unknown option "'+t+'" is met in definition of "'+r+'" YAML type.')}),this.tag=r,this.kind=e.kind||null,this.resolve=e.resolve||function(){return!0},this.construct=e.construct||function(t){return t},this.instanceOf=e.instanceOf||null,this.predicate=e.predicate||null,this.represent=e.represent||null,this.defaultStyle=e.defaultStyle||null,this.styleAliases=bhe(e.styleAliases||null),Bhe.indexOf(this.kind)===-1)throw new t2('Unknown kind "'+this.kind+'" is specified for "'+r+'" YAML type.')}r2.exports=Qhe});var dc=y((qZe,n2)=>{"use strict";var i2=pc(),jI=tf(),She=Ai();function Bv(r,e,t){var i=[];return r.include.forEach(function(n){t=Bv(n,e,t)}),r[e].forEach(function(n){t.forEach(function(s,o){s.tag===n.tag&&s.kind===n.kind&&i.push(o)}),t.push(n)}),t.filter(function(n,s){return i.indexOf(s)===-1})}function vhe(){var r={scalar:{},sequence:{},mapping:{},fallback:{}},e,t;function i(n){r[n.kind][n.tag]=r.fallback[n.tag]=n}for(e=0,t=arguments.length;e{"use strict";var xhe=Ai();s2.exports=new xhe("tag:yaml.org,2002:str",{kind:"scalar",construct:function(r){return r!==null?r:""}})});var A2=y((WZe,a2)=>{"use strict";var Phe=Ai();a2.exports=new Phe("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(r){return r!==null?r:[]}})});var c2=y((zZe,l2)=>{"use strict";var Dhe=Ai();l2.exports=new Dhe("tag:yaml.org,2002:map",{kind:"mapping",construct:function(r){return r!==null?r:{}}})});var qI=y((VZe,u2)=>{"use strict";var khe=dc();u2.exports=new khe({explicit:[o2(),A2(),c2()]})});var f2=y((XZe,g2)=>{"use strict";var Rhe=Ai();function Fhe(r){if(r===null)return!0;var e=r.length;return e===1&&r==="~"||e===4&&(r==="null"||r==="Null"||r==="NULL")}function Nhe(){return null}function The(r){return r===null}g2.exports=new Rhe("tag:yaml.org,2002:null",{kind:"scalar",resolve:Fhe,construct:Nhe,predicate:The,represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"}},defaultStyle:"lowercase"})});var p2=y((_Ze,h2)=>{"use strict";var Lhe=Ai();function Ohe(r){if(r===null)return!1;var e=r.length;return e===4&&(r==="true"||r==="True"||r==="TRUE")||e===5&&(r==="false"||r==="False"||r==="FALSE")}function Mhe(r){return r==="true"||r==="True"||r==="TRUE"}function Uhe(r){return Object.prototype.toString.call(r)==="[object Boolean]"}h2.exports=new Lhe("tag:yaml.org,2002:bool",{kind:"scalar",resolve:Ohe,construct:Mhe,predicate:Uhe,represent:{lowercase:function(r){return r?"true":"false"},uppercase:function(r){return r?"TRUE":"FALSE"},camelcase:function(r){return r?"True":"False"}},defaultStyle:"lowercase"})});var C2=y((ZZe,d2)=>{"use strict";var Khe=pc(),Hhe=Ai();function Ghe(r){return 48<=r&&r<=57||65<=r&&r<=70||97<=r&&r<=102}function Yhe(r){return 48<=r&&r<=55}function jhe(r){return 48<=r&&r<=57}function qhe(r){if(r===null)return!1;var e=r.length,t=0,i=!1,n;if(!e)return!1;if(n=r[t],(n==="-"||n==="+")&&(n=r[++t]),n==="0"){if(t+1===e)return!0;if(n=r[++t],n==="b"){for(t++;t=0?"0b"+r.toString(2):"-0b"+r.toString(2).slice(1)},octal:function(r){return r>=0?"0"+r.toString(8):"-0"+r.toString(8).slice(1)},decimal:function(r){return r.toString(10)},hexadecimal:function(r){return r>=0?"0x"+r.toString(16).toUpperCase():"-0x"+r.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}})});var I2=y(($Ze,E2)=>{"use strict";var m2=pc(),zhe=Ai(),Vhe=new RegExp("^(?:[-+]?(?:0|[1-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");function Xhe(r){return!(r===null||!Vhe.test(r)||r[r.length-1]==="_")}function _he(r){var e,t,i,n;return e=r.replace(/_/g,"").toLowerCase(),t=e[0]==="-"?-1:1,n=[],"+-".indexOf(e[0])>=0&&(e=e.slice(1)),e===".inf"?t===1?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:e===".nan"?NaN:e.indexOf(":")>=0?(e.split(":").forEach(function(s){n.unshift(parseFloat(s,10))}),e=0,i=1,n.forEach(function(s){e+=s*i,i*=60}),t*e):t*parseFloat(e,10)}var Zhe=/^[-+]?[0-9]+e/;function $he(r,e){var t;if(isNaN(r))switch(e){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===r)switch(e){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===r)switch(e){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(m2.isNegativeZero(r))return"-0.0";return t=r.toString(10),Zhe.test(t)?t.replace("e",".e"):t}function epe(r){return Object.prototype.toString.call(r)==="[object Number]"&&(r%1!==0||m2.isNegativeZero(r))}E2.exports=new zhe("tag:yaml.org,2002:float",{kind:"scalar",resolve:Xhe,construct:_he,predicate:epe,represent:$he,defaultStyle:"lowercase"})});var bv=y((e$e,y2)=>{"use strict";var tpe=dc();y2.exports=new tpe({include:[qI()],implicit:[f2(),p2(),C2(),I2()]})});var Qv=y((t$e,w2)=>{"use strict";var rpe=dc();w2.exports=new rpe({include:[bv()]})});var S2=y((r$e,Q2)=>{"use strict";var ipe=Ai(),B2=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),b2=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");function npe(r){return r===null?!1:B2.exec(r)!==null||b2.exec(r)!==null}function spe(r){var e,t,i,n,s,o,a,l=0,c=null,u,g,f;if(e=B2.exec(r),e===null&&(e=b2.exec(r)),e===null)throw new Error("Date resolve error");if(t=+e[1],i=+e[2]-1,n=+e[3],!e[4])return new Date(Date.UTC(t,i,n));if(s=+e[4],o=+e[5],a=+e[6],e[7]){for(l=e[7].slice(0,3);l.length<3;)l+="0";l=+l}return e[9]&&(u=+e[10],g=+(e[11]||0),c=(u*60+g)*6e4,e[9]==="-"&&(c=-c)),f=new Date(Date.UTC(t,i,n,s,o,a,l)),c&&f.setTime(f.getTime()-c),f}function ope(r){return r.toISOString()}Q2.exports=new ipe("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:npe,construct:spe,instanceOf:Date,represent:ope})});var x2=y((i$e,v2)=>{"use strict";var ape=Ai();function Ape(r){return r==="<<"||r===null}v2.exports=new ape("tag:yaml.org,2002:merge",{kind:"scalar",resolve:Ape})});var k2=y((n$e,D2)=>{"use strict";var Cc;try{P2=J,Cc=P2("buffer").Buffer}catch{}var P2,lpe=Ai(),Sv=`ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/= -\r`;function cpe(r){if(r===null)return!1;var e,t,i=0,n=r.length,s=Sv;for(t=0;t64)){if(e<0)return!1;i+=6}return i%8===0}function upe(r){var e,t,i=r.replace(/[\r\n=]/g,""),n=i.length,s=Sv,o=0,a=[];for(e=0;e>16&255),a.push(o>>8&255),a.push(o&255)),o=o<<6|s.indexOf(i.charAt(e));return t=n%4*6,t===0?(a.push(o>>16&255),a.push(o>>8&255),a.push(o&255)):t===18?(a.push(o>>10&255),a.push(o>>2&255)):t===12&&a.push(o>>4&255),Cc?Cc.from?Cc.from(a):new Cc(a):a}function gpe(r){var e="",t=0,i,n,s=r.length,o=Sv;for(i=0;i>18&63],e+=o[t>>12&63],e+=o[t>>6&63],e+=o[t&63]),t=(t<<8)+r[i];return n=s%3,n===0?(e+=o[t>>18&63],e+=o[t>>12&63],e+=o[t>>6&63],e+=o[t&63]):n===2?(e+=o[t>>10&63],e+=o[t>>4&63],e+=o[t<<2&63],e+=o[64]):n===1&&(e+=o[t>>2&63],e+=o[t<<4&63],e+=o[64],e+=o[64]),e}function fpe(r){return Cc&&Cc.isBuffer(r)}D2.exports=new lpe("tag:yaml.org,2002:binary",{kind:"scalar",resolve:cpe,construct:upe,predicate:fpe,represent:gpe})});var F2=y((s$e,R2)=>{"use strict";var hpe=Ai(),ppe=Object.prototype.hasOwnProperty,dpe=Object.prototype.toString;function Cpe(r){if(r===null)return!0;var e=[],t,i,n,s,o,a=r;for(t=0,i=a.length;t{"use strict";var Epe=Ai(),Ipe=Object.prototype.toString;function ype(r){if(r===null)return!0;var e,t,i,n,s,o=r;for(s=new Array(o.length),e=0,t=o.length;e{"use strict";var Bpe=Ai(),bpe=Object.prototype.hasOwnProperty;function Qpe(r){if(r===null)return!0;var e,t=r;for(e in t)if(bpe.call(t,e)&&t[e]!==null)return!1;return!0}function Spe(r){return r!==null?r:{}}L2.exports=new Bpe("tag:yaml.org,2002:set",{kind:"mapping",resolve:Qpe,construct:Spe})});var nf=y((A$e,M2)=>{"use strict";var vpe=dc();M2.exports=new vpe({include:[Qv()],implicit:[S2(),x2()],explicit:[k2(),F2(),T2(),O2()]})});var K2=y((l$e,U2)=>{"use strict";var xpe=Ai();function Ppe(){return!0}function Dpe(){}function kpe(){return""}function Rpe(r){return typeof r>"u"}U2.exports=new xpe("tag:yaml.org,2002:js/undefined",{kind:"scalar",resolve:Ppe,construct:Dpe,predicate:Rpe,represent:kpe})});var G2=y((c$e,H2)=>{"use strict";var Fpe=Ai();function Npe(r){if(r===null||r.length===0)return!1;var e=r,t=/\/([gim]*)$/.exec(r),i="";return!(e[0]==="/"&&(t&&(i=t[1]),i.length>3||e[e.length-i.length-1]!=="/"))}function Tpe(r){var e=r,t=/\/([gim]*)$/.exec(r),i="";return e[0]==="/"&&(t&&(i=t[1]),e=e.slice(1,e.length-i.length-1)),new RegExp(e,i)}function Lpe(r){var e="/"+r.source+"/";return r.global&&(e+="g"),r.multiline&&(e+="m"),r.ignoreCase&&(e+="i"),e}function Ope(r){return Object.prototype.toString.call(r)==="[object RegExp]"}H2.exports=new Fpe("tag:yaml.org,2002:js/regexp",{kind:"scalar",resolve:Npe,construct:Tpe,predicate:Ope,represent:Lpe})});var q2=y((u$e,j2)=>{"use strict";var JI;try{Y2=J,JI=Y2("esprima")}catch{typeof window<"u"&&(JI=window.esprima)}var Y2,Mpe=Ai();function Upe(r){if(r===null)return!1;try{var e="("+r+")",t=JI.parse(e,{range:!0});return!(t.type!=="Program"||t.body.length!==1||t.body[0].type!=="ExpressionStatement"||t.body[0].expression.type!=="ArrowFunctionExpression"&&t.body[0].expression.type!=="FunctionExpression")}catch{return!1}}function Kpe(r){var e="("+r+")",t=JI.parse(e,{range:!0}),i=[],n;if(t.type!=="Program"||t.body.length!==1||t.body[0].type!=="ExpressionStatement"||t.body[0].expression.type!=="ArrowFunctionExpression"&&t.body[0].expression.type!=="FunctionExpression")throw new Error("Failed to resolve function");return t.body[0].expression.params.forEach(function(s){i.push(s.name)}),n=t.body[0].expression.body.range,t.body[0].expression.body.type==="BlockStatement"?new Function(i,e.slice(n[0]+1,n[1]-1)):new Function(i,"return "+e.slice(n[0],n[1]))}function Hpe(r){return r.toString()}function Gpe(r){return Object.prototype.toString.call(r)==="[object Function]"}j2.exports=new Mpe("tag:yaml.org,2002:js/function",{kind:"scalar",resolve:Upe,construct:Kpe,predicate:Gpe,represent:Hpe})});var Ed=y((g$e,W2)=>{"use strict";var J2=dc();W2.exports=J2.DEFAULT=new J2({include:[nf()],explicit:[K2(),G2(),q2()]})});var gH=y((f$e,Id)=>{"use strict";var Qa=pc(),eH=tf(),Ype=e2(),tH=nf(),jpe=Ed(),NA=Object.prototype.hasOwnProperty,WI=1,rH=2,iH=3,zI=4,vv=1,qpe=2,z2=3,Jpe=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,Wpe=/[\x85\u2028\u2029]/,zpe=/[,\[\]\{\}]/,nH=/^(?:!|!!|![a-z\-]+!)$/i,sH=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;function V2(r){return Object.prototype.toString.call(r)}function So(r){return r===10||r===13}function Ec(r){return r===9||r===32}function fn(r){return r===9||r===32||r===10||r===13}function sf(r){return r===44||r===91||r===93||r===123||r===125}function Vpe(r){var e;return 48<=r&&r<=57?r-48:(e=r|32,97<=e&&e<=102?e-97+10:-1)}function Xpe(r){return r===120?2:r===117?4:r===85?8:0}function _pe(r){return 48<=r&&r<=57?r-48:-1}function X2(r){return r===48?"\0":r===97?"\x07":r===98?"\b":r===116||r===9?" ":r===110?` -`:r===118?"\v":r===102?"\f":r===114?"\r":r===101?"\x1B":r===32?" ":r===34?'"':r===47?"/":r===92?"\\":r===78?"\x85":r===95?"\xA0":r===76?"\u2028":r===80?"\u2029":""}function Zpe(r){return r<=65535?String.fromCharCode(r):String.fromCharCode((r-65536>>10)+55296,(r-65536&1023)+56320)}var oH=new Array(256),aH=new Array(256);for(mc=0;mc<256;mc++)oH[mc]=X2(mc)?1:0,aH[mc]=X2(mc);var mc;function $pe(r,e){this.input=r,this.filename=e.filename||null,this.schema=e.schema||jpe,this.onWarning=e.onWarning||null,this.legacy=e.legacy||!1,this.json=e.json||!1,this.listener=e.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=r.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.documents=[]}function AH(r,e){return new eH(e,new Ype(r.filename,r.input,r.position,r.line,r.position-r.lineStart))}function gt(r,e){throw AH(r,e)}function VI(r,e){r.onWarning&&r.onWarning.call(null,AH(r,e))}var _2={YAML:function(e,t,i){var n,s,o;e.version!==null&>(e,"duplication of %YAML directive"),i.length!==1&>(e,"YAML directive accepts exactly one argument"),n=/^([0-9]+)\.([0-9]+)$/.exec(i[0]),n===null&>(e,"ill-formed argument of the YAML directive"),s=parseInt(n[1],10),o=parseInt(n[2],10),s!==1&>(e,"unacceptable YAML version of the document"),e.version=i[0],e.checkLineBreaks=o<2,o!==1&&o!==2&&VI(e,"unsupported YAML version of the document")},TAG:function(e,t,i){var n,s;i.length!==2&>(e,"TAG directive accepts exactly two arguments"),n=i[0],s=i[1],nH.test(n)||gt(e,"ill-formed tag handle (first argument) of the TAG directive"),NA.call(e.tagMap,n)&>(e,'there is a previously declared suffix for "'+n+'" tag handle'),sH.test(s)||gt(e,"ill-formed tag prefix (second argument) of the TAG directive"),e.tagMap[n]=s}};function FA(r,e,t,i){var n,s,o,a;if(e1&&(r.result+=Qa.repeat(` -`,e-1))}function ede(r,e,t){var i,n,s,o,a,l,c,u,g=r.kind,f=r.result,h;if(h=r.input.charCodeAt(r.position),fn(h)||sf(h)||h===35||h===38||h===42||h===33||h===124||h===62||h===39||h===34||h===37||h===64||h===96||(h===63||h===45)&&(n=r.input.charCodeAt(r.position+1),fn(n)||t&&sf(n)))return!1;for(r.kind="scalar",r.result="",s=o=r.position,a=!1;h!==0;){if(h===58){if(n=r.input.charCodeAt(r.position+1),fn(n)||t&&sf(n))break}else if(h===35){if(i=r.input.charCodeAt(r.position-1),fn(i))break}else{if(r.position===r.lineStart&&XI(r)||t&&sf(h))break;if(So(h))if(l=r.line,c=r.lineStart,u=r.lineIndent,_r(r,!1,-1),r.lineIndent>=e){a=!0,h=r.input.charCodeAt(r.position);continue}else{r.position=o,r.line=l,r.lineStart=c,r.lineIndent=u;break}}a&&(FA(r,s,o,!1),Pv(r,r.line-l),s=o=r.position,a=!1),Ec(h)||(o=r.position+1),h=r.input.charCodeAt(++r.position)}return FA(r,s,o,!1),r.result?!0:(r.kind=g,r.result=f,!1)}function tde(r,e){var t,i,n;if(t=r.input.charCodeAt(r.position),t!==39)return!1;for(r.kind="scalar",r.result="",r.position++,i=n=r.position;(t=r.input.charCodeAt(r.position))!==0;)if(t===39)if(FA(r,i,r.position,!0),t=r.input.charCodeAt(++r.position),t===39)i=r.position,r.position++,n=r.position;else return!0;else So(t)?(FA(r,i,n,!0),Pv(r,_r(r,!1,e)),i=n=r.position):r.position===r.lineStart&&XI(r)?gt(r,"unexpected end of the document within a single quoted scalar"):(r.position++,n=r.position);gt(r,"unexpected end of the stream within a single quoted scalar")}function rde(r,e){var t,i,n,s,o,a;if(a=r.input.charCodeAt(r.position),a!==34)return!1;for(r.kind="scalar",r.result="",r.position++,t=i=r.position;(a=r.input.charCodeAt(r.position))!==0;){if(a===34)return FA(r,t,r.position,!0),r.position++,!0;if(a===92){if(FA(r,t,r.position,!0),a=r.input.charCodeAt(++r.position),So(a))_r(r,!1,e);else if(a<256&&oH[a])r.result+=aH[a],r.position++;else if((o=Xpe(a))>0){for(n=o,s=0;n>0;n--)a=r.input.charCodeAt(++r.position),(o=Vpe(a))>=0?s=(s<<4)+o:gt(r,"expected hexadecimal character");r.result+=Zpe(s),r.position++}else gt(r,"unknown escape sequence");t=i=r.position}else So(a)?(FA(r,t,i,!0),Pv(r,_r(r,!1,e)),t=i=r.position):r.position===r.lineStart&&XI(r)?gt(r,"unexpected end of the document within a double quoted scalar"):(r.position++,i=r.position)}gt(r,"unexpected end of the stream within a double quoted scalar")}function ide(r,e){var t=!0,i,n=r.tag,s,o=r.anchor,a,l,c,u,g,f={},h,p,C,w;if(w=r.input.charCodeAt(r.position),w===91)l=93,g=!1,s=[];else if(w===123)l=125,g=!0,s={};else return!1;for(r.anchor!==null&&(r.anchorMap[r.anchor]=s),w=r.input.charCodeAt(++r.position);w!==0;){if(_r(r,!0,e),w=r.input.charCodeAt(r.position),w===l)return r.position++,r.tag=n,r.anchor=o,r.kind=g?"mapping":"sequence",r.result=s,!0;t||gt(r,"missed comma between flow collection entries"),p=h=C=null,c=u=!1,w===63&&(a=r.input.charCodeAt(r.position+1),fn(a)&&(c=u=!0,r.position++,_r(r,!0,e))),i=r.line,af(r,e,WI,!1,!0),p=r.tag,h=r.result,_r(r,!0,e),w=r.input.charCodeAt(r.position),(u||r.line===i)&&w===58&&(c=!0,w=r.input.charCodeAt(++r.position),_r(r,!0,e),af(r,e,WI,!1,!0),C=r.result),g?of(r,s,f,p,h,C):c?s.push(of(r,null,f,p,h,C)):s.push(h),_r(r,!0,e),w=r.input.charCodeAt(r.position),w===44?(t=!0,w=r.input.charCodeAt(++r.position)):t=!1}gt(r,"unexpected end of the stream within a flow collection")}function nde(r,e){var t,i,n=vv,s=!1,o=!1,a=e,l=0,c=!1,u,g;if(g=r.input.charCodeAt(r.position),g===124)i=!1;else if(g===62)i=!0;else return!1;for(r.kind="scalar",r.result="";g!==0;)if(g=r.input.charCodeAt(++r.position),g===43||g===45)vv===n?n=g===43?z2:qpe:gt(r,"repeat of a chomping mode identifier");else if((u=_pe(g))>=0)u===0?gt(r,"bad explicit indentation width of a block scalar; it cannot be less than one"):o?gt(r,"repeat of an indentation width identifier"):(a=e+u-1,o=!0);else break;if(Ec(g)){do g=r.input.charCodeAt(++r.position);while(Ec(g));if(g===35)do g=r.input.charCodeAt(++r.position);while(!So(g)&&g!==0)}for(;g!==0;){for(xv(r),r.lineIndent=0,g=r.input.charCodeAt(r.position);(!o||r.lineIndenta&&(a=r.lineIndent),So(g)){l++;continue}if(r.lineIndente)&&l!==0)gt(r,"bad indentation of a sequence entry");else if(r.lineIndente)&&(af(r,e,zI,!0,n)&&(p?f=r.result:h=r.result),p||(of(r,c,u,g,f,h,s,o),g=f=h=null),_r(r,!0,-1),w=r.input.charCodeAt(r.position)),r.lineIndent>e&&w!==0)gt(r,"bad indentation of a mapping entry");else if(r.lineIndente?l=1:r.lineIndent===e?l=0:r.lineIndente?l=1:r.lineIndent===e?l=0:r.lineIndent tag; it should be "scalar", not "'+r.kind+'"'),g=0,f=r.implicitTypes.length;g tag; it should be "'+h.kind+'", not "'+r.kind+'"'),h.resolve(r.result)?(r.result=h.construct(r.result),r.anchor!==null&&(r.anchorMap[r.anchor]=r.result)):gt(r,"cannot resolve a node with !<"+r.tag+"> explicit tag")):gt(r,"unknown tag !<"+r.tag+">");return r.listener!==null&&r.listener("close",r),r.tag!==null||r.anchor!==null||u}function lde(r){var e=r.position,t,i,n,s=!1,o;for(r.version=null,r.checkLineBreaks=r.legacy,r.tagMap={},r.anchorMap={};(o=r.input.charCodeAt(r.position))!==0&&(_r(r,!0,-1),o=r.input.charCodeAt(r.position),!(r.lineIndent>0||o!==37));){for(s=!0,o=r.input.charCodeAt(++r.position),t=r.position;o!==0&&!fn(o);)o=r.input.charCodeAt(++r.position);for(i=r.input.slice(t,r.position),n=[],i.length<1&>(r,"directive name must not be less than one character in length");o!==0;){for(;Ec(o);)o=r.input.charCodeAt(++r.position);if(o===35){do o=r.input.charCodeAt(++r.position);while(o!==0&&!So(o));break}if(So(o))break;for(t=r.position;o!==0&&!fn(o);)o=r.input.charCodeAt(++r.position);n.push(r.input.slice(t,r.position))}o!==0&&xv(r),NA.call(_2,i)?_2[i](r,i,n):VI(r,'unknown document directive "'+i+'"')}if(_r(r,!0,-1),r.lineIndent===0&&r.input.charCodeAt(r.position)===45&&r.input.charCodeAt(r.position+1)===45&&r.input.charCodeAt(r.position+2)===45?(r.position+=3,_r(r,!0,-1)):s&>(r,"directives end mark is expected"),af(r,r.lineIndent-1,zI,!1,!0),_r(r,!0,-1),r.checkLineBreaks&&Wpe.test(r.input.slice(e,r.position))&&VI(r,"non-ASCII line breaks are interpreted as content"),r.documents.push(r.result),r.position===r.lineStart&&XI(r)){r.input.charCodeAt(r.position)===46&&(r.position+=3,_r(r,!0,-1));return}if(r.position"u"&&(t=e,e=null);var i=lH(r,t);if(typeof e!="function")return i;for(var n=0,s=i.length;n"u"&&(t=e,e=null),cH(r,e,Qa.extend({schema:tH},t))}function ude(r,e){return uH(r,Qa.extend({schema:tH},e))}Id.exports.loadAll=cH;Id.exports.load=uH;Id.exports.safeLoadAll=cde;Id.exports.safeLoad=ude});var TH=y((h$e,Fv)=>{"use strict";var wd=pc(),Bd=tf(),gde=Ed(),fde=nf(),IH=Object.prototype.toString,yH=Object.prototype.hasOwnProperty,hde=9,yd=10,pde=13,dde=32,Cde=33,mde=34,wH=35,Ede=37,Ide=38,yde=39,wde=42,BH=44,Bde=45,bH=58,bde=61,Qde=62,Sde=63,vde=64,QH=91,SH=93,xde=96,vH=123,Pde=124,xH=125,Ti={};Ti[0]="\\0";Ti[7]="\\a";Ti[8]="\\b";Ti[9]="\\t";Ti[10]="\\n";Ti[11]="\\v";Ti[12]="\\f";Ti[13]="\\r";Ti[27]="\\e";Ti[34]='\\"';Ti[92]="\\\\";Ti[133]="\\N";Ti[160]="\\_";Ti[8232]="\\L";Ti[8233]="\\P";var Dde=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"];function kde(r,e){var t,i,n,s,o,a,l;if(e===null)return{};for(t={},i=Object.keys(e),n=0,s=i.length;n0?r.charCodeAt(s-1):null,f=f&&pH(o,a)}else{for(s=0;si&&r[g+1]!==" ",g=s);else if(!Af(o))return _I;a=s>0?r.charCodeAt(s-1):null,f=f&&pH(o,a)}c=c||u&&s-g-1>i&&r[g+1]!==" "}return!l&&!c?f&&!n(r)?DH:kH:t>9&&PH(r)?_I:c?FH:RH}function Ode(r,e,t,i){r.dump=function(){if(e.length===0)return"''";if(!r.noCompatMode&&Dde.indexOf(e)!==-1)return"'"+e+"'";var n=r.indent*Math.max(1,t),s=r.lineWidth===-1?-1:Math.max(Math.min(r.lineWidth,40),r.lineWidth-n),o=i||r.flowLevel>-1&&t>=r.flowLevel;function a(l){return Fde(r,l)}switch(Lde(e,o,r.indent,s,a)){case DH:return e;case kH:return"'"+e.replace(/'/g,"''")+"'";case RH:return"|"+dH(e,r.indent)+CH(hH(e,n));case FH:return">"+dH(e,r.indent)+CH(hH(Mde(e,s),n));case _I:return'"'+Ude(e,s)+'"';default:throw new Bd("impossible error: invalid scalar style")}}()}function dH(r,e){var t=PH(r)?String(e):"",i=r[r.length-1]===` -`,n=i&&(r[r.length-2]===` -`||r===` -`),s=n?"+":i?"":"-";return t+s+` -`}function CH(r){return r[r.length-1]===` -`?r.slice(0,-1):r}function Mde(r,e){for(var t=/(\n+)([^\n]*)/g,i=function(){var c=r.indexOf(` -`);return c=c!==-1?c:r.length,t.lastIndex=c,mH(r.slice(0,c),e)}(),n=r[0]===` -`||r[0]===" ",s,o;o=t.exec(r);){var a=o[1],l=o[2];s=l[0]===" ",i+=a+(!n&&!s&&l!==""?` -`:"")+mH(l,e),n=s}return i}function mH(r,e){if(r===""||r[0]===" ")return r;for(var t=/ [^ ]/g,i,n=0,s,o=0,a=0,l="";i=t.exec(r);)a=i.index,a-n>e&&(s=o>n?o:a,l+=` -`+r.slice(n,s),n=s+1),o=a;return l+=` -`,r.length-n>e&&o>n?l+=r.slice(n,o)+` -`+r.slice(o+1):l+=r.slice(n),l.slice(1)}function Ude(r){for(var e="",t,i,n,s=0;s=55296&&t<=56319&&(i=r.charCodeAt(s+1),i>=56320&&i<=57343)){e+=fH((t-55296)*1024+i-56320+65536),s++;continue}n=Ti[t],e+=!n&&Af(t)?r[s]:n||fH(t)}return e}function Kde(r,e,t){var i="",n=r.tag,s,o;for(s=0,o=t.length;s1024&&(u+="? "),u+=r.dump+(r.condenseFlow?'"':"")+":"+(r.condenseFlow?"":" "),Ic(r,e,c,!1,!1)&&(u+=r.dump,i+=u));r.tag=n,r.dump="{"+i+"}"}function Yde(r,e,t,i){var n="",s=r.tag,o=Object.keys(t),a,l,c,u,g,f;if(r.sortKeys===!0)o.sort();else if(typeof r.sortKeys=="function")o.sort(r.sortKeys);else if(r.sortKeys)throw new Bd("sortKeys must be a boolean or a function");for(a=0,l=o.length;a1024,g&&(r.dump&&yd===r.dump.charCodeAt(0)?f+="?":f+="? "),f+=r.dump,g&&(f+=Dv(r,e)),Ic(r,e+1,u,!0,g)&&(r.dump&&yd===r.dump.charCodeAt(0)?f+=":":f+=": ",f+=r.dump,n+=f));r.tag=s,r.dump=n||"{}"}function EH(r,e,t){var i,n,s,o,a,l;for(n=t?r.explicitTypes:r.implicitTypes,s=0,o=n.length;s tag resolver accepts not "'+l+'" style');r.dump=i}return!0}return!1}function Ic(r,e,t,i,n,s){r.tag=null,r.dump=t,EH(r,t,!1)||EH(r,t,!0);var o=IH.call(r.dump);i&&(i=r.flowLevel<0||r.flowLevel>e);var a=o==="[object Object]"||o==="[object Array]",l,c;if(a&&(l=r.duplicates.indexOf(t),c=l!==-1),(r.tag!==null&&r.tag!=="?"||c||r.indent!==2&&e>0)&&(n=!1),c&&r.usedDuplicates[l])r.dump="*ref_"+l;else{if(a&&c&&!r.usedDuplicates[l]&&(r.usedDuplicates[l]=!0),o==="[object Object]")i&&Object.keys(r.dump).length!==0?(Yde(r,e,r.dump,n),c&&(r.dump="&ref_"+l+r.dump)):(Gde(r,e,r.dump),c&&(r.dump="&ref_"+l+" "+r.dump));else if(o==="[object Array]"){var u=r.noArrayIndent&&e>0?e-1:e;i&&r.dump.length!==0?(Hde(r,u,r.dump,n),c&&(r.dump="&ref_"+l+r.dump)):(Kde(r,u,r.dump),c&&(r.dump="&ref_"+l+" "+r.dump))}else if(o==="[object String]")r.tag!=="?"&&Ode(r,r.dump,e,s);else{if(r.skipInvalid)return!1;throw new Bd("unacceptable kind of an object to dump "+o)}r.tag!==null&&r.tag!=="?"&&(r.dump="!<"+r.tag+"> "+r.dump)}return!0}function jde(r,e){var t=[],i=[],n,s;for(kv(r,t,i),n=0,s=i.length;n{"use strict";var ZI=gH(),LH=TH();function $I(r){return function(){throw new Error("Function "+r+" is deprecated and cannot be used.")}}Tr.exports.Type=Ai();Tr.exports.Schema=dc();Tr.exports.FAILSAFE_SCHEMA=qI();Tr.exports.JSON_SCHEMA=bv();Tr.exports.CORE_SCHEMA=Qv();Tr.exports.DEFAULT_SAFE_SCHEMA=nf();Tr.exports.DEFAULT_FULL_SCHEMA=Ed();Tr.exports.load=ZI.load;Tr.exports.loadAll=ZI.loadAll;Tr.exports.safeLoad=ZI.safeLoad;Tr.exports.safeLoadAll=ZI.safeLoadAll;Tr.exports.dump=LH.dump;Tr.exports.safeDump=LH.safeDump;Tr.exports.YAMLException=tf();Tr.exports.MINIMAL_SCHEMA=qI();Tr.exports.SAFE_SCHEMA=nf();Tr.exports.DEFAULT_SCHEMA=Ed();Tr.exports.scan=$I("scan");Tr.exports.parse=$I("parse");Tr.exports.compose=$I("compose");Tr.exports.addConstructor=$I("addConstructor")});var UH=y((d$e,MH)=>{"use strict";var Jde=OH();MH.exports=Jde});var HH=y((C$e,KH)=>{"use strict";function Wde(r,e){function t(){this.constructor=r}t.prototype=e.prototype,r.prototype=new t}function yc(r,e,t,i){this.message=r,this.expected=e,this.found=t,this.location=i,this.name="SyntaxError",typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,yc)}Wde(yc,Error);yc.buildMessage=function(r,e){var t={literal:function(c){return'"'+n(c.text)+'"'},class:function(c){var u="",g;for(g=0;g0){for(g=1,f=1;g({[Ne]:pe})))},H=function(R){return R},j=function(R){return R},$=Ms("correct indentation"),V=" ",W=ar(" ",!1),Z=function(R){return R.length===vA*Gg},A=function(R){return R.length===(vA+1)*Gg},ae=function(){return vA++,!0},ge=function(){return vA--,!0},_=function(){return Lg()},L=Ms("pseudostring"),N=/^[^\r\n\t ?:,\][{}#&*!|>'"%@`\-]/,ue=Fn(["\r",` -`," "," ","?",":",",","]","[","{","}","#","&","*","!","|",">","'",'"',"%","@","`","-"],!0,!1),we=/^[^\r\n\t ,\][{}:#"']/,Te=Fn(["\r",` -`," "," ",",","]","[","{","}",":","#",'"',"'"],!0,!1),Pe=function(){return Lg().replace(/^ *| *$/g,"")},Le="--",se=ar("--",!1),Ae=/^[a-zA-Z\/0-9]/,be=Fn([["a","z"],["A","Z"],"/",["0","9"]],!1,!1),fe=/^[^\r\n\t :,]/,le=Fn(["\r",` -`," "," ",":",","],!0,!1),Ge="null",ie=ar("null",!1),Y=function(){return null},he="true",re=ar("true",!1),me=function(){return!0},tt="false",Rt=ar("false",!1),It=function(){return!1},Ur=Ms("string"),oi='"',pi=ar('"',!1),pr=function(){return""},di=function(R){return R},ai=function(R){return R.join("")},Os=/^[^"\\\0-\x1F\x7F]/,dr=Fn(['"',"\\",["\0",""],"\x7F"],!0,!1),Bi='\\"',_n=ar('\\"',!1),pa=function(){return'"'},EA="\\\\",kg=ar("\\\\",!1),Zn=function(){return"\\"},IA="\\/",da=ar("\\/",!1),Jp=function(){return"/"},yA="\\b",wA=ar("\\b",!1),Br=function(){return"\b"},Vl="\\f",Rg=ar("\\f",!1),Eo=function(){return"\f"},Fg="\\n",Wp=ar("\\n",!1),zp=function(){return` -`},Pr="\\r",oe=ar("\\r",!1),Io=function(){return"\r"},kn="\\t",Ng=ar("\\t",!1),bt=function(){return" "},Xl="\\u",Rn=ar("\\u",!1),$n=function(R,q,pe,Ne){return String.fromCharCode(parseInt(`0x${R}${q}${pe}${Ne}`))},es=/^[0-9a-fA-F]/,ut=Fn([["0","9"],["a","f"],["A","F"]],!1,!1),yo=Ms("blank space"),at=/^[ \t]/,ln=Fn([" "," "],!1,!1),S=Ms("white space"),Lt=/^[ \t\n\r]/,Tg=Fn([" "," ",` -`,"\r"],!1,!1),_l=`\r -`,Vp=ar(`\r -`,!1),Xp=` -`,_p=ar(` -`,!1),Zp="\r",$p=ar("\r",!1),G=0,yt=0,BA=[{line:1,column:1}],Wi=0,Zl=[],We=0,Ca;if("startRule"in e){if(!(e.startRule in i))throw new Error(`Can't start parsing from rule "`+e.startRule+'".');n=i[e.startRule]}function Lg(){return r.substring(yt,G)}function uI(){return cn(yt,G)}function ed(R,q){throw q=q!==void 0?q:cn(yt,G),ec([Ms(R)],r.substring(yt,G),q)}function gI(R,q){throw q=q!==void 0?q:cn(yt,G),Og(R,q)}function ar(R,q){return{type:"literal",text:R,ignoreCase:q}}function Fn(R,q,pe){return{type:"class",parts:R,inverted:q,ignoreCase:pe}}function $l(){return{type:"any"}}function td(){return{type:"end"}}function Ms(R){return{type:"other",description:R}}function ma(R){var q=BA[R],pe;if(q)return q;for(pe=R-1;!BA[pe];)pe--;for(q=BA[pe],q={line:q.line,column:q.column};peWi&&(Wi=G,Zl=[]),Zl.push(R))}function Og(R,q){return new yc(R,null,null,q)}function ec(R,q,pe){return new yc(yc.buildMessage(R,q),R,q,pe)}function Us(){var R;return R=Mg(),R}function tc(){var R,q,pe;for(R=G,q=[],pe=bA();pe!==t;)q.push(pe),pe=bA();return q!==t&&(yt=R,q=s(q)),R=q,R}function bA(){var R,q,pe,Ne,xe;return R=G,q=Ia(),q!==t?(r.charCodeAt(G)===45?(pe=o,G++):(pe=t,We===0&&ke(a)),pe!==t?(Ne=Nr(),Ne!==t?(xe=Ea(),xe!==t?(yt=R,q=l(xe),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R}function Mg(){var R,q,pe;for(R=G,q=[],pe=Ug();pe!==t;)q.push(pe),pe=Ug();return q!==t&&(yt=R,q=c(q)),R=q,R}function Ug(){var R,q,pe,Ne,xe,qe,dt,Ft,Nn;if(R=G,q=Nr(),q===t&&(q=null),q!==t){if(pe=G,r.charCodeAt(G)===35?(Ne=u,G++):(Ne=t,We===0&&ke(g)),Ne!==t){if(xe=[],qe=G,dt=G,We++,Ft=Gs(),We--,Ft===t?dt=void 0:(G=dt,dt=t),dt!==t?(r.length>G?(Ft=r.charAt(G),G++):(Ft=t,We===0&&ke(f)),Ft!==t?(dt=[dt,Ft],qe=dt):(G=qe,qe=t)):(G=qe,qe=t),qe!==t)for(;qe!==t;)xe.push(qe),qe=G,dt=G,We++,Ft=Gs(),We--,Ft===t?dt=void 0:(G=dt,dt=t),dt!==t?(r.length>G?(Ft=r.charAt(G),G++):(Ft=t,We===0&&ke(f)),Ft!==t?(dt=[dt,Ft],qe=dt):(G=qe,qe=t)):(G=qe,qe=t);else xe=t;xe!==t?(Ne=[Ne,xe],pe=Ne):(G=pe,pe=t)}else G=pe,pe=t;if(pe===t&&(pe=null),pe!==t){if(Ne=[],xe=Hs(),xe!==t)for(;xe!==t;)Ne.push(xe),xe=Hs();else Ne=t;Ne!==t?(yt=R,q=h(),R=q):(G=R,R=t)}else G=R,R=t}else G=R,R=t;if(R===t&&(R=G,q=Ia(),q!==t?(pe=rc(),pe!==t?(Ne=Nr(),Ne===t&&(Ne=null),Ne!==t?(r.charCodeAt(G)===58?(xe=p,G++):(xe=t,We===0&&ke(C)),xe!==t?(qe=Nr(),qe===t&&(qe=null),qe!==t?(dt=Ea(),dt!==t?(yt=R,q=w(pe,dt),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,q=Ia(),q!==t?(pe=Ks(),pe!==t?(Ne=Nr(),Ne===t&&(Ne=null),Ne!==t?(r.charCodeAt(G)===58?(xe=p,G++):(xe=t,We===0&&ke(C)),xe!==t?(qe=Nr(),qe===t&&(qe=null),qe!==t?(dt=Ea(),dt!==t?(yt=R,q=w(pe,dt),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t))){if(R=G,q=Ia(),q!==t)if(pe=Ks(),pe!==t)if(Ne=Nr(),Ne!==t)if(xe=fI(),xe!==t){if(qe=[],dt=Hs(),dt!==t)for(;dt!==t;)qe.push(dt),dt=Hs();else qe=t;qe!==t?(yt=R,q=w(pe,xe),R=q):(G=R,R=t)}else G=R,R=t;else G=R,R=t;else G=R,R=t;else G=R,R=t;if(R===t)if(R=G,q=Ia(),q!==t)if(pe=Ks(),pe!==t){if(Ne=[],xe=G,qe=Nr(),qe===t&&(qe=null),qe!==t?(r.charCodeAt(G)===44?(dt=B,G++):(dt=t,We===0&&ke(v)),dt!==t?(Ft=Nr(),Ft===t&&(Ft=null),Ft!==t?(Nn=Ks(),Nn!==t?(yt=xe,qe=D(pe,Nn),xe=qe):(G=xe,xe=t)):(G=xe,xe=t)):(G=xe,xe=t)):(G=xe,xe=t),xe!==t)for(;xe!==t;)Ne.push(xe),xe=G,qe=Nr(),qe===t&&(qe=null),qe!==t?(r.charCodeAt(G)===44?(dt=B,G++):(dt=t,We===0&&ke(v)),dt!==t?(Ft=Nr(),Ft===t&&(Ft=null),Ft!==t?(Nn=Ks(),Nn!==t?(yt=xe,qe=D(pe,Nn),xe=qe):(G=xe,xe=t)):(G=xe,xe=t)):(G=xe,xe=t)):(G=xe,xe=t);else Ne=t;Ne!==t?(xe=Nr(),xe===t&&(xe=null),xe!==t?(r.charCodeAt(G)===58?(qe=p,G++):(qe=t,We===0&&ke(C)),qe!==t?(dt=Nr(),dt===t&&(dt=null),dt!==t?(Ft=Ea(),Ft!==t?(yt=R,q=T(pe,Ne,Ft),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)}else G=R,R=t;else G=R,R=t}return R}function Ea(){var R,q,pe,Ne,xe,qe,dt;if(R=G,q=G,We++,pe=G,Ne=Gs(),Ne!==t?(xe=$e(),xe!==t?(r.charCodeAt(G)===45?(qe=o,G++):(qe=t,We===0&&ke(a)),qe!==t?(dt=Nr(),dt!==t?(Ne=[Ne,xe,qe,dt],pe=Ne):(G=pe,pe=t)):(G=pe,pe=t)):(G=pe,pe=t)):(G=pe,pe=t),We--,pe!==t?(G=q,q=void 0):q=t,q!==t?(pe=Hs(),pe!==t?(Ne=wo(),Ne!==t?(xe=tc(),xe!==t?(qe=QA(),qe!==t?(yt=R,q=H(xe),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,q=Gs(),q!==t?(pe=wo(),pe!==t?(Ne=Mg(),Ne!==t?(xe=QA(),xe!==t?(yt=R,q=H(Ne),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t),R===t))if(R=G,q=ic(),q!==t){if(pe=[],Ne=Hs(),Ne!==t)for(;Ne!==t;)pe.push(Ne),Ne=Hs();else pe=t;pe!==t?(yt=R,q=j(q),R=q):(G=R,R=t)}else G=R,R=t;return R}function Ia(){var R,q,pe;for(We++,R=G,q=[],r.charCodeAt(G)===32?(pe=V,G++):(pe=t,We===0&&ke(W));pe!==t;)q.push(pe),r.charCodeAt(G)===32?(pe=V,G++):(pe=t,We===0&&ke(W));return q!==t?(yt=G,pe=Z(q),pe?pe=void 0:pe=t,pe!==t?(q=[q,pe],R=q):(G=R,R=t)):(G=R,R=t),We--,R===t&&(q=t,We===0&&ke($)),R}function $e(){var R,q,pe;for(R=G,q=[],r.charCodeAt(G)===32?(pe=V,G++):(pe=t,We===0&&ke(W));pe!==t;)q.push(pe),r.charCodeAt(G)===32?(pe=V,G++):(pe=t,We===0&&ke(W));return q!==t?(yt=G,pe=A(q),pe?pe=void 0:pe=t,pe!==t?(q=[q,pe],R=q):(G=R,R=t)):(G=R,R=t),R}function wo(){var R;return yt=G,R=ae(),R?R=void 0:R=t,R}function QA(){var R;return yt=G,R=ge(),R?R=void 0:R=t,R}function rc(){var R;return R=nc(),R===t&&(R=rd()),R}function Ks(){var R,q,pe;if(R=nc(),R===t){if(R=G,q=[],pe=Kg(),pe!==t)for(;pe!==t;)q.push(pe),pe=Kg();else q=t;q!==t&&(yt=R,q=_()),R=q}return R}function ic(){var R;return R=id(),R===t&&(R=hI(),R===t&&(R=nc(),R===t&&(R=rd()))),R}function fI(){var R;return R=id(),R===t&&(R=nc(),R===t&&(R=Kg())),R}function rd(){var R,q,pe,Ne,xe,qe;if(We++,R=G,N.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,We===0&&ke(ue)),q!==t){for(pe=[],Ne=G,xe=Nr(),xe===t&&(xe=null),xe!==t?(we.test(r.charAt(G))?(qe=r.charAt(G),G++):(qe=t,We===0&&ke(Te)),qe!==t?(xe=[xe,qe],Ne=xe):(G=Ne,Ne=t)):(G=Ne,Ne=t);Ne!==t;)pe.push(Ne),Ne=G,xe=Nr(),xe===t&&(xe=null),xe!==t?(we.test(r.charAt(G))?(qe=r.charAt(G),G++):(qe=t,We===0&&ke(Te)),qe!==t?(xe=[xe,qe],Ne=xe):(G=Ne,Ne=t)):(G=Ne,Ne=t);pe!==t?(yt=R,q=Pe(),R=q):(G=R,R=t)}else G=R,R=t;return We--,R===t&&(q=t,We===0&&ke(L)),R}function Kg(){var R,q,pe,Ne,xe;if(R=G,r.substr(G,2)===Le?(q=Le,G+=2):(q=t,We===0&&ke(se)),q===t&&(q=null),q!==t)if(Ae.test(r.charAt(G))?(pe=r.charAt(G),G++):(pe=t,We===0&&ke(be)),pe!==t){for(Ne=[],fe.test(r.charAt(G))?(xe=r.charAt(G),G++):(xe=t,We===0&&ke(le));xe!==t;)Ne.push(xe),fe.test(r.charAt(G))?(xe=r.charAt(G),G++):(xe=t,We===0&&ke(le));Ne!==t?(yt=R,q=Pe(),R=q):(G=R,R=t)}else G=R,R=t;else G=R,R=t;return R}function id(){var R,q;return R=G,r.substr(G,4)===Ge?(q=Ge,G+=4):(q=t,We===0&&ke(ie)),q!==t&&(yt=R,q=Y()),R=q,R}function hI(){var R,q;return R=G,r.substr(G,4)===he?(q=he,G+=4):(q=t,We===0&&ke(re)),q!==t&&(yt=R,q=me()),R=q,R===t&&(R=G,r.substr(G,5)===tt?(q=tt,G+=5):(q=t,We===0&&ke(Rt)),q!==t&&(yt=R,q=It()),R=q),R}function nc(){var R,q,pe,Ne;return We++,R=G,r.charCodeAt(G)===34?(q=oi,G++):(q=t,We===0&&ke(pi)),q!==t?(r.charCodeAt(G)===34?(pe=oi,G++):(pe=t,We===0&&ke(pi)),pe!==t?(yt=R,q=pr(),R=q):(G=R,R=t)):(G=R,R=t),R===t&&(R=G,r.charCodeAt(G)===34?(q=oi,G++):(q=t,We===0&&ke(pi)),q!==t?(pe=pI(),pe!==t?(r.charCodeAt(G)===34?(Ne=oi,G++):(Ne=t,We===0&&ke(pi)),Ne!==t?(yt=R,q=di(pe),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)),We--,R===t&&(q=t,We===0&&ke(Ur)),R}function pI(){var R,q,pe;if(R=G,q=[],pe=Hg(),pe!==t)for(;pe!==t;)q.push(pe),pe=Hg();else q=t;return q!==t&&(yt=R,q=ai(q)),R=q,R}function Hg(){var R,q,pe,Ne,xe,qe;return Os.test(r.charAt(G))?(R=r.charAt(G),G++):(R=t,We===0&&ke(dr)),R===t&&(R=G,r.substr(G,2)===Bi?(q=Bi,G+=2):(q=t,We===0&&ke(_n)),q!==t&&(yt=R,q=pa()),R=q,R===t&&(R=G,r.substr(G,2)===EA?(q=EA,G+=2):(q=t,We===0&&ke(kg)),q!==t&&(yt=R,q=Zn()),R=q,R===t&&(R=G,r.substr(G,2)===IA?(q=IA,G+=2):(q=t,We===0&&ke(da)),q!==t&&(yt=R,q=Jp()),R=q,R===t&&(R=G,r.substr(G,2)===yA?(q=yA,G+=2):(q=t,We===0&&ke(wA)),q!==t&&(yt=R,q=Br()),R=q,R===t&&(R=G,r.substr(G,2)===Vl?(q=Vl,G+=2):(q=t,We===0&&ke(Rg)),q!==t&&(yt=R,q=Eo()),R=q,R===t&&(R=G,r.substr(G,2)===Fg?(q=Fg,G+=2):(q=t,We===0&&ke(Wp)),q!==t&&(yt=R,q=zp()),R=q,R===t&&(R=G,r.substr(G,2)===Pr?(q=Pr,G+=2):(q=t,We===0&&ke(oe)),q!==t&&(yt=R,q=Io()),R=q,R===t&&(R=G,r.substr(G,2)===kn?(q=kn,G+=2):(q=t,We===0&&ke(Ng)),q!==t&&(yt=R,q=bt()),R=q,R===t&&(R=G,r.substr(G,2)===Xl?(q=Xl,G+=2):(q=t,We===0&&ke(Rn)),q!==t?(pe=SA(),pe!==t?(Ne=SA(),Ne!==t?(xe=SA(),xe!==t?(qe=SA(),qe!==t?(yt=R,q=$n(pe,Ne,xe,qe),R=q):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)):(G=R,R=t)))))))))),R}function SA(){var R;return es.test(r.charAt(G))?(R=r.charAt(G),G++):(R=t,We===0&&ke(ut)),R}function Nr(){var R,q;if(We++,R=[],at.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,We===0&&ke(ln)),q!==t)for(;q!==t;)R.push(q),at.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,We===0&&ke(ln));else R=t;return We--,R===t&&(q=t,We===0&&ke(yo)),R}function dI(){var R,q;if(We++,R=[],Lt.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,We===0&&ke(Tg)),q!==t)for(;q!==t;)R.push(q),Lt.test(r.charAt(G))?(q=r.charAt(G),G++):(q=t,We===0&&ke(Tg));else R=t;return We--,R===t&&(q=t,We===0&&ke(S)),R}function Hs(){var R,q,pe,Ne,xe,qe;if(R=G,q=Gs(),q!==t){for(pe=[],Ne=G,xe=Nr(),xe===t&&(xe=null),xe!==t?(qe=Gs(),qe!==t?(xe=[xe,qe],Ne=xe):(G=Ne,Ne=t)):(G=Ne,Ne=t);Ne!==t;)pe.push(Ne),Ne=G,xe=Nr(),xe===t&&(xe=null),xe!==t?(qe=Gs(),qe!==t?(xe=[xe,qe],Ne=xe):(G=Ne,Ne=t)):(G=Ne,Ne=t);pe!==t?(q=[q,pe],R=q):(G=R,R=t)}else G=R,R=t;return R}function Gs(){var R;return r.substr(G,2)===_l?(R=_l,G+=2):(R=t,We===0&&ke(Vp)),R===t&&(r.charCodeAt(G)===10?(R=Xp,G++):(R=t,We===0&&ke(_p)),R===t&&(r.charCodeAt(G)===13?(R=Zp,G++):(R=t,We===0&&ke($p)))),R}let Gg=2,vA=0;if(Ca=n(),Ca!==t&&G===r.length)return Ca;throw Ca!==t&&G{"use strict";var $de=r=>{let e=!1,t=!1,i=!1;for(let n=0;n{if(!(typeof r=="string"||Array.isArray(r)))throw new TypeError("Expected the input to be `string | string[]`");e=Object.assign({pascalCase:!1},e);let t=n=>e.pascalCase?n.charAt(0).toUpperCase()+n.slice(1):n;return Array.isArray(r)?r=r.map(n=>n.trim()).filter(n=>n.length).join("-"):r=r.trim(),r.length===0?"":r.length===1?e.pascalCase?r.toUpperCase():r.toLowerCase():(r!==r.toLowerCase()&&(r=$de(r)),r=r.replace(/^[_.\- ]+/,"").toLowerCase().replace(/[_.\- ]+(\w|$)/g,(n,s)=>s.toUpperCase()).replace(/\d+(\w|$)/g,n=>n.toUpperCase()),t(r))};Tv.exports=JH;Tv.exports.default=JH});var zH=y((B$e,eCe)=>{eCe.exports=[{name:"AppVeyor",constant:"APPVEYOR",env:"APPVEYOR",pr:"APPVEYOR_PULL_REQUEST_NUMBER"},{name:"Azure Pipelines",constant:"AZURE_PIPELINES",env:"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",pr:"SYSTEM_PULLREQUEST_PULLREQUESTID"},{name:"Appcircle",constant:"APPCIRCLE",env:"AC_APPCIRCLE"},{name:"Bamboo",constant:"BAMBOO",env:"bamboo_planKey"},{name:"Bitbucket Pipelines",constant:"BITBUCKET",env:"BITBUCKET_COMMIT",pr:"BITBUCKET_PR_ID"},{name:"Bitrise",constant:"BITRISE",env:"BITRISE_IO",pr:"BITRISE_PULL_REQUEST"},{name:"Buddy",constant:"BUDDY",env:"BUDDY_WORKSPACE_ID",pr:"BUDDY_EXECUTION_PULL_REQUEST_ID"},{name:"Buildkite",constant:"BUILDKITE",env:"BUILDKITE",pr:{env:"BUILDKITE_PULL_REQUEST",ne:"false"}},{name:"CircleCI",constant:"CIRCLE",env:"CIRCLECI",pr:"CIRCLE_PULL_REQUEST"},{name:"Cirrus CI",constant:"CIRRUS",env:"CIRRUS_CI",pr:"CIRRUS_PR"},{name:"AWS CodeBuild",constant:"CODEBUILD",env:"CODEBUILD_BUILD_ARN"},{name:"Codefresh",constant:"CODEFRESH",env:"CF_BUILD_ID",pr:{any:["CF_PULL_REQUEST_NUMBER","CF_PULL_REQUEST_ID"]}},{name:"Codeship",constant:"CODESHIP",env:{CI_NAME:"codeship"}},{name:"Drone",constant:"DRONE",env:"DRONE",pr:{DRONE_BUILD_EVENT:"pull_request"}},{name:"dsari",constant:"DSARI",env:"DSARI"},{name:"GitHub Actions",constant:"GITHUB_ACTIONS",env:"GITHUB_ACTIONS",pr:{GITHUB_EVENT_NAME:"pull_request"}},{name:"GitLab CI",constant:"GITLAB",env:"GITLAB_CI",pr:"CI_MERGE_REQUEST_ID"},{name:"GoCD",constant:"GOCD",env:"GO_PIPELINE_LABEL"},{name:"LayerCI",constant:"LAYERCI",env:"LAYERCI",pr:"LAYERCI_PULL_REQUEST"},{name:"Hudson",constant:"HUDSON",env:"HUDSON_URL"},{name:"Jenkins",constant:"JENKINS",env:["JENKINS_URL","BUILD_ID"],pr:{any:["ghprbPullId","CHANGE_ID"]}},{name:"Magnum CI",constant:"MAGNUM",env:"MAGNUM"},{name:"Netlify CI",constant:"NETLIFY",env:"NETLIFY",pr:{env:"PULL_REQUEST",ne:"false"}},{name:"Nevercode",constant:"NEVERCODE",env:"NEVERCODE",pr:{env:"NEVERCODE_PULL_REQUEST",ne:"false"}},{name:"Render",constant:"RENDER",env:"RENDER",pr:{IS_PULL_REQUEST:"true"}},{name:"Sail CI",constant:"SAIL",env:"SAILCI",pr:"SAIL_PULL_REQUEST_NUMBER"},{name:"Semaphore",constant:"SEMAPHORE",env:"SEMAPHORE",pr:"PULL_REQUEST_NUMBER"},{name:"Screwdriver",constant:"SCREWDRIVER",env:"SCREWDRIVER",pr:{env:"SD_PULL_REQUEST",ne:"false"}},{name:"Shippable",constant:"SHIPPABLE",env:"SHIPPABLE",pr:{IS_PULL_REQUEST:"true"}},{name:"Solano CI",constant:"SOLANO",env:"TDDIUM",pr:"TDDIUM_PR_ID"},{name:"Strider CD",constant:"STRIDER",env:"STRIDER"},{name:"TaskCluster",constant:"TASKCLUSTER",env:["TASK_ID","RUN_ID"]},{name:"TeamCity",constant:"TEAMCITY",env:"TEAMCITY_VERSION"},{name:"Travis CI",constant:"TRAVIS",env:"TRAVIS",pr:{env:"TRAVIS_PULL_REQUEST",ne:"false"}},{name:"Vercel",constant:"VERCEL",env:"NOW_BUILDER"},{name:"Visual Studio App Center",constant:"APPCENTER",env:"APPCENTER_BUILD_ID"}]});var wc=y(Mn=>{"use strict";var XH=zH(),vo=process.env;Object.defineProperty(Mn,"_vendors",{value:XH.map(function(r){return r.constant})});Mn.name=null;Mn.isPR=null;XH.forEach(function(r){let t=(Array.isArray(r.env)?r.env:[r.env]).every(function(i){return VH(i)});if(Mn[r.constant]=t,t)switch(Mn.name=r.name,typeof r.pr){case"string":Mn.isPR=!!vo[r.pr];break;case"object":"env"in r.pr?Mn.isPR=r.pr.env in vo&&vo[r.pr.env]!==r.pr.ne:"any"in r.pr?Mn.isPR=r.pr.any.some(function(i){return!!vo[i]}):Mn.isPR=VH(r.pr);break;default:Mn.isPR=null}});Mn.isCI=!!(vo.CI||vo.CONTINUOUS_INTEGRATION||vo.BUILD_NUMBER||vo.RUN_ID||Mn.name);function VH(r){return typeof r=="string"?!!vo[r]:Object.keys(r).every(function(e){return vo[e]===r[e]})}});var ry=y(Un=>{"use strict";Object.defineProperty(Un,"__esModule",{value:!0});var tCe=0,rCe=1,iCe=2,nCe="",sCe="\0",oCe=-1,aCe=/^(-h|--help)(?:=([0-9]+))?$/,ACe=/^(--[a-z]+(?:-[a-z]+)*|-[a-zA-Z]+)$/,lCe=/^-[a-zA-Z]{2,}$/,cCe=/^([^=]+)=([\s\S]*)$/,uCe=process.env.DEBUG_CLI==="1";Un.BATCH_REGEX=lCe;Un.BINDING_REGEX=cCe;Un.DEBUG=uCe;Un.END_OF_INPUT=sCe;Un.HELP_COMMAND_INDEX=oCe;Un.HELP_REGEX=aCe;Un.NODE_ERRORED=iCe;Un.NODE_INITIAL=tCe;Un.NODE_SUCCESS=rCe;Un.OPTION_REGEX=ACe;Un.START_OF_INPUT=nCe});var iy=y(Qd=>{"use strict";Object.defineProperty(Qd,"__esModule",{value:!0});var gCe=ry(),Lv=class extends Error{constructor(e){super(e),this.clipanion={type:"usage"},this.name="UsageError"}},Ov=class extends Error{constructor(e,t){if(super(),this.input=e,this.candidates=t,this.clipanion={type:"none"},this.name="UnknownSyntaxError",this.candidates.length===0)this.message="Command not found, but we're not sure what's the alternative.";else if(this.candidates.every(i=>i.reason!==null&&i.reason===t[0].reason)){let[{reason:i}]=this.candidates;this.message=`${i} - -${this.candidates.map(({usage:n})=>`$ ${n}`).join(` -`)}`}else if(this.candidates.length===1){let[{usage:i}]=this.candidates;this.message=`Command not found; did you mean: - -$ ${i} -${Uv(e)}`}else this.message=`Command not found; did you mean one of: - -${this.candidates.map(({usage:i},n)=>`${`${n}.`.padStart(4)} ${i}`).join(` -`)} - -${Uv(e)}`}},Mv=class extends Error{constructor(e,t){super(),this.input=e,this.usages=t,this.clipanion={type:"none"},this.name="AmbiguousSyntaxError",this.message=`Cannot find which to pick amongst the following alternatives: - -${this.usages.map((i,n)=>`${`${n}.`.padStart(4)} ${i}`).join(` -`)} - -${Uv(e)}`}},Uv=r=>`While running ${r.filter(e=>e!==gCe.END_OF_INPUT).map(e=>{let t=JSON.stringify(e);return e.match(/\s/)||e.length===0||t!==`"${e}"`?t:e}).join(" ")}`;Qd.AmbiguousSyntaxError=Mv;Qd.UnknownSyntaxError=Ov;Qd.UsageError=Lv});var va=y(TA=>{"use strict";Object.defineProperty(TA,"__esModule",{value:!0});var _H=iy(),ZH=Symbol("clipanion/isOption");function fCe(r){return{...r,[ZH]:!0}}function hCe(r,e){return typeof r>"u"?[r,e]:typeof r=="object"&&r!==null&&!Array.isArray(r)?[void 0,r]:[r,e]}function Kv(r,e=!1){let t=r.replace(/^\.: /,"");return e&&(t=t[0].toLowerCase()+t.slice(1)),t}function $H(r,e){return e.length===1?new _H.UsageError(`${r}: ${Kv(e[0],!0)}`):new _H.UsageError(`${r}: -${e.map(t=>` -- ${Kv(t)}`).join("")}`)}function pCe(r,e,t){if(typeof t>"u")return e;let i=[],n=[],s=a=>{let l=e;return e=a,s.bind(null,l)};if(!t(e,{errors:i,coercions:n,coercion:s}))throw $H(`Invalid value for ${r}`,i);for(let[,a]of n)a();return e}TA.applyValidator=pCe;TA.cleanValidationError=Kv;TA.formatError=$H;TA.isOptionSymbol=ZH;TA.makeCommandOption=fCe;TA.rerouteArguments=hCe});var ns=y(st=>{"use strict";Object.defineProperty(st,"__esModule",{value:!0});var eG=/^[a-zA-Z_][a-zA-Z0-9_]*$/,tG=/^#[0-9a-f]{6}$/i,rG=/^#[0-9a-f]{6}([0-9a-f]{2})?$/i,iG=/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,nG=/^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/i,Hv=/^(?:[1-9]\d{3}(-?)(?:(?:0[1-9]|1[0-2])\1(?:0[1-9]|1\d|2[0-8])|(?:0[13-9]|1[0-2])\1(?:29|30)|(?:0[13578]|1[02])(?:\1)31|00[1-9]|0[1-9]\d|[12]\d{2}|3(?:[0-5]\d|6[0-5]))|(?:[1-9]\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)(?:(-?)02(?:\2)29|-?366))T(?:[01]\d|2[0-3])(:?)[0-5]\d(?:\3[0-5]\d)?(?:Z|[+-][01]\d(?:\3[0-5]\d)?)$/,sG=r=>()=>r;function Qt({test:r}){return sG(r)()}function Zr(r){return r===null?"null":r===void 0?"undefined":r===""?"an empty string":JSON.stringify(r)}function LA(r,e){var t,i,n;return typeof e=="number"?`${(t=r==null?void 0:r.p)!==null&&t!==void 0?t:"."}[${e}]`:eG.test(e)?`${(i=r==null?void 0:r.p)!==null&&i!==void 0?i:""}.${e}`:`${(n=r==null?void 0:r.p)!==null&&n!==void 0?n:"."}[${JSON.stringify(e)}]`}function Bc(r,e){return t=>{let i=r[e];return r[e]=t,Bc(r,e).bind(null,i)}}function oG(r,e){return t=>{r[e]=t}}function ny(r,e,t){return r===1?e:t}function pt({errors:r,p:e}={},t){return r==null||r.push(`${e!=null?e:"."}: ${t}`),!1}var aG=()=>Qt({test:(r,e)=>!0});function dCe(r){return Qt({test:(e,t)=>e!==r?pt(t,`Expected a literal (got ${Zr(r)})`):!0})}var CCe=()=>Qt({test:(r,e)=>typeof r!="string"?pt(e,`Expected a string (got ${Zr(r)})`):!0});function mCe(r){let e=Array.isArray(r)?r:Object.values(r),t=new Set(e);return Qt({test:(i,n)=>t.has(i)?!0:pt(n,`Expected a valid enumeration value (got ${Zr(i)})`)})}var ECe=new Map([["true",!0],["True",!0],["1",!0],[1,!0],["false",!1],["False",!1],["0",!1],[0,!1]]),ICe=()=>Qt({test:(r,e)=>{var t;if(typeof r!="boolean"){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i=ECe.get(r);if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a boolean (got ${Zr(r)})`)}return!0}}),yCe=()=>Qt({test:(r,e)=>{var t;if(typeof r!="number"){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i;if(typeof r=="string"){let n;try{n=JSON.parse(r)}catch{}if(typeof n=="number")if(JSON.stringify(n)===r)i=n;else return pt(e,`Received a number that can't be safely represented by the runtime (${r})`)}if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a number (got ${Zr(r)})`)}return!0}}),wCe=()=>Qt({test:(r,e)=>{var t;if(!(r instanceof Date)){if(typeof(e==null?void 0:e.coercions)<"u"){if(typeof(e==null?void 0:e.coercion)>"u")return pt(e,"Unbound coercion result");let i;if(typeof r=="string"&&Hv.test(r))i=new Date(r);else{let n;if(typeof r=="string"){let s;try{s=JSON.parse(r)}catch{}typeof s=="number"&&(n=s)}else typeof r=="number"&&(n=r);if(typeof n<"u")if(Number.isSafeInteger(n)||!Number.isSafeInteger(n*1e3))i=new Date(n*1e3);else return pt(e,`Received a timestamp that can't be safely represented by the runtime (${r})`)}if(typeof i<"u")return e.coercions.push([(t=e.p)!==null&&t!==void 0?t:".",e.coercion.bind(null,i)]),!0}return pt(e,`Expected a date (got ${Zr(r)})`)}return!0}}),BCe=(r,{delimiter:e}={})=>Qt({test:(t,i)=>{var n;if(typeof t=="string"&&typeof e<"u"&&typeof(i==null?void 0:i.coercions)<"u"){if(typeof(i==null?void 0:i.coercion)>"u")return pt(i,"Unbound coercion result");t=t.split(e),i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,t)])}if(!Array.isArray(t))return pt(i,`Expected an array (got ${Zr(t)})`);let s=!0;for(let o=0,a=t.length;o{let t=AG(r.length);return Qt({test:(i,n)=>{var s;if(typeof i=="string"&&typeof e<"u"&&typeof(n==null?void 0:n.coercions)<"u"){if(typeof(n==null?void 0:n.coercion)>"u")return pt(n,"Unbound coercion result");i=i.split(e),n.coercions.push([(s=n.p)!==null&&s!==void 0?s:".",n.coercion.bind(null,i)])}if(!Array.isArray(i))return pt(n,`Expected a tuple (got ${Zr(i)})`);let o=t(i,Object.assign({},n));for(let a=0,l=i.length;aQt({test:(t,i)=>{if(typeof t!="object"||t===null)return pt(i,`Expected an object (got ${Zr(t)})`);let n=Object.keys(t),s=!0;for(let o=0,a=n.length;o{let t=Object.keys(r);return Qt({test:(i,n)=>{if(typeof i!="object"||i===null)return pt(n,`Expected an object (got ${Zr(i)})`);let s=new Set([...t,...Object.keys(i)]),o={},a=!0;for(let l of s){if(l==="constructor"||l==="__proto__")a=pt(Object.assign(Object.assign({},n),{p:LA(n,l)}),"Unsafe property name");else{let c=Object.prototype.hasOwnProperty.call(r,l)?r[l]:void 0,u=Object.prototype.hasOwnProperty.call(i,l)?i[l]:void 0;typeof c<"u"?a=c(u,Object.assign(Object.assign({},n),{p:LA(n,l),coercion:Bc(i,l)}))&&a:e===null?a=pt(Object.assign(Object.assign({},n),{p:LA(n,l)}),`Extraneous property (got ${Zr(u)})`):Object.defineProperty(o,l,{enumerable:!0,get:()=>u,set:oG(i,l)})}if(!a&&(n==null?void 0:n.errors)==null)break}return e!==null&&(a||(n==null?void 0:n.errors)!=null)&&(a=e(o,n)&&a),a}})},vCe=r=>Qt({test:(e,t)=>e instanceof r?!0:pt(t,`Expected an instance of ${r.name} (got ${Zr(e)})`)}),xCe=(r,{exclusive:e=!1}={})=>Qt({test:(t,i)=>{var n,s,o;let a=[],l=typeof(i==null?void 0:i.errors)<"u"?[]:void 0;for(let c=0,u=r.length;c1?pt(i,`Expected to match exactly a single predicate (matched ${a.join(", ")})`):(o=i==null?void 0:i.errors)===null||o===void 0||o.push(...l),!1}}),PCe=(r,e)=>Qt({test:(t,i)=>{var n,s;let o={value:t},a=typeof(i==null?void 0:i.coercions)<"u"?Bc(o,"value"):void 0,l=typeof(i==null?void 0:i.coercions)<"u"?[]:void 0;if(!r(t,Object.assign(Object.assign({},i),{coercion:a,coercions:l})))return!1;let c=[];if(typeof l<"u")for(let[,u]of l)c.push(u());try{if(typeof(i==null?void 0:i.coercions)<"u"){if(o.value!==t){if(typeof(i==null?void 0:i.coercion)>"u")return pt(i,"Unbound coercion result");i.coercions.push([(n=i.p)!==null&&n!==void 0?n:".",i.coercion.bind(null,o.value)])}(s=i==null?void 0:i.coercions)===null||s===void 0||s.push(...l)}return e.every(u=>u(o.value,i))}finally{for(let u of c)u()}}}),DCe=r=>Qt({test:(e,t)=>typeof e>"u"?!0:r(e,t)}),kCe=r=>Qt({test:(e,t)=>e===null?!0:r(e,t)}),RCe=r=>Qt({test:(e,t)=>e.length>=r?!0:pt(t,`Expected to have a length of at least ${r} elements (got ${e.length})`)}),FCe=r=>Qt({test:(e,t)=>e.length<=r?!0:pt(t,`Expected to have a length of at most ${r} elements (got ${e.length})`)}),AG=r=>Qt({test:(e,t)=>e.length!==r?pt(t,`Expected to have a length of exactly ${r} elements (got ${e.length})`):!0}),NCe=({map:r}={})=>Qt({test:(e,t)=>{let i=new Set,n=new Set;for(let s=0,o=e.length;sQt({test:(r,e)=>r<=0?!0:pt(e,`Expected to be negative (got ${r})`)}),LCe=()=>Qt({test:(r,e)=>r>=0?!0:pt(e,`Expected to be positive (got ${r})`)}),OCe=r=>Qt({test:(e,t)=>e>=r?!0:pt(t,`Expected to be at least ${r} (got ${e})`)}),MCe=r=>Qt({test:(e,t)=>e<=r?!0:pt(t,`Expected to be at most ${r} (got ${e})`)}),UCe=(r,e)=>Qt({test:(t,i)=>t>=r&&t<=e?!0:pt(i,`Expected to be in the [${r}; ${e}] range (got ${t})`)}),KCe=(r,e)=>Qt({test:(t,i)=>t>=r&&tQt({test:(e,t)=>e!==Math.round(e)?pt(t,`Expected to be an integer (got ${e})`):Number.isSafeInteger(e)?!0:pt(t,`Expected to be a safe integer (got ${e})`)}),GCe=r=>Qt({test:(e,t)=>r.test(e)?!0:pt(t,`Expected to match the pattern ${r.toString()} (got ${Zr(e)})`)}),YCe=()=>Qt({test:(r,e)=>r!==r.toLowerCase()?pt(e,`Expected to be all-lowercase (got ${r})`):!0}),jCe=()=>Qt({test:(r,e)=>r!==r.toUpperCase()?pt(e,`Expected to be all-uppercase (got ${r})`):!0}),qCe=()=>Qt({test:(r,e)=>nG.test(r)?!0:pt(e,`Expected to be a valid UUID v4 (got ${Zr(r)})`)}),JCe=()=>Qt({test:(r,e)=>Hv.test(r)?!1:pt(e,`Expected to be a valid ISO 8601 date string (got ${Zr(r)})`)}),WCe=({alpha:r=!1})=>Qt({test:(e,t)=>(r?tG.test(e):rG.test(e))?!0:pt(t,`Expected to be a valid hexadecimal color string (got ${Zr(e)})`)}),zCe=()=>Qt({test:(r,e)=>iG.test(r)?!0:pt(e,`Expected to be a valid base 64 string (got ${Zr(r)})`)}),VCe=(r=aG())=>Qt({test:(e,t)=>{let i;try{i=JSON.parse(e)}catch{return pt(t,`Expected to be a valid JSON string (got ${Zr(e)})`)}return r(i,t)}}),XCe=r=>{let e=new Set(r);return Qt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)||s.push(o);return s.length>0?pt(i,`Missing required ${ny(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},_Ce=r=>{let e=new Set(r);return Qt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>0?pt(i,`Forbidden ${ny(s.length,"property","properties")} ${s.map(o=>`"${o}"`).join(", ")}`):!0}})},ZCe=r=>{let e=new Set(r);return Qt({test:(t,i)=>{let n=new Set(Object.keys(t)),s=[];for(let o of e)n.has(o)&&s.push(o);return s.length>1?pt(i,`Mutually exclusive properties ${s.map(o=>`"${o}"`).join(", ")}`):!0}})};(function(r){r.Forbids="Forbids",r.Requires="Requires"})(st.KeyRelationship||(st.KeyRelationship={}));var $Ce={[st.KeyRelationship.Forbids]:{expect:!1,message:"forbids using"},[st.KeyRelationship.Requires]:{expect:!0,message:"requires using"}},eme=(r,e,t,{ignore:i=[]}={})=>{let n=new Set(i),s=new Set(t),o=$Ce[e];return Qt({test:(a,l)=>{let c=new Set(Object.keys(a));if(!c.has(r)||n.has(a[r]))return!0;let u=[];for(let g of s)(c.has(g)&&!n.has(a[g]))!==o.expect&&u.push(g);return u.length>=1?pt(l,`Property "${r}" ${o.message} ${ny(u.length,"property","properties")} ${u.map(g=>`"${g}"`).join(", ")}`):!0}})};st.applyCascade=PCe;st.base64RegExp=iG;st.colorStringAlphaRegExp=rG;st.colorStringRegExp=tG;st.computeKey=LA;st.getPrintable=Zr;st.hasExactLength=AG;st.hasForbiddenKeys=_Ce;st.hasKeyRelationship=eme;st.hasMaxLength=FCe;st.hasMinLength=RCe;st.hasMutuallyExclusiveKeys=ZCe;st.hasRequiredKeys=XCe;st.hasUniqueItems=NCe;st.isArray=BCe;st.isAtLeast=OCe;st.isAtMost=MCe;st.isBase64=zCe;st.isBoolean=ICe;st.isDate=wCe;st.isDict=QCe;st.isEnum=mCe;st.isHexColor=WCe;st.isISO8601=JCe;st.isInExclusiveRange=KCe;st.isInInclusiveRange=UCe;st.isInstanceOf=vCe;st.isInteger=HCe;st.isJSON=VCe;st.isLiteral=dCe;st.isLowerCase=YCe;st.isNegative=TCe;st.isNullable=kCe;st.isNumber=yCe;st.isObject=SCe;st.isOneOf=xCe;st.isOptional=DCe;st.isPositive=LCe;st.isString=CCe;st.isTuple=bCe;st.isUUID4=qCe;st.isUnknown=aG;st.isUpperCase=jCe;st.iso8601RegExp=Hv;st.makeCoercionFn=Bc;st.makeSetter=oG;st.makeTrait=sG;st.makeValidator=Qt;st.matchesRegExp=GCe;st.plural=ny;st.pushError=pt;st.simpleKeyRegExp=eG;st.uuid4RegExp=nG});var bc=y(Gv=>{"use strict";Object.defineProperty(Gv,"__esModule",{value:!0});var lG=va();function tme(r){if(r&&r.__esModule)return r;var e=Object.create(null);return r&&Object.keys(r).forEach(function(t){if(t!=="default"){var i=Object.getOwnPropertyDescriptor(r,t);Object.defineProperty(e,t,i.get?i:{enumerable:!0,get:function(){return r[t]}})}}),e.default=r,Object.freeze(e)}var Sd=class{constructor(){this.help=!1}static Usage(e){return e}async catch(e){throw e}async validateAndExecute(){let t=this.constructor.schema;if(Array.isArray(t)){let{isDict:n,isUnknown:s,applyCascade:o}=await Promise.resolve().then(function(){return tme(ns())}),a=o(n(s()),t),l=[],c=[];if(!a(this,{errors:l,coercions:c}))throw lG.formatError("Invalid option schema",l);for(let[,g]of c)g()}else if(t!=null)throw new Error("Invalid command schema");let i=await this.execute();return typeof i<"u"?i:0}};Sd.isOption=lG.isOptionSymbol;Sd.Default=[];Gv.Command=Sd});var jv=y(vd=>{"use strict";Object.defineProperty(vd,"__esModule",{value:!0});var cG=80,Yv=Array(cG).fill("\u2501");for(let r=0;r<=24;++r)Yv[Yv.length-r]=`\x1B[38;5;${232+r}m\u2501`;var rme={header:r=>`\x1B[1m\u2501\u2501\u2501 ${r}${r.length`\x1B[1m${r}\x1B[22m`,error:r=>`\x1B[31m\x1B[1m${r}\x1B[22m\x1B[39m`,code:r=>`\x1B[36m${r}\x1B[39m`},ime={header:r=>r,bold:r=>r,error:r=>r,code:r=>r};function nme(r){let e=r.split(` -`),t=e.filter(n=>n.match(/\S/)),i=t.length>0?t.reduce((n,s)=>Math.min(n,s.length-s.trimStart().length),Number.MAX_VALUE):0;return e.map(n=>n.slice(i).trimRight()).join(` -`)}function sme(r,{format:e,paragraphs:t}){return r=r.replace(/\r\n?/g,` -`),r=nme(r),r=r.replace(/^\n+|\n+$/g,""),r=r.replace(/^(\s*)-([^\n]*?)\n+/gm,`$1-$2 - -`),r=r.replace(/\n(\n)?\n*/g,"$1"),t&&(r=r.split(/\n/).map(i=>{let n=i.match(/^\s*[*-][\t ]+(.*)/);if(!n)return i.match(/(.{1,80})(?: |$)/g).join(` -`);let s=i.length-i.trimStart().length;return n[1].match(new RegExp(`(.{1,${78-s}})(?: |$)`,"g")).map((o,a)=>" ".repeat(s)+(a===0?"- ":" ")+o).join(` -`)}).join(` - -`)),r=r.replace(/(`+)((?:.|[\n])*?)\1/g,(i,n,s)=>e.code(n+s+n)),r=r.replace(/(\*\*)((?:.|[\n])*?)\1/g,(i,n,s)=>e.bold(n+s+n)),r?`${r} -`:""}vd.formatMarkdownish=sme;vd.richFormat=rme;vd.textFormat=ime});var ly=y(Ar=>{"use strict";Object.defineProperty(Ar,"__esModule",{value:!0});var lt=ry(),ay=iy();function Vi(r){lt.DEBUG&&console.log(r)}var uG={candidateUsage:null,requiredOptions:[],errorMessage:null,ignoreOptions:!1,path:[],positionals:[],options:[],remainder:null,selectedIndex:lt.HELP_COMMAND_INDEX};function qv(){return{nodes:[Li(),Li(),Li()]}}function gG(r){let e=qv(),t=[],i=e.nodes.length;for(let n of r){t.push(i);for(let s=0;s{if(e.has(i))return;e.add(i);let n=r.nodes[i];for(let o of Object.values(n.statics))for(let{to:a}of o)t(a);for(let[,{to:o}]of n.dynamics)t(o);for(let{to:o}of n.shortcuts)t(o);let s=new Set(n.shortcuts.map(({to:o})=>o));for(;n.shortcuts.length>0;){let{to:o}=n.shortcuts.shift(),a=r.nodes[o];for(let[l,c]of Object.entries(a.statics)){let u=Object.prototype.hasOwnProperty.call(n.statics,l)?n.statics[l]:n.statics[l]=[];for(let g of c)u.some(({to:f})=>g.to===f)||u.push(g)}for(let[l,c]of a.dynamics)n.dynamics.some(([u,{to:g}])=>l===u&&c.to===g)||n.dynamics.push([l,c]);for(let l of a.shortcuts)s.has(l.to)||(n.shortcuts.push(l),s.add(l.to))}};t(lt.NODE_INITIAL)}function hG(r,{prefix:e=""}={}){if(lt.DEBUG){Vi(`${e}Nodes are:`);for(let t=0;tl!==lt.NODE_ERRORED).map(({state:l})=>({usage:l.candidateUsage,reason:null})));if(a.every(({node:l})=>l===lt.NODE_ERRORED))throw new ay.UnknownSyntaxError(e,a.map(({state:l})=>({usage:l.candidateUsage,reason:l.errorMessage})));i=pG(a)}if(i.length>0){Vi(" Results:");for(let s of i)Vi(` - ${s.node} -> ${JSON.stringify(s.state)}`)}else Vi(" No results");return i}function ome(r,e){if(e.selectedIndex!==null)return!0;if(Object.prototype.hasOwnProperty.call(r.statics,lt.END_OF_INPUT)){for(let{to:t}of r.statics[lt.END_OF_INPUT])if(t===lt.NODE_SUCCESS)return!0}return!1}function ame(r,e,t){let i=t&&e.length>0?[""]:[],n=Jv(r,e,t),s=[],o=new Set,a=(l,c,u=!0)=>{let g=[c];for(;g.length>0;){let h=g;g=[];for(let p of h){let C=r.nodes[p],w=Object.keys(C.statics);for(let B of Object.keys(C.statics)){let v=w[0];for(let{to:D,reducer:T}of C.statics[v])T==="pushPath"&&(u||l.push(v),g.push(D))}}u=!1}let f=JSON.stringify(l);o.has(f)||(s.push(l),o.add(f))};for(let{node:l,state:c}of n){if(c.remainder!==null){a([c.remainder],l);continue}let u=r.nodes[l],g=ome(u,c);for(let[f,h]of Object.entries(u.statics))(g&&f!==lt.END_OF_INPUT||!f.startsWith("-")&&h.some(({reducer:p})=>p==="pushPath"))&&a([...i,f],l);if(!!g)for(let[f,{to:h}]of u.dynamics){if(h===lt.NODE_ERRORED)continue;let p=IG(f,c);if(p!==null)for(let C of p)a([...i,C],l)}}return[...s].sort()}function Ame(r,e){let t=Jv(r,[...e,lt.END_OF_INPUT]);return dG(e,t.map(({state:i})=>i))}function pG(r){let e=0;for(let{state:t}of r)t.path.length>e&&(e=t.path.length);return r.filter(({state:t})=>t.path.length===e)}function dG(r,e){let t=e.filter(g=>g.selectedIndex!==null);if(t.length===0)throw new Error;let i=t.filter(g=>g.requiredOptions.every(f=>f.some(h=>g.options.find(p=>p.name===h))));if(i.length===0)throw new ay.UnknownSyntaxError(r,t.map(g=>({usage:g.candidateUsage,reason:null})));let n=0;for(let g of i)g.path.length>n&&(n=g.path.length);let s=i.filter(g=>g.path.length===n),o=g=>g.positionals.filter(({extra:f})=>!f).length+g.options.length,a=s.map(g=>({state:g,positionalCount:o(g)})),l=0;for(let{positionalCount:g}of a)g>l&&(l=g);let c=a.filter(({positionalCount:g})=>g===l).map(({state:g})=>g),u=CG(c);if(u.length>1)throw new ay.AmbiguousSyntaxError(r,u.map(g=>g.candidateUsage));return u[0]}function CG(r){let e=[],t=[];for(let i of r)i.selectedIndex===lt.HELP_COMMAND_INDEX?t.push(i):e.push(i);return t.length>0&&e.push({...uG,path:mG(...t.map(i=>i.path)),options:t.reduce((i,n)=>i.concat(n.options),[])}),e}function mG(r,e,...t){return e===void 0?Array.from(r):mG(r.filter((i,n)=>i===e[n]),...t)}function Li(){return{dynamics:[],shortcuts:[],statics:{}}}function Wv(r){return r===lt.NODE_SUCCESS||r===lt.NODE_ERRORED}function sy(r,e=0){return{to:Wv(r.to)?r.to:r.to>2?r.to+e-2:r.to+e,reducer:r.reducer}}function EG(r,e=0){let t=Li();for(let[i,n]of r.dynamics)t.dynamics.push([i,sy(n,e)]);for(let i of r.shortcuts)t.shortcuts.push(sy(i,e));for(let[i,n]of Object.entries(r.statics))t.statics[i]=n.map(s=>sy(s,e));return t}function Ei(r,e,t,i,n){r.nodes[e].dynamics.push([t,{to:i,reducer:n}])}function Qc(r,e,t,i){r.nodes[e].shortcuts.push({to:t,reducer:i})}function xo(r,e,t,i,n){(Object.prototype.hasOwnProperty.call(r.nodes[e].statics,t)?r.nodes[e].statics[t]:r.nodes[e].statics[t]=[]).push({to:i,reducer:n})}function xd(r,e,t,i){if(Array.isArray(e)){let[n,...s]=e;return r[n](t,i,...s)}else return r[e](t,i)}function IG(r,e){let t=Array.isArray(r)?Pd[r[0]]:Pd[r];if(typeof t.suggest>"u")return null;let i=Array.isArray(r)?r.slice(1):[];return t.suggest(e,...i)}var Pd={always:()=>!0,isOptionLike:(r,e)=>!r.ignoreOptions&&e!=="-"&&e.startsWith("-"),isNotOptionLike:(r,e)=>r.ignoreOptions||e==="-"||!e.startsWith("-"),isOption:(r,e,t,i)=>!r.ignoreOptions&&e===t,isBatchOption:(r,e,t)=>!r.ignoreOptions&<.BATCH_REGEX.test(e)&&[...e.slice(1)].every(i=>t.includes(`-${i}`)),isBoundOption:(r,e,t,i)=>{let n=e.match(lt.BINDING_REGEX);return!r.ignoreOptions&&!!n&<.OPTION_REGEX.test(n[1])&&t.includes(n[1])&&i.filter(s=>s.names.includes(n[1])).every(s=>s.allowBinding)},isNegatedOption:(r,e,t)=>!r.ignoreOptions&&e===`--no-${t.slice(2)}`,isHelp:(r,e)=>!r.ignoreOptions&<.HELP_REGEX.test(e),isUnsupportedOption:(r,e,t)=>!r.ignoreOptions&&e.startsWith("-")&<.OPTION_REGEX.test(e)&&!t.includes(e),isInvalidOption:(r,e)=>!r.ignoreOptions&&e.startsWith("-")&&!lt.OPTION_REGEX.test(e)};Pd.isOption.suggest=(r,e,t=!0)=>t?null:[e];var oy={setCandidateState:(r,e,t)=>({...r,...t}),setSelectedIndex:(r,e,t)=>({...r,selectedIndex:t}),pushBatch:(r,e)=>({...r,options:r.options.concat([...e.slice(1)].map(t=>({name:`-${t}`,value:!0})))}),pushBound:(r,e)=>{let[,t,i]=e.match(lt.BINDING_REGEX);return{...r,options:r.options.concat({name:t,value:i})}},pushPath:(r,e)=>({...r,path:r.path.concat(e)}),pushPositional:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:!1})}),pushExtra:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:!0})}),pushExtraNoLimits:(r,e)=>({...r,positionals:r.positionals.concat({value:e,extra:Po})}),pushTrue:(r,e,t=e)=>({...r,options:r.options.concat({name:e,value:!0})}),pushFalse:(r,e,t=e)=>({...r,options:r.options.concat({name:t,value:!1})}),pushUndefined:(r,e)=>({...r,options:r.options.concat({name:e,value:void 0})}),pushStringValue:(r,e)=>{var t;let i={...r,options:[...r.options]},n=r.options[r.options.length-1];return n.value=((t=n.value)!==null&&t!==void 0?t:[]).concat([e]),i},setStringValue:(r,e)=>{let t={...r,options:[...r.options]},i=r.options[r.options.length-1];return i.value=e,t},inhibateOptions:r=>({...r,ignoreOptions:!0}),useHelp:(r,e,t)=>{let[,,i]=e.match(lt.HELP_REGEX);return typeof i<"u"?{...r,options:[{name:"-c",value:String(t)},{name:"-i",value:i}]}:{...r,options:[{name:"-c",value:String(t)}]}},setError:(r,e,t)=>e===lt.END_OF_INPUT?{...r,errorMessage:`${t}.`}:{...r,errorMessage:`${t} ("${e}").`},setOptionArityError:(r,e)=>{let t=r.options[r.options.length-1];return{...r,errorMessage:`Not enough arguments to option ${t.name}.`}}},Po=Symbol(),Ay=class{constructor(e,t){this.allOptionNames=[],this.arity={leading:[],trailing:[],extra:[],proxy:!1},this.options=[],this.paths=[],this.cliIndex=e,this.cliOpts=t}addPath(e){this.paths.push(e)}setArity({leading:e=this.arity.leading,trailing:t=this.arity.trailing,extra:i=this.arity.extra,proxy:n=this.arity.proxy}){Object.assign(this.arity,{leading:e,trailing:t,extra:i,proxy:n})}addPositional({name:e="arg",required:t=!0}={}){if(!t&&this.arity.extra===Po)throw new Error("Optional parameters cannot be declared when using .rest() or .proxy()");if(!t&&this.arity.trailing.length>0)throw new Error("Optional parameters cannot be declared after the required trailing positional arguments");!t&&this.arity.extra!==Po?this.arity.extra.push(e):this.arity.extra!==Po&&this.arity.extra.length===0?this.arity.leading.push(e):this.arity.trailing.push(e)}addRest({name:e="arg",required:t=0}={}){if(this.arity.extra===Po)throw new Error("Infinite lists cannot be declared multiple times in the same command");if(this.arity.trailing.length>0)throw new Error("Infinite lists cannot be declared after the required trailing positional arguments");for(let i=0;i1)throw new Error("The arity cannot be higher than 1 when the option only supports the --arg=value syntax");if(!Number.isInteger(i))throw new Error(`The arity must be an integer, got ${i}`);if(i<0)throw new Error(`The arity must be positive, got ${i}`);this.allOptionNames.push(...e),this.options.push({names:e,description:t,arity:i,hidden:n,required:s,allowBinding:o})}setContext(e){this.context=e}usage({detailed:e=!0,inlineOptions:t=!0}={}){let i=[this.cliOpts.binaryName],n=[];if(this.paths.length>0&&i.push(...this.paths[0]),e){for(let{names:o,arity:a,hidden:l,description:c,required:u}of this.options){if(l)continue;let g=[];for(let h=0;h`:`[${f}]`)}i.push(...this.arity.leading.map(o=>`<${o}>`)),this.arity.extra===Po?i.push("..."):i.push(...this.arity.extra.map(o=>`[${o}]`)),i.push(...this.arity.trailing.map(o=>`<${o}>`))}return{usage:i.join(" "),options:n}}compile(){if(typeof this.context>"u")throw new Error("Assertion failed: No context attached");let e=qv(),t=lt.NODE_INITIAL,i=this.usage().usage,n=this.options.filter(a=>a.required).map(a=>a.names);t=ss(e,Li()),xo(e,lt.NODE_INITIAL,lt.START_OF_INPUT,t,["setCandidateState",{candidateUsage:i,requiredOptions:n}]);let s=this.arity.proxy?"always":"isNotOptionLike",o=this.paths.length>0?this.paths:[[]];for(let a of o){let l=t;if(a.length>0){let f=ss(e,Li());Qc(e,l,f),this.registerOptions(e,f),l=f}for(let f=0;f0||!this.arity.proxy){let f=ss(e,Li());Ei(e,l,"isHelp",f,["useHelp",this.cliIndex]),xo(e,f,lt.END_OF_INPUT,lt.NODE_SUCCESS,["setSelectedIndex",lt.HELP_COMMAND_INDEX]),this.registerOptions(e,l)}this.arity.leading.length>0&&xo(e,l,lt.END_OF_INPUT,lt.NODE_ERRORED,["setError","Not enough positional arguments"]);let c=l;for(let f=0;f0||f+1!==this.arity.leading.length)&&xo(e,h,lt.END_OF_INPUT,lt.NODE_ERRORED,["setError","Not enough positional arguments"]),Ei(e,c,"isNotOptionLike",h,"pushPositional"),c=h}let u=c;if(this.arity.extra===Po||this.arity.extra.length>0){let f=ss(e,Li());if(Qc(e,c,f),this.arity.extra===Po){let h=ss(e,Li());this.arity.proxy||this.registerOptions(e,h),Ei(e,c,s,h,"pushExtraNoLimits"),Ei(e,h,s,h,"pushExtraNoLimits"),Qc(e,h,f)}else for(let h=0;h0&&xo(e,u,lt.END_OF_INPUT,lt.NODE_ERRORED,["setError","Not enough positional arguments"]);let g=u;for(let f=0;fo.length>s.length?o:s,"");if(i.arity===0)for(let s of i.names)Ei(e,t,["isOption",s,i.hidden||s!==n],t,"pushTrue"),s.startsWith("--")&&!s.startsWith("--no-")&&Ei(e,t,["isNegatedOption",s],t,["pushFalse",s]);else{let s=ss(e,Li());for(let o of i.names)Ei(e,t,["isOption",o,i.hidden||o!==n],s,"pushUndefined");for(let o=0;o=0&&eAme(i,n),suggest:(n,s)=>ame(i,n,s)}}};Ar.CliBuilder=Dd;Ar.CommandBuilder=Ay;Ar.NoLimits=Po;Ar.aggregateHelpStates=CG;Ar.cloneNode=EG;Ar.cloneTransition=sy;Ar.debug=Vi;Ar.debugMachine=hG;Ar.execute=xd;Ar.injectNode=ss;Ar.isTerminalNode=Wv;Ar.makeAnyOfMachine=gG;Ar.makeNode=Li;Ar.makeStateMachine=qv;Ar.reducers=oy;Ar.registerDynamic=Ei;Ar.registerShortcut=Qc;Ar.registerStatic=xo;Ar.runMachineInternal=Jv;Ar.selectBestState=dG;Ar.simplifyMachine=fG;Ar.suggest=IG;Ar.tests=Pd;Ar.trimSmallerBranches=pG});var yG=y(zv=>{"use strict";Object.defineProperty(zv,"__esModule",{value:!0});var lme=bc(),kd=class extends lme.Command{constructor(e){super(),this.contexts=e,this.commands=[]}static from(e,t){let i=new kd(t);i.path=e.path;for(let n of e.options)switch(n.name){case"-c":i.commands.push(Number(n.value));break;case"-i":i.index=Number(n.value);break}return i}async execute(){let e=this.commands;if(typeof this.index<"u"&&this.index>=0&&this.index1){this.context.stdout.write(`Multiple commands match your selection: -`),this.context.stdout.write(` -`);let t=0;for(let i of this.commands)this.context.stdout.write(this.cli.usage(this.contexts[i].commandClass,{prefix:`${t++}. `.padStart(5)}));this.context.stdout.write(` -`),this.context.stdout.write(`Run again with -h= to see the longer details of any of those commands. -`)}}};zv.HelpCommand=kd});var vG=y(Vv=>{"use strict";Object.defineProperty(Vv,"__esModule",{value:!0});var cme=ry(),wG=bc(),ume=J("tty"),gme=ly(),hn=jv(),fme=yG();function hme(r){return r&&typeof r=="object"&&"default"in r?r:{default:r}}var BG=hme(ume),bG=Symbol("clipanion/errorCommand");function pme(){return process.env.FORCE_COLOR==="0"?1:process.env.FORCE_COLOR==="1"||typeof process.stdout<"u"&&process.stdout.isTTY?8:1}var OA=class{constructor({binaryLabel:e,binaryName:t="...",binaryVersion:i,enableCapture:n=!1,enableColors:s}={}){this.registrations=new Map,this.builder=new gme.CliBuilder({binaryName:t}),this.binaryLabel=e,this.binaryName=t,this.binaryVersion=i,this.enableCapture=n,this.enableColors=s}static from(e,t={}){let i=new OA(t);for(let n of e)i.register(n);return i}register(e){var t;let i=new Map,n=new e;for(let l in n){let c=n[l];typeof c=="object"&&c!==null&&c[wG.Command.isOption]&&i.set(l,c)}let s=this.builder.command(),o=s.cliIndex,a=(t=e.paths)!==null&&t!==void 0?t:n.paths;if(typeof a<"u")for(let l of a)s.addPath(l);this.registrations.set(e,{specs:i,builder:s,index:o});for(let[l,{definition:c}]of i.entries())c(s,l);s.setContext({commandClass:e})}process(e){let{contexts:t,process:i}=this.builder.compile(),n=i(e);switch(n.selectedIndex){case cme.HELP_COMMAND_INDEX:return fme.HelpCommand.from(n,t);default:{let{commandClass:s}=t[n.selectedIndex],o=this.registrations.get(s);if(typeof o>"u")throw new Error("Assertion failed: Expected the command class to have been registered.");let a=new s;a.path=n.path;try{for(let[l,{transformer:c}]of o.specs.entries())a[l]=c(o.builder,l,n);return a}catch(l){throw l[bG]=a,l}}break}}async run(e,t){var i;let n,s={...OA.defaultContext,...t},o=(i=this.enableColors)!==null&&i!==void 0?i:s.colorDepth>1;if(!Array.isArray(e))n=e;else try{n=this.process(e)}catch(c){return s.stdout.write(this.error(c,{colored:o})),1}if(n.help)return s.stdout.write(this.usage(n,{colored:o,detailed:!0})),0;n.context=s,n.cli={binaryLabel:this.binaryLabel,binaryName:this.binaryName,binaryVersion:this.binaryVersion,enableCapture:this.enableCapture,enableColors:this.enableColors,definitions:()=>this.definitions(),error:(c,u)=>this.error(c,u),format:c=>this.format(c),process:c=>this.process(c),run:(c,u)=>this.run(c,{...s,...u}),usage:(c,u)=>this.usage(c,u)};let a=this.enableCapture?dme(s):SG,l;try{l=await a(()=>n.validateAndExecute().catch(c=>n.catch(c).then(()=>0)))}catch(c){return s.stdout.write(this.error(c,{colored:o,command:n})),1}return l}async runExit(e,t){process.exitCode=await this.run(e,t)}suggest(e,t){let{suggest:i}=this.builder.compile();return i(e,t)}definitions({colored:e=!1}={}){let t=[];for(let[i,{index:n}]of this.registrations){if(typeof i.usage>"u")continue;let{usage:s}=this.getUsageByIndex(n,{detailed:!1}),{usage:o,options:a}=this.getUsageByIndex(n,{detailed:!0,inlineOptions:!1}),l=typeof i.usage.category<"u"?hn.formatMarkdownish(i.usage.category,{format:this.format(e),paragraphs:!1}):void 0,c=typeof i.usage.description<"u"?hn.formatMarkdownish(i.usage.description,{format:this.format(e),paragraphs:!1}):void 0,u=typeof i.usage.details<"u"?hn.formatMarkdownish(i.usage.details,{format:this.format(e),paragraphs:!0}):void 0,g=typeof i.usage.examples<"u"?i.usage.examples.map(([f,h])=>[hn.formatMarkdownish(f,{format:this.format(e),paragraphs:!1}),h.replace(/\$0/g,this.binaryName)]):void 0;t.push({path:s,usage:o,category:l,description:c,details:u,examples:g,options:a})}return t}usage(e=null,{colored:t,detailed:i=!1,prefix:n="$ "}={}){var s;if(e===null){for(let l of this.registrations.keys()){let c=l.paths,u=typeof l.usage<"u";if(!c||c.length===0||c.length===1&&c[0].length===0||((s=c==null?void 0:c.some(h=>h.length===0))!==null&&s!==void 0?s:!1))if(e){e=null;break}else e=l;else if(u){e=null;continue}}e&&(i=!0)}let o=e!==null&&e instanceof wG.Command?e.constructor:e,a="";if(o)if(i){let{description:l="",details:c="",examples:u=[]}=o.usage||{};l!==""&&(a+=hn.formatMarkdownish(l,{format:this.format(t),paragraphs:!1}).replace(/^./,h=>h.toUpperCase()),a+=` -`),(c!==""||u.length>0)&&(a+=`${this.format(t).header("Usage")} -`,a+=` -`);let{usage:g,options:f}=this.getUsageByRegistration(o,{inlineOptions:!1});if(a+=`${this.format(t).bold(n)}${g} -`,f.length>0){a+=` -`,a+=`${hn.richFormat.header("Options")} -`;let h=f.reduce((p,C)=>Math.max(p,C.definition.length),0);a+=` -`;for(let{definition:p,description:C}of f)a+=` ${this.format(t).bold(p.padEnd(h))} ${hn.formatMarkdownish(C,{format:this.format(t),paragraphs:!1})}`}if(c!==""&&(a+=` -`,a+=`${this.format(t).header("Details")} -`,a+=` -`,a+=hn.formatMarkdownish(c,{format:this.format(t),paragraphs:!0})),u.length>0){a+=` -`,a+=`${this.format(t).header("Examples")} -`;for(let[h,p]of u)a+=` -`,a+=hn.formatMarkdownish(h,{format:this.format(t),paragraphs:!1}),a+=`${p.replace(/^/m,` ${this.format(t).bold(n)}`).replace(/\$0/g,this.binaryName)} -`}}else{let{usage:l}=this.getUsageByRegistration(o);a+=`${this.format(t).bold(n)}${l} -`}else{let l=new Map;for(let[f,{index:h}]of this.registrations.entries()){if(typeof f.usage>"u")continue;let p=typeof f.usage.category<"u"?hn.formatMarkdownish(f.usage.category,{format:this.format(t),paragraphs:!1}):null,C=l.get(p);typeof C>"u"&&l.set(p,C=[]);let{usage:w}=this.getUsageByIndex(h);C.push({commandClass:f,usage:w})}let c=Array.from(l.keys()).sort((f,h)=>f===null?-1:h===null?1:f.localeCompare(h,"en",{usage:"sort",caseFirst:"upper"})),u=typeof this.binaryLabel<"u",g=typeof this.binaryVersion<"u";u||g?(u&&g?a+=`${this.format(t).header(`${this.binaryLabel} - ${this.binaryVersion}`)} - -`:u?a+=`${this.format(t).header(`${this.binaryLabel}`)} -`:a+=`${this.format(t).header(`${this.binaryVersion}`)} -`,a+=` ${this.format(t).bold(n)}${this.binaryName} -`):a+=`${this.format(t).bold(n)}${this.binaryName} -`;for(let f of c){let h=l.get(f).slice().sort((C,w)=>C.usage.localeCompare(w.usage,"en",{usage:"sort",caseFirst:"upper"})),p=f!==null?f.trim():"General commands";a+=` -`,a+=`${this.format(t).header(`${p}`)} -`;for(let{commandClass:C,usage:w}of h){let B=C.usage.description||"undocumented";a+=` -`,a+=` ${this.format(t).bold(w)} -`,a+=` ${hn.formatMarkdownish(B,{format:this.format(t),paragraphs:!1})}`}}a+=` -`,a+=hn.formatMarkdownish("You can also print more details about any of these commands by calling them with the `-h,--help` flag right after the command name.",{format:this.format(t),paragraphs:!0})}return a}error(e,t){var i,{colored:n,command:s=(i=e[bG])!==null&&i!==void 0?i:null}=t===void 0?{}:t;e instanceof Error||(e=new Error(`Execution failed with a non-error rejection (rejected value: ${JSON.stringify(e)})`));let o="",a=e.name.replace(/([a-z])([A-Z])/g,"$1 $2");a==="Error"&&(a="Internal Error"),o+=`${this.format(n).error(a)}: ${e.message} -`;let l=e.clipanion;return typeof l<"u"?l.type==="usage"&&(o+=` -`,o+=this.usage(s)):e.stack&&(o+=`${e.stack.replace(/^.*\n/,"")} -`),o}format(e){var t;return((t=e!=null?e:this.enableColors)!==null&&t!==void 0?t:OA.defaultContext.colorDepth>1)?hn.richFormat:hn.textFormat}getUsageByRegistration(e,t){let i=this.registrations.get(e);if(typeof i>"u")throw new Error("Assertion failed: Unregistered command");return this.getUsageByIndex(i.index,t)}getUsageByIndex(e,t){return this.builder.getBuilderByIndex(e).usage(t)}};OA.defaultContext={stdin:process.stdin,stdout:process.stdout,stderr:process.stderr,colorDepth:"getColorDepth"in BG.default.WriteStream.prototype?BG.default.WriteStream.prototype.getColorDepth():pme()};var QG;function dme(r){let e=QG;if(typeof e>"u"){if(r.stdout===process.stdout&&r.stderr===process.stderr)return SG;let{AsyncLocalStorage:t}=J("async_hooks");e=QG=new t;let i=process.stdout._write;process.stdout._write=function(s,o,a){let l=e.getStore();return typeof l>"u"?i.call(this,s,o,a):l.stdout.write(s,o,a)};let n=process.stderr._write;process.stderr._write=function(s,o,a){let l=e.getStore();return typeof l>"u"?n.call(this,s,o,a):l.stderr.write(s,o,a)}}return t=>e.run(r,t)}function SG(r){return r()}Vv.Cli=OA});var xG=y(Xv=>{"use strict";Object.defineProperty(Xv,"__esModule",{value:!0});var Cme=bc(),cy=class extends Cme.Command{async execute(){this.context.stdout.write(`${JSON.stringify(this.cli.definitions(),null,2)} -`)}};cy.paths=[["--clipanion=definitions"]];Xv.DefinitionsCommand=cy});var PG=y(_v=>{"use strict";Object.defineProperty(_v,"__esModule",{value:!0});var mme=bc(),uy=class extends mme.Command{async execute(){this.context.stdout.write(this.cli.usage())}};uy.paths=[["-h"],["--help"]];_v.HelpCommand=uy});var DG=y(Zv=>{"use strict";Object.defineProperty(Zv,"__esModule",{value:!0});var Eme=bc(),gy=class extends Eme.Command{async execute(){var e;this.context.stdout.write(`${(e=this.cli.binaryVersion)!==null&&e!==void 0?e:""} -`)}};gy.paths=[["-v"],["--version"]];Zv.VersionCommand=gy});var kG=y(Rd=>{"use strict";Object.defineProperty(Rd,"__esModule",{value:!0});var Ime=xG(),yme=PG(),wme=DG();Rd.DefinitionsCommand=Ime.DefinitionsCommand;Rd.HelpCommand=yme.HelpCommand;Rd.VersionCommand=wme.VersionCommand});var FG=y($v=>{"use strict";Object.defineProperty($v,"__esModule",{value:!0});var RG=va();function Bme(r,e,t){let[i,n]=RG.rerouteArguments(e,t!=null?t:{}),{arity:s=1}=n,o=r.split(","),a=new Set(o);return RG.makeCommandOption({definition(l){l.addOption({names:o,arity:s,hidden:n==null?void 0:n.hidden,description:n==null?void 0:n.description,required:n.required})},transformer(l,c,u){let g=typeof i<"u"?[...i]:void 0;for(let{name:f,value:h}of u.options)!a.has(f)||(g=g!=null?g:[],g.push(h));return g}})}$v.Array=Bme});var TG=y(ex=>{"use strict";Object.defineProperty(ex,"__esModule",{value:!0});var NG=va();function bme(r,e,t){let[i,n]=NG.rerouteArguments(e,t!=null?t:{}),s=r.split(","),o=new Set(s);return NG.makeCommandOption({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u=f);return u}})}ex.Boolean=bme});var OG=y(tx=>{"use strict";Object.defineProperty(tx,"__esModule",{value:!0});var LG=va();function Qme(r,e,t){let[i,n]=LG.rerouteArguments(e,t!=null?t:{}),s=r.split(","),o=new Set(s);return LG.makeCommandOption({definition(a){a.addOption({names:s,allowBinding:!1,arity:0,hidden:n.hidden,description:n.description,required:n.required})},transformer(a,l,c){let u=i;for(let{name:g,value:f}of c.options)!o.has(g)||(u!=null||(u=0),f?u+=1:u=0);return u}})}tx.Counter=Qme});var MG=y(rx=>{"use strict";Object.defineProperty(rx,"__esModule",{value:!0});var Sme=va();function vme(r={}){return Sme.makeCommandOption({definition(e,t){var i;e.addProxy({name:(i=r.name)!==null&&i!==void 0?i:t,required:r.required})},transformer(e,t,i){return i.positionals.map(({value:n})=>n)}})}rx.Proxy=vme});var UG=y(ix=>{"use strict";Object.defineProperty(ix,"__esModule",{value:!0});var xme=va(),Pme=ly();function Dme(r={}){return xme.makeCommandOption({definition(e,t){var i;e.addRest({name:(i=r.name)!==null&&i!==void 0?i:t,required:r.required})},transformer(e,t,i){let n=o=>{let a=i.positionals[o];return a.extra===Pme.NoLimits||a.extra===!1&&oo)}})}ix.Rest=Dme});var KG=y(nx=>{"use strict";Object.defineProperty(nx,"__esModule",{value:!0});var Fd=va(),kme=ly();function Rme(r,e,t){let[i,n]=Fd.rerouteArguments(e,t!=null?t:{}),{arity:s=1}=n,o=r.split(","),a=new Set(o);return Fd.makeCommandOption({definition(l){l.addOption({names:o,arity:n.tolerateBoolean?0:s,hidden:n.hidden,description:n.description,required:n.required})},transformer(l,c,u){let g,f=i;for(let{name:h,value:p}of u.options)!a.has(h)||(g=h,f=p);return typeof f=="string"?Fd.applyValidator(g!=null?g:c,f,n.validator):f}})}function Fme(r={}){let{required:e=!0}=r;return Fd.makeCommandOption({definition(t,i){var n;t.addPositional({name:(n=r.name)!==null&&n!==void 0?n:i,required:r.required})},transformer(t,i,n){var s;for(let o=0;o{"use strict";Object.defineProperty(pn,"__esModule",{value:!0});var lf=va(),Tme=FG(),Lme=TG(),Ome=OG(),Mme=MG(),Ume=UG(),Kme=KG();pn.applyValidator=lf.applyValidator;pn.cleanValidationError=lf.cleanValidationError;pn.formatError=lf.formatError;pn.isOptionSymbol=lf.isOptionSymbol;pn.makeCommandOption=lf.makeCommandOption;pn.rerouteArguments=lf.rerouteArguments;pn.Array=Tme.Array;pn.Boolean=Lme.Boolean;pn.Counter=Ome.Counter;pn.Proxy=Mme.Proxy;pn.Rest=Ume.Rest;pn.String=Kme.String});var Xe=y(MA=>{"use strict";Object.defineProperty(MA,"__esModule",{value:!0});var Hme=iy(),Gme=bc(),Yme=jv(),jme=vG(),qme=kG(),Jme=HG();MA.UsageError=Hme.UsageError;MA.Command=Gme.Command;MA.formatMarkdownish=Yme.formatMarkdownish;MA.Cli=jme.Cli;MA.Builtins=qme;MA.Option=Jme});var YG=y((J$e,GG)=>{"use strict";GG.exports=(r,...e)=>new Promise(t=>{t(r(...e))})});var cf=y((W$e,sx)=>{"use strict";var Wme=YG(),jG=r=>{if(r<1)throw new TypeError("Expected `concurrency` to be a number from 1 and up");let e=[],t=0,i=()=>{t--,e.length>0&&e.shift()()},n=(a,l,...c)=>{t++;let u=Wme(a,...c);l(u),u.then(i,i)},s=(a,l,...c)=>{tnew Promise(c=>s(a,c,...l));return Object.defineProperties(o,{activeCount:{get:()=>t},pendingCount:{get:()=>e.length}}),o};sx.exports=jG;sx.exports.default=jG});var Nd=y((V$e,qG)=>{var zme="2.0.0",Vme=Number.MAX_SAFE_INTEGER||9007199254740991,Xme=16;qG.exports={SEMVER_SPEC_VERSION:zme,MAX_LENGTH:256,MAX_SAFE_INTEGER:Vme,MAX_SAFE_COMPONENT_LENGTH:Xme}});var Td=y((X$e,JG)=>{var _me=typeof process=="object"&&process.env&&process.env.NODE_DEBUG&&/\bsemver\b/i.test(process.env.NODE_DEBUG)?(...r)=>console.error("SEMVER",...r):()=>{};JG.exports=_me});var Sc=y((KA,WG)=>{var{MAX_SAFE_COMPONENT_LENGTH:ox}=Nd(),Zme=Td();KA=WG.exports={};var $me=KA.re=[],_e=KA.src=[],Ze=KA.t={},eEe=0,St=(r,e,t)=>{let i=eEe++;Zme(i,e),Ze[r]=i,_e[i]=e,$me[i]=new RegExp(e,t?"g":void 0)};St("NUMERICIDENTIFIER","0|[1-9]\\d*");St("NUMERICIDENTIFIERLOOSE","[0-9]+");St("NONNUMERICIDENTIFIER","\\d*[a-zA-Z-][a-zA-Z0-9-]*");St("MAINVERSION",`(${_e[Ze.NUMERICIDENTIFIER]})\\.(${_e[Ze.NUMERICIDENTIFIER]})\\.(${_e[Ze.NUMERICIDENTIFIER]})`);St("MAINVERSIONLOOSE",`(${_e[Ze.NUMERICIDENTIFIERLOOSE]})\\.(${_e[Ze.NUMERICIDENTIFIERLOOSE]})\\.(${_e[Ze.NUMERICIDENTIFIERLOOSE]})`);St("PRERELEASEIDENTIFIER",`(?:${_e[Ze.NUMERICIDENTIFIER]}|${_e[Ze.NONNUMERICIDENTIFIER]})`);St("PRERELEASEIDENTIFIERLOOSE",`(?:${_e[Ze.NUMERICIDENTIFIERLOOSE]}|${_e[Ze.NONNUMERICIDENTIFIER]})`);St("PRERELEASE",`(?:-(${_e[Ze.PRERELEASEIDENTIFIER]}(?:\\.${_e[Ze.PRERELEASEIDENTIFIER]})*))`);St("PRERELEASELOOSE",`(?:-?(${_e[Ze.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${_e[Ze.PRERELEASEIDENTIFIERLOOSE]})*))`);St("BUILDIDENTIFIER","[0-9A-Za-z-]+");St("BUILD",`(?:\\+(${_e[Ze.BUILDIDENTIFIER]}(?:\\.${_e[Ze.BUILDIDENTIFIER]})*))`);St("FULLPLAIN",`v?${_e[Ze.MAINVERSION]}${_e[Ze.PRERELEASE]}?${_e[Ze.BUILD]}?`);St("FULL",`^${_e[Ze.FULLPLAIN]}$`);St("LOOSEPLAIN",`[v=\\s]*${_e[Ze.MAINVERSIONLOOSE]}${_e[Ze.PRERELEASELOOSE]}?${_e[Ze.BUILD]}?`);St("LOOSE",`^${_e[Ze.LOOSEPLAIN]}$`);St("GTLT","((?:<|>)?=?)");St("XRANGEIDENTIFIERLOOSE",`${_e[Ze.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`);St("XRANGEIDENTIFIER",`${_e[Ze.NUMERICIDENTIFIER]}|x|X|\\*`);St("XRANGEPLAIN",`[v=\\s]*(${_e[Ze.XRANGEIDENTIFIER]})(?:\\.(${_e[Ze.XRANGEIDENTIFIER]})(?:\\.(${_e[Ze.XRANGEIDENTIFIER]})(?:${_e[Ze.PRERELEASE]})?${_e[Ze.BUILD]}?)?)?`);St("XRANGEPLAINLOOSE",`[v=\\s]*(${_e[Ze.XRANGEIDENTIFIERLOOSE]})(?:\\.(${_e[Ze.XRANGEIDENTIFIERLOOSE]})(?:\\.(${_e[Ze.XRANGEIDENTIFIERLOOSE]})(?:${_e[Ze.PRERELEASELOOSE]})?${_e[Ze.BUILD]}?)?)?`);St("XRANGE",`^${_e[Ze.GTLT]}\\s*${_e[Ze.XRANGEPLAIN]}$`);St("XRANGELOOSE",`^${_e[Ze.GTLT]}\\s*${_e[Ze.XRANGEPLAINLOOSE]}$`);St("COERCE",`(^|[^\\d])(\\d{1,${ox}})(?:\\.(\\d{1,${ox}}))?(?:\\.(\\d{1,${ox}}))?(?:$|[^\\d])`);St("COERCERTL",_e[Ze.COERCE],!0);St("LONETILDE","(?:~>?)");St("TILDETRIM",`(\\s*)${_e[Ze.LONETILDE]}\\s+`,!0);KA.tildeTrimReplace="$1~";St("TILDE",`^${_e[Ze.LONETILDE]}${_e[Ze.XRANGEPLAIN]}$`);St("TILDELOOSE",`^${_e[Ze.LONETILDE]}${_e[Ze.XRANGEPLAINLOOSE]}$`);St("LONECARET","(?:\\^)");St("CARETTRIM",`(\\s*)${_e[Ze.LONECARET]}\\s+`,!0);KA.caretTrimReplace="$1^";St("CARET",`^${_e[Ze.LONECARET]}${_e[Ze.XRANGEPLAIN]}$`);St("CARETLOOSE",`^${_e[Ze.LONECARET]}${_e[Ze.XRANGEPLAINLOOSE]}$`);St("COMPARATORLOOSE",`^${_e[Ze.GTLT]}\\s*(${_e[Ze.LOOSEPLAIN]})$|^$`);St("COMPARATOR",`^${_e[Ze.GTLT]}\\s*(${_e[Ze.FULLPLAIN]})$|^$`);St("COMPARATORTRIM",`(\\s*)${_e[Ze.GTLT]}\\s*(${_e[Ze.LOOSEPLAIN]}|${_e[Ze.XRANGEPLAIN]})`,!0);KA.comparatorTrimReplace="$1$2$3";St("HYPHENRANGE",`^\\s*(${_e[Ze.XRANGEPLAIN]})\\s+-\\s+(${_e[Ze.XRANGEPLAIN]})\\s*$`);St("HYPHENRANGELOOSE",`^\\s*(${_e[Ze.XRANGEPLAINLOOSE]})\\s+-\\s+(${_e[Ze.XRANGEPLAINLOOSE]})\\s*$`);St("STAR","(<|>)?=?\\s*\\*");St("GTE0","^\\s*>=\\s*0.0.0\\s*$");St("GTE0PRE","^\\s*>=\\s*0.0.0-0\\s*$")});var Ld=y((_$e,zG)=>{var tEe=["includePrerelease","loose","rtl"],rEe=r=>r?typeof r!="object"?{loose:!0}:tEe.filter(e=>r[e]).reduce((e,t)=>(e[t]=!0,e),{}):{};zG.exports=rEe});var hy=y((Z$e,_G)=>{var VG=/^[0-9]+$/,XG=(r,e)=>{let t=VG.test(r),i=VG.test(e);return t&&i&&(r=+r,e=+e),r===e?0:t&&!i?-1:i&&!t?1:rXG(e,r);_G.exports={compareIdentifiers:XG,rcompareIdentifiers:iEe}});var Oi=y(($$e,tY)=>{var py=Td(),{MAX_LENGTH:ZG,MAX_SAFE_INTEGER:dy}=Nd(),{re:$G,t:eY}=Sc(),nEe=Ld(),{compareIdentifiers:Od}=hy(),Kn=class{constructor(e,t){if(t=nEe(t),e instanceof Kn){if(e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease)return e;e=e.version}else if(typeof e!="string")throw new TypeError(`Invalid Version: ${e}`);if(e.length>ZG)throw new TypeError(`version is longer than ${ZG} characters`);py("SemVer",e,t),this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease;let i=e.trim().match(t.loose?$G[eY.LOOSE]:$G[eY.FULL]);if(!i)throw new TypeError(`Invalid Version: ${e}`);if(this.raw=e,this.major=+i[1],this.minor=+i[2],this.patch=+i[3],this.major>dy||this.major<0)throw new TypeError("Invalid major version");if(this.minor>dy||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>dy||this.patch<0)throw new TypeError("Invalid patch version");i[4]?this.prerelease=i[4].split(".").map(n=>{if(/^[0-9]+$/.test(n)){let s=+n;if(s>=0&&s=0;)typeof this.prerelease[i]=="number"&&(this.prerelease[i]++,i=-2);i===-1&&this.prerelease.push(0)}t&&(this.prerelease[0]===t?isNaN(this.prerelease[1])&&(this.prerelease=[t,0]):this.prerelease=[t,0]);break;default:throw new Error(`invalid increment argument: ${e}`)}return this.format(),this.raw=this.version,this}};tY.exports=Kn});var vc=y((eet,sY)=>{var{MAX_LENGTH:sEe}=Nd(),{re:rY,t:iY}=Sc(),nY=Oi(),oEe=Ld(),aEe=(r,e)=>{if(e=oEe(e),r instanceof nY)return r;if(typeof r!="string"||r.length>sEe||!(e.loose?rY[iY.LOOSE]:rY[iY.FULL]).test(r))return null;try{return new nY(r,e)}catch{return null}};sY.exports=aEe});var aY=y((tet,oY)=>{var AEe=vc(),lEe=(r,e)=>{let t=AEe(r,e);return t?t.version:null};oY.exports=lEe});var lY=y((ret,AY)=>{var cEe=vc(),uEe=(r,e)=>{let t=cEe(r.trim().replace(/^[=v]+/,""),e);return t?t.version:null};AY.exports=uEe});var uY=y((iet,cY)=>{var gEe=Oi(),fEe=(r,e,t,i)=>{typeof t=="string"&&(i=t,t=void 0);try{return new gEe(r,t).inc(e,i).version}catch{return null}};cY.exports=fEe});var os=y((net,fY)=>{var gY=Oi(),hEe=(r,e,t)=>new gY(r,t).compare(new gY(e,t));fY.exports=hEe});var Cy=y((set,hY)=>{var pEe=os(),dEe=(r,e,t)=>pEe(r,e,t)===0;hY.exports=dEe});var CY=y((oet,dY)=>{var pY=vc(),CEe=Cy(),mEe=(r,e)=>{if(CEe(r,e))return null;{let t=pY(r),i=pY(e),n=t.prerelease.length||i.prerelease.length,s=n?"pre":"",o=n?"prerelease":"";for(let a in t)if((a==="major"||a==="minor"||a==="patch")&&t[a]!==i[a])return s+a;return o}};dY.exports=mEe});var EY=y((aet,mY)=>{var EEe=Oi(),IEe=(r,e)=>new EEe(r,e).major;mY.exports=IEe});var yY=y((Aet,IY)=>{var yEe=Oi(),wEe=(r,e)=>new yEe(r,e).minor;IY.exports=wEe});var BY=y((cet,wY)=>{var BEe=Oi(),bEe=(r,e)=>new BEe(r,e).patch;wY.exports=bEe});var QY=y((uet,bY)=>{var QEe=vc(),SEe=(r,e)=>{let t=QEe(r,e);return t&&t.prerelease.length?t.prerelease:null};bY.exports=SEe});var vY=y((get,SY)=>{var vEe=os(),xEe=(r,e,t)=>vEe(e,r,t);SY.exports=xEe});var PY=y((fet,xY)=>{var PEe=os(),DEe=(r,e)=>PEe(r,e,!0);xY.exports=DEe});var my=y((het,kY)=>{var DY=Oi(),kEe=(r,e,t)=>{let i=new DY(r,t),n=new DY(e,t);return i.compare(n)||i.compareBuild(n)};kY.exports=kEe});var FY=y((pet,RY)=>{var REe=my(),FEe=(r,e)=>r.sort((t,i)=>REe(t,i,e));RY.exports=FEe});var TY=y((det,NY)=>{var NEe=my(),TEe=(r,e)=>r.sort((t,i)=>NEe(i,t,e));NY.exports=TEe});var Md=y((Cet,LY)=>{var LEe=os(),OEe=(r,e,t)=>LEe(r,e,t)>0;LY.exports=OEe});var Ey=y((met,OY)=>{var MEe=os(),UEe=(r,e,t)=>MEe(r,e,t)<0;OY.exports=UEe});var ax=y((Eet,MY)=>{var KEe=os(),HEe=(r,e,t)=>KEe(r,e,t)!==0;MY.exports=HEe});var Iy=y((Iet,UY)=>{var GEe=os(),YEe=(r,e,t)=>GEe(r,e,t)>=0;UY.exports=YEe});var yy=y((yet,KY)=>{var jEe=os(),qEe=(r,e,t)=>jEe(r,e,t)<=0;KY.exports=qEe});var Ax=y((wet,HY)=>{var JEe=Cy(),WEe=ax(),zEe=Md(),VEe=Iy(),XEe=Ey(),_Ee=yy(),ZEe=(r,e,t,i)=>{switch(e){case"===":return typeof r=="object"&&(r=r.version),typeof t=="object"&&(t=t.version),r===t;case"!==":return typeof r=="object"&&(r=r.version),typeof t=="object"&&(t=t.version),r!==t;case"":case"=":case"==":return JEe(r,t,i);case"!=":return WEe(r,t,i);case">":return zEe(r,t,i);case">=":return VEe(r,t,i);case"<":return XEe(r,t,i);case"<=":return _Ee(r,t,i);default:throw new TypeError(`Invalid operator: ${e}`)}};HY.exports=ZEe});var YY=y((Bet,GY)=>{var $Ee=Oi(),eIe=vc(),{re:wy,t:By}=Sc(),tIe=(r,e)=>{if(r instanceof $Ee)return r;if(typeof r=="number"&&(r=String(r)),typeof r!="string")return null;e=e||{};let t=null;if(!e.rtl)t=r.match(wy[By.COERCE]);else{let i;for(;(i=wy[By.COERCERTL].exec(r))&&(!t||t.index+t[0].length!==r.length);)(!t||i.index+i[0].length!==t.index+t[0].length)&&(t=i),wy[By.COERCERTL].lastIndex=i.index+i[1].length+i[2].length;wy[By.COERCERTL].lastIndex=-1}return t===null?null:eIe(`${t[2]}.${t[3]||"0"}.${t[4]||"0"}`,e)};GY.exports=tIe});var qY=y((bet,jY)=>{"use strict";jY.exports=function(r){r.prototype[Symbol.iterator]=function*(){for(let e=this.head;e;e=e.next)yield e.value}}});var Ud=y((Qet,JY)=>{"use strict";JY.exports=Ht;Ht.Node=xc;Ht.create=Ht;function Ht(r){var e=this;if(e instanceof Ht||(e=new Ht),e.tail=null,e.head=null,e.length=0,r&&typeof r.forEach=="function")r.forEach(function(n){e.push(n)});else if(arguments.length>0)for(var t=0,i=arguments.length;t1)t=e;else if(this.head)i=this.head.next,t=this.head.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=0;i!==null;n++)t=r(t,i.value,n),i=i.next;return t};Ht.prototype.reduceReverse=function(r,e){var t,i=this.tail;if(arguments.length>1)t=e;else if(this.tail)i=this.tail.prev,t=this.tail.value;else throw new TypeError("Reduce of empty list with no initial value");for(var n=this.length-1;i!==null;n--)t=r(t,i.value,n),i=i.prev;return t};Ht.prototype.toArray=function(){for(var r=new Array(this.length),e=0,t=this.head;t!==null;e++)r[e]=t.value,t=t.next;return r};Ht.prototype.toArrayReverse=function(){for(var r=new Array(this.length),e=0,t=this.tail;t!==null;e++)r[e]=t.value,t=t.prev;return r};Ht.prototype.slice=function(r,e){e=e||this.length,e<0&&(e+=this.length),r=r||0,r<0&&(r+=this.length);var t=new Ht;if(ethis.length&&(e=this.length);for(var i=0,n=this.head;n!==null&&ithis.length&&(e=this.length);for(var i=this.length,n=this.tail;n!==null&&i>e;i--)n=n.prev;for(;n!==null&&i>r;i--,n=n.prev)t.push(n.value);return t};Ht.prototype.splice=function(r,e,...t){r>this.length&&(r=this.length-1),r<0&&(r=this.length+r);for(var i=0,n=this.head;n!==null&&i{"use strict";var sIe=Ud(),Pc=Symbol("max"),Pa=Symbol("length"),uf=Symbol("lengthCalculator"),Hd=Symbol("allowStale"),Dc=Symbol("maxAge"),xa=Symbol("dispose"),WY=Symbol("noDisposeOnSet"),Ii=Symbol("lruList"),zs=Symbol("cache"),VY=Symbol("updateAgeOnGet"),lx=()=>1,ux=class{constructor(e){if(typeof e=="number"&&(e={max:e}),e||(e={}),e.max&&(typeof e.max!="number"||e.max<0))throw new TypeError("max must be a non-negative number");let t=this[Pc]=e.max||1/0,i=e.length||lx;if(this[uf]=typeof i!="function"?lx:i,this[Hd]=e.stale||!1,e.maxAge&&typeof e.maxAge!="number")throw new TypeError("maxAge must be a number");this[Dc]=e.maxAge||0,this[xa]=e.dispose,this[WY]=e.noDisposeOnSet||!1,this[VY]=e.updateAgeOnGet||!1,this.reset()}set max(e){if(typeof e!="number"||e<0)throw new TypeError("max must be a non-negative number");this[Pc]=e||1/0,Kd(this)}get max(){return this[Pc]}set allowStale(e){this[Hd]=!!e}get allowStale(){return this[Hd]}set maxAge(e){if(typeof e!="number")throw new TypeError("maxAge must be a non-negative number");this[Dc]=e,Kd(this)}get maxAge(){return this[Dc]}set lengthCalculator(e){typeof e!="function"&&(e=lx),e!==this[uf]&&(this[uf]=e,this[Pa]=0,this[Ii].forEach(t=>{t.length=this[uf](t.value,t.key),this[Pa]+=t.length})),Kd(this)}get lengthCalculator(){return this[uf]}get length(){return this[Pa]}get itemCount(){return this[Ii].length}rforEach(e,t){t=t||this;for(let i=this[Ii].tail;i!==null;){let n=i.prev;zY(this,e,i,t),i=n}}forEach(e,t){t=t||this;for(let i=this[Ii].head;i!==null;){let n=i.next;zY(this,e,i,t),i=n}}keys(){return this[Ii].toArray().map(e=>e.key)}values(){return this[Ii].toArray().map(e=>e.value)}reset(){this[xa]&&this[Ii]&&this[Ii].length&&this[Ii].forEach(e=>this[xa](e.key,e.value)),this[zs]=new Map,this[Ii]=new sIe,this[Pa]=0}dump(){return this[Ii].map(e=>by(this,e)?!1:{k:e.key,v:e.value,e:e.now+(e.maxAge||0)}).toArray().filter(e=>e)}dumpLru(){return this[Ii]}set(e,t,i){if(i=i||this[Dc],i&&typeof i!="number")throw new TypeError("maxAge must be a number");let n=i?Date.now():0,s=this[uf](t,e);if(this[zs].has(e)){if(s>this[Pc])return gf(this,this[zs].get(e)),!1;let l=this[zs].get(e).value;return this[xa]&&(this[WY]||this[xa](e,l.value)),l.now=n,l.maxAge=i,l.value=t,this[Pa]+=s-l.length,l.length=s,this.get(e),Kd(this),!0}let o=new gx(e,t,s,n,i);return o.length>this[Pc]?(this[xa]&&this[xa](e,t),!1):(this[Pa]+=o.length,this[Ii].unshift(o),this[zs].set(e,this[Ii].head),Kd(this),!0)}has(e){if(!this[zs].has(e))return!1;let t=this[zs].get(e).value;return!by(this,t)}get(e){return cx(this,e,!0)}peek(e){return cx(this,e,!1)}pop(){let e=this[Ii].tail;return e?(gf(this,e),e.value):null}del(e){gf(this,this[zs].get(e))}load(e){this.reset();let t=Date.now();for(let i=e.length-1;i>=0;i--){let n=e[i],s=n.e||0;if(s===0)this.set(n.k,n.v);else{let o=s-t;o>0&&this.set(n.k,n.v,o)}}}prune(){this[zs].forEach((e,t)=>cx(this,t,!1))}},cx=(r,e,t)=>{let i=r[zs].get(e);if(i){let n=i.value;if(by(r,n)){if(gf(r,i),!r[Hd])return}else t&&(r[VY]&&(i.value.now=Date.now()),r[Ii].unshiftNode(i));return n.value}},by=(r,e)=>{if(!e||!e.maxAge&&!r[Dc])return!1;let t=Date.now()-e.now;return e.maxAge?t>e.maxAge:r[Dc]&&t>r[Dc]},Kd=r=>{if(r[Pa]>r[Pc])for(let e=r[Ii].tail;r[Pa]>r[Pc]&&e!==null;){let t=e.prev;gf(r,e),e=t}},gf=(r,e)=>{if(e){let t=e.value;r[xa]&&r[xa](t.key,t.value),r[Pa]-=t.length,r[zs].delete(t.key),r[Ii].removeNode(e)}},gx=class{constructor(e,t,i,n,s){this.key=e,this.value=t,this.length=i,this.now=n,this.maxAge=s||0}},zY=(r,e,t,i)=>{let n=t.value;by(r,n)&&(gf(r,t),r[Hd]||(n=void 0)),n&&e.call(i,n.value,n.key,r)};XY.exports=ux});var as=y((xet,tj)=>{var kc=class{constructor(e,t){if(t=aIe(t),e instanceof kc)return e.loose===!!t.loose&&e.includePrerelease===!!t.includePrerelease?e:new kc(e.raw,t);if(e instanceof fx)return this.raw=e.value,this.set=[[e]],this.format(),this;if(this.options=t,this.loose=!!t.loose,this.includePrerelease=!!t.includePrerelease,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map(i=>this.parseRange(i.trim())).filter(i=>i.length),!this.set.length)throw new TypeError(`Invalid SemVer Range: ${e}`);if(this.set.length>1){let i=this.set[0];if(this.set=this.set.filter(n=>!$Y(n[0])),this.set.length===0)this.set=[i];else if(this.set.length>1){for(let n of this.set)if(n.length===1&&gIe(n[0])){this.set=[n];break}}}this.format()}format(){return this.range=this.set.map(e=>e.join(" ").trim()).join("||").trim(),this.range}toString(){return this.range}parseRange(e){e=e.trim();let i=`parseRange:${Object.keys(this.options).join(",")}:${e}`,n=ZY.get(i);if(n)return n;let s=this.options.loose,o=s?Mi[Qi.HYPHENRANGELOOSE]:Mi[Qi.HYPHENRANGE];e=e.replace(o,wIe(this.options.includePrerelease)),jr("hyphen replace",e),e=e.replace(Mi[Qi.COMPARATORTRIM],lIe),jr("comparator trim",e,Mi[Qi.COMPARATORTRIM]),e=e.replace(Mi[Qi.TILDETRIM],cIe),e=e.replace(Mi[Qi.CARETTRIM],uIe),e=e.split(/\s+/).join(" ");let a=s?Mi[Qi.COMPARATORLOOSE]:Mi[Qi.COMPARATOR],l=e.split(" ").map(f=>fIe(f,this.options)).join(" ").split(/\s+/).map(f=>yIe(f,this.options)).filter(this.options.loose?f=>!!f.match(a):()=>!0).map(f=>new fx(f,this.options)),c=l.length,u=new Map;for(let f of l){if($Y(f))return[f];u.set(f.value,f)}u.size>1&&u.has("")&&u.delete("");let g=[...u.values()];return ZY.set(i,g),g}intersects(e,t){if(!(e instanceof kc))throw new TypeError("a Range is required");return this.set.some(i=>ej(i,t)&&e.set.some(n=>ej(n,t)&&i.every(s=>n.every(o=>s.intersects(o,t)))))}test(e){if(!e)return!1;if(typeof e=="string")try{e=new AIe(e,this.options)}catch{return!1}for(let t=0;tr.value==="<0.0.0-0",gIe=r=>r.value==="",ej=(r,e)=>{let t=!0,i=r.slice(),n=i.pop();for(;t&&i.length;)t=i.every(s=>n.intersects(s,e)),n=i.pop();return t},fIe=(r,e)=>(jr("comp",r,e),r=dIe(r,e),jr("caret",r),r=hIe(r,e),jr("tildes",r),r=mIe(r,e),jr("xrange",r),r=IIe(r,e),jr("stars",r),r),Xi=r=>!r||r.toLowerCase()==="x"||r==="*",hIe=(r,e)=>r.trim().split(/\s+/).map(t=>pIe(t,e)).join(" "),pIe=(r,e)=>{let t=e.loose?Mi[Qi.TILDELOOSE]:Mi[Qi.TILDE];return r.replace(t,(i,n,s,o,a)=>{jr("tilde",r,i,n,s,o,a);let l;return Xi(n)?l="":Xi(s)?l=`>=${n}.0.0 <${+n+1}.0.0-0`:Xi(o)?l=`>=${n}.${s}.0 <${n}.${+s+1}.0-0`:a?(jr("replaceTilde pr",a),l=`>=${n}.${s}.${o}-${a} <${n}.${+s+1}.0-0`):l=`>=${n}.${s}.${o} <${n}.${+s+1}.0-0`,jr("tilde return",l),l})},dIe=(r,e)=>r.trim().split(/\s+/).map(t=>CIe(t,e)).join(" "),CIe=(r,e)=>{jr("caret",r,e);let t=e.loose?Mi[Qi.CARETLOOSE]:Mi[Qi.CARET],i=e.includePrerelease?"-0":"";return r.replace(t,(n,s,o,a,l)=>{jr("caret",r,n,s,o,a,l);let c;return Xi(s)?c="":Xi(o)?c=`>=${s}.0.0${i} <${+s+1}.0.0-0`:Xi(a)?s==="0"?c=`>=${s}.${o}.0${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.0${i} <${+s+1}.0.0-0`:l?(jr("replaceCaret pr",l),s==="0"?o==="0"?c=`>=${s}.${o}.${a}-${l} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}-${l} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a}-${l} <${+s+1}.0.0-0`):(jr("no pr"),s==="0"?o==="0"?c=`>=${s}.${o}.${a}${i} <${s}.${o}.${+a+1}-0`:c=`>=${s}.${o}.${a}${i} <${s}.${+o+1}.0-0`:c=`>=${s}.${o}.${a} <${+s+1}.0.0-0`),jr("caret return",c),c})},mIe=(r,e)=>(jr("replaceXRanges",r,e),r.split(/\s+/).map(t=>EIe(t,e)).join(" ")),EIe=(r,e)=>{r=r.trim();let t=e.loose?Mi[Qi.XRANGELOOSE]:Mi[Qi.XRANGE];return r.replace(t,(i,n,s,o,a,l)=>{jr("xRange",r,i,n,s,o,a,l);let c=Xi(s),u=c||Xi(o),g=u||Xi(a),f=g;return n==="="&&f&&(n=""),l=e.includePrerelease?"-0":"",c?n===">"||n==="<"?i="<0.0.0-0":i="*":n&&f?(u&&(o=0),a=0,n===">"?(n=">=",u?(s=+s+1,o=0,a=0):(o=+o+1,a=0)):n==="<="&&(n="<",u?s=+s+1:o=+o+1),n==="<"&&(l="-0"),i=`${n+s}.${o}.${a}${l}`):u?i=`>=${s}.0.0${l} <${+s+1}.0.0-0`:g&&(i=`>=${s}.${o}.0${l} <${s}.${+o+1}.0-0`),jr("xRange return",i),i})},IIe=(r,e)=>(jr("replaceStars",r,e),r.trim().replace(Mi[Qi.STAR],"")),yIe=(r,e)=>(jr("replaceGTE0",r,e),r.trim().replace(Mi[e.includePrerelease?Qi.GTE0PRE:Qi.GTE0],"")),wIe=r=>(e,t,i,n,s,o,a,l,c,u,g,f,h)=>(Xi(i)?t="":Xi(n)?t=`>=${i}.0.0${r?"-0":""}`:Xi(s)?t=`>=${i}.${n}.0${r?"-0":""}`:o?t=`>=${t}`:t=`>=${t}${r?"-0":""}`,Xi(c)?l="":Xi(u)?l=`<${+c+1}.0.0-0`:Xi(g)?l=`<${c}.${+u+1}.0-0`:f?l=`<=${c}.${u}.${g}-${f}`:r?l=`<${c}.${u}.${+g+1}-0`:l=`<=${l}`,`${t} ${l}`.trim()),BIe=(r,e,t)=>{for(let i=0;i0){let n=r[i].semver;if(n.major===e.major&&n.minor===e.minor&&n.patch===e.patch)return!0}return!1}return!0}});var Gd=y((Pet,oj)=>{var Yd=Symbol("SemVer ANY"),ff=class{static get ANY(){return Yd}constructor(e,t){if(t=bIe(t),e instanceof ff){if(e.loose===!!t.loose)return e;e=e.value}px("comparator",e,t),this.options=t,this.loose=!!t.loose,this.parse(e),this.semver===Yd?this.value="":this.value=this.operator+this.semver.version,px("comp",this)}parse(e){let t=this.options.loose?rj[ij.COMPARATORLOOSE]:rj[ij.COMPARATOR],i=e.match(t);if(!i)throw new TypeError(`Invalid comparator: ${e}`);this.operator=i[1]!==void 0?i[1]:"",this.operator==="="&&(this.operator=""),i[2]?this.semver=new nj(i[2],this.options.loose):this.semver=Yd}toString(){return this.value}test(e){if(px("Comparator.test",e,this.options.loose),this.semver===Yd||e===Yd)return!0;if(typeof e=="string")try{e=new nj(e,this.options)}catch{return!1}return hx(e,this.operator,this.semver,this.options)}intersects(e,t){if(!(e instanceof ff))throw new TypeError("a Comparator is required");if((!t||typeof t!="object")&&(t={loose:!!t,includePrerelease:!1}),this.operator==="")return this.value===""?!0:new sj(e.value,t).test(this.value);if(e.operator==="")return e.value===""?!0:new sj(this.value,t).test(e.semver);let i=(this.operator===">="||this.operator===">")&&(e.operator===">="||e.operator===">"),n=(this.operator==="<="||this.operator==="<")&&(e.operator==="<="||e.operator==="<"),s=this.semver.version===e.semver.version,o=(this.operator===">="||this.operator==="<=")&&(e.operator===">="||e.operator==="<="),a=hx(this.semver,"<",e.semver,t)&&(this.operator===">="||this.operator===">")&&(e.operator==="<="||e.operator==="<"),l=hx(this.semver,">",e.semver,t)&&(this.operator==="<="||this.operator==="<")&&(e.operator===">="||e.operator===">");return i||n||s&&o||a||l}};oj.exports=ff;var bIe=Ld(),{re:rj,t:ij}=Sc(),hx=Ax(),px=Td(),nj=Oi(),sj=as()});var jd=y((Det,aj)=>{var QIe=as(),SIe=(r,e,t)=>{try{e=new QIe(e,t)}catch{return!1}return e.test(r)};aj.exports=SIe});var lj=y((ket,Aj)=>{var vIe=as(),xIe=(r,e)=>new vIe(r,e).set.map(t=>t.map(i=>i.value).join(" ").trim().split(" "));Aj.exports=xIe});var uj=y((Ret,cj)=>{var PIe=Oi(),DIe=as(),kIe=(r,e,t)=>{let i=null,n=null,s=null;try{s=new DIe(e,t)}catch{return null}return r.forEach(o=>{s.test(o)&&(!i||n.compare(o)===-1)&&(i=o,n=new PIe(i,t))}),i};cj.exports=kIe});var fj=y((Fet,gj)=>{var RIe=Oi(),FIe=as(),NIe=(r,e,t)=>{let i=null,n=null,s=null;try{s=new FIe(e,t)}catch{return null}return r.forEach(o=>{s.test(o)&&(!i||n.compare(o)===1)&&(i=o,n=new RIe(i,t))}),i};gj.exports=NIe});var dj=y((Net,pj)=>{var dx=Oi(),TIe=as(),hj=Md(),LIe=(r,e)=>{r=new TIe(r,e);let t=new dx("0.0.0");if(r.test(t)||(t=new dx("0.0.0-0"),r.test(t)))return t;t=null;for(let i=0;i{let a=new dx(o.semver.version);switch(o.operator){case">":a.prerelease.length===0?a.patch++:a.prerelease.push(0),a.raw=a.format();case"":case">=":(!s||hj(a,s))&&(s=a);break;case"<":case"<=":break;default:throw new Error(`Unexpected operation: ${o.operator}`)}}),s&&(!t||hj(t,s))&&(t=s)}return t&&r.test(t)?t:null};pj.exports=LIe});var mj=y((Tet,Cj)=>{var OIe=as(),MIe=(r,e)=>{try{return new OIe(r,e).range||"*"}catch{return null}};Cj.exports=MIe});var Qy=y((Let,wj)=>{var UIe=Oi(),yj=Gd(),{ANY:KIe}=yj,HIe=as(),GIe=jd(),Ej=Md(),Ij=Ey(),YIe=yy(),jIe=Iy(),qIe=(r,e,t,i)=>{r=new UIe(r,i),e=new HIe(e,i);let n,s,o,a,l;switch(t){case">":n=Ej,s=YIe,o=Ij,a=">",l=">=";break;case"<":n=Ij,s=jIe,o=Ej,a="<",l="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(GIe(r,e,i))return!1;for(let c=0;c{h.semver===KIe&&(h=new yj(">=0.0.0")),g=g||h,f=f||h,n(h.semver,g.semver,i)?g=h:o(h.semver,f.semver,i)&&(f=h)}),g.operator===a||g.operator===l||(!f.operator||f.operator===a)&&s(r,f.semver))return!1;if(f.operator===l&&o(r,f.semver))return!1}return!0};wj.exports=qIe});var bj=y((Oet,Bj)=>{var JIe=Qy(),WIe=(r,e,t)=>JIe(r,e,">",t);Bj.exports=WIe});var Sj=y((Met,Qj)=>{var zIe=Qy(),VIe=(r,e,t)=>zIe(r,e,"<",t);Qj.exports=VIe});var Pj=y((Uet,xj)=>{var vj=as(),XIe=(r,e,t)=>(r=new vj(r,t),e=new vj(e,t),r.intersects(e));xj.exports=XIe});var kj=y((Ket,Dj)=>{var _Ie=jd(),ZIe=os();Dj.exports=(r,e,t)=>{let i=[],n=null,s=null,o=r.sort((u,g)=>ZIe(u,g,t));for(let u of o)_Ie(u,e,t)?(s=u,n||(n=u)):(s&&i.push([n,s]),s=null,n=null);n&&i.push([n,null]);let a=[];for(let[u,g]of i)u===g?a.push(u):!g&&u===o[0]?a.push("*"):g?u===o[0]?a.push(`<=${g}`):a.push(`${u} - ${g}`):a.push(`>=${u}`);let l=a.join(" || "),c=typeof e.raw=="string"?e.raw:String(e);return l.length{var Rj=as(),Sy=Gd(),{ANY:Cx}=Sy,qd=jd(),mx=os(),$Ie=(r,e,t={})=>{if(r===e)return!0;r=new Rj(r,t),e=new Rj(e,t);let i=!1;e:for(let n of r.set){for(let s of e.set){let o=eye(n,s,t);if(i=i||o!==null,o)continue e}if(i)return!1}return!0},eye=(r,e,t)=>{if(r===e)return!0;if(r.length===1&&r[0].semver===Cx){if(e.length===1&&e[0].semver===Cx)return!0;t.includePrerelease?r=[new Sy(">=0.0.0-0")]:r=[new Sy(">=0.0.0")]}if(e.length===1&&e[0].semver===Cx){if(t.includePrerelease)return!0;e=[new Sy(">=0.0.0")]}let i=new Set,n,s;for(let h of r)h.operator===">"||h.operator===">="?n=Fj(n,h,t):h.operator==="<"||h.operator==="<="?s=Nj(s,h,t):i.add(h.semver);if(i.size>1)return null;let o;if(n&&s){if(o=mx(n.semver,s.semver,t),o>0)return null;if(o===0&&(n.operator!==">="||s.operator!=="<="))return null}for(let h of i){if(n&&!qd(h,String(n),t)||s&&!qd(h,String(s),t))return null;for(let p of e)if(!qd(h,String(p),t))return!1;return!0}let a,l,c,u,g=s&&!t.includePrerelease&&s.semver.prerelease.length?s.semver:!1,f=n&&!t.includePrerelease&&n.semver.prerelease.length?n.semver:!1;g&&g.prerelease.length===1&&s.operator==="<"&&g.prerelease[0]===0&&(g=!1);for(let h of e){if(u=u||h.operator===">"||h.operator===">=",c=c||h.operator==="<"||h.operator==="<=",n){if(f&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===f.major&&h.semver.minor===f.minor&&h.semver.patch===f.patch&&(f=!1),h.operator===">"||h.operator===">="){if(a=Fj(n,h,t),a===h&&a!==n)return!1}else if(n.operator===">="&&!qd(n.semver,String(h),t))return!1}if(s){if(g&&h.semver.prerelease&&h.semver.prerelease.length&&h.semver.major===g.major&&h.semver.minor===g.minor&&h.semver.patch===g.patch&&(g=!1),h.operator==="<"||h.operator==="<="){if(l=Nj(s,h,t),l===h&&l!==s)return!1}else if(s.operator==="<="&&!qd(s.semver,String(h),t))return!1}if(!h.operator&&(s||n)&&o!==0)return!1}return!(n&&c&&!s&&o!==0||s&&u&&!n&&o!==0||f||g)},Fj=(r,e,t)=>{if(!r)return e;let i=mx(r.semver,e.semver,t);return i>0?r:i<0||e.operator===">"&&r.operator===">="?e:r},Nj=(r,e,t)=>{if(!r)return e;let i=mx(r.semver,e.semver,t);return i<0?r:i>0||e.operator==="<"&&r.operator==="<="?e:r};Tj.exports=$Ie});var $r=y((Get,Oj)=>{var Ex=Sc();Oj.exports={re:Ex.re,src:Ex.src,tokens:Ex.t,SEMVER_SPEC_VERSION:Nd().SEMVER_SPEC_VERSION,SemVer:Oi(),compareIdentifiers:hy().compareIdentifiers,rcompareIdentifiers:hy().rcompareIdentifiers,parse:vc(),valid:aY(),clean:lY(),inc:uY(),diff:CY(),major:EY(),minor:yY(),patch:BY(),prerelease:QY(),compare:os(),rcompare:vY(),compareLoose:PY(),compareBuild:my(),sort:FY(),rsort:TY(),gt:Md(),lt:Ey(),eq:Cy(),neq:ax(),gte:Iy(),lte:yy(),cmp:Ax(),coerce:YY(),Comparator:Gd(),Range:as(),satisfies:jd(),toComparators:lj(),maxSatisfying:uj(),minSatisfying:fj(),minVersion:dj(),validRange:mj(),outside:Qy(),gtr:bj(),ltr:Sj(),intersects:Pj(),simplifyRange:kj(),subset:Lj()}});var Ix=y(vy=>{"use strict";Object.defineProperty(vy,"__esModule",{value:!0});vy.VERSION=void 0;vy.VERSION="9.1.0"});var Gt=y((exports,module)=>{"use strict";var __spreadArray=exports&&exports.__spreadArray||function(r,e,t){if(t||arguments.length===2)for(var i=0,n=e.length,s;i{(function(r,e){typeof define=="function"&&define.amd?define([],e):typeof xy=="object"&&xy.exports?xy.exports=e():r.regexpToAst=e()})(typeof self<"u"?self:Mj,function(){function r(){}r.prototype.saveState=function(){return{idx:this.idx,input:this.input,groupIdx:this.groupIdx}},r.prototype.restoreState=function(p){this.idx=p.idx,this.input=p.input,this.groupIdx=p.groupIdx},r.prototype.pattern=function(p){this.idx=0,this.input=p,this.groupIdx=0,this.consumeChar("/");var C=this.disjunction();this.consumeChar("/");for(var w={type:"Flags",loc:{begin:this.idx,end:p.length},global:!1,ignoreCase:!1,multiLine:!1,unicode:!1,sticky:!1};this.isRegExpFlag();)switch(this.popChar()){case"g":o(w,"global");break;case"i":o(w,"ignoreCase");break;case"m":o(w,"multiLine");break;case"u":o(w,"unicode");break;case"y":o(w,"sticky");break}if(this.idx!==this.input.length)throw Error("Redundant input: "+this.input.substring(this.idx));return{type:"Pattern",flags:w,value:C,loc:this.loc(0)}},r.prototype.disjunction=function(){var p=[],C=this.idx;for(p.push(this.alternative());this.peekChar()==="|";)this.consumeChar("|"),p.push(this.alternative());return{type:"Disjunction",value:p,loc:this.loc(C)}},r.prototype.alternative=function(){for(var p=[],C=this.idx;this.isTerm();)p.push(this.term());return{type:"Alternative",value:p,loc:this.loc(C)}},r.prototype.term=function(){return this.isAssertion()?this.assertion():this.atom()},r.prototype.assertion=function(){var p=this.idx;switch(this.popChar()){case"^":return{type:"StartAnchor",loc:this.loc(p)};case"$":return{type:"EndAnchor",loc:this.loc(p)};case"\\":switch(this.popChar()){case"b":return{type:"WordBoundary",loc:this.loc(p)};case"B":return{type:"NonWordBoundary",loc:this.loc(p)}}throw Error("Invalid Assertion Escape");case"(":this.consumeChar("?");var C;switch(this.popChar()){case"=":C="Lookahead";break;case"!":C="NegativeLookahead";break}a(C);var w=this.disjunction();return this.consumeChar(")"),{type:C,value:w,loc:this.loc(p)}}l()},r.prototype.quantifier=function(p){var C,w=this.idx;switch(this.popChar()){case"*":C={atLeast:0,atMost:1/0};break;case"+":C={atLeast:1,atMost:1/0};break;case"?":C={atLeast:0,atMost:1};break;case"{":var B=this.integerIncludingZero();switch(this.popChar()){case"}":C={atLeast:B,atMost:B};break;case",":var v;this.isDigit()?(v=this.integerIncludingZero(),C={atLeast:B,atMost:v}):C={atLeast:B,atMost:1/0},this.consumeChar("}");break}if(p===!0&&C===void 0)return;a(C);break}if(!(p===!0&&C===void 0))return a(C),this.peekChar(0)==="?"?(this.consumeChar("?"),C.greedy=!1):C.greedy=!0,C.type="Quantifier",C.loc=this.loc(w),C},r.prototype.atom=function(){var p,C=this.idx;switch(this.peekChar()){case".":p=this.dotAll();break;case"\\":p=this.atomEscape();break;case"[":p=this.characterClass();break;case"(":p=this.group();break}return p===void 0&&this.isPatternCharacter()&&(p=this.patternCharacter()),a(p),p.loc=this.loc(C),this.isQuantifier()&&(p.quantifier=this.quantifier()),p},r.prototype.dotAll=function(){return this.consumeChar("."),{type:"Set",complement:!0,value:[n(` -`),n("\r"),n("\u2028"),n("\u2029")]}},r.prototype.atomEscape=function(){switch(this.consumeChar("\\"),this.peekChar()){case"1":case"2":case"3":case"4":case"5":case"6":case"7":case"8":case"9":return this.decimalEscapeAtom();case"d":case"D":case"s":case"S":case"w":case"W":return this.characterClassEscape();case"f":case"n":case"r":case"t":case"v":return this.controlEscapeAtom();case"c":return this.controlLetterEscapeAtom();case"0":return this.nulCharacterAtom();case"x":return this.hexEscapeSequenceAtom();case"u":return this.regExpUnicodeEscapeSequenceAtom();default:return this.identityEscapeAtom()}},r.prototype.decimalEscapeAtom=function(){var p=this.positiveInteger();return{type:"GroupBackReference",value:p}},r.prototype.characterClassEscape=function(){var p,C=!1;switch(this.popChar()){case"d":p=u;break;case"D":p=u,C=!0;break;case"s":p=f;break;case"S":p=f,C=!0;break;case"w":p=g;break;case"W":p=g,C=!0;break}return a(p),{type:"Set",value:p,complement:C}},r.prototype.controlEscapeAtom=function(){var p;switch(this.popChar()){case"f":p=n("\f");break;case"n":p=n(` -`);break;case"r":p=n("\r");break;case"t":p=n(" ");break;case"v":p=n("\v");break}return a(p),{type:"Character",value:p}},r.prototype.controlLetterEscapeAtom=function(){this.consumeChar("c");var p=this.popChar();if(/[a-zA-Z]/.test(p)===!1)throw Error("Invalid ");var C=p.toUpperCase().charCodeAt(0)-64;return{type:"Character",value:C}},r.prototype.nulCharacterAtom=function(){return this.consumeChar("0"),{type:"Character",value:n("\0")}},r.prototype.hexEscapeSequenceAtom=function(){return this.consumeChar("x"),this.parseHexDigits(2)},r.prototype.regExpUnicodeEscapeSequenceAtom=function(){return this.consumeChar("u"),this.parseHexDigits(4)},r.prototype.identityEscapeAtom=function(){var p=this.popChar();return{type:"Character",value:n(p)}},r.prototype.classPatternCharacterAtom=function(){switch(this.peekChar()){case` -`:case"\r":case"\u2028":case"\u2029":case"\\":case"]":throw Error("TBD");default:var p=this.popChar();return{type:"Character",value:n(p)}}},r.prototype.characterClass=function(){var p=[],C=!1;for(this.consumeChar("["),this.peekChar(0)==="^"&&(this.consumeChar("^"),C=!0);this.isClassAtom();){var w=this.classAtom(),B=w.type==="Character";if(B&&this.isRangeDash()){this.consumeChar("-");var v=this.classAtom(),D=v.type==="Character";if(D){if(v.value=this.input.length)throw Error("Unexpected end of input");this.idx++},r.prototype.loc=function(p){return{begin:p,end:this.idx}};var e=/[0-9a-fA-F]/,t=/[0-9]/,i=/[1-9]/;function n(p){return p.charCodeAt(0)}function s(p,C){p.length!==void 0?p.forEach(function(w){C.push(w)}):C.push(p)}function o(p,C){if(p[C]===!0)throw"duplicate flag "+C;p[C]=!0}function a(p){if(p===void 0)throw Error("Internal Error - Should never get here!")}function l(){throw Error("Internal Error - Should never get here!")}var c,u=[];for(c=n("0");c<=n("9");c++)u.push(c);var g=[n("_")].concat(u);for(c=n("a");c<=n("z");c++)g.push(c);for(c=n("A");c<=n("Z");c++)g.push(c);var f=[n(" "),n("\f"),n(` -`),n("\r"),n(" "),n("\v"),n(" "),n("\xA0"),n("\u1680"),n("\u2000"),n("\u2001"),n("\u2002"),n("\u2003"),n("\u2004"),n("\u2005"),n("\u2006"),n("\u2007"),n("\u2008"),n("\u2009"),n("\u200A"),n("\u2028"),n("\u2029"),n("\u202F"),n("\u205F"),n("\u3000"),n("\uFEFF")];function h(){}return h.prototype.visitChildren=function(p){for(var C in p){var w=p[C];p.hasOwnProperty(C)&&(w.type!==void 0?this.visit(w):Array.isArray(w)&&w.forEach(function(B){this.visit(B)},this))}},h.prototype.visit=function(p){switch(p.type){case"Pattern":this.visitPattern(p);break;case"Flags":this.visitFlags(p);break;case"Disjunction":this.visitDisjunction(p);break;case"Alternative":this.visitAlternative(p);break;case"StartAnchor":this.visitStartAnchor(p);break;case"EndAnchor":this.visitEndAnchor(p);break;case"WordBoundary":this.visitWordBoundary(p);break;case"NonWordBoundary":this.visitNonWordBoundary(p);break;case"Lookahead":this.visitLookahead(p);break;case"NegativeLookahead":this.visitNegativeLookahead(p);break;case"Character":this.visitCharacter(p);break;case"Set":this.visitSet(p);break;case"Group":this.visitGroup(p);break;case"GroupBackReference":this.visitGroupBackReference(p);break;case"Quantifier":this.visitQuantifier(p);break}this.visitChildren(p)},h.prototype.visitPattern=function(p){},h.prototype.visitFlags=function(p){},h.prototype.visitDisjunction=function(p){},h.prototype.visitAlternative=function(p){},h.prototype.visitStartAnchor=function(p){},h.prototype.visitEndAnchor=function(p){},h.prototype.visitWordBoundary=function(p){},h.prototype.visitNonWordBoundary=function(p){},h.prototype.visitLookahead=function(p){},h.prototype.visitNegativeLookahead=function(p){},h.prototype.visitCharacter=function(p){},h.prototype.visitSet=function(p){},h.prototype.visitGroup=function(p){},h.prototype.visitGroupBackReference=function(p){},h.prototype.visitQuantifier=function(p){},{RegExpParser:r,BaseRegExpVisitor:h,VERSION:"0.5.0"}})});var ky=y(hf=>{"use strict";Object.defineProperty(hf,"__esModule",{value:!0});hf.clearRegExpParserCache=hf.getRegExpAst=void 0;var tye=Py(),Dy={},rye=new tye.RegExpParser;function iye(r){var e=r.toString();if(Dy.hasOwnProperty(e))return Dy[e];var t=rye.pattern(e);return Dy[e]=t,t}hf.getRegExpAst=iye;function nye(){Dy={}}hf.clearRegExpParserCache=nye});var Yj=y(dn=>{"use strict";var sye=dn&&dn.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(dn,"__esModule",{value:!0});dn.canMatchCharCode=dn.firstCharOptimizedIndices=dn.getOptimizedStartCodesIndices=dn.failedOptimizationPrefixMsg=void 0;var Kj=Py(),As=Gt(),Hj=ky(),Da=wx(),Gj="Complement Sets are not supported for first char optimization";dn.failedOptimizationPrefixMsg=`Unable to use "first char" lexer optimizations: -`;function oye(r,e){e===void 0&&(e=!1);try{var t=(0,Hj.getRegExpAst)(r),i=Fy(t.value,{},t.flags.ignoreCase);return i}catch(s){if(s.message===Gj)e&&(0,As.PRINT_WARNING)(""+dn.failedOptimizationPrefixMsg+(" Unable to optimize: < "+r.toString()+` > -`)+` Complement Sets cannot be automatically optimized. - This will disable the lexer's first char optimizations. - See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#COMPLEMENT for details.`);else{var n="";e&&(n=` - This will disable the lexer's first char optimizations. - See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#REGEXP_PARSING for details.`),(0,As.PRINT_ERROR)(dn.failedOptimizationPrefixMsg+` -`+(" Failed parsing: < "+r.toString()+` > -`)+(" Using the regexp-to-ast library version: "+Kj.VERSION+` -`)+" Please open an issue at: https://github.com/bd82/regexp-to-ast/issues"+n)}}return[]}dn.getOptimizedStartCodesIndices=oye;function Fy(r,e,t){switch(r.type){case"Disjunction":for(var i=0;i=Da.minOptimizationVal)for(var f=u.from>=Da.minOptimizationVal?u.from:Da.minOptimizationVal,h=u.to,p=(0,Da.charCodeToOptimizedIndex)(f),C=(0,Da.charCodeToOptimizedIndex)(h),w=p;w<=C;w++)e[w]=w}}});break;case"Group":Fy(o.value,e,t);break;default:throw Error("Non Exhaustive Match")}var a=o.quantifier!==void 0&&o.quantifier.atLeast===0;if(o.type==="Group"&&yx(o)===!1||o.type!=="Group"&&a===!1)break}break;default:throw Error("non exhaustive match!")}return(0,As.values)(e)}dn.firstCharOptimizedIndices=Fy;function Ry(r,e,t){var i=(0,Da.charCodeToOptimizedIndex)(r);e[i]=i,t===!0&&aye(r,e)}function aye(r,e){var t=String.fromCharCode(r),i=t.toUpperCase();if(i!==t){var n=(0,Da.charCodeToOptimizedIndex)(i.charCodeAt(0));e[n]=n}else{var s=t.toLowerCase();if(s!==t){var n=(0,Da.charCodeToOptimizedIndex)(s.charCodeAt(0));e[n]=n}}}function Uj(r,e){return(0,As.find)(r.value,function(t){if(typeof t=="number")return(0,As.contains)(e,t);var i=t;return(0,As.find)(e,function(n){return i.from<=n&&n<=i.to})!==void 0})}function yx(r){return r.quantifier&&r.quantifier.atLeast===0?!0:r.value?(0,As.isArray)(r.value)?(0,As.every)(r.value,yx):yx(r.value):!1}var Aye=function(r){sye(e,r);function e(t){var i=r.call(this)||this;return i.targetCharCodes=t,i.found=!1,i}return e.prototype.visitChildren=function(t){if(this.found!==!0){switch(t.type){case"Lookahead":this.visitLookahead(t);return;case"NegativeLookahead":this.visitNegativeLookahead(t);return}r.prototype.visitChildren.call(this,t)}},e.prototype.visitCharacter=function(t){(0,As.contains)(this.targetCharCodes,t.value)&&(this.found=!0)},e.prototype.visitSet=function(t){t.complement?Uj(t,this.targetCharCodes)===void 0&&(this.found=!0):Uj(t,this.targetCharCodes)!==void 0&&(this.found=!0)},e}(Kj.BaseRegExpVisitor);function lye(r,e){if(e instanceof RegExp){var t=(0,Hj.getRegExpAst)(e),i=new Aye(r);return i.visit(t),i.found}else return(0,As.find)(e,function(n){return(0,As.contains)(r,n.charCodeAt(0))})!==void 0}dn.canMatchCharCode=lye});var wx=y(Je=>{"use strict";var jj=Je&&Je.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Je,"__esModule",{value:!0});Je.charCodeToOptimizedIndex=Je.minOptimizationVal=Je.buildLineBreakIssueMessage=Je.LineTerminatorOptimizedTester=Je.isShortPattern=Je.isCustomPattern=Je.cloneEmptyGroups=Je.performWarningRuntimeChecks=Je.performRuntimeChecks=Je.addStickyFlag=Je.addStartOfInput=Je.findUnreachablePatterns=Je.findModesThatDoNotExist=Je.findInvalidGroupType=Je.findDuplicatePatterns=Je.findUnsupportedFlags=Je.findStartOfInputAnchor=Je.findEmptyMatchRegExps=Je.findEndOfInputAnchor=Je.findInvalidPatterns=Je.findMissingPatterns=Je.validatePatterns=Je.analyzeTokenTypes=Je.enableSticky=Je.disableSticky=Je.SUPPORT_STICKY=Je.MODES=Je.DEFAULT_MODE=void 0;var qj=Py(),ir=Jd(),Se=Gt(),pf=Yj(),Jj=ky(),Do="PATTERN";Je.DEFAULT_MODE="defaultMode";Je.MODES="modes";Je.SUPPORT_STICKY=typeof new RegExp("(?:)").sticky=="boolean";function cye(){Je.SUPPORT_STICKY=!1}Je.disableSticky=cye;function uye(){Je.SUPPORT_STICKY=!0}Je.enableSticky=uye;function gye(r,e){e=(0,Se.defaults)(e,{useSticky:Je.SUPPORT_STICKY,debug:!1,safeMode:!1,positionTracking:"full",lineTerminatorCharacters:["\r",` -`],tracer:function(v,D){return D()}});var t=e.tracer;t("initCharCodeToOptimizedIndexMap",function(){wye()});var i;t("Reject Lexer.NA",function(){i=(0,Se.reject)(r,function(v){return v[Do]===ir.Lexer.NA})});var n=!1,s;t("Transform Patterns",function(){n=!1,s=(0,Se.map)(i,function(v){var D=v[Do];if((0,Se.isRegExp)(D)){var T=D.source;return T.length===1&&T!=="^"&&T!=="$"&&T!=="."&&!D.ignoreCase?T:T.length===2&&T[0]==="\\"&&!(0,Se.contains)(["d","D","s","S","t","r","n","t","0","c","b","B","f","v","w","W"],T[1])?T[1]:e.useSticky?Qx(D):bx(D)}else{if((0,Se.isFunction)(D))return n=!0,{exec:D};if((0,Se.has)(D,"exec"))return n=!0,D;if(typeof D=="string"){if(D.length===1)return D;var H=D.replace(/[\\^$.*+?()[\]{}|]/g,"\\$&"),j=new RegExp(H);return e.useSticky?Qx(j):bx(j)}else throw Error("non exhaustive match")}})});var o,a,l,c,u;t("misc mapping",function(){o=(0,Se.map)(i,function(v){return v.tokenTypeIdx}),a=(0,Se.map)(i,function(v){var D=v.GROUP;if(D!==ir.Lexer.SKIPPED){if((0,Se.isString)(D))return D;if((0,Se.isUndefined)(D))return!1;throw Error("non exhaustive match")}}),l=(0,Se.map)(i,function(v){var D=v.LONGER_ALT;if(D){var T=(0,Se.isArray)(D)?(0,Se.map)(D,function(H){return(0,Se.indexOf)(i,H)}):[(0,Se.indexOf)(i,D)];return T}}),c=(0,Se.map)(i,function(v){return v.PUSH_MODE}),u=(0,Se.map)(i,function(v){return(0,Se.has)(v,"POP_MODE")})});var g;t("Line Terminator Handling",function(){var v=oq(e.lineTerminatorCharacters);g=(0,Se.map)(i,function(D){return!1}),e.positionTracking!=="onlyOffset"&&(g=(0,Se.map)(i,function(D){if((0,Se.has)(D,"LINE_BREAKS"))return D.LINE_BREAKS;if(nq(D,v)===!1)return(0,pf.canMatchCharCode)(v,D.PATTERN)}))});var f,h,p,C;t("Misc Mapping #2",function(){f=(0,Se.map)(i,vx),h=(0,Se.map)(s,iq),p=(0,Se.reduce)(i,function(v,D){var T=D.GROUP;return(0,Se.isString)(T)&&T!==ir.Lexer.SKIPPED&&(v[T]=[]),v},{}),C=(0,Se.map)(s,function(v,D){return{pattern:s[D],longerAlt:l[D],canLineTerminator:g[D],isCustom:f[D],short:h[D],group:a[D],push:c[D],pop:u[D],tokenTypeIdx:o[D],tokenType:i[D]}})});var w=!0,B=[];return e.safeMode||t("First Char Optimization",function(){B=(0,Se.reduce)(i,function(v,D,T){if(typeof D.PATTERN=="string"){var H=D.PATTERN.charCodeAt(0),j=Sx(H);Bx(v,j,C[T])}else if((0,Se.isArray)(D.START_CHARS_HINT)){var $;(0,Se.forEach)(D.START_CHARS_HINT,function(W){var Z=typeof W=="string"?W.charCodeAt(0):W,A=Sx(Z);$!==A&&($=A,Bx(v,A,C[T]))})}else if((0,Se.isRegExp)(D.PATTERN))if(D.PATTERN.unicode)w=!1,e.ensureOptimizations&&(0,Se.PRINT_ERROR)(""+pf.failedOptimizationPrefixMsg+(" Unable to analyze < "+D.PATTERN.toString()+` > pattern. -`)+` The regexp unicode flag is not currently supported by the regexp-to-ast library. - This will disable the lexer's first char optimizations. - For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNICODE_OPTIMIZE`);else{var V=(0,pf.getOptimizedStartCodesIndices)(D.PATTERN,e.ensureOptimizations);(0,Se.isEmpty)(V)&&(w=!1),(0,Se.forEach)(V,function(W){Bx(v,W,C[T])})}else e.ensureOptimizations&&(0,Se.PRINT_ERROR)(""+pf.failedOptimizationPrefixMsg+(" TokenType: <"+D.name+`> is using a custom token pattern without providing parameter. -`)+` This will disable the lexer's first char optimizations. - For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_OPTIMIZE`),w=!1;return v},[])}),t("ArrayPacking",function(){B=(0,Se.packArray)(B)}),{emptyGroups:p,patternIdxToConfig:C,charCodeToPatternIdxToConfig:B,hasCustom:n,canBeOptimized:w}}Je.analyzeTokenTypes=gye;function fye(r,e){var t=[],i=Wj(r);t=t.concat(i.errors);var n=zj(i.valid),s=n.valid;return t=t.concat(n.errors),t=t.concat(hye(s)),t=t.concat(eq(s)),t=t.concat(tq(s,e)),t=t.concat(rq(s)),t}Je.validatePatterns=fye;function hye(r){var e=[],t=(0,Se.filter)(r,function(i){return(0,Se.isRegExp)(i[Do])});return e=e.concat(Vj(t)),e=e.concat(_j(t)),e=e.concat(Zj(t)),e=e.concat($j(t)),e=e.concat(Xj(t)),e}function Wj(r){var e=(0,Se.filter)(r,function(n){return!(0,Se.has)(n,Do)}),t=(0,Se.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- missing static 'PATTERN' property",type:ir.LexerDefinitionErrorType.MISSING_PATTERN,tokenTypes:[n]}}),i=(0,Se.difference)(r,e);return{errors:t,valid:i}}Je.findMissingPatterns=Wj;function zj(r){var e=(0,Se.filter)(r,function(n){var s=n[Do];return!(0,Se.isRegExp)(s)&&!(0,Se.isFunction)(s)&&!(0,Se.has)(s,"exec")&&!(0,Se.isString)(s)}),t=(0,Se.map)(e,function(n){return{message:"Token Type: ->"+n.name+"<- static 'PATTERN' can only be a RegExp, a Function matching the {CustomPatternMatcherFunc} type or an Object matching the {ICustomPattern} interface.",type:ir.LexerDefinitionErrorType.INVALID_PATTERN,tokenTypes:[n]}}),i=(0,Se.difference)(r,e);return{errors:t,valid:i}}Je.findInvalidPatterns=zj;var pye=/[^\\][\$]/;function Vj(r){var e=function(n){jj(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitEndAnchor=function(o){this.found=!0},s}(qj.BaseRegExpVisitor),t=(0,Se.filter)(r,function(n){var s=n[Do];try{var o=(0,Jj.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch{return pye.test(s.source)}}),i=(0,Se.map)(t,function(n){return{message:`Unexpected RegExp Anchor Error: - Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain end of input anchor '$' - See chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS for details.`,type:ir.LexerDefinitionErrorType.EOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}Je.findEndOfInputAnchor=Vj;function Xj(r){var e=(0,Se.filter)(r,function(i){var n=i[Do];return n.test("")}),t=(0,Se.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' must not match an empty string",type:ir.LexerDefinitionErrorType.EMPTY_MATCH_PATTERN,tokenTypes:[i]}});return t}Je.findEmptyMatchRegExps=Xj;var dye=/[^\\[][\^]|^\^/;function _j(r){var e=function(n){jj(s,n);function s(){var o=n!==null&&n.apply(this,arguments)||this;return o.found=!1,o}return s.prototype.visitStartAnchor=function(o){this.found=!0},s}(qj.BaseRegExpVisitor),t=(0,Se.filter)(r,function(n){var s=n[Do];try{var o=(0,Jj.getRegExpAst)(s),a=new e;return a.visit(o),a.found}catch{return dye.test(s.source)}}),i=(0,Se.map)(t,function(n){return{message:`Unexpected RegExp Anchor Error: - Token Type: ->`+n.name+`<- static 'PATTERN' cannot contain start of input anchor '^' - See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#ANCHORS for details.`,type:ir.LexerDefinitionErrorType.SOI_ANCHOR_FOUND,tokenTypes:[n]}});return i}Je.findStartOfInputAnchor=_j;function Zj(r){var e=(0,Se.filter)(r,function(i){var n=i[Do];return n instanceof RegExp&&(n.multiline||n.global)}),t=(0,Se.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'PATTERN' may NOT contain global('g') or multiline('m')",type:ir.LexerDefinitionErrorType.UNSUPPORTED_FLAGS_FOUND,tokenTypes:[i]}});return t}Je.findUnsupportedFlags=Zj;function $j(r){var e=[],t=(0,Se.map)(r,function(s){return(0,Se.reduce)(r,function(o,a){return s.PATTERN.source===a.PATTERN.source&&!(0,Se.contains)(e,a)&&a.PATTERN!==ir.Lexer.NA&&(e.push(a),o.push(a)),o},[])});t=(0,Se.compact)(t);var i=(0,Se.filter)(t,function(s){return s.length>1}),n=(0,Se.map)(i,function(s){var o=(0,Se.map)(s,function(l){return l.name}),a=(0,Se.first)(s).PATTERN;return{message:"The same RegExp pattern ->"+a+"<-"+("has been used in all of the following Token Types: "+o.join(", ")+" <-"),type:ir.LexerDefinitionErrorType.DUPLICATE_PATTERNS_FOUND,tokenTypes:s}});return n}Je.findDuplicatePatterns=$j;function eq(r){var e=(0,Se.filter)(r,function(i){if(!(0,Se.has)(i,"GROUP"))return!1;var n=i.GROUP;return n!==ir.Lexer.SKIPPED&&n!==ir.Lexer.NA&&!(0,Se.isString)(n)}),t=(0,Se.map)(e,function(i){return{message:"Token Type: ->"+i.name+"<- static 'GROUP' can only be Lexer.SKIPPED/Lexer.NA/A String",type:ir.LexerDefinitionErrorType.INVALID_GROUP_TYPE_FOUND,tokenTypes:[i]}});return t}Je.findInvalidGroupType=eq;function tq(r,e){var t=(0,Se.filter)(r,function(n){return n.PUSH_MODE!==void 0&&!(0,Se.contains)(e,n.PUSH_MODE)}),i=(0,Se.map)(t,function(n){var s="Token Type: ->"+n.name+"<- static 'PUSH_MODE' value cannot refer to a Lexer Mode ->"+n.PUSH_MODE+"<-which does not exist";return{message:s,type:ir.LexerDefinitionErrorType.PUSH_MODE_DOES_NOT_EXIST,tokenTypes:[n]}});return i}Je.findModesThatDoNotExist=tq;function rq(r){var e=[],t=(0,Se.reduce)(r,function(i,n,s){var o=n.PATTERN;return o===ir.Lexer.NA||((0,Se.isString)(o)?i.push({str:o,idx:s,tokenType:n}):(0,Se.isRegExp)(o)&&mye(o)&&i.push({str:o.source,idx:s,tokenType:n})),i},[]);return(0,Se.forEach)(r,function(i,n){(0,Se.forEach)(t,function(s){var o=s.str,a=s.idx,l=s.tokenType;if(n"+i.name+"<-")+`in the lexer's definition. -See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#UNREACHABLE`;e.push({message:c,type:ir.LexerDefinitionErrorType.UNREACHABLE_PATTERN,tokenTypes:[i,l]})}})}),e}Je.findUnreachablePatterns=rq;function Cye(r,e){if((0,Se.isRegExp)(e)){var t=e.exec(r);return t!==null&&t.index===0}else{if((0,Se.isFunction)(e))return e(r,0,[],{});if((0,Se.has)(e,"exec"))return e.exec(r,0,[],{});if(typeof e=="string")return e===r;throw Error("non exhaustive match")}}function mye(r){var e=[".","\\","[","]","|","^","$","(",")","?","*","+","{"];return(0,Se.find)(e,function(t){return r.source.indexOf(t)!==-1})===void 0}function bx(r){var e=r.ignoreCase?"i":"";return new RegExp("^(?:"+r.source+")",e)}Je.addStartOfInput=bx;function Qx(r){var e=r.ignoreCase?"iy":"y";return new RegExp(""+r.source,e)}Je.addStickyFlag=Qx;function Eye(r,e,t){var i=[];return(0,Se.has)(r,Je.DEFAULT_MODE)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+Je.DEFAULT_MODE+`> property in its definition -`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE}),(0,Se.has)(r,Je.MODES)||i.push({message:"A MultiMode Lexer cannot be initialized without a <"+Je.MODES+`> property in its definition -`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY}),(0,Se.has)(r,Je.MODES)&&(0,Se.has)(r,Je.DEFAULT_MODE)&&!(0,Se.has)(r.modes,r.defaultMode)&&i.push({message:"A MultiMode Lexer cannot be initialized with a "+Je.DEFAULT_MODE+": <"+r.defaultMode+`>which does not exist -`,type:ir.LexerDefinitionErrorType.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST}),(0,Se.has)(r,Je.MODES)&&(0,Se.forEach)(r.modes,function(n,s){(0,Se.forEach)(n,function(o,a){(0,Se.isUndefined)(o)&&i.push({message:"A Lexer cannot be initialized using an undefined Token Type. Mode:"+("<"+s+"> at index: <"+a+`> -`),type:ir.LexerDefinitionErrorType.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED})})}),i}Je.performRuntimeChecks=Eye;function Iye(r,e,t){var i=[],n=!1,s=(0,Se.compact)((0,Se.flatten)((0,Se.mapValues)(r.modes,function(l){return l}))),o=(0,Se.reject)(s,function(l){return l[Do]===ir.Lexer.NA}),a=oq(t);return e&&(0,Se.forEach)(o,function(l){var c=nq(l,a);if(c!==!1){var u=sq(l,c),g={message:u,type:c.issue,tokenType:l};i.push(g)}else(0,Se.has)(l,"LINE_BREAKS")?l.LINE_BREAKS===!0&&(n=!0):(0,pf.canMatchCharCode)(a,l.PATTERN)&&(n=!0)}),e&&!n&&i.push({message:`Warning: No LINE_BREAKS Found. - This Lexer has been defined to track line and column information, - But none of the Token Types can be identified as matching a line terminator. - See https://chevrotain.io/docs/guide/resolving_lexer_errors.html#LINE_BREAKS - for details.`,type:ir.LexerDefinitionErrorType.NO_LINE_BREAKS_FLAGS}),i}Je.performWarningRuntimeChecks=Iye;function yye(r){var e={},t=(0,Se.keys)(r);return(0,Se.forEach)(t,function(i){var n=r[i];if((0,Se.isArray)(n))e[i]=[];else throw Error("non exhaustive match")}),e}Je.cloneEmptyGroups=yye;function vx(r){var e=r.PATTERN;if((0,Se.isRegExp)(e))return!1;if((0,Se.isFunction)(e))return!0;if((0,Se.has)(e,"exec"))return!0;if((0,Se.isString)(e))return!1;throw Error("non exhaustive match")}Je.isCustomPattern=vx;function iq(r){return(0,Se.isString)(r)&&r.length===1?r.charCodeAt(0):!1}Je.isShortPattern=iq;Je.LineTerminatorOptimizedTester={test:function(r){for(var e=r.length,t=this.lastIndex;t Token Type -`)+(" Root cause: "+e.errMsg+`. -`)+" For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#IDENTIFY_TERMINATOR";if(e.issue===ir.LexerDefinitionErrorType.CUSTOM_LINE_BREAK)return`Warning: A Custom Token Pattern should specify the option. -`+(" The problem is in the <"+r.name+`> Token Type -`)+" For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#CUSTOM_LINE_BREAK";throw Error("non exhaustive match")}Je.buildLineBreakIssueMessage=sq;function oq(r){var e=(0,Se.map)(r,function(t){return(0,Se.isString)(t)&&t.length>0?t.charCodeAt(0):t});return e}function Bx(r,e,t){r[e]===void 0?r[e]=[t]:r[e].push(t)}Je.minOptimizationVal=256;var Ny=[];function Sx(r){return r255?255+~~(r/255):r}}});var df=y(Nt=>{"use strict";Object.defineProperty(Nt,"__esModule",{value:!0});Nt.isTokenType=Nt.hasExtendingTokensTypesMapProperty=Nt.hasExtendingTokensTypesProperty=Nt.hasCategoriesProperty=Nt.hasShortKeyProperty=Nt.singleAssignCategoriesToksMap=Nt.assignCategoriesMapProp=Nt.assignCategoriesTokensProp=Nt.assignTokenDefaultProps=Nt.expandCategories=Nt.augmentTokenTypes=Nt.tokenIdxToClass=Nt.tokenShortNameIdx=Nt.tokenStructuredMatcherNoCategories=Nt.tokenStructuredMatcher=void 0;var ei=Gt();function Bye(r,e){var t=r.tokenTypeIdx;return t===e.tokenTypeIdx?!0:e.isParent===!0&&e.categoryMatchesMap[t]===!0}Nt.tokenStructuredMatcher=Bye;function bye(r,e){return r.tokenTypeIdx===e.tokenTypeIdx}Nt.tokenStructuredMatcherNoCategories=bye;Nt.tokenShortNameIdx=1;Nt.tokenIdxToClass={};function Qye(r){var e=aq(r);Aq(e),cq(e),lq(e),(0,ei.forEach)(e,function(t){t.isParent=t.categoryMatches.length>0})}Nt.augmentTokenTypes=Qye;function aq(r){for(var e=(0,ei.cloneArr)(r),t=r,i=!0;i;){t=(0,ei.compact)((0,ei.flatten)((0,ei.map)(t,function(s){return s.CATEGORIES})));var n=(0,ei.difference)(t,e);e=e.concat(n),(0,ei.isEmpty)(n)?i=!1:t=n}return e}Nt.expandCategories=aq;function Aq(r){(0,ei.forEach)(r,function(e){uq(e)||(Nt.tokenIdxToClass[Nt.tokenShortNameIdx]=e,e.tokenTypeIdx=Nt.tokenShortNameIdx++),xx(e)&&!(0,ei.isArray)(e.CATEGORIES)&&(e.CATEGORIES=[e.CATEGORIES]),xx(e)||(e.CATEGORIES=[]),gq(e)||(e.categoryMatches=[]),fq(e)||(e.categoryMatchesMap={})})}Nt.assignTokenDefaultProps=Aq;function lq(r){(0,ei.forEach)(r,function(e){e.categoryMatches=[],(0,ei.forEach)(e.categoryMatchesMap,function(t,i){e.categoryMatches.push(Nt.tokenIdxToClass[i].tokenTypeIdx)})})}Nt.assignCategoriesTokensProp=lq;function cq(r){(0,ei.forEach)(r,function(e){Px([],e)})}Nt.assignCategoriesMapProp=cq;function Px(r,e){(0,ei.forEach)(r,function(t){e.categoryMatchesMap[t.tokenTypeIdx]=!0}),(0,ei.forEach)(e.CATEGORIES,function(t){var i=r.concat(e);(0,ei.contains)(i,t)||Px(i,t)})}Nt.singleAssignCategoriesToksMap=Px;function uq(r){return(0,ei.has)(r,"tokenTypeIdx")}Nt.hasShortKeyProperty=uq;function xx(r){return(0,ei.has)(r,"CATEGORIES")}Nt.hasCategoriesProperty=xx;function gq(r){return(0,ei.has)(r,"categoryMatches")}Nt.hasExtendingTokensTypesProperty=gq;function fq(r){return(0,ei.has)(r,"categoryMatchesMap")}Nt.hasExtendingTokensTypesMapProperty=fq;function Sye(r){return(0,ei.has)(r,"tokenTypeIdx")}Nt.isTokenType=Sye});var Dx=y(Ty=>{"use strict";Object.defineProperty(Ty,"__esModule",{value:!0});Ty.defaultLexerErrorProvider=void 0;Ty.defaultLexerErrorProvider={buildUnableToPopLexerModeMessage:function(r){return"Unable to pop Lexer Mode after encountering Token ->"+r.image+"<- The Mode Stack is empty"},buildUnexpectedCharactersMessage:function(r,e,t,i,n){return"unexpected character: ->"+r.charAt(e)+"<- at offset: "+e+","+(" skipped "+t+" characters.")}}});var Jd=y(Rc=>{"use strict";Object.defineProperty(Rc,"__esModule",{value:!0});Rc.Lexer=Rc.LexerDefinitionErrorType=void 0;var Vs=wx(),nr=Gt(),vye=df(),xye=Dx(),Pye=ky(),Dye;(function(r){r[r.MISSING_PATTERN=0]="MISSING_PATTERN",r[r.INVALID_PATTERN=1]="INVALID_PATTERN",r[r.EOI_ANCHOR_FOUND=2]="EOI_ANCHOR_FOUND",r[r.UNSUPPORTED_FLAGS_FOUND=3]="UNSUPPORTED_FLAGS_FOUND",r[r.DUPLICATE_PATTERNS_FOUND=4]="DUPLICATE_PATTERNS_FOUND",r[r.INVALID_GROUP_TYPE_FOUND=5]="INVALID_GROUP_TYPE_FOUND",r[r.PUSH_MODE_DOES_NOT_EXIST=6]="PUSH_MODE_DOES_NOT_EXIST",r[r.MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE=7]="MULTI_MODE_LEXER_WITHOUT_DEFAULT_MODE",r[r.MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY=8]="MULTI_MODE_LEXER_WITHOUT_MODES_PROPERTY",r[r.MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST=9]="MULTI_MODE_LEXER_DEFAULT_MODE_VALUE_DOES_NOT_EXIST",r[r.LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED=10]="LEXER_DEFINITION_CANNOT_CONTAIN_UNDEFINED",r[r.SOI_ANCHOR_FOUND=11]="SOI_ANCHOR_FOUND",r[r.EMPTY_MATCH_PATTERN=12]="EMPTY_MATCH_PATTERN",r[r.NO_LINE_BREAKS_FLAGS=13]="NO_LINE_BREAKS_FLAGS",r[r.UNREACHABLE_PATTERN=14]="UNREACHABLE_PATTERN",r[r.IDENTIFY_TERMINATOR=15]="IDENTIFY_TERMINATOR",r[r.CUSTOM_LINE_BREAK=16]="CUSTOM_LINE_BREAK"})(Dye=Rc.LexerDefinitionErrorType||(Rc.LexerDefinitionErrorType={}));var Wd={deferDefinitionErrorsHandling:!1,positionTracking:"full",lineTerminatorsPattern:/\n|\r\n?/g,lineTerminatorCharacters:[` -`,"\r"],ensureOptimizations:!1,safeMode:!1,errorMessageProvider:xye.defaultLexerErrorProvider,traceInitPerf:!1,skipValidations:!1};Object.freeze(Wd);var kye=function(){function r(e,t){var i=this;if(t===void 0&&(t=Wd),this.lexerDefinition=e,this.lexerDefinitionErrors=[],this.lexerDefinitionWarning=[],this.patternIdxToConfig={},this.charCodeToPatternIdxToConfig={},this.modes=[],this.emptyGroups={},this.config=void 0,this.trackStartLines=!0,this.trackEndLines=!0,this.hasCustom=!1,this.canModeBeOptimized={},typeof t=="boolean")throw Error(`The second argument to the Lexer constructor is now an ILexerConfig Object. -a boolean 2nd argument is no longer supported`);this.config=(0,nr.merge)(Wd,t);var n=this.config.traceInitPerf;n===!0?(this.traceInitMaxIdent=1/0,this.traceInitPerf=!0):typeof n=="number"&&(this.traceInitMaxIdent=n,this.traceInitPerf=!0),this.traceInitIndent=-1,this.TRACE_INIT("Lexer Constructor",function(){var s,o=!0;i.TRACE_INIT("Lexer Config handling",function(){if(i.config.lineTerminatorsPattern===Wd.lineTerminatorsPattern)i.config.lineTerminatorsPattern=Vs.LineTerminatorOptimizedTester;else if(i.config.lineTerminatorCharacters===Wd.lineTerminatorCharacters)throw Error(`Error: Missing property on the Lexer config. - For details See: https://chevrotain.io/docs/guide/resolving_lexer_errors.html#MISSING_LINE_TERM_CHARS`);if(t.safeMode&&t.ensureOptimizations)throw Error('"safeMode" and "ensureOptimizations" flags are mutually exclusive.');i.trackStartLines=/full|onlyStart/i.test(i.config.positionTracking),i.trackEndLines=/full/i.test(i.config.positionTracking),(0,nr.isArray)(e)?(s={modes:{}},s.modes[Vs.DEFAULT_MODE]=(0,nr.cloneArr)(e),s[Vs.DEFAULT_MODE]=Vs.DEFAULT_MODE):(o=!1,s=(0,nr.cloneObj)(e))}),i.config.skipValidations===!1&&(i.TRACE_INIT("performRuntimeChecks",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,Vs.performRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))}),i.TRACE_INIT("performWarningRuntimeChecks",function(){i.lexerDefinitionWarning=i.lexerDefinitionWarning.concat((0,Vs.performWarningRuntimeChecks)(s,i.trackStartLines,i.config.lineTerminatorCharacters))})),s.modes=s.modes?s.modes:{},(0,nr.forEach)(s.modes,function(u,g){s.modes[g]=(0,nr.reject)(u,function(f){return(0,nr.isUndefined)(f)})});var a=(0,nr.keys)(s.modes);if((0,nr.forEach)(s.modes,function(u,g){i.TRACE_INIT("Mode: <"+g+"> processing",function(){if(i.modes.push(g),i.config.skipValidations===!1&&i.TRACE_INIT("validatePatterns",function(){i.lexerDefinitionErrors=i.lexerDefinitionErrors.concat((0,Vs.validatePatterns)(u,a))}),(0,nr.isEmpty)(i.lexerDefinitionErrors)){(0,vye.augmentTokenTypes)(u);var f;i.TRACE_INIT("analyzeTokenTypes",function(){f=(0,Vs.analyzeTokenTypes)(u,{lineTerminatorCharacters:i.config.lineTerminatorCharacters,positionTracking:t.positionTracking,ensureOptimizations:t.ensureOptimizations,safeMode:t.safeMode,tracer:i.TRACE_INIT.bind(i)})}),i.patternIdxToConfig[g]=f.patternIdxToConfig,i.charCodeToPatternIdxToConfig[g]=f.charCodeToPatternIdxToConfig,i.emptyGroups=(0,nr.merge)(i.emptyGroups,f.emptyGroups),i.hasCustom=f.hasCustom||i.hasCustom,i.canModeBeOptimized[g]=f.canBeOptimized}})}),i.defaultMode=s.defaultMode,!(0,nr.isEmpty)(i.lexerDefinitionErrors)&&!i.config.deferDefinitionErrorsHandling){var l=(0,nr.map)(i.lexerDefinitionErrors,function(u){return u.message}),c=l.join(`----------------------- -`);throw new Error(`Errors detected in definition of Lexer: -`+c)}(0,nr.forEach)(i.lexerDefinitionWarning,function(u){(0,nr.PRINT_WARNING)(u.message)}),i.TRACE_INIT("Choosing sub-methods implementations",function(){if(Vs.SUPPORT_STICKY?(i.chopInput=nr.IDENTITY,i.match=i.matchWithTest):(i.updateLastIndex=nr.NOOP,i.match=i.matchWithExec),o&&(i.handleModes=nr.NOOP),i.trackStartLines===!1&&(i.computeNewColumn=nr.IDENTITY),i.trackEndLines===!1&&(i.updateTokenEndLineColumnLocation=nr.NOOP),/full/i.test(i.config.positionTracking))i.createTokenInstance=i.createFullToken;else if(/onlyStart/i.test(i.config.positionTracking))i.createTokenInstance=i.createStartOnlyToken;else if(/onlyOffset/i.test(i.config.positionTracking))i.createTokenInstance=i.createOffsetOnlyToken;else throw Error('Invalid config option: "'+i.config.positionTracking+'"');i.hasCustom?(i.addToken=i.addTokenUsingPush,i.handlePayload=i.handlePayloadWithCustom):(i.addToken=i.addTokenUsingMemberAccess,i.handlePayload=i.handlePayloadNoCustom)}),i.TRACE_INIT("Failed Optimization Warnings",function(){var u=(0,nr.reduce)(i.canModeBeOptimized,function(g,f,h){return f===!1&&g.push(h),g},[]);if(t.ensureOptimizations&&!(0,nr.isEmpty)(u))throw Error("Lexer Modes: < "+u.join(", ")+` > cannot be optimized. - Disable the "ensureOptimizations" lexer config flag to silently ignore this and run the lexer in an un-optimized mode. - Or inspect the console log for details on how to resolve these issues.`)}),i.TRACE_INIT("clearRegExpParserCache",function(){(0,Pye.clearRegExpParserCache)()}),i.TRACE_INIT("toFastProperties",function(){(0,nr.toFastProperties)(i)})})}return r.prototype.tokenize=function(e,t){if(t===void 0&&(t=this.defaultMode),!(0,nr.isEmpty)(this.lexerDefinitionErrors)){var i=(0,nr.map)(this.lexerDefinitionErrors,function(o){return o.message}),n=i.join(`----------------------- -`);throw new Error(`Unable to Tokenize because Errors detected in definition of Lexer: -`+n)}var s=this.tokenizeInternal(e,t);return s},r.prototype.tokenizeInternal=function(e,t){var i=this,n,s,o,a,l,c,u,g,f,h,p,C,w,B,v,D,T=e,H=T.length,j=0,$=0,V=this.hasCustom?0:Math.floor(e.length/10),W=new Array(V),Z=[],A=this.trackStartLines?1:void 0,ae=this.trackStartLines?1:void 0,ge=(0,Vs.cloneEmptyGroups)(this.emptyGroups),_=this.trackStartLines,L=this.config.lineTerminatorsPattern,N=0,ue=[],we=[],Te=[],Pe=[];Object.freeze(Pe);var Le=void 0;function se(){return ue}function Ae(dr){var Bi=(0,Vs.charCodeToOptimizedIndex)(dr),_n=we[Bi];return _n===void 0?Pe:_n}var be=function(dr){if(Te.length===1&&dr.tokenType.PUSH_MODE===void 0){var Bi=i.config.errorMessageProvider.buildUnableToPopLexerModeMessage(dr);Z.push({offset:dr.startOffset,line:dr.startLine!==void 0?dr.startLine:void 0,column:dr.startColumn!==void 0?dr.startColumn:void 0,length:dr.image.length,message:Bi})}else{Te.pop();var _n=(0,nr.last)(Te);ue=i.patternIdxToConfig[_n],we=i.charCodeToPatternIdxToConfig[_n],N=ue.length;var pa=i.canModeBeOptimized[_n]&&i.config.safeMode===!1;we&&pa?Le=Ae:Le=se}};function fe(dr){Te.push(dr),we=this.charCodeToPatternIdxToConfig[dr],ue=this.patternIdxToConfig[dr],N=ue.length,N=ue.length;var Bi=this.canModeBeOptimized[dr]&&this.config.safeMode===!1;we&&Bi?Le=Ae:Le=se}fe.call(this,t);for(var le;jc.length){c=a,u=g,le=tt;break}}}break}}if(c!==null){if(f=c.length,h=le.group,h!==void 0&&(p=le.tokenTypeIdx,C=this.createTokenInstance(c,j,p,le.tokenType,A,ae,f),this.handlePayload(C,u),h===!1?$=this.addToken(W,$,C):ge[h].push(C)),e=this.chopInput(e,f),j=j+f,ae=this.computeNewColumn(ae,f),_===!0&&le.canLineTerminator===!0){var It=0,Ur=void 0,oi=void 0;L.lastIndex=0;do Ur=L.test(c),Ur===!0&&(oi=L.lastIndex-1,It++);while(Ur===!0);It!==0&&(A=A+It,ae=f-oi,this.updateTokenEndLineColumnLocation(C,h,oi,It,A,ae,f))}this.handleModes(le,be,fe,C)}else{for(var pi=j,pr=A,di=ae,ai=!1;!ai&&j <"+e+">");var n=(0,nr.timer)(t),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent time: "+s+"ms"),this.traceInitIndent--,o}else return t()},r.SKIPPED="This marks a skipped Token pattern, this means each token identified by it willbe consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.",r.NA=/NOT_APPLICABLE/,r}();Rc.Lexer=kye});var HA=y(Si=>{"use strict";Object.defineProperty(Si,"__esModule",{value:!0});Si.tokenMatcher=Si.createTokenInstance=Si.EOF=Si.createToken=Si.hasTokenLabel=Si.tokenName=Si.tokenLabel=void 0;var Xs=Gt(),Rye=Jd(),kx=df();function Fye(r){return wq(r)?r.LABEL:r.name}Si.tokenLabel=Fye;function Nye(r){return r.name}Si.tokenName=Nye;function wq(r){return(0,Xs.isString)(r.LABEL)&&r.LABEL!==""}Si.hasTokenLabel=wq;var Tye="parent",hq="categories",pq="label",dq="group",Cq="push_mode",mq="pop_mode",Eq="longer_alt",Iq="line_breaks",yq="start_chars_hint";function Bq(r){return Lye(r)}Si.createToken=Bq;function Lye(r){var e=r.pattern,t={};if(t.name=r.name,(0,Xs.isUndefined)(e)||(t.PATTERN=e),(0,Xs.has)(r,Tye))throw`The parent property is no longer supported. -See: https://github.com/chevrotain/chevrotain/issues/564#issuecomment-349062346 for details.`;return(0,Xs.has)(r,hq)&&(t.CATEGORIES=r[hq]),(0,kx.augmentTokenTypes)([t]),(0,Xs.has)(r,pq)&&(t.LABEL=r[pq]),(0,Xs.has)(r,dq)&&(t.GROUP=r[dq]),(0,Xs.has)(r,mq)&&(t.POP_MODE=r[mq]),(0,Xs.has)(r,Cq)&&(t.PUSH_MODE=r[Cq]),(0,Xs.has)(r,Eq)&&(t.LONGER_ALT=r[Eq]),(0,Xs.has)(r,Iq)&&(t.LINE_BREAKS=r[Iq]),(0,Xs.has)(r,yq)&&(t.START_CHARS_HINT=r[yq]),t}Si.EOF=Bq({name:"EOF",pattern:Rye.Lexer.NA});(0,kx.augmentTokenTypes)([Si.EOF]);function Oye(r,e,t,i,n,s,o,a){return{image:e,startOffset:t,endOffset:i,startLine:n,endLine:s,startColumn:o,endColumn:a,tokenTypeIdx:r.tokenTypeIdx,tokenType:r}}Si.createTokenInstance=Oye;function Mye(r,e){return(0,kx.tokenStructuredMatcher)(r,e)}Si.tokenMatcher=Mye});var Cn=y(Wt=>{"use strict";var ka=Wt&&Wt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Wt,"__esModule",{value:!0});Wt.serializeProduction=Wt.serializeGrammar=Wt.Terminal=Wt.Alternation=Wt.RepetitionWithSeparator=Wt.Repetition=Wt.RepetitionMandatoryWithSeparator=Wt.RepetitionMandatory=Wt.Option=Wt.Alternative=Wt.Rule=Wt.NonTerminal=Wt.AbstractProduction=void 0;var lr=Gt(),Uye=HA(),ko=function(){function r(e){this._definition=e}return Object.defineProperty(r.prototype,"definition",{get:function(){return this._definition},set:function(e){this._definition=e},enumerable:!1,configurable:!0}),r.prototype.accept=function(e){e.visit(this),(0,lr.forEach)(this.definition,function(t){t.accept(e)})},r}();Wt.AbstractProduction=ko;var bq=function(r){ka(e,r);function e(t){var i=r.call(this,[])||this;return i.idx=1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this.referencedRule!==void 0?this.referencedRule.definition:[]},set:function(t){},enumerable:!1,configurable:!0}),e.prototype.accept=function(t){t.visit(this)},e}(ko);Wt.NonTerminal=bq;var Qq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.orgText="",(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return e}(ko);Wt.Rule=Qq;var Sq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.ignoreAmbiguities=!1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return e}(ko);Wt.Alternative=Sq;var vq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return e}(ko);Wt.Option=vq;var xq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return e}(ko);Wt.RepetitionMandatory=xq;var Pq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return e}(ko);Wt.RepetitionMandatoryWithSeparator=Pq;var Dq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return e}(ko);Wt.Repetition=Dq;var kq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return e}(ko);Wt.RepetitionWithSeparator=kq;var Rq=function(r){ka(e,r);function e(t){var i=r.call(this,t.definition)||this;return i.idx=1,i.ignoreAmbiguities=!1,i.hasPredicates=!1,(0,lr.assign)(i,(0,lr.pick)(t,function(n){return n!==void 0})),i}return Object.defineProperty(e.prototype,"definition",{get:function(){return this._definition},set:function(t){this._definition=t},enumerable:!1,configurable:!0}),e}(ko);Wt.Alternation=Rq;var Ly=function(){function r(e){this.idx=1,(0,lr.assign)(this,(0,lr.pick)(e,function(t){return t!==void 0}))}return r.prototype.accept=function(e){e.visit(this)},r}();Wt.Terminal=Ly;function Kye(r){return(0,lr.map)(r,zd)}Wt.serializeGrammar=Kye;function zd(r){function e(s){return(0,lr.map)(s,zd)}if(r instanceof bq){var t={type:"NonTerminal",name:r.nonTerminalName,idx:r.idx};return(0,lr.isString)(r.label)&&(t.label=r.label),t}else{if(r instanceof Sq)return{type:"Alternative",definition:e(r.definition)};if(r instanceof vq)return{type:"Option",idx:r.idx,definition:e(r.definition)};if(r instanceof xq)return{type:"RepetitionMandatory",idx:r.idx,definition:e(r.definition)};if(r instanceof Pq)return{type:"RepetitionMandatoryWithSeparator",idx:r.idx,separator:zd(new Ly({terminalType:r.separator})),definition:e(r.definition)};if(r instanceof kq)return{type:"RepetitionWithSeparator",idx:r.idx,separator:zd(new Ly({terminalType:r.separator})),definition:e(r.definition)};if(r instanceof Dq)return{type:"Repetition",idx:r.idx,definition:e(r.definition)};if(r instanceof Rq)return{type:"Alternation",idx:r.idx,definition:e(r.definition)};if(r instanceof Ly){var i={type:"Terminal",name:r.terminalType.name,label:(0,Uye.tokenLabel)(r.terminalType),idx:r.idx};(0,lr.isString)(r.label)&&(i.terminalLabel=r.label);var n=r.terminalType.PATTERN;return r.terminalType.PATTERN&&(i.pattern=(0,lr.isRegExp)(n)?n.source:n),i}else{if(r instanceof Qq)return{type:"Rule",name:r.name,orgText:r.orgText,definition:e(r.definition)};throw Error("non exhaustive match")}}}Wt.serializeProduction=zd});var My=y(Oy=>{"use strict";Object.defineProperty(Oy,"__esModule",{value:!0});Oy.RestWalker=void 0;var Rx=Gt(),mn=Cn(),Hye=function(){function r(){}return r.prototype.walk=function(e,t){var i=this;t===void 0&&(t=[]),(0,Rx.forEach)(e.definition,function(n,s){var o=(0,Rx.drop)(e.definition,s+1);if(n instanceof mn.NonTerminal)i.walkProdRef(n,o,t);else if(n instanceof mn.Terminal)i.walkTerminal(n,o,t);else if(n instanceof mn.Alternative)i.walkFlat(n,o,t);else if(n instanceof mn.Option)i.walkOption(n,o,t);else if(n instanceof mn.RepetitionMandatory)i.walkAtLeastOne(n,o,t);else if(n instanceof mn.RepetitionMandatoryWithSeparator)i.walkAtLeastOneSep(n,o,t);else if(n instanceof mn.RepetitionWithSeparator)i.walkManySep(n,o,t);else if(n instanceof mn.Repetition)i.walkMany(n,o,t);else if(n instanceof mn.Alternation)i.walkOr(n,o,t);else throw Error("non exhaustive match")})},r.prototype.walkTerminal=function(e,t,i){},r.prototype.walkProdRef=function(e,t,i){},r.prototype.walkFlat=function(e,t,i){var n=t.concat(i);this.walk(e,n)},r.prototype.walkOption=function(e,t,i){var n=t.concat(i);this.walk(e,n)},r.prototype.walkAtLeastOne=function(e,t,i){var n=[new mn.Option({definition:e.definition})].concat(t,i);this.walk(e,n)},r.prototype.walkAtLeastOneSep=function(e,t,i){var n=Fq(e,t,i);this.walk(e,n)},r.prototype.walkMany=function(e,t,i){var n=[new mn.Option({definition:e.definition})].concat(t,i);this.walk(e,n)},r.prototype.walkManySep=function(e,t,i){var n=Fq(e,t,i);this.walk(e,n)},r.prototype.walkOr=function(e,t,i){var n=this,s=t.concat(i);(0,Rx.forEach)(e.definition,function(o){var a=new mn.Alternative({definition:[o]});n.walk(a,s)})},r}();Oy.RestWalker=Hye;function Fq(r,e,t){var i=[new mn.Option({definition:[new mn.Terminal({terminalType:r.separator})].concat(r.definition)})],n=i.concat(e,t);return n}});var Cf=y(Uy=>{"use strict";Object.defineProperty(Uy,"__esModule",{value:!0});Uy.GAstVisitor=void 0;var Ro=Cn(),Gye=function(){function r(){}return r.prototype.visit=function(e){var t=e;switch(t.constructor){case Ro.NonTerminal:return this.visitNonTerminal(t);case Ro.Alternative:return this.visitAlternative(t);case Ro.Option:return this.visitOption(t);case Ro.RepetitionMandatory:return this.visitRepetitionMandatory(t);case Ro.RepetitionMandatoryWithSeparator:return this.visitRepetitionMandatoryWithSeparator(t);case Ro.RepetitionWithSeparator:return this.visitRepetitionWithSeparator(t);case Ro.Repetition:return this.visitRepetition(t);case Ro.Alternation:return this.visitAlternation(t);case Ro.Terminal:return this.visitTerminal(t);case Ro.Rule:return this.visitRule(t);default:throw Error("non exhaustive match")}},r.prototype.visitNonTerminal=function(e){},r.prototype.visitAlternative=function(e){},r.prototype.visitOption=function(e){},r.prototype.visitRepetition=function(e){},r.prototype.visitRepetitionMandatory=function(e){},r.prototype.visitRepetitionMandatoryWithSeparator=function(e){},r.prototype.visitRepetitionWithSeparator=function(e){},r.prototype.visitAlternation=function(e){},r.prototype.visitTerminal=function(e){},r.prototype.visitRule=function(e){},r}();Uy.GAstVisitor=Gye});var Xd=y(Ui=>{"use strict";var Yye=Ui&&Ui.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Ui,"__esModule",{value:!0});Ui.collectMethods=Ui.DslMethodsCollectorVisitor=Ui.getProductionDslName=Ui.isBranchingProd=Ui.isOptionalProd=Ui.isSequenceProd=void 0;var Vd=Gt(),Qr=Cn(),jye=Cf();function qye(r){return r instanceof Qr.Alternative||r instanceof Qr.Option||r instanceof Qr.Repetition||r instanceof Qr.RepetitionMandatory||r instanceof Qr.RepetitionMandatoryWithSeparator||r instanceof Qr.RepetitionWithSeparator||r instanceof Qr.Terminal||r instanceof Qr.Rule}Ui.isSequenceProd=qye;function Fx(r,e){e===void 0&&(e=[]);var t=r instanceof Qr.Option||r instanceof Qr.Repetition||r instanceof Qr.RepetitionWithSeparator;return t?!0:r instanceof Qr.Alternation?(0,Vd.some)(r.definition,function(i){return Fx(i,e)}):r instanceof Qr.NonTerminal&&(0,Vd.contains)(e,r)?!1:r instanceof Qr.AbstractProduction?(r instanceof Qr.NonTerminal&&e.push(r),(0,Vd.every)(r.definition,function(i){return Fx(i,e)})):!1}Ui.isOptionalProd=Fx;function Jye(r){return r instanceof Qr.Alternation}Ui.isBranchingProd=Jye;function Wye(r){if(r instanceof Qr.NonTerminal)return"SUBRULE";if(r instanceof Qr.Option)return"OPTION";if(r instanceof Qr.Alternation)return"OR";if(r instanceof Qr.RepetitionMandatory)return"AT_LEAST_ONE";if(r instanceof Qr.RepetitionMandatoryWithSeparator)return"AT_LEAST_ONE_SEP";if(r instanceof Qr.RepetitionWithSeparator)return"MANY_SEP";if(r instanceof Qr.Repetition)return"MANY";if(r instanceof Qr.Terminal)return"CONSUME";throw Error("non exhaustive match")}Ui.getProductionDslName=Wye;var Nq=function(r){Yye(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.separator="-",t.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]},t}return e.prototype.reset=function(){this.dslMethods={option:[],alternation:[],repetition:[],repetitionWithSeparator:[],repetitionMandatory:[],repetitionMandatoryWithSeparator:[]}},e.prototype.visitTerminal=function(t){var i=t.terminalType.name+this.separator+"Terminal";(0,Vd.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(t)},e.prototype.visitNonTerminal=function(t){var i=t.nonTerminalName+this.separator+"Terminal";(0,Vd.has)(this.dslMethods,i)||(this.dslMethods[i]=[]),this.dslMethods[i].push(t)},e.prototype.visitOption=function(t){this.dslMethods.option.push(t)},e.prototype.visitRepetitionWithSeparator=function(t){this.dslMethods.repetitionWithSeparator.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.dslMethods.repetitionMandatory.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.dslMethods.repetitionMandatoryWithSeparator.push(t)},e.prototype.visitRepetition=function(t){this.dslMethods.repetition.push(t)},e.prototype.visitAlternation=function(t){this.dslMethods.alternation.push(t)},e}(jye.GAstVisitor);Ui.DslMethodsCollectorVisitor=Nq;var Ky=new Nq;function zye(r){Ky.reset(),r.accept(Ky);var e=Ky.dslMethods;return Ky.reset(),e}Ui.collectMethods=zye});var Tx=y(Fo=>{"use strict";Object.defineProperty(Fo,"__esModule",{value:!0});Fo.firstForTerminal=Fo.firstForBranching=Fo.firstForSequence=Fo.first=void 0;var Hy=Gt(),Tq=Cn(),Nx=Xd();function Gy(r){if(r instanceof Tq.NonTerminal)return Gy(r.referencedRule);if(r instanceof Tq.Terminal)return Mq(r);if((0,Nx.isSequenceProd)(r))return Lq(r);if((0,Nx.isBranchingProd)(r))return Oq(r);throw Error("non exhaustive match")}Fo.first=Gy;function Lq(r){for(var e=[],t=r.definition,i=0,n=t.length>i,s,o=!0;n&&o;)s=t[i],o=(0,Nx.isOptionalProd)(s),e=e.concat(Gy(s)),i=i+1,n=t.length>i;return(0,Hy.uniq)(e)}Fo.firstForSequence=Lq;function Oq(r){var e=(0,Hy.map)(r.definition,function(t){return Gy(t)});return(0,Hy.uniq)((0,Hy.flatten)(e))}Fo.firstForBranching=Oq;function Mq(r){return[r.terminalType]}Fo.firstForTerminal=Mq});var Lx=y(Yy=>{"use strict";Object.defineProperty(Yy,"__esModule",{value:!0});Yy.IN=void 0;Yy.IN="_~IN~_"});var Yq=y(ls=>{"use strict";var Vye=ls&&ls.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(ls,"__esModule",{value:!0});ls.buildInProdFollowPrefix=ls.buildBetweenProdsFollowPrefix=ls.computeAllProdsFollows=ls.ResyncFollowsWalker=void 0;var Xye=My(),_ye=Tx(),Uq=Gt(),Kq=Lx(),Zye=Cn(),Hq=function(r){Vye(e,r);function e(t){var i=r.call(this)||this;return i.topProd=t,i.follows={},i}return e.prototype.startWalking=function(){return this.walk(this.topProd),this.follows},e.prototype.walkTerminal=function(t,i,n){},e.prototype.walkProdRef=function(t,i,n){var s=Gq(t.referencedRule,t.idx)+this.topProd.name,o=i.concat(n),a=new Zye.Alternative({definition:o}),l=(0,_ye.first)(a);this.follows[s]=l},e}(Xye.RestWalker);ls.ResyncFollowsWalker=Hq;function $ye(r){var e={};return(0,Uq.forEach)(r,function(t){var i=new Hq(t).startWalking();(0,Uq.assign)(e,i)}),e}ls.computeAllProdsFollows=$ye;function Gq(r,e){return r.name+e+Kq.IN}ls.buildBetweenProdsFollowPrefix=Gq;function ewe(r){var e=r.terminalType.name;return e+r.idx+Kq.IN}ls.buildInProdFollowPrefix=ewe});var _d=y(Ra=>{"use strict";Object.defineProperty(Ra,"__esModule",{value:!0});Ra.defaultGrammarValidatorErrorProvider=Ra.defaultGrammarResolverErrorProvider=Ra.defaultParserErrorProvider=void 0;var mf=HA(),twe=Gt(),_s=Gt(),Ox=Cn(),jq=Xd();Ra.defaultParserErrorProvider={buildMismatchTokenMessage:function(r){var e=r.expected,t=r.actual,i=r.previous,n=r.ruleName,s=(0,mf.hasTokenLabel)(e),o=s?"--> "+(0,mf.tokenLabel)(e)+" <--":"token of type --> "+e.name+" <--",a="Expecting "+o+" but found --> '"+t.image+"' <--";return a},buildNotAllInputParsedMessage:function(r){var e=r.firstRedundant,t=r.ruleName;return"Redundant input, expecting EOF but found: "+e.image},buildNoViableAltMessage:function(r){var e=r.expectedPathsPerAlt,t=r.actual,i=r.previous,n=r.customUserDescription,s=r.ruleName,o="Expecting: ",a=(0,_s.first)(t).image,l=` -but found: '`+a+"'";if(n)return o+n+l;var c=(0,_s.reduce)(e,function(h,p){return h.concat(p)},[]),u=(0,_s.map)(c,function(h){return"["+(0,_s.map)(h,function(p){return(0,mf.tokenLabel)(p)}).join(", ")+"]"}),g=(0,_s.map)(u,function(h,p){return" "+(p+1)+". "+h}),f=`one of these possible Token sequences: -`+g.join(` -`);return o+f+l},buildEarlyExitMessage:function(r){var e=r.expectedIterationPaths,t=r.actual,i=r.customUserDescription,n=r.ruleName,s="Expecting: ",o=(0,_s.first)(t).image,a=` -but found: '`+o+"'";if(i)return s+i+a;var l=(0,_s.map)(e,function(u){return"["+(0,_s.map)(u,function(g){return(0,mf.tokenLabel)(g)}).join(",")+"]"}),c=`expecting at least one iteration which starts with one of these possible Token sequences:: - `+("<"+l.join(" ,")+">");return s+c+a}};Object.freeze(Ra.defaultParserErrorProvider);Ra.defaultGrammarResolverErrorProvider={buildRuleNotFoundError:function(r,e){var t="Invalid grammar, reference to a rule which is not defined: ->"+e.nonTerminalName+`<- -inside top level rule: ->`+r.name+"<-";return t}};Ra.defaultGrammarValidatorErrorProvider={buildDuplicateFoundError:function(r,e){function t(u){return u instanceof Ox.Terminal?u.terminalType.name:u instanceof Ox.NonTerminal?u.nonTerminalName:""}var i=r.name,n=(0,_s.first)(e),s=n.idx,o=(0,jq.getProductionDslName)(n),a=t(n),l=s>0,c="->"+o+(l?s:"")+"<- "+(a?"with argument: ->"+a+"<-":"")+` - appears more than once (`+e.length+" times) in the top level rule: ->"+i+`<-. - For further details see: https://chevrotain.io/docs/FAQ.html#NUMERICAL_SUFFIXES - `;return c=c.replace(/[ \t]+/g," "),c=c.replace(/\s\s+/g,` -`),c},buildNamespaceConflictError:function(r){var e=`Namespace conflict found in grammar. -`+("The grammar has both a Terminal(Token) and a Non-Terminal(Rule) named: <"+r.name+`>. -`)+`To resolve this make sure each Terminal and Non-Terminal names are unique -This is easy to accomplish by using the convention that Terminal names start with an uppercase letter -and Non-Terminal names start with a lower case letter.`;return e},buildAlternationPrefixAmbiguityError:function(r){var e=(0,_s.map)(r.prefixPath,function(n){return(0,mf.tokenLabel)(n)}).join(", "),t=r.alternation.idx===0?"":r.alternation.idx,i="Ambiguous alternatives: <"+r.ambiguityIndices.join(" ,")+`> due to common lookahead prefix -`+("in inside <"+r.topLevelRule.name+`> Rule, -`)+("<"+e+`> may appears as a prefix path in all these alternatives. -`)+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#COMMON_PREFIX -For Further details.`;return i},buildAlternationAmbiguityError:function(r){var e=(0,_s.map)(r.prefixPath,function(n){return(0,mf.tokenLabel)(n)}).join(", "),t=r.alternation.idx===0?"":r.alternation.idx,i="Ambiguous Alternatives Detected: <"+r.ambiguityIndices.join(" ,")+"> in "+(" inside <"+r.topLevelRule.name+`> Rule, -`)+("<"+e+`> may appears as a prefix path in all these alternatives. -`);return i=i+`See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES -For Further details.`,i},buildEmptyRepetitionError:function(r){var e=(0,jq.getProductionDslName)(r.repetition);r.repetition.idx!==0&&(e+=r.repetition.idx);var t="The repetition <"+e+"> within Rule <"+r.topLevelRule.name+`> can never consume any tokens. -This could lead to an infinite loop.`;return t},buildTokenNameError:function(r){return"deprecated"},buildEmptyAlternationError:function(r){var e="Ambiguous empty alternative: <"+(r.emptyChoiceIdx+1)+">"+(" in inside <"+r.topLevelRule.name+`> Rule. -`)+"Only the last alternative may be an empty alternative.";return e},buildTooManyAlternativesError:function(r){var e=`An Alternation cannot have more than 256 alternatives: -`+(" inside <"+r.topLevelRule.name+`> Rule. - has `+(r.alternation.definition.length+1)+" alternatives.");return e},buildLeftRecursionError:function(r){var e=r.topLevelRule.name,t=twe.map(r.leftRecursionPath,function(s){return s.name}),i=e+" --> "+t.concat([e]).join(" --> "),n=`Left Recursion found in grammar. -`+("rule: <"+e+`> can be invoked from itself (directly or indirectly) -`)+(`without consuming any Tokens. The grammar path that causes this is: - `+i+` -`)+` To fix this refactor your grammar to remove the left recursion. -see: https://en.wikipedia.org/wiki/LL_parser#Left_Factoring.`;return n},buildInvalidRuleNameError:function(r){return"deprecated"},buildDuplicateRuleNameError:function(r){var e;r.topLevelRule instanceof Ox.Rule?e=r.topLevelRule.name:e=r.topLevelRule;var t="Duplicate definition, rule: ->"+e+"<- is already defined in the grammar: ->"+r.grammarName+"<-";return t}}});var Wq=y(GA=>{"use strict";var rwe=GA&&GA.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(GA,"__esModule",{value:!0});GA.GastRefResolverVisitor=GA.resolveGrammar=void 0;var iwe=Hn(),qq=Gt(),nwe=Cf();function swe(r,e){var t=new Jq(r,e);return t.resolveRefs(),t.errors}GA.resolveGrammar=swe;var Jq=function(r){rwe(e,r);function e(t,i){var n=r.call(this)||this;return n.nameToTopRule=t,n.errMsgProvider=i,n.errors=[],n}return e.prototype.resolveRefs=function(){var t=this;(0,qq.forEach)((0,qq.values)(this.nameToTopRule),function(i){t.currTopLevel=i,i.accept(t)})},e.prototype.visitNonTerminal=function(t){var i=this.nameToTopRule[t.nonTerminalName];if(i)t.referencedRule=i;else{var n=this.errMsgProvider.buildRuleNotFoundError(this.currTopLevel,t);this.errors.push({message:n,type:iwe.ParserDefinitionErrorType.UNRESOLVED_SUBRULE_REF,ruleName:this.currTopLevel.name,unresolvedRefName:t.nonTerminalName})}},e}(nwe.GAstVisitor);GA.GastRefResolverVisitor=Jq});var $d=y(Lr=>{"use strict";var Fc=Lr&&Lr.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Lr,"__esModule",{value:!0});Lr.nextPossibleTokensAfter=Lr.possiblePathsFrom=Lr.NextTerminalAfterAtLeastOneSepWalker=Lr.NextTerminalAfterAtLeastOneWalker=Lr.NextTerminalAfterManySepWalker=Lr.NextTerminalAfterManyWalker=Lr.AbstractNextTerminalAfterProductionWalker=Lr.NextAfterTokenWalker=Lr.AbstractNextPossibleTokensWalker=void 0;var zq=My(),Ut=Gt(),owe=Tx(),Dt=Cn(),Vq=function(r){Fc(e,r);function e(t,i){var n=r.call(this)||this;return n.topProd=t,n.path=i,n.possibleTokTypes=[],n.nextProductionName="",n.nextProductionOccurrence=0,n.found=!1,n.isAtEndOfPath=!1,n}return e.prototype.startWalking=function(){if(this.found=!1,this.path.ruleStack[0]!==this.topProd.name)throw Error("The path does not start with the walker's top Rule!");return this.ruleStack=(0,Ut.cloneArr)(this.path.ruleStack).reverse(),this.occurrenceStack=(0,Ut.cloneArr)(this.path.occurrenceStack).reverse(),this.ruleStack.pop(),this.occurrenceStack.pop(),this.updateExpectedNext(),this.walk(this.topProd),this.possibleTokTypes},e.prototype.walk=function(t,i){i===void 0&&(i=[]),this.found||r.prototype.walk.call(this,t,i)},e.prototype.walkProdRef=function(t,i,n){if(t.referencedRule.name===this.nextProductionName&&t.idx===this.nextProductionOccurrence){var s=i.concat(n);this.updateExpectedNext(),this.walk(t.referencedRule,s)}},e.prototype.updateExpectedNext=function(){(0,Ut.isEmpty)(this.ruleStack)?(this.nextProductionName="",this.nextProductionOccurrence=0,this.isAtEndOfPath=!0):(this.nextProductionName=this.ruleStack.pop(),this.nextProductionOccurrence=this.occurrenceStack.pop())},e}(zq.RestWalker);Lr.AbstractNextPossibleTokensWalker=Vq;var awe=function(r){Fc(e,r);function e(t,i){var n=r.call(this,t,i)||this;return n.path=i,n.nextTerminalName="",n.nextTerminalOccurrence=0,n.nextTerminalName=n.path.lastTok.name,n.nextTerminalOccurrence=n.path.lastTokOccurrence,n}return e.prototype.walkTerminal=function(t,i,n){if(this.isAtEndOfPath&&t.terminalType.name===this.nextTerminalName&&t.idx===this.nextTerminalOccurrence&&!this.found){var s=i.concat(n),o=new Dt.Alternative({definition:s});this.possibleTokTypes=(0,owe.first)(o),this.found=!0}},e}(Vq);Lr.NextAfterTokenWalker=awe;var Zd=function(r){Fc(e,r);function e(t,i){var n=r.call(this)||this;return n.topRule=t,n.occurrence=i,n.result={token:void 0,occurrence:void 0,isEndOfRule:void 0},n}return e.prototype.startWalking=function(){return this.walk(this.topRule),this.result},e}(zq.RestWalker);Lr.AbstractNextTerminalAfterProductionWalker=Zd;var Awe=function(r){Fc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkMany=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Ut.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Dt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkMany.call(this,t,i,n)},e}(Zd);Lr.NextTerminalAfterManyWalker=Awe;var lwe=function(r){Fc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkManySep=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Ut.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Dt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkManySep.call(this,t,i,n)},e}(Zd);Lr.NextTerminalAfterManySepWalker=lwe;var cwe=function(r){Fc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkAtLeastOne=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Ut.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Dt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkAtLeastOne.call(this,t,i,n)},e}(Zd);Lr.NextTerminalAfterAtLeastOneWalker=cwe;var uwe=function(r){Fc(e,r);function e(){return r!==null&&r.apply(this,arguments)||this}return e.prototype.walkAtLeastOneSep=function(t,i,n){if(t.idx===this.occurrence){var s=(0,Ut.first)(i.concat(n));this.result.isEndOfRule=s===void 0,s instanceof Dt.Terminal&&(this.result.token=s.terminalType,this.result.occurrence=s.idx)}else r.prototype.walkAtLeastOneSep.call(this,t,i,n)},e}(Zd);Lr.NextTerminalAfterAtLeastOneSepWalker=uwe;function Xq(r,e,t){t===void 0&&(t=[]),t=(0,Ut.cloneArr)(t);var i=[],n=0;function s(c){return c.concat((0,Ut.drop)(r,n+1))}function o(c){var u=Xq(s(c),e,t);return i.concat(u)}for(;t.length=0;ge--){var _=B.definition[ge],L={idx:p,def:_.definition.concat((0,Ut.drop)(h)),ruleStack:C,occurrenceStack:w};g.push(L),g.push(o)}else if(B instanceof Dt.Alternative)g.push({idx:p,def:B.definition.concat((0,Ut.drop)(h)),ruleStack:C,occurrenceStack:w});else if(B instanceof Dt.Rule)g.push(fwe(B,p,C,w));else throw Error("non exhaustive match")}}return u}Lr.nextPossibleTokensAfter=gwe;function fwe(r,e,t,i){var n=(0,Ut.cloneArr)(t);n.push(r.name);var s=(0,Ut.cloneArr)(i);return s.push(1),{idx:e,def:r.definition,ruleStack:n,occurrenceStack:s}}});var eC=y(_t=>{"use strict";var $q=_t&&_t.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(_t,"__esModule",{value:!0});_t.areTokenCategoriesNotUsed=_t.isStrictPrefixOfPath=_t.containsPath=_t.getLookaheadPathsForOptionalProd=_t.getLookaheadPathsForOr=_t.lookAheadSequenceFromAlternatives=_t.buildSingleAlternativeLookaheadFunction=_t.buildAlternativesLookAheadFunc=_t.buildLookaheadFuncForOptionalProd=_t.buildLookaheadFuncForOr=_t.getProdType=_t.PROD_TYPE=void 0;var sr=Gt(),_q=$d(),hwe=My(),jy=df(),YA=Cn(),pwe=Cf(),li;(function(r){r[r.OPTION=0]="OPTION",r[r.REPETITION=1]="REPETITION",r[r.REPETITION_MANDATORY=2]="REPETITION_MANDATORY",r[r.REPETITION_MANDATORY_WITH_SEPARATOR=3]="REPETITION_MANDATORY_WITH_SEPARATOR",r[r.REPETITION_WITH_SEPARATOR=4]="REPETITION_WITH_SEPARATOR",r[r.ALTERNATION=5]="ALTERNATION"})(li=_t.PROD_TYPE||(_t.PROD_TYPE={}));function dwe(r){if(r instanceof YA.Option)return li.OPTION;if(r instanceof YA.Repetition)return li.REPETITION;if(r instanceof YA.RepetitionMandatory)return li.REPETITION_MANDATORY;if(r instanceof YA.RepetitionMandatoryWithSeparator)return li.REPETITION_MANDATORY_WITH_SEPARATOR;if(r instanceof YA.RepetitionWithSeparator)return li.REPETITION_WITH_SEPARATOR;if(r instanceof YA.Alternation)return li.ALTERNATION;throw Error("non exhaustive match")}_t.getProdType=dwe;function Cwe(r,e,t,i,n,s){var o=tJ(r,e,t),a=Kx(o)?jy.tokenStructuredMatcherNoCategories:jy.tokenStructuredMatcher;return s(o,i,a,n)}_t.buildLookaheadFuncForOr=Cwe;function mwe(r,e,t,i,n,s){var o=rJ(r,e,n,t),a=Kx(o)?jy.tokenStructuredMatcherNoCategories:jy.tokenStructuredMatcher;return s(o[0],a,i)}_t.buildLookaheadFuncForOptionalProd=mwe;function Ewe(r,e,t,i){var n=r.length,s=(0,sr.every)(r,function(l){return(0,sr.every)(l,function(c){return c.length===1})});if(e)return function(l){for(var c=(0,sr.map)(l,function(D){return D.GATE}),u=0;u{"use strict";var Hx=zt&&zt.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(zt,"__esModule",{value:!0});zt.checkPrefixAlternativesAmbiguities=zt.validateSomeNonEmptyLookaheadPath=zt.validateTooManyAlts=zt.RepetionCollector=zt.validateAmbiguousAlternationAlternatives=zt.validateEmptyOrAlternative=zt.getFirstNoneTerminal=zt.validateNoLeftRecursion=zt.validateRuleIsOverridden=zt.validateRuleDoesNotAlreadyExist=zt.OccurrenceValidationCollector=zt.identifyProductionForDuplicates=zt.validateGrammar=void 0;var er=Gt(),Sr=Gt(),No=Hn(),Gx=Xd(),Ef=eC(),bwe=$d(),Zs=Cn(),Yx=Cf();function Qwe(r,e,t,i,n){var s=er.map(r,function(h){return Swe(h,i)}),o=er.map(r,function(h){return jx(h,h,i)}),a=[],l=[],c=[];(0,Sr.every)(o,Sr.isEmpty)&&(a=(0,Sr.map)(r,function(h){return AJ(h,i)}),l=(0,Sr.map)(r,function(h){return lJ(h,e,i)}),c=gJ(r,e,i));var u=Pwe(r,t,i),g=(0,Sr.map)(r,function(h){return uJ(h,i)}),f=(0,Sr.map)(r,function(h){return aJ(h,r,n,i)});return er.flatten(s.concat(c,o,a,l,u,g,f))}zt.validateGrammar=Qwe;function Swe(r,e){var t=new oJ;r.accept(t);var i=t.allProductions,n=er.groupBy(i,nJ),s=er.pick(n,function(a){return a.length>1}),o=er.map(er.values(s),function(a){var l=er.first(a),c=e.buildDuplicateFoundError(r,a),u=(0,Gx.getProductionDslName)(l),g={message:c,type:No.ParserDefinitionErrorType.DUPLICATE_PRODUCTIONS,ruleName:r.name,dslName:u,occurrence:l.idx},f=sJ(l);return f&&(g.parameter=f),g});return o}function nJ(r){return(0,Gx.getProductionDslName)(r)+"_#_"+r.idx+"_#_"+sJ(r)}zt.identifyProductionForDuplicates=nJ;function sJ(r){return r instanceof Zs.Terminal?r.terminalType.name:r instanceof Zs.NonTerminal?r.nonTerminalName:""}var oJ=function(r){Hx(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.allProductions=[],t}return e.prototype.visitNonTerminal=function(t){this.allProductions.push(t)},e.prototype.visitOption=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetition=function(t){this.allProductions.push(t)},e.prototype.visitAlternation=function(t){this.allProductions.push(t)},e.prototype.visitTerminal=function(t){this.allProductions.push(t)},e}(Yx.GAstVisitor);zt.OccurrenceValidationCollector=oJ;function aJ(r,e,t,i){var n=[],s=(0,Sr.reduce)(e,function(a,l){return l.name===r.name?a+1:a},0);if(s>1){var o=i.buildDuplicateRuleNameError({topLevelRule:r,grammarName:t});n.push({message:o,type:No.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:r.name})}return n}zt.validateRuleDoesNotAlreadyExist=aJ;function vwe(r,e,t){var i=[],n;return er.contains(e,r)||(n="Invalid rule override, rule: ->"+r+"<- cannot be overridden in the grammar: ->"+t+"<-as it is not defined in any of the super grammars ",i.push({message:n,type:No.ParserDefinitionErrorType.INVALID_RULE_OVERRIDE,ruleName:r})),i}zt.validateRuleIsOverridden=vwe;function jx(r,e,t,i){i===void 0&&(i=[]);var n=[],s=tC(e.definition);if(er.isEmpty(s))return[];var o=r.name,a=er.contains(s,r);a&&n.push({message:t.buildLeftRecursionError({topLevelRule:r,leftRecursionPath:i}),type:No.ParserDefinitionErrorType.LEFT_RECURSION,ruleName:o});var l=er.difference(s,i.concat([r])),c=er.map(l,function(u){var g=er.cloneArr(i);return g.push(u),jx(r,u,t,g)});return n.concat(er.flatten(c))}zt.validateNoLeftRecursion=jx;function tC(r){var e=[];if(er.isEmpty(r))return e;var t=er.first(r);if(t instanceof Zs.NonTerminal)e.push(t.referencedRule);else if(t instanceof Zs.Alternative||t instanceof Zs.Option||t instanceof Zs.RepetitionMandatory||t instanceof Zs.RepetitionMandatoryWithSeparator||t instanceof Zs.RepetitionWithSeparator||t instanceof Zs.Repetition)e=e.concat(tC(t.definition));else if(t instanceof Zs.Alternation)e=er.flatten(er.map(t.definition,function(o){return tC(o.definition)}));else if(!(t instanceof Zs.Terminal))throw Error("non exhaustive match");var i=(0,Gx.isOptionalProd)(t),n=r.length>1;if(i&&n){var s=er.drop(r);return e.concat(tC(s))}else return e}zt.getFirstNoneTerminal=tC;var qx=function(r){Hx(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.alternations=[],t}return e.prototype.visitAlternation=function(t){this.alternations.push(t)},e}(Yx.GAstVisitor);function AJ(r,e){var t=new qx;r.accept(t);var i=t.alternations,n=er.reduce(i,function(s,o){var a=er.dropRight(o.definition),l=er.map(a,function(c,u){var g=(0,bwe.nextPossibleTokensAfter)([c],[],null,1);return er.isEmpty(g)?{message:e.buildEmptyAlternationError({topLevelRule:r,alternation:o,emptyChoiceIdx:u}),type:No.ParserDefinitionErrorType.NONE_LAST_EMPTY_ALT,ruleName:r.name,occurrence:o.idx,alternative:u+1}:null});return s.concat(er.compact(l))},[]);return n}zt.validateEmptyOrAlternative=AJ;function lJ(r,e,t){var i=new qx;r.accept(i);var n=i.alternations;n=(0,Sr.reject)(n,function(o){return o.ignoreAmbiguities===!0});var s=er.reduce(n,function(o,a){var l=a.idx,c=a.maxLookahead||e,u=(0,Ef.getLookaheadPathsForOr)(l,r,c,a),g=xwe(u,a,r,t),f=fJ(u,a,r,t);return o.concat(g,f)},[]);return s}zt.validateAmbiguousAlternationAlternatives=lJ;var cJ=function(r){Hx(e,r);function e(){var t=r!==null&&r.apply(this,arguments)||this;return t.allProductions=[],t}return e.prototype.visitRepetitionWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatory=function(t){this.allProductions.push(t)},e.prototype.visitRepetitionMandatoryWithSeparator=function(t){this.allProductions.push(t)},e.prototype.visitRepetition=function(t){this.allProductions.push(t)},e}(Yx.GAstVisitor);zt.RepetionCollector=cJ;function uJ(r,e){var t=new qx;r.accept(t);var i=t.alternations,n=er.reduce(i,function(s,o){return o.definition.length>255&&s.push({message:e.buildTooManyAlternativesError({topLevelRule:r,alternation:o}),type:No.ParserDefinitionErrorType.TOO_MANY_ALTS,ruleName:r.name,occurrence:o.idx}),s},[]);return n}zt.validateTooManyAlts=uJ;function gJ(r,e,t){var i=[];return(0,Sr.forEach)(r,function(n){var s=new cJ;n.accept(s);var o=s.allProductions;(0,Sr.forEach)(o,function(a){var l=(0,Ef.getProdType)(a),c=a.maxLookahead||e,u=a.idx,g=(0,Ef.getLookaheadPathsForOptionalProd)(u,n,l,c),f=g[0];if((0,Sr.isEmpty)((0,Sr.flatten)(f))){var h=t.buildEmptyRepetitionError({topLevelRule:n,repetition:a});i.push({message:h,type:No.ParserDefinitionErrorType.NO_NON_EMPTY_LOOKAHEAD,ruleName:n.name})}})}),i}zt.validateSomeNonEmptyLookaheadPath=gJ;function xwe(r,e,t,i){var n=[],s=(0,Sr.reduce)(r,function(a,l,c){return e.definition[c].ignoreAmbiguities===!0||(0,Sr.forEach)(l,function(u){var g=[c];(0,Sr.forEach)(r,function(f,h){c!==h&&(0,Ef.containsPath)(f,u)&&e.definition[h].ignoreAmbiguities!==!0&&g.push(h)}),g.length>1&&!(0,Ef.containsPath)(n,u)&&(n.push(u),a.push({alts:g,path:u}))}),a},[]),o=er.map(s,function(a){var l=(0,Sr.map)(a.alts,function(u){return u+1}),c=i.buildAlternationAmbiguityError({topLevelRule:t,alternation:e,ambiguityIndices:l,prefixPath:a.path});return{message:c,type:No.ParserDefinitionErrorType.AMBIGUOUS_ALTS,ruleName:t.name,occurrence:e.idx,alternatives:[a.alts]}});return o}function fJ(r,e,t,i){var n=[],s=(0,Sr.reduce)(r,function(o,a,l){var c=(0,Sr.map)(a,function(u){return{idx:l,path:u}});return o.concat(c)},[]);return(0,Sr.forEach)(s,function(o){var a=e.definition[o.idx];if(a.ignoreAmbiguities!==!0){var l=o.idx,c=o.path,u=(0,Sr.findAll)(s,function(f){return e.definition[f.idx].ignoreAmbiguities!==!0&&f.idx{"use strict";Object.defineProperty(If,"__esModule",{value:!0});If.validateGrammar=If.resolveGrammar=void 0;var Wx=Gt(),Dwe=Wq(),kwe=Jx(),hJ=_d();function Rwe(r){r=(0,Wx.defaults)(r,{errMsgProvider:hJ.defaultGrammarResolverErrorProvider});var e={};return(0,Wx.forEach)(r.rules,function(t){e[t.name]=t}),(0,Dwe.resolveGrammar)(e,r.errMsgProvider)}If.resolveGrammar=Rwe;function Fwe(r){return r=(0,Wx.defaults)(r,{errMsgProvider:hJ.defaultGrammarValidatorErrorProvider}),(0,kwe.validateGrammar)(r.rules,r.maxLookahead,r.tokenTypes,r.errMsgProvider,r.grammarName)}If.validateGrammar=Fwe});var yf=y(En=>{"use strict";var rC=En&&En.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(En,"__esModule",{value:!0});En.EarlyExitException=En.NotAllInputParsedException=En.NoViableAltException=En.MismatchedTokenException=En.isRecognitionException=void 0;var Nwe=Gt(),dJ="MismatchedTokenException",CJ="NoViableAltException",mJ="EarlyExitException",EJ="NotAllInputParsedException",IJ=[dJ,CJ,mJ,EJ];Object.freeze(IJ);function Twe(r){return(0,Nwe.contains)(IJ,r.name)}En.isRecognitionException=Twe;var qy=function(r){rC(e,r);function e(t,i){var n=this.constructor,s=r.call(this,t)||this;return s.token=i,s.resyncedTokens=[],Object.setPrototypeOf(s,n.prototype),Error.captureStackTrace&&Error.captureStackTrace(s,s.constructor),s}return e}(Error),Lwe=function(r){rC(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=dJ,s}return e}(qy);En.MismatchedTokenException=Lwe;var Owe=function(r){rC(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=CJ,s}return e}(qy);En.NoViableAltException=Owe;var Mwe=function(r){rC(e,r);function e(t,i){var n=r.call(this,t,i)||this;return n.name=EJ,n}return e}(qy);En.NotAllInputParsedException=Mwe;var Uwe=function(r){rC(e,r);function e(t,i,n){var s=r.call(this,t,i)||this;return s.previousToken=n,s.name=mJ,s}return e}(qy);En.EarlyExitException=Uwe});var Vx=y(Ki=>{"use strict";Object.defineProperty(Ki,"__esModule",{value:!0});Ki.attemptInRepetitionRecovery=Ki.Recoverable=Ki.InRuleRecoveryException=Ki.IN_RULE_RECOVERY_EXCEPTION=Ki.EOF_FOLLOW_KEY=void 0;var Jy=HA(),cs=Gt(),Kwe=yf(),Hwe=Lx(),Gwe=Hn();Ki.EOF_FOLLOW_KEY={};Ki.IN_RULE_RECOVERY_EXCEPTION="InRuleRecoveryException";function zx(r){this.name=Ki.IN_RULE_RECOVERY_EXCEPTION,this.message=r}Ki.InRuleRecoveryException=zx;zx.prototype=Error.prototype;var Ywe=function(){function r(){}return r.prototype.initRecoverable=function(e){this.firstAfterRepMap={},this.resyncFollows={},this.recoveryEnabled=(0,cs.has)(e,"recoveryEnabled")?e.recoveryEnabled:Gwe.DEFAULT_PARSER_CONFIG.recoveryEnabled,this.recoveryEnabled&&(this.attemptInRepetitionRecovery=yJ)},r.prototype.getTokenToInsert=function(e){var t=(0,Jy.createTokenInstance)(e,"",NaN,NaN,NaN,NaN,NaN,NaN);return t.isInsertedInRecovery=!0,t},r.prototype.canTokenTypeBeInsertedInRecovery=function(e){return!0},r.prototype.tryInRepetitionRecovery=function(e,t,i,n){for(var s=this,o=this.findReSyncTokenType(),a=this.exportLexerState(),l=[],c=!1,u=this.LA(1),g=this.LA(1),f=function(){var h=s.LA(0),p=s.errorMessageProvider.buildMismatchTokenMessage({expected:n,actual:u,previous:h,ruleName:s.getCurrRuleFullName()}),C=new Kwe.MismatchedTokenException(p,u,s.LA(0));C.resyncedTokens=(0,cs.dropRight)(l),s.SAVE_ERROR(C)};!c;)if(this.tokenMatcher(g,n)){f();return}else if(i.call(this)){f(),e.apply(this,t);return}else this.tokenMatcher(g,o)?c=!0:(g=this.SKIP_TOKEN(),this.addToResyncTokens(g,l));this.importLexerState(a)},r.prototype.shouldInRepetitionRecoveryBeTried=function(e,t,i){return!(i===!1||e===void 0||t===void 0||this.tokenMatcher(this.LA(1),e)||this.isBackTracking()||this.canPerformInRuleRecovery(e,this.getFollowsForInRuleRecovery(e,t)))},r.prototype.getFollowsForInRuleRecovery=function(e,t){var i=this.getCurrentGrammarPath(e,t),n=this.getNextPossibleTokenTypes(i);return n},r.prototype.tryInRuleRecovery=function(e,t){if(this.canRecoverWithSingleTokenInsertion(e,t)){var i=this.getTokenToInsert(e);return i}if(this.canRecoverWithSingleTokenDeletion(e)){var n=this.SKIP_TOKEN();return this.consumeToken(),n}throw new zx("sad sad panda")},r.prototype.canPerformInRuleRecovery=function(e,t){return this.canRecoverWithSingleTokenInsertion(e,t)||this.canRecoverWithSingleTokenDeletion(e)},r.prototype.canRecoverWithSingleTokenInsertion=function(e,t){var i=this;if(!this.canTokenTypeBeInsertedInRecovery(e)||(0,cs.isEmpty)(t))return!1;var n=this.LA(1),s=(0,cs.find)(t,function(o){return i.tokenMatcher(n,o)})!==void 0;return s},r.prototype.canRecoverWithSingleTokenDeletion=function(e){var t=this.tokenMatcher(this.LA(2),e);return t},r.prototype.isInCurrentRuleReSyncSet=function(e){var t=this.getCurrFollowKey(),i=this.getFollowSetFromFollowKey(t);return(0,cs.contains)(i,e)},r.prototype.findReSyncTokenType=function(){for(var e=this.flattenFollowSet(),t=this.LA(1),i=2;;){var n=t.tokenType;if((0,cs.contains)(e,n))return n;t=this.LA(i),i++}},r.prototype.getCurrFollowKey=function(){if(this.RULE_STACK.length===1)return Ki.EOF_FOLLOW_KEY;var e=this.getLastExplicitRuleShortName(),t=this.getLastExplicitRuleOccurrenceIndex(),i=this.getPreviousExplicitRuleShortName();return{ruleName:this.shortRuleNameToFullName(e),idxInCallingRule:t,inRule:this.shortRuleNameToFullName(i)}},r.prototype.buildFullFollowKeyStack=function(){var e=this,t=this.RULE_STACK,i=this.RULE_OCCURRENCE_STACK;return(0,cs.map)(t,function(n,s){return s===0?Ki.EOF_FOLLOW_KEY:{ruleName:e.shortRuleNameToFullName(n),idxInCallingRule:i[s],inRule:e.shortRuleNameToFullName(t[s-1])}})},r.prototype.flattenFollowSet=function(){var e=this,t=(0,cs.map)(this.buildFullFollowKeyStack(),function(i){return e.getFollowSetFromFollowKey(i)});return(0,cs.flatten)(t)},r.prototype.getFollowSetFromFollowKey=function(e){if(e===Ki.EOF_FOLLOW_KEY)return[Jy.EOF];var t=e.ruleName+e.idxInCallingRule+Hwe.IN+e.inRule;return this.resyncFollows[t]},r.prototype.addToResyncTokens=function(e,t){return this.tokenMatcher(e,Jy.EOF)||t.push(e),t},r.prototype.reSyncTo=function(e){for(var t=[],i=this.LA(1);this.tokenMatcher(i,e)===!1;)i=this.SKIP_TOKEN(),this.addToResyncTokens(i,t);return(0,cs.dropRight)(t)},r.prototype.attemptInRepetitionRecovery=function(e,t,i,n,s,o,a){},r.prototype.getCurrentGrammarPath=function(e,t){var i=this.getHumanReadableRuleStack(),n=(0,cs.cloneArr)(this.RULE_OCCURRENCE_STACK),s={ruleStack:i,occurrenceStack:n,lastTok:e,lastTokOccurrence:t};return s},r.prototype.getHumanReadableRuleStack=function(){var e=this;return(0,cs.map)(this.RULE_STACK,function(t){return e.shortRuleNameToFullName(t)})},r}();Ki.Recoverable=Ywe;function yJ(r,e,t,i,n,s,o){var a=this.getKeyForAutomaticLookahead(i,n),l=this.firstAfterRepMap[a];if(l===void 0){var c=this.getCurrRuleFullName(),u=this.getGAstProductions()[c],g=new s(u,n);l=g.startWalking(),this.firstAfterRepMap[a]=l}var f=l.token,h=l.occurrence,p=l.isEndOfRule;this.RULE_STACK.length===1&&p&&f===void 0&&(f=Jy.EOF,h=1),this.shouldInRepetitionRecoveryBeTried(f,h,o)&&this.tryInRepetitionRecovery(r,e,t,f)}Ki.attemptInRepetitionRecovery=yJ});var Wy=y(qt=>{"use strict";Object.defineProperty(qt,"__esModule",{value:!0});qt.getKeyForAutomaticLookahead=qt.AT_LEAST_ONE_SEP_IDX=qt.MANY_SEP_IDX=qt.AT_LEAST_ONE_IDX=qt.MANY_IDX=qt.OPTION_IDX=qt.OR_IDX=qt.BITS_FOR_ALT_IDX=qt.BITS_FOR_RULE_IDX=qt.BITS_FOR_OCCURRENCE_IDX=qt.BITS_FOR_METHOD_TYPE=void 0;qt.BITS_FOR_METHOD_TYPE=4;qt.BITS_FOR_OCCURRENCE_IDX=8;qt.BITS_FOR_RULE_IDX=12;qt.BITS_FOR_ALT_IDX=8;qt.OR_IDX=1<{"use strict";Object.defineProperty(zy,"__esModule",{value:!0});zy.LooksAhead=void 0;var Fa=eC(),$s=Gt(),wJ=Hn(),Na=Wy(),Nc=Xd(),qwe=function(){function r(){}return r.prototype.initLooksAhead=function(e){this.dynamicTokensEnabled=(0,$s.has)(e,"dynamicTokensEnabled")?e.dynamicTokensEnabled:wJ.DEFAULT_PARSER_CONFIG.dynamicTokensEnabled,this.maxLookahead=(0,$s.has)(e,"maxLookahead")?e.maxLookahead:wJ.DEFAULT_PARSER_CONFIG.maxLookahead,this.lookAheadFuncsCache=(0,$s.isES2015MapSupported)()?new Map:[],(0,$s.isES2015MapSupported)()?(this.getLaFuncFromCache=this.getLaFuncFromMap,this.setLaFuncCache=this.setLaFuncCacheUsingMap):(this.getLaFuncFromCache=this.getLaFuncFromObj,this.setLaFuncCache=this.setLaFuncUsingObj)},r.prototype.preComputeLookaheadFunctions=function(e){var t=this;(0,$s.forEach)(e,function(i){t.TRACE_INIT(i.name+" Rule Lookahead",function(){var n=(0,Nc.collectMethods)(i),s=n.alternation,o=n.repetition,a=n.option,l=n.repetitionMandatory,c=n.repetitionMandatoryWithSeparator,u=n.repetitionWithSeparator;(0,$s.forEach)(s,function(g){var f=g.idx===0?"":g.idx;t.TRACE_INIT(""+(0,Nc.getProductionDslName)(g)+f,function(){var h=(0,Fa.buildLookaheadFuncForOr)(g.idx,i,g.maxLookahead||t.maxLookahead,g.hasPredicates,t.dynamicTokensEnabled,t.lookAheadBuilderForAlternatives),p=(0,Na.getKeyForAutomaticLookahead)(t.fullRuleNameToShort[i.name],Na.OR_IDX,g.idx);t.setLaFuncCache(p,h)})}),(0,$s.forEach)(o,function(g){t.computeLookaheadFunc(i,g.idx,Na.MANY_IDX,Fa.PROD_TYPE.REPETITION,g.maxLookahead,(0,Nc.getProductionDslName)(g))}),(0,$s.forEach)(a,function(g){t.computeLookaheadFunc(i,g.idx,Na.OPTION_IDX,Fa.PROD_TYPE.OPTION,g.maxLookahead,(0,Nc.getProductionDslName)(g))}),(0,$s.forEach)(l,function(g){t.computeLookaheadFunc(i,g.idx,Na.AT_LEAST_ONE_IDX,Fa.PROD_TYPE.REPETITION_MANDATORY,g.maxLookahead,(0,Nc.getProductionDslName)(g))}),(0,$s.forEach)(c,function(g){t.computeLookaheadFunc(i,g.idx,Na.AT_LEAST_ONE_SEP_IDX,Fa.PROD_TYPE.REPETITION_MANDATORY_WITH_SEPARATOR,g.maxLookahead,(0,Nc.getProductionDslName)(g))}),(0,$s.forEach)(u,function(g){t.computeLookaheadFunc(i,g.idx,Na.MANY_SEP_IDX,Fa.PROD_TYPE.REPETITION_WITH_SEPARATOR,g.maxLookahead,(0,Nc.getProductionDslName)(g))})})})},r.prototype.computeLookaheadFunc=function(e,t,i,n,s,o){var a=this;this.TRACE_INIT(""+o+(t===0?"":t),function(){var l=(0,Fa.buildLookaheadFuncForOptionalProd)(t,e,s||a.maxLookahead,a.dynamicTokensEnabled,n,a.lookAheadBuilderForOptional),c=(0,Na.getKeyForAutomaticLookahead)(a.fullRuleNameToShort[e.name],i,t);a.setLaFuncCache(c,l)})},r.prototype.lookAheadBuilderForOptional=function(e,t,i){return(0,Fa.buildSingleAlternativeLookaheadFunction)(e,t,i)},r.prototype.lookAheadBuilderForAlternatives=function(e,t,i,n){return(0,Fa.buildAlternativesLookAheadFunc)(e,t,i,n)},r.prototype.getKeyForAutomaticLookahead=function(e,t){var i=this.getLastExplicitRuleShortName();return(0,Na.getKeyForAutomaticLookahead)(i,e,t)},r.prototype.getLaFuncFromCache=function(e){},r.prototype.getLaFuncFromMap=function(e){return this.lookAheadFuncsCache.get(e)},r.prototype.getLaFuncFromObj=function(e){return this.lookAheadFuncsCache[e]},r.prototype.setLaFuncCache=function(e,t){},r.prototype.setLaFuncCacheUsingMap=function(e,t){this.lookAheadFuncsCache.set(e,t)},r.prototype.setLaFuncUsingObj=function(e,t){this.lookAheadFuncsCache[e]=t},r}();zy.LooksAhead=qwe});var bJ=y(To=>{"use strict";Object.defineProperty(To,"__esModule",{value:!0});To.addNoneTerminalToCst=To.addTerminalToCst=To.setNodeLocationFull=To.setNodeLocationOnlyOffset=void 0;function Jwe(r,e){isNaN(r.startOffset)===!0?(r.startOffset=e.startOffset,r.endOffset=e.endOffset):r.endOffset{"use strict";Object.defineProperty(jA,"__esModule",{value:!0});jA.defineNameProp=jA.functionName=jA.classNameFromInstance=void 0;var Xwe=Gt();function _we(r){return SJ(r.constructor)}jA.classNameFromInstance=_we;var QJ="name";function SJ(r){var e=r.name;return e||"anonymous"}jA.functionName=SJ;function Zwe(r,e){var t=Object.getOwnPropertyDescriptor(r,QJ);return(0,Xwe.isUndefined)(t)||t.configurable?(Object.defineProperty(r,QJ,{enumerable:!1,configurable:!0,writable:!1,value:e}),!0):!1}jA.defineNameProp=Zwe});var kJ=y(vi=>{"use strict";Object.defineProperty(vi,"__esModule",{value:!0});vi.validateRedundantMethods=vi.validateMissingCstMethods=vi.validateVisitor=vi.CstVisitorDefinitionError=vi.createBaseVisitorConstructorWithDefaults=vi.createBaseSemanticVisitorConstructor=vi.defaultVisit=void 0;var us=Gt(),iC=Xx();function vJ(r,e){for(var t=(0,us.keys)(r),i=t.length,n=0;n: - `+(""+s.join(` - -`).replace(/\n/g,` - `)))}}};return t.prototype=i,t.prototype.constructor=t,t._RULE_NAMES=e,t}vi.createBaseSemanticVisitorConstructor=$we;function eBe(r,e,t){var i=function(){};(0,iC.defineNameProp)(i,r+"BaseSemanticsWithDefaults");var n=Object.create(t.prototype);return(0,us.forEach)(e,function(s){n[s]=vJ}),i.prototype=n,i.prototype.constructor=i,i}vi.createBaseVisitorConstructorWithDefaults=eBe;var _x;(function(r){r[r.REDUNDANT_METHOD=0]="REDUNDANT_METHOD",r[r.MISSING_METHOD=1]="MISSING_METHOD"})(_x=vi.CstVisitorDefinitionError||(vi.CstVisitorDefinitionError={}));function xJ(r,e){var t=PJ(r,e),i=DJ(r,e);return t.concat(i)}vi.validateVisitor=xJ;function PJ(r,e){var t=(0,us.map)(e,function(i){if(!(0,us.isFunction)(r[i]))return{msg:"Missing visitor method: <"+i+"> on "+(0,iC.functionName)(r.constructor)+" CST Visitor.",type:_x.MISSING_METHOD,methodName:i}});return(0,us.compact)(t)}vi.validateMissingCstMethods=PJ;var tBe=["constructor","visit","validateVisitor"];function DJ(r,e){var t=[];for(var i in r)(0,us.isFunction)(r[i])&&!(0,us.contains)(tBe,i)&&!(0,us.contains)(e,i)&&t.push({msg:"Redundant visitor method: <"+i+"> on "+(0,iC.functionName)(r.constructor)+` CST Visitor -There is no Grammar Rule corresponding to this method's name. -`,type:_x.REDUNDANT_METHOD,methodName:i});return t}vi.validateRedundantMethods=DJ});var FJ=y(Vy=>{"use strict";Object.defineProperty(Vy,"__esModule",{value:!0});Vy.TreeBuilder=void 0;var wf=bJ(),ti=Gt(),RJ=kJ(),rBe=Hn(),iBe=function(){function r(){}return r.prototype.initTreeBuilder=function(e){if(this.CST_STACK=[],this.outputCst=e.outputCst,this.nodeLocationTracking=(0,ti.has)(e,"nodeLocationTracking")?e.nodeLocationTracking:rBe.DEFAULT_PARSER_CONFIG.nodeLocationTracking,!this.outputCst)this.cstInvocationStateUpdate=ti.NOOP,this.cstFinallyStateUpdate=ti.NOOP,this.cstPostTerminal=ti.NOOP,this.cstPostNonTerminal=ti.NOOP,this.cstPostRule=ti.NOOP;else if(/full/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=wf.setNodeLocationFull,this.setNodeLocationFromNode=wf.setNodeLocationFull,this.cstPostRule=ti.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationFullRecovery):(this.setNodeLocationFromToken=ti.NOOP,this.setNodeLocationFromNode=ti.NOOP,this.cstPostRule=this.cstPostRuleFull,this.setInitialNodeLocation=this.setInitialNodeLocationFullRegular);else if(/onlyOffset/i.test(this.nodeLocationTracking))this.recoveryEnabled?(this.setNodeLocationFromToken=wf.setNodeLocationOnlyOffset,this.setNodeLocationFromNode=wf.setNodeLocationOnlyOffset,this.cstPostRule=ti.NOOP,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRecovery):(this.setNodeLocationFromToken=ti.NOOP,this.setNodeLocationFromNode=ti.NOOP,this.cstPostRule=this.cstPostRuleOnlyOffset,this.setInitialNodeLocation=this.setInitialNodeLocationOnlyOffsetRegular);else if(/none/i.test(this.nodeLocationTracking))this.setNodeLocationFromToken=ti.NOOP,this.setNodeLocationFromNode=ti.NOOP,this.cstPostRule=ti.NOOP,this.setInitialNodeLocation=ti.NOOP;else throw Error('Invalid config option: "'+e.nodeLocationTracking+'"')},r.prototype.setInitialNodeLocationOnlyOffsetRecovery=function(e){e.location={startOffset:NaN,endOffset:NaN}},r.prototype.setInitialNodeLocationOnlyOffsetRegular=function(e){e.location={startOffset:this.LA(1).startOffset,endOffset:NaN}},r.prototype.setInitialNodeLocationFullRecovery=function(e){e.location={startOffset:NaN,startLine:NaN,startColumn:NaN,endOffset:NaN,endLine:NaN,endColumn:NaN}},r.prototype.setInitialNodeLocationFullRegular=function(e){var t=this.LA(1);e.location={startOffset:t.startOffset,startLine:t.startLine,startColumn:t.startColumn,endOffset:NaN,endLine:NaN,endColumn:NaN}},r.prototype.cstInvocationStateUpdate=function(e,t){var i={name:e,children:{}};this.setInitialNodeLocation(i),this.CST_STACK.push(i)},r.prototype.cstFinallyStateUpdate=function(){this.CST_STACK.pop()},r.prototype.cstPostRuleFull=function(e){var t=this.LA(0),i=e.location;i.startOffset<=t.startOffset?(i.endOffset=t.endOffset,i.endLine=t.endLine,i.endColumn=t.endColumn):(i.startOffset=NaN,i.startLine=NaN,i.startColumn=NaN)},r.prototype.cstPostRuleOnlyOffset=function(e){var t=this.LA(0),i=e.location;i.startOffset<=t.startOffset?i.endOffset=t.endOffset:i.startOffset=NaN},r.prototype.cstPostTerminal=function(e,t){var i=this.CST_STACK[this.CST_STACK.length-1];(0,wf.addTerminalToCst)(i,t,e),this.setNodeLocationFromToken(i.location,t)},r.prototype.cstPostNonTerminal=function(e,t){var i=this.CST_STACK[this.CST_STACK.length-1];(0,wf.addNoneTerminalToCst)(i,t,e),this.setNodeLocationFromNode(i.location,e.location)},r.prototype.getBaseCstVisitorConstructor=function(){if((0,ti.isUndefined)(this.baseCstVisitorConstructor)){var e=(0,RJ.createBaseSemanticVisitorConstructor)(this.className,(0,ti.keys)(this.gastProductionsCache));return this.baseCstVisitorConstructor=e,e}return this.baseCstVisitorConstructor},r.prototype.getBaseCstVisitorConstructorWithDefaults=function(){if((0,ti.isUndefined)(this.baseCstVisitorWithDefaultsConstructor)){var e=(0,RJ.createBaseVisitorConstructorWithDefaults)(this.className,(0,ti.keys)(this.gastProductionsCache),this.getBaseCstVisitorConstructor());return this.baseCstVisitorWithDefaultsConstructor=e,e}return this.baseCstVisitorWithDefaultsConstructor},r.prototype.getLastExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-1]},r.prototype.getPreviousExplicitRuleShortName=function(){var e=this.RULE_STACK;return e[e.length-2]},r.prototype.getLastExplicitRuleOccurrenceIndex=function(){var e=this.RULE_OCCURRENCE_STACK;return e[e.length-1]},r}();Vy.TreeBuilder=iBe});var TJ=y(Xy=>{"use strict";Object.defineProperty(Xy,"__esModule",{value:!0});Xy.LexerAdapter=void 0;var NJ=Hn(),nBe=function(){function r(){}return r.prototype.initLexerAdapter=function(){this.tokVector=[],this.tokVectorLength=0,this.currIdx=-1},Object.defineProperty(r.prototype,"input",{get:function(){return this.tokVector},set:function(e){if(this.selfAnalysisDone!==!0)throw Error("Missing invocation at the end of the Parser's constructor.");this.reset(),this.tokVector=e,this.tokVectorLength=e.length},enumerable:!1,configurable:!0}),r.prototype.SKIP_TOKEN=function(){return this.currIdx<=this.tokVector.length-2?(this.consumeToken(),this.LA(1)):NJ.END_OF_FILE},r.prototype.LA=function(e){var t=this.currIdx+e;return t<0||this.tokVectorLength<=t?NJ.END_OF_FILE:this.tokVector[t]},r.prototype.consumeToken=function(){this.currIdx++},r.prototype.exportLexerState=function(){return this.currIdx},r.prototype.importLexerState=function(e){this.currIdx=e},r.prototype.resetLexerState=function(){this.currIdx=-1},r.prototype.moveToTerminatedState=function(){this.currIdx=this.tokVector.length-1},r.prototype.getLexerPosition=function(){return this.exportLexerState()},r}();Xy.LexerAdapter=nBe});var OJ=y(_y=>{"use strict";Object.defineProperty(_y,"__esModule",{value:!0});_y.RecognizerApi=void 0;var LJ=Gt(),sBe=yf(),Zx=Hn(),oBe=_d(),aBe=Jx(),ABe=Cn(),lBe=function(){function r(){}return r.prototype.ACTION=function(e){return e.call(this)},r.prototype.consume=function(e,t,i){return this.consumeInternal(t,e,i)},r.prototype.subrule=function(e,t,i){return this.subruleInternal(t,e,i)},r.prototype.option=function(e,t){return this.optionInternal(t,e)},r.prototype.or=function(e,t){return this.orInternal(t,e)},r.prototype.many=function(e,t){return this.manyInternal(e,t)},r.prototype.atLeastOne=function(e,t){return this.atLeastOneInternal(e,t)},r.prototype.CONSUME=function(e,t){return this.consumeInternal(e,0,t)},r.prototype.CONSUME1=function(e,t){return this.consumeInternal(e,1,t)},r.prototype.CONSUME2=function(e,t){return this.consumeInternal(e,2,t)},r.prototype.CONSUME3=function(e,t){return this.consumeInternal(e,3,t)},r.prototype.CONSUME4=function(e,t){return this.consumeInternal(e,4,t)},r.prototype.CONSUME5=function(e,t){return this.consumeInternal(e,5,t)},r.prototype.CONSUME6=function(e,t){return this.consumeInternal(e,6,t)},r.prototype.CONSUME7=function(e,t){return this.consumeInternal(e,7,t)},r.prototype.CONSUME8=function(e,t){return this.consumeInternal(e,8,t)},r.prototype.CONSUME9=function(e,t){return this.consumeInternal(e,9,t)},r.prototype.SUBRULE=function(e,t){return this.subruleInternal(e,0,t)},r.prototype.SUBRULE1=function(e,t){return this.subruleInternal(e,1,t)},r.prototype.SUBRULE2=function(e,t){return this.subruleInternal(e,2,t)},r.prototype.SUBRULE3=function(e,t){return this.subruleInternal(e,3,t)},r.prototype.SUBRULE4=function(e,t){return this.subruleInternal(e,4,t)},r.prototype.SUBRULE5=function(e,t){return this.subruleInternal(e,5,t)},r.prototype.SUBRULE6=function(e,t){return this.subruleInternal(e,6,t)},r.prototype.SUBRULE7=function(e,t){return this.subruleInternal(e,7,t)},r.prototype.SUBRULE8=function(e,t){return this.subruleInternal(e,8,t)},r.prototype.SUBRULE9=function(e,t){return this.subruleInternal(e,9,t)},r.prototype.OPTION=function(e){return this.optionInternal(e,0)},r.prototype.OPTION1=function(e){return this.optionInternal(e,1)},r.prototype.OPTION2=function(e){return this.optionInternal(e,2)},r.prototype.OPTION3=function(e){return this.optionInternal(e,3)},r.prototype.OPTION4=function(e){return this.optionInternal(e,4)},r.prototype.OPTION5=function(e){return this.optionInternal(e,5)},r.prototype.OPTION6=function(e){return this.optionInternal(e,6)},r.prototype.OPTION7=function(e){return this.optionInternal(e,7)},r.prototype.OPTION8=function(e){return this.optionInternal(e,8)},r.prototype.OPTION9=function(e){return this.optionInternal(e,9)},r.prototype.OR=function(e){return this.orInternal(e,0)},r.prototype.OR1=function(e){return this.orInternal(e,1)},r.prototype.OR2=function(e){return this.orInternal(e,2)},r.prototype.OR3=function(e){return this.orInternal(e,3)},r.prototype.OR4=function(e){return this.orInternal(e,4)},r.prototype.OR5=function(e){return this.orInternal(e,5)},r.prototype.OR6=function(e){return this.orInternal(e,6)},r.prototype.OR7=function(e){return this.orInternal(e,7)},r.prototype.OR8=function(e){return this.orInternal(e,8)},r.prototype.OR9=function(e){return this.orInternal(e,9)},r.prototype.MANY=function(e){this.manyInternal(0,e)},r.prototype.MANY1=function(e){this.manyInternal(1,e)},r.prototype.MANY2=function(e){this.manyInternal(2,e)},r.prototype.MANY3=function(e){this.manyInternal(3,e)},r.prototype.MANY4=function(e){this.manyInternal(4,e)},r.prototype.MANY5=function(e){this.manyInternal(5,e)},r.prototype.MANY6=function(e){this.manyInternal(6,e)},r.prototype.MANY7=function(e){this.manyInternal(7,e)},r.prototype.MANY8=function(e){this.manyInternal(8,e)},r.prototype.MANY9=function(e){this.manyInternal(9,e)},r.prototype.MANY_SEP=function(e){this.manySepFirstInternal(0,e)},r.prototype.MANY_SEP1=function(e){this.manySepFirstInternal(1,e)},r.prototype.MANY_SEP2=function(e){this.manySepFirstInternal(2,e)},r.prototype.MANY_SEP3=function(e){this.manySepFirstInternal(3,e)},r.prototype.MANY_SEP4=function(e){this.manySepFirstInternal(4,e)},r.prototype.MANY_SEP5=function(e){this.manySepFirstInternal(5,e)},r.prototype.MANY_SEP6=function(e){this.manySepFirstInternal(6,e)},r.prototype.MANY_SEP7=function(e){this.manySepFirstInternal(7,e)},r.prototype.MANY_SEP8=function(e){this.manySepFirstInternal(8,e)},r.prototype.MANY_SEP9=function(e){this.manySepFirstInternal(9,e)},r.prototype.AT_LEAST_ONE=function(e){this.atLeastOneInternal(0,e)},r.prototype.AT_LEAST_ONE1=function(e){return this.atLeastOneInternal(1,e)},r.prototype.AT_LEAST_ONE2=function(e){this.atLeastOneInternal(2,e)},r.prototype.AT_LEAST_ONE3=function(e){this.atLeastOneInternal(3,e)},r.prototype.AT_LEAST_ONE4=function(e){this.atLeastOneInternal(4,e)},r.prototype.AT_LEAST_ONE5=function(e){this.atLeastOneInternal(5,e)},r.prototype.AT_LEAST_ONE6=function(e){this.atLeastOneInternal(6,e)},r.prototype.AT_LEAST_ONE7=function(e){this.atLeastOneInternal(7,e)},r.prototype.AT_LEAST_ONE8=function(e){this.atLeastOneInternal(8,e)},r.prototype.AT_LEAST_ONE9=function(e){this.atLeastOneInternal(9,e)},r.prototype.AT_LEAST_ONE_SEP=function(e){this.atLeastOneSepFirstInternal(0,e)},r.prototype.AT_LEAST_ONE_SEP1=function(e){this.atLeastOneSepFirstInternal(1,e)},r.prototype.AT_LEAST_ONE_SEP2=function(e){this.atLeastOneSepFirstInternal(2,e)},r.prototype.AT_LEAST_ONE_SEP3=function(e){this.atLeastOneSepFirstInternal(3,e)},r.prototype.AT_LEAST_ONE_SEP4=function(e){this.atLeastOneSepFirstInternal(4,e)},r.prototype.AT_LEAST_ONE_SEP5=function(e){this.atLeastOneSepFirstInternal(5,e)},r.prototype.AT_LEAST_ONE_SEP6=function(e){this.atLeastOneSepFirstInternal(6,e)},r.prototype.AT_LEAST_ONE_SEP7=function(e){this.atLeastOneSepFirstInternal(7,e)},r.prototype.AT_LEAST_ONE_SEP8=function(e){this.atLeastOneSepFirstInternal(8,e)},r.prototype.AT_LEAST_ONE_SEP9=function(e){this.atLeastOneSepFirstInternal(9,e)},r.prototype.RULE=function(e,t,i){if(i===void 0&&(i=Zx.DEFAULT_RULE_CONFIG),(0,LJ.contains)(this.definedRulesNames,e)){var n=oBe.defaultGrammarValidatorErrorProvider.buildDuplicateRuleNameError({topLevelRule:e,grammarName:this.className}),s={message:n,type:Zx.ParserDefinitionErrorType.DUPLICATE_RULE_NAME,ruleName:e};this.definitionErrors.push(s)}this.definedRulesNames.push(e);var o=this.defineRule(e,t,i);return this[e]=o,o},r.prototype.OVERRIDE_RULE=function(e,t,i){i===void 0&&(i=Zx.DEFAULT_RULE_CONFIG);var n=[];n=n.concat((0,aBe.validateRuleIsOverridden)(e,this.definedRulesNames,this.className)),this.definitionErrors=this.definitionErrors.concat(n);var s=this.defineRule(e,t,i);return this[e]=s,s},r.prototype.BACKTRACK=function(e,t){return function(){this.isBackTrackingStack.push(1);var i=this.saveRecogState();try{return e.apply(this,t),!0}catch(n){if((0,sBe.isRecognitionException)(n))return!1;throw n}finally{this.reloadRecogState(i),this.isBackTrackingStack.pop()}}},r.prototype.getGAstProductions=function(){return this.gastProductionsCache},r.prototype.getSerializedGastProductions=function(){return(0,ABe.serializeGrammar)((0,LJ.values)(this.gastProductionsCache))},r}();_y.RecognizerApi=lBe});var HJ=y($y=>{"use strict";Object.defineProperty($y,"__esModule",{value:!0});$y.RecognizerEngine=void 0;var kr=Gt(),Gn=Wy(),Zy=yf(),MJ=eC(),Bf=$d(),UJ=Hn(),cBe=Vx(),KJ=HA(),nC=df(),uBe=Xx(),gBe=function(){function r(){}return r.prototype.initRecognizerEngine=function(e,t){if(this.className=(0,uBe.classNameFromInstance)(this),this.shortRuleNameToFull={},this.fullRuleNameToShort={},this.ruleShortNameIdx=256,this.tokenMatcher=nC.tokenStructuredMatcherNoCategories,this.definedRulesNames=[],this.tokensMap={},this.isBackTrackingStack=[],this.RULE_STACK=[],this.RULE_OCCURRENCE_STACK=[],this.gastProductionsCache={},(0,kr.has)(t,"serializedGrammar"))throw Error(`The Parser's configuration can no longer contain a property. - See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_6-0-0 - For Further details.`);if((0,kr.isArray)(e)){if((0,kr.isEmpty)(e))throw Error(`A Token Vocabulary cannot be empty. - Note that the first argument for the parser constructor - is no longer a Token vector (since v4.0).`);if(typeof e[0].startOffset=="number")throw Error(`The Parser constructor no longer accepts a token vector as the first argument. - See: https://chevrotain.io/docs/changes/BREAKING_CHANGES.html#_4-0-0 - For Further details.`)}if((0,kr.isArray)(e))this.tokensMap=(0,kr.reduce)(e,function(o,a){return o[a.name]=a,o},{});else if((0,kr.has)(e,"modes")&&(0,kr.every)((0,kr.flatten)((0,kr.values)(e.modes)),nC.isTokenType)){var i=(0,kr.flatten)((0,kr.values)(e.modes)),n=(0,kr.uniq)(i);this.tokensMap=(0,kr.reduce)(n,function(o,a){return o[a.name]=a,o},{})}else if((0,kr.isObject)(e))this.tokensMap=(0,kr.cloneObj)(e);else throw new Error(" argument must be An Array of Token constructors, A dictionary of Token constructors or an IMultiModeLexerDefinition");this.tokensMap.EOF=KJ.EOF;var s=(0,kr.every)((0,kr.values)(e),function(o){return(0,kr.isEmpty)(o.categoryMatches)});this.tokenMatcher=s?nC.tokenStructuredMatcherNoCategories:nC.tokenStructuredMatcher,(0,nC.augmentTokenTypes)((0,kr.values)(this.tokensMap))},r.prototype.defineRule=function(e,t,i){if(this.selfAnalysisDone)throw Error("Grammar rule <"+e+`> may not be defined after the 'performSelfAnalysis' method has been called' -Make sure that all grammar rule definitions are done before 'performSelfAnalysis' is called.`);var n=(0,kr.has)(i,"resyncEnabled")?i.resyncEnabled:UJ.DEFAULT_RULE_CONFIG.resyncEnabled,s=(0,kr.has)(i,"recoveryValueFunc")?i.recoveryValueFunc:UJ.DEFAULT_RULE_CONFIG.recoveryValueFunc,o=this.ruleShortNameIdx<t},r.prototype.orInternal=function(e,t){var i=this.getKeyForAutomaticLookahead(Gn.OR_IDX,t),n=(0,kr.isArray)(e)?e:e.DEF,s=this.getLaFuncFromCache(i),o=s.call(this,n);if(o!==void 0){var a=n[o];return a.ALT.call(this)}this.raiseNoAltException(t,e.ERR_MSG)},r.prototype.ruleFinallyStateUpdate=function(){if(this.RULE_STACK.pop(),this.RULE_OCCURRENCE_STACK.pop(),this.cstFinallyStateUpdate(),this.RULE_STACK.length===0&&this.isAtEndOfInput()===!1){var e=this.LA(1),t=this.errorMessageProvider.buildNotAllInputParsedMessage({firstRedundant:e,ruleName:this.getCurrRuleFullName()});this.SAVE_ERROR(new Zy.NotAllInputParsedException(t,e))}},r.prototype.subruleInternal=function(e,t,i){var n;try{var s=i!==void 0?i.ARGS:void 0;return n=e.call(this,t,s),this.cstPostNonTerminal(n,i!==void 0&&i.LABEL!==void 0?i.LABEL:e.ruleName),n}catch(o){this.subruleInternalError(o,i,e.ruleName)}},r.prototype.subruleInternalError=function(e,t,i){throw(0,Zy.isRecognitionException)(e)&&e.partialCstResult!==void 0&&(this.cstPostNonTerminal(e.partialCstResult,t!==void 0&&t.LABEL!==void 0?t.LABEL:i),delete e.partialCstResult),e},r.prototype.consumeInternal=function(e,t,i){var n;try{var s=this.LA(1);this.tokenMatcher(s,e)===!0?(this.consumeToken(),n=s):this.consumeInternalError(e,s,i)}catch(o){n=this.consumeInternalRecovery(e,t,o)}return this.cstPostTerminal(i!==void 0&&i.LABEL!==void 0?i.LABEL:e.name,n),n},r.prototype.consumeInternalError=function(e,t,i){var n,s=this.LA(0);throw i!==void 0&&i.ERR_MSG?n=i.ERR_MSG:n=this.errorMessageProvider.buildMismatchTokenMessage({expected:e,actual:t,previous:s,ruleName:this.getCurrRuleFullName()}),this.SAVE_ERROR(new Zy.MismatchedTokenException(n,t,s))},r.prototype.consumeInternalRecovery=function(e,t,i){if(this.recoveryEnabled&&i.name==="MismatchedTokenException"&&!this.isBackTracking()){var n=this.getFollowsForInRuleRecovery(e,t);try{return this.tryInRuleRecovery(e,n)}catch(s){throw s.name===cBe.IN_RULE_RECOVERY_EXCEPTION?i:s}}else throw i},r.prototype.saveRecogState=function(){var e=this.errors,t=(0,kr.cloneArr)(this.RULE_STACK);return{errors:e,lexerState:this.exportLexerState(),RULE_STACK:t,CST_STACK:this.CST_STACK}},r.prototype.reloadRecogState=function(e){this.errors=e.errors,this.importLexerState(e.lexerState),this.RULE_STACK=e.RULE_STACK},r.prototype.ruleInvocationStateUpdate=function(e,t,i){this.RULE_OCCURRENCE_STACK.push(i),this.RULE_STACK.push(e),this.cstInvocationStateUpdate(t,e)},r.prototype.isBackTracking=function(){return this.isBackTrackingStack.length!==0},r.prototype.getCurrRuleFullName=function(){var e=this.getLastExplicitRuleShortName();return this.shortRuleNameToFull[e]},r.prototype.shortRuleNameToFullName=function(e){return this.shortRuleNameToFull[e]},r.prototype.isAtEndOfInput=function(){return this.tokenMatcher(this.LA(1),KJ.EOF)},r.prototype.reset=function(){this.resetLexerState(),this.isBackTrackingStack=[],this.errors=[],this.RULE_STACK=[],this.CST_STACK=[],this.RULE_OCCURRENCE_STACK=[]},r}();$y.RecognizerEngine=gBe});var YJ=y(ew=>{"use strict";Object.defineProperty(ew,"__esModule",{value:!0});ew.ErrorHandler=void 0;var $x=yf(),eP=Gt(),GJ=eC(),fBe=Hn(),hBe=function(){function r(){}return r.prototype.initErrorHandler=function(e){this._errors=[],this.errorMessageProvider=(0,eP.has)(e,"errorMessageProvider")?e.errorMessageProvider:fBe.DEFAULT_PARSER_CONFIG.errorMessageProvider},r.prototype.SAVE_ERROR=function(e){if((0,$x.isRecognitionException)(e))return e.context={ruleStack:this.getHumanReadableRuleStack(),ruleOccurrenceStack:(0,eP.cloneArr)(this.RULE_OCCURRENCE_STACK)},this._errors.push(e),e;throw Error("Trying to save an Error which is not a RecognitionException")},Object.defineProperty(r.prototype,"errors",{get:function(){return(0,eP.cloneArr)(this._errors)},set:function(e){this._errors=e},enumerable:!1,configurable:!0}),r.prototype.raiseEarlyExitException=function(e,t,i){for(var n=this.getCurrRuleFullName(),s=this.getGAstProductions()[n],o=(0,GJ.getLookaheadPathsForOptionalProd)(e,s,t,this.maxLookahead),a=o[0],l=[],c=1;c<=this.maxLookahead;c++)l.push(this.LA(c));var u=this.errorMessageProvider.buildEarlyExitMessage({expectedIterationPaths:a,actual:l,previous:this.LA(0),customUserDescription:i,ruleName:n});throw this.SAVE_ERROR(new $x.EarlyExitException(u,this.LA(1),this.LA(0)))},r.prototype.raiseNoAltException=function(e,t){for(var i=this.getCurrRuleFullName(),n=this.getGAstProductions()[i],s=(0,GJ.getLookaheadPathsForOr)(e,n,this.maxLookahead),o=[],a=1;a<=this.maxLookahead;a++)o.push(this.LA(a));var l=this.LA(0),c=this.errorMessageProvider.buildNoViableAltMessage({expectedPathsPerAlt:s,actual:o,previous:l,customUserDescription:t,ruleName:this.getCurrRuleFullName()});throw this.SAVE_ERROR(new $x.NoViableAltException(c,this.LA(1),l))},r}();ew.ErrorHandler=hBe});var JJ=y(tw=>{"use strict";Object.defineProperty(tw,"__esModule",{value:!0});tw.ContentAssist=void 0;var jJ=$d(),qJ=Gt(),pBe=function(){function r(){}return r.prototype.initContentAssist=function(){},r.prototype.computeContentAssist=function(e,t){var i=this.gastProductionsCache[e];if((0,qJ.isUndefined)(i))throw Error("Rule ->"+e+"<- does not exist in this grammar.");return(0,jJ.nextPossibleTokensAfter)([i],t,this.tokenMatcher,this.maxLookahead)},r.prototype.getNextPossibleTokenTypes=function(e){var t=(0,qJ.first)(e.ruleStack),i=this.getGAstProductions(),n=i[t],s=new jJ.NextAfterTokenWalker(n,e).startWalking();return s},r}();tw.ContentAssist=pBe});var e3=y(nw=>{"use strict";Object.defineProperty(nw,"__esModule",{value:!0});nw.GastRecorder=void 0;var In=Gt(),Lo=Cn(),dBe=Jd(),XJ=df(),_J=HA(),CBe=Hn(),mBe=Wy(),iw={description:"This Object indicates the Parser is during Recording Phase"};Object.freeze(iw);var WJ=!0,zJ=Math.pow(2,mBe.BITS_FOR_OCCURRENCE_IDX)-1,ZJ=(0,_J.createToken)({name:"RECORDING_PHASE_TOKEN",pattern:dBe.Lexer.NA});(0,XJ.augmentTokenTypes)([ZJ]);var $J=(0,_J.createTokenInstance)(ZJ,`This IToken indicates the Parser is in Recording Phase - See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,-1,-1,-1,-1,-1,-1);Object.freeze($J);var EBe={name:`This CSTNode indicates the Parser is in Recording Phase - See: https://chevrotain.io/docs/guide/internals.html#grammar-recording for details`,children:{}},IBe=function(){function r(){}return r.prototype.initGastRecorder=function(e){this.recordingProdStack=[],this.RECORDING_PHASE=!1},r.prototype.enableRecording=function(){var e=this;this.RECORDING_PHASE=!0,this.TRACE_INIT("Enable Recording",function(){for(var t=function(n){var s=n>0?n:"";e["CONSUME"+s]=function(o,a){return this.consumeInternalRecord(o,n,a)},e["SUBRULE"+s]=function(o,a){return this.subruleInternalRecord(o,n,a)},e["OPTION"+s]=function(o){return this.optionInternalRecord(o,n)},e["OR"+s]=function(o){return this.orInternalRecord(o,n)},e["MANY"+s]=function(o){this.manyInternalRecord(n,o)},e["MANY_SEP"+s]=function(o){this.manySepFirstInternalRecord(n,o)},e["AT_LEAST_ONE"+s]=function(o){this.atLeastOneInternalRecord(n,o)},e["AT_LEAST_ONE_SEP"+s]=function(o){this.atLeastOneSepFirstInternalRecord(n,o)}},i=0;i<10;i++)t(i);e.consume=function(n,s,o){return this.consumeInternalRecord(s,n,o)},e.subrule=function(n,s,o){return this.subruleInternalRecord(s,n,o)},e.option=function(n,s){return this.optionInternalRecord(s,n)},e.or=function(n,s){return this.orInternalRecord(s,n)},e.many=function(n,s){this.manyInternalRecord(n,s)},e.atLeastOne=function(n,s){this.atLeastOneInternalRecord(n,s)},e.ACTION=e.ACTION_RECORD,e.BACKTRACK=e.BACKTRACK_RECORD,e.LA=e.LA_RECORD})},r.prototype.disableRecording=function(){var e=this;this.RECORDING_PHASE=!1,this.TRACE_INIT("Deleting Recording methods",function(){for(var t=0;t<10;t++){var i=t>0?t:"";delete e["CONSUME"+i],delete e["SUBRULE"+i],delete e["OPTION"+i],delete e["OR"+i],delete e["MANY"+i],delete e["MANY_SEP"+i],delete e["AT_LEAST_ONE"+i],delete e["AT_LEAST_ONE_SEP"+i]}delete e.consume,delete e.subrule,delete e.option,delete e.or,delete e.many,delete e.atLeastOne,delete e.ACTION,delete e.BACKTRACK,delete e.LA})},r.prototype.ACTION_RECORD=function(e){},r.prototype.BACKTRACK_RECORD=function(e,t){return function(){return!0}},r.prototype.LA_RECORD=function(e){return CBe.END_OF_FILE},r.prototype.topLevelRuleRecord=function(e,t){try{var i=new Lo.Rule({definition:[],name:e});return i.name=e,this.recordingProdStack.push(i),t.call(this),this.recordingProdStack.pop(),i}catch(n){if(n.KNOWN_RECORDER_ERROR!==!0)try{n.message=n.message+` - This error was thrown during the "grammar recording phase" For more info see: - https://chevrotain.io/docs/guide/internals.html#grammar-recording`}catch{throw n}throw n}},r.prototype.optionInternalRecord=function(e,t){return sC.call(this,Lo.Option,e,t)},r.prototype.atLeastOneInternalRecord=function(e,t){sC.call(this,Lo.RepetitionMandatory,t,e)},r.prototype.atLeastOneSepFirstInternalRecord=function(e,t){sC.call(this,Lo.RepetitionMandatoryWithSeparator,t,e,WJ)},r.prototype.manyInternalRecord=function(e,t){sC.call(this,Lo.Repetition,t,e)},r.prototype.manySepFirstInternalRecord=function(e,t){sC.call(this,Lo.RepetitionWithSeparator,t,e,WJ)},r.prototype.orInternalRecord=function(e,t){return yBe.call(this,e,t)},r.prototype.subruleInternalRecord=function(e,t,i){if(rw(t),!e||(0,In.has)(e,"ruleName")===!1){var n=new Error(" argument is invalid"+(" expecting a Parser method reference but got: <"+JSON.stringify(e)+">")+(` - inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,In.peek)(this.recordingProdStack),o=e.ruleName,a=new Lo.NonTerminal({idx:t,nonTerminalName:o,label:i==null?void 0:i.LABEL,referencedRule:void 0});return s.definition.push(a),this.outputCst?EBe:iw},r.prototype.consumeInternalRecord=function(e,t,i){if(rw(t),!(0,XJ.hasShortKeyProperty)(e)){var n=new Error(" argument is invalid"+(" expecting a TokenType reference but got: <"+JSON.stringify(e)+">")+(` - inside top level rule: <`+this.recordingProdStack[0].name+">"));throw n.KNOWN_RECORDER_ERROR=!0,n}var s=(0,In.peek)(this.recordingProdStack),o=new Lo.Terminal({idx:t,terminalType:e,label:i==null?void 0:i.LABEL});return s.definition.push(o),$J},r}();nw.GastRecorder=IBe;function sC(r,e,t,i){i===void 0&&(i=!1),rw(t);var n=(0,In.peek)(this.recordingProdStack),s=(0,In.isFunction)(e)?e:e.DEF,o=new r({definition:[],idx:t});return i&&(o.separator=e.SEP),(0,In.has)(e,"MAX_LOOKAHEAD")&&(o.maxLookahead=e.MAX_LOOKAHEAD),this.recordingProdStack.push(o),s.call(this),n.definition.push(o),this.recordingProdStack.pop(),iw}function yBe(r,e){var t=this;rw(e);var i=(0,In.peek)(this.recordingProdStack),n=(0,In.isArray)(r)===!1,s=n===!1?r:r.DEF,o=new Lo.Alternation({definition:[],idx:e,ignoreAmbiguities:n&&r.IGNORE_AMBIGUITIES===!0});(0,In.has)(r,"MAX_LOOKAHEAD")&&(o.maxLookahead=r.MAX_LOOKAHEAD);var a=(0,In.some)(s,function(l){return(0,In.isFunction)(l.GATE)});return o.hasPredicates=a,i.definition.push(o),(0,In.forEach)(s,function(l){var c=new Lo.Alternative({definition:[]});o.definition.push(c),(0,In.has)(l,"IGNORE_AMBIGUITIES")?c.ignoreAmbiguities=l.IGNORE_AMBIGUITIES:(0,In.has)(l,"GATE")&&(c.ignoreAmbiguities=!0),t.recordingProdStack.push(c),l.ALT.call(t),t.recordingProdStack.pop()}),iw}function VJ(r){return r===0?"":""+r}function rw(r){if(r<0||r>zJ){var e=new Error("Invalid DSL Method idx value: <"+r+`> - `+("Idx value must be a none negative value smaller than "+(zJ+1)));throw e.KNOWN_RECORDER_ERROR=!0,e}}});var r3=y(sw=>{"use strict";Object.defineProperty(sw,"__esModule",{value:!0});sw.PerformanceTracer=void 0;var t3=Gt(),wBe=Hn(),BBe=function(){function r(){}return r.prototype.initPerformanceTracer=function(e){if((0,t3.has)(e,"traceInitPerf")){var t=e.traceInitPerf,i=typeof t=="number";this.traceInitMaxIdent=i?t:1/0,this.traceInitPerf=i?t>0:t}else this.traceInitMaxIdent=0,this.traceInitPerf=wBe.DEFAULT_PARSER_CONFIG.traceInitPerf;this.traceInitIndent=-1},r.prototype.TRACE_INIT=function(e,t){if(this.traceInitPerf===!0){this.traceInitIndent++;var i=new Array(this.traceInitIndent+1).join(" ");this.traceInitIndent <"+e+">");var n=(0,t3.timer)(t),s=n.time,o=n.value,a=s>10?console.warn:console.log;return this.traceInitIndent time: "+s+"ms"),this.traceInitIndent--,o}else return t()},r}();sw.PerformanceTracer=BBe});var i3=y(ow=>{"use strict";Object.defineProperty(ow,"__esModule",{value:!0});ow.applyMixins=void 0;function bBe(r,e){e.forEach(function(t){var i=t.prototype;Object.getOwnPropertyNames(i).forEach(function(n){if(n!=="constructor"){var s=Object.getOwnPropertyDescriptor(i,n);s&&(s.get||s.set)?Object.defineProperty(r.prototype,n,s):r.prototype[n]=t.prototype[n]}})})}ow.applyMixins=bBe});var Hn=y(Cr=>{"use strict";var o3=Cr&&Cr.__extends||function(){var r=function(e,t){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(i,n){i.__proto__=n}||function(i,n){for(var s in n)Object.prototype.hasOwnProperty.call(n,s)&&(i[s]=n[s])},r(e,t)};return function(e,t){if(typeof t!="function"&&t!==null)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null");r(e,t);function i(){this.constructor=e}e.prototype=t===null?Object.create(t):(i.prototype=t.prototype,new i)}}();Object.defineProperty(Cr,"__esModule",{value:!0});Cr.EmbeddedActionsParser=Cr.CstParser=Cr.Parser=Cr.EMPTY_ALT=Cr.ParserDefinitionErrorType=Cr.DEFAULT_RULE_CONFIG=Cr.DEFAULT_PARSER_CONFIG=Cr.END_OF_FILE=void 0;var _i=Gt(),QBe=Yq(),n3=HA(),a3=_d(),s3=pJ(),SBe=Vx(),vBe=BJ(),xBe=FJ(),PBe=TJ(),DBe=OJ(),kBe=HJ(),RBe=YJ(),FBe=JJ(),NBe=e3(),TBe=r3(),LBe=i3();Cr.END_OF_FILE=(0,n3.createTokenInstance)(n3.EOF,"",NaN,NaN,NaN,NaN,NaN,NaN);Object.freeze(Cr.END_OF_FILE);Cr.DEFAULT_PARSER_CONFIG=Object.freeze({recoveryEnabled:!1,maxLookahead:3,dynamicTokensEnabled:!1,outputCst:!0,errorMessageProvider:a3.defaultParserErrorProvider,nodeLocationTracking:"none",traceInitPerf:!1,skipValidations:!1});Cr.DEFAULT_RULE_CONFIG=Object.freeze({recoveryValueFunc:function(){},resyncEnabled:!0});var OBe;(function(r){r[r.INVALID_RULE_NAME=0]="INVALID_RULE_NAME",r[r.DUPLICATE_RULE_NAME=1]="DUPLICATE_RULE_NAME",r[r.INVALID_RULE_OVERRIDE=2]="INVALID_RULE_OVERRIDE",r[r.DUPLICATE_PRODUCTIONS=3]="DUPLICATE_PRODUCTIONS",r[r.UNRESOLVED_SUBRULE_REF=4]="UNRESOLVED_SUBRULE_REF",r[r.LEFT_RECURSION=5]="LEFT_RECURSION",r[r.NONE_LAST_EMPTY_ALT=6]="NONE_LAST_EMPTY_ALT",r[r.AMBIGUOUS_ALTS=7]="AMBIGUOUS_ALTS",r[r.CONFLICT_TOKENS_RULES_NAMESPACE=8]="CONFLICT_TOKENS_RULES_NAMESPACE",r[r.INVALID_TOKEN_NAME=9]="INVALID_TOKEN_NAME",r[r.NO_NON_EMPTY_LOOKAHEAD=10]="NO_NON_EMPTY_LOOKAHEAD",r[r.AMBIGUOUS_PREFIX_ALTS=11]="AMBIGUOUS_PREFIX_ALTS",r[r.TOO_MANY_ALTS=12]="TOO_MANY_ALTS"})(OBe=Cr.ParserDefinitionErrorType||(Cr.ParserDefinitionErrorType={}));function MBe(r){return r===void 0&&(r=void 0),function(){return r}}Cr.EMPTY_ALT=MBe;var aw=function(){function r(e,t){this.definitionErrors=[],this.selfAnalysisDone=!1;var i=this;if(i.initErrorHandler(t),i.initLexerAdapter(),i.initLooksAhead(t),i.initRecognizerEngine(e,t),i.initRecoverable(t),i.initTreeBuilder(t),i.initContentAssist(),i.initGastRecorder(t),i.initPerformanceTracer(t),(0,_i.has)(t,"ignoredIssues"))throw new Error(`The IParserConfig property has been deprecated. - Please use the flag on the relevant DSL method instead. - See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#IGNORING_AMBIGUITIES - For further details.`);this.skipValidations=(0,_i.has)(t,"skipValidations")?t.skipValidations:Cr.DEFAULT_PARSER_CONFIG.skipValidations}return r.performSelfAnalysis=function(e){throw Error("The **static** `performSelfAnalysis` method has been deprecated. \nUse the **instance** method with the same name instead.")},r.prototype.performSelfAnalysis=function(){var e=this;this.TRACE_INIT("performSelfAnalysis",function(){var t;e.selfAnalysisDone=!0;var i=e.className;e.TRACE_INIT("toFastProps",function(){(0,_i.toFastProperties)(e)}),e.TRACE_INIT("Grammar Recording",function(){try{e.enableRecording(),(0,_i.forEach)(e.definedRulesNames,function(s){var o=e[s],a=o.originalGrammarAction,l=void 0;e.TRACE_INIT(s+" Rule",function(){l=e.topLevelRuleRecord(s,a)}),e.gastProductionsCache[s]=l})}finally{e.disableRecording()}});var n=[];if(e.TRACE_INIT("Grammar Resolving",function(){n=(0,s3.resolveGrammar)({rules:(0,_i.values)(e.gastProductionsCache)}),e.definitionErrors=e.definitionErrors.concat(n)}),e.TRACE_INIT("Grammar Validations",function(){if((0,_i.isEmpty)(n)&&e.skipValidations===!1){var s=(0,s3.validateGrammar)({rules:(0,_i.values)(e.gastProductionsCache),maxLookahead:e.maxLookahead,tokenTypes:(0,_i.values)(e.tokensMap),errMsgProvider:a3.defaultGrammarValidatorErrorProvider,grammarName:i});e.definitionErrors=e.definitionErrors.concat(s)}}),(0,_i.isEmpty)(e.definitionErrors)&&(e.recoveryEnabled&&e.TRACE_INIT("computeAllProdsFollows",function(){var s=(0,QBe.computeAllProdsFollows)((0,_i.values)(e.gastProductionsCache));e.resyncFollows=s}),e.TRACE_INIT("ComputeLookaheadFunctions",function(){e.preComputeLookaheadFunctions((0,_i.values)(e.gastProductionsCache))})),!r.DEFER_DEFINITION_ERRORS_HANDLING&&!(0,_i.isEmpty)(e.definitionErrors))throw t=(0,_i.map)(e.definitionErrors,function(s){return s.message}),new Error(`Parser Definition Errors detected: - `+t.join(` -------------------------------- -`))})},r.DEFER_DEFINITION_ERRORS_HANDLING=!1,r}();Cr.Parser=aw;(0,LBe.applyMixins)(aw,[SBe.Recoverable,vBe.LooksAhead,xBe.TreeBuilder,PBe.LexerAdapter,kBe.RecognizerEngine,DBe.RecognizerApi,RBe.ErrorHandler,FBe.ContentAssist,NBe.GastRecorder,TBe.PerformanceTracer]);var UBe=function(r){o3(e,r);function e(t,i){i===void 0&&(i=Cr.DEFAULT_PARSER_CONFIG);var n=this,s=(0,_i.cloneObj)(i);return s.outputCst=!0,n=r.call(this,t,s)||this,n}return e}(aw);Cr.CstParser=UBe;var KBe=function(r){o3(e,r);function e(t,i){i===void 0&&(i=Cr.DEFAULT_PARSER_CONFIG);var n=this,s=(0,_i.cloneObj)(i);return s.outputCst=!1,n=r.call(this,t,s)||this,n}return e}(aw);Cr.EmbeddedActionsParser=KBe});var l3=y(Aw=>{"use strict";Object.defineProperty(Aw,"__esModule",{value:!0});Aw.createSyntaxDiagramsCode=void 0;var A3=Ix();function HBe(r,e){var t=e===void 0?{}:e,i=t.resourceBase,n=i===void 0?"https://unpkg.com/chevrotain@"+A3.VERSION+"/diagrams/":i,s=t.css,o=s===void 0?"https://unpkg.com/chevrotain@"+A3.VERSION+"/diagrams/diagrams.css":s,a=` - - - - - -`,l=` - -`,c=` - ``` @@ -93,22 +89,12 @@ window.initialize( If you need to inline multiple JS or CSS files, you can concatenate them for now, and separate contents of each file with an `\n` symbol. _This can be a point of improvement (add support for file lists)_. -## Fancy mode - -You may have noticed the fancy mode in previous snippets: - -```dm -window.initialize(fancy = TRUE) -``` - -This removes the native window titlebar and border, which effectively turns window into a floating panel. TGUI heavily uses this option to draw completely custom, fancy windows. You can use it too, but not having the default titlebar limits usability of the browser window, since you can't even close it or drag around without implementing that functionality yourself. This mode might be useful for creating popups and tooltips. - ## Communication It is very often necessary to exchange data between DM and JS, and in vanilla BYOND programming it is a huge pain in the butt, because the `browse()` API is very convoluted, out of box it can send only strings, and sending data back to DM requires using hrefs. ``` -location.href='byond://?src=12345¶m=1' +location.href = '?src=12345¶m=1' ``` If you're familiar with the href syntax of BYOND topic calls, then perhaps this doesn't surprise you, but this API artificially limits you to sending 2048 characters of string-typed data; you need to reinvent the wheel if you want to send something more complex than strings. It differs from the way you send messages from DM. And it's very hard to read as well. @@ -138,9 +124,9 @@ Finally, message can contain custom properties, and how you use them is _complet ```js Byond.sendMessage({ - type: 'click', - payload: { buttonId: 1 }, - popup_section: 'left', + type: 'click', + payload: { buttonId: 1 }, + popup_section: 'left', }); ``` @@ -160,15 +146,15 @@ To receive it in JS, you have two different syntaxes. First one is the most verb ```js Byond.subscribe(function (type, payload) { - if (type === 'alert') { - window.alert(payload.text); - return; - } - if (type === 'other') { - // ... - return; - } - // ... + if (type === 'alert') { + window.alert(payload.text); + return; + } + if (type === 'other') { + // ... + return; + } + // ... }); ``` @@ -176,7 +162,7 @@ Second one is more compact, because it already filters messages by type and pass ```js Byond.subscribeTo('alert', function (payload) { - window.alert(payload.text); + window.alert(payload.text); }); ``` @@ -186,7 +172,7 @@ To send a message from JS, you can use the `Byond.sendMessage()` function. ```js Byond.sendMessage('click', { - button: 'explode-mech', + button: 'explode-mech', }); ``` @@ -209,8 +195,8 @@ You can send messages with custom fields in case if you want to bypass JSON seri ```js Byond.sendMessage({ - type: 'something', - ref: '[0x12345678]', + type: 'something', + ref: '[0x12345678]', }); ``` @@ -244,7 +230,7 @@ Id of the current tgui window can be accessed via `Byond.windowId`, and below in ```js Byond.winset(Byond.windowId, { - size: '1280x640', + size: '1280x640', }); ``` @@ -255,10 +241,10 @@ Little known feature, but you can also get non-UI parameters on the client by us ```js // Fetch URL of a server client is currently connected to Byond.winget(null, 'url').then((serverUrl) => { - // Connect to this server - Byond.call(serverUrl); - // Close our client because it is now connecting in background - Byond.command('.quit'); + // Connect to this server + Byond.call(serverUrl); + // Close our client because it is now connecting in background + Byond.command('.quit'); }); ``` diff --git a/tgui/docs/tutorial-and-examples.md b/tgui/docs/tutorial-and-examples.md index 97630f6b213..4c61fecb773 100644 --- a/tgui/docs/tutorial-and-examples.md +++ b/tgui/docs/tutorial-and-examples.md @@ -124,31 +124,31 @@ snippet (make sure component name matches the file name): ```jsx import { useBackend } from '../backend'; -import { Button, LabeledList, Section } from '../components'; +import { Button, LabeledList, Section } from 'tgui-core/components'; import { Window } from '../layouts'; -export const SampleInterface = (props, context) => { - const { act, data } = useBackend(context); - // Extract `health` and `color` variables from the `data` object. - const { health, color } = data; - return ( - - -

    - - {health} - {color} - -
    - - - ); +export const SampleInterface = (props) => { + const { act, data } = useBackend(context); + // Extract `health` and `color` variables from the `data` object. + const { health, color } = data; + return ( + + +
    + + {health} + {color} + +
    +     +     + ); }; ``` @@ -188,11 +188,11 @@ After compiling the code above, this is what it becomes: ```js createElement( - 'div', - { className: 'color-' + status }, - 'You are in ', - status, - ' condition!', + 'div', + { className: 'color-' + status }, + 'You are in ', + status, + ' condition!', ); ``` @@ -227,11 +227,11 @@ and builds a new array based on what was returned by that function. ```jsx - {items.map((item) => ( - - {item.content} - - ))} + {items.map((item) => ( + + {item.content} + + ))} ``` @@ -246,31 +246,31 @@ JSX code, and wrap it into a second, smaller React component: ```jsx import { useBackend } from '../backend'; -import { Button, LabeledList, Section } from '../components'; +import { Button, LabeledList, Section } from 'tgui-core/components'; import { Window } from '../layouts'; -export const SampleInterface = (props, context) => { - return ( - - - - - - ); +export const SampleInterface = (props) => { + return ( + + + + + + ); }; -const HealthStatus = (props, context) => { - const { act, data } = useBackend(context); - const { user } = props; - const { health, color } = data; - return ( -
    - - {health} - {color} - -
    - ); +const HealthStatus = (props) => { + const { act, data } = useBackend(context); + const { user } = props; + const { health, color } = data; + return ( +
    + + {health} + {color} + +
    + ); }; ``` @@ -292,7 +292,7 @@ upon code review): data["var"] = var return data -/obj/copypasta/ui_act(action, params) +/obj/copypasta/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) if(..()) return switch(action) @@ -308,25 +308,30 @@ And the template: ```jsx import { useBackend } from '../backend'; -import { Button, LabeledList, Section } from '../components'; +import { Button, LabeledList, Section } from 'tgui-core/components'; import { Window } from '../layouts'; -export type UIData = { - -} - -export const SampleInterface = (props, context) => { - const { act, data } = useBackend(context); - - return ( - - -
    - -
    -     -     - ); +export const SampleInterface = (props) => { + const { act, data } = useBackend(context); + // Extract `health` and `color` variables from the `data` object. + const { health, color } = data; + return ( + + +
    + + {health} + {color} + +
    +     +     + ); }; - ``` diff --git a/tgui/docs/writing-tests.md b/tgui/docs/writing-tests.md index 633e73bcd1a..daa29115d9e 100644 --- a/tgui/docs/writing-tests.md +++ b/tgui/docs/writing-tests.md @@ -6,7 +6,7 @@ It's quite simple: create a file ending in `.test.ts` or `.spec.ts` (usually wit ```js test('something', () => { - expect('a').toBe('a'); + expect('a').toBe('a'); }); ``` diff --git a/tgui/global.d.ts b/tgui/global.d.ts index d21ac79b0f8..e88281c4987 100644 --- a/tgui/global.d.ts +++ b/tgui/global.d.ts @@ -6,6 +6,7 @@ // Webpack asset modules. // Should match extensions used in webpack config. +/// declare module '*.png' { const content: string; export default content; @@ -21,6 +22,16 @@ declare module '*.svg' { export default content; } +declare module '*.scss' { + const content: string; + export default content; +} + +declare module '*.sass' { + const content: string; + export default content; +} + namespace JSX { interface IntrinsicElements { marquee: any; @@ -47,29 +58,9 @@ type ByondType = { IS_BYOND: boolean; /** - * Version of Trident engine of Internet Explorer. Null if N/A. + * Version of Blink engine of WebView2. Null if N/A. */ - TRIDENT: number | null; - - /** - * True if browser is IE8 or lower. - */ - IS_LTE_IE8: boolean; - - /** - * True if browser is IE9 or lower. - */ - IS_LTE_IE9: boolean; - - /** - * True if browser is IE10 or lower. - */ - IS_LTE_IE10: boolean; - - /** - * True if browser is IE11 or lower. - */ - IS_LTE_IE11: boolean; + BLINK: number | null; /** * If `true`, unhandled errors and common mistakes result in a blue screen @@ -83,6 +74,11 @@ type ByondType = { */ strictMode: boolean; + /** + * The external URL for the IndexedDB IFrame to use as the origin + */ + storageCdn: string; + /** * Makes a BYOND call. * @@ -115,14 +111,14 @@ type ByondType = { * * Returns a promise with a key-value object containing all properties. */ - winget(id: string | null): Promise; + winget(id: string | null): Promise>; /** * Retrieves all properties of the BYOND skin element. * * Returns a promise with a key-value object containing all properties. */ - winget(id: string | null, propName: '*'): Promise; + winget(id: string | null, propName: '*'): Promise>; /** * Retrieves an exactly one property of the BYOND skin element, @@ -138,7 +134,7 @@ type ByondType = { * * Returns a promise with a key-value object containing listed properties. */ - winget(id: string | null, propNames: string[]): Promise; + winget(id: string | null, propNames: string[]): Promise>; /** * Assigns properties to BYOND skin elements in bulk. @@ -162,11 +158,6 @@ type ByondType = { */ parseJson(text: string): any; - /** - * Downloads a blob, platform-agnostic - */ - saveBlob(blob: Blob, filename: string, ext: string): void; - /** * Sends a message to `/datum/tgui_window` which hosts this window instance. */ @@ -193,16 +184,36 @@ type ByondType = { * Loads a script into the document. */ loadJs(url: string): void; + + /** + * Maps icons to their ref + */ + iconRefMap: Record; + + /** + * Downloads a blob, platform-agnostic + */ + saveBlob(blob: Blob, filename: string, ext: string): void; }; /** * Object that provides access to Byond Skin API and is available in * any tgui application. */ -const Byond: ByondType; +const Byond: ByondType = {}; interface Window { Byond: ByondType; - __store__: Store; - __augmentStack__: (store: Store) => StackAugmentor; + __augmentStack__: (stack: string, error?: Error) => string; + + // IE IndexedDB stuff. + msIndexedDB: IDBFactory; + msIDBTransaction: IDBTransaction; + + // 516 byondstorage API. + hubStorage: Storage; + domainStorage: Storage; + serverStorage: Storage; + + __chatRenderer__: any; } diff --git a/tgui/happydom.ts b/tgui/happydom.ts new file mode 100644 index 00000000000..e3799b44740 --- /dev/null +++ b/tgui/happydom.ts @@ -0,0 +1,5 @@ +import { GlobalRegistrator } from '@happy-dom/global-registrator'; + +GlobalRegistrator.register(); + +import 'tgui/__mocks__/setup.ts'; diff --git a/tgui/package.json b/tgui/package.json index b6dd1a99eee..208b9001305 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -1,63 +1,31 @@ { - "private": true, - "name": "tgui-workspace", - "version": "4.3.1", - "packageManager": "yarn@3.3.1", - "workspaces": [ - "packages/*" - ], - "scripts": { - "tgui:analyze": "webpack --analyze", - "tgui:bench": "webpack --env TGUI_BENCH=1 && node packages/tgui-bench/index.js", - "tgui:build": "BROWSERSLIST_IGNORE_OLD_DATA=true webpack", - "tgui:dev": "node --experimental-modules packages/tgui-dev-server/index.js", - "tgui:lint": "eslint packages --ext .js,.cjs,.ts,.tsx", - "tgui:prettier": "prettier --check .", - "tgui:sonar": "eslint packages --ext .js,.cjs,.ts,.tsx -c .eslintrc-sonar.yml", - "tgui:test": "jest --watch", - "tgui:test-simple": "CI=true jest --color", - "tgui:test-ci": "CI=true jest --color --collect-coverage", - "tgui:tsc": "tsc" - }, - "dependencies": { - "@babel/core": "^7.15.0", - "@babel/eslint-parser": "^7.15.0", - "@babel/plugin-proposal-class-properties": "^7.14.5", - "@babel/plugin-transform-jscript": "^7.14.5", - "@babel/preset-env": "^7.15.0", - "@babel/preset-typescript": "^7.15.0", - "@types/jest": "^29.2.4", - "@types/jsdom": "^20.0.1", - "@types/node": "14.x", - "@types/webpack": "^5.28.0", - "@types/webpack-env": "^1.18.0", - "@typescript-eslint/parser": "^5.47.1", - "babel-jest": "^27.0.6", - "babel-loader": "^8.2.2", - "babel-plugin-inferno": "^6.3.0", - "babel-plugin-transform-remove-console": "^6.9.4", - "common": "workspace:*", - "css-loader": "^5.2.7", - "eslint": "^7.32.0", - "eslint-config-prettier": "^8.10.0", - "eslint-plugin-radar": "^0.2.1", - "eslint-plugin-react": "^7.24.0", - "eslint-plugin-unused-imports": "^1.1.4", - "file-loader": "^6.2.0", - "inferno": "^7.4.8", - "jest": "^27.0.6", - "jest-circus": "^27.0.6", - "jsdom": "^16.7.0", - "mini-css-extract-plugin": "^1.6.2", - "prettier": "^3.1.1", - "sass": "^1.37.5", - "sass-loader": "^11.1.1", - "style-loader": "^2.0.0", - "terser-webpack-plugin": "^5.1.4", - "typescript": "^4.9.5", - "url-loader": "^4.1.1", - "webpack": "^5.104.1", - "webpack-bundle-analyzer": "^4.4.2", - "webpack-cli": "^4.7.2" - } + "name": "tgui-workspace", + "version": "6.0.0", + "devDependencies": { + "@happy-dom/global-registrator": "^20.0.11", + "@rspack/cli": "^1.6.8", + "@rspack/core": "^1.6.8", + "@testing-library/react": "^16.3.2", + "@types/bun": "^1.3.5", + "@types/react": "^19.2.7", + "@types/react-dom": "^19.2.3", + "@types/webpack-env": "^1.18.8", + "@types/wicg-file-system-access": "^2023.10.6", + "css-loader": "^7.1.2", + "sass-embedded": "^1.97.1", + "sass-loader": "^16.0.6", + "typescript": "^5.8.3" + }, + "packageManager": "bun@1.2.16", + "private": true, + "scripts": { + "tgui:analyze": "rspack --analyze", + "tgui:build": "rspack build", + "tgui:dev": "bun --smol packages/tgui-dev-server/index.ts", + "tgui:test": "bun test", + "tgui:tsc": "tsc" + }, + "workspaces": [ + "packages/*" + ] } diff --git a/tgui/packages/common/assets.ts b/tgui/packages/common/assets.ts new file mode 100644 index 00000000000..958d472ca4e --- /dev/null +++ b/tgui/packages/common/assets.ts @@ -0,0 +1,30 @@ +const EXCLUDED_PATTERNS = [/v4shim/i]; + +export function loadStyleSheet(payload: string): void { + Byond.loadCss(payload); +} + +export function loadMappings( + payload: Record, + /** Lets you insert your own independent asset map. */ + map: Record, +): void { + for (const name in payload) { + // Skip anything that matches excluded patterns + if (EXCLUDED_PATTERNS.some((regex) => regex.test(name))) { + continue; + } + + const url = payload[name]; + const ext = name.split('.').pop(); + + map[name] = url; + + if (ext === 'css') { + Byond.loadCss(url); + } + if (ext === 'js') { + Byond.loadJs(url); + } + } +} diff --git a/tgui/packages/common/collections.spec.ts b/tgui/packages/common/collections.spec.ts deleted file mode 100644 index ef35a95cb3e..00000000000 --- a/tgui/packages/common/collections.spec.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { range, zip } from './collections'; - -// Type assertions, these will lint if the types are wrong. -const _zip1: [string, number] = zip(['a'], [1])[0]; - -describe('range', () => { - test('range(0, 5)', () => { - expect(range(0, 5)).toEqual([0, 1, 2, 3, 4]); - }); -}); - -describe('zip', () => { - test("zip(['a', 'b', 'c'], [1, 2, 3, 4])", () => { - expect(zip(['a', 'b', 'c'], [1, 2, 3, 4])).toEqual([ - ['a', 1], - ['b', 2], - ['c', 3], - ]); - }); -}); diff --git a/tgui/packages/common/collections.ts b/tgui/packages/common/collections.ts index 5bfcee85884..438ad19a4d2 100644 --- a/tgui/packages/common/collections.ts +++ b/tgui/packages/common/collections.ts @@ -4,260 +4,6 @@ * @license MIT */ -/** - * Iterates over elements of collection, returning an array of all elements - * iteratee returns truthy for. The predicate is invoked with three - * arguments: (value, index|key, collection). - * - * If collection is 'null' or 'undefined', it will be returned "as is" - * without emitting any errors (which can be useful in some cases). - */ -export const filter = - (iterateeFn: (input: T, index: number, collection: T[]) => boolean) => - (collection: T[]): T[] => { - if (collection === null || collection === undefined) { - return collection; - } - if (Array.isArray(collection)) { - const result: T[] = []; - for (let i = 0; i < collection.length; i++) { - const item = collection[i]; - if (iterateeFn(item, i, collection)) { - result.push(item); - } - } - return result; - } - throw new Error(`filter() can't iterate on type ${typeof collection}`); - }; - -type MapFunction = { - ( - iterateeFn: (value: T, index: number, collection: T[]) => U, - ): (collection: T[]) => U[]; - - ( - iterateeFn: (value: T, index: K, collection: Record) => U, - ): (collection: Record) => U[]; -}; - -/** - * Creates an array of values by running each element in collection - * thru an iteratee function. The iteratee is invoked with three - * arguments: (value, index|key, collection). - * - * If collection is 'null' or 'undefined', it will be returned "as is" - * without emitting any errors (which can be useful in some cases). - */ -export const map: MapFunction = - (iterateeFn) => - (collection: T[]): U[] => { - if (collection === null || collection === undefined) { - return collection; - } - - if (Array.isArray(collection)) { - return collection.map(iterateeFn); - } - - if (typeof collection === 'object') { - return Object.entries(collection).map(([key, value]) => { - return iterateeFn(value, key, collection); - }); - } - - throw new Error(`map() can't iterate on type ${typeof collection}`); - }; - -/** - * Given a collection, will run each element through an iteratee function. - * Will then filter out undefined values. - */ -export const filterMap = ( - collection: T[], - iterateeFn: (value: T) => U | undefined, -): U[] => { - const finalCollection: U[] = []; - - for (const value of collection) { - const output = iterateeFn(value); - if (output !== undefined) { - finalCollection.push(output); - } - } - - return finalCollection; -}; - -const COMPARATOR = (objA, objB) => { - const criteriaA = objA.criteria; - const criteriaB = objB.criteria; - const length = criteriaA.length; - for (let i = 0; i < length; i++) { - const a = criteriaA[i]; - const b = criteriaB[i]; - if (a < b) { - return -1; - } - if (a > b) { - return 1; - } - } - return 0; -}; - -/** - * Creates an array of elements, sorted in ascending order by the results - * of running each element in a collection thru each iteratee. - * - * Iteratees are called with one argument (value). - */ -export const sortBy = - (...iterateeFns: ((input: T) => unknown)[]) => - (array: T[]): T[] => { - if (!Array.isArray(array)) { - return array; - } - let length = array.length; - // Iterate over the array to collect criteria to sort it by - let mappedArray: { - criteria: unknown[]; - value: T; - }[] = []; - for (let i = 0; i < length; i++) { - const value = array[i]; - mappedArray.push({ - criteria: iterateeFns.map((fn) => fn(value)), - value, - }); - } - // Sort criteria using the base comparator - mappedArray.sort(COMPARATOR); - - // Unwrap values - const values: T[] = []; - while (length--) { - values[length] = mappedArray[length].value; - } - return values; - }; - -export const sort = sortBy(); - -export const sortStrings = sortBy(); - -/** - * Returns a range of numbers from start to end, exclusively. - * For example, range(0, 5) will return [0, 1, 2, 3, 4]. - */ -export const range = (start: number, end: number): number[] => - new Array(end - start).fill(null).map((_, index) => index + start); - -/** - * A fast implementation of reduce. - */ -export const reduce = (reducerFn, initialValue) => (array) => { - const length = array.length; - let i; - let result; - if (initialValue === undefined) { - i = 1; - result = array[0]; - } else { - i = 0; - result = initialValue; - } - for (; i < length; i++) { - result = reducerFn(result, array[i], i, array); - } - return result; -}; - -/** - * Creates a duplicate-free version of an array, using SameValueZero for - * equality comparisons, in which only the first occurrence of each element - * is kept. The order of result values is determined by the order they occur - * in the array. - * - * It accepts iteratee which is invoked for each element in array to generate - * the criterion by which uniqueness is computed. The order of result values - * is determined by the order they occur in the array. The iteratee is - * invoked with one argument: value. - */ -export const uniqBy = - (iterateeFn?: (value: T) => unknown) => - (array: T[]): T[] => { - const { length } = array; - const result: T[] = []; - const seen: unknown[] = iterateeFn ? [] : result; - let index = -1; - // prettier-ignore - outer: - while (++index < length) { - let value: T | 0 = array[index]; - const computed = iterateeFn ? iterateeFn(value) : value; - if (computed === computed) { - let seenIndex = seen.length; - while (seenIndex--) { - if (seen[seenIndex] === computed) { - continue outer; - } - } - if (iterateeFn) { - seen.push(computed); - } - result.push(value); - } else if (!seen.includes(computed)) { - if (seen !== result) { - seen.push(computed); - } - result.push(value); - } - } - return result; - }; - -export const uniq = uniqBy(); - -type Zip = { - [I in keyof T]: T[I] extends (infer U)[] ? U : never; -}[]; - -/** - * Creates an array of grouped elements, the first of which contains - * the first elements of the given arrays, the second of which contains - * the second elements of the given arrays, and so on. - */ -export const zip = (...arrays: T): Zip => { - if (arrays.length === 0) { - return []; - } - const numArrays = arrays.length; - const numValues = arrays[0].length; - const result: Zip = []; - for (let valueIndex = 0; valueIndex < numValues; valueIndex++) { - const entry: unknown[] = []; - for (let arrayIndex = 0; arrayIndex < numArrays; arrayIndex++) { - entry.push(arrays[arrayIndex][valueIndex]); - } - - // I tried everything to remove this any, and have no idea how to do it. - result.push(entry as any); - } - return result; -}; - -/** - * This method is like "zip" except that it accepts iteratee to - * specify how grouped values should be combined. The iteratee is - * invoked with the elements of each group. - */ -export const zipWith = - (iterateeFn: (...values: T[]) => U) => - (...arrays: T[][]): U[] => { - return map((values: T[]) => iterateeFn(...values))(zip(...arrays)); - }; - const binarySearch = ( getKey: (value: T) => U, collection: readonly T[], @@ -293,55 +39,12 @@ const binarySearch = ( return compare > insertingKey ? middle : middle + 1; }; -export const binaryInsertWith = - (getKey: (value: T) => U) => - (collection: readonly T[], value: T) => { - const copy = [...collection]; - copy.splice(binarySearch(getKey, collection, value), 0, value); - return copy; - }; - -/** - * This method takes a collection of items and a number, returning a collection - * of collections, where the maximum amount of items in each is that second arg - */ -export const paginate = (collection: T[], maxPerPage: number): T[][] => { - const pages: T[][] = []; - let page: T[] = []; - let itemsToAdd = maxPerPage; - - for (const item of collection) { - page.push(item); - itemsToAdd--; - if (!itemsToAdd) { - itemsToAdd = maxPerPage; - pages.push(page); - page = []; - } - } - if (page.length) { - pages.push(page); - } - return pages; -}; - -const isObject = (obj: unknown) => typeof obj === 'object' && obj !== null; - -// Does a deep merge of two objects. DO NOT FEED CIRCULAR OBJECTS!! -export const deepMerge = (...objects: any[]): any => { - const target = {}; - for (const object of objects) { - for (const key of Object.keys(object)) { - const targetValue = target[key]; - const objectValue = object[key]; - if (Array.isArray(targetValue) && Array.isArray(objectValue)) { - target[key] = [...targetValue, ...objectValue]; - } else if (isObject(targetValue) && isObject(objectValue)) { - target[key] = deepMerge(targetValue, objectValue); - } else { - target[key] = objectValue; - } - } - } - return target; +export const binaryInsertWith = ( + collection: readonly T[], + value: T, + getKey: (value: T) => U, +): T[] => { + const copy = [...collection]; + copy.splice(binarySearch(getKey, collection, value), 0, value); + return copy; }; diff --git a/tgui/packages/common/color.js b/tgui/packages/common/color.js deleted file mode 100644 index 59935931d82..00000000000 --- a/tgui/packages/common/color.js +++ /dev/null @@ -1,84 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -const EPSILON = 0.0001; - -export class Color { - constructor(r = 0, g = 0, b = 0, a = 1) { - this.r = r; - this.g = g; - this.b = b; - this.a = a; - } - - toString() { - // Alpha component needs to permit fractional values, so cannot use | - let alpha = parseFloat(this.a); - if (isNaN(alpha)) { - alpha = 1; - } - return `rgba(${this.r | 0}, ${this.g | 0}, ${this.b | 0}, ${alpha})`; - } - - // Darkens a color by a given percent. Returns a color, which can have toString called to get it's rgba() css value. - darken(percent) { - percent /= 100; - return new Color( - this.r - this.r * percent, - this.g - this.g * percent, - this.b - this.b * percent, - this.a, - ); - } - - // Brightens a color by a given percent. Returns a color, which can have toString called to get it's rgba() css value. - lighten(percent) { - // No point in rewriting code we already have. - return this.darken(-percent); - } -} - -/** - * Creates a color from the CSS hex color notation. - */ -Color.fromHex = (hex) => - new Color( - parseInt(hex.substr(1, 2), 16), - parseInt(hex.substr(3, 2), 16), - parseInt(hex.substr(5, 2), 16), - ); - -/** - * Linear interpolation of two colors. - */ -Color.lerp = (c1, c2, n) => - new Color( - (c2.r - c1.r) * n + c1.r, - (c2.g - c1.g) * n + c1.g, - (c2.b - c1.b) * n + c1.b, - (c2.a - c1.a) * n + c1.a, - ); - -/** - * Loops up the color in the provided list of colors - * with linear interpolation. - */ -Color.lookup = (value, colors = []) => { - const len = colors.length; - if (len < 2) { - throw new Error('Needs at least two colors!'); - } - const scaled = value * (len - 1); - if (value < EPSILON) { - return colors[0]; - } - if (value >= 1 - EPSILON) { - return colors[len - 1]; - } - const ratio = scaled % 1; - const index = scaled | 0; - return Color.lerp(colors[index], colors[index + 1], ratio); -}; diff --git a/tgui/packages/common/events.js b/tgui/packages/common/events.js deleted file mode 100644 index 7eeff511aa5..00000000000 --- a/tgui/packages/common/events.js +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -export class EventEmitter { - constructor() { - this.listeners = {}; - } - - on(name, listener) { - this.listeners[name] = this.listeners[name] || []; - this.listeners[name].push(listener); - } - - off(name, listener) { - const listeners = this.listeners[name]; - if (!listeners) { - throw new Error(`There is no listeners for "${name}"`); - } - this.listeners[name] = listeners.filter((existingListener) => { - return existingListener !== listener; - }); - } - - emit(name, ...params) { - const listeners = this.listeners[name]; - if (!listeners) { - return; - } - for (let i = 0, len = listeners.length; i < len; i += 1) { - const listener = listeners[i]; - listener(...params); - } - } - - clear() { - this.listeners = {}; - } -} diff --git a/tgui/packages/common/exhaustive.ts b/tgui/packages/common/exhaustive.ts deleted file mode 100644 index bc41757515b..00000000000 --- a/tgui/packages/common/exhaustive.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Throws an error such that a non-exhaustive check will error at compile time - * when using TypeScript, rather than at runtime. - * - * For example: - * enum Color { Red, Green, Blue } - * switch (color) { - * case Color.Red: - * return "red"; - * case Color.Green: - * return "green"; - * default: - * // This will error at compile time that we forgot blue. - * exhaustiveCheck(color); - * } - */ -export const exhaustiveCheck = (input: never) => { - throw new Error(`Unhandled case: ${input}`); -}; diff --git a/tgui/packages/common/fp.js b/tgui/packages/common/fp.js deleted file mode 100644 index ba7df09d407..00000000000 --- a/tgui/packages/common/fp.js +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -/** - * Creates a function that returns the result of invoking the given - * functions, where each successive invocation is supplied the return - * value of the previous. - */ -// prettier-ignore -export const flow = (...funcs) => (input, ...rest) => { - let output = input; - for (let func of funcs) { - // Recurse into the array of functions - if (Array.isArray(func)) { - output = flow(...func)(output, ...rest); - } - else if (func) { - output = func(output, ...rest); - } - } - return output; -}; - -/** - * Composes single-argument functions from right to left. - * - * All functions might accept a context in form of additional arguments. - * If the resulting function is called with more than 1 argument, rest of - * the arguments are passed to all functions unchanged. - * - * @param {...Function} funcs The functions to compose - * @returns {Function} A function obtained by composing the argument functions - * from right to left. For example, compose(f, g, h) is identical to doing - * (input, ...rest) => f(g(h(input, ...rest), ...rest), ...rest) - */ -export const compose = (...funcs) => { - if (funcs.length === 0) { - return (arg) => arg; - } - if (funcs.length === 1) { - return funcs[0]; - } - // prettier-ignore - return funcs.reduce((a, b) => (value, ...rest) => - a(b(value, ...rest), ...rest)); -}; diff --git a/tgui/packages/common/keycodes.js b/tgui/packages/common/keycodes.js deleted file mode 100644 index 8f18b154b56..00000000000 --- a/tgui/packages/common/keycodes.js +++ /dev/null @@ -1,86 +0,0 @@ -/** - * All possible browser keycodes, in one file. - * - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -export const KEY_BACKSPACE = 8; -export const KEY_TAB = 9; -export const KEY_ENTER = 13; -export const KEY_SHIFT = 16; -export const KEY_CTRL = 17; -export const KEY_ALT = 18; -export const KEY_PAUSE = 19; -export const KEY_CAPSLOCK = 20; -export const KEY_ESCAPE = 27; -export const KEY_SPACE = 32; -export const KEY_PAGEUP = 33; -export const KEY_PAGEDOWN = 34; -export const KEY_END = 35; -export const KEY_HOME = 36; -export const KEY_LEFT = 37; -export const KEY_UP = 38; -export const KEY_RIGHT = 39; -export const KEY_DOWN = 40; -export const KEY_INSERT = 45; -export const KEY_DELETE = 46; -export const KEY_0 = 48; -export const KEY_1 = 49; -export const KEY_2 = 50; -export const KEY_3 = 51; -export const KEY_4 = 52; -export const KEY_5 = 53; -export const KEY_6 = 54; -export const KEY_7 = 55; -export const KEY_8 = 56; -export const KEY_9 = 57; -export const KEY_A = 65; -export const KEY_B = 66; -export const KEY_C = 67; -export const KEY_D = 68; -export const KEY_E = 69; -export const KEY_F = 70; -export const KEY_G = 71; -export const KEY_H = 72; -export const KEY_I = 73; -export const KEY_J = 74; -export const KEY_K = 75; -export const KEY_L = 76; -export const KEY_M = 77; -export const KEY_N = 78; -export const KEY_O = 79; -export const KEY_P = 80; -export const KEY_Q = 81; -export const KEY_R = 82; -export const KEY_S = 83; -export const KEY_T = 84; -export const KEY_U = 85; -export const KEY_V = 86; -export const KEY_W = 87; -export const KEY_X = 88; -export const KEY_Y = 89; -export const KEY_Z = 90; -export const KEY_F1 = 112; -export const KEY_F2 = 113; -export const KEY_F3 = 114; -export const KEY_F4 = 115; -export const KEY_F5 = 116; -export const KEY_F6 = 117; -export const KEY_F7 = 118; -export const KEY_F8 = 119; -export const KEY_F9 = 120; -export const KEY_F10 = 121; -export const KEY_F11 = 122; -export const KEY_F12 = 123; -export const KEY_SEMICOLON = 186; -export const KEY_EQUAL = 187; -export const KEY_COMMA = 188; -export const KEY_MINUS = 189; -export const KEY_PERIOD = 190; -export const KEY_SLASH = 191; -export const KEY_LEFT_BRACKET = 219; -export const KEY_BACKSLASH = 220; -export const KEY_RIGHT_BRACKET = 221; -export const KEY_QUOTE = 222; diff --git a/tgui/packages/common/keys.ts b/tgui/packages/common/keys.ts deleted file mode 100644 index b3e6a4e814f..00000000000 --- a/tgui/packages/common/keys.ts +++ /dev/null @@ -1,139 +0,0 @@ -/** - * ### Key codes. - * event.keyCode is deprecated, use this reference instead. - * - * Handles modifier keys (Shift, Alt, Control) and arrow keys. - * - * For alphabetical keys, use the actual character (e.g. 'a') instead of the key code. - * Don't access Esc or Escape directly, use isEscape() instead - * - * Something isn't here that you want? Just add it: - * @url https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values - * @usage - * ```ts - * import { KEY } from 'tgui/common/keys'; - * - * if (event.key === KEY.Enter) { - * // do something - * } - * ``` - * - * - */ -export enum KEY { - A = 'a', - Alt = 'Alt', - Backspace = 'Backspace', - Control = 'Control', - D = 'd', - Delete = 'Delete', - Down = 'ArrowDown', - E = 'e', - End = 'End', - Enter = 'Enter', - Esc = 'Esc', - Escape = 'Escape', - Home = 'Home', - Insert = 'Insert', - Left = 'ArrowLeft', - N = 'n', - PageDown = 'PageDown', - PageUp = 'PageUp', - Right = 'ArrowRight', - S = 's', - Shift = 'Shift', - Space = ' ', - Tab = 'Tab', - Up = 'ArrowUp', - W = 'w', - Z = 'z', -} - -/** - * ### isEscape - * - * Checks if the user has hit the 'ESC' key on their keyboard. - * There's a weirdness in BYOND where this could be either the string - * 'Escape' or 'Esc' depending on the browser. This function handles - * both cases. - * - * @param key - the key to check, typically from event.key - * @returns true if key is Escape or Esc, false otherwise - */ -export function isEscape(key: string): boolean { - return key === KEY.Esc || key === KEY.Escape; -} - -/** - * ### isAlphabetic - * - * Checks if the user has hit any alphabetic key (a - z) - * - * @param key - the key to check, typically from event.key - * @returns true if key is in the range of a-z - */ -export function isAlphabetic(key: string): boolean { - return key >= KEY.A && key <= KEY.Z; -} - -/** - * ### isNumeric - * - * Checks if the user has hit any numeric key (0 - 9) - * - * @param key - the key to check, typically from event.key - * @returns true if key is in the range of 0 - 9 - */ -export function isNumeric(key: string): boolean { - return key >= '0' && key <= '9'; -} - -/** - * ### isCardinal - * - * Checks if the user has hit any cardinal key (n s w e) - * - * @param key - the key to check, typically from event.key - * @returns true if key matches any cardinal n s w e - */ -export function isCardinal(key: string): boolean { - return key === KEY.N || key === KEY.S || key === KEY.W || key === KEY.E; -} - -/** - * ### isArrow - * - * Checks if the user has hit any arrow key - * - * @param key - the key to check, typically from event.key - * @returns true if key matches any arrow keys - */ -export function isArrow(key: string): boolean { - return ( - key === KEY.Up || key === KEY.Down || key === KEY.Left || key === KEY.Right - ); -} - -/** - * ### isWasd - * - * Checks if the user has hit any w a s d key - * - * @param key - the key to check, typically from event.key - * @returns true if key matches any w a s d - */ -export function isWasd(key: string): boolean { - return key === KEY.W || key === KEY.A || key === KEY.S || key === KEY.D; -} - -/** - * ### isMovement - * - * Checks if the user has hit any movement key (w a s d and arrow keys) - * - * @param key - the key to check, typically from event.key - * @returns true if key matches any movement key w a s d and arrow keys - */ -export function isMovement(key: string): boolean { - return isWasd(key) || isArrow(key); -} diff --git a/tgui/packages/common/math.ts b/tgui/packages/common/math.ts deleted file mode 100644 index b9f7bfda9d5..00000000000 --- a/tgui/packages/common/math.ts +++ /dev/null @@ -1,107 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -// Further modified for Aurora - -/** - * Limits a number to the range between 'min' and 'max'. - */ -export const clamp = (value, min, max) => { - return value < min ? min : value > max ? max : value; -}; - -/** - * Limits a number between 0 and 1. - */ -export const clamp01 = (value) => { - return value < 0 ? 0 : value > 1 ? 1 : value; -}; - -/** - * Scales a number to fit into the range between min and max. - */ -export const scale = (value, min, max) => { - return (value - min) / (max - min); -}; - -/** - * Robust number rounding. - * - * Adapted from Locutus, see: http://locutus.io/php/math/round/ - * - * @param {number} value - * @param {number} precision - * @return {number} - */ -export const round = (value, precision) => { - if (!value || isNaN(value)) { - return value; - } - // helper variables - let m, f, isHalf, sgn; - // making sure precision is integer - precision |= 0; - m = Math.pow(10, precision); - value *= m; - // sign of the number - sgn = +(value > 0) | -(value < 0); - // isHalf = value % 1 === 0.5 * sgn; - isHalf = Math.abs(value % 1) >= 0.4999999999854481; - f = Math.floor(value); - if (isHalf) { - // rounds .5 away from zero - value = f + (sgn > 0); - } - return (isHalf ? value : Math.round(value)) / m; -}; - -/** - * Returns a string representing a number in fixed point notation. - */ -export const toFixed = (value, fractionDigits = 0) => { - return Number(value).toFixed(Math.max(fractionDigits, 0)); -}; - -/** - * Checks whether a value is within the provided range. - * - * Range is an array of two numbers, for example: [0, 15]. - */ -export const inRange = (value, range) => { - return range && value >= range[0] && value <= range[1]; -}; - -/** - * Walks over the object with ranges, comparing value against every range, - * and returns the key of the first matching range. - * - * Range is an array of two numbers, for example: [0, 15]. - */ -export const keyOfMatchingRange = (value, ranges) => { - for (let rangeName of Object.keys(ranges)) { - const range = ranges[rangeName]; - if (inRange(value, range)) { - return rangeName; - } - } -}; - -/** - * Get number of digits following the decimal point in a number - */ -export const numberOfDecimalDigits = (value) => { - if (Math.floor(value) !== value) { - return value.toString().split('.')[1].length || 0; - } - return 0; -}; - -// Linear interpolation between two values. -export const lerp = (value1: number, value2: number, amount: number) => { - amount = amount < 0 ? 0 : amount; - amount = amount > 1 ? 1 : amount; - return value1 + (value2 - value1) * amount; -}; diff --git a/tgui/packages/common/package.json b/tgui/packages/common/package.json index bbf99bf1cad..f40c3b79237 100644 --- a/tgui/packages/common/package.json +++ b/tgui/packages/common/package.json @@ -1,5 +1,8 @@ { - "private": true, - "name": "common", - "version": "4.3.1" + "name": "common", + "version": "4.3.1", + "dependencies": { + "es-toolkit": "^1.39.3" + }, + "private": true } diff --git a/tgui/packages/common/perf.js b/tgui/packages/common/perf.ts similarity index 50% rename from tgui/packages/common/perf.js rename to tgui/packages/common/perf.ts index 591aa3537de..a7dfefc1e1c 100644 --- a/tgui/packages/common/perf.js +++ b/tgui/packages/common/perf.ts @@ -14,46 +14,57 @@ const FRAME_DURATION = 1000 / FPS; // True if Performance API is supported const supportsPerf = !!window.performance?.now; // High precision markers -let hpMarkersByName = {}; +const hpMarkersByName: Record = {}; // Low precision markers -let lpMarkersByName = {}; +const lpMarkersByName: Record = {}; /** * Marks a certain spot in the code for later measurements. */ -const mark = (name, timestamp) => { +function mark(name: string, timestamp?: number): void { if (process.env.NODE_ENV !== 'production') { if (supportsPerf && !timestamp) { hpMarkersByName[name] = performance.now(); } lpMarkersByName[name] = timestamp || Date.now(); } -}; +} /** * Calculates and returns the difference between two markers as a string. * * Use logger.log() to print the measurement. */ -const measure = (markerNameA, markerNameB) => { - if (process.env.NODE_ENV !== 'production') { - let markerA = hpMarkersByName[markerNameA]; - let markerB = hpMarkersByName[markerNameB]; - if (!markerA || !markerB) { - markerA = lpMarkersByName[markerNameA]; - markerB = lpMarkersByName[markerNameB]; - } - const duration = Math.abs(markerB - markerA); - return formatDuration(duration); - } -}; +function measure(markerNameA: string, markerNameB: string): string | undefined { + if (process.env.NODE_ENV === 'production') return; -const formatDuration = (duration) => { + let markerA = hpMarkersByName[markerNameA]; + let markerB = hpMarkersByName[markerNameB]; + + if (!markerA || !markerB) { + markerA = lpMarkersByName[markerNameA]; + markerB = lpMarkersByName[markerNameB]; + } + + const duration = Math.abs(markerB - markerA); + + return formatDuration(duration); +} + +/** + * Formats a duration in milliseconds and frames. + */ +function formatDuration(duration: number): string { const durationInFrames = duration / FRAME_DURATION; - // prettier-ignore - return duration.toFixed(duration < 10 ? 1 : 0) + 'ms ' - + '(' + durationInFrames.toFixed(2) + ' frames)'; -}; + + return ( + duration.toFixed(duration < 10 ? 1 : 0) + + 'ms ' + + '(' + + durationInFrames.toFixed(2) + + ' frames)' + ); +} export const perf = { mark, diff --git a/tgui/packages/common/random.ts b/tgui/packages/common/random.ts deleted file mode 100644 index fbf9030b1ba..00000000000 --- a/tgui/packages/common/random.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { clamp } from './math'; - -/** - * Returns random number between lowerBound exclusive and upperBound inclusive - */ -export const randomNumber = (lowerBound: number, upperBound: number) => { - return Math.random() * (upperBound - lowerBound) + lowerBound; -}; - -/** - * Returns random integer between lowerBound exclusive and upperBound inclusive - */ -export const randomInteger = (lowerBound: number, upperBound: number) => { - lowerBound = Math.ceil(lowerBound); - upperBound = Math.floor(upperBound); - return Math.floor(Math.random() * (upperBound - lowerBound) + lowerBound); -}; - -/** - * Returns random array element - */ -export const randomPick = (array: T[]) => { - return array[Math.floor(Math.random() * array.length)]; -}; - -/** - * Return 1 with probability P percent; otherwise 0 - */ -export const randomProb = (probability: number) => { - const normalized = clamp(probability, 0, 100) / 100; - return Math.random() <= normalized; -}; diff --git a/tgui/packages/common/react.spec.ts b/tgui/packages/common/react.spec.ts deleted file mode 100644 index 44102fdc971..00000000000 --- a/tgui/packages/common/react.spec.ts +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @copyright 2021 Aleksej Komarov - * @license MIT - */ - -import { classes } from './react'; - -describe('classes', () => { - test('empty', () => { - expect(classes([])).toBe(''); - }); - - test('result contains inputs', () => { - const output = classes(['foo', 'bar', false, true, 0, 1, 'baz']); - expect(output).toContain('foo'); - expect(output).toContain('bar'); - expect(output).toContain('baz'); - }); -}); diff --git a/tgui/packages/common/react.ts b/tgui/packages/common/react.ts deleted file mode 100644 index 8e42d0971ab..00000000000 --- a/tgui/packages/common/react.ts +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -/** - * Helper for conditionally adding/removing classes in React - */ -export const classes = (classNames: (string | BooleanLike)[]) => { - let className = ''; - for (let i = 0; i < classNames.length; i++) { - const part = classNames[i]; - if (typeof part === 'string') { - className += part + ' '; - } - } - return className; -}; - -/** - * Normalizes children prop, so that it is always an array of VDom - * elements. - */ -export const normalizeChildren = (children: T | T[]) => { - if (Array.isArray(children)) { - return children.flat().filter((value) => value) as T[]; - } - if (typeof children === 'object') { - return [children]; - } - return []; -}; - -/** - * Shallowly checks if two objects are different. - * Credit: https://github.com/developit/preact-compat - */ -export const shallowDiffers = (a: object, b: object) => { - let i; - for (i in a) { - if (!(i in b)) { - return true; - } - } - for (i in b) { - if (a[i] !== b[i]) { - return true; - } - } - return false; -}; - -/** - * Default inferno hooks for pure components. - */ -export const pureComponentHooks = { - onComponentShouldUpdate: (lastProps, nextProps) => { - return shallowDiffers(lastProps, nextProps); - }, -}; - -/** - * A helper to determine whether the object is renderable by React. - */ -export const canRender = (value: unknown) => { - // prettier-ignore - return value !== undefined - && value !== null - && typeof value !== 'boolean'; -}; - -/** - * A common case in tgui, when you pass a value conditionally, these are - * the types that can fall through the condition. - */ -export type BooleanLike = number | boolean | null | undefined; diff --git a/tgui/packages/common/redux.test.ts b/tgui/packages/common/redux.test.ts index 0a29a92e0ce..0a5d8c143cb 100644 --- a/tgui/packages/common/redux.test.ts +++ b/tgui/packages/common/redux.test.ts @@ -1,10 +1,12 @@ +import { describe, expect, it } from 'bun:test'; + import { - Action, - Reducer, + type Action, applyMiddleware, combineReducers, createAction, createStore, + type Reducer, } from './redux'; // Dummy Reducer @@ -30,12 +32,12 @@ const increment = createAction('INCREMENT'); const decrement = createAction('DECREMENT'); describe('Redux implementation tests', () => { - test('createStore works', () => { + it('createStore works', () => { const store = createStore(counterReducer); expect(store.getState()).toBe(0); }); - test('createStore with applyMiddleware works', () => { + it('createStore with applyMiddleware works', () => { const store = createStore( counterReducer, applyMiddleware(loggingMiddleware), @@ -43,7 +45,7 @@ describe('Redux implementation tests', () => { expect(store.getState()).toBe(0); }); - test('dispatch works', () => { + it('dispatch works', () => { const store = createStore(counterReducer); store.dispatch(increment()); expect(store.getState()).toBe(1); @@ -51,7 +53,7 @@ describe('Redux implementation tests', () => { expect(store.getState()).toBe(0); }); - test('combineReducers works', () => { + it('combineReducers works', () => { const rootReducer = combineReducers({ counter: counterReducer, }); @@ -59,7 +61,7 @@ describe('Redux implementation tests', () => { expect(store.getState()).toEqual({ counter: 0 }); }); - test('createAction works', () => { + it('createAction works', () => { const incrementAction = increment(); expect(incrementAction).toEqual({ type: 'INCREMENT' }); const decrementAction = decrement(); diff --git a/tgui/packages/common/redux.ts b/tgui/packages/common/redux.ts index 1503de3c7d7..33275884714 100644 --- a/tgui/packages/common/redux.ts +++ b/tgui/packages/common/redux.ts @@ -4,6 +4,8 @@ * @license MIT */ +type Fn = (...args: any[]) => any; + export type Reducer = ( state: State | undefined, action: ActionType, @@ -36,7 +38,7 @@ export type Dispatch = ( action: ActionType, ) => void; -type StoreEnhancer = (createStoreFunction: Function) => Function; +type StoreEnhancer = (createStoreFunction: Fn) => Fn; type PreparedAction = { payload?: any; @@ -56,7 +58,7 @@ export const createStore = ( } let currentState: State; - let listeners: Array<() => void> = []; + const listeners: Array<() => void> = []; const getState = (): State => currentState; @@ -95,7 +97,7 @@ export const applyMiddleware = ( return (reducer, ...args): Store => { const store = createStoreFunction(reducer, ...args); - let dispatch: Dispatch = () => { + let dispatch: Dispatch = (action, ...args) => { throw new Error( 'Dispatching while constructing your middleware is not allowed.', ); @@ -163,7 +165,7 @@ export const combineReducers = ( * @param {string} type The action type to use for created actions. * @param {any} prepare (optional) a method that takes any number of arguments * and returns { payload } or { payload, meta }. If this is given, the - * resulting action creator will pass it's arguments to this method to + * resulting action creator will pass its arguments to this method to * calculate payload & meta. * * @public @@ -194,19 +196,3 @@ export const createAction = ( return actionCreator; }; - -// Implementation specific -// -------------------------------------------------------- - -export const useDispatch = (context: { - store: Store; -}): Dispatch => { - return context.store.dispatch; -}; - -export const useSelector = ( - context: { store: Store }, - selector: (state: State) => Selected, -): Selected => { - return selector(context.store.getState()); -}; diff --git a/tgui/packages/common/storage.js b/tgui/packages/common/storage.js deleted file mode 100644 index 869ffd84990..00000000000 --- a/tgui/packages/common/storage.js +++ /dev/null @@ -1,308 +0,0 @@ -/** - * Browser-agnostic abstraction of key-value web storage. - * - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -export const IMPL_MEMORY = 0; -export const IMPL_HUB_STORAGE = 1; -export const IMPL_INDEXED_DB = 2; -export const IMPL_IFRAME_INDEXED_DB = 3; - -const INDEXED_DB_VERSION = 1; -const INDEXED_DB_NAME = 'tgui'; -const INDEXED_DB_STORE_NAME = 'storage-v1'; - -const READ_ONLY = 'readonly'; -const READ_WRITE = 'readwrite'; - -const testGeneric = (testFn) => () => { - try { - return Boolean(testFn()); - } catch { - return false; - } -}; - -const testHubStorage = testGeneric( - () => window.hubStorage && window.hubStorage.getItem, -); - -// TODO: Remove with 516 -// prettier-ignore -const testIndexedDb = testGeneric(() => ( - (window.indexedDB || window.msIndexedDB) - && (window.IDBTransaction || window.msIDBTransaction) -)); - -class MemoryBackend { - constructor() { - this.impl = IMPL_MEMORY; - this.store = {}; - } - - async get(key) { - return this.store[key]; - } - - async set(key, value) { - this.store[key] = value; - } - - async remove(key) { - this.store[key] = undefined; - } - - async clear() { - this.store = {}; - } -} - -class HubStorageBackend { - constructor() { - this.impl = IMPL_HUB_STORAGE; - } - - async get(key) { - const value = await window.hubStorage.getItem('aurora-' + key); - if (typeof value === 'string') { - return JSON.parse(value); - } - } - - async set(key, value) { - window.hubStorage.setItem('aurora-' + key, JSON.stringify(value)); - } - - async remove(key) { - window.hubStorage.removeItem('aurora-' + key); - } - - async clear() { - window.hubStorage.clear(); - } -} - -class IFrameIndexedDbBackend { - constructor() { - this.impl = IMPL_IFRAME_INDEXED_DB; - } - - async ready() { - const iframe = document.createElement('iframe'); - iframe.style.display = 'none'; - iframe.src = Byond.storageCdn; - - const completePromise = new Promise((resolve) => { - iframe.onload = () => resolve(this); - }); - - this.documentElement = document.body.appendChild(iframe); - this.iframeWindow = this.documentElement.contentWindow; - - return completePromise; - } - - async get(key) { - const promise = new Promise((resolve) => { - window.addEventListener('message', (message) => { - if (message.data.key && message.data.key === key) { - resolve(message.data.value); - } - }); - }); - - this.iframeWindow.postMessage({ type: 'get', key: key }, '*'); - return promise; - } - - async set(key, value) { - this.iframeWindow.postMessage({ type: 'set', key: key, value: value }, '*'); - } - - async remove(key) { - this.iframeWindow.postMessage({ type: 'remove', key: key }, '*'); - } - - async clear() { - this.iframeWindow.postMessage({ type: 'clear' }, '*'); - } - - async ping() { - const promise = new Promise((resolve) => { - window.addEventListener('message', (message) => { - if (message.data === true) { - resolve(true); - } - }); - - setTimeout(() => resolve(false), 100); - }); - - this.iframeWindow.postMessage({ type: 'ping' }, '*'); - return promise; - } - - async processChatMessages(messages) { - this.iframeWindow.postMessage( - { type: 'processChatMessages', messages: messages }, - '*', - ); - } - - async getChatMessages() { - const promise = new Promise((resolve) => { - window.addEventListener('message', (message) => { - if (message.data.messages) { - resolve(message.data.messages); - } - }); - }); - - this.iframeWindow.postMessage({ type: 'getChatMessages' }, '*'); - return promise; - } - - async setNumberStored(number) { - this.iframeWindow.postMessage( - { type: 'setNumberStored', newMax: number }, - '*', - ); - } - - async destroy() { - document.body.removeChild(this.documentElement); - this.documentElement = null; - this.iframeWindow = null; - } -} - -class IndexedDbBackend { - // TODO: Remove with 516 - constructor() { - this.impl = IMPL_INDEXED_DB; - /** @type {Promise} */ - this.dbPromise = new Promise((resolve, reject) => { - const indexedDB = window.indexedDB || window.msIndexedDB; - const req = indexedDB.open(INDEXED_DB_NAME, INDEXED_DB_VERSION); - req.onupgradeneeded = () => { - try { - req.result.createObjectStore(INDEXED_DB_STORE_NAME); - } catch (err) { - reject(new Error('Failed to upgrade IDB: ' + req.error)); - } - }; - req.onsuccess = () => resolve(req.result); - req.onerror = () => { - reject(new Error('Failed to open IDB: ' + req.error)); - }; - }); - } - - async getStore(mode) { - // prettier-ignore - return this.dbPromise.then((db) => db - .transaction(INDEXED_DB_STORE_NAME, mode) - .objectStore(INDEXED_DB_STORE_NAME)); - } - - async get(key) { - const store = await this.getStore(READ_ONLY); - return new Promise((resolve, reject) => { - const req = store.get(key); - req.onsuccess = () => resolve(req.result); - req.onerror = () => reject(req.error); - }); - } - - async set(key, value) { - // NOTE: We deliberately make this operation transactionless - const store = await this.getStore(READ_WRITE); - store.put(value, key); - } - - async remove(key) { - // NOTE: We deliberately make this operation transactionless - const store = await this.getStore(READ_WRITE); - store.delete(key); - } - - async clear() { - // NOTE: We deliberately make this operation transactionless - const store = await this.getStore(READ_WRITE); - store.clear(); - } -} - -/** - * Web Storage Proxy object, which selects the best backend available - * depending on the environment. - */ -export class StorageProxy { - constructor() { - this.backendPromise = (async () => { - if (!Byond.TRIDENT) { - if (Byond.storageCdn) { - const iframe = new IFrameIndexedDbBackend(); - await iframe.ready(); - - if ((await iframe.ping()) === true) { - return iframe; - } - - iframe.destroy(); - } - - if (!testHubStorage()) { - Byond.winset(null, 'browser-options', '+byondstorage'); - - return new Promise((resolve) => { - const listener = () => { - document.removeEventListener('byondstorageupdated', listener); - resolve(new HubStorageBackend()); - }; - - document.addEventListener('byondstorageupdated', listener); - }); - } - return new HubStorageBackend(); - } - // TODO: Remove with 516 - if (testIndexedDb()) { - try { - const backend = new IndexedDbBackend(); - await backend.dbPromise; - return backend; - } catch {} - } - console.warn( - 'No supported storage backend found. Using in-memory storage.', - ); - return new MemoryBackend(); - })(); - } - - async get(key) { - const backend = await this.backendPromise; - return backend.get(key); - } - - async set(key, value) { - const backend = await this.backendPromise; - return backend.set(key, value); - } - - async remove(key) { - const backend = await this.backendPromise; - return backend.remove(key); - } - - async clear() { - const backend = await this.backendPromise; - return backend.clear(); - } -} - -export const storage = new StorageProxy(); diff --git a/tgui/packages/common/storage.ts b/tgui/packages/common/storage.ts new file mode 100644 index 00000000000..2af369fc71b --- /dev/null +++ b/tgui/packages/common/storage.ts @@ -0,0 +1,261 @@ +/** + * Browser-agnostic abstraction of key-value web storage. + * + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +export const IMPL_MEMORY = 0; +export const IMPL_HUB_STORAGE = 1; +export const IMPL_IFRAME_INDEXED_DB = 2; + +type StorageImplementation = + | typeof IMPL_MEMORY + | typeof IMPL_HUB_STORAGE + | typeof IMPL_IFRAME_INDEXED_DB; + +type StorageBackend = { + impl: StorageImplementation; + get(key: string): Promise; + set(key: string, value: any): Promise; + remove(key: string): Promise; + clear(): Promise; +}; + +const testGeneric = (testFn: () => boolean) => (): boolean => { + try { + return Boolean(testFn()); + } catch { + return false; + } +}; + +const testHubStorage = testGeneric( + () => window.hubStorage && !!window.hubStorage.getItem, +); + +class MemoryBackend implements StorageBackend { + private store: Record; + public impl: StorageImplementation; + + constructor() { + this.impl = IMPL_MEMORY; + this.store = {}; + } + + async get(key: string): Promise { + return this.store[key]; + } + + async set(key: string, value: any): Promise { + this.store[key] = value; + } + + async remove(key: string): Promise { + this.store[key] = undefined; + } + + async clear(): Promise { + this.store = {}; + } +} + +class HubStorageBackend implements StorageBackend { + public impl: StorageImplementation; + + constructor() { + this.impl = IMPL_HUB_STORAGE; + } + + async get(key: string): Promise { + const value = await window.hubStorage.getItem(key); + if (typeof value === 'string') { + return JSON.parse(value); + } + return undefined; + } + + async set(key: string, value: any): Promise { + window.hubStorage.setItem(key, JSON.stringify(value)); + } + + async remove(key: string): Promise { + window.hubStorage.removeItem(key); + } + + async clear(): Promise { + window.hubStorage.clear(); + } +} + +class IFrameIndexedDbBackend implements StorageBackend { + public impl: StorageImplementation; + + private documentElement: HTMLIFrameElement; + private iframeWindow: Window; + + constructor() { + this.impl = IMPL_IFRAME_INDEXED_DB; + } + + async ready(): Promise { + const iframe = document.createElement('iframe'); + iframe.style.display = 'none'; + iframe.src = Byond.storageCdn; + + const completePromise: Promise = new Promise((resolve) => { + iframe.onload = () => resolve(true); + }); + + this.documentElement = document.body.appendChild(iframe); + if (!this.documentElement.contentWindow) { + return new Promise((res) => res(false)); + } + + this.iframeWindow = this.documentElement.contentWindow; + + return completePromise; + } + + async get(key: string): Promise { + const promise = new Promise((resolve) => { + window.addEventListener('message', (message) => { + if (message.data.key && message.data.key === key) { + resolve(message.data.value); + } + }); + }); + + this.iframeWindow.postMessage({ type: 'get', key: key }, '*'); + return promise; + } + + async set(key: string, value: any): Promise { + this.iframeWindow.postMessage({ type: 'set', key: key, value: value }, '*'); + } + + async remove(key: string): Promise { + this.iframeWindow.postMessage({ type: 'remove', key: key }, '*'); + } + + async clear(): Promise { + this.iframeWindow.postMessage({ type: 'clear' }, '*'); + } + + async ping(): Promise { + const promise: Promise = new Promise((resolve) => { + window.addEventListener('message', (message) => { + if (message.data === true) { + resolve(true); + } + }); + + setTimeout(() => resolve(false), 100); + }); + + this.iframeWindow.postMessage({ type: 'ping' }, '*'); + return promise; + } + + async destroy(): Promise { + document.body.removeChild(this.documentElement); + } +} + +/** + * Web Storage Proxy object, which selects the best backend available + * depending on the environment. + */ +class StorageProxy implements StorageBackend { + private backendPromise: Promise; + public impl: StorageImplementation = IMPL_MEMORY; + + constructor() { + this.backendPromise = (async () => { + if (testHubStorage()) { + return new HubStorageBackend(); + } + + if (Byond.storageCdn) { + const iframe = new IFrameIndexedDbBackend(); + const iframeReady = await iframe.ready(); + + if (iframeReady && (await iframe.ping()) === true) { + if (await iframe.get('byondstorage-migrated')) return iframe; + + Byond.winset(null, 'browser-options', '+byondstorage'); + + await new Promise((resolve) => { + document.addEventListener('byondstorageupdated', async () => { + setTimeout(() => { + const hub = new HubStorageBackend(); + + for (const setting of [ + 'panel-settings', + 'chat-state', + 'chat-messages', + ]) { + hub + .get(setting) + .then((settings) => iframe.set(setting, settings)); + } + + iframe.set('byondstorage-migrated', true); + Byond.winset(null, 'browser-options', '-byondstorage'); + + resolve(); + }, 1); + }); + }); + + return iframe; + } + + iframe.destroy(); + + } + + if (Byond.IS_BYOND) { + Byond.winset(null, 'browser-options', '+byondstorage'); + + return new Promise((resolve) => { + const listener = () => { + document.removeEventListener('byondstorageupdated', listener); + resolve(new HubStorageBackend()); + }; + + document.addEventListener('byondstorageupdated', listener); + }); + } + + console.warn( + 'No supported storage backend found. Using in-memory storage.', + ); + + return new MemoryBackend(); + })(); + } + + async get(key: string): Promise { + const backend = await this.backendPromise; + return backend.get(key); + } + + async set(key: string, value: any): Promise { + const backend = await this.backendPromise; + return backend.set(key, value); + } + + async remove(key: string): Promise { + const backend = await this.backendPromise; + return backend.remove(key); + } + + async clear(): Promise { + const backend = await this.backendPromise; + return backend.clear(); + } +} + +export const storage = new StorageProxy(); diff --git a/tgui/packages/common/string.babel-plugin.cjs b/tgui/packages/common/string.babel-plugin.cjs deleted file mode 100644 index 97ca67c6ea4..00000000000 --- a/tgui/packages/common/string.babel-plugin.cjs +++ /dev/null @@ -1,73 +0,0 @@ -/** - * This plugin saves overall about 10KB on the final bundle size, so it's - * sort of worth it. - * - * We are using a .cjs extension because: - * - * 1. Webpack CLI only supports CommonJS modules; - * 2. tgui-dev-server supports both, but we still need to signal NodeJS - * to import it as a CommonJS module, hence .cjs extension. - * - * We need to copy-paste the whole "multiline" function because we can't - * synchronously import an ES module from a CommonJS module. - * - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -/** - * Removes excess whitespace and indentation from the string. - */ -const multiline = (str) => { - const lines = str.split('\n'); - // Determine base indentation - let minIndent; - for (let line of lines) { - for (let indent = 0; indent < line.length; indent++) { - const char = line[indent]; - if (char !== ' ') { - if (minIndent === undefined || indent < minIndent) { - minIndent = indent; - } - break; - } - } - } - if (!minIndent) { - minIndent = 0; - } - // Remove this base indentation and trim the resulting string - // from both ends. - return lines - .map((line) => line.substr(minIndent).trimRight()) - .join('\n') - .trim(); -}; - -const StringPlugin = (ref) => { - return { - visitor: { - TaggedTemplateExpression: (path) => { - if (path.node.tag.name === 'multiline') { - const { quasi } = path.node; - if (quasi.expressions.length > 0) { - throw new Error('Multiline tag does not support expressions!'); - } - if (quasi.quasis.length > 1) { - throw new Error('Quasis is longer than 1'); - } - const { value } = quasi.quasis[0]; - value.raw = multiline(value.raw); - value.cooked = multiline(value.cooked); - path.replaceWith(quasi); - } - }, - }, - }; -}; - -module.exports = { - __esModule: true, - default: StringPlugin, -}; diff --git a/tgui/packages/common/string.js b/tgui/packages/common/string.js deleted file mode 100644 index 5906d83cb84..00000000000 --- a/tgui/packages/common/string.js +++ /dev/null @@ -1,196 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -/** - * Removes excess whitespace and indentation from the string. - */ -export const multiline = (str) => { - if (Array.isArray(str)) { - // Small stub to allow usage as a template tag - return multiline(str.join('')); - } - const lines = str.split('\n'); - // Determine base indentation - let minIndent; - for (let line of lines) { - for (let indent = 0; indent < line.length; indent++) { - const char = line[indent]; - if (char !== ' ') { - if (minIndent === undefined || indent < minIndent) { - minIndent = indent; - } - break; - } - } - } - if (!minIndent) { - minIndent = 0; - } - // Remove this base indentation and trim the resulting string - // from both ends. - return lines - .map((line) => line.substr(minIndent).trimRight()) - .join('\n') - .trim(); -}; - -/** - * Creates a glob pattern matcher. - * - * Matches strings with wildcards. - * - * Example: createGlobPattern('*@domain')('user@domain') === true - */ -export const createGlobPattern = (pattern) => { - const escapeString = (str) => str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&'); - // prettier-ignore - const regex = new RegExp('^' - + pattern.split(/\*+/).map(escapeString).join('.*') - + '$'); - return (str) => regex.test(str); -}; - -/** - * Creates a search terms matcher. - * - * Returns true if given string matches the search text. - * - * @template T - * @param {string} searchText - * @param {(obj: T) => string} stringifier - * @returns {(obj: T) => boolean} - */ -export const createSearch = (searchText, stringifier) => { - const preparedSearchText = searchText.toLowerCase().trim(); - return (obj) => { - if (!preparedSearchText) { - return true; - } - const str = stringifier ? stringifier(obj) : obj; - if (!str) { - return false; - } - return str.toLowerCase().includes(preparedSearchText); - }; -}; - -/** - * Capitalizes a word and lowercases the rest. - * @param {string} str - * @returns {string} capitalized string - * - * @example capitalize('heLLo') === 'Hello' - */ -export const capitalize = (str) => { - // Handle array - if (Array.isArray(str)) { - return str.map(capitalize); - } - // Handle string - return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase(); -}; - -/** - * Similar to capitalize, this takes a string and replaces all first letters - * of any words. - * - * @param {string} str - * @return {string} The string with the first letters capitalized. - * - * @example capitalizeAll('heLLo woRLd') === 'HeLLo WoRLd' - */ -export const capitalizeAll = (str) => { - return str.replace(/(^\w{1})|(\s+\w{1})/g, (letter) => letter.toUpperCase()); -}; - -/** - * Capitalizes only the first letter of the str. - * - * @param {string} str - * @return {string} capitalized string - * - * @example capitalizeFirst('heLLo woRLd') === 'HeLLo woRLd' - */ -export const capitalizeFirst = (str) => { - return str.replace(/^\w/, (letter) => letter.toUpperCase()); -}; - -export const toTitleCase = (str) => { - // Handle array - if (Array.isArray(str)) { - return str.map(toTitleCase); - } - // Pass non-string - if (typeof str !== 'string') { - return str; - } - // Handle string - const WORDS_UPPER = ['Id', 'Tv']; - // prettier-ignore - const WORDS_LOWER = [ - 'A', 'An', 'And', 'As', 'At', 'But', 'By', 'For', 'For', 'From', 'In', - 'Into', 'Near', 'Nor', 'Of', 'On', 'Onto', 'Or', 'The', 'To', 'With', - ]; - let currentStr = str.replace(/([^\W_]+[^\s-]*) */g, (str) => { - return str.charAt(0).toUpperCase() + str.substr(1).toLowerCase(); - }); - for (let word of WORDS_LOWER) { - const regex = new RegExp('\\s' + word + '\\s', 'g'); - currentStr = currentStr.replace(regex, (str) => str.toLowerCase()); - } - for (let word of WORDS_UPPER) { - const regex = new RegExp('\\b' + word + '\\b', 'g'); - currentStr = currentStr.replace(regex, (str) => str.toLowerCase()); - } - return currentStr; -}; - -/** - * Decodes HTML entities, and removes unnecessary HTML tags. - * - * @param {String} str Encoded HTML string - * @return {String} Decoded HTML string - */ -export const decodeHtmlEntities = (str) => { - if (!str) { - return str; - } - const translate_re = /&(nbsp|amp|quot|lt|gt|apos);/g; - const translate = { - nbsp: ' ', - amp: '&', - quot: '"', - lt: '<', - gt: '>', - apos: "'", - }; - // prettier-ignore - return str - // Newline tags - .replace(/
    /gi, '\n') - .replace(/<\/?[a-z0-9-_]+[^>]*>/gi, '') - // Basic entities - .replace(translate_re, (match, entity) => translate[entity]) - // Decimal entities - .replace(/&#?([0-9]+);/gi, (match, numStr) => { - const num = parseInt(numStr, 10); - return String.fromCharCode(num); - }) - // Hex entities - .replace(/&#x?([0-9a-f]+);/gi, (match, numStr) => { - const num = parseInt(numStr, 16); - return String.fromCharCode(num); - }); -}; - -/** - * Converts an object into a query string, - */ -// prettier-ignore -export const buildQueryString = obj => Object.keys(obj) - .map(key => encodeURIComponent(key) - + '=' + encodeURIComponent(obj[key])) - .join('&'); diff --git a/tgui/packages/common/timer.js b/tgui/packages/common/timer.js deleted file mode 100644 index 715b713e027..00000000000 --- a/tgui/packages/common/timer.js +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -/** - * Returns a function, that, as long as it continues to be invoked, will - * not be triggered. The function will be called after it stops being - * called for N milliseconds. If `immediate` is passed, trigger the - * function on the leading edge, instead of the trailing. - */ -export const debounce = (fn, time, immediate = false) => { - let timeout; - return (...args) => { - const later = () => { - timeout = null; - if (!immediate) { - fn(...args); - } - }; - const callNow = immediate && !timeout; - clearTimeout(timeout); - timeout = setTimeout(later, time); - if (callNow) { - fn(...args); - } - }; -}; - -/** - * Returns a function, that, when invoked, will only be triggered at most once - * during a given window of time. - */ -export const throttle = (fn, time) => { - let previouslyRun, queuedToRun; - return function invokeFn(...args) { - const now = Date.now(); - queuedToRun = clearTimeout(queuedToRun); - if (!previouslyRun || now - previouslyRun >= time) { - fn.apply(null, args); - previouslyRun = now; - } else { - queuedToRun = setTimeout( - invokeFn.bind(null, ...args), - time - (now - previouslyRun), - ); - } - }; -}; - -/** - * Suspends an asynchronous function for N milliseconds. - * - * @param {number} time - */ -export const sleep = (time) => - new Promise((resolve) => setTimeout(resolve, time)); diff --git a/tgui/packages/common/type-safety.test.ts b/tgui/packages/common/type-safety.test.ts new file mode 100644 index 00000000000..f572a19781d --- /dev/null +++ b/tgui/packages/common/type-safety.test.ts @@ -0,0 +1,53 @@ +import { describe, it } from 'bun:test'; +import assert from 'node:assert/strict'; +import * as z from 'zod'; +import { smoothMerge } from './type-safety'; + +describe('smoothMerge', () => { + it('merges valid fields from source into target', () => { + const schema = z.object({ + a: z.string(), + b: z.number(), + }); + + const source = { a: 'hello', b: 'not a number', c: true }; + const target = { a: 'default', b: 42 }; + + const result = smoothMerge({ schema, source, target }); + assert.deepEqual(result, { a: 'hello', b: 42 }); + }); + + it('returns target if source is empty', () => { + const schema = z.object({ + a: z.string(), + }); + + const source = {}; + const target = { a: 'default' }; + const result = smoothMerge({ schema, source, target }); + assert.deepEqual(result, target); + }); + + it('completely ignores an object if its not in the schema', () => { + const schema = z.object({ + a: z.string(), + b: z.number(), + }); + + const source = { + c: 1, + d: [1, 2, 3], + }; + + const target = { + a: 'default', + b: 42, + }; + + const result = smoothMerge({ schema, source, target }); + assert.deepEqual(result, { + a: 'default', + b: 42, + }); + }); +}); diff --git a/tgui/packages/common/type-safety.ts b/tgui/packages/common/type-safety.ts new file mode 100644 index 00000000000..71e1c6aa568 --- /dev/null +++ b/tgui/packages/common/type-safety.ts @@ -0,0 +1,56 @@ +import type { ZodObject } from 'zod'; + +type MergeInput = { + /** + * A zod object. + * @see Writing a Zod Schema: https://zod.dev/basics + */ + schema: ZodObject; + /** The input getting merged */ + source: Record; + /** The defaults, which is the shape of the output */ + target: TObj; +}; + +/** + * Merges two objects together while validating the output against a zod schema. + * Different than just parsing - it does not throw errors, it simply discards + * invalid fields and invalid value types. + * + * @example + * + * ```ts + * const schema = z.object({ + * a: z.string(), + * b: z.number(), + * }); + * + * const source = { a: 'hello', b: 'not a number', c: true }; + * const target = { a: 'default', b: 42 }; + * + * const result = smoothMerge({ schema, source, target }); + * // result is { a: 'hello', b: 42 } + * ``` + */ +export function smoothMerge>( + input: MergeInput, +): TObj { + if (Object.keys(input.source).length === 0) return input.target; + + const validated = {}; + + for (const [key, value] of Object.entries(input.source)) { + // Skip keys that are not in the schema + if (!(key in input.schema.shape)) continue; + + const fieldSchema = input.schema.shape[key]; + const result = fieldSchema.safeParse(value); + + // Only assign fields which pass validation + if (result.success) { + validated[key] = result.data; + } + } + + return { ...input.target, ...validated }; +} diff --git a/tgui/packages/common/types.ts b/tgui/packages/common/types.ts deleted file mode 100644 index e219bd3b7e1..00000000000 --- a/tgui/packages/common/types.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Returns the arguments of a function F as an array. - */ -// prettier-ignore -export type ArgumentsOf - = F extends (...args: infer A) => unknown ? A : never; diff --git a/tgui/packages/common/uuid.js b/tgui/packages/common/uuid.js deleted file mode 100644 index 33d765fcab0..00000000000 --- a/tgui/packages/common/uuid.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -/** - * Creates a UUID v4 string - * - * @return {string} - */ -export const createUuid = () => { - let d = new Date().getTime(); - return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => { - const r = ((d + Math.random() * 16) % 16) | 0; - d = Math.floor(d / 16); - // prettier-ignore - return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16); - }); -}; diff --git a/tgui/packages/common/vector.js b/tgui/packages/common/vector.js deleted file mode 100644 index b1f85f7429d..00000000000 --- a/tgui/packages/common/vector.js +++ /dev/null @@ -1,48 +0,0 @@ -/** - * N-dimensional vector manipulation functions. - * - * Vectors are plain number arrays, i.e. [x, y, z]. - * - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import { map, reduce, zipWith } from './collections'; - -const ADD = (a, b) => a + b; -const SUB = (a, b) => a - b; -const MUL = (a, b) => a * b; -const DIV = (a, b) => a / b; - -export const vecAdd = (...vecs) => { - return reduce((a, b) => zipWith(ADD)(a, b))(vecs); -}; - -export const vecSubtract = (...vecs) => { - return reduce((a, b) => zipWith(SUB)(a, b))(vecs); -}; - -export const vecMultiply = (...vecs) => { - return reduce((a, b) => zipWith(MUL)(a, b))(vecs); -}; - -export const vecDivide = (...vecs) => { - return reduce((a, b) => zipWith(DIV)(a, b))(vecs); -}; - -export const vecScale = (vec, n) => { - return map((x) => x * n)(vec); -}; - -export const vecInverse = (vec) => { - return map((x) => -x)(vec); -}; - -export const vecLength = (vec) => { - return Math.sqrt(reduce(ADD)(zipWith(MUL)(vec, vec))); -}; - -export const vecNormalize = (vec) => { - return vecDivide(vec, vecLength(vec)); -}; diff --git a/tgui/packages/common/vector.ts b/tgui/packages/common/vector.ts new file mode 100644 index 00000000000..78d22c35d11 --- /dev/null +++ b/tgui/packages/common/vector.ts @@ -0,0 +1,55 @@ +/** + * N-dimensional vector manipulation functions. + * + * Vectors are plain number arrays, i.e. [x, y, z]. + * + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +import { zip } from 'es-toolkit'; +import { map, reduce } from 'es-toolkit/compat'; + +const ADD = (a: number, b: number): number => a + b; +const SUB = (a: number, b: number): number => a - b; +const MUL = (a: number, b: number): number => a * b; +const DIV = (a: number, b: number): number => a / b; + +export type Vector = number[]; + +// It's really not ideal to bypass the type system and use `as Vector` +// however, there isn't a more eloquent way to type these + +export const vecAdd = (...vecs: Vector[]): Vector => { + return map(zip(...vecs) as Vector[], (x) => reduce(x, ADD)) as Vector; +}; + +export const vecSubtract = (...vecs: Vector[]): Vector => { + return map(zip(...vecs) as Vector[], (x) => reduce(x, SUB)) as Vector; +}; + +export const vecMultiply = (...vecs: Vector[]): Vector => { + return map(zip(...vecs) as Vector[], (x) => reduce(x, MUL)) as Vector; +}; + +export const vecDivide = (...vecs: Vector[]): Vector => { + return map(zip(...vecs) as Vector[], (x) => reduce(x, DIV)) as Vector; +}; + +export const vecScale = (vec: Vector, n: number): Vector => { + return map(vec, (x) => x * n); +}; + +export const vecInverse = (vec: Vector): Vector => { + return map(vec, (x) => -x); +}; + +export const vecLength = (vec: Vector): number => { + return Math.sqrt(reduce(vecMultiply(vec, vec), ADD) as number); +}; + +export const vecNormalize = (vec: Vector): Vector => { + const length = vecLength(vec); + return map(vec, (c) => c / length); +}; diff --git a/tgui/packages/tgfont/README_ICON_TUTORIAL.txt b/tgui/packages/tgfont/README_ICON_TUTORIAL.md similarity index 100% rename from tgui/packages/tgfont/README_ICON_TUTORIAL.txt rename to tgui/packages/tgfont/README_ICON_TUTORIAL.md diff --git a/tgui/packages/tgfont/config.cjs b/tgui/packages/tgfont/config.cjs deleted file mode 100644 index 73d96ac6ce9..00000000000 --- a/tgui/packages/tgfont/config.cjs +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @file - * @copyright 2021 AnturK https://github.com/AnturK - * @license MIT - */ - -module.exports = { - name: 'tgfont', - inputDir: './icons', - normalize: true, - outputDir: './dist', - fontTypes: ['woff2', 'eot'], - assetTypes: ['css'], - prefix: 'tg', - formatOptions: { - preserveAspectRatio: true, - }, -}; diff --git a/tgui/packages/tgfont/icons/air-tank-slash.svg b/tgui/packages/tgfont/icons/air-tank-slash.svg index 37ffcb5b880..8c33265f334 100644 --- a/tgui/packages/tgfont/icons/air-tank-slash.svg +++ b/tgui/packages/tgfont/icons/air-tank-slash.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/air-tank.svg b/tgui/packages/tgfont/icons/air-tank.svg index 7d1e0774719..b55f4e7b3aa 100644 --- a/tgui/packages/tgfont/icons/air-tank.svg +++ b/tgui/packages/tgfont/icons/air-tank.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/bad-touch.svg b/tgui/packages/tgfont/icons/bad-touch.svg index 795f4c2d840..dba8df87497 100644 --- a/tgui/packages/tgfont/icons/bad-touch.svg +++ b/tgui/packages/tgfont/icons/bad-touch.svg @@ -1,46 +1 @@ - -image/svg+xml - - - - - - - - - - - + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/image-minus.svg b/tgui/packages/tgfont/icons/image-minus.svg index 8c3231917ff..6fb74bd54fb 100644 --- a/tgui/packages/tgfont/icons/image-minus.svg +++ b/tgui/packages/tgfont/icons/image-minus.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/image-plus.svg b/tgui/packages/tgfont/icons/image-plus.svg index 1658509429e..e8b9bec62e7 100644 --- a/tgui/packages/tgfont/icons/image-plus.svg +++ b/tgui/packages/tgfont/icons/image-plus.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/nanotrasen-logo.svg b/tgui/packages/tgfont/icons/nanotrasen-logo.svg index b74a415d4d2..7cdc98573f4 100644 --- a/tgui/packages/tgfont/icons/nanotrasen-logo.svg +++ b/tgui/packages/tgfont/icons/nanotrasen-logo.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/non-binary.svg b/tgui/packages/tgfont/icons/non-binary.svg index c708c26d985..c2178ec1b36 100644 --- a/tgui/packages/tgfont/icons/non-binary.svg +++ b/tgui/packages/tgfont/icons/non-binary.svg @@ -1,44 +1 @@ - -image/svg+xml - - - - - - - - - - - + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/prosthetic-full.svg b/tgui/packages/tgfont/icons/prosthetic-full.svg index 7d221244edc..f9054947044 100644 --- a/tgui/packages/tgfont/icons/prosthetic-full.svg +++ b/tgui/packages/tgfont/icons/prosthetic-full.svg @@ -1,27 +1 @@ - -image/svg+xml - - + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/prosthetic-leg.svg b/tgui/packages/tgfont/icons/prosthetic-leg.svg index f4e16dccfb6..9db9fb5cde4 100644 --- a/tgui/packages/tgfont/icons/prosthetic-leg.svg +++ b/tgui/packages/tgfont/icons/prosthetic-leg.svg @@ -1,35 +1 @@ - -image/svg+xml - - - - - - + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/sound-minus.svg b/tgui/packages/tgfont/icons/sound-minus.svg index df51179d4b5..1da5d4fa5b0 100644 --- a/tgui/packages/tgfont/icons/sound-minus.svg +++ b/tgui/packages/tgfont/icons/sound-minus.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/sound-plus.svg b/tgui/packages/tgfont/icons/sound-plus.svg index c5f40d53b56..33be2c9176f 100644 --- a/tgui/packages/tgfont/icons/sound-plus.svg +++ b/tgui/packages/tgfont/icons/sound-plus.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/tgui/packages/tgfont/icons/syndicate-logo.svg b/tgui/packages/tgfont/icons/syndicate-logo.svg index 423dd7c6275..8086d3319a1 100644 --- a/tgui/packages/tgfont/icons/syndicate-logo.svg +++ b/tgui/packages/tgfont/icons/syndicate-logo.svg @@ -1,13 +1 @@ - - - - - - image/svg+xml - - - - - - - + \ No newline at end of file diff --git a/tgui/packages/tgfont/mkdist.cjs b/tgui/packages/tgfont/mkdist.cjs deleted file mode 100644 index 85634bd265d..00000000000 --- a/tgui/packages/tgfont/mkdist.cjs +++ /dev/null @@ -1,13 +0,0 @@ -/** - * @file - * @copyright 2021 AnturK https://github.com/AnturK - * @license MIT - */ - -// Change working directory to project root -process.chdir(__dirname); - -// Silently make a dist folder -try { - require('fs').mkdirSync('dist'); -} catch (err) {} diff --git a/tgui/packages/tgfont/package.json b/tgui/packages/tgfont/package.json index 9459aa12969..e98f7aa5b43 100644 --- a/tgui/packages/tgfont/package.json +++ b/tgui/packages/tgfont/package.json @@ -1,11 +1,13 @@ { - "private": true, - "name": "tgfont", - "version": "1.0.0", - "scripts": { - "tgfont:build": "node mkdist.cjs && fantasticon --config config.cjs" - }, - "dependencies": { - "fantasticon": "^1.2.2" - } + "private": true, + "name": "tgfont", + "type": "module", + "version": "2.0.0", + "scripts": { + "tgfont:build": "svgo icons && node svgtofont.mjs" + }, + "dependencies": { + "svgo": "^3.3.2", + "svgtofont": "^6.3.2" + } } diff --git a/tgui/packages/tgfont/static/tgfont.css b/tgui/packages/tgfont/static/tgfont.css index 3af3e9bbe02..6bdf310a502 100644 --- a/tgui/packages/tgfont/static/tgfont.css +++ b/tgui/packages/tgfont/static/tgfont.css @@ -1,56 +1,67 @@ @font-face { - font-family: 'tgfont'; - src: - url('./tgfont.woff2?ac4105718bed41e8015b97ba87c9ec71') format('woff2'), - url('./tgfont.eot?ac4105718bed41e8015b97ba87c9ec71#iefix') - format('embedded-opentype'); + font-family: "tgfont"; + src: url("tgfont.woff2?t=1747971548188") format("woff2"); } -i[class^='tg-']:before, -i[class*=' tg-']:before { - font-family: tgfont !important; - font-style: normal; - font-weight: normal !important; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; +[class^="tg-"], +[class*=" tg-"] { + /* biome-ignore lint/complexity/noImportantStyles: Just leave it */ + font-family: "tgfont" !important; + font-size: inherit; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -.tg-air-tank-slash:before { - content: '\f101'; +:root { + /* biome-ignore-start lint/suspicious/noUselessEscapeInString: The escapes are needed */ + --tg-air-tank-slash: "\ea01"; + --tg-air-tank: "\ea02"; + --tg-bad-touch: "\ea03"; + --tg-image-minus: "\ea04"; + --tg-image-plus: "\ea05"; + --tg-nanotrasen-logo: "\ea06"; + --tg-non-binary: "\ea07"; + --tg-prosthetic-full: "\ea08"; + --tg-prosthetic-leg: "\ea09"; + --tg-sound-minus: "\ea0a"; + --tg-sound-plus: "\ea0b"; + --tg-syndicate-logo: "\ea0c"; + /* biome-ignore-end lint/suspicious/noUselessEscapeInString: The escapes are needed */ } -.tg-air-tank:before { - content: '\f102'; +.tg-air-tank-slash::before { + content: var(--tg-air-tank-slash); } -.tg-bad-touch:before { - content: '\f103'; +.tg-air-tank::before { + content: var(--tg-air-tank); } -.tg-image-minus:before { - content: '\f104'; +.tg-bad-touch::before { + content: var(--tg-bad-touch); } -.tg-image-plus:before { - content: '\f105'; +.tg-image-minus::before { + content: var(--tg-image-minus); } -.tg-nanotrasen-logo:before { - content: '\f106'; +.tg-image-plus::before { + content: var(--tg-image-plus); } -.tg-non-binary:before { - content: '\f107'; +.tg-nanotrasen-logo::before { + content: var(--tg-nanotrasen-logo); } -.tg-prosthetic-full:before { - content: '\f108'; +.tg-non-binary::before { + content: var(--tg-non-binary); } -.tg-prosthetic-leg:before { - content: '\f109'; +.tg-prosthetic-full::before { + content: var(--tg-prosthetic-full); } -.tg-sound-minus:before { - content: '\f10a'; +.tg-prosthetic-leg::before { + content: var(--tg-prosthetic-leg); } -.tg-sound-plus:before { - content: '\f10b'; +.tg-sound-minus::before { + content: var(--tg-sound-minus); } -.tg-syndicate-logo:before { - content: '\f10c'; +.tg-sound-plus::before { + content: var(--tg-sound-plus); +} +.tg-syndicate-logo::before { + content: var(--tg-syndicate-logo); } diff --git a/tgui/packages/tgfont/static/tgfont.eot b/tgui/packages/tgfont/static/tgfont.eot deleted file mode 100644 index 9b08d348391..00000000000 Binary files a/tgui/packages/tgfont/static/tgfont.eot and /dev/null differ diff --git a/tgui/packages/tgfont/static/tgfont.woff2 b/tgui/packages/tgfont/static/tgfont.woff2 index d443fb92c91..2586080a0d9 100644 Binary files a/tgui/packages/tgfont/static/tgfont.woff2 and b/tgui/packages/tgfont/static/tgfont.woff2 differ diff --git a/tgui/packages/tgfont/svgtofont.mjs b/tgui/packages/tgfont/svgtofont.mjs new file mode 100644 index 00000000000..6f5c5a3fb24 --- /dev/null +++ b/tgui/packages/tgfont/svgtofont.mjs @@ -0,0 +1,20 @@ +import svgtofont from 'svgtofont'; + +/** @type {import('svgtofont').SvgToFontOptions} */ +const config = { + classNamePrefix: 'tg', + css: { + include: /\.css$/, + }, + dist: './dist', + emptyDist: true, + excludeFormat: ['eot', 'svg', 'symbol.svg', 'ttf', 'woff'], + fontName: 'tgfont', + src: './icons', + svgicons2svgfont: { + normalize: true, + }, + useCSSVars: true, +}; + +svgtofont(config).catch(console.error); diff --git a/tgui/packages/tgui-bench/entrypoint.tsx b/tgui/packages/tgui-bench/entrypoint.tsx deleted file mode 100644 index 377848fe3ae..00000000000 --- a/tgui/packages/tgui-bench/entrypoint.tsx +++ /dev/null @@ -1,72 +0,0 @@ -/** - * @file - * @copyright 2021 Aleksej Komarov - * @license MIT - */ - -import { setupGlobalEvents } from 'tgui/events'; -import 'tgui/styles/main.scss'; -import Benchmark from './lib/benchmark'; - -const sendMessage = (obj: any) => { - const req = new XMLHttpRequest(); - req.open('POST', `/message`, false); - req.setRequestHeader('Content-Type', 'application/json;charset=UTF-8'); - req.timeout = 250; - req.send(JSON.stringify(obj)); -}; - -const setupApp = async () => { - // Delay setup - if (document.readyState === 'loading') { - document.addEventListener('DOMContentLoaded', setupApp); - return; - } - - setupGlobalEvents({ - ignoreWindowFocus: true, - }); - - const requireTest = require.context('./tests', false, /\.test\./); - - for (const file of requireTest.keys()) { - sendMessage({ type: 'suite-start', file }); - try { - const tests = requireTest(file); - await new Promise((resolve) => { - const suite = new Benchmark.Suite(file, { - onCycle(e) { - sendMessage({ - type: 'suite-cycle', - message: String(e.target), - }); - }, - onComplete() { - // This message is somewhat useless, but leaving it here in case - // someone has an idea how to show more useful data. - // sendMessage({ - // type: 'suite-complete', - // message: 'Fastest is ' + this.filter('fastest').map('name'), - // }); - resolve(); - }, - onError(e) { - sendMessage({ type: 'error', e }); - resolve(); - }, - }); - for (const [name, fn] of Object.entries(tests)) { - if (typeof fn === 'function') { - suite.add(name, fn); - } - } - suite.run(); - }); - } catch (error) { - sendMessage({ type: 'error', error }); - } - } - sendMessage({ type: 'finished' }); -}; - -setupApp(); diff --git a/tgui/packages/tgui-bench/index.js b/tgui/packages/tgui-bench/index.js deleted file mode 100644 index 9f6aee20996..00000000000 --- a/tgui/packages/tgui-bench/index.js +++ /dev/null @@ -1,93 +0,0 @@ -/** - * @file - * @copyright 2021 Aleksej Komarov - * @license MIT - */ - -const fs = require('fs'); -const path = require('path'); -const { exec } = require('child_process'); -const { fastify } = require('fastify'); - -process.chdir(__dirname); - -const sleep = (time) => new Promise((resolve) => setTimeout(resolve, time)); - -const IE_TIMEOUT_SECONDS = 60; - -const setup = async () => { - const server = fastify(); - - let hasResponded = false; - - let assets = ''; - assets += `\n`; - - const publicDir = path.resolve(__dirname, '../../public'); - const page = fs - .readFileSync(path.join(publicDir, 'tgui.html'), 'utf-8') - .replace('\n', assets); - - server.register(require('fastify-static'), { - root: publicDir, - }); - - server.get('/', async (req, res) => { - return res.type('text/html').send(page); - }); - - server.post('/message', async (req, res) => { - if (!hasResponded) { - process.stdout.write('\n'); - hasResponded = true; - } - const { type, ...rest } = req.body; - if (type === 'suite-start') { - console.log(`=> Test '${rest.file}'`); - return res.send(); - } - if (type === 'suite-cycle') { - console.log(rest.message); - return res.send(); - } - if (type === 'suite-complete') { - console.log(rest.message); - return res.send(); - } - if (type === 'finished') { - await res.send(); - process.exit(0); - } - // Unhandled message - console.log(req.body); - return res.send(); - }); - - try { - await server.listen(3002, '0.0.0.0'); - } catch (err) { - console.error(err); - process.exit(1); - } - - if (process.platform === 'win32') { - exec(`start "" "iexplore" "http://127.0.0.1:3002"`); - } - - console.log('Waiting for Internet Explorer to respond.'); - for (let i = 0; i < IE_TIMEOUT_SECONDS; i++) { - await sleep(1000); - if (hasResponded) { - return; - } - process.stdout.write('.'); - } - process.stdout.write('\n'); - console.error('Did not receive a response, exiting.'); - process.exit(1); -}; - -setup(); diff --git a/tgui/packages/tgui-bench/lib/benchmark.d.ts b/tgui/packages/tgui-bench/lib/benchmark.d.ts deleted file mode 100644 index 3eac568d418..00000000000 --- a/tgui/packages/tgui-bench/lib/benchmark.d.ts +++ /dev/null @@ -1,219 +0,0 @@ -/* eslint-disable */ -// Type definitions for Benchmark v2.1.4 -// Project: https://benchmarkjs.com -// Definitions by: Asana -// Charlie Fish -// Blair Zajac -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -declare class Benchmark { - static filter(arr: T[], callback: (value: T) => any, thisArg?: any): T[]; - static filter(arr: T[], filter: string, thisArg?: any): T[]; - static formatNumber(num: number): string; - static join(obj: Object, separator1?: string, separator2?: string): string; - static invoke( - benches: Benchmark[], - name: string | Object, - ...args: any[] - ): any[]; - static runInContext(context: Object): Function; - - static each(obj: Object | any[], callback: Function, thisArg?: any): void; - static forEach(arr: T[], callback: (value: T) => any, thisArg?: any): void; - static forOwn(obj: Object, callback: Function, thisArg?: any): void; - static has(obj: Object, path: any[] | string): boolean; - static indexOf(arr: T[], value: T, fromIndex?: number): number; - static map(arr: T[], callback: (value: T) => K, thisArg?: any): K[]; - static reduce( - arr: T[], - callback: (accumulator: K, value: T) => K, - thisArg?: any, - ): K; - - static options: Benchmark.Options; - static platform: Benchmark.Platform; - static support: Benchmark.Support; - static version: string; - - constructor(fn: Function | string, options?: Benchmark.Options); - constructor(name: string, fn: Function | string, options?: Benchmark.Options); - constructor(name: string, options?: Benchmark.Options); - constructor(options: Benchmark.Options); - - id: number; - name: string; - count: number; - cycles: number; - hz: number; - compiled: Function | string; - error: Error; - fn: Function | string; - aborted: boolean; - running: boolean; - setup: Function | string; - teardown: Function | string; - - stats: Benchmark.Stats; - times: Benchmark.Times; - - abort(): Benchmark; - clone(options: Benchmark.Options): Benchmark; - compare(benchmark: Benchmark): number; - emit(type: string | Object): any; - listeners(type: string): Function[]; - off(type?: string, listener?: Function): Benchmark; - off(types: string[]): Benchmark; - on(type?: string, listener?: Function): Benchmark; - on(types: string[]): Benchmark; - reset(): Benchmark; - run(options?: Benchmark.Options): Benchmark; - toString(): string; -} - -declare namespace Benchmark { - export interface Options { - async?: boolean | undefined; - defer?: boolean | undefined; - delay?: number | undefined; - id?: string | undefined; - initCount?: number | undefined; - maxTime?: number | undefined; - minSamples?: number | undefined; - minTime?: number | undefined; - name?: string | undefined; - onAbort?: Function | undefined; - onComplete?: Function | undefined; - onCycle?: Function | undefined; - onError?: Function | undefined; - onReset?: Function | undefined; - onStart?: Function | undefined; - setup?: Function | string | undefined; - teardown?: Function | string | undefined; - fn?: Function | string | undefined; - queued?: boolean | undefined; - } - - export interface Platform { - description: string; - layout: string; - product: string; - name: string; - manufacturer: string; - os: string; - prerelease: string; - version: string; - toString(): string; - } - - export interface Support { - browser: boolean; - timeout: boolean; - decompilation: boolean; - } - - export interface Stats { - moe: number; - rme: number; - sem: number; - deviation: number; - mean: number; - sample: any[]; - variance: number; - } - - export interface Times { - cycle: number; - elapsed: number; - period: number; - timeStamp: number; - } - - export class Deferred { - constructor(clone: Benchmark); - - benchmark: Benchmark; - cycles: number; - elapsed: number; - timeStamp: number; - - resolve(): void; - } - - export interface Target { - options: Options; - async?: boolean | undefined; - defer?: boolean | undefined; - delay?: number | undefined; - initCount?: number | undefined; - maxTime?: number | undefined; - minSamples?: number | undefined; - minTime?: number | undefined; - name?: string | undefined; - fn?: Function | undefined; - id: number; - stats?: Stats | undefined; - times?: Times | undefined; - running: boolean; - count?: number | undefined; - compiled?: Function | undefined; - cycles?: number | undefined; - hz?: number | undefined; - } - - export class Event { - constructor(type: string | Object); - - aborted: boolean; - cancelled: boolean; - currentTarget: Object; - result: any; - target: Target; - timeStamp: number; - type: string; - } - - export class Suite { - static options: { name: string }; - - constructor(name?: string, options?: Options); - - length: number; - aborted: boolean; - running: boolean; - - abort(): Suite; - add(name: string, fn: Function | string, options?: Options): Suite; - add(fn: Function | string, options?: Options): Suite; - add(name: string, options?: Options): Suite; - add(options: Options): Suite; - clone(options: Options): Suite; - emit(type: string | Object): any; - filter(callback: Function | string): Suite; - join(separator?: string): string; - listeners(type: string): Function[]; - off(type?: string, callback?: Function): Suite; - off(types: string[]): Suite; - on(type?: string, callback?: Function): Suite; - on(types: string[]): Suite; - push(benchmark: Benchmark): number; - reset(): Suite; - run(options?: Options): Suite; - reverse(): any[]; - sort(compareFn: (a: any, b: any) => number): any[]; - splice(start: number, deleteCount?: number): any[]; - unshift(benchmark: Benchmark): number; - - each(callback: Function): Suite; - forEach(callback: Function): Suite; - indexOf(value: any): number; - map(callback: Function | string): any[]; - reduce(callback: Function, accumulator: T): T; - - pop(): Function; - shift(): Benchmark; - slice(start: number, end: number): any[]; - slice(start: number, deleteCount: number, ...values: any[]): any[]; - } -} - -export = Benchmark; diff --git a/tgui/packages/tgui-bench/lib/benchmark.js b/tgui/packages/tgui-bench/lib/benchmark.js deleted file mode 100644 index 0837678decf..00000000000 --- a/tgui/packages/tgui-bench/lib/benchmark.js +++ /dev/null @@ -1,2760 +0,0 @@ -/* eslint-disable */ -/*! - * Benchmark.js - * Copyright 2010-2016 Mathias Bynens - * Based on JSLitmus.js, copyright Robert Kieffer - * Modified by John-David Dalton - * Manually stripped from useless junk by /tg/station13 maintainers. - * Available under MIT license - */ -// prettier-ignore -module.exports = (function() { - 'use strict'; - - /** Used as a safe reference for `undefined` in pre ES5 environments. */ - var undefined; - - /** Used to determine if values are of the language type Object. */ - var objectTypes = { - 'function': true, - 'object': true - }; - - /** Used as a reference to the global object. */ - var root = (objectTypes[typeof window] && window) || this; - - /** Detect free variable `define`. */ - var freeDefine = false; - - /** Used to assign each benchmark an incremented id. */ - var counter = 0; - - /** Used to detect primitive types. */ - var rePrimitive = /^(?:boolean|number|string|undefined)$/; - - /** Used to make every compiled test unique. */ - var uidCounter = 0; - - /** Used to assign default `context` object properties. */ - var contextProps = [ - 'Array', 'Date', 'Function', 'Math', 'Object', 'RegExp', 'String', '_', - 'clearTimeout', 'chrome', 'chromium', 'document', 'navigator', 'phantom', - 'platform', 'process', 'runtime', 'setTimeout' - ]; - - /** Used to avoid hz of Infinity. */ - var divisors = { - '1': 4096, - '2': 512, - '3': 64, - '4': 8, - '5': 0 - }; - - /** - * T-Distribution two-tailed critical values for 95% confidence. - * For more info see http://www.itl.nist.gov/div898/handbook/eda/section3/eda3672.htm. - */ - var tTable = { - '1': 12.706, '2': 4.303, '3': 3.182, '4': 2.776, '5': 2.571, '6': 2.447, - '7': 2.365, '8': 2.306, '9': 2.262, '10': 2.228, '11': 2.201, '12': 2.179, - '13': 2.16, '14': 2.145, '15': 2.131, '16': 2.12, '17': 2.11, '18': 2.101, - '19': 2.093, '20': 2.086, '21': 2.08, '22': 2.074, '23': 2.069, '24': 2.064, - '25': 2.06, '26': 2.056, '27': 2.052, '28': 2.048, '29': 2.045, '30': 2.042, - 'infinity': 1.96 - }; - - /** - * Critical Mann-Whitney U-values for 95% confidence. - * For more info see http://www.saburchill.com/IBbiology/stats/003.html. - */ - var uTable = { - '5': [0, 1, 2], - '6': [1, 2, 3, 5], - '7': [1, 3, 5, 6, 8], - '8': [2, 4, 6, 8, 10, 13], - '9': [2, 4, 7, 10, 12, 15, 17], - '10': [3, 5, 8, 11, 14, 17, 20, 23], - '11': [3, 6, 9, 13, 16, 19, 23, 26, 30], - '12': [4, 7, 11, 14, 18, 22, 26, 29, 33, 37], - '13': [4, 8, 12, 16, 20, 24, 28, 33, 37, 41, 45], - '14': [5, 9, 13, 17, 22, 26, 31, 36, 40, 45, 50, 55], - '15': [5, 10, 14, 19, 24, 29, 34, 39, 44, 49, 54, 59, 64], - '16': [6, 11, 15, 21, 26, 31, 37, 42, 47, 53, 59, 64, 70, 75], - '17': [6, 11, 17, 22, 28, 34, 39, 45, 51, 57, 63, 67, 75, 81, 87], - '18': [7, 12, 18, 24, 30, 36, 42, 48, 55, 61, 67, 74, 80, 86, 93, 99], - '19': [7, 13, 19, 25, 32, 38, 45, 52, 58, 65, 72, 78, 85, 92, 99, 106, 113], - '20': [8, 14, 20, 27, 34, 41, 48, 55, 62, 69, 76, 83, 90, 98, 105, 112, 119, 127], - '21': [8, 15, 22, 29, 36, 43, 50, 58, 65, 73, 80, 88, 96, 103, 111, 119, 126, 134, 142], - '22': [9, 16, 23, 30, 38, 45, 53, 61, 69, 77, 85, 93, 101, 109, 117, 125, 133, 141, 150, 158], - '23': [9, 17, 24, 32, 40, 48, 56, 64, 73, 81, 89, 98, 106, 115, 123, 132, 140, 149, 157, 166, 175], - '24': [10, 17, 25, 33, 42, 50, 59, 67, 76, 85, 94, 102, 111, 120, 129, 138, 147, 156, 165, 174, 183, 192], - '25': [10, 18, 27, 35, 44, 53, 62, 71, 80, 89, 98, 107, 117, 126, 135, 145, 154, 163, 173, 182, 192, 201, 211], - '26': [11, 19, 28, 37, 46, 55, 64, 74, 83, 93, 102, 112, 122, 132, 141, 151, 161, 171, 181, 191, 200, 210, 220, 230], - '27': [11, 20, 29, 38, 48, 57, 67, 77, 87, 97, 107, 118, 125, 138, 147, 158, 168, 178, 188, 199, 209, 219, 230, 240, 250], - '28': [12, 21, 30, 40, 50, 60, 70, 80, 90, 101, 111, 122, 132, 143, 154, 164, 175, 186, 196, 207, 218, 228, 239, 250, 261, 272], - '29': [13, 22, 32, 42, 52, 62, 73, 83, 94, 105, 116, 127, 138, 149, 160, 171, 182, 193, 204, 215, 226, 238, 249, 260, 271, 282, 294], - '30': [13, 23, 33, 43, 54, 65, 76, 87, 98, 109, 120, 131, 143, 154, 166, 177, 189, 200, 212, 223, 235, 247, 258, 270, 282, 293, 305, 317] - }; - - /*--------------------------------------------------------------------------*/ - - /** - * Create a new `Benchmark` function using the given `context` object. - * - * @static - * @memberOf Benchmark - * @param {Object} [context=root] The context object. - * @returns {Function} Returns a new `Benchmark` function. - */ - function runInContext(context) { - // Exit early if unable to acquire lodash. - var _ = context && context._ || require('lodash') || root._; - if (!_) { - Benchmark.runInContext = runInContext; - return Benchmark; - } - // Avoid issues with some ES3 environments that attempt to use values, named - // after built-in constructors like `Object`, for the creation of literals. - // ES5 clears this up by stating that literals must use built-in constructors. - // See http://es5.github.io/#x11.1.5. - context = context ? _.defaults(root.Object(), context, _.pick(root, contextProps)) : root; - - /** Native constructor references. */ - var Array = context.Array, - Date = context.Date, - Function = context.Function, - Math = context.Math, - Object = context.Object, - RegExp = context.RegExp, - String = context.String; - - /** Used for `Array` and `Object` method references. */ - var arrayRef = [], - objectProto = Object.prototype; - - /** Native method shortcuts. */ - var abs = Math.abs, - clearTimeout = context.clearTimeout, - floor = Math.floor, - log = Math.log, - max = Math.max, - min = Math.min, - pow = Math.pow, - push = arrayRef.push, - setTimeout = context.setTimeout, - shift = arrayRef.shift, - slice = arrayRef.slice, - sqrt = Math.sqrt, - toString = objectProto.toString, - unshift = arrayRef.unshift; - - /** Detect DOM document object. */ - var doc = isHostType(context, 'document') && context.document; - - /** Used to access Node.js's high resolution timer. */ - var processObject = isHostType(context, 'process') && context.process; - - /** Used to prevent a `removeChild` memory leak in IE < 9. */ - var trash = doc && doc.createElement('div'); - - /** Used to integrity check compiled tests. */ - var uid = 'uid' + _.now(); - - /** Used to avoid infinite recursion when methods call each other. */ - var calledBy = {}; - - /** - * An object used to flag environments/features. - * - * @static - * @memberOf Benchmark - * @type Object - */ - var support = {}; - - (function() { - - /** - * Detect if running in a browser environment. - * - * @memberOf Benchmark.support - * @type boolean - */ - support.browser = doc && isHostType(context, 'navigator') && !isHostType(context, 'phantom'); - - /** - * Detect if the Timers API exists. - * - * @memberOf Benchmark.support - * @type boolean - */ - support.timeout = isHostType(context, 'setTimeout') && isHostType(context, 'clearTimeout'); - - /** - * Detect if function decompilation is support. - * - * @name decompilation - * @memberOf Benchmark.support - * @type boolean - */ - try { - // Safari 2.x removes commas in object literals from `Function#toString` results. - // See http://webk.it/11609 for more details. - // Firefox 3.6 and Opera 9.25 strip grouping parentheses from `Function#toString` results. - // See http://bugzil.la/559438 for more details. - support.decompilation = Function( - ('return (' + (function(x) { return { 'x': '' + (1 + x) + '', 'y': 0 }; }) + ')') - // Avoid issues with code added by Istanbul. - .replace(/__cov__[^;]+;/g, '') - )()(0).x === '1'; - } catch(e) { - support.decompilation = false; - } - }()); - - /** - * Timer object used by `clock()` and `Deferred#resolve`. - * - * @private - * @type Object - */ - var timer = { - - /** - * The timer namespace object or constructor. - * - * @private - * @memberOf timer - * @type {Function|Object} - */ - 'ns': Date, - - /** - * Starts the deferred timer. - * - * @private - * @memberOf timer - * @param {Object} deferred The deferred instance. - */ - 'start': null, // Lazy defined in `clock()`. - - /** - * Stops the deferred timer. - * - * @private - * @memberOf timer - * @param {Object} deferred The deferred instance. - */ - 'stop': null // Lazy defined in `clock()`. - }; - - /*------------------------------------------------------------------------*/ - - /** - * The Benchmark constructor. - * - * Note: The Benchmark constructor exposes a handful of lodash methods to - * make working with arrays, collections, and objects easier. The lodash - * methods are: - * [`each/forEach`](https://lodash.com/docs#forEach), [`forOwn`](https://lodash.com/docs#forOwn), - * [`has`](https://lodash.com/docs#has), [`indexOf`](https://lodash.com/docs#indexOf), - * [`map`](https://lodash.com/docs#map), and [`reduce`](https://lodash.com/docs#reduce) - * - * @constructor - * @param {string} name A name to identify the benchmark. - * @param {Function|string} fn The test to benchmark. - * @param {Object} [options={}] Options object. - * @example - * - * // basic usage (the `new` operator is optional) - * var bench = new Benchmark(fn); - * - * // or using a name first - * var bench = new Benchmark('foo', fn); - * - * // or with options - * var bench = new Benchmark('foo', fn, { - * - * // displayed by `Benchmark#toString` if `name` is not available - * 'id': 'xyz', - * - * // called when the benchmark starts running - * 'onStart': onStart, - * - * // called after each run cycle - * 'onCycle': onCycle, - * - * // called when aborted - * 'onAbort': onAbort, - * - * // called when a test errors - * 'onError': onError, - * - * // called when reset - * 'onReset': onReset, - * - * // called when the benchmark completes running - * 'onComplete': onComplete, - * - * // compiled/called before the test loop - * 'setup': setup, - * - * // compiled/called after the test loop - * 'teardown': teardown - * }); - * - * // or name and options - * var bench = new Benchmark('foo', { - * - * // a flag to indicate the benchmark is deferred - * 'defer': true, - * - * // benchmark test function - * 'fn': function(deferred) { - * // call `Deferred#resolve` when the deferred test is finished - * deferred.resolve(); - * } - * }); - * - * // or options only - * var bench = new Benchmark({ - * - * // benchmark name - * 'name': 'foo', - * - * // benchmark test as a string - * 'fn': '[1,2,3,4].sort()' - * }); - * - * // a test's `this` binding is set to the benchmark instance - * var bench = new Benchmark('foo', function() { - * 'My name is '.concat(this.name); // "My name is foo" - * }); - */ - function Benchmark(name, fn, options) { - var bench = this; - - // Allow instance creation without the `new` operator. - if (!(bench instanceof Benchmark)) { - return new Benchmark(name, fn, options); - } - // Juggle arguments. - if (_.isPlainObject(name)) { - // 1 argument (options). - options = name; - } - else if (_.isFunction(name)) { - // 2 arguments (fn, options). - options = fn; - fn = name; - } - else if (_.isPlainObject(fn)) { - // 2 arguments (name, options). - options = fn; - fn = null; - bench.name = name; - } - else { - // 3 arguments (name, fn [, options]). - bench.name = name; - } - setOptions(bench, options); - - bench.id || (bench.id = ++counter); - bench.fn == null && (bench.fn = fn); - - bench.stats = cloneDeep(bench.stats); - bench.times = cloneDeep(bench.times); - } - - /** - * The Deferred constructor. - * - * @constructor - * @memberOf Benchmark - * @param {Object} clone The cloned benchmark instance. - */ - function Deferred(clone) { - var deferred = this; - if (!(deferred instanceof Deferred)) { - return new Deferred(clone); - } - deferred.benchmark = clone; - clock(deferred); - } - - /** - * The Event constructor. - * - * @constructor - * @memberOf Benchmark - * @param {Object|string} type The event type. - */ - function Event(type) { - var event = this; - if (type instanceof Event) { - return type; - } - return (event instanceof Event) - ? _.assign(event, { 'timeStamp': _.now() }, typeof type == 'string' ? { 'type': type } : type) - : new Event(type); - } - - /** - * The Suite constructor. - * - * Note: Each Suite instance has a handful of wrapped lodash methods to - * make working with Suites easier. The wrapped lodash methods are: - * [`each/forEach`](https://lodash.com/docs#forEach), [`indexOf`](https://lodash.com/docs#indexOf), - * [`map`](https://lodash.com/docs#map), and [`reduce`](https://lodash.com/docs#reduce) - * - * @constructor - * @memberOf Benchmark - * @param {string} name A name to identify the suite. - * @param {Object} [options={}] Options object. - * @example - * - * // basic usage (the `new` operator is optional) - * var suite = new Benchmark.Suite; - * - * // or using a name first - * var suite = new Benchmark.Suite('foo'); - * - * // or with options - * var suite = new Benchmark.Suite('foo', { - * - * // called when the suite starts running - * 'onStart': onStart, - * - * // called between running benchmarks - * 'onCycle': onCycle, - * - * // called when aborted - * 'onAbort': onAbort, - * - * // called when a test errors - * 'onError': onError, - * - * // called when reset - * 'onReset': onReset, - * - * // called when the suite completes running - * 'onComplete': onComplete - * }); - */ - function Suite(name, options) { - var suite = this; - - // Allow instance creation without the `new` operator. - if (!(suite instanceof Suite)) { - return new Suite(name, options); - } - // Juggle arguments. - if (_.isPlainObject(name)) { - // 1 argument (options). - options = name; - } else { - // 2 arguments (name [, options]). - suite.name = name; - } - setOptions(suite, options); - } - - /*------------------------------------------------------------------------*/ - - /** - * A specialized version of `_.cloneDeep` which only clones arrays and plain - * objects assigning all other values by reference. - * - * @private - * @param {*} value The value to clone. - * @returns {*} The cloned value. - */ - var cloneDeep = _.partial(_.cloneDeepWith, _, function(value) { - // Only clone primitives, arrays, and plain objects. - return (_.isObject(value) && !_.isArray(value) && !_.isPlainObject(value)) - ? value - : undefined; - }); - - /** - * Creates a function from the given arguments string and body. - * - * @private - * @param {string} args The comma separated function arguments. - * @param {string} body The function body. - * @returns {Function} The new function. - */ - function createFunction() { - // Lazy define. - createFunction = function(args, body) { - var result, - anchor = freeDefine ? freeDefine.amd : Benchmark, - prop = uid + 'createFunction'; - - runScript((freeDefine ? 'define.amd.' : 'Benchmark.') + prop + '=function(' + args + '){' + body + '}'); - result = anchor[prop]; - delete anchor[prop]; - return result; - }; - // Fix JaegerMonkey bug. - // For more information see http://bugzil.la/639720. - createFunction = support.browser && (createFunction('', 'return"' + uid + '"') || _.noop)() == uid ? createFunction : Function; - return createFunction.apply(null, arguments); - } - - /** - * Delay the execution of a function based on the benchmark's `delay` property. - * - * @private - * @param {Object} bench The benchmark instance. - * @param {Object} fn The function to execute. - */ - function delay(bench, fn) { - bench._timerId = _.delay(fn, bench.delay * 1e3); - } - - /** - * Destroys the given element. - * - * @private - * @param {Element} element The element to destroy. - */ - function destroyElement(element) { - trash.appendChild(element); - trash.innerHTML = ''; - } - - /** - * Gets the name of the first argument from a function's source. - * - * @private - * @param {Function} fn The function. - * @returns {string} The argument name. - */ - function getFirstArgument(fn) { - return (!_.has(fn, 'toString') && - (/^[\s(]*function[^(]*\(([^\s,)]+)/.exec(fn) || 0)[1]) || ''; - } - - /** - * Computes the arithmetic mean of a sample. - * - * @private - * @param {Array} sample The sample. - * @returns {number} The mean. - */ - function getMean(sample) { - return (_.reduce(sample, function(sum, x) { - return sum + x; - }) / sample.length) || 0; - } - - /** - * Gets the source code of a function. - * - * @private - * @param {Function} fn The function. - * @returns {string} The function's source code. - */ - function getSource(fn) { - var result = ''; - if (isStringable(fn)) { - result = String(fn); - } else if (support.decompilation) { - // Escape the `{` for Firefox 1. - result = _.result(/^[^{]+\{([\s\S]*)\}\s*$/.exec(fn), 1); - } - // Trim string. - result = (result || '').replace(/^\s+|\s+$/g, ''); - - // Detect strings containing only the "use strict" directive. - return /^(?:\/\*+[\w\W]*?\*\/|\/\/.*?[\n\r\u2028\u2029]|\s)*(["'])use strict\1;?$/.test(result) - ? '' - : result; - } - - /** - * Checks if an object is of the specified class. - * - * @private - * @param {*} value The value to check. - * @param {string} name The name of the class. - * @returns {boolean} Returns `true` if the value is of the specified class, else `false`. - */ - function isClassOf(value, name) { - return value != null && toString.call(value) == '[object ' + name + ']'; - } - - /** - * Host objects can return type values that are different from their actual - * data type. The objects we are concerned with usually return non-primitive - * types of "object", "function", or "unknown". - * - * @private - * @param {*} object The owner of the property. - * @param {string} property The property to check. - * @returns {boolean} Returns `true` if the property value is a non-primitive, else `false`. - */ - function isHostType(object, property) { - if (object == null) { - return false; - } - var type = typeof object[property]; - return !rePrimitive.test(type) && (type != 'object' || !!object[property]); - } - - /** - * Checks if a value can be safely coerced to a string. - * - * @private - * @param {*} value The value to check. - * @returns {boolean} Returns `true` if the value can be coerced, else `false`. - */ - function isStringable(value) { - return _.isString(value) || (_.has(value, 'toString') && _.isFunction(value.toString)); - } - - /** - * Runs a snippet of JavaScript via script injection. - * - * @private - * @param {string} code The code to run. - */ - function runScript(code) { - var anchor = freeDefine ? define.amd : Benchmark, - script = doc.createElement('script'), - sibling = doc.getElementsByTagName('script')[0], - parent = sibling.parentNode, - prop = uid + 'runScript', - prefix = '(' + (freeDefine ? 'define.amd.' : 'Benchmark.') + prop + '||function(){})();'; - - // Firefox 2.0.0.2 cannot use script injection as intended because it executes - // asynchronously, but that's OK because script injection is only used to avoid - // the previously commented JaegerMonkey bug. - try { - // Remove the inserted script *before* running the code to avoid differences - // in the expected script element count/order of the document. - script.appendChild(doc.createTextNode(prefix + code)); - anchor[prop] = function() { destroyElement(script); }; - } catch(e) { - parent = parent.cloneNode(false); - sibling = null; - script.text = code; - } - parent.insertBefore(script, sibling); - delete anchor[prop]; - } - - /** - * A helper function for setting options/event handlers. - * - * @private - * @param {Object} object The benchmark or suite instance. - * @param {Object} [options={}] Options object. - */ - function setOptions(object, options) { - options = object.options = _.assign({}, cloneDeep(object.constructor.options), cloneDeep(options)); - - _.forOwn(options, function(value, key) { - if (value != null) { - // Add event listeners. - if (/^on[A-Z]/.test(key)) { - _.each(key.split(' '), function(key) { - object.on(key.slice(2).toLowerCase(), value); - }); - } else if (!_.has(object, key)) { - object[key] = cloneDeep(value); - } - } - }); - } - - /*------------------------------------------------------------------------*/ - - /** - * Handles cycling/completing the deferred benchmark. - * - * @memberOf Benchmark.Deferred - */ - function resolve() { - var deferred = this, - clone = deferred.benchmark, - bench = clone._original; - - if (bench.aborted) { - // cycle() -> clone cycle/complete event -> compute()'s invoked bench.run() cycle/complete. - deferred.teardown(); - clone.running = false; - cycle(deferred); - } - else if (++deferred.cycles < clone.count) { - clone.compiled.call(deferred, context, timer); - } - else { - timer.stop(deferred); - deferred.teardown(); - delay(clone, function() { cycle(deferred); }); - } - } - - /*------------------------------------------------------------------------*/ - - /** - * A generic `Array#filter` like method. - * - * @static - * @memberOf Benchmark - * @param {Array} array The array to iterate over. - * @param {Function|string} callback The function/alias called per iteration. - * @returns {Array} A new array of values that passed callback filter. - * @example - * - * // get odd numbers - * Benchmark.filter([1, 2, 3, 4, 5], function(n) { - * return n % 2; - * }); // -> [1, 3, 5]; - * - * // get fastest benchmarks - * Benchmark.filter(benches, 'fastest'); - * - * // get slowest benchmarks - * Benchmark.filter(benches, 'slowest'); - * - * // get benchmarks that completed without erroring - * Benchmark.filter(benches, 'successful'); - */ - function filter(array, callback) { - if (callback === 'successful') { - // Callback to exclude those that are errored, unrun, or have hz of Infinity. - callback = function(bench) { - return bench.cycles && _.isFinite(bench.hz) && !bench.error; - }; - } - else if (callback === 'fastest' || callback === 'slowest') { - // Get successful, sort by period + margin of error, and filter fastest/slowest. - var result = filter(array, 'successful').sort(function(a, b) { - a = a.stats; b = b.stats; - return (a.mean + a.moe > b.mean + b.moe ? 1 : -1) * (callback === 'fastest' ? 1 : -1); - }); - - return _.filter(result, function(bench) { - return result[0].compare(bench) == 0; - }); - } - return _.filter(array, callback); - } - - /** - * Converts a number to a more readable comma-separated string representation. - * - * @static - * @memberOf Benchmark - * @param {number} number The number to convert. - * @returns {string} The more readable string representation. - */ - function formatNumber(number) { - number = String(number).split('.'); - return number[0].replace(/(?=(?:\d{3})+$)(?!\b)/g, ',') + - (number[1] ? '.' + number[1] : ''); - } - - /** - * Invokes a method on all items in an array. - * - * @static - * @memberOf Benchmark - * @param {Array} benches Array of benchmarks to iterate over. - * @param {Object|string} name The name of the method to invoke OR options object. - * @param {...*} [args] Arguments to invoke the method with. - * @returns {Array} A new array of values returned from each method invoked. - * @example - * - * // invoke `reset` on all benchmarks - * Benchmark.invoke(benches, 'reset'); - * - * // invoke `emit` with arguments - * Benchmark.invoke(benches, 'emit', 'complete', listener); - * - * // invoke `run(true)`, treat benchmarks as a queue, and register invoke callbacks - * Benchmark.invoke(benches, { - * - * // invoke the `run` method - * 'name': 'run', - * - * // pass a single argument - * 'args': true, - * - * // treat as queue, removing benchmarks from front of `benches` until empty - * 'queued': true, - * - * // called before any benchmarks have been invoked. - * 'onStart': onStart, - * - * // called between invoking benchmarks - * 'onCycle': onCycle, - * - * // called after all benchmarks have been invoked. - * 'onComplete': onComplete - * }); - */ - function invoke(benches, name) { - var args, - bench, - queued, - index = -1, - eventProps = { 'currentTarget': benches }, - options = { 'onStart': _.noop, 'onCycle': _.noop, 'onComplete': _.noop }, - result = _.toArray(benches); - - /** - * Invokes the method of the current object and if synchronous, fetches the next. - */ - function execute() { - var listeners, - async = isAsync(bench); - - if (async) { - // Use `getNext` as the first listener. - bench.on('complete', getNext); - listeners = bench.events.complete; - listeners.splice(0, 0, listeners.pop()); - } - // Execute method. - result[index] = _.isFunction(bench && bench[name]) ? bench[name].apply(bench, args) : undefined; - // If synchronous return `true` until finished. - return !async && getNext(); - } - - /** - * Fetches the next bench or executes `onComplete` callback. - */ - function getNext(event) { - var cycleEvent, - last = bench, - async = isAsync(last); - - if (async) { - last.off('complete', getNext); - last.emit('complete'); - } - // Emit "cycle" event. - eventProps.type = 'cycle'; - eventProps.target = last; - cycleEvent = Event(eventProps); - options.onCycle.call(benches, cycleEvent); - - // Choose next benchmark if not exiting early. - if (!cycleEvent.aborted && raiseIndex() !== false) { - bench = queued ? benches[0] : result[index]; - if (isAsync(bench)) { - delay(bench, execute); - } - else if (async) { - // Resume execution if previously asynchronous but now synchronous. - while (execute()) {} - } - else { - // Continue synchronous execution. - return true; - } - } else { - // Emit "complete" event. - eventProps.type = 'complete'; - options.onComplete.call(benches, Event(eventProps)); - } - // When used as a listener `event.aborted = true` will cancel the rest of - // the "complete" listeners because they were already called above and when - // used as part of `getNext` the `return false` will exit the execution while-loop. - if (event) { - event.aborted = true; - } else { - return false; - } - } - - /** - * Checks if invoking `Benchmark#run` with asynchronous cycles. - */ - function isAsync(object) { - // Avoid using `instanceof` here because of IE memory leak issues with host objects. - var async = args[0] && args[0].async; - return name == 'run' && (object instanceof Benchmark) && - ((async == null ? object.options.async : async) && support.timeout || object.defer); - } - - /** - * Raises `index` to the next defined index or returns `false`. - */ - function raiseIndex() { - index++; - - // If queued remove the previous bench. - if (queued && index > 0) { - shift.call(benches); - } - // If we reached the last index then return `false`. - return (queued ? benches.length : index < result.length) - ? index - : (index = false); - } - // Juggle arguments. - if (_.isString(name)) { - // 2 arguments (array, name). - args = slice.call(arguments, 2); - } else { - // 2 arguments (array, options). - options = _.assign(options, name); - name = options.name; - args = _.isArray(args = 'args' in options ? options.args : []) ? args : [args]; - queued = options.queued; - } - // Start iterating over the array. - if (raiseIndex() !== false) { - // Emit "start" event. - bench = result[index]; - eventProps.type = 'start'; - eventProps.target = bench; - options.onStart.call(benches, Event(eventProps)); - - // End early if the suite was aborted in an "onStart" listener. - if (name == 'run' && (benches instanceof Suite) && benches.aborted) { - // Emit "cycle" event. - eventProps.type = 'cycle'; - options.onCycle.call(benches, Event(eventProps)); - // Emit "complete" event. - eventProps.type = 'complete'; - options.onComplete.call(benches, Event(eventProps)); - } - // Start method execution. - else { - if (isAsync(bench)) { - delay(bench, execute); - } else { - while (execute()) {} - } - } - } - return result; - } - - /** - * Creates a string of joined array values or object key-value pairs. - * - * @static - * @memberOf Benchmark - * @param {Array|Object} object The object to operate on. - * @param {string} [separator1=','] The separator used between key-value pairs. - * @param {string} [separator2=': '] The separator used between keys and values. - * @returns {string} The joined result. - */ - function join(object, separator1, separator2) { - var result = [], - length = (object = Object(object)).length, - arrayLike = length === length >>> 0; - - separator2 || (separator2 = ': '); - _.each(object, function(value, key) { - result.push(arrayLike ? value : key + separator2 + value); - }); - return result.join(separator1 || ','); - } - - /*------------------------------------------------------------------------*/ - - /** - * Aborts all benchmarks in the suite. - * - * @name abort - * @memberOf Benchmark.Suite - * @returns {Object} The suite instance. - */ - function abortSuite() { - var event, - suite = this, - resetting = calledBy.resetSuite; - - if (suite.running) { - event = Event('abort'); - suite.emit(event); - if (!event.cancelled || resetting) { - // Avoid infinite recursion. - calledBy.abortSuite = true; - suite.reset(); - delete calledBy.abortSuite; - - if (!resetting) { - suite.aborted = true; - invoke(suite, 'abort'); - } - } - } - return suite; - } - - /** - * Adds a test to the benchmark suite. - * - * @memberOf Benchmark.Suite - * @param {string} name A name to identify the benchmark. - * @param {Function|string} fn The test to benchmark. - * @param {Object} [options={}] Options object. - * @returns {Object} The suite instance. - * @example - * - * // basic usage - * suite.add(fn); - * - * // or using a name first - * suite.add('foo', fn); - * - * // or with options - * suite.add('foo', fn, { - * 'onCycle': onCycle, - * 'onComplete': onComplete - * }); - * - * // or name and options - * suite.add('foo', { - * 'fn': fn, - * 'onCycle': onCycle, - * 'onComplete': onComplete - * }); - * - * // or options only - * suite.add({ - * 'name': 'foo', - * 'fn': fn, - * 'onCycle': onCycle, - * 'onComplete': onComplete - * }); - */ - function add(name, fn, options) { - var suite = this, - bench = new Benchmark(name, fn, options), - event = Event({ 'type': 'add', 'target': bench }); - - if (suite.emit(event), !event.cancelled) { - suite.push(bench); - } - return suite; - } - - /** - * Creates a new suite with cloned benchmarks. - * - * @name clone - * @memberOf Benchmark.Suite - * @param {Object} options Options object to overwrite cloned options. - * @returns {Object} The new suite instance. - */ - function cloneSuite(options) { - var suite = this, - result = new suite.constructor(_.assign({}, suite.options, options)); - - // Copy own properties. - _.forOwn(suite, function(value, key) { - if (!_.has(result, key)) { - result[key] = value && _.isFunction(value.clone) - ? value.clone() - : cloneDeep(value); - } - }); - return result; - } - - /** - * An `Array#filter` like method. - * - * @name filter - * @memberOf Benchmark.Suite - * @param {Function|string} callback The function/alias called per iteration. - * @returns {Object} A new suite of benchmarks that passed callback filter. - */ - function filterSuite(callback) { - var suite = this, - result = new suite.constructor(suite.options); - - result.push.apply(result, filter(suite, callback)); - return result; - } - - /** - * Resets all benchmarks in the suite. - * - * @name reset - * @memberOf Benchmark.Suite - * @returns {Object} The suite instance. - */ - function resetSuite() { - var event, - suite = this, - aborting = calledBy.abortSuite; - - if (suite.running && !aborting) { - // No worries, `resetSuite()` is called within `abortSuite()`. - calledBy.resetSuite = true; - suite.abort(); - delete calledBy.resetSuite; - } - // Reset if the state has changed. - else if ((suite.aborted || suite.running) && - (suite.emit(event = Event('reset')), !event.cancelled)) { - suite.aborted = suite.running = false; - if (!aborting) { - invoke(suite, 'reset'); - } - } - return suite; - } - - /** - * Runs the suite. - * - * @name run - * @memberOf Benchmark.Suite - * @param {Object} [options={}] Options object. - * @returns {Object} The suite instance. - * @example - * - * // basic usage - * suite.run(); - * - * // or with options - * suite.run({ 'async': true, 'queued': true }); - */ - function runSuite(options) { - var suite = this; - - suite.reset(); - suite.running = true; - options || (options = {}); - - invoke(suite, { - 'name': 'run', - 'args': options, - 'queued': options.queued, - 'onStart': function(event) { - suite.emit(event); - }, - 'onCycle': function(event) { - var bench = event.target; - if (bench.error) { - suite.emit({ 'type': 'error', 'target': bench }); - } - suite.emit(event); - event.aborted = suite.aborted; - }, - 'onComplete': function(event) { - suite.running = false; - suite.emit(event); - } - }); - return suite; - } - - /*------------------------------------------------------------------------*/ - - /** - * Executes all registered listeners of the specified event type. - * - * @memberOf Benchmark, Benchmark.Suite - * @param {Object|string} type The event type or object. - * @param {...*} [args] Arguments to invoke the listener with. - * @returns {*} Returns the return value of the last listener executed. - */ - function emit(type) { - var listeners, - object = this, - event = Event(type), - events = object.events, - args = (arguments[0] = event, arguments); - - event.currentTarget || (event.currentTarget = object); - event.target || (event.target = object); - delete event.result; - - if (events && (listeners = _.has(events, event.type) && events[event.type])) { - _.each(listeners.slice(), function(listener) { - if ((event.result = listener.apply(object, args)) === false) { - event.cancelled = true; - } - return !event.aborted; - }); - } - return event.result; - } - - /** - * Returns an array of event listeners for a given type that can be manipulated - * to add or remove listeners. - * - * @memberOf Benchmark, Benchmark.Suite - * @param {string} type The event type. - * @returns {Array} The listeners array. - */ - function listeners(type) { - var object = this, - events = object.events || (object.events = {}); - - return _.has(events, type) ? events[type] : (events[type] = []); - } - - /** - * Unregisters a listener for the specified event type(s), - * or unregisters all listeners for the specified event type(s), - * or unregisters all listeners for all event types. - * - * @memberOf Benchmark, Benchmark.Suite - * @param {string} [type] The event type. - * @param {Function} [listener] The function to unregister. - * @returns {Object} The current instance. - * @example - * - * // unregister a listener for an event type - * bench.off('cycle', listener); - * - * // unregister a listener for multiple event types - * bench.off('start cycle', listener); - * - * // unregister all listeners for an event type - * bench.off('cycle'); - * - * // unregister all listeners for multiple event types - * bench.off('start cycle complete'); - * - * // unregister all listeners for all event types - * bench.off(); - */ - function off(type, listener) { - var object = this, - events = object.events; - - if (!events) { - return object; - } - _.each(type ? type.split(' ') : events, function(listeners, type) { - var index; - if (typeof listeners == 'string') { - type = listeners; - listeners = _.has(events, type) && events[type]; - } - if (listeners) { - if (listener) { - index = _.indexOf(listeners, listener); - if (index > -1) { - listeners.splice(index, 1); - } - } else { - listeners.length = 0; - } - } - }); - return object; - } - - /** - * Registers a listener for the specified event type(s). - * - * @memberOf Benchmark, Benchmark.Suite - * @param {string} type The event type. - * @param {Function} listener The function to register. - * @returns {Object} The current instance. - * @example - * - * // register a listener for an event type - * bench.on('cycle', listener); - * - * // register a listener for multiple event types - * bench.on('start cycle', listener); - */ - function on(type, listener) { - var object = this, - events = object.events || (object.events = {}); - - _.each(type.split(' '), function(type) { - (_.has(events, type) - ? events[type] - : (events[type] = []) - ).push(listener); - }); - return object; - } - - /*------------------------------------------------------------------------*/ - - /** - * Aborts the benchmark without recording times. - * - * @memberOf Benchmark - * @returns {Object} The benchmark instance. - */ - function abort() { - var event, - bench = this, - resetting = calledBy.reset; - - if (bench.running) { - event = Event('abort'); - bench.emit(event); - if (!event.cancelled || resetting) { - // Avoid infinite recursion. - calledBy.abort = true; - bench.reset(); - delete calledBy.abort; - - if (support.timeout) { - clearTimeout(bench._timerId); - delete bench._timerId; - } - if (!resetting) { - bench.aborted = true; - bench.running = false; - } - } - } - return bench; - } - - /** - * Creates a new benchmark using the same test and options. - * - * @memberOf Benchmark - * @param {Object} options Options object to overwrite cloned options. - * @returns {Object} The new benchmark instance. - * @example - * - * var bizarro = bench.clone({ - * 'name': 'doppelganger' - * }); - */ - function clone(options) { - var bench = this, - result = new bench.constructor(_.assign({}, bench, options)); - - // Correct the `options` object. - result.options = _.assign({}, cloneDeep(bench.options), cloneDeep(options)); - - // Copy own custom properties. - _.forOwn(bench, function(value, key) { - if (!_.has(result, key)) { - result[key] = cloneDeep(value); - } - }); - - return result; - } - - /** - * Determines if a benchmark is faster than another. - * - * @memberOf Benchmark - * @param {Object} other The benchmark to compare. - * @returns {number} Returns `-1` if slower, `1` if faster, and `0` if indeterminate. - */ - function compare(other) { - var bench = this; - - // Exit early if comparing the same benchmark. - if (bench == other) { - return 0; - } - var critical, - zStat, - sample1 = bench.stats.sample, - sample2 = other.stats.sample, - size1 = sample1.length, - size2 = sample2.length, - maxSize = max(size1, size2), - minSize = min(size1, size2), - u1 = getU(sample1, sample2), - u2 = getU(sample2, sample1), - u = min(u1, u2); - - function getScore(xA, sampleB) { - return _.reduce(sampleB, function(total, xB) { - return total + (xB > xA ? 0 : xB < xA ? 1 : 0.5); - }, 0); - } - - function getU(sampleA, sampleB) { - return _.reduce(sampleA, function(total, xA) { - return total + getScore(xA, sampleB); - }, 0); - } - - function getZ(u) { - return (u - ((size1 * size2) / 2)) / sqrt((size1 * size2 * (size1 + size2 + 1)) / 12); - } - // Reject the null hypothesis the two samples come from the - // same population (i.e. have the same median) if... - if (size1 + size2 > 30) { - // ...the z-stat is greater than 1.96 or less than -1.96 - // http://www.statisticslectures.com/topics/mannwhitneyu/ - zStat = getZ(u); - return abs(zStat) > 1.96 ? (u == u1 ? 1 : -1) : 0; - } - // ...the U value is less than or equal the critical U value. - critical = maxSize < 5 || minSize < 3 ? 0 : uTable[maxSize][minSize - 3]; - return u <= critical ? (u == u1 ? 1 : -1) : 0; - } - - /** - * Reset properties and abort if running. - * - * @memberOf Benchmark - * @returns {Object} The benchmark instance. - */ - function reset() { - var bench = this; - if (bench.running && !calledBy.abort) { - // No worries, `reset()` is called within `abort()`. - calledBy.reset = true; - bench.abort(); - delete calledBy.reset; - return bench; - } - var event, - index = 0, - changes = [], - queue = []; - - // A non-recursive solution to check if properties have changed. - // For more information see http://www.jslab.dk/articles/non.recursive.preorder.traversal.part4. - var data = { - 'destination': bench, - 'source': _.assign({}, cloneDeep(bench.constructor.prototype), cloneDeep(bench.options)) - }; - - do { - _.forOwn(data.source, function(value, key) { - var changed, - destination = data.destination, - currValue = destination[key]; - - // Skip pseudo private properties like `_timerId` which could be a - // Java object in environments like RingoJS. - if (key.charAt(0) == '_') { - return; - } - if (value && typeof value == 'object') { - if (_.isArray(value)) { - // Check if an array value has changed to a non-array value. - if (!_.isArray(currValue)) { - changed = currValue = []; - } - // Check if an array has changed its length. - if (currValue.length != value.length) { - changed = currValue = currValue.slice(0, value.length); - currValue.length = value.length; - } - } - // Check if an object has changed to a non-object value. - else if (!currValue || typeof currValue != 'object') { - changed = currValue = {}; - } - // Register a changed object. - if (changed) { - changes.push({ 'destination': destination, 'key': key, 'value': currValue }); - } - queue.push({ 'destination': currValue, 'source': value }); - } - // Register a changed primitive. - else if (value !== currValue && !(value == null || _.isFunction(value))) { - changes.push({ 'destination': destination, 'key': key, 'value': value }); - } - }); - } - while ((data = queue[index++])); - - // If changed emit the `reset` event and if it isn't cancelled reset the benchmark. - if (changes.length && (bench.emit(event = Event('reset')), !event.cancelled)) { - _.each(changes, function(data) { - data.destination[data.key] = data.value; - }); - } - return bench; - } - - /** - * Displays relevant benchmark information when coerced to a string. - * - * @name toString - * @memberOf Benchmark - * @returns {string} A string representation of the benchmark instance. - */ - function toStringBench() { - var bench = this, - error = bench.error, - hz = bench.hz, - id = bench.id, - stats = bench.stats, - size = stats.sample.length, - pm = '\xb1', - result = bench.name || (_.isNaN(id) ? id : ''); - - if (error) { - var errorStr; - if (!_.isObject(error)) { - errorStr = String(error); - } else if (!_.isError(Error)) { - errorStr = join(error); - } else { - // Error#name and Error#message properties are non-enumerable. - errorStr = join(_.assign({ 'name': error.name, 'message': error.message }, error)); - } - result += ': ' + errorStr; - } - else { - result += ' x ' + formatNumber(hz.toFixed(hz < 100 ? 2 : 0)) + ' ops/sec ' + pm + - stats.rme.toFixed(2) + '% (' + size + ' run' + (size == 1 ? '' : 's') + ' sampled)'; - } - return result; - } - - /*------------------------------------------------------------------------*/ - - /** - * Clocks the time taken to execute a test per cycle (secs). - * - * @private - * @param {Object} bench The benchmark instance. - * @returns {number} The time taken. - */ - function clock() { - var options = Benchmark.options, - templateData = {}, - timers = [{ 'ns': timer.ns, 'res': max(0.0015, getRes('ms')), 'unit': 'ms' }]; - - // Lazy define for hi-res timers. - clock = function(clone) { - var deferred; - - if (clone instanceof Deferred) { - deferred = clone; - clone = deferred.benchmark; - } - var bench = clone._original, - stringable = isStringable(bench.fn), - count = bench.count = clone.count, - decompilable = stringable || (support.decompilation && (clone.setup !== _.noop || clone.teardown !== _.noop)), - id = bench.id, - name = bench.name || (typeof id == 'number' ? '' : id), - result = 0; - - // Init `minTime` if needed. - clone.minTime = bench.minTime || (bench.minTime = bench.options.minTime = options.minTime); - - // Compile in setup/teardown functions and the test loop. - // Create a new compiled test, instead of using the cached `bench.compiled`, - // to avoid potential engine optimizations enabled over the life of the test. - var funcBody = deferred - ? 'var d#=this,${fnArg}=d#,m#=d#.benchmark._original,f#=m#.fn,su#=m#.setup,td#=m#.teardown;' + - // When `deferred.cycles` is `0` then... - 'if(!d#.cycles){' + - // set `deferred.fn`, - 'd#.fn=function(){var ${fnArg}=d#;if(typeof f#=="function"){try{${fn}\n}catch(e#){f#(d#)}}else{${fn}\n}};' + - // set `deferred.teardown`, - 'd#.teardown=function(){d#.cycles=0;if(typeof td#=="function"){try{${teardown}\n}catch(e#){td#()}}else{${teardown}\n}};' + - // execute the benchmark's `setup`, - 'if(typeof su#=="function"){try{${setup}\n}catch(e#){su#()}}else{${setup}\n};' + - // start timer, - 't#.start(d#);' + - // and then execute `deferred.fn` and return a dummy object. - '}d#.fn();return{uid:"${uid}"}' - - : 'var r#,s#,m#=this,f#=m#.fn,i#=m#.count,n#=t#.ns;${setup}\n${begin};' + - 'while(i#--){${fn}\n}${end};${teardown}\nreturn{elapsed:r#,uid:"${uid}"}'; - - var compiled = bench.compiled = clone.compiled = createCompiled(bench, decompilable, deferred, funcBody), - isEmpty = !(templateData.fn || stringable); - - try { - if (isEmpty) { - // Firefox may remove dead code from `Function#toString` results. - // For more information see http://bugzil.la/536085. - throw new Error('The test "' + name + '" is empty. This may be the result of dead code removal.'); - } - else if (!deferred) { - // Pretest to determine if compiled code exits early, usually by a - // rogue `return` statement, by checking for a return object with the uid. - bench.count = 1; - compiled = decompilable && (compiled.call(bench, context, timer) || {}).uid == templateData.uid && compiled; - bench.count = count; - } - } catch(e) { - compiled = null; - clone.error = e || new Error(String(e)); - bench.count = count; - } - // Fallback when a test exits early or errors during pretest. - if (!compiled && !deferred && !isEmpty) { - funcBody = ( - stringable || (decompilable && !clone.error) - ? 'function f#(){${fn}\n}var r#,s#,m#=this,i#=m#.count' - : 'var r#,s#,m#=this,f#=m#.fn,i#=m#.count' - ) + - ',n#=t#.ns;${setup}\n${begin};m#.f#=f#;while(i#--){m#.f#()}${end};' + - 'delete m#.f#;${teardown}\nreturn{elapsed:r#}'; - - compiled = createCompiled(bench, decompilable, deferred, funcBody); - - try { - // Pretest one more time to check for errors. - bench.count = 1; - compiled.call(bench, context, timer); - bench.count = count; - delete clone.error; - } - catch(e) { - bench.count = count; - if (!clone.error) { - clone.error = e || new Error(String(e)); - } - } - } - // If no errors run the full test loop. - if (!clone.error) { - compiled = bench.compiled = clone.compiled = createCompiled(bench, decompilable, deferred, funcBody); - result = compiled.call(deferred || bench, context, timer).elapsed; - } - return result; - }; - - /*----------------------------------------------------------------------*/ - - /** - * Creates a compiled function from the given function `body`. - */ - function createCompiled(bench, decompilable, deferred, body) { - var fn = bench.fn, - fnArg = deferred ? getFirstArgument(fn) || 'deferred' : ''; - - templateData.uid = uid + uidCounter++; - - _.assign(templateData, { - 'setup': decompilable ? getSource(bench.setup) : interpolate('m#.setup()'), - 'fn': decompilable ? getSource(fn) : interpolate('m#.fn(' + fnArg + ')'), - 'fnArg': fnArg, - 'teardown': decompilable ? getSource(bench.teardown) : interpolate('m#.teardown()') - }); - - // Use API of chosen timer. - if (timer.unit == 'ns') { - _.assign(templateData, { - 'begin': interpolate('s#=n#()'), - 'end': interpolate('r#=n#(s#);r#=r#[0]+(r#[1]/1e9)') - }); - } - else if (timer.unit == 'us') { - if (timer.ns.stop) { - _.assign(templateData, { - 'begin': interpolate('s#=n#.start()'), - 'end': interpolate('r#=n#.microseconds()/1e6') - }); - } else { - _.assign(templateData, { - 'begin': interpolate('s#=n#()'), - 'end': interpolate('r#=(n#()-s#)/1e6') - }); - } - } - else if (timer.ns.now) { - _.assign(templateData, { - 'begin': interpolate('s#=n#.now()'), - 'end': interpolate('r#=(n#.now()-s#)/1e3') - }); - } - else { - _.assign(templateData, { - 'begin': interpolate('s#=new n#().getTime()'), - 'end': interpolate('r#=(new n#().getTime()-s#)/1e3') - }); - } - // Define `timer` methods. - timer.start = createFunction( - interpolate('o#'), - interpolate('var n#=this.ns,${begin};o#.elapsed=0;o#.timeStamp=s#') - ); - - timer.stop = createFunction( - interpolate('o#'), - interpolate('var n#=this.ns,s#=o#.timeStamp,${end};o#.elapsed=r#') - ); - - // Create compiled test. - return createFunction( - interpolate('window,t#'), - 'var global = window, clearTimeout = global.clearTimeout, setTimeout = global.setTimeout;\n' + - interpolate(body) - ); - } - - /** - * Gets the current timer's minimum resolution (secs). - */ - function getRes(unit) { - var measured, - begin, - count = 30, - divisor = 1e3, - ns = timer.ns, - sample = []; - - // Get average smallest measurable time. - while (count--) { - if (unit == 'us') { - divisor = 1e6; - if (ns.stop) { - ns.start(); - while (!(measured = ns.microseconds())) {} - } else { - begin = ns(); - while (!(measured = ns() - begin)) {} - } - } - else if (unit == 'ns') { - divisor = 1e9; - begin = (begin = ns())[0] + (begin[1] / divisor); - while (!(measured = ((measured = ns())[0] + (measured[1] / divisor)) - begin)) {} - divisor = 1; - } - else if (ns.now) { - begin = ns.now(); - while (!(measured = ns.now() - begin)) {} - } - else { - begin = new ns().getTime(); - while (!(measured = new ns().getTime() - begin)) {} - } - // Check for broken timers. - if (measured > 0) { - sample.push(measured); - } else { - sample.push(Infinity); - break; - } - } - // Convert to seconds. - return getMean(sample) / divisor; - } - - /** - * Interpolates a given template string. - */ - function interpolate(string) { - // Replaces all occurrences of `#` with a unique number and template tokens with content. - return _.template(string.replace(/\#/g, /\d+/.exec(templateData.uid)))(templateData); - } - - /*----------------------------------------------------------------------*/ - - // Detect Chrome's microsecond timer: - // enable benchmarking via the --enable-benchmarking command - // line switch in at least Chrome 7 to use chrome.Interval - try { - if ((timer.ns = new (context.chrome || context.chromium).Interval)) { - timers.push({ 'ns': timer.ns, 'res': getRes('us'), 'unit': 'us' }); - } - } catch(e) {} - - // Detect Node.js's nanosecond resolution timer available in Node.js >= 0.8. - if (processObject && typeof (timer.ns = processObject.hrtime) == 'function') { - timers.push({ 'ns': timer.ns, 'res': getRes('ns'), 'unit': 'ns' }); - } - // Pick timer with highest resolution. - timer = _.minBy(timers, 'res'); - - // Error if there are no working timers. - if (timer.res == Infinity) { - throw new Error('Benchmark.js was unable to find a working timer.'); - } - // Resolve time span required to achieve a percent uncertainty of at most 1%. - // For more information see http://spiff.rit.edu/classes/phys273/uncert/uncert.html. - options.minTime || (options.minTime = max(timer.res / 2 / 0.01, 0.05)); - return clock.apply(null, arguments); - } - - /*------------------------------------------------------------------------*/ - - /** - * Computes stats on benchmark results. - * - * @private - * @param {Object} bench The benchmark instance. - * @param {Object} options The options object. - */ - function compute(bench, options) { - options || (options = {}); - - var async = options.async, - elapsed = 0, - initCount = bench.initCount, - minSamples = bench.minSamples, - queue = [], - sample = bench.stats.sample; - - /** - * Adds a clone to the queue. - */ - function enqueue() { - queue.push(bench.clone({ - '_original': bench, - 'events': { - 'abort': [update], - 'cycle': [update], - 'error': [update], - 'start': [update] - } - })); - } - - /** - * Updates the clone/original benchmarks to keep their data in sync. - */ - function update(event) { - var clone = this, - type = event.type; - - if (bench.running) { - if (type == 'start') { - // Note: `clone.minTime` prop is inited in `clock()`. - clone.count = bench.initCount; - } - else { - if (type == 'error') { - bench.error = clone.error; - } - if (type == 'abort') { - bench.abort(); - bench.emit('cycle'); - } else { - event.currentTarget = event.target = bench; - bench.emit(event); - } - } - } else if (bench.aborted) { - // Clear abort listeners to avoid triggering bench's abort/cycle again. - clone.events.abort.length = 0; - clone.abort(); - } - } - - /** - * Determines if more clones should be queued or if cycling should stop. - */ - function evaluate(event) { - var critical, - df, - mean, - moe, - rme, - sd, - sem, - variance, - clone = event.target, - done = bench.aborted, - now = _.now(), - size = sample.push(clone.times.period), - maxedOut = size >= minSamples && (elapsed += now - clone.times.timeStamp) / 1e3 > bench.maxTime, - times = bench.times, - varOf = function(sum, x) { return sum + pow(x - mean, 2); }; - - // Exit early for aborted or unclockable tests. - if (done || clone.hz == Infinity) { - maxedOut = !(size = sample.length = queue.length = 0); - } - - if (!done) { - // Compute the sample mean (estimate of the population mean). - mean = getMean(sample); - // Compute the sample variance (estimate of the population variance). - variance = _.reduce(sample, varOf, 0) / (size - 1) || 0; - // Compute the sample standard deviation (estimate of the population standard deviation). - sd = sqrt(variance); - // Compute the standard error of the mean (a.k.a. the standard deviation of the sampling distribution of the sample mean). - sem = sd / sqrt(size); - // Compute the degrees of freedom. - df = size - 1; - // Compute the critical value. - critical = tTable[Math.round(df) || 1] || tTable.infinity; - // Compute the margin of error. - moe = sem * critical; - // Compute the relative margin of error. - rme = (moe / mean) * 100 || 0; - - _.assign(bench.stats, { - 'deviation': sd, - 'mean': mean, - 'moe': moe, - 'rme': rme, - 'sem': sem, - 'variance': variance - }); - - // Abort the cycle loop when the minimum sample size has been collected - // and the elapsed time exceeds the maximum time allowed per benchmark. - // We don't count cycle delays toward the max time because delays may be - // increased by browsers that clamp timeouts for inactive tabs. For more - // information see https://developer.mozilla.org/en/window.setTimeout#Inactive_tabs. - if (maxedOut) { - // Reset the `initCount` in case the benchmark is rerun. - bench.initCount = initCount; - bench.running = false; - done = true; - times.elapsed = (now - times.timeStamp) / 1e3; - } - if (bench.hz != Infinity) { - bench.hz = 1 / mean; - times.cycle = mean * bench.count; - times.period = mean; - } - } - // If time permits, increase sample size to reduce the margin of error. - if (queue.length < 2 && !maxedOut) { - enqueue(); - } - // Abort the `invoke` cycle when done. - event.aborted = done; - } - - // Init queue and begin. - enqueue(); - invoke(queue, { - 'name': 'run', - 'args': { 'async': async }, - 'queued': true, - 'onCycle': evaluate, - 'onComplete': function() { bench.emit('complete'); } - }); - } - - /*------------------------------------------------------------------------*/ - - /** - * Cycles a benchmark until a run `count` can be established. - * - * @private - * @param {Object} clone The cloned benchmark instance. - * @param {Object} options The options object. - */ - function cycle(clone, options) { - options || (options = {}); - - var deferred; - if (clone instanceof Deferred) { - deferred = clone; - clone = clone.benchmark; - } - var clocked, - cycles, - divisor, - event, - minTime, - period, - async = options.async, - bench = clone._original, - count = clone.count, - times = clone.times; - - // Continue, if not aborted between cycles. - if (clone.running) { - // `minTime` is set to `Benchmark.options.minTime` in `clock()`. - cycles = ++clone.cycles; - clocked = deferred ? deferred.elapsed : clock(clone); - minTime = clone.minTime; - - if (cycles > bench.cycles) { - bench.cycles = cycles; - } - if (clone.error) { - event = Event('error'); - event.message = clone.error; - clone.emit(event); - if (!event.cancelled) { - clone.abort(); - } - } - } - // Continue, if not errored. - if (clone.running) { - // Compute the time taken to complete last test cycle. - bench.times.cycle = times.cycle = clocked; - // Compute the seconds per operation. - period = bench.times.period = times.period = clocked / count; - // Compute the ops per second. - bench.hz = clone.hz = 1 / period; - // Avoid working our way up to this next time. - bench.initCount = clone.initCount = count; - // Do we need to do another cycle? - clone.running = clocked < minTime; - - if (clone.running) { - // Tests may clock at `0` when `initCount` is a small number, - // to avoid that we set its count to something a bit higher. - if (!clocked && (divisor = divisors[clone.cycles]) != null) { - count = floor(4e6 / divisor); - } - // Calculate how many more iterations it will take to achieve the `minTime`. - if (count <= clone.count) { - count += Math.ceil((minTime - clocked) / period); - } - clone.running = count != Infinity; - } - } - // Should we exit early? - event = Event('cycle'); - clone.emit(event); - if (event.aborted) { - clone.abort(); - } - // Figure out what to do next. - if (clone.running) { - // Start a new cycle. - clone.count = count; - if (deferred) { - clone.compiled.call(deferred, context, timer); - } else if (async) { - delay(clone, function() { cycle(clone, options); }); - } else { - cycle(clone); - } - } - else { - // Fix TraceMonkey bug associated with clock fallbacks. - // For more information see http://bugzil.la/509069. - if (support.browser) { - runScript(uid + '=1;delete ' + uid); - } - // We're done. - clone.emit('complete'); - } - } - - /*------------------------------------------------------------------------*/ - - /** - * Runs the benchmark. - * - * @memberOf Benchmark - * @param {Object} [options={}] Options object. - * @returns {Object} The benchmark instance. - * @example - * - * // basic usage - * bench.run(); - * - * // or with options - * bench.run({ 'async': true }); - */ - function run(options) { - var bench = this, - event = Event('start'); - - // Set `running` to `false` so `reset()` won't call `abort()`. - bench.running = false; - bench.reset(); - bench.running = true; - - bench.count = bench.initCount; - bench.times.timeStamp = _.now(); - bench.emit(event); - - if (!event.cancelled) { - options = { 'async': ((options = options && options.async) == null ? bench.async : options) && support.timeout }; - - // For clones created within `compute()`. - if (bench._original) { - if (bench.defer) { - Deferred(bench); - } else { - cycle(bench, options); - } - } - // For original benchmarks. - else { - compute(bench, options); - } - } - return bench; - } - - /*------------------------------------------------------------------------*/ - - // Firefox 1 erroneously defines variable and argument names of functions on - // the function itself as non-configurable properties with `undefined` values. - // The bugginess continues as the `Benchmark` constructor has an argument - // named `options` and Firefox 1 will not assign a value to `Benchmark.options`, - // making it non-writable in the process, unless it is the first property - // assigned by for-in loop of `_.assign()`. - _.assign(Benchmark, { - - /** - * The default options copied by benchmark instances. - * - * @static - * @memberOf Benchmark - * @type Object - */ - 'options': { - - /** - * A flag to indicate that benchmark cycles will execute asynchronously - * by default. - * - * @memberOf Benchmark.options - * @type boolean - */ - 'async': false, - - /** - * A flag to indicate that the benchmark clock is deferred. - * - * @memberOf Benchmark.options - * @type boolean - */ - 'defer': false, - - /** - * The delay between test cycles (secs). - * @memberOf Benchmark.options - * @type number - */ - 'delay': 0.005, - - /** - * Displayed by `Benchmark#toString` when a `name` is not available - * (auto-generated if absent). - * - * @memberOf Benchmark.options - * @type string - */ - 'id': undefined, - - /** - * The default number of times to execute a test on a benchmark's first cycle. - * - * @memberOf Benchmark.options - * @type number - */ - 'initCount': 1, - - /** - * The maximum time a benchmark is allowed to run before finishing (secs). - * - * Note: Cycle delays aren't counted toward the maximum time. - * - * @memberOf Benchmark.options - * @type number - */ - 'maxTime': 5, - - /** - * The minimum sample size required to perform statistical analysis. - * - * @memberOf Benchmark.options - * @type number - */ - 'minSamples': 5, - - /** - * The time needed to reduce the percent uncertainty of measurement to 1% (secs). - * - * @memberOf Benchmark.options - * @type number - */ - 'minTime': 0, - - /** - * The name of the benchmark. - * - * @memberOf Benchmark.options - * @type string - */ - 'name': undefined, - - /** - * An event listener called when the benchmark is aborted. - * - * @memberOf Benchmark.options - * @type Function - */ - 'onAbort': undefined, - - /** - * An event listener called when the benchmark completes running. - * - * @memberOf Benchmark.options - * @type Function - */ - 'onComplete': undefined, - - /** - * An event listener called after each run cycle. - * - * @memberOf Benchmark.options - * @type Function - */ - 'onCycle': undefined, - - /** - * An event listener called when a test errors. - * - * @memberOf Benchmark.options - * @type Function - */ - 'onError': undefined, - - /** - * An event listener called when the benchmark is reset. - * - * @memberOf Benchmark.options - * @type Function - */ - 'onReset': undefined, - - /** - * An event listener called when the benchmark starts running. - * - * @memberOf Benchmark.options - * @type Function - */ - 'onStart': undefined - }, - - /** - * Platform object with properties describing things like browser name, - * version, and operating system. See [`platform.js`](https://mths.be/platform). - * - * @static - * @memberOf Benchmark - * @type Object - */ - 'platform': context.platform || require('platform') || ({ - 'description': context.navigator && context.navigator.userAgent || null, - 'layout': null, - 'product': null, - 'name': null, - 'manufacturer': null, - 'os': null, - 'prerelease': null, - 'version': null, - 'toString': function() { - return this.description || ''; - } - }), - - /** - * The semantic version number. - * - * @static - * @memberOf Benchmark - * @type string - */ - 'version': '2.1.2' - }); - - _.assign(Benchmark, { - 'filter': filter, - 'formatNumber': formatNumber, - 'invoke': invoke, - 'join': join, - 'runInContext': runInContext, - 'support': support - }); - - // Add lodash methods to Benchmark. - _.each(['each', 'forEach', 'forOwn', 'has', 'indexOf', 'map', 'reduce'], function(methodName) { - Benchmark[methodName] = _[methodName]; - }); - - /*------------------------------------------------------------------------*/ - - _.assign(Benchmark.prototype, { - - /** - * The number of times a test was executed. - * - * @memberOf Benchmark - * @type number - */ - 'count': 0, - - /** - * The number of cycles performed while benchmarking. - * - * @memberOf Benchmark - * @type number - */ - 'cycles': 0, - - /** - * The number of executions per second. - * - * @memberOf Benchmark - * @type number - */ - 'hz': 0, - - /** - * The compiled test function. - * - * @memberOf Benchmark - * @type {Function|string} - */ - 'compiled': undefined, - - /** - * The error object if the test failed. - * - * @memberOf Benchmark - * @type Object - */ - 'error': undefined, - - /** - * The test to benchmark. - * - * @memberOf Benchmark - * @type {Function|string} - */ - 'fn': undefined, - - /** - * A flag to indicate if the benchmark is aborted. - * - * @memberOf Benchmark - * @type boolean - */ - 'aborted': false, - - /** - * A flag to indicate if the benchmark is running. - * - * @memberOf Benchmark - * @type boolean - */ - 'running': false, - - /** - * Compiled into the test and executed immediately **before** the test loop. - * - * @memberOf Benchmark - * @type {Function|string} - * @example - * - * // basic usage - * var bench = Benchmark({ - * 'setup': function() { - * var c = this.count, - * element = document.getElementById('container'); - * while (c--) { - * element.appendChild(document.createElement('div')); - * } - * }, - * 'fn': function() { - * element.removeChild(element.lastChild); - * } - * }); - * - * // compiles to something like: - * var c = this.count, - * element = document.getElementById('container'); - * while (c--) { - * element.appendChild(document.createElement('div')); - * } - * var start = new Date; - * while (count--) { - * element.removeChild(element.lastChild); - * } - * var end = new Date - start; - * - * // or using strings - * var bench = Benchmark({ - * 'setup': '\ - * var a = 0;\n\ - * (function() {\n\ - * (function() {\n\ - * (function() {', - * 'fn': 'a += 1;', - * 'teardown': '\ - * }())\n\ - * }())\n\ - * }())' - * }); - * - * // compiles to something like: - * var a = 0; - * (function() { - * (function() { - * (function() { - * var start = new Date; - * while (count--) { - * a += 1; - * } - * var end = new Date - start; - * }()) - * }()) - * }()) - */ - 'setup': _.noop, - - /** - * Compiled into the test and executed immediately **after** the test loop. - * - * @memberOf Benchmark - * @type {Function|string} - */ - 'teardown': _.noop, - - /** - * An object of stats including mean, margin or error, and standard deviation. - * - * @memberOf Benchmark - * @type Object - */ - 'stats': { - - /** - * The margin of error. - * - * @memberOf Benchmark#stats - * @type number - */ - 'moe': 0, - - /** - * The relative margin of error (expressed as a percentage of the mean). - * - * @memberOf Benchmark#stats - * @type number - */ - 'rme': 0, - - /** - * The standard error of the mean. - * - * @memberOf Benchmark#stats - * @type number - */ - 'sem': 0, - - /** - * The sample standard deviation. - * - * @memberOf Benchmark#stats - * @type number - */ - 'deviation': 0, - - /** - * The sample arithmetic mean (secs). - * - * @memberOf Benchmark#stats - * @type number - */ - 'mean': 0, - - /** - * The array of sampled periods. - * - * @memberOf Benchmark#stats - * @type Array - */ - 'sample': [], - - /** - * The sample variance. - * - * @memberOf Benchmark#stats - * @type number - */ - 'variance': 0 - }, - - /** - * An object of timing data including cycle, elapsed, period, start, and stop. - * - * @memberOf Benchmark - * @type Object - */ - 'times': { - - /** - * The time taken to complete the last cycle (secs). - * - * @memberOf Benchmark#times - * @type number - */ - 'cycle': 0, - - /** - * The time taken to complete the benchmark (secs). - * - * @memberOf Benchmark#times - * @type number - */ - 'elapsed': 0, - - /** - * The time taken to execute the test once (secs). - * - * @memberOf Benchmark#times - * @type number - */ - 'period': 0, - - /** - * A timestamp of when the benchmark started (ms). - * - * @memberOf Benchmark#times - * @type number - */ - 'timeStamp': 0 - } - }); - - _.assign(Benchmark.prototype, { - 'abort': abort, - 'clone': clone, - 'compare': compare, - 'emit': emit, - 'listeners': listeners, - 'off': off, - 'on': on, - 'reset': reset, - 'run': run, - 'toString': toStringBench - }); - - /*------------------------------------------------------------------------*/ - - _.assign(Deferred.prototype, { - - /** - * The deferred benchmark instance. - * - * @memberOf Benchmark.Deferred - * @type Object - */ - 'benchmark': null, - - /** - * The number of deferred cycles performed while benchmarking. - * - * @memberOf Benchmark.Deferred - * @type number - */ - 'cycles': 0, - - /** - * The time taken to complete the deferred benchmark (secs). - * - * @memberOf Benchmark.Deferred - * @type number - */ - 'elapsed': 0, - - /** - * A timestamp of when the deferred benchmark started (ms). - * - * @memberOf Benchmark.Deferred - * @type number - */ - 'timeStamp': 0 - }); - - _.assign(Deferred.prototype, { - 'resolve': resolve - }); - - /*------------------------------------------------------------------------*/ - - _.assign(Event.prototype, { - - /** - * A flag to indicate if the emitters listener iteration is aborted. - * - * @memberOf Benchmark.Event - * @type boolean - */ - 'aborted': false, - - /** - * A flag to indicate if the default action is cancelled. - * - * @memberOf Benchmark.Event - * @type boolean - */ - 'cancelled': false, - - /** - * The object whose listeners are currently being processed. - * - * @memberOf Benchmark.Event - * @type Object - */ - 'currentTarget': undefined, - - /** - * The return value of the last executed listener. - * - * @memberOf Benchmark.Event - * @type Mixed - */ - 'result': undefined, - - /** - * The object to which the event was originally emitted. - * - * @memberOf Benchmark.Event - * @type Object - */ - 'target': undefined, - - /** - * A timestamp of when the event was created (ms). - * - * @memberOf Benchmark.Event - * @type number - */ - 'timeStamp': 0, - - /** - * The event type. - * - * @memberOf Benchmark.Event - * @type string - */ - 'type': '' - }); - - /*------------------------------------------------------------------------*/ - - /** - * The default options copied by suite instances. - * - * @static - * @memberOf Benchmark.Suite - * @type Object - */ - Suite.options = { - - /** - * The name of the suite. - * - * @memberOf Benchmark.Suite.options - * @type string - */ - 'name': undefined - }; - - /*------------------------------------------------------------------------*/ - - _.assign(Suite.prototype, { - - /** - * The number of benchmarks in the suite. - * - * @memberOf Benchmark.Suite - * @type number - */ - 'length': 0, - - /** - * A flag to indicate if the suite is aborted. - * - * @memberOf Benchmark.Suite - * @type boolean - */ - 'aborted': false, - - /** - * A flag to indicate if the suite is running. - * - * @memberOf Benchmark.Suite - * @type boolean - */ - 'running': false - }); - - _.assign(Suite.prototype, { - 'abort': abortSuite, - 'add': add, - 'clone': cloneSuite, - 'emit': emit, - 'filter': filterSuite, - 'join': arrayRef.join, - 'listeners': listeners, - 'off': off, - 'on': on, - 'pop': arrayRef.pop, - 'push': push, - 'reset': resetSuite, - 'run': runSuite, - 'reverse': arrayRef.reverse, - 'shift': shift, - 'slice': slice, - 'sort': arrayRef.sort, - 'splice': arrayRef.splice, - 'unshift': unshift - }); - - /*------------------------------------------------------------------------*/ - - // Expose Deferred, Event, and Suite. - _.assign(Benchmark, { - 'Deferred': Deferred, - 'Event': Event, - 'Suite': Suite - }); - - /*------------------------------------------------------------------------*/ - - // Add lodash methods as Suite methods. - _.each(['each', 'forEach', 'indexOf', 'map', 'reduce'], function(methodName) { - var func = _[methodName]; - Suite.prototype[methodName] = function() { - var args = [this]; - push.apply(args, arguments); - return func.apply(_, args); - }; - }); - - // Avoid array-like object bugs with `Array#shift` and `Array#splice` - // in Firefox < 10 and IE < 9. - _.each(['pop', 'shift', 'splice'], function(methodName) { - var func = arrayRef[methodName]; - - Suite.prototype[methodName] = function() { - var value = this, - result = func.apply(value, arguments); - - if (value.length === 0) { - delete value[0]; - } - return result; - }; - }); - - // Avoid buggy `Array#unshift` in IE < 8 which doesn't return the new - // length of the array. - Suite.prototype.unshift = function() { - var value = this; - unshift.apply(value, arguments); - return value.length; - }; - - return Benchmark; - } - - /*--------------------------------------------------------------------------*/ - - var Benchmark = runInContext(); - - window.Benchmark = Benchmark; - - return Benchmark; - -}.call(this)); diff --git a/tgui/packages/tgui-bench/package.json b/tgui/packages/tgui-bench/package.json deleted file mode 100644 index eb0ca5b5a88..00000000000 --- a/tgui/packages/tgui-bench/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "private": true, - "name": "tgui-bench", - "version": "4.3.1", - "dependencies": { - "common": "workspace:*", - "fastify": "^3.29.4", - "fastify-static": "^4.2.3", - "inferno": "^7.4.8", - "inferno-vnode-flags": "^7.4.8", - "lodash": "^4.18.1", - "platform": "^1.3.6", - "tgui": "workspace:*" - } -} diff --git a/tgui/packages/tgui-bench/tests/Button.test.tsx b/tgui/packages/tgui-bench/tests/Button.test.tsx deleted file mode 100644 index 6b806d720ab..00000000000 --- a/tgui/packages/tgui-bench/tests/Button.test.tsx +++ /dev/null @@ -1,85 +0,0 @@ -import { linkEvent } from 'inferno'; -import { Button } from 'tgui/components'; -import { createRenderer } from 'tgui/renderer'; - -const render = createRenderer(); - -const handleClick = () => undefined; - -export const SingleButton = () => { - const node = ; - render(node); -}; - -export const SingleButtonWithCallback = () => { - const node = ; - render(node); -}; - -export const SingleButtonWithLinkEvent = () => { - const node = ( - - ); - render(node); -}; - -export const ListOfButtons = () => { - const nodes: JSX.Element[] = []; - for (let i = 0; i < 100; i++) { - const node = ; - nodes.push(node); - } - render(
    {nodes}
    ); -}; - -export const ListOfButtonsWithCallback = () => { - const nodes: JSX.Element[] = []; - for (let i = 0; i < 100; i++) { - const node = ( - - ); - nodes.push(node); - } - render(
    {nodes}
    ); -}; - -export const ListOfButtonsWithLinkEvent = () => { - const nodes: JSX.Element[] = []; - for (let i = 0; i < 100; i++) { - const node = ( - - ); - nodes.push(node); - } - render(
    {nodes}
    ); -}; - -export const ListOfButtonsWithIcons = () => { - const nodes: JSX.Element[] = []; - for (let i = 0; i < 100; i++) { - const node = ( - - ); - nodes.push(node); - } - render(
    {nodes}
    ); -}; - -export const ListOfButtonsWithTooltips = () => { - const nodes: JSX.Element[] = []; - for (let i = 0; i < 100; i++) { - const node = ( - - ); - nodes.push(node); - } - render(
    {nodes}
    ); -}; diff --git a/tgui/packages/tgui-bench/tests/Flex.test.tsx b/tgui/packages/tgui-bench/tests/Flex.test.tsx deleted file mode 100644 index 66c039a1908..00000000000 --- a/tgui/packages/tgui-bench/tests/Flex.test.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Flex } from 'tgui/components'; -import { createRenderer } from 'tgui/renderer'; - -const render = createRenderer(); - -export const Default = () => { - const node = ( - - Text {Math.random()} - - Text {Math.random()} - - - ); - render(node); -}; diff --git a/tgui/packages/tgui-bench/tests/Stack.test.tsx b/tgui/packages/tgui-bench/tests/Stack.test.tsx deleted file mode 100644 index ce7f5599e72..00000000000 --- a/tgui/packages/tgui-bench/tests/Stack.test.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Stack } from 'tgui/components'; -import { createRenderer } from 'tgui/renderer'; - -const render = createRenderer(); - -export const Default = () => { - const node = ( - - Text {Math.random()} - - Text {Math.random()} - - - ); - render(node); -}; diff --git a/tgui/packages/tgui-bench/tests/Tooltip.test.tsx b/tgui/packages/tgui-bench/tests/Tooltip.test.tsx deleted file mode 100644 index 9dae16f5c03..00000000000 --- a/tgui/packages/tgui-bench/tests/Tooltip.test.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import { Box, Tooltip } from 'tgui/components'; -import { createRenderer } from 'tgui/renderer'; - -const render = createRenderer(); - -export const ListOfTooltips = () => { - const nodes: JSX.Element[] = []; - - for (let i = 0; i < 100; i++) { - nodes.push( - - - Tooltip #{i} - - , - ); - } - - render(
    {nodes}
    ); -}; diff --git a/tgui/packages/tgui-chat-dark/index.ts b/tgui/packages/tgui-chat-dark/index.ts new file mode 100644 index 00000000000..dd105da9774 --- /dev/null +++ b/tgui/packages/tgui-chat-dark/index.ts @@ -0,0 +1 @@ +import '../tgui-panel/styles/tgchat/chat-dark.scss'; diff --git a/tgui/packages/tgui-dev-server/dreamseeker.js b/tgui/packages/tgui-dev-server/dreamseeker.js deleted file mode 100644 index af4bfe891cb..00000000000 --- a/tgui/packages/tgui-dev-server/dreamseeker.js +++ /dev/null @@ -1,101 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import { exec } from 'child_process'; -import { promisify } from 'util'; -import { createLogger } from './logging.js'; -import { require } from './require.js'; - -const axios = require('axios'); -const logger = createLogger('dreamseeker'); - -const instanceByPid = new Map(); - -export class DreamSeeker { - constructor(pid, addr) { - this.pid = pid; - this.addr = addr; - this.client = axios.create({ - baseURL: `http://${addr}/`, - }); - } - - topic(params = {}) { - // prettier-ignore - const query = Object.keys(params) - .map(key => encodeURIComponent(key) - + '=' + encodeURIComponent(params[key])) - .join('&'); - logger.log( - `topic call at ${this.client.defaults.baseURL + '/dummy?' + query}`, - ); - return this.client.get('/dummy?' + query); - } -} - -/** - * @param {number[]} pids - * @returns {DreamSeeker[]} - */ -DreamSeeker.getInstancesByPids = async (pids) => { - if (process.platform !== 'win32') { - return []; - } - const instances = []; - const pidsToResolve = []; - for (let pid of pids) { - const instance = instanceByPid.get(pid); - if (instance) { - instances.push(instance); - } else { - pidsToResolve.push(pid); - } - } - if (pidsToResolve.length > 0) { - try { - const command = 'netstat -ano | findstr TCP | findstr 0.0.0.0:0'; - const { stdout } = await promisify(exec)(command, { - // Max buffer of 1MB (default is 200KB) - maxBuffer: 1024 * 1024, - }); - // Line format: - // proto addr mask mode pid - const entries = []; - const lines = stdout.split('\r\n'); - for (let line of lines) { - const words = line.match(/\S+/g); - if (!words || words.length === 0) { - continue; - } - const entry = { - addr: words[1], - pid: parseInt(words[4], 10), - }; - if (pidsToResolve.includes(entry.pid)) { - entries.push(entry); - } - } - const len = entries.length; - logger.log('found', len, plural('instance', len)); - for (let entry of entries) { - const { pid, addr } = entry; - const instance = new DreamSeeker(pid, addr); - instances.push(instance); - instanceByPid.set(pid, instance); - } - } catch (err) { - if (err.code === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER') { - logger.error(err.message, err.code); - } else { - logger.error(err); - } - return []; - } - } - return instances; -}; - -const plural = (word, n) => (n !== 1 ? word + 's' : word); diff --git a/tgui/packages/tgui-dev-server/dreamseeker.ts b/tgui/packages/tgui-dev-server/dreamseeker.ts new file mode 100644 index 00000000000..90e26b914c4 --- /dev/null +++ b/tgui/packages/tgui-dev-server/dreamseeker.ts @@ -0,0 +1,115 @@ +/** + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +import { exec } from 'node:child_process'; +import { promisify } from 'node:util'; + +import axios, { type AxiosInstance, type AxiosResponse } from 'axios'; + +import { createLogger } from './logging'; + +type Entry = { + addr: string; + pid: number; +}; + +const logger = createLogger('dreamseeker'); + +const instanceByPid = new Map(); + +export class DreamSeeker { + public pid: number; + public addr: string; + public client: AxiosInstance; + + constructor(pid: number, addr: string) { + this.pid = pid; + this.addr = addr; + this.client = axios.create({ + baseURL: `http://${addr}`, + }); + } + + topic(params: Record = {}): Promise { + const query = Object.keys(params) + .map( + (key) => + `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`, + ) + .join('&'); + logger.log( + `topic call at ${this.client.defaults.baseURL}/dummy.htm?${query}`, + ); + return this.client.get(`/dummy.htm?${query}`); + } + + static async getInstancesByPids(pids: number[]): Promise { + const instances: DreamSeeker[] = []; + const pidsToResolve: number[] = []; + + for (const pid of pids) { + const instance = instanceByPid.get(pid); + if (instance) { + instances.push(instance); + } else { + pidsToResolve.push(pid); + } + } + + if (pidsToResolve.length === 0) { + return instances; + } + + const command = 'netstat -ano | findstr TCP | findstr 0.0.0.0:0'; + + try { + const { stdout } = await promisify(exec)(command, { + // Max buffer of 1MB (default is 200KB) + maxBuffer: 1024 * 1024, + }); + + // Line format: + // proto addr mask mode pid + const entries: Entry[] = []; + const lines = stdout.split('\r\n'); + + for (const line of lines) { + const words = line.match(/\S+/g); + if (!words || words.length === 0) { + continue; + } + const entry: Entry = { + addr: words[1], + pid: parseInt(words[4], 10), + }; + if (pidsToResolve.includes(entry.pid)) { + entries.push(entry); + } + } + + const len = entries.length; + logger.log('found', len, plural('instance', len)); + for (const entry of entries) { + const { pid, addr } = entry; + const instance = new DreamSeeker(pid, addr); + instances.push(instance); + instanceByPid.set(pid, instance); + } + } catch (err) { + if (err.code === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER') { + logger.error(err.message, err.code); + } else { + logger.error(err); + } + return []; + } + return instances; + } +} + +function plural(word: string, n: number): string { + return n !== 1 ? `${word}s` : word; +} diff --git a/tgui/packages/tgui-dev-server/index.js b/tgui/packages/tgui-dev-server/index.js deleted file mode 100644 index 199e93d8363..00000000000 --- a/tgui/packages/tgui-dev-server/index.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import { createCompiler } from './webpack.js'; -import { reloadByondCache } from './reloader.js'; - -const noHot = process.argv.includes('--no-hot'); -const noTmp = process.argv.includes('--no-tmp'); -const reloadOnce = process.argv.includes('--reload'); - -const setupServer = async () => { - const compiler = await createCompiler({ - mode: 'development', - hot: !noHot, - devServer: true, - useTmpFolder: !noTmp, - }); - // Reload cache once - if (reloadOnce) { - await reloadByondCache(compiler.bundleDir); - return; - } - // Run a development server - await compiler.watch(); -}; - -setupServer(); diff --git a/tgui/packages/tgui-dev-server/index.ts b/tgui/packages/tgui-dev-server/index.ts new file mode 100644 index 00000000000..f7fe55851e4 --- /dev/null +++ b/tgui/packages/tgui-dev-server/index.ts @@ -0,0 +1,31 @@ +/** + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +import fs from 'node:fs'; + +import { reloadByondCache } from './reloader'; +import { RspackCompiler } from './webpack'; + +const reloadOnce = process.argv.includes('--reload'); + +async function setupServer() { + fs.mkdirSync('./public/.tmp', { recursive: true }); + + const compiler = new RspackCompiler(); + + await compiler.setup(); + + // Reload cache once + if (reloadOnce) { + await reloadByondCache(compiler.bundleDir); + return; + } + + // Run a development server + await compiler.watch(); +} + +setupServer(); diff --git a/tgui/packages/tgui-dev-server/link/client.cjs b/tgui/packages/tgui-dev-server/link/client.cjs deleted file mode 100644 index 1e21d42ce86..00000000000 --- a/tgui/packages/tgui-dev-server/link/client.cjs +++ /dev/null @@ -1,179 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -let socket; -const queue = []; -const subscribers = []; - -const ensureConnection = () => { - if (process.env.NODE_ENV !== 'production') { - if (!window.WebSocket) { - return; - } - if (!socket || socket.readyState === WebSocket.CLOSED) { - const DEV_SERVER_IP = process.env.DEV_SERVER_IP || '127.0.0.1'; - socket = new WebSocket(`ws://${DEV_SERVER_IP}:3000`); - socket.onopen = () => { - // Empty the message queue - while (queue.length !== 0) { - const msg = queue.shift(); - socket.send(msg); - } - }; - socket.onmessage = (event) => { - const msg = JSON.parse(event.data); - for (let subscriber of subscribers) { - subscriber(msg); - } - }; - } - } -}; - -if (process.env.NODE_ENV !== 'production') { - window.onunload = () => socket && socket.close(); -} - -const subscribe = (fn) => subscribers.push(fn); - -/** - * A json serializer which handles circular references and other junk. - */ -const serializeObject = (obj) => { - let refs = []; - const primitiveReviver = (value) => { - if (typeof value === 'number' && !Number.isFinite(value)) { - return { - __number__: String(value), - }; - } - if (typeof value === 'undefined') { - return { - __undefined__: true, - }; - } - return value; - }; - const objectReviver = (key, value) => { - if (typeof value === 'object') { - if (value === null) { - return value; - } - // Circular reference - if (refs.includes(value)) { - return '[circular ref]'; - } - refs.push(value); - // Error object - // prettier-ignore - const isError = value instanceof Error || ( - value.code && value.message && value.message.includes('Error') - ); - if (isError) { - return { - __error__: true, - string: String(value), - stack: value.stack, - }; - } - // Array - if (Array.isArray(value)) { - return value.map(primitiveReviver); - } - return value; - } - return primitiveReviver(value); - }; - const json = JSON.stringify(obj, objectReviver); - refs = null; - return json; -}; - -const sendMessage = (msg) => { - if (process.env.NODE_ENV !== 'production') { - const json = serializeObject(msg); - // Send message using WebSocket - if (window.WebSocket) { - ensureConnection(); - if (socket.readyState === WebSocket.OPEN) { - socket.send(json); - } else { - // Keep only 100 latest messages in the queue - if (queue.length > 100) { - queue.shift(); - } - queue.push(json); - } - } - // Send message using plain HTTP request. - else { - const DEV_SERVER_IP = process.env.DEV_SERVER_IP || '127.0.0.1'; - const req = new XMLHttpRequest(); - req.open('POST', `http://${DEV_SERVER_IP}:3001`, true); - req.timeout = 250; - req.send(json); - } - } -}; - -const sendLogEntry = (level, ns, ...args) => { - if (process.env.NODE_ENV !== 'production') { - try { - sendMessage({ - type: 'log', - payload: { - level, - ns: ns || 'client', - args, - }, - }); - } catch (err) {} - } -}; - -const setupHotReloading = () => { - if ( - // prettier-ignore - process.env.NODE_ENV !== 'production' - && process.env.WEBPACK_HMR_ENABLED - && window.WebSocket - ) { - if (module.hot) { - ensureConnection(); - sendLogEntry(0, null, 'setting up hot reloading'); - subscribe((msg) => { - const { type } = msg; - sendLogEntry(0, null, 'received', type); - if (type === 'hotUpdate') { - const status = module.hot.status(); - if (status !== 'idle') { - sendLogEntry(0, null, 'hot reload status:', status); - return; - } - module.hot - .check({ - ignoreUnaccepted: true, - ignoreDeclined: true, - ignoreErrored: true, - }) - .then((modules) => { - sendLogEntry(0, null, 'outdated modules', modules); - }) - .catch((err) => { - sendLogEntry(0, null, 'reload error', err); - }); - } - }); - } - } -}; - -module.exports = { - subscribe, - sendMessage, - sendLogEntry, - setupHotReloading, -}; diff --git a/tgui/packages/tgui-dev-server/link/client.ts b/tgui/packages/tgui-dev-server/link/client.ts new file mode 100644 index 00000000000..be283a67601 --- /dev/null +++ b/tgui/packages/tgui-dev-server/link/client.ts @@ -0,0 +1,172 @@ +type Messenger = (msg: any) => void; + +let socket: WebSocket | undefined; +const queue: string[] = []; +const subscribers: Messenger[] = []; + +function ensureConnection() { + if (socket) return; + console.log('Creating a connection'); + + socket = new WebSocket('ws://127.0.0.1:3000'); + + socket.onopen = () => { + // Empty the message queue + while (queue.length !== 0) { + const msg = queue.shift(); + if (msg) { + socket?.send(msg); + } + } + }; + + socket.onmessage = (event) => { + const msg = JSON.parse(event.data); + for (const subscriber of subscribers) { + subscriber(msg); + } + }; + + socket.onerror = (err) => { + console.log('WebSocket error:', err); + }; + + window.addEventListener('unload', () => socket?.close()); +} + +function primitiveReviver(value: unknown): any { + if (typeof value === 'number' && !Number.isFinite(value)) { + return { + __number__: String(value), + }; + } + if (typeof value === 'undefined') { + return { + __undefined__: true, + }; + } + return value; +} + +export function sendLogEntry( + level: number, + ns: string | null = 'client', + ...args: any[] +): void { + if (process.env.NODE_ENV === 'development') { + try { + sendMessage({ + type: 'log', + payload: { + level, + ns, + args, + }, + }); + } catch (err) {} + } +} + +export function sendMessage(msg: Record): void { + if (process.env.NODE_ENV === 'development' && socket) { + const json = serializeObject(msg); + // Send message using WebSocket + if (!window.WebSocket) return; + + ensureConnection(); + if (socket.readyState === WebSocket.OPEN) { + socket.send(json); + } else { + // Keep only 100 latest messages in the queue + if (queue.length > 100) { + queue.shift(); + } + queue.push(json); + } + } +} + +/** A json serializer which handles circular references and other junk. */ +function serializeObject(obj: Record): string { + let refs: string[] = []; + + function objectReviver(key: string, value: any) { + if (typeof value !== 'object') { + return primitiveReviver(value); + } + + if (value === null) { + return value; + } + // Circular reference + if (refs.includes(value)) { + return '[circular ref]'; + } + refs.push(value); + // Error object + const isError = + value instanceof Error || + (value.code && value.message?.includes('Error')); + if (isError) { + return { + __error__: true, + string: String(value), + stack: value.stack, + }; + } + // Array + if (Array.isArray(value)) { + return value.map(primitiveReviver); + } + return value; + } + + const json = JSON.stringify(obj, objectReviver); + refs = []; + return json; +} + +export function setupHotReloading(): void { + if (process.env.NODE_ENV === 'development' && window.WebSocket) { + console.log('Setting up hot reloading...'); + if (socket) { + socket.close(); + socket = undefined; + subscribers.length = 0; + } + ensureConnection(); + subscribe(({ type }) => { + if (type !== 'hotUpdate') return; + + const status = import.meta.webpackHot?.status(); + if (status === 'ready') { + import.meta.webpackHot + ?.apply({ + ignoreUnaccepted: true, + ignoreDeclined: true, + ignoreErrored: true, + }) + .then((modules) => { + console.log('outdated modules:', modules); + }) + .catch((err) => { + console.log(import.meta.webpackHot?.status()); + console.error('Hot reload error:', err); + }); + } else if (status === 'idle') { + import.meta.webpackHot + ?.check(true) + .then((updatedModules) => { + console.log('Updated modules:', updatedModules); + }) + .catch((err) => { + console.error('Hot reload error:', err); + }); + } + }); + } +} + +export function subscribe(fn: Messenger): void { + subscribers.push(fn); +} diff --git a/tgui/packages/tgui-dev-server/link/retrace.js b/tgui/packages/tgui-dev-server/link/retrace.ts similarity index 56% rename from tgui/packages/tgui-dev-server/link/retrace.js rename to tgui/packages/tgui-dev-server/link/retrace.ts index b7f4d4eacfb..6fd1bc27ab0 100644 --- a/tgui/packages/tgui-dev-server/link/retrace.js +++ b/tgui/packages/tgui-dev-server/link/retrace.ts @@ -1,46 +1,46 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ +import path from 'node:path'; -import fs from 'fs'; -import { basename } from 'path'; -import { createLogger } from '../logging.js'; -import { require } from '../require.js'; -import { resolveGlob } from '../util.js'; +import { SourceMapConsumer } from 'source-map'; +import { parse as parseStackTrace } from 'stacktrace-parser'; -const SourceMap = require('source-map'); -const { parse: parseStackTrace } = require('stacktrace-parser'); +import { createLogger } from '../logging'; +import { resolveGlob } from '../util'; + +type SourceMap = { + file: string; + consumer: SourceMapConsumer; +}; const logger = createLogger('retrace'); -const { SourceMapConsumer } = SourceMap; -const sourceMaps = []; +const sourceMaps: SourceMap[] = []; -export const loadSourceMaps = async (bundleDir) => { +export async function loadSourceMaps(bundleDir: string): Promise { // Destroy and garbage collect consumers while (sourceMaps.length !== 0) { - const { consumer } = sourceMaps.shift(); - consumer.destroy(); + const map = sourceMaps.shift(); + if (!map?.consumer) continue; + map.consumer.destroy(); } + // Load new sourcemaps - const paths = await resolveGlob(bundleDir, '*.map'); - for (let path of paths) { + const files = await resolveGlob(bundleDir, '*.map'); + for (const file of files) { try { - const file = basename(path).replace('.map', ''); - const consumer = await new SourceMapConsumer( - JSON.parse(fs.readFileSync(path, 'utf8')), - ); + const loc = path.resolve(bundleDir, file); + const parsed = await Bun.file(loc).json(); + const consumer = await new SourceMapConsumer(parsed); + sourceMaps.push({ file, consumer }); } catch (err) { logger.error(err); } } - logger.log(`loaded ${sourceMaps.length} source maps`); -}; -export const retrace = (stack) => { + logger.log(`loaded ${sourceMaps.length} source maps`); +} + +export function retrace(stack: string): string | undefined { if (typeof stack !== 'string') { logger.log('ERROR: Stack is not a string!', stack); return stack; @@ -53,7 +53,7 @@ export const retrace = (stack) => { } // Find the correct source map const sourceMap = sourceMaps.find((sourceMap) => { - return frame.file.includes(sourceMap.file); + return frame.file!.includes(sourceMap.file); }); if (!sourceMap) { return frame; @@ -61,9 +61,8 @@ export const retrace = (stack) => { // Map the frame const { consumer } = sourceMap; const mappedFrame = consumer.originalPositionFor({ - source: basename(frame.file), - line: frame.lineNumber, - column: frame.column, + line: frame.lineNumber || 0, + column: frame.column || 0, }); return { ...frame, @@ -79,10 +78,11 @@ export const retrace = (stack) => { return ` at ${methodName}`; } const compactPath = file - .replace(/^webpack:\/\/\/?/, './') + .replace(/^rspack:\/\/\/?/, './') .replace(/.*node_modules\//, ''); return ` at ${methodName} (${compactPath}:${lineNumber})`; }) .join('\n'); - return header + '\n' + mappedStack; -}; + + return `${header}\n${mappedStack}`; +} diff --git a/tgui/packages/tgui-dev-server/link/server.js b/tgui/packages/tgui-dev-server/link/server.js deleted file mode 100644 index 60cc78c1bd9..00000000000 --- a/tgui/packages/tgui-dev-server/link/server.js +++ /dev/null @@ -1,144 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import http from 'http'; -import { inspect } from 'util'; -import { createLogger, directLog } from '../logging.js'; -import { require } from '../require.js'; -import { loadSourceMaps, retrace } from './retrace.js'; - -const WebSocket = require('ws'); - -const logger = createLogger('link'); - -const DEBUG = process.argv.includes('--debug'); - -export { loadSourceMaps }; - -export const setupLink = () => new LinkServer(); - -class LinkServer { - constructor() { - logger.log('setting up'); - this.wss = null; - this.setupWebSocketLink(); - this.setupHttpLink(); - } - - // WebSocket-based client link - setupWebSocketLink() { - const port = 3000; - this.wss = new WebSocket.Server({ port }); - this.wss.on('connection', (ws) => { - logger.log('client connected'); - ws.on('message', (json) => { - const msg = deserializeObject(json); - this.handleLinkMessage(ws, msg); - }); - ws.on('close', () => { - logger.log('client disconnected'); - }); - }); - logger.log(`listening on port ${port} (WebSocket)`); - } - - // One way HTTP-based client link for IE8 - setupHttpLink() { - const port = 3001; - this.httpServer = http.createServer((req, res) => { - if (req.method === 'POST') { - let body = ''; - req.on('data', (chunk) => { - body += chunk.toString(); - }); - req.on('end', () => { - const msg = deserializeObject(body); - this.handleLinkMessage(null, msg); - res.end(); - }); - return; - } - res.write('Hello'); - res.end(); - }); - this.httpServer.listen(port); - logger.log(`listening on port ${port} (HTTP)`); - } - - handleLinkMessage(ws, msg) { - const { type, payload } = msg; - if (type === 'log') { - const { level, ns, args } = payload; - // Skip debug messages - if (level <= 0 && !DEBUG) { - return; - } - // prettier-ignore - directLog(ns, ...args.map(arg => { - if (typeof arg === 'object') { - return inspect(arg, { - depth: Infinity, - colors: true, - compact: 8, - }); - } - return arg; - })); - return; - } - if (type === 'relay') { - for (let client of this.wss.clients) { - if (client === ws) { - continue; - } - this.sendMessage(client, msg); - } - return; - } - logger.log('unhandled message', msg); - } - - sendMessage(ws, msg) { - ws.send(JSON.stringify(msg)); - } - - broadcastMessage(msg) { - const clients = [...this.wss.clients]; - if (clients.length === 0) { - return; - } - logger.log(`broadcasting ${msg.type} to ${clients.length} clients`); - for (let client of clients) { - const json = JSON.stringify(msg); - client.send(json); - } - } -} - -const deserializeObject = (str) => { - return JSON.parse(str, (key, value) => { - if (typeof value === 'object' && value !== null) { - if (value.__undefined__) { - // NOTE: You should not rely on deserialized object's undefined, - // this is purely for inspection purposes. - return { - [inspect.custom]: () => undefined, - }; - } - if (value.__number__) { - return parseFloat(value.__number__); - } - if (value.__error__) { - if (!value.stack) { - return value.string; - } - return retrace(value.stack); - } - return value; - } - return value; - }); -}; diff --git a/tgui/packages/tgui-dev-server/link/server.ts b/tgui/packages/tgui-dev-server/link/server.ts new file mode 100644 index 00000000000..9b2ef1e4c85 --- /dev/null +++ b/tgui/packages/tgui-dev-server/link/server.ts @@ -0,0 +1,116 @@ +import { inspect } from 'node:util'; + +import type { ServerWebSocket } from 'bun'; + +import { createLogger, directLog } from '../logging'; +import { retrace } from './retrace'; + +let server: Bun.Server; +const logger = createLogger('link'); +const DEBUG = process.argv.includes('--debug'); + +export function setupLink() { + server = Bun.serve({ + fetch: upgradeServer, + development: true, + hostname: '127.0.0.1', + port: 3000, + websocket: { + open(ws) { + ws.subscribe('link'); + logger.log('client connected'); + }, + close(ws) { + ws.unsubscribe('link'); + logger.log('client disconnected'); + }, + message: handleLinkMessage, + }, + }); +} + +export function broadcastMessage(msg: Record): void { + const subscribers = server.subscriberCount('link'); + if (subscribers === 0) return; + + server?.publish('link', JSON.stringify(msg)); +} + +function deserializeObject(str: any): any { + return JSON.parse(str, (_key: string, value: any) => { + if (typeof value === 'object' && value !== null) { + if (value.__undefined__) { + // NOTE: You should not rely on deserialized object's undefined, + // this is purely for inspection purposes. + return { + [inspect.custom]: () => undefined, + }; + } + if (value.__number__) { + return parseFloat(value.__number__); + } + if (value.__error__) { + if (!value.stack) { + return value.string; + } + return retrace(value.stack); + } + return value; + } + return value; + }); +} + +function handleLinkMessage( + _ws: ServerWebSocket, + message: string | Buffer, +): void { + const deserializedMsg = deserializeObject(message); + const { type, payload } = deserializedMsg; + + if (type === 'log') { + const { level, ns, args } = payload; + // Skip debug messages + if (level <= 0 && !DEBUG) return; + + directLog( + ns, + ...args.map((arg) => { + if (typeof arg === 'object') { + return inspect(arg, { + depth: Infinity, + colors: true, + compact: 8, + }); + } + return arg; + }), + ); + + return; + } + if (type === 'relay') { + broadcastMessage(payload); + + return; + } + + logger.log('unhandled message', JSON.stringify(message)); +} + +function upgradeServer(req: Request, srv: Bun.Server) { + const client = crypto.randomUUID(); + + const upgraded = srv.upgrade(req, { + data: { + id: client, + createdAt: Date.now(), + }, + }); + + if (upgraded) { + return new Response('Ok'); + } else { + return new Response('Upgrade failed', { status: 500 }); + } +} diff --git a/tgui/packages/tgui-dev-server/logging.js b/tgui/packages/tgui-dev-server/logging.js deleted file mode 100644 index 4ec09008ff5..00000000000 --- a/tgui/packages/tgui-dev-server/logging.js +++ /dev/null @@ -1,72 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -const inception = Date.now(); - -// Runtime detection -const isNode = process && process.release && process.release.name === 'node'; -let isChrome = false; -try { - isChrome = window.navigator.userAgent.toLowerCase().includes('chrome'); -} catch {} - -// Timestamping function -const getTimestamp = () => { - const timestamp = String(Date.now() - inception) - .padStart(4, '0') - .padStart(7, ' '); - const seconds = timestamp.substr(0, timestamp.length - 3); - const millis = timestamp.substr(-3); - return `${seconds}.${millis}`; -}; - -const getPrefix = (() => { - if (isNode) { - // Escape sequences - const ESC = { - dimmed: '\x1b[38;5;240m', - bright: '\x1b[37;1m', - reset: '\x1b[0m', - }; - return (ns) => [ - `${ESC.dimmed}${getTimestamp()} ${ESC.bright}${ns}${ESC.reset}`, - ]; - } - if (isChrome) { - // Styles - const styles = { - dimmed: 'color: #888', - bright: 'font-weight: bold', - }; - return (ns) => [ - `%c${getTimestamp()}%c ${ns}`, - styles.dimmed, - styles.bright, - ]; - } - // prettier-ignore - return ns => [ - `${getTimestamp()} ${ns}`, - ]; -})(); - -/** - * Creates a logger object. - */ -export const createLogger = (ns) => ({ - log: (...args) => console.log(...getPrefix(ns), ...args), - trace: (...args) => console.trace(...getPrefix(ns), ...args), - debug: (...args) => console.debug(...getPrefix(ns), ...args), - info: (...args) => console.info(...getPrefix(ns), ...args), - warn: (...args) => console.warn(...getPrefix(ns), ...args), - error: (...args) => console.error(...getPrefix(ns), ...args), -}); - -/** - * Explicitly log with chosen namespace. - */ -export const directLog = (ns, ...args) => - console.log(...getPrefix(ns), ...args); diff --git a/tgui/packages/tgui-dev-server/logging.ts b/tgui/packages/tgui-dev-server/logging.ts new file mode 100644 index 00000000000..bf46b365ce3 --- /dev/null +++ b/tgui/packages/tgui-dev-server/logging.ts @@ -0,0 +1,72 @@ +/** + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +type Fn = (...args: any[]) => void; + +const inception = Date.now(); + +// Runtime detection. Yes, even in bun! +const isNode = process?.release?.name === 'node'; +let isChrome = false; +try { + isChrome = window.navigator.userAgent.toLowerCase().includes('chrome'); +} catch {} + +// Timestamping function +function getTimestamp(): string { + const timestamp = String(Date.now() - inception) + .padStart(4, '0') + .padStart(7, ' '); + const seconds = timestamp.slice(0, timestamp.length - 3); + const millis = timestamp.slice(-3); + + return `${seconds}.${millis}`; +} + +const getPrefix = (() => { + if (isNode) { + // Escape sequences + const ESC = { + dimmed: '\x1b[38;5;240m', + bright: '\x1b[37;1m', + reset: '\x1b[0m', + }; + return (ns: string) => [ + `${ESC.dimmed}${getTimestamp()} ${ESC.bright}${ns}${ESC.reset}`, + ]; + } + if (isChrome) { + // Styles + const styles = { + dimmed: 'color: #888', + bright: 'font-weight: bold', + }; + return (ns: string) => [ + `%c${getTimestamp()}%c ${ns}`, + styles.dimmed, + styles.bright, + ]; + } + + return (ns: string) => [`${getTimestamp()} ${ns}`]; +})(); + +/** Creates a logger object. */ +export function createLogger(ns: string): Record { + return { + log: (...args) => console.log(...getPrefix(ns), ...args), + trace: (...args) => console.trace(...getPrefix(ns), ...args), + debug: (...args) => console.debug(...getPrefix(ns), ...args), + info: (...args) => console.info(...getPrefix(ns), ...args), + warn: (...args) => console.warn(...getPrefix(ns), ...args), + error: (...args) => console.error(...getPrefix(ns), ...args), + }; +} + +/** Explicitly log with chosen namespace. */ +export function directLog(ns: string, ...args: any[]): void { + console.log(...getPrefix(ns), ...args); +} diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index bd1ee1a5bd6..26049529bd6 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -1,13 +1,11 @@ { - "private": true, - "name": "tgui-dev-server", - "version": "4.3.1", - "type": "module", - "dependencies": { - "axios": "^1.15.0", - "glob": "^7.1.7", - "source-map": "^0.7.4", - "stacktrace-parser": "^0.1.10", - "ws": "^7.5.10" - } + "name": "tgui-dev-server", + "version": "6.0.0", + "dependencies": { + "axios": "^1.16.0", + "source-map": "^0.7.4", + "stacktrace-parser": "^0.1.11" + }, + "private": true, + "type": "module" } diff --git a/tgui/packages/tgui-dev-server/reloader.js b/tgui/packages/tgui-dev-server/reloader.ts similarity index 52% rename from tgui/packages/tgui-dev-server/reloader.js rename to tgui/packages/tgui-dev-server/reloader.ts index 427d1aecbd6..fdbb2aa066c 100644 --- a/tgui/packages/tgui-dev-server/reloader.js +++ b/tgui/packages/tgui-dev-server/reloader.ts @@ -4,16 +4,19 @@ * @license MIT */ -import fs from 'fs'; -import os from 'os'; -import { basename } from 'path'; -import { DreamSeeker } from './dreamseeker.js'; -import { createLogger } from './logging.js'; -import { resolveGlob, resolvePath } from './util.js'; -import { regQuery } from './winreg.js'; +import os from 'node:os'; +import path from 'node:path'; + +import { DreamSeeker } from './dreamseeker'; +import { createLogger } from './logging'; +import { resolveGlob, resolvePath } from './util'; +import { regQuery } from './winreg'; const logger = createLogger('reloader'); +// Basic glob pattern for bundle files +const bundleGlob = '*.{bundle,chunk,hot-update}.*'; + const HOME = os.homedir(); const SEARCH_LOCATIONS = [ // Custom location @@ -28,18 +31,20 @@ const SEARCH_LOCATIONS = [ `/mnt/c/Users/*/*/BYOND/cache`, ]; -let cacheRoot; +let cacheRoot: string; -export const findCacheRoot = async () => { +export async function findCacheRoot(): Promise { if (cacheRoot) { return cacheRoot; } logger.log('looking for byond cache'); // Find BYOND cache folders - for (let pattern of SEARCH_LOCATIONS) { + + for (const pattern of SEARCH_LOCATIONS) { if (!pattern) { continue; } + const paths = await resolveGlob(pattern); if (paths.length > 0) { cacheRoot = paths[0]; @@ -47,67 +52,66 @@ export const findCacheRoot = async () => { return cacheRoot; } } + // Query the Windows Registry if (process.platform === 'win32') { logger.log('querying windows registry'); - let userpath = await regQuery('HKCU\\Software\\Dantom\\BYOND', 'userpath'); + const userpath = await regQuery( + 'HKCU\\Software\\Dantom\\BYOND', + 'userpath', + ); if (userpath) { - // prettier-ignore - cacheRoot = userpath - .replace(/\\$/, '') - .replace(/\\/g, '/') - + '/cache'; - onCacheRootFound(cacheRoot); + cacheRoot = `${userpath.replace(/\\$/, '').replace(/\\/g, '/')}/cache`; + await onCacheRootFound(cacheRoot); return cacheRoot; } } logger.log('found no cache directories'); -}; +} -const onCacheRootFound = (cacheRoot) => { +async function onCacheRootFound(cacheRoot: string): Promise { logger.log(`found cache at '${cacheRoot}'`); // Plant a dummy browser window file, we'll be using this to avoid world topic. For byond 514. - fs.closeSync(fs.openSync(cacheRoot + '/dummy', 'w')); -}; + await Bun.write(`${cacheRoot}/dummy.htm`, ''); +} -export const reloadByondCache = async (bundleDir) => { +export async function reloadByondCache(bundleDir: string): Promise { const cacheRoot = await findCacheRoot(); - if (!cacheRoot) { - return; - } + if (!cacheRoot) return; + // Find tmp folders in cache - const cacheDirs = await resolveGlob(cacheRoot, './tmp*'); + const cacheDirs = await resolveGlob(cacheRoot, 'tmp*'); if (cacheDirs.length === 0) { logger.log('found no tmp folder in cache'); return; } - // Get dreamseeker instances - const pids = cacheDirs.map((cacheDir) => - parseInt(cacheDir.split('/cache/tmp').pop(), 10), - ); + + const pids = cacheDirs.map((cacheDir) => { + return parseInt(cacheDir.split('\\cache\\tmp')[1], 10); + }); + const dssPromise = DreamSeeker.getInstancesByPids(pids); // Copy assets - const assets = await resolveGlob( - bundleDir, - './*.+(bundle|chunk|hot-update).*', - ); - for (let cacheDir of cacheDirs) { - // Clear garbage - const garbage = await resolveGlob( - cacheDir, - './*.+(bundle|chunk|hot-update).*', - ); - try { - // Plant a dummy browser window file, we'll be using this to avoid world topic. For byond 515. - fs.closeSync(fs.openSync(cacheDir + '/dummy', 'w')); + const assets = await resolveGlob(bundleDir, bundleGlob); + + for (const cacheDir of cacheDirs) { + // Clear garbage + const garbage = await resolveGlob(cacheDir, bundleGlob); + for (const file of garbage) { + await Bun.file(file).delete(); + } + + try { + // Plant a dummy browser window file, we'll be using this to avoid world topic. For byond 515-516. + await Bun.write(`${cacheDir}/dummy.htm`, ''); - for (let file of garbage) { - fs.unlinkSync(file); - } // Copy assets - for (let asset of assets) { - const destination = resolvePath(cacheDir, basename(asset)); - fs.writeFileSync(destination, fs.readFileSync(asset)); + for (const asset of assets) { + const destination = resolvePath(cacheDir, path.basename(asset)); + const input = Bun.file(asset); + const output = Bun.file(destination); + + await Bun.write(output, input); } logger.log(`copied ${assets.length} files to '${cacheDir}'`); } catch (err) { @@ -119,11 +123,11 @@ export const reloadByondCache = async (bundleDir) => { const dss = await dssPromise; if (dss.length > 0) { logger.log(`notifying dreamseeker`); - for (let dreamseeker of dss) { + for (const dreamseeker of dss) { dreamseeker.topic({ tgui: 1, type: 'cacheReloaded', }); } } -}; +} diff --git a/tgui/packages/tgui-dev-server/require.js b/tgui/packages/tgui-dev-server/require.ts similarity index 73% rename from tgui/packages/tgui-dev-server/require.js rename to tgui/packages/tgui-dev-server/require.ts index 0551d630fc6..d1f5ec4ce16 100644 --- a/tgui/packages/tgui-dev-server/require.js +++ b/tgui/packages/tgui-dev-server/require.ts @@ -4,6 +4,6 @@ * @license MIT */ -import { createRequire } from 'module'; +import { createRequire } from 'node:module'; export const require = createRequire(import.meta.url); diff --git a/tgui/packages/tgui-dev-server/util.js b/tgui/packages/tgui-dev-server/util.js deleted file mode 100644 index 9d07b96c71a..00000000000 --- a/tgui/packages/tgui-dev-server/util.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import fs from 'fs'; -import path from 'path'; -import { require } from './require.js'; - -const globPkg = require('glob'); - -export const resolvePath = path.resolve; - -/** - * Combines path.resolve with glob patterns. - */ -export const resolveGlob = (...sections) => { - const unsafePaths = globPkg.sync(path.resolve(...sections), { - strict: false, - silent: true, - }); - const safePaths = []; - for (let path of unsafePaths) { - try { - fs.statSync(path); - safePaths.push(path); - } catch {} - } - return safePaths; -}; diff --git a/tgui/packages/tgui-dev-server/util.ts b/tgui/packages/tgui-dev-server/util.ts new file mode 100644 index 00000000000..3c162b4abab --- /dev/null +++ b/tgui/packages/tgui-dev-server/util.ts @@ -0,0 +1,40 @@ +/** + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +import path from 'node:path'; + +import { Glob } from 'bun'; + +export const resolvePath = path.resolve; + +/** Combines path.resolve with glob patterns. */ +export async function resolveGlob( + directory: string, + pattern = '*', +): Promise { + // If no pattern is supplied, just return the directory if it exists + if (pattern === '*') { + try { + const stat = await Bun.file(directory).stat(); + if (stat?.isDirectory()) { + return [directory]; + } + } catch (e) { + return []; + } + return []; + } + + // Otherwise, use glob logic + const glob = new Glob(pattern); + const results: string[] = []; + + for await (const match of glob.scan({ onlyFiles: false, cwd: directory })) { + results.push(path.resolve(directory, match)); + } + + return results; +} diff --git a/tgui/packages/tgui-dev-server/webpack.js b/tgui/packages/tgui-dev-server/webpack.js deleted file mode 100644 index 139610b79ce..00000000000 --- a/tgui/packages/tgui-dev-server/webpack.js +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import fs from 'fs'; -import { createRequire } from 'module'; -import { dirname } from 'path'; -import { loadSourceMaps, setupLink } from './link/server.js'; -import { createLogger } from './logging.js'; -import { reloadByondCache } from './reloader.js'; -import { resolveGlob } from './util.js'; - -const logger = createLogger('webpack'); - -/** - * @param {any} config - * @return {WebpackCompiler} - */ -export const createCompiler = async (options) => { - const compiler = new WebpackCompiler(); - await compiler.setup(options); - return compiler; -}; - -class WebpackCompiler { - async setup(options) { - // Create a require context that is relative to project root - // and retrieve all necessary dependencies. - const requireFromRoot = createRequire(dirname(import.meta.url) + '/../..'); - const webpack = await requireFromRoot('webpack'); - const createConfig = await requireFromRoot('./webpack.config.js'); - const config = createConfig({}, options); - // Inject the HMR plugin into the config if we're using it - if (options.hot) { - config.plugins.push(new webpack.HotModuleReplacementPlugin()); - } - this.webpack = webpack; - this.config = config; - this.bundleDir = config.output.path; - } - - async watch() { - logger.log('setting up'); - // Setup link - const link = setupLink(); - // Instantiate the compiler - const compiler = this.webpack.webpack(this.config); - // Clear garbage before compiling - compiler.hooks.watchRun.tapPromise('tgui-dev-server', async () => { - const files = await resolveGlob(this.bundleDir, './*.hot-update.*'); - logger.log(`clearing garbage (${files.length} files)`); - for (let file of files) { - fs.unlinkSync(file); - } - logger.log('compiling'); - }); - // Start reloading when it's finished - compiler.hooks.done.tap('tgui-dev-server', async (stats) => { - // Load source maps - await loadSourceMaps(this.bundleDir); - // Reload cache - await reloadByondCache(this.bundleDir); - // Notify all clients that update has happened - link.broadcastMessage({ - type: 'hotUpdate', - }); - }); - // Start watching - logger.log('watching for changes'); - compiler.watch({}, (err, stats) => { - if (err) { - logger.error('compilation error', err); - return; - } - stats - .toString(this.config.devServer.stats) - .split('\n') - .forEach((line) => logger.log(line)); - }); - } -} diff --git a/tgui/packages/tgui-dev-server/webpack.ts b/tgui/packages/tgui-dev-server/webpack.ts new file mode 100644 index 00000000000..3b1eb522dea --- /dev/null +++ b/tgui/packages/tgui-dev-server/webpack.ts @@ -0,0 +1,69 @@ +import { createRequire } from 'node:module'; + +import { config } from '../../rspack.config-dev'; +import { loadSourceMaps } from './link/retrace'; +import { broadcastMessage, setupLink } from './link/server'; +import { createLogger } from './logging'; +import { reloadByondCache } from './reloader'; +import { resolveGlob } from './util'; + +const logger = createLogger('rspack'); + +export class RspackCompiler { + rspack: any; + config: any; + bundleDir: string; + + async setup() { + // Create a require context that is relative to project root + // and retrieve all necessary dependencies. + const requireFromRoot = createRequire(`${import.meta.dirname}/../../..`); + const rspack = await requireFromRoot('@rspack/core'); + + this.rspack = rspack; + this.config = config; + this.bundleDir = config.output?.path || ''; + } + + async watch() { + logger.log('setting up'); + setupLink(); + // Instantiate the compiler + const compiler = this.rspack.rspack(this.config); + + // Clear garbage before compiling + compiler.hooks.watchRun.tapPromise('tgui-dev-server', async () => { + const files = await resolveGlob(this.bundleDir, '*.hot-update.*'); + for (const file of files) { + await Bun.file(file).delete(); + } + logger.log('compiling'); + }); + + // Start reloading when it's finished + compiler.hooks.done.tap('tgui-dev-server', async () => { + // Load source maps + await loadSourceMaps(this.bundleDir); + // Reload cache + await reloadByondCache(this.bundleDir); + // Notify all clients that update has happened + broadcastMessage({ + type: 'hotUpdate', + }); + }); + // Start watching + logger.log('watching for changes'); + compiler.watch({}, (err, stats) => { + if (err) { + logger.error('compilation error', err); + return; + } + stats + ?.toString(this.config.stats) + .split('\n') + .forEach((line) => { + logger.log(line); + }); + }); + } +} diff --git a/tgui/packages/tgui-dev-server/winreg.js b/tgui/packages/tgui-dev-server/winreg.ts similarity index 69% rename from tgui/packages/tgui-dev-server/winreg.js rename to tgui/packages/tgui-dev-server/winreg.ts index b61fddc1a25..c3c0a85a0bf 100644 --- a/tgui/packages/tgui-dev-server/winreg.js +++ b/tgui/packages/tgui-dev-server/winreg.ts @@ -6,39 +6,47 @@ * @license MIT */ -import { exec } from 'child_process'; -import { promisify } from 'util'; -import { createLogger } from './logging.js'; +import { exec } from 'node:child_process'; +import { promisify } from 'node:util'; + +import { createLogger } from './logging'; const logger = createLogger('winreg'); -export const regQuery = async (path, key) => { +/** Query a registry key. */ +export async function regQuery( + path: string, + key: string, +): Promise { if (process.platform !== 'win32') { - return null; + return; } try { const command = `reg query "${path}" /v ${key}`; const { stdout } = await promisify(exec)(command); const keyPattern = ` ${key} `; const indexOfKey = stdout.indexOf(keyPattern); + if (indexOfKey === -1) { logger.error('could not find the registry key'); - return null; + return; } + const indexOfEol = stdout.indexOf('\r\n', indexOfKey); if (indexOfEol === -1) { logger.error('could not find the end of the line'); - return null; + return; } + const indexOfValue = stdout.indexOf(' ', indexOfKey + keyPattern.length); if (indexOfValue === -1) { logger.error('could not find the start of the key value'); - return null; + return; } - const value = stdout.substring(indexOfValue + 4, indexOfEol); - return value; + + return stdout.substring(indexOfValue + 4, indexOfEol); } catch (err) { logger.error(err); - return null; + return; } -}; +} diff --git a/tgui/packages/tgui-panel/Notifications.js b/tgui/packages/tgui-panel/Notifications.tsx similarity index 80% rename from tgui/packages/tgui-panel/Notifications.js rename to tgui/packages/tgui-panel/Notifications.tsx index 2b92995287f..9c87ca633a7 100644 --- a/tgui/packages/tgui-panel/Notifications.js +++ b/tgui/packages/tgui-panel/Notifications.tsx @@ -4,15 +4,17 @@ * @license MIT */ -import { Flex } from 'tgui/components'; +import { Flex } from 'tgui-core/components'; -export const Notifications = (props) => { +export function Notifications(props) { const { children } = props; - return
    {children}
    ; -}; -const NotificationsItem = (props) => { + return
    {children}
    ; +} + +function NotificationsItem(props) { const { rightSlot, children } = props; + return ( @@ -23,6 +25,6 @@ const NotificationsItem = (props) => { )} ); -}; +} Notifications.Item = NotificationsItem; diff --git a/tgui/packages/tgui-panel/Panel.js b/tgui/packages/tgui-panel/Panel.tsx similarity index 50% rename from tgui/packages/tgui-panel/Panel.js rename to tgui/packages/tgui-panel/Panel.tsx index 18976735de9..7ad6ebed3d0 100644 --- a/tgui/packages/tgui-panel/Panel.js +++ b/tgui/packages/tgui-panel/Panel.tsx @@ -4,38 +4,38 @@ * @license MIT */ -import { Button, Section, Stack } from 'tgui/components'; +import { useAtom, useAtomValue } from 'jotai'; import { Pane } from 'tgui/layouts'; -import { NowPlayingWidget, useAudio } from './audio'; -import { ChatPanel, ChatTabs } from './chat'; -import { useGame } from './game'; +import { Button, Section, Stack } from 'tgui-core/components'; +import { visibleAtom } from './audio/atoms'; +import { NowPlayingWidget } from './audio/NowPlayingWidget'; +import { ChatPanel } from './chat/ChatPanel'; +import { ChatTabs } from './chat/ChatTabs'; +import { useChatPersistence } from './chat/use-chat-persistence'; +import { gameAtom } from './game/atoms'; +import { useKeepAlive } from './game/use-keep-alive'; import { Notifications } from './Notifications'; -import { PingIndicator } from './ping'; +import { PingIndicator } from './ping/PingIndicator'; import { ReconnectButton } from './reconnect'; -import { SettingsPanel, useSettings } from './settings'; +import { settingsVisibleAtom } from './settings/atoms'; +import { SettingsPanel } from './settings/SettingsPanel'; +import { useSettings } from './settings/use-settings'; + +export function Panel(props) { + const [audioVisible, setAudioVisible] = useAtom(visibleAtom); + const game = useAtomValue(gameAtom); + const { settings } = useSettings(); + const [settingsVisible, setSettingsVisible] = useAtom(settingsVisibleAtom); + useChatPersistence(); + useKeepAlive(); -export const Panel = (props, context) => { - // IE8-10: Needs special treatment due to missing Flex support - if (Byond.IS_LTE_IE10) { - return ; - } - const audio = useAudio(context); - const settings = useSettings(context); - const game = useGame(context); - if (process.env.NODE_ENV !== 'production') { - const { useDebug, KitchenSink } = require('tgui/debug'); - const debug = useDebug(context); - if (debug.kitchenSink) { - return ; - } - } return ( - +
    - + @@ -44,42 +44,40 @@ export const Panel = (props, context) => {
    - {audio.visible && ( + {audioVisible && (
    )} - {settings.visible && ( + {settingsVisible && ( )}
    - + @@ -101,29 +99,4 @@ export const Panel = (props, context) => { ); -}; - -const HoboPanel = (props, context) => { - const settings = useSettings(context); - return ( - - - - {(settings.visible && ) || ( - - )} - - - ); -}; +} diff --git a/tgui/packages/tgui-panel/app.tsx b/tgui/packages/tgui-panel/app.tsx new file mode 100644 index 00000000000..efe198ae3a7 --- /dev/null +++ b/tgui/packages/tgui-panel/app.tsx @@ -0,0 +1,12 @@ +import { Provider } from 'jotai'; +import { store } from './events/store'; +import { Panel } from './Panel'; + +/** Just an expandable wrapper for setup shenanigans and providers */ +export function App() { + return ( + + + + ); +} diff --git a/tgui/packages/tgui-panel/audio/NowPlayingWidget.js b/tgui/packages/tgui-panel/audio/NowPlayingWidget.tsx similarity index 51% rename from tgui/packages/tgui-panel/audio/NowPlayingWidget.js rename to tgui/packages/tgui-panel/audio/NowPlayingWidget.tsx index af5380a7a5b..74f6f14c0c8 100644 --- a/tgui/packages/tgui-panel/audio/NowPlayingWidget.js +++ b/tgui/packages/tgui-panel/audio/NowPlayingWidget.tsx @@ -4,57 +4,62 @@ * @license MIT */ -import { toFixed } from 'common/math'; -import { useDispatch, useSelector } from 'common/redux'; -import { Button, Collapsible, Flex, Knob, Section } from 'tgui/components'; -import { useSettings } from '../settings'; -import { selectAudio } from './selectors'; +import { useAtomValue } from 'jotai'; +import { Button, Collapsible, Flex, Knob, Section } from 'tgui-core/components'; +import { toFixed } from 'tgui-core/math'; +import { useSettings } from '../settings/use-settings'; +import { metaAtom, playingAtom } from './atoms'; +import { player } from './handlers'; -export const NowPlayingWidget = (props, context) => { - const audio = useSelector(context, selectAudio), - dispatch = useDispatch(context), - settings = useSettings(context), - title = audio.meta?.title, - URL = audio.meta?.link, - Artist = audio.meta?.artist || 'Unknown Artist', - upload_date = audio.meta?.upload_date || 'Unknown Date', - album = audio.meta?.album || 'Unknown Album', - duration = audio.meta?.duration, - date = !isNaN(upload_date) - ? upload_date?.substring(0, 4) + - '-' + - upload_date?.substring(4, 6) + - '-' + - upload_date?.substring(6, 8) - : upload_date; +export function NowPlayingWidget(props) { + const { settings, updateSettings } = useSettings(); + const meta = useAtomValue(metaAtom); + const { + album = 'Unknown Album', + artist = 'Unknown Artist', + duration, + link, + title, + upload_date = 'Unknown Data', + } = meta || {}; + + const playing = useAtomValue(playingAtom); + + const date = !Number.isNaN(upload_date) + ? upload_date?.substring(0, 4) + + '-' + + upload_date?.substring(4, 6) + + '-' + + upload_date?.substring(6, 8) + : upload_date; return ( - {(audio.playing && ( + {playing ? ( { - +
    - {URL !== 'Song Link Hidden' && ( + {link !== 'Song Link Hidden' && ( - Url: {URL} + URL: {link} )} Duration: {duration} - {Artist !== 'Song Artist Hidden' && - Artist !== 'Unknown Artist' && ( + {artist !== 'Song Artist Hidden' && + artist !== 'Unknown Artist' && ( - Artist: {Artist} + Artist: {artist} )} {album !== 'Song Album Hidden' && album !== 'Unknown Album' && ( @@ -72,22 +77,14 @@ export const NowPlayingWidget = (props, context) => { } - )) || ( + ) : ( Nothing to play. )} - {audio.playing && ( + {playing && ( - - - - -
    - {MESSAGE_TYPES.filter( - (typeDef) => !typeDef.important && !typeDef.admin, - ).map((typeDef) => ( - - dispatch( - toggleAcceptedType({ - pageId: page.id, - type: typeDef.type, - }), - ) - } - > - {typeDef.name} - - ))} - - {MESSAGE_TYPES.filter( - (typeDef) => !typeDef.important && typeDef.admin, - ).map((typeDef) => ( - - dispatch( - toggleAcceptedType({ - pageId: page.id, - type: typeDef.type, - }), - ) - } - > - {typeDef.name} - - ))} - -
    -
    - ); -}; diff --git a/tgui/packages/tgui-panel/chat/ChatPageSettings.tsx b/tgui/packages/tgui-panel/chat/ChatPageSettings.tsx new file mode 100644 index 00000000000..5057cf22d40 --- /dev/null +++ b/tgui/packages/tgui-panel/chat/ChatPageSettings.tsx @@ -0,0 +1,113 @@ +/** + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +import { + Button, + Collapsible, + Divider, + Input, + Section, + Stack, +} from 'tgui-core/components'; +import { MESSAGE_TYPES } from './constants'; +import { useChatPages } from './use-chat-pages'; + +export function ChatPageSettings(props) { + const { + page, + moveChatLeft, + moveChatRight, + updateChatPage, + removeChatPage, + toggleAcceptedType, + } = useChatPages(); + + return ( +
    + + {!page.isMain && ( + + + + )} + + +
    + {MESSAGE_TYPES.filter( + (typeDef) => !typeDef.important && !typeDef.admin, + ).map((typeDef) => ( + toggleAcceptedType(typeDef.type)} + > + {typeDef.name} + + ))} + + {MESSAGE_TYPES.filter( + (typeDef) => !typeDef.important && typeDef.admin, + ).map((typeDef) => ( + toggleAcceptedType(typeDef.type)} + > + {typeDef.name} + + ))} + +
    +
    + ); +} diff --git a/tgui/packages/tgui-panel/chat/ChatPanel.js b/tgui/packages/tgui-panel/chat/ChatPanel.js deleted file mode 100644 index 1577e933fb4..00000000000 --- a/tgui/packages/tgui-panel/chat/ChatPanel.js +++ /dev/null @@ -1,74 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import { shallowDiffers } from 'common/react'; -import { Component, createRef } from 'inferno'; -import { Button } from 'tgui/components'; -import { chatRenderer } from './renderer'; - -export class ChatPanel extends Component { - constructor() { - super(); - this.ref = createRef(); - this.state = { - scrollTracking: true, - }; - this.handleScrollTrackingChange = (value) => - this.setState({ - scrollTracking: value, - }); - } - - componentDidMount() { - chatRenderer.mount(this.ref.current); - chatRenderer.events.on( - 'scrollTrackingChanged', - this.handleScrollTrackingChange, - ); - this.componentDidUpdate(); - } - - componentWillUnmount() { - chatRenderer.events.off( - 'scrollTrackingChanged', - this.handleScrollTrackingChange, - ); - } - - componentDidUpdate(prevProps) { - requestAnimationFrame(() => { - chatRenderer.ensureScrollTracking(); - }); - const shouldUpdateStyle = - !prevProps || shallowDiffers(this.props, prevProps); - if (shouldUpdateStyle) { - chatRenderer.assignStyle({ - width: '100%', - 'white-space': 'pre-wrap', - 'font-size': this.props.fontSize, - 'line-height': this.props.lineHeight, - }); - } - } - - render() { - const { scrollTracking } = this.state; - return ( - <> -
    - {!scrollTracking && ( - - )} - - ); - } -} diff --git a/tgui/packages/tgui-panel/chat/ChatPanel.tsx b/tgui/packages/tgui-panel/chat/ChatPanel.tsx new file mode 100644 index 00000000000..17171ddf81b --- /dev/null +++ b/tgui/packages/tgui-panel/chat/ChatPanel.tsx @@ -0,0 +1,76 @@ +/** + * @file + * @copyright 2020 Aleksej Komarov + * @license MIT + */ + +import { useAtom, useAtomValue } from 'jotai'; +import { useEffect, useRef } from 'react'; +import { Button } from 'tgui-core/components'; +import { + chatPagesRecordAtom, + currentPageIdAtom, + scrollTrackingAtom, +} from './atom'; +import { chatRenderer } from './renderer'; +import type { Page } from './types'; + +type Props = { + fontSize?: string; + lineHeight: string | number; +}; + +export function ChatPanel(props: Props) { + const ref = useRef(null); + const scrollTracking = useAtomValue(scrollTrackingAtom); + // Page stuff + const currentPageId = useAtomValue(currentPageIdAtom); + const [pagesRecord, setPagesRecord] = useAtom(chatPagesRecordAtom); + + /** Mounts the renderer */ + useEffect(() => { + if (ref.current) { + chatRenderer.mount(ref.current); + } + }, []); + + /** Resets unread count when scroll tracking is enabled */ + useEffect(() => { + if (scrollTracking) { + const draft: Page = { + ...pagesRecord[currentPageId], + unreadCount: 0, + }; + + setPagesRecord({ + ...pagesRecord, + [currentPageId]: draft, + }); + } + }, [scrollTracking]); + + /** Updates the style of the chat panel */ + useEffect(() => { + chatRenderer.assignStyle({ + width: '100%', + 'white-space': 'pre-wrap', + 'font-size': props.fontSize, + 'line-height': props.lineHeight, + }); + }, [props.fontSize, props.lineHeight]); + + return ( + <> +
    + {!scrollTracking && ( + + )} + + ); +} diff --git a/tgui/packages/tgui-panel/chat/ChatTabs.js b/tgui/packages/tgui-panel/chat/ChatTabs.js deleted file mode 100644 index 601cd111589..00000000000 --- a/tgui/packages/tgui-panel/chat/ChatTabs.js +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import { useDispatch, useSelector } from 'common/redux'; -import { Box, Tabs, Flex, Button } from 'tgui/components'; -import { changeChatPage, addChatPage } from './actions'; -import { selectChatPages, selectCurrentChatPage } from './selectors'; -import { openChatSettings } from '../settings/actions'; - -const UnreadCountWidget = ({ value }) => ( - - {Math.min(value, 99)} - -); - -export const ChatTabs = (props, context) => { - const pages = useSelector(context, selectChatPages); - const currentPage = useSelector(context, selectCurrentChatPage); - const dispatch = useDispatch(context); - return ( - - - - {pages.map((page) => ( - 0 && ( - - ) - } - onClick={() => - dispatch( - changeChatPage({ - pageId: page.id, - }), - ) - } - > - {page.name} - - ))} - - - - + /> ); -}; +} diff --git a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx new file mode 100644 index 00000000000..940747947b4 --- /dev/null +++ b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx @@ -0,0 +1,222 @@ +import { useState } from 'react'; +import { + Button, + Collapsible, + Divider, + Input, + LabeledList, + Section, + Slider, + Stack, +} from 'tgui-core/components'; +import { toFixed } from 'tgui-core/math'; +import { capitalize } from 'tgui-core/string'; +import { + MAX_CONFIGURABLE_MESSAGES, + MIN_CONFIGURABLE_MESSAGES, +} from '../chat/constants'; +import { chatRenderer } from '../chat/renderer'; +import { FONTS, THEMES } from './constants'; +import { resetPaneSplitters, setEditPaneSplitters } from './scaling'; +import { exportChatSettings, importChatSettings } from './settingsImExport'; +import { useSettings } from './use-settings'; + +export function SettingsGeneral(props) { + const { settings, updateSettings } = useSettings(); + const [freeFont, setFreeFont] = useState(false); + + const [editingPanes, setEditingPanes] = useState(false); + + return ( +
    + + + {THEMES.map((THEME) => ( + + ))} + + + + + + + + + + + + + + {!freeFont ? ( + { + setFreeFont(!freeFont); + }} + > + Custom font + + } + > + {FONTS.map((FONT) => ( + + ))} + + ) : ( + + + updateSettings({ + fontFamily: value, + }) + } + /> + + + )} + + + + + + toFixed(value)} + onChange={(_, value) => updateSettings({ fontSize: value })} + /> + + + + + toFixed(value, 2)} + onChange={(_, value) => + updateSettings({ + lineHeight: value, + }) + } + /> + + + toFixed(value)} + onChange={(_, value) => + updateSettings({ + maxMessages: value, + }) + } + /> + + + + + + + + + + Import settings + + + + + + + chatRenderer.clearChat()} + > + Clear chat + + + +
    + ); +} diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.js b/tgui/packages/tgui-panel/settings/SettingsPanel.js deleted file mode 100644 index 9c49a6c6b94..00000000000 --- a/tgui/packages/tgui-panel/settings/SettingsPanel.js +++ /dev/null @@ -1,451 +0,0 @@ -/** - * @file - * @copyright 2020 Aleksej Komarov - * @license MIT - */ - -import { toFixed } from 'common/math'; -import { useLocalState } from 'tgui/backend'; -import { useDispatch, useSelector } from 'common/redux'; -import { - Box, - Button, - ColorBox, - Divider, - Dropdown, - Flex, - Input, - LabeledList, - NumberInput, - Section, - Stack, - Tabs, - TextArea, -} from 'tgui/components'; -import { ChatPageSettings } from '../chat'; -import { - rebuildChat, - saveChatToDisk, - clearChatMessages, -} from '../chat/actions'; -import { THEMES } from '../themes'; -import { - changeSettingsTab, - updateSettings, - addHighlightSetting, - removeHighlightSetting, - updateHighlightSetting, -} from './actions'; -import { SETTINGS_TABS, FONTS, MAX_HIGHLIGHT_SETTINGS } from './constants'; -import { resetPaneSplitters, setEditPaneSplitters } from './scaling'; -import { - selectActiveTab, - selectSettings, - selectHighlightSettings, - selectHighlightSettingById, -} from './selectors'; -import { IMPL_IFRAME_INDEXED_DB, storage } from 'common/storage'; - -export const SettingsPanel = (props, context) => { - const activeTab = useSelector(context, selectActiveTab); - const dispatch = useDispatch(context); - return ( - - -
    - - {SETTINGS_TABS.map((tab) => ( - - dispatch( - changeSettingsTab({ - tabId: tab.id, - }), - ) - } - > - {tab.name} - - ))} - -
    -     - - {activeTab === 'general' && } - {activeTab === 'chatPage' && } - {activeTab === 'textHighlight' && } - -     - ); -}; - -export const SettingsGeneral = (props, context) => { - const { theme, fontFamily, fontSize, lineHeight, maxMessages } = useSelector( - context, - selectSettings, - ); - const dispatch = useDispatch(context); - const [freeFont, setFreeFont] = useLocalState(context, 'freeFont', false); - const [editingPanes, setEditingPanes] = useLocalState( - context, - 'uiScaling', - false, - ); - return ( -
    - - - - dispatch( - updateSettings({ - theme: value, - }), - ) - } - /> - - - - - - - - - - - - - - - {(!freeFont && ( - - dispatch( - updateSettings({ - fontFamily: value, - }), - ) - } - /> - )) || ( - - dispatch( - updateSettings({ - fontFamily: value, - }), - ) - } - /> - )} - - - - -
    - ); -}; - -const TextHighlightSettings = (props, context) => { - const highlightSettings = useSelector(context, selectHighlightSettings); - const settings = useSelector(context, selectSettings); - const dispatch = useDispatch(context); - return ( -
    -
    - - {highlightSettings.map((id, i) => ( - - ))} - {highlightSettings.length < MAX_HIGHLIGHT_SETTINGS && ( - -
    - - - - - Can freeze the chat for a while. - - -
    - ); -}; - -const TextHighlightSetting = (props, context) => { - const { id, ...rest } = props; - const highlightSettingById = useSelector(context, selectHighlightSettingById); - const dispatch = useDispatch(context); - const { - highlightColor, - highlightText, - highlightWholeMessage, - backgroundHighlightColor, - backgroundHighlightOpacity, - matchWord, - matchCase, - } = highlightSettingById[id]; - return ( - - - -
    + + ); +} diff --git a/tgui/packages/tgui/stories/Collapsible.stories.js b/tgui/packages/tgui/stories/Collapsible.stories.js index eace08607ba..55e9fb0aac6 100644 --- a/tgui/packages/tgui/stories/Collapsible.stories.js +++ b/tgui/packages/tgui/stories/Collapsible.stories.js @@ -4,7 +4,7 @@ * @license MIT */ -import { Button, Collapsible, Section } from '../components'; +import { Button, Collapsible, Section } from 'tgui-core/components'; import { BoxWithSampleText } from './common'; export const meta = { @@ -12,7 +12,7 @@ export const meta = { render: () => , }; -const Story = (props, context) => { +const Story = (props) => { return (
    }> diff --git a/tgui/packages/tgui/stories/Collapsible.stories.tsx b/tgui/packages/tgui/stories/Collapsible.stories.tsx new file mode 100644 index 00000000000..24689697a1a --- /dev/null +++ b/tgui/packages/tgui/stories/Collapsible.stories.tsx @@ -0,0 +1,24 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { Button, Collapsible, Section } from 'tgui-core/components'; + +import { BoxWithSampleText } from './common'; + +export const meta = { + title: 'Collapsible', + render: () => , +}; + +function Story() { + return ( +
    + }> + + +
    + ); +} diff --git a/tgui/packages/tgui/stories/Flex.stories.js b/tgui/packages/tgui/stories/Flex.stories.js index 64dc79edfc4..73e5c755177 100644 --- a/tgui/packages/tgui/stories/Flex.stories.js +++ b/tgui/packages/tgui/stories/Flex.stories.js @@ -4,15 +4,15 @@ * @license MIT */ +import { Button, Flex, Section } from 'tgui-core/components'; import { useLocalState } from '../backend'; -import { Button, Flex, Section } from '../components'; export const meta = { title: 'Flex & Sections', render: () => , }; -const Story = (props, context) => { +const Story = (props) => { const [grow, setGrow] = useLocalState(context, 'fs_grow', 1); const [direction, setDirection] = useLocalState( context, diff --git a/tgui/packages/tgui/stories/Flex.stories.tsx b/tgui/packages/tgui/stories/Flex.stories.tsx new file mode 100644 index 00000000000..86333b8dc92 --- /dev/null +++ b/tgui/packages/tgui/stories/Flex.stories.tsx @@ -0,0 +1,68 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { useState } from 'react'; +import { Button, Flex, Section } from 'tgui-core/components'; + +export const meta = { + title: 'Flex & Sections', + render: () => , +}; + +function Story() { + const [grow, setGrow] = useState(1); + const [direction, setDirection] = useState('column'); + const [fill, setFill] = useState(true); + const [hasTitle, setHasTitle] = useState(true); + + return ( + + +
    + + + + +
    +     + + + +
    + Content +
    +     + +
    + Content +
    +     +     +     +     + ); +} diff --git a/tgui/packages/tgui/stories/Input.stories.js b/tgui/packages/tgui/stories/Input.stories.js index 66fcd602b32..692bf008337 100644 --- a/tgui/packages/tgui/stories/Input.stories.js +++ b/tgui/packages/tgui/stories/Input.stories.js @@ -4,25 +4,23 @@ * @license MIT */ -import { useLocalState } from '../backend'; import { Box, DraggableControl, Icon, Input, - Knob, LabeledList, NumberInput, Section, - Slider, -} from '../components'; +} from 'tgui-core/components'; +import { useLocalState } from '../backend'; export const meta = { title: 'Input', render: () => , }; -const Story = (props, context) => { +const Story = (props) => { const [number, setNumber] = useLocalState(context, 'number', 0); const [text, setText] = useLocalState(context, 'text', 'Sample text'); return ( @@ -46,52 +44,6 @@ const Story = (props, context) => { onChange={(e, value) => setNumber(value)} /> - - setNumber(value)} - /> - - - setNumber(value)} - /> - - - setNumber(value)} - /> - setNumber(value)} - /> - { dragMatrix={[0, -1]} step={1} stepPixelSize={5} - onDrag={(e, value) => setNumber(value)} + onChange={(e, value) => setNumber(value)} > {(control) => ( diff --git a/tgui/packages/tgui/stories/Input.stories.tsx b/tgui/packages/tgui/stories/Input.stories.tsx new file mode 100644 index 00000000000..d162c0119cf --- /dev/null +++ b/tgui/packages/tgui/stories/Input.stories.tsx @@ -0,0 +1,72 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { + Box, + DraggableControl, + Icon, + Input, + LabeledList, + NumberInput, + Section, +} from 'tgui-core/components'; +import { useLocalState } from '../backend'; + +export const meta = { + title: 'Input', + render: () => , +}; + +const Story = (props) => { + const [string, setNumber] = useLocalState('string', 0); + const [text, setText] = useLocalState('text', 'Sample text'); + return ( +
    + + + setText(value)} /> + + + setNumber(value)} + /> + + + + setNumber(value)} + > + {(control) => ( + + + {control.inputElement} + + )} + + + + +
    + ); +}; diff --git a/tgui/packages/tgui/stories/LabeledList.stories.js b/tgui/packages/tgui/stories/LabeledList.stories.js index 2a94bb9c74b..c85f13313e9 100644 --- a/tgui/packages/tgui/stories/LabeledList.stories.js +++ b/tgui/packages/tgui/stories/LabeledList.stories.js @@ -4,14 +4,14 @@ * @license MIT */ -import { Button, LabeledList } from '../components'; +import { Button, LabeledList } from 'tgui-core/components'; export const meta = { title: 'LabeledList', render: () => , }; -const Story = (props, context) => { +const Story = (props) => { return ( <> diff --git a/tgui/packages/tgui/stories/LabeledList.stories.tsx b/tgui/packages/tgui/stories/LabeledList.stories.tsx new file mode 100644 index 00000000000..5dbfa8feb2a --- /dev/null +++ b/tgui/packages/tgui/stories/LabeledList.stories.tsx @@ -0,0 +1,73 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { Button, LabeledList } from 'tgui-core/components'; + +export const meta = { + title: 'LabeledList', + render: () => , +}; + +function Story() { + return ( + <> + + Entry 1 + Nodes as labels:}> + Entry 2 + + + Entry 3 + + + Entry 4 + + Test} label="Buttons prop"> + Entry 5 + + + + Entry 6 + + + Entry 7 + + + Entry 8 + + +
    +
    +
    + + + Entry 1 + + + Entry 2 + + + Entry 3 + + +
    +
    +
    + + + Entry 1 + + + + ); +} diff --git a/tgui/packages/tgui/stories/Popper.stories.js b/tgui/packages/tgui/stories/Popper.stories.js index 5a984ac6fea..548214ef46a 100644 --- a/tgui/packages/tgui/stories/Popper.stories.js +++ b/tgui/packages/tgui/stories/Popper.stories.js @@ -1,4 +1,4 @@ -import { Box, Popper } from '../components'; +import { Box, Popper } from 'tgui-core/components'; export const meta = { title: 'Popper', diff --git a/tgui/packages/tgui/stories/ProgressBar.stories.js b/tgui/packages/tgui/stories/ProgressBar.stories.js index a05f6b2e85c..4da721cd4bc 100644 --- a/tgui/packages/tgui/stories/ProgressBar.stories.js +++ b/tgui/packages/tgui/stories/ProgressBar.stories.js @@ -4,7 +4,6 @@ * @license MIT */ -import { useLocalState } from '../backend'; import { Box, Button, @@ -12,14 +11,15 @@ import { LabeledList, ProgressBar, Section, -} from '../components'; +} from 'tgui-core/components'; +import { useLocalState } from '../backend'; export const meta = { title: 'ProgressBar', render: () => , }; -const Story = (props, context) => { +const Story = (props) => { const [progress, setProgress] = useLocalState(context, 'progress', 0.5); const [color, setColor] = useLocalState(context, 'color', ''); diff --git a/tgui/packages/tgui/stories/ProgressBar.stories.tsx b/tgui/packages/tgui/stories/ProgressBar.stories.tsx new file mode 100644 index 00000000000..8e6314b421b --- /dev/null +++ b/tgui/packages/tgui/stories/ProgressBar.stories.tsx @@ -0,0 +1,54 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { useState } from 'react'; +import { + Box, + Button, + Input, + LabeledList, + ProgressBar, + Section, +} from 'tgui-core/components'; + +export const meta = { + title: 'ProgressBar', + render: () => , +}; + +function Story() { + const [progress, setProgress] = useState(0.5); + const [color, setColor] = useState(''); + + const color_data = color + ? { color: color } + : { + ranges: { + good: [0.5, Infinity], + bad: [-Infinity, 0.1], + average: [0, 0.5], + } as Record, + }; + + return ( +
    + + Value: {Number(progress).toFixed(1)} + + + + + + + + + + + + +
    + ); +} diff --git a/tgui/packages/tgui/stories/Stack.stories.js b/tgui/packages/tgui/stories/Stack.stories.js index 09d8066133d..0d84e6e9bb8 100644 --- a/tgui/packages/tgui/stories/Stack.stories.js +++ b/tgui/packages/tgui/stories/Stack.stories.js @@ -4,7 +4,7 @@ * @license MIT */ -import { Box, Section, Stack } from '../components'; +import { Box, Section, Stack } from 'tgui-core/components'; export const meta = { title: 'Stack', @@ -29,7 +29,7 @@ const SmallStackItems = () => ( ); -const Story = (props, context) => { +const Story = (props) => { return (
    diff --git a/tgui/packages/tgui/stories/Stack.stories.tsx b/tgui/packages/tgui/stories/Stack.stories.tsx new file mode 100644 index 00000000000..a92416250f1 --- /dev/null +++ b/tgui/packages/tgui/stories/Stack.stories.tsx @@ -0,0 +1,59 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { Box, Section, Stack } from 'tgui-core/components'; + +export const meta = { + title: 'Stack', + render: () => , +}; + +function Filler() { + return ( + + A + + ); +} + +function SmallStackItems() { + return ( + <> + + + + + + + + + ); +} + +function Story() { + return ( +
    + + + + + + + + + + + + + + + + + + +
    + ); +} diff --git a/tgui/packages/tgui/stories/Storage.stories.js b/tgui/packages/tgui/stories/Storage.stories.js index 3172a097d24..b667e88736c 100644 --- a/tgui/packages/tgui/stories/Storage.stories.js +++ b/tgui/packages/tgui/stories/Storage.stories.js @@ -5,7 +5,7 @@ */ import { storage } from 'common/storage'; -import { Button, LabeledList, NoticeBox, Section } from '../components'; +import { Button, LabeledList, NoticeBox, Section } from 'tgui-core/components'; import { formatSiUnit } from '../format'; export const meta = { @@ -13,7 +13,7 @@ export const meta = { render: () => , }; -const Story = (props, context) => { +const Story = (props) => { if (!window.localStorage) { return Local storage is not available.; } diff --git a/tgui/packages/tgui/stories/Storage.stories.tsx b/tgui/packages/tgui/stories/Storage.stories.tsx new file mode 100644 index 00000000000..c5234a1e31d --- /dev/null +++ b/tgui/packages/tgui/stories/Storage.stories.tsx @@ -0,0 +1,42 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { storage } from 'common/storage'; +import { Button, LabeledList, NoticeBox, Section } from 'tgui-core/components'; + +export const meta = { + title: 'Storage', + render: () => , +}; + +const Story = (props) => { + if (!window.localStorage) { + return Local storage is not available.; + } + + return ( +
    { + localStorage.clear(); + storage.clear(); + }} + > + Clear + + } + > + + + {localStorage.length} + + +
    + ); +}; diff --git a/tgui/packages/tgui/stories/Tabs.stories.js b/tgui/packages/tgui/stories/Tabs.stories.js index b2b51c3ea74..177354a8b3b 100644 --- a/tgui/packages/tgui/stories/Tabs.stories.js +++ b/tgui/packages/tgui/stories/Tabs.stories.js @@ -4,8 +4,8 @@ * @license MIT */ +import { Button, Section, Tabs } from 'tgui-core/components'; import { useLocalState } from '../backend'; -import { Button, Section, Tabs } from '../components'; export const meta = { title: 'Tabs', @@ -14,7 +14,7 @@ export const meta = { const TAB_RANGE = ['Tab #1', 'Tab #2', 'Tab #3', 'Tab #4']; -const Story = (props, context) => { +const Story = (props) => { const [tabProps, setTabProps] = useLocalState(context, 'tabProps', {}); return ( <> @@ -101,7 +101,7 @@ const Story = (props, context) => { ); }; -const TabsPrefab = (props, context) => { +const TabsPrefab = (props) => { const [tabIndex, setTabIndex] = useLocalState(context, 'tabIndex', 0); const [tabProps] = useLocalState(context, 'tabProps', {}); return ( diff --git a/tgui/packages/tgui/stories/Tabs.stories.tsx b/tgui/packages/tgui/stories/Tabs.stories.tsx new file mode 100644 index 00000000000..507a6c0b643 --- /dev/null +++ b/tgui/packages/tgui/stories/Tabs.stories.tsx @@ -0,0 +1,152 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { useState } from 'react'; +import { Button, Section, Tabs } from 'tgui-core/components'; + +export const meta = { + title: 'Tabs', + render: () => , +}; + +const TAB_RANGE = ['Tab #1', 'Tab #2', 'Tab #3', 'Tab #4'] as const; + +type TabProps = Partial<{ + centered: boolean; + fluid: boolean; + icon: boolean; + leftSlot: boolean; + rightSlot: boolean; + vertical: boolean; +}>; + +function Story() { + const [tabProps, setTabProps] = useState({}); + + return ( + <> +
    + + setTabProps({ + ...tabProps, + vertical: !tabProps.vertical, + }) + } + > + Vertical + + + setTabProps({ + ...tabProps, + leftSlot: !tabProps.leftSlot, + }) + } + > + leftSlot + + + setTabProps({ + ...tabProps, + rightSlot: !tabProps.rightSlot, + }) + } + > + rightSlot + + + setTabProps({ + ...tabProps, + icon: !tabProps.icon, + }) + } + > + icon + + + setTabProps({ + ...tabProps, + fluid: !tabProps.fluid, + }) + } + > + fluid + + + setTabProps({ + ...tabProps, + centered: !tabProps.centered, + }) + } + > + centered + +
    +
    + +
    +
    + + Some text +
    +
    + Section-less tabs appear the same as tabs in a fitted section: +
    + + + ); +} + +function TabsPrefab() { + const [tabIndex, setTabIndex] = useState(0); + const [tabProps] = useState({}); + + return ( + + {TAB_RANGE.map((text, i) => ( + + ) + } + rightSlot={ + tabProps.rightSlot && ( + + + + {positions.map((position) => ( + + ))} + +
    + ); +} diff --git a/tgui/packages/tgui/stories/common.js b/tgui/packages/tgui/stories/common.js index 08703e32d2d..e30dd817b2b 100644 --- a/tgui/packages/tgui/stories/common.js +++ b/tgui/packages/tgui/stories/common.js @@ -4,7 +4,7 @@ * @license MIT */ -import { Box } from '../components'; +import { Box } from 'tgui-core/components'; export const BoxWithSampleText = (props) => { return ( diff --git a/tgui/packages/tgui/stories/common.tsx b/tgui/packages/tgui/stories/common.tsx new file mode 100644 index 00000000000..3810dc39272 --- /dev/null +++ b/tgui/packages/tgui/stories/common.tsx @@ -0,0 +1,19 @@ +/** + * @file + * @copyright 2021 Aleksej Komarov + * @license MIT + */ + +import { Box } from 'tgui-core/components'; + +export function BoxWithSampleText(props) { + return ( + + Jackdaws love my big sphinx of quartz. + + The wide electrification of the southern provinces will give a powerful + impetus to the growth of agriculture. + + + ); +} diff --git a/tgui/packages/tgui/styles/assets/bg-deforest.svg b/tgui/packages/tgui/styles/assets/bg-deforest.svg new file mode 100644 index 00000000000..018c2e984bd --- /dev/null +++ b/tgui/packages/tgui/styles/assets/bg-deforest.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/tgui/packages/tgui/styles/atomic/candystripe.scss b/tgui/packages/tgui/styles/atomic/candystripe.scss deleted file mode 100644 index 30159bf99c3..00000000000 --- a/tgui/packages/tgui/styles/atomic/candystripe.scss +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -.candystripe:nth-child(odd) { - background-color: rgba(0, 0, 0, 0.25); -} diff --git a/tgui/packages/tgui/styles/atomic/centered-image.scss b/tgui/packages/tgui/styles/atomic/centered-image.scss deleted file mode 100644 index cce5bfdf2c1..00000000000 --- a/tgui/packages/tgui/styles/atomic/centered-image.scss +++ /dev/null @@ -1,7 +0,0 @@ -.centered-image { - position: absolute; - height: 100%; - left: 50%; - top: 50%; - transform: translateX(-50%) translateY(-50%) scale(0.8); -} diff --git a/tgui/packages/tgui/styles/atomic/color.scss b/tgui/packages/tgui/styles/atomic/color.scss deleted file mode 100644 index e2563f86fa5..00000000000 --- a/tgui/packages/tgui/styles/atomic/color.scss +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../colors.scss'; - -$fg-map: colors.$fg-map !default; -$bg-map: colors.$bg-map !default; - -@each $color-name, $color-value in $fg-map { - .color-#{$color-name} { - color: $color-value !important; - } -} - -@each $color-name, $color-value in $bg-map { - .color-bg-#{$color-name} { - background-color: $color-value !important; - } -} diff --git a/tgui/packages/tgui/styles/atomic/debug-layout.scss b/tgui/packages/tgui/styles/atomic/debug-layout.scss deleted file mode 100644 index d015185927a..00000000000 --- a/tgui/packages/tgui/styles/atomic/debug-layout.scss +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -.debug-layout, -.debug-layout *:not(g):not(path) { - color: rgba(255, 255, 255, 0.9) !important; - background: transparent !important; - outline: 1px solid rgba(255, 255, 255, 0.5) !important; - box-shadow: none !important; - filter: none !important; - - &:hover { - outline-color: rgba(255, 255, 255, 0.8) !important; - } -} diff --git a/tgui/packages/tgui/styles/atomic/fit-text.scss b/tgui/packages/tgui/styles/atomic/fit-text.scss deleted file mode 100644 index 1d49e13c8e3..00000000000 --- a/tgui/packages/tgui/styles/atomic/fit-text.scss +++ /dev/null @@ -1,14 +0,0 @@ -$mqIterations: 19; -@mixin fontResize($iterations) { - $i: 1; - @while $i <= $iterations { - @media all and (min-width: 100px * $i) { - .fit-text { - font-size: 0.1em * $i; - } - } - $i: $i + 1; - } -} - -@include fontResize($mqIterations); diff --git a/tgui/packages/tgui/styles/atomic/links.scss b/tgui/packages/tgui/styles/atomic/links.scss deleted file mode 100644 index 8754c3bc2e1..00000000000 --- a/tgui/packages/tgui/styles/atomic/links.scss +++ /dev/null @@ -1,12 +0,0 @@ -@use '../colors.scss'; - -a { - &:link, - &:visited { - color: colors.$blue; - } - &:hover, - &:active { - color: colors.$primary; - } -} diff --git a/tgui/packages/tgui/styles/atomic/outline.scss b/tgui/packages/tgui/styles/atomic/outline.scss deleted file mode 100644 index a91625de9ca..00000000000 --- a/tgui/packages/tgui/styles/atomic/outline.scss +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../colors.scss'; - -.outline-dotted { - outline-style: dotted !important; -} - -.outline-dashed { - outline-style: dashed !important; -} - -.outline-solid { - outline-style: solid !important; -} - -.outline-double { - outline-style: double !important; -} - -.outline-groove { - outline-style: groove !important; -} - -.outline-ridge { - outline-style: ridge !important; -} - -.outline-inset { - outline-style: inset !important; -} - -.outline-outset { - outline-style: outset !important; -} - -$fg-map: colors.$fg-map !default; -$bg-map: colors.$bg-map !default; - -@each $color-name, $color-value in $fg-map { - .outline-color-#{$color-name} { - outline: 0.167rem solid $color-value !important; - } -} diff --git a/tgui/packages/tgui/styles/atomic/text.scss b/tgui/packages/tgui/styles/atomic/text.scss deleted file mode 100644 index 4889041e6af..00000000000 --- a/tgui/packages/tgui/styles/atomic/text.scss +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -.text-left { - text-align: left; -} - -.text-center { - text-align: center; -} - -.text-right { - text-align: right; -} - -.text-baseline { - text-align: baseline; -} - -.text-justify { - text-align: justify; -} - -.text-nowrap { - white-space: nowrap; -} - -.text-pre { - white-space: pre; -} - -.text-bold { - font-weight: bold; -} - -.text-italic { - font-style: italic; -} - -.text-underline { - text-decoration: underline; -} diff --git a/tgui/packages/tgui/styles/colors.scss b/tgui/packages/tgui/styles/colors.scss index 1521c1e5f6f..1efccad5269 100644 --- a/tgui/packages/tgui/styles/colors.scss +++ b/tgui/packages/tgui/styles/colors.scss @@ -22,7 +22,9 @@ $purple: #a333c8 !default; $pink: #e03997 !default; $brown: #a5673f !default; $grey: #767676 !default; +$gray: $grey !default; $light-grey: #aaa !default; +$light-gray: $light-grey !default; $silver: #c0c0c0 !default; $crimson: #dc143c !default; $cyan: #00ffff !default; @@ -41,15 +43,22 @@ $bg-lightness: -15% !default; $fg-lightness: 10% !default; @function bg($color) { - @return color.scale($color, $lightness: $bg-lightness); + @if meta.type-of($color) == 'color' { + @return color.scale($color, $lightness: $bg-lightness); + } + + @return hsl(from $color h s calc(l - var(--adjust-color))); } @function fg($color) { - @return color.scale($color, $lightness: $fg-lightness); + @if meta.type-of($color) == 'color' { + @return color.scale($color, $lightness: $fg-lightness); + } + + @return hsl(from $color h s calc(l + var(--adjust-color))); } // Mappings of color names - $_gen_map: ( 'black': $black, 'white': $white, @@ -65,7 +74,9 @@ $_gen_map: ( 'pink': $pink, 'brown': $brown, 'grey': $grey, + 'gray': $gray, 'light-grey': $light-grey, + 'light-gray': $light-gray, 'silver': $silver, 'crimson': $crimson, 'cyan': $cyan, @@ -78,23 +89,38 @@ $_gen_map: ( 'label': $label, ); -// Foreground color names for which to generate a color map +// Modern tgui-core atomic styles +$color-map-keys: map.keys($_gen_map) !default; +$color-map: (); +@each $color-name in $color-map-keys { + $color-map: map.merge( + $color-map, + ( + $color-name: map.get($_gen_map, $color-name), + ) + ); +} + +// Aurora theme styles configure these maps directly. $fg-map-keys: map.keys($_gen_map) !default; -// Background color names for which to generate a color map $bg-map-keys: map.keys($_gen_map) !default; $fg-map: (); @each $color-name in $fg-map-keys { - // prettier-ignore - $fg-map: map-merge($fg-map, ( - $color-name: fg(map.get($_gen_map, $color-name)), - )); + $fg-map: map.merge( + $fg-map, + ( + $color-name: fg(map.get($_gen_map, $color-name)), + ) + ); } $bg-map: (); @each $color-name in $bg-map-keys { - // prettier-ignore - $bg-map: map-merge($bg-map, ( - $color-name: bg(map.get($_gen_map, $color-name)), - )); + $bg-map: map.merge( + $bg-map, + ( + $color-name: bg(map.get($_gen_map, $color-name)), + ) + ); } diff --git a/tgui/packages/tgui/styles/components/BlockQuote.scss b/tgui/packages/tgui/styles/components/BlockQuote.scss deleted file mode 100644 index 4e54030e5b6..00000000000 --- a/tgui/packages/tgui/styles/components/BlockQuote.scss +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../colors.scss'; - -$color-default: colors.fg(colors.$label) !default; - -.BlockQuote { - color: $color-default; - border-left: base.em(2px) solid $color-default; - padding-left: 0.5em; - margin-bottom: 0.5em; - - &:last-child { - margin-bottom: 0; - } -} diff --git a/tgui/packages/tgui/styles/components/Button.scss b/tgui/packages/tgui/styles/components/Button.scss deleted file mode 100644 index f559cc26359..00000000000 --- a/tgui/packages/tgui/styles/components/Button.scss +++ /dev/null @@ -1,172 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../colors.scss'; -@use '../functions.scss' as *; - -$color-default: colors.bg(colors.$primary) !default; -$color-disabled: #999999 !default; -$color-selected: colors.bg(colors.$green) !default; -$color-caution: colors.bg(colors.$yellow) !default; -$color-danger: colors.bg(colors.$red) !default; -$color-transparent-text: rgba(255, 255, 255, 0.5) !default; -$border-radius: base.$border-radius !default; -$bg-map: colors.$bg-map !default; - -@mixin button-color($color) { - // Adapt text color to background luminance to ensure high contast - $luminance: luminance($color); - $text-color: if($luminance > 0.4, rgba(0, 0, 0, 1), rgba(255, 255, 255, 1)); - - transition: - color 50ms, - background-color 50ms; - background-color: $color; - color: $text-color; - - &:hover { - transition: - color 0ms, - background-color 0ms; - } - - &:focus { - transition: - color 100ms, - background-color 100ms; - } - - &:hover, - &:focus { - background-color: lighten($color, 30%); - color: $text-color; - } -} - -.Button { - position: relative; - display: inline-block; - line-height: 1.667em; - padding: 0 0.5em; - margin-right: base.em(2px); - white-space: nowrap; - outline: 0; - border-radius: $border-radius; - margin-bottom: base.em(2px); - // Disable selection in buttons - user-select: none; - -ms-user-select: none; - - &:last-child { - margin-right: 0; - margin-bottom: 0; - } - - .fa, - .fas, - .far { - margin-left: -0.25em; - margin-right: -0.25em; - min-width: 1.333em; - text-align: center; - } -} - -.Button--hasContent { - // Add a margin to the icon to keep it separate from the text - .fa, - .fas, - .far { - margin-right: 0.25em; - } -} - -.Button--hasContent.Button--iconPosition--right { - .fa, - .fas, - .far { - margin-right: 0px; - margin-left: 3px; - } -} - -.Button--ellipsis { - overflow: hidden; - text-overflow: ellipsis; -} - -.Button--fluid { - display: block; - margin-left: 0; - margin-right: 0; -} - -.Button--circular { - border-radius: 50%; -} - -.Button--compact { - padding: 0 0.25em; - line-height: 1.333em; -} - -@each $color-name, $color-value in $bg-map { - .Button--color--#{$color-name} { - @include button-color($color-value); - } -} - -.Button--color--default { - @include button-color($color-default); -} - -.Button--color--caution { - @include button-color($color-caution); -} - -.Button--color--danger { - @include button-color($color-danger); -} - -.Button--color--transparent { - @include button-color(base.$color-bg); - background-color: rgba(base.$color-bg, 0); - color: $color-transparent-text; -} - -.Button--disabled { - background-color: $color-disabled !important; -} - -.Button--selected { - @include button-color($color-selected); -} - -.Button--flex { - display: inline-flex; //Inline even for fluid - flex-direction: column; -} - -.Button--flex--fluid { - width: 100%; -} - -.Button--verticalAlignContent--top { - justify-content: flex-start; -} - -.Button--verticalAlignContent--middle { - justify-content: center; -} - -.Button--verticalAlignContent--bottom { - justify-content: flex-end; -} - -.Button__content { - display: block; - align-self: stretch; -} diff --git a/tgui/packages/tgui/styles/components/ColorBox.scss b/tgui/packages/tgui/styles/components/ColorBox.scss deleted file mode 100644 index 739cacee0e4..00000000000 --- a/tgui/packages/tgui/styles/components/ColorBox.scss +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -.ColorBox { - display: inline-block; - width: 1em; - height: 1em; - line-height: 1em; - text-align: center; -} diff --git a/tgui/packages/tgui/styles/components/Dialog.scss b/tgui/packages/tgui/styles/components/Dialog.scss deleted file mode 100644 index c7b7fd13261..00000000000 --- a/tgui/packages/tgui/styles/components/Dialog.scss +++ /dev/null @@ -1,105 +0,0 @@ -@use '../base'; - -$background-color: base.$color-bg !default; - -.Dialog { - position: fixed; - left: 0; - top: 0; - right: 0; - bottom: 0; - background-color: rgba(0, 0, 0, 0.5); - display: flex; - align-items: center; - justify-content: center; -} - -.Dialog__content { - background-color: $background-color; - font-family: Consolas, monospace; - font-size: base.em(14px); - display: flex; - flex-direction: column; -} - -.Dialog__header { - display: flex; - height: 2em; - line-height: 1.928em; - background-color: rgba(0, 0, 0, 0.5); - user-select: none; - -ms-user-select: none; -} - -.Dialog__title { - display: inline; - font-style: italic; - margin-left: 1rem; - margin-right: 2rem; - flex-grow: 1; - opacity: 0.33; -} - -.Dialog__body { - margin: 2rem 1rem 2rem 1rem; - flex-grow: 1; -} - -.Dialog__footer { - display: flex; - flex-direction: row; - justify-content: flex-end; - padding: 1rem; - background-color: rgba(0, 0, 0, 0.25); -} - -.Dialog__button { - margin: 0 1rem 0 1rem; - height: 2rem; - min-width: 6rem; - text-align: center; -} - -.SaveAsDialog__inputs { - display: flex; - flex-direction: row; - align-items: center; - padding-left: 3rem; - justify-content: flex-end; - margin-right: 1rem; -} - -.SaveAsDialog__input { - margin-left: 1rem; - width: 80%; -} - -.SaveAsDialog__label { - vertical-align: center; -} - -.Dialog__FileList { - position: relative; - display: flex; - flex-wrap: wrap; - flex-grow: 1; - align-content: flex-start; - max-height: 20rem; - overflow: auto; - overflow-y: scroll; -} - -.Dialog__FileEntry { - text-align: center; - margin: 1rem; -} - -.Dialog__FileIcon { - display: inline-block; - margin: 0 0 1rem 0; - position: relative; - width: 6vh; - height: auto; - text-align: center; - cursor: default; -} diff --git a/tgui/packages/tgui/styles/components/Dimmer.scss b/tgui/packages/tgui/styles/components/Dimmer.scss deleted file mode 100644 index 32a43ce509e..00000000000 --- a/tgui/packages/tgui/styles/components/Dimmer.scss +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ -$background-dimness: 0.75 !default; - -.Dimmer { - // Align everything in the middle. - // A fat middle finger for anything less than IE11. - display: flex; - justify-content: center; - align-items: center; - // Fill positioned parent - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - // Dim everything around it - background-color: rgba(0, 0, 0, $background-dimness); - z-index: 1; -} diff --git a/tgui/packages/tgui/styles/components/Divider.scss b/tgui/packages/tgui/styles/components/Divider.scss deleted file mode 100644 index e4df190e62c..00000000000 --- a/tgui/packages/tgui/styles/components/Divider.scss +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; - -$color: rgba(255, 255, 255, 0.1) !default; -$thickness: base.em(2px) !default; -$spacing: 0.5em; - -.Divider--horizontal { - margin: $spacing 0; - - &:not(.Divider--hidden) { - border-top: $thickness solid $color; - } -} - -.Divider--vertical { - height: 100%; - margin: 0 $spacing; - - &:not(.Divider--hidden) { - border-left: $thickness solid $color; - } -} diff --git a/tgui/packages/tgui/styles/components/Dropdown.scss b/tgui/packages/tgui/styles/components/Dropdown.scss deleted file mode 100644 index 6909f8d9312..00000000000 --- a/tgui/packages/tgui/styles/components/Dropdown.scss +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; - -.Dropdown { - position: relative; -} - -.Dropdown__control { - position: relative; - display: inline-block; - font-family: Verdana, sans-serif; - font-size: base.em(12px); - width: base.em(100px); - line-height: base.em(17px); - user-select: none; -} - -.Dropdown__arrow-button { - float: right; - padding-left: 0.35em; - width: 1.2em; - height: base.em(22px); - border-left: base.em(1px) solid #000; - border-left: base.em(1px) solid rgba(0, 0, 0, 0.25); -} - -.Dropdown__menu { - position: absolute; - overflow-y: auto; - z-index: 5; - width: base.em(100px); - max-height: base.em(200px); - overflow-y: scroll; - border-radius: 0 0 base.em(2px) base.em(2px); - color: #fff; - background-color: #000; - background-color: rgba(0, 0, 0, 0.75); -} - -.Dropdown__menu-noscroll { - position: absolute; - overflow-y: auto; - z-index: 5; - width: base.em(100px); - max-height: base.em(200px); - border-radius: 0 0 base.em(2px) base.em(2px); - color: #fff; - background-color: #000; - background-color: rgba(0, 0, 0, 0.75); -} - -.Dropdown__menuentry { - padding: base.em(2px) base.em(4px); - font-family: Verdana, sans-serif; - font-size: base.em(12px); - line-height: base.em(17px); - transition: background-color 100ms ease-out; - - &:hover { - background-color: rgba(255, 255, 255, 0.2); - transition: background-color 0ms; - } -} - -.Dropdown__over { - top: auto; - bottom: 100%; -} - -.Dropdown__selected-text { - display: inline-block; - text-overflow: ellipsis; - white-space: nowrap; - height: base.em(17px); - width: calc(100% - 1.2em); -} diff --git a/tgui/packages/tgui/styles/components/Flex.scss b/tgui/packages/tgui/styles/components/Flex.scss deleted file mode 100644 index d4b6b8ec388..00000000000 --- a/tgui/packages/tgui/styles/components/Flex.scss +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -.Flex { - display: -ms-flexbox; - display: flex; -} - -.Flex--inline { - display: inline-flex; -} - -.Flex--iefix { - display: block; -} - -.Flex--iefix.Flex--inline { - display: inline-block; -} - -.Flex__item--iefix { - display: inline-block; -} - -.Flex--iefix--column { - & > .Flex__item--iefix { - display: block; - } -} diff --git a/tgui/packages/tgui/styles/components/Icon.scss b/tgui/packages/tgui/styles/components/Icon.scss deleted file mode 100644 index 320117a65f3..00000000000 --- a/tgui/packages/tgui/styles/components/Icon.scss +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file - * @copyright 2020 - * @author ThePotato97 (https://github.com/ThePotato97) - * @license ISC - */ - -.IconStack > .Icon { - position: absolute; - width: 100%; - text-align: center; -} - -.IconStack { - position: relative; - display: inline-block; - height: 1.2em; - line-height: 2em; - vertical-align: middle; - - &:after { - color: transparent; - content: '.'; - } -} diff --git a/tgui/packages/tgui/styles/components/Input.scss b/tgui/packages/tgui/styles/components/Input.scss deleted file mode 100644 index 0e8e509df0b..00000000000 --- a/tgui/packages/tgui/styles/components/Input.scss +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../functions.scss' as *; - -$text-color: base.$color-fg !default; -$background-color: #0a0a0a !default; -$border-color: #88bfff !default; -$border-radius: base.$border-radius !default; -$font-family: Verdana, sans-serif !default; - -.Input { - position: relative; - display: inline-block; - width: base.em(120px); - border: base.em(1px) solid $border-color; - border: base.em(1px) solid rgba($border-color, 0.75); - border-radius: $border-radius; - color: $text-color; - background-color: $background-color; - padding: 0 base.em(4px); - margin-right: base.em(2px); - line-height: base.em(17px); - overflow: visible; -} - -.Input--fluid { - display: block; - width: auto; -} - -.Input__baseline { - display: inline-block; - color: transparent; -} - -.Input__input { - display: block; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - border: 0; - outline: 0; - width: 100%; - font-size: base.em(12px); - line-height: base.em(17px); - height: base.em(17px); - margin: 0; - padding: 0 0.5em; - font-family: $font-family; - background-color: transparent; - color: $text-color; - color: inherit; - - &::placeholder { - font-style: italic; - color: #777; - color: rgba(255, 255, 255, 0.45); - } - - &:-ms-input-placeholder { - font-style: italic; - color: #777; - color: rgba(255, 255, 255, 0.45); - } -} - -.Input--monospace .Input__input { - font-family: 'Consolas', monospace; -} diff --git a/tgui/packages/tgui/styles/components/Knob.scss b/tgui/packages/tgui/styles/components/Knob.scss deleted file mode 100644 index 1a5f0d10a99..00000000000 --- a/tgui/packages/tgui/styles/components/Knob.scss +++ /dev/null @@ -1,131 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../colors.scss'; -@use '../functions.scss' as *; - -$bg-map: colors.$bg-map !default; -$fg-map: colors.$fg-map !default; -$ring-color: #6a96c9 !default; -$knob-color: #333333 !default; -$popup-background-color: #000000 !default; -$popup-text-color: #ffffff !default; - -$inner-padding: 0.1em; - -.Knob { - position: relative; - font-size: 1rem; - width: 2.6em; - height: 2.6em; - margin: 0 auto; - margin-bottom: -0.2em; - cursor: n-resize; - - // Adjusts a baseline in a way, that makes knob middle-aligned - // when it flows with the text. - &:after { - content: '.'; - color: transparent; - line-height: 2.5em; - } -} - -.Knob__circle { - position: absolute; - top: $inner-padding; - bottom: $inner-padding; - left: $inner-padding; - right: $inner-padding; - margin: 0.3em; - background-color: $knob-color; - background-image: linear-gradient( - to bottom, - rgba(255, 255, 255, 0.15) 0%, - rgba(255, 255, 255, 0) 100% - ); - border-radius: 50%; - box-shadow: 0 0.05em 0.5em 0 rgba(0, 0, 0, 0.5); -} - -.Knob__cursorBox { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; -} - -.Knob__cursor { - position: relative; - top: 0.05em; - margin: 0 auto; - width: 0.2em; - height: 0.8em; - background-color: rgba(255, 255, 255, 0.9); -} - -.Knob__popupValue { - position: absolute; - top: -2rem; - right: 50%; - font-size: 1rem; - text-align: center; - padding: 0.25rem 0.5rem; - color: $popup-text-color; - background-color: $popup-background-color; - transform: translateX(50%); - white-space: nowrap; -} - -.Knob__ring { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - padding: $inner-padding; -} - -$pi: 3.1416; - -.Knob__ringTrackPivot { - transform: rotateZ(135deg); -} - -.Knob__ringTrack { - // transform-origin: 50% 50%; - fill: transparent; - stroke: rgba(255, 255, 255, 0.1); - stroke-width: 8; - stroke-linecap: round; - stroke-dasharray: 75 * $pi; -} - -.Knob__ringFillPivot { - transform: rotateZ(135deg); -} - -.Knob--bipolar .Knob__ringFillPivot { - transform: rotateZ(270deg); -} - -.Knob__ringFill { - fill: transparent; - stroke: $ring-color; - stroke-width: 8; - stroke-linecap: round; - stroke-dasharray: 100 * $pi; - transition: stroke 50ms ease-out; -} - -@each $color-name, $color-value in $fg-map { - .Knob--color--#{$color-name} { - .Knob__ringFill { - stroke: $color-value; - } - } -} diff --git a/tgui/packages/tgui/styles/components/LabeledList.scss b/tgui/packages/tgui/styles/components/LabeledList.scss deleted file mode 100644 index 94adf932549..00000000000 --- a/tgui/packages/tgui/styles/components/LabeledList.scss +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; - -.LabeledList { - display: table; - // IE8: Does not support calc - width: 100%; - // Compensate for negative margin - width: calc(100% + 1em); - border-collapse: collapse; - border-spacing: 0; - margin: -0.25em -0.5em; - margin-bottom: 0; - padding: 0; -} - -.LabeledList__row { - display: table-row; -} - -.LabeledList__row:last-child .LabeledList__cell { - padding-bottom: 0; -} - -.LabeledList__cell { - display: table-cell; - margin: 0; - padding: 0.25em 0.5em; - border: 0; - text-align: left; -} - -.LabeledList__label--nowrap { - width: 1%; - white-space: nowrap; - min-width: 5em; -} - -.LabeledList__buttons { - width: 0.1%; - white-space: nowrap; - text-align: right; - padding-top: base.em(1px); - padding-bottom: 0; -} diff --git a/tgui/packages/tgui/styles/components/MenuBar.scss b/tgui/packages/tgui/styles/components/MenuBar.scss deleted file mode 100644 index 0f5eb47380c..00000000000 --- a/tgui/packages/tgui/styles/components/MenuBar.scss +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; - -$separator-color: base.$color-bg-section; -$background-color: base.$color-bg !default; -$dropdown-z-index: 5; - -.MenuBar { - display: flex; -} - -.MenuBar__font { - font-family: Verdana, sans-serif; - font-size: base.em(12px); - line-height: base.em(17px); -} - -.MenuBar__hover { - &:hover { - background-color: lighten($background-color, 30%); - transition: background-color 0ms; - } -} - -.MenuBar__MenuBarButton { - padding: 0.2rem 0.5rem 0.2rem 0.5rem; -} - -.MenuBar__menu { - position: absolute; - z-index: $dropdown-z-index; - background-color: $background-color; - padding: 0.3rem 0.3rem 0.3rem 0.3rem; - box-shadow: 4px 6px 5px -2px rgba(0, 0, 0, 0.55); -} - -.MenuBar__MenuItem { - z-index: $dropdown-z-index; - transition: background-color 100ms ease-out; - background-color: $background-color; - white-space: nowrap; - padding: 0.3rem 2rem 0.3rem 3rem; -} - -.MenuBar__MenuItemToggle { - padding: 0.3rem 2rem 0.3rem 0; -} - -.MenuBar__MenuItemToggle__check { - display: inline-block; - vertical-align: middle; - min-width: 3rem; - margin-left: 0.3rem; -} - -.MenuBar__over { - top: auto; - bottom: 100%; -} - -.MenuBar__MenuBarButton-text { - text-overflow: clip; - white-space: nowrap; - height: base.em(17px); -} - -.MenuBar__Separator { - display: block; - margin: 0.3rem 0.3rem 0.3rem 2.3rem; - border-top: 1px solid $separator-color; -} diff --git a/tgui/packages/tgui/styles/components/Modal.scss b/tgui/packages/tgui/styles/components/Modal.scss deleted file mode 100644 index 005ffe31656..00000000000 --- a/tgui/packages/tgui/styles/components/Modal.scss +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; - -$background-color: base.$color-bg !default; - -.Modal { - background-color: $background-color; - max-width: calc(100% - 1rem); - padding: 1rem; -} diff --git a/tgui/packages/tgui/styles/components/NoticeBox.scss b/tgui/packages/tgui/styles/components/NoticeBox.scss deleted file mode 100644 index 0394ffaa660..00000000000 --- a/tgui/packages/tgui/styles/components/NoticeBox.scss +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use 'sass:color'; -@use '../base.scss'; -@use '../colors.scss'; -@use '../functions.scss' as *; - -// NoticeBox -$background-color: #bb9b68 !default; -$color-stripes: rgba(0, 0, 0, 0.1) !default; -$color-border: #272727 !default; -$bg-map: colors.$bg-map !default; - -.NoticeBox { - // Adapt text color to background luminance to ensure high contast - $luminance: luminance($background-color); - $text-color: if($luminance > 0.35, rgba(0, 0, 0, 1), rgba(255, 255, 255, 1)); - - padding: 0.33em 0.5em; - margin-bottom: 0.5em; - box-shadow: none; - font-weight: bold; - font-style: italic; - color: $text-color; - background-color: $background-color; - background-image: repeating-linear-gradient( - -45deg, - transparent, - transparent base.em(10px), - $color-stripes base.em(10px), - $color-stripes base.em(20px) - ); -} - -@mixin box-color($color) { - $luminance: luminance($color); - $text-color: if($luminance > 0.35, rgba(0, 0, 0, 1), rgba(255, 255, 255, 1)); - color: $text-color; - background-color: color.adjust($color, $saturation: -15%, $lightness: -15%); -} - -@each $color-name, $color-value in $bg-map { - .NoticeBox--color--#{$color-name} { - @include box-color($color-value); - } -} - -.NoticeBox--type--info { - @include box-color(colors.$blue); -} - -.NoticeBox--type--success { - @include box-color(colors.$green); -} - -.NoticeBox--type--warning { - @include box-color(colors.$orange); -} - -.NoticeBox--type--danger { - @include box-color(colors.$red); -} diff --git a/tgui/packages/tgui/styles/components/NumberInput.scss b/tgui/packages/tgui/styles/components/NumberInput.scss deleted file mode 100644 index ef2aba4d474..00000000000 --- a/tgui/packages/tgui/styles/components/NumberInput.scss +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use 'sass:color'; -@use '../base.scss'; -@use '../functions.scss' as *; -@use './Input.scss'; - -$text-color: Input.$text-color !default; -$background-color: Input.$background-color !default; -$border-color: Input.$border-color !default; -$border-radius: Input.$border-radius !default; - -.NumberInput { - position: relative; - display: inline-block; - border: base.em(1px) solid $border-color; - border: base.em(1px) solid rgba($border-color, 0.75); - border-radius: $border-radius; - color: $border-color; - background-color: $background-color; - padding: 0 base.em(4px); - margin-right: base.em(2px); - line-height: base.em(17px); - text-align: right; - overflow: visible; - cursor: n-resize; -} - -.NumberInput--fluid { - display: block; -} - -.NumberInput__content { - margin-left: 0.5em; -} - -.NumberInput__barContainer { - position: absolute; - top: base.em(2px); - bottom: base.em(2px); - left: base.em(2px); -} - -.NumberInput__bar { - position: absolute; - bottom: 0; - left: 0; - width: base.em(3px); - box-sizing: border-box; - border-bottom: base.em(1px) solid $border-color; - background-color: $border-color; -} - -.NumberInput__input { - display: block; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - border: 0; - outline: 0; - width: 100%; - font-size: base.em(12px); - line-height: base.em(17px); - height: base.em(17px); - margin: 0; - padding: 0 0.5em; - font-family: Verdana, sans-serif; - background-color: $background-color; - color: $text-color; - text-align: right; -} diff --git a/tgui/packages/tgui/styles/components/ProgressBar.scss b/tgui/packages/tgui/styles/components/ProgressBar.scss deleted file mode 100644 index e13d25e8375..00000000000 --- a/tgui/packages/tgui/styles/components/ProgressBar.scss +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../colors.scss'; -@use '../functions.scss' as *; - -$color-default-fill: colors.bg(colors.$primary) !default; -$background-color: rgba(0, 0, 0, 0) !default; -$border-radius: base.$border-radius !default; -$bg-map: colors.$bg-map !default; - -.ProgressBar { - display: inline-block; - position: relative; - width: 100%; - padding: 0 0.5em; - border-width: base.em(1px) !important; - border-style: solid !important; - border-radius: $border-radius; - background-color: $background-color; - transition: border-color 900ms ease-out; -} - -.ProgressBar__fill { - position: absolute; - top: -0.5px; - left: 0px; - bottom: -0.5px; -} - -.ProgressBar__fill--animated { - transition: - background-color 900ms ease-out, - width 900ms ease-out; -} - -.ProgressBar__content { - position: relative; - line-height: base.em(17px); - width: 100%; - text-align: right; -} - -.ProgressBar--color--default { - border: base.em(1px) solid $color-default-fill; - - .ProgressBar__fill { - background-color: $color-default-fill; - } -} - -@each $color-name, $color-value in $bg-map { - .ProgressBar--color--#{$color-name} { - border-color: $color-value !important; - - .ProgressBar__fill { - background-color: $color-value; - } - } -} diff --git a/tgui/packages/tgui/styles/components/RoundGauge.scss b/tgui/packages/tgui/styles/components/RoundGauge.scss deleted file mode 100644 index be95519d646..00000000000 --- a/tgui/packages/tgui/styles/components/RoundGauge.scss +++ /dev/null @@ -1,88 +0,0 @@ -/** - * Copyright (c) 2020 bobbahbrown (https://github.com/bobbahbrown) - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../colors.scss'; -@use '../functions.scss' as *; - -$fg-map: colors.$fg-map !default; -$ring-color: #6a96c9 !default; - -.RoundGauge { - font-size: 1rem; - width: 2.6em; - height: 1.3em; - margin: 0 auto; - margin-bottom: 0.2em; -} - -$pi: 3.1416; - -.RoundGauge__ringTrack { - fill: transparent; - stroke: rgba(255, 255, 255, 0.1); - stroke-width: 10; - stroke-dasharray: 50 * $pi; - stroke-dashoffset: 50 * $pi; -} - -.RoundGauge__ringFill { - fill: transparent; - stroke: $ring-color; - stroke-width: 10; - stroke-dasharray: 100 * $pi; - transition: stroke 50ms ease-out; -} - -.RoundGauge__needle, -.RoundGauge__ringFill { - transition: transform 50ms ease-in-out; -} - -.RoundGauge__needleLine, -.RoundGauge__needleMiddle { - fill: colors.$bad; -} - -.RoundGauge__alert { - fill-rule: evenodd; - clip-rule: evenodd; - stroke-linejoin: round; - stroke-miterlimit: 2; - fill: rgba(255, 255, 255, 0.1); -} - -.RoundGauge__alert.max { - fill: colors.$bad; -} - -@each $color-name, $color-value in $fg-map { - .RoundGauge--color--#{$color-name}.RoundGauge__ringFill { - stroke: $color-value; - } -} - -@each $color-name, $color-value in $fg-map { - .RoundGauge__alert--#{$color-name} { - fill: $color-value; - transition: opacity 0.6s cubic-bezier(0.25, 1, 0.5, 1); - animation: RoundGauge__alertAnim - 1s - cubic-bezier(0.34, 1.56, 0.64, 1) - infinite; - } -} - -@keyframes RoundGauge__alertAnim { - 0% { - opacity: 0.1; - } - 50% { - opacity: 1; - } - 100% { - opacity: 0.1; - } -} diff --git a/tgui/packages/tgui/styles/components/Section.scss b/tgui/packages/tgui/styles/components/Section.scss deleted file mode 100644 index d1f81b1f766..00000000000 --- a/tgui/packages/tgui/styles/components/Section.scss +++ /dev/null @@ -1,143 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use 'sass:color'; -@use '../base.scss'; -@use '../colors.scss'; -@use '../functions.scss'; - -$title-text-color: base.$color-fg !default; -$background-color: base.$color-bg-section !default; -$separator-color: colors.$primary !default; - -.Section { - position: relative; - margin-bottom: 0.5em; - background-color: functions.fake-alpha($background-color, base.$color-bg); - background-color: $background-color; - box-sizing: border-box; - - &:last-child { - margin-bottom: 0; - } -} - -.Section__title { - position: relative; - padding: 0.5em; - border-bottom: base.em(2px) solid $separator-color; -} - -.Section__titleText { - font-size: base.em(14px); - font-weight: bold; - color: $title-text-color; -} - -.Section__buttons { - position: absolute; - display: inline-block; - right: 0.5em; - margin-top: base.em(-1px); -} - -.Section__rest { - position: relative; -} - -.Section__content { - padding: 0.66em 0.5em; -} - -.Section--fitted > .Section__rest > .Section__content { - padding: 0; -} - -.Section--fill { - display: flex; - flex-direction: column; - height: 100%; -} - -.Section--fill > .Section__rest { - flex-grow: 1; -} - -.Section--fill > .Section__rest > .Section__content { - height: 100%; -} - -.Section--fill.Section--scrollable > .Section__rest > .Section__content { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; -} - -.Section--fill.Section--iefix { - display: table !important; - width: 100% !important; - height: 100% !important; - border-collapse: collapse; - border-spacing: 0; - - & > .Section__rest { - display: table-row !important; - height: 100% !important; - } -} - -.Section--scrollable { - overflow-x: hidden; - overflow-y: hidden; - - & > .Section__rest > .Section__content { - overflow-y: scroll; - overflow-x: hidden; - } -} - -.Section--scrollableHorizontal { - overflow-x: hidden; - overflow-y: hidden; - - & > .Section__rest > .Section__content { - overflow-y: hidden; - overflow-x: scroll; - } -} - -.Section--scrollable.Section--scrollableHorizontal { - overflow-x: hidden; - overflow-y: hidden; - - & > .Section__rest > .Section__content { - overflow-y: scroll; - overflow-x: scroll; - } -} - -// Nested sections -.Section .Section { - background-color: transparent; - margin-left: -0.5em; - margin-right: -0.5em; - - // Remove extra space above the first nested section - &:first-child { - margin-top: -0.5em; - } -} - -// Level 2 section title -.Section .Section .Section__titleText { - font-size: base.em(13px); -} - -// Level 3 section title -.Section .Section .Section .Section__titleText { - font-size: base.em(12px); -} diff --git a/tgui/packages/tgui/styles/components/Slider.scss b/tgui/packages/tgui/styles/components/Slider.scss deleted file mode 100644 index 83baf71dc09..00000000000 --- a/tgui/packages/tgui/styles/components/Slider.scss +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; - -$cursor-color: base.$color-fg !default; -$popup-background-color: #000000 !default; -$popup-text-color: #ffffff !default; - -.Slider { - cursor: e-resize; -} - -.Slider__cursorOffset { - position: absolute; - top: 0; - left: 0; - bottom: 0; - transition: none !important; -} - -.Slider__cursor { - position: absolute; - top: 0; - right: base.em(-1px); - bottom: 0; - width: 0; - border-left: base.em(2px) solid $cursor-color; -} - -.Slider__pointer { - position: absolute; - right: base.em(-5px); - bottom: base.em(-4px); - width: 0; - height: 0; - border-left: base.em(5px) solid transparent; - border-right: base.em(5px) solid transparent; - border-bottom: base.em(5px) solid $cursor-color; -} - -.Slider__popupValue { - position: absolute; - right: 0; - top: -2rem; - font-size: 1rem; - padding: 0.25rem 0.5rem; - color: $popup-text-color; - background-color: $popup-background-color; - transform: translateX(50%); - white-space: nowrap; -} diff --git a/tgui/packages/tgui/styles/components/Stack.scss b/tgui/packages/tgui/styles/components/Stack.scss deleted file mode 100644 index ab2c6f24931..00000000000 --- a/tgui/packages/tgui/styles/components/Stack.scss +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) 2021 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use './Divider.scss'; - -.Stack--fill { - height: 100%; -} - -.Stack--horizontal > .Stack__item { - margin-left: 0.5em; - - &:first-child { - margin-left: 0; - } -} - -.Stack--vertical > .Stack__item { - margin-top: 0.5em; - - &:first-child { - margin-top: 0; - } -} - -.Stack--horizontal > .Stack__divider:not(.Stack__divider--hidden) { - border-left: Divider.$thickness solid Divider.$color; -} - -.Stack--vertical > .Stack__divider:not(.Stack__divider--hidden) { - border-top: Divider.$thickness solid Divider.$color; -} diff --git a/tgui/packages/tgui/styles/components/Table.scss b/tgui/packages/tgui/styles/components/Table.scss deleted file mode 100644 index ecc47e5ba9a..00000000000 --- a/tgui/packages/tgui/styles/components/Table.scss +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -.Table { - display: table; - width: 100%; - border-collapse: collapse; - border-spacing: 0; - margin: 0; -} - -.Table--collapsing { - width: auto; -} - -.Table__row { - display: table-row; -} - -.Table__cell { - display: table-cell; - padding: 0 0.25em; - - &:first-child { - padding-left: 0; - } - - &:last-child { - padding-right: 0; - } -} - -.Table__row--header .Table__cell, -.Table__cell--header { - font-weight: bold; - padding-bottom: 0.5em; -} - -.Table__cell--collapsing { - width: 1%; - white-space: nowrap; -} diff --git a/tgui/packages/tgui/styles/components/Tabs.scss b/tgui/packages/tgui/styles/components/Tabs.scss deleted file mode 100644 index 2ab09125027..00000000000 --- a/tgui/packages/tgui/styles/components/Tabs.scss +++ /dev/null @@ -1,144 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use 'sass:color'; -@use 'sass:math'; -@use '../base.scss'; -@use '../colors.scss'; - -$color-default: color.scale( - colors.fg(colors.$primary), - $lightness: 75% -) !default; -$text-color: rgba(255, 255, 255, 0.5) !default; -$text-color-selected: color.scale($color-default, $lightness: 25%) !default; -$tab-color: transparent !default; -$tab-color-hovered: rgba(255, 255, 255, 0.075) !default; -$tab-color-selected: rgba(255, 255, 255, 0.125) !default; -$border-radius: base.$border-radius !default; -$fg-map: colors.$fg-map !default; - -.Tabs { - display: flex; - align-items: stretch; - overflow: hidden; - background-color: base.$color-bg-section; -} - -.Tabs--fill { - height: 100%; -} - -// Interoperability with sections -.Section .Tabs { - background-color: transparent; -} - -.Section:not(.Section--fitted) .Tabs { - margin: 0 -0.5em 0.5em; - - &:first-child { - margin-top: -0.5em; - } -} - -.Tabs--vertical { - flex-direction: column; - padding: 0.25em 0 0.25em 0.25em; -} - -.Tabs--horizontal { - margin-bottom: 0.5em; - padding: 0.25em 0.25em 0 0.25em; - - &:last-child { - margin-bottom: 0; - } -} - -.Tabs__Tab { - flex-grow: 0; -} - -.Tabs--fluid .Tabs__Tab { - flex-grow: 1; -} - -.Tab { - display: flex; - align-items: center; - justify-content: space-between; - background-color: $tab-color; - color: $text-color; - min-height: 2.25em; - min-width: 4em; -} - -.Tab:not(.Tab--selected):hover { - background-color: $tab-color-hovered; -} - -.Tab--selected { - background-color: $tab-color-selected; - color: $text-color-selected; -} - -.Tab__text { - flex-grow: 1; - margin: 0 0.5em; -} - -.Tab__left { - min-width: 1.5em; - text-align: center; - margin-left: 0.25em; -} - -.Tab__right { - min-width: 1.5em; - text-align: center; - margin-right: 0.25em; -} - -.Tabs--horizontal { - .Tab { - border-top: math.div(1em, 6) solid transparent; - border-bottom: math.div(1em, 6) solid transparent; - border-top-left-radius: 0.25em; - border-top-right-radius: 0.25em; - } - - .Tab--selected { - border-bottom: math.div(1em, 6) solid $color-default; - } -} - -.Tabs--vertical { - .Tab { - min-height: 2em; - border-left: math.div(1em, 6) solid transparent; - border-right: math.div(1em, 6) solid transparent; - border-top-left-radius: 0.25em; - border-bottom-left-radius: 0.25em; - } - - .Tab--selected { - border-right: math.div(1em, 6) solid $color-default; - } -} - -@each $color-name, $color-value in $fg-map { - .Tab--selected.Tab--color--#{$color-name} { - color: color.scale($color-value, $lightness: 25%); - } - - .Tabs--horizontal .Tab--selected.Tab--color--#{$color-name} { - border-bottom-color: $color-value; - } - - .Tabs--vertical .Tab--selected.Tab--color--#{$color-name} { - border-right-color: $color-value; - } -} diff --git a/tgui/packages/tgui/styles/components/TextArea.scss b/tgui/packages/tgui/styles/components/TextArea.scss deleted file mode 100644 index ec8e0c7a317..00000000000 --- a/tgui/packages/tgui/styles/components/TextArea.scss +++ /dev/null @@ -1,90 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../functions.scss' as *; -@use './Input.scss'; - -$text-color: Input.$text-color !default; -$background-color: Input.$background-color !default; -$border-color: Input.$border-color !default; -$border-radius: Input.$border-radius !default; - -.TextArea { - position: relative; - display: inline-block; - border: base.em(1px) solid $border-color; - border: base.em(1px) solid rgba($border-color, 0.75); - border-radius: $border-radius; - background-color: $background-color; - margin-right: base.em(2px); - line-height: base.em(17px); - box-sizing: border-box; - width: 100%; -} - -.TextArea--fluid { - display: block; - width: auto; - height: auto; -} - -.TextArea--noborder { - border: 0px; -} - -.TextArea__textarea.TextArea__textarea--scrollable { - overflow: auto; - overflow-x: hidden; - overflow-y: scroll; -} - -.TextArea__textarea { - display: block; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - border: 0; - outline: 0; - width: 100%; - height: 100%; - font-size: 1em; - line-height: base.em(17px); - min-height: base.em(17px); - margin: 0; - padding: 0 0.5em; - font-family: inherit; - background-color: transparent; - color: inherit; - box-sizing: border-box; - // Make sure the div and the textarea wrap words in the same way - word-wrap: break-word; - overflow: hidden; - - &::placeholder { - font-style: italic; - color: #777; - color: rgba(255, 255, 255, 0.45); - } - - &:-ms-input-placeholder { - font-style: italic; - color: #777; - color: rgba(255, 255, 255, 0.45); - } -} - -.TextArea__textarea_custom { - overflow: visible; - white-space: pre-wrap; -} - -.TextArea__nowrap { - white-space: nowrap; - overflow-wrap: normal; - overflow-x: scroll; -} diff --git a/tgui/packages/tgui/styles/components/Tooltip.scss b/tgui/packages/tgui/styles/components/Tooltip.scss deleted file mode 100644 index 497813a206d..00000000000 --- a/tgui/packages/tgui/styles/components/Tooltip.scss +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT - */ - -@use '../base.scss'; -@use '../functions.scss' as *; - -$color: #ffffff !default; -$background-color: #000000 !default; -$border-radius: base.$border-radius !default; - -.Tooltip { - z-index: 2; - padding: 0.5em 0.75em; - pointer-events: none; - text-align: left; - transition: opacity 150ms ease-out; - background-color: $background-color; - color: $color; - box-shadow: 0.1em 0.1em 1.25em -0.1em rgba(0, 0, 0, 0.5); - border-radius: $border-radius; - max-width: base.em(250px); -} diff --git a/tgui/packages/tgui/styles/css-variables.scss b/tgui/packages/tgui/styles/css-variables.scss new file mode 100644 index 00000000000..bddcdb2ef80 --- /dev/null +++ b/tgui/packages/tgui/styles/css-variables.scss @@ -0,0 +1,13 @@ +/** + * Internal variables + * For more, see: https://github.com/tgstation/tgui-core + * Files: vars-colors.scss | vars-components.scss | vars-vaules.scss + */ + +:root { + /* TitleBar */ + --titlebar-background: var(--color-secondary); + --titlebar-text: var(--color-text-translucent-light); + --titlebar-shadow-color: var(--color-border-dark); + --titlebar-shadow-core: var(--color-border-dark); +} diff --git a/tgui/packages/tgui/styles/functions.scss b/tgui/packages/tgui/styles/functions.scss index 28185755e88..c4b512a3e17 100644 --- a/tgui/packages/tgui/styles/functions.scss +++ b/tgui/packages/tgui/styles/functions.scss @@ -3,15 +3,9 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:map'; @use 'sass:math'; -@use 'sass:meta'; -// Type-casting -// -------------------------------------------------------- - -// Get a unit-less numeric value +/* Type-casting: Get a unit-less numeric value */ @function num($value) { @if meta.type-of($value) != number { @error 'Could not convert `#{$value}` - must be `type-of number`'; @@ -23,60 +17,6 @@ @return math.div($value, $value * 0 + 1); } -// Color -// -------------------------------------------------------- - -// Increases perceptual color lightness. -@function lighten($color, $percent) { - $scaled: hsl( - color.hue($color), - color.saturation($color), - color.lightness($color) * (1 + num($percent)) - ); - $mixed: color.mix(#ffffff, $color, 100% * num($percent)); - @return color.mix($scaled, $mixed, 75%); -} - -// Returns the NTSC luminance of `$color` as a float (between 0 and 1). -// 1 is pure white, 0 is pure black. -@function luminance($color) { - $colors: ( - 'red': color.red($color), - 'green': color.green($color), - 'blue': color.blue($color), - ); - - @each $name, $value in $colors { - $adjusted: 0; - $value: math.div($value, 255); - @if $value < 0.03928 { - $value: math.div($value, 12.92); - } @else { - $value: math.div($value + 0.055, 1.055); - $value: math.pow($value, 2.4); - } - // prettier-ignore - $colors: map.merge($colors, ( - $name: $value, - )); - } - - // prettier-ignore - @return (map.get($colors, 'red') * .2126) - + (map.get($colors, 'green') * .7152) - + (map.get($colors, 'blue') * .0722); -} - -// Blends an RGBA color with a static background color based on its -// alpha channel. Returns an RGB color, which is compatible with IE8. -@function fake-alpha($color-rgba, $color-background) { - @return color.mix( - color.change($color-rgba, $alpha: 1), - $color-background, - color.alpha($color-rgba) * 100% - ); -} - // Multiplies our viewport units by the DPI scaling amount // to ensure that they display correctly when using differently-scaled windows @function vp($viewportUnit) { diff --git a/tgui/packages/tgui/styles/interfaces/Accounting.scss b/tgui/packages/tgui/styles/interfaces/Accounting.scss new file mode 100644 index 00000000000..d48ef846d73 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Accounting.scss @@ -0,0 +1,42 @@ +.Accounting__Toolbar { + outline: solid 1px; + outline-style: outset; + outline-width: 2px; + outline-color: hsl(0, 0%, 85%); + background-color: rgb(195, 195, 195); + color: grey; +} + +.Accounting__Window { + flex-direction: column; + outline: solid 1px black; + outline-style: outset; + outline-width: 2px; + outline-color: hsl(0, 0%, 85%); + background-color: rgb(195, 195, 195); +} + +.Accounting__WindowContent { + background-color: white; + outline: solid; + outline-style: outset; + outline-width: 2px; + outline-color: hsl(0, 0%, 85%); + background-color: rgb(195, 195, 195); +} + +.Accounting__TableHeader { + border-style: solid; + border-width: 2px; + border-left: 0px; + border-right: 0px; + border-bottom: 0px; +} + +.Accounting__TableCellSides { + border-style: solid; + border-width: 1px; + border-top: 0px; + border-right: 0px; + border-bottom: 0px; +} diff --git a/tgui/packages/tgui/styles/interfaces/AlertModal.scss b/tgui/packages/tgui/styles/interfaces/AlertModal.scss index beff2b5535e..2a531c4186b 100644 --- a/tgui/packages/tgui/styles/interfaces/AlertModal.scss +++ b/tgui/packages/tgui/styles/interfaces/AlertModal.scss @@ -17,14 +17,14 @@ .AlertModal__Loader { width: 100%; position: relative; - height: 4px; + height: var(--border-thickness-large); } .AlertModal__LoaderProgress { position: absolute; - transition: - background-color 500ms ease-out, - width 500ms ease-out; - background-color: colors.bg(colors.$primary); + transition-property: background-color, width; + transition-duration: var(--transition-time-slow); + transition-timing-function: ease-out; + background-color: var(--color-primary); height: 100%; } diff --git a/tgui/packages/tgui/styles/interfaces/AnomalyTower.scss b/tgui/packages/tgui/styles/interfaces/AnomalyTower.scss new file mode 100644 index 00000000000..340acd85c2d --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/AnomalyTower.scss @@ -0,0 +1,33 @@ +.AnomalyTower__HazardBg { + background-size: 42.42px 42.42px; // ~30 * sqrt(2) to avoid weird artifacts + background-image: repeating-linear-gradient( + 45deg, + #ffc107, + #ffc107 15px, + #000000 15px, + #000000 30px + ); + + border-style: outset; + border-color: #333333; +} + +.AnomalyTower__HazardButton { + border-radius: 50px; + border-style: outset; + border-color: #bebebe; + + box-shadow: 0 0 20px #0c0c0c; + + width: 100px; + height: 100px; + color: red; +} + +.AnomalyTower__Charge { + font-family: 'Consolas', monospace; + background-color: black; + + border-style: ridge; + border-color: #8f8f8f; +} diff --git a/tgui/packages/tgui/styles/interfaces/AntagInfoHeretic.scss b/tgui/packages/tgui/styles/interfaces/AntagInfoHeretic.scss new file mode 100644 index 00000000000..74b2b985282 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/AntagInfoHeretic.scss @@ -0,0 +1,193 @@ +.theme-Heretic { + --background-color: radial-gradient( + circle, + rgb(3, 3, 7) 54%, + rgb(9, 9, 26) 60%, + rgb(8, 5, 15) 80%, + rgb(13, 7, 26) 100% + ); + --background-color-title: radial-gradient( + circle, + rgb(3, 3, 7) 54%, + rgb(9, 9, 26) 60%, + rgb(8, 5, 15) 80%, + rgb(13, 7, 26) 100% + ); + + &--AshPath { + --background-color: radial-gradient( + circle, + rgba(24, 9, 9, 1) 54%, + rgba(31, 10, 10, 1) 60%, + rgba(46, 11, 11, 1) 80%, + rgba(47, 14, 14, 1) 100% + ); + --background-color-title: radial-gradient( + circle, + rgba(24, 9, 9, 1) 54%, + rgba(31, 10, 10, 1) 60%, + rgba(46, 11, 11, 1) 80%, + rgba(47, 14, 14, 1) 100% + ); + } + + &--RustPath { + // brown like poop + --background-color: radial-gradient( + circle, + rgba(120, 48, 9) 54%, + rgba(139, 48, 9) 60%, + rgb(150, 48, 9) 80%, + rgba(160, 48, 9) 100% + ); + --background-color-title: radial-gradient( + circle, + rgb(107, 48, 48) 54%, + rgb(211, 19, 19) 60%, + rgb(221, 84, 25) 80%, + rgb(230, 81, 12) 100% + ); + } + + &--FleshPath { + --background-color: radial-gradient( + circle, + rgb(153, 26, 26) 54%, + rgba(130, 9, 9, 1) 60%, + rgb(150, 33, 30) 80%, + rgb(141, 30, 26) 100% + ); + --background-color-title: radial-gradient( + circle, + rgb(100, 0, 0) 54%, + rgb(100, 2, 2) 60%, + rgba(150, 8, 5, 1) 80%, + rgb(200, 34, 0) 100% + ); + } + + &--VoidPath { + --background-color: radial-gradient( + circle, + rgb(13, 13, 66) 54%, + rgb(22, 22, 66) 60%, + rgb(25, 25, 99) 80%, + rgb(42, 42, 192) 100% + ); + --background-color-title: radial-gradient( + circle, + rgb(13, 13, 66) 54%, + rgb(22, 22, 66) 60%, + rgb(25, 25, 99) 80%, + rgb(42, 42, 192) 100% + ); + } + + &--BladePath { + --background-color: radial-gradient( + circle, + rgb(139, 141, 137) 54%, + rgb(139, 141, 137) 60%, + rgb(170, 188, 186) 80%, + rgba(185, 188, 182) 100% + ); + --background-color-title: radial-gradient( + circle, + rgb(139, 141, 137) 54%, + rgb(139, 141, 137) 60%, + rgb(170, 188, 186) 80%, + rgba(185, 188, 182) 100% + ); + } + + &--CosmicPath { + --background-color: radial-gradient( + circle, + rgb(78, 38, 110) 54%, + rgb(78, 38, 110) 60%, + rgb(78, 38, 110) 80%, + rgb(78, 38, 110) 100% + ); + --background-color-title: radial-gradient( + circle, + rgba(3, 3, 7, 1) 54%, + rgba(9, 9, 26, 1) 60%, + rgba(8, 5, 15, 1) 80%, + rgba(13, 7, 26, 1) 100% + ); + } + + &--LockPath { + --background-color: radial-gradient( + circle, + rgba(3, 3, 7, 1) 54%, + rgba(9, 9, 26, 1) 60%, + rgba(8, 5, 15, 1) 80%, + rgba(13, 7, 26, 1) 100% + ); + --background-color-title: radial-gradient( + circle, + rgba(3, 3, 7, 1) 54%, + rgba(9, 9, 26, 1) 60%, + rgba(8, 5, 15, 1) 80%, + rgba(13, 7, 26, 1) 100% + ); + } + + &--MoonPath { + --background-color: radial-gradient( + circle, + rgb(215, 179, 218) 54%, + rgb(163, 139, 165) 60%, + rgb(108, 92, 109) 80%, + rgba(13, 7, 26, 1) 100% + ); + --background-color-title: radial-gradient( + circle, + rgb(215, 179, 218) 54%, + rgb(163, 139, 165) 60%, + rgb(108, 92, 109) 80%, + rgba(13, 7, 26, 1) 100% + ); + } + + .TitleBar { + background: var(--background-color); + } + + .Window { + background: var(--background-color); + + &__content { + background-image: none; + } + } + + &--ascended { + --background-color: radial-gradient( + circle, + rgba(24, 9, 9, 1) 54%, + rgba(31, 10, 10, 1) 60%, + rgba(46, 11, 11, 1) 80%, + rgba(47, 14, 14, 1) 100% + ); + } +} + +.path-title { + padding: 0; + margin: 0; + text-align: center; +} + +.Passive { + margin: 0.5em 0; + background-color: #808080; + border-radius: 5px; + width: 50%; + padding: 0.5em; + + &--Active { + background-color: #62cc67; + } +} diff --git a/tgui/packages/tgui/styles/interfaces/Changelog.scss b/tgui/packages/tgui/styles/interfaces/Changelog.scss new file mode 100644 index 00000000000..f459f697a09 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Changelog.scss @@ -0,0 +1,13 @@ +.Changelog { + &__Button { + height: 22px; + } + + &__Cell { + padding: var(--space-s) 0; + + &--Icon { + width: 25px; + } + } +} diff --git a/tgui/packages/tgui/styles/interfaces/CivCargoHoldTerminal.scss b/tgui/packages/tgui/styles/interfaces/CivCargoHoldTerminal.scss new file mode 100644 index 00000000000..c3be10fe06e --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/CivCargoHoldTerminal.scss @@ -0,0 +1,23 @@ +.Tab_Flash { + box-shadow: 0 0 1px 2px #48abe0; + animation: shadowFade 0.5s forwards; +} + +@keyframes shadowFade { + to { + box-shadow: 0 0 0 0 #48abe0; + } +} + +.Marquee { + animation: marquee 5s linear infinite; +} + +@keyframes marquee { + 0% { + transform: translateX(100%); + } + 100% { + transform: translateX(-100%); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/ColorPicker.scss b/tgui/packages/tgui/styles/interfaces/ColorPicker.scss new file mode 100644 index 00000000000..f9d9d317695 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/ColorPicker.scss @@ -0,0 +1,150 @@ +/** + * MIT License + * https://github.com/omgovich/react-colorful/ + * + * Copyright (c) 2020 Vlad Shilov + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +@use '../colors.scss'; +@use '../base.scss'; + +.react-colorful { + position: relative; + display: flex; + flex-direction: column; + width: 200px; + height: 200px; + user-select: none; + cursor: default; +} + +.react-colorful__saturation_value { + position: relative; + flex-grow: 1; + border-color: transparent; /* Fixes https://github.com/omgovich/react-colorful/issues/139 */ + border-bottom: 12px solid #000; + border-radius: 8px 8px 0 0; + background-image: + linear-gradient(to top, rgba(0, 0, 0, 255), rgba(0, 0, 0, 0)), + linear-gradient(to right, rgba(255, 255, 255, 255), rgba(255, 255, 255, 0)); +} + +.react-colorful__pointer-fill, +.react-colorful__alpha-gradient { + content: ''; + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + pointer-events: none; + border-radius: inherit; +} + +/* Improve elements rendering on light backgrounds */ +.react-colorful__alpha-gradient, +.react-colorful__saturation_value { + box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05); +} + +.react-colorful__hue, +.react-colorful__r, +.react-colorful__g, +.react-colorful__b, +.react-colorful__alpha, +.react-colorful__saturation, +.react-colorful__value { + position: relative; + height: 24px; +} + +.react-colorful__hue { + background: linear-gradient( + to right, + #f00 0%, + #ff0 17%, + #0f0 33%, + #0ff 50%, + #00f 67%, + #f0f 83%, + #f00 100% + ); +} + +.react-colorful__r { + background: linear-gradient(to right, #000, #f00); +} + +.react-colorful__g { + background: linear-gradient(to right, #000, #0f0); +} + +.react-colorful__b { + background: linear-gradient(to right, #000, #00f); +} + +/* Round bottom corners of the last element: `Hue` for `ColorPicker` or `Alpha` for `AlphaColorPicker` */ +.react-colorful__last-control { + border-radius: 0 0 8px 8px; +} + +.react-colorful__interactive { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + border-radius: inherit; + outline: none; + /* Don't trigger the default scrolling behavior when the event is originating from this element */ + touch-action: none; +} + +.react-colorful__pointer { + position: absolute; + z-index: 1; + box-sizing: border-box; + width: 28px; + height: 28px; + transform: translate(-50%, -50%); + background-color: #cfcfcf; + border: 2px solid #cfcfcf; + border-radius: 50%; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.4); +} + +.react-colorful__interactive:focus .react-colorful__pointer { + transform: translate(-50%, -50%) scale(1.1); + background-color: #fff; + border-color: #fff; +} + +/* Chessboard-like pattern for alpha related elements */ +.react-colorful__alpha, +.react-colorful__alpha-pointer { + background-color: #fff; + background-image: url('data:image/svg+xml,'); +} + +.react-colorful__saturation-pointer, +.react-colorful__value-pointer, +.react-colorful__hue-pointer, +.react-colorful__r-pointer, +.react-colorful__g-pointer, +.react-colorful__b-pointer { + z-index: 1; + width: 20px; + height: 20px; +} + +/* Display the saturation value pointer over the hue one */ +.react-colorful__saturation_value-pointer { + z-index: 3; +} diff --git a/tgui/packages/tgui/styles/interfaces/CrewManifest.scss b/tgui/packages/tgui/styles/interfaces/CrewManifest.scss index 6c70acf4abc..6a36674493e 100644 --- a/tgui/packages/tgui/styles/interfaces/CrewManifest.scss +++ b/tgui/packages/tgui/styles/interfaces/CrewManifest.scss @@ -1,51 +1,59 @@ -@use '../colors.scss'; - -$departmental-colors: ( - 'Command': #114dc1, - 'Command Support': #114dc1, - 'Security': #991818, - 'Engineering': #c67519, - 'Medical': #15903a, - 'Science': #a44799, - 'Operations': #593616, - 'Service': #90524b, - 'Civilian': #999999, - 'Equipment': #6c5b73, - 'Miscellaneous': #5d6a67, +$manifest_status_map: ( + 'active': var(--color-green), + 'online': var(--color-green), + 'away-mission': var(--color-blue), + 'ssd': var(--color-yellow), + 'deceased': var(--color-red), + 'missing': var(--color-orange), + 'physically-unfit': var(--color-orange), + 'disabled': var(--color-grey), ); -$status-colors: ( - 'active': colors.$green, - 'ssd': colors.$orange, - 'missing': colors.$orange, - 'deceased': colors.$red, - 'physically-unfit': colors.$yellow, - 'disabled': colors.$yellow, - 'away-mission': colors.$blue, -); - -@each $dept, $color in $departmental-colors { - .text-dept-#{to-lower-case($dept)} { - color: $color !important; - } - .bg-dept-#{to-lower-case($dept)} { - background-color: $color !important; - } - .border-dept-#{to-lower-case($dept)} { - border-color: $color !important; - .Section { - &__title { - border-color: $color; - } - &__titleText { - color: $color; - } +.border-dept { + .Section { + &__title { + border-color: var(--department-color); + } + &__titleText { + color: var(--department-color); } } } -@each $status, $color in $status-colors { - .manifest-indicator-#{$status} { - color: $color !important; +@each $status-name, $color-value in $manifest_status_map { + .manifest-indicator-#{$status-name} { + color: $color-value; + } +} + +.CrewManifest { + &__Cell { + padding: var(--space-s) 0; + + &--Rank { + color: var(--color-label); + } + } + + &__Icons { + padding: var(--space-s) var(--space-l); + text-align: right; + } + + &__Icon { + color: var(--color-label); + position: relative; + + &:not(:last-child) { + margin-right: var(--space-m); + } + + &--Chevron { + padding-right: var(--space-xs); + } + + &--Command { + color: var(--color-yellow); + } } } diff --git a/tgui/packages/tgui/styles/interfaces/DeForestLogo.scss b/tgui/packages/tgui/styles/interfaces/DeForestLogo.scss new file mode 100644 index 00000000000..5c247781bd0 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/DeForestLogo.scss @@ -0,0 +1,7 @@ +.deforest_logo { + background-color: hsl(150, 100%, 18%); + -webkit-mask-image: url('../assets/bg-deforest.svg'); + mask-image: url('../assets/bg-deforest.svg'); + mask-repeat: no-repeat; + mask-position: center; +} diff --git a/tgui/packages/tgui/styles/interfaces/DetectiveBoard.scss b/tgui/packages/tgui/styles/interfaces/DetectiveBoard.scss new file mode 100644 index 00000000000..d5adcaa4e0b --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/DetectiveBoard.scss @@ -0,0 +1,230 @@ +@use '../colors.scss'; +@use '../base.scss'; + +.BoardTab { + display: flex; + align-items: center; + justify-content: space-between; + color: var(--color-black); + min-height: 2.25em; + min-width: 4em; + border-radius: var(--border-radius-large) var(--border-radius-large) 0 0; + transform-origin: 50% 100%; + transition-property: background-color, transform; + transition-duration: var(--transition-time-medium); +} + +.BoardTab__Text { + margin-right: var(--space-m); +} + +.BoardTab__Contain { + flex-grow: 1; + margin: 0 var(--space-m); +} + +.BoardTab__Perspective:not(.BoardTab__Contain) { + perspective-origin: 50%; + transform: perspective(100px) rotateX(25deg); +} + +.BoardTab__Selected { + background-color: hsl(45, 82%, 66%); +} + +.BoardTabs { + display: flex; + align-items: stretch; + overflow: hidden; +} + +.Evidence__Pin { + box-shadow: var(--shadow-glow-small) hsla(0, 0%, 0%, 0.33); + background-color: hsl(0, 65%, 40%); + border-radius: var(--border-radius-circular); + width: 16px; + height: 16px; + transition: + transform 0.2s ease, + box-shadow 0.2s ease; + border: 1px solid hsla(0, 0%, 0%, 0.3); + background-image: radial-gradient( + circle at 30% 30%, + rgba(255, 255, 255, 0.5) 0%, + rgba(255, 255, 255, 0) 60% + ); +} + +.Evidence__Pin:hover { + transform: scale(1.2); + cursor: var(--cursor-pointer); + box-shadow: 0 0 12px hsla(0, 72%, 50%, 0.7); +} + +.Evidence__Pin--connecting { + background-color: hsl(0, 82%, 60%); + box-shadow: 0 0 15px hsla(0, 72%, 50%, 0.9); + transform: scale(1.3); +} + +.Evidence__Box { + cursor: var(--cursor-pointer); + box-shadow: 0 4px 12px hsla(0, 0%, 0%, 0.6); + padding: var(--space-m); + color: var(--color-black); + min-width: 200px; + max-width: 300px; + background-color: hsl(46, 39%, 94%); + border: 2px solid hsl(35, 30%, 50%); + user-select: none; + -ms-user-select: none; + text-wrap: wrap; + position: relative; + background-image: repeating-linear-gradient( + 0deg, + rgba(0, 0, 0, 0.06) 0px, + rgba(0, 0, 0, 0.06) 1px, + transparent 1px, + transparent 22px + ); + transition: all 0.3s ease; +} + +.Evidence__Box:hover { + box-shadow: 0 8px 16px hsla(0, 0%, 0%, 0.7); + transform: translateY(-4px) rotate(0.5deg); + border-color: hsl(35, 40%, 40%); + transition: transform 0.3s ease; +} + +.Evidence--dragging .Evidence__Box { + animation: card-sway 1s ease-in-out infinite; + box-shadow: 0 12px 24px hsla(0, 0%, 0%, 0.7); + transform: translateY(-8px) rotate(1deg) translateX(10px); + transition: all 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275); + border-color: hsl(35, 40%, 30%); + z-index: 100; +} + +.Evidence__Box::after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: linear-gradient( + 135deg, + rgba(255, 255, 255, 0.3) 0%, + rgba(255, 255, 255, 0) 50% + ); + pointer-events: none; +} + +.Evidence__Box::before { + content: ''; + position: absolute; + top: 0; + right: 0; + width: 20px; + height: 20px; + background: linear-gradient( + 135deg, + transparent 0%, + transparent 50%, + rgba(0, 0, 0, 0.05) 50%, + rgba(0, 0, 0, 0.05) 100% + ); + pointer-events: none; +} + +.Evidence__Box__TextBox { + border-top: var(--border-thickness-tiny) dashed hsl(36, 29%, 80%); + text-wrap: wrap; + padding: var(--space-m) 0; + margin-top: var(--space-m); + max-width: 240px; + text-align: center; + font-family: 'Courier New', Courier, monospace; + color: #333; + + &.title { + border-top: none; + margin-top: 0; + font-weight: bold; + font-size: 1.1em; + color: #22131b; + text-transform: uppercase; + letter-spacing: 1px; + text-align: center; + text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5); + } +} + +.Board__Content { + position: relative; + background-color: hsl(45, 82%, 66%); + padding: var(--space-m); + overflow: hidden; + height: 95%; + background-image: + radial-gradient(circle, rgba(0, 0, 0, 0.1) 1px, transparent 1px), + radial-gradient(circle, rgba(0, 0, 0, 0.1) 1px, transparent 1px); + background-size: 16px 16px; + background-position: + 0 0, + 8px 8px; +} + +.Evidence__Icon { + image-rendering: pixelated; + margin-top: var(--space-m); + border: var(--border-thickness-large) solid hsl(0, 0%, 88%); + width: 100%; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3); + transition: transform 0.2s ease; + filter: sepia(20%); +} + +.Evidence__Icon:hover { + transform: scale(1.02); + filter: sepia(0%); +} + +@each $color-name, $color-value in colors.$color-map { + .BoardTab__#{$color-name} { + cursor: var(--cursor-pointer); + background-color: hsl(from $color-value h s calc(l + var(--adjust-color))); + color: var(--color-text-fixed-black); + } + + .BoardTab__#{$color-name}:hover { + background-color: hsl( + from $color-value h s calc(l + var(--adjust-color) * 2.5) + ); + } +} + +@keyframes float { + 0% { + transform: translateY(0px); + } + 50% { + transform: translateY(-5px); + } + 100% { + transform: translateY(0px); + } +} + +@keyframes card-sway { + 0% { + transform: rotate(-1deg) translateX(0); + } + 50% { + transform: rotate(1deg) translateX(5px); + } + 100% { + transform: rotate(-1deg) translateX(0); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/Emojipedia.scss b/tgui/packages/tgui/styles/interfaces/Emojipedia.scss new file mode 100644 index 00000000000..d6ec654cc80 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Emojipedia.scss @@ -0,0 +1,8 @@ +.emojipedia16x16 { + transform-origin: center; + margin: var(--space-m); + + &:hover { + transform: scale(1.5); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/EventLogger.scss b/tgui/packages/tgui/styles/interfaces/EventLogger.scss new file mode 100644 index 00000000000..f8e33cbf22b --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/EventLogger.scss @@ -0,0 +1,16 @@ +// Custom HTML tooltip shown on timeline mark hover, rendered at fixed position +.evlog-mark-tooltip { + position: fixed; + background: #1e1e2e; + border: 1px solid #555; + border-radius: 4px; + padding: 4px 8px; + white-space: pre-wrap; + font-size: 11px; + color: #ccc; + pointer-events: none; + z-index: 9999; + min-width: 120px; + max-width: 320px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.6); +} diff --git a/tgui/packages/tgui/styles/interfaces/ExperimentConfigure.scss b/tgui/packages/tgui/styles/interfaces/ExperimentConfigure.scss new file mode 100644 index 00000000000..c2135bc9b0e --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/ExperimentConfigure.scss @@ -0,0 +1,108 @@ +.ExperimentTechwebServer__Web, +.ExperimentConfigure__ExperimentPanel { + background: var(--color-black); + border: var(--border-thickness-tiny) solid var(--color-primary); + margin: var(--space-s) 0; + + &--selected { + border: var(--border-thickness-tiny) solid var(--button-background-selected); + } +} + +.ExperimentTechwebServer__WebHeader { + background: var(--color-primary); + padding: var(--space-xs); +} + +.ExperimentTechwebServer__WebName { + font-size: 18px; +} + +.ExperimentTechwebServer__WebContent { + padding: var(--space-sm); +} + +.ExperimentTechwebServer__WebContent > .LabeledList { + margin: var(--space-s) var(--space-s) var(--space-s) var(--space-xl); +} + +.ExperimentConfigure__ExperimentName { + font-weight: bold; + border-radius: 0; +} + +.ExperimentConfigure__ExperimentNameFakeButton { + background-color: var(--color-primary); + font-weight: bold; + border-radius: 0; + position: relative; + display: block; + margin-left: 0; + margin-right: 0; + white-space: nowrap; + line-height: var(--button-height); + padding: 0 var(--space-m); + margin-bottom: var(--space-xs); + border-radius: var(--button-border-radius); + outline: none; + &__content { + display: block; + align-self: stretch; + } +} + +.ExperimentConfigure__ExperimentContent { + /* prettier-ignore */ + padding: var(--space-s) calc(var(--space-xl) * 1.5) var(--space-s) var(--space-s); +} + +.ExperimentStage__Indicator { + font-weight: bold; + text-align: center; +} + +.ExperimentStage__StageContainer.complete .ExperimentStage__Description { + opacity: 0.4; + text-decoration: line-through; +} + +.ExperimentStage__StageContainer { + margin-bottom: var(--space-m); +} + +.ExperimentStage__Table { + border-collapse: separate; + border-spacing: var(--space-s) var(--space-s); +} + +.ExperimentConfigure__PerformExperiment { + text-align: center; + padding: var(--space-l) 0; +} + +.ExperimentConfigure__ExperimentsContainer { + height: 100%; + display: flex; + flex-direction: column; +} + +.ExperimentConfigure__ExperimentsContainer > :last-child { + flex: 1; +} + +// Required for the time being otherwise we'll end up coloring the tooltip +// by accident when we color the tag. +.ExperimentConfigure__TagContainer { + position: absolute; + right: 0; + top: 0; +} + +.ExperimentConfigure__PerformanceHint * { + position: absolute; + width: 100%; + height: 100%; + right: 0; + top: 0; + color: var(--color-text-translucent); +} diff --git a/tgui/packages/tgui/styles/interfaces/Fabricator.scss b/tgui/packages/tgui/styles/interfaces/Fabricator.scss new file mode 100644 index 00000000000..e464611f5fb --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Fabricator.scss @@ -0,0 +1,207 @@ +@use '~tgui-core/styles/components/Button' as button; + +.Fabricator__Recipe { + padding: var(--space-s) 0; + border-bottom: var(--border-radius-tiny) solid var(--color-black); + position: relative; + + &:last-child { + border-bottom: 0; + } +} + +.Fabricator__PrintAmount { + min-height: 100%; +} + +.Fabricator__PrintAmount { + transition: opacity var(--transition-time-slow) ease-out; +} + +.Fabricator__PrintAmount--disabled { + opacity: 0.5; + background-color: transparent; +} + +.Fabricator__PrintAmount--disabled { + text-decoration: line-through; +} + +.MaterialDock { + position: relative; + padding: var(--space-m); + border-radius: 0 0 var(--border-radius-small) var(--border-radius-small); + transition: opacity var(--transition-time-slow) ease-in-out; +} + +.MaterialDock--active { + background-color: hsl(0, 0%, 6.7%); + transition: background-color var(--transition-time-fas) ease-out; +} + +.MaterialDock__Label { + transition: opacity var(--transition-time-slow) ease-out; +} + +.MaterialDock--disabled .MaterialDock__Label { + opacity: 0.5; +} + +.MaterialDock__Dock { + position: absolute; + background-color: hsl(0, 0%, 6.7%); + bottom: 100%; + left: 0; + width: 100%; + padding: var(--space-xl); + border-radius: var(--border-radius-small) var(--border-radius-small) 0 0; + text-align: center; + box-shadow: 0 0 3px var(--color-black); +} + +.MaterialDock--active .MaterialDock__Dock { + animation: materialdock-open var(--transition-time-medium) ease-out; + @keyframes materialdock-open { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } +} + +.MaterialDock__Button { + width: 100%; + height: 0; + padding-bottom: 100%; + position: relative; + box-shadow: 0 0 3px var(--color-black); +} + +.FabricatorRecipe { + display: flex; + width: auto; + border-bottom: var(--border-thickness-tiny) solid hsla(0, 0%, 0%, 0.5); + position: relative; + + &:last-child { + border-bottom: 0; + } + + &__Progress { + position: absolute; + bottom: 0; + left: 0; + height: 4px; + background-color: hsla(0, 0%, 100%, 0.25); + border-radius: var(--border-radius-medium); + transition: width var(--transition-time-slowest) linear; + } + + &__Title, + &__Button { + position: relative; + display: flex; + align-items: center; + justify-content: flex-start; + margin: 0; + padding: var(--space-s) var(--space-m); + border-radius: 0; + + @include button.button-color(); + @include button.button-color-transparent(); + + &:first-child { + border-radius: var(--border-radius-medium) 0 0 var(--border-radius-medium); + } + + &:last-child { + border-radius: 0 var(--border-radius-medium) var(--border-radius-medium) 0; + } + + &--disabled { + opacity: 0.5; + } + } + + &__Title { + flex-grow: 1; + } + + &__Icon { + width: 32px; + height: 32px; + margin-right: var(--space-xl); + } + + &__Button { + justify-self: flex-end; + + &--icon { + padding: 0 var(--space-xl); + } + + &--disabled { + text-decoration: line-through; + } + } +} + +.FabricatorMaterialIcon { + display: inline-block; + position: relative; + width: 32px; + height: 32px; + + &__Icon { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + opacity: 0; + transition: opacity var(--transition-time-slow) ease-out; + + &--active { + opacity: 1; + } + } +} + +.FabricatorTabs { + .FabricatorTabs { + margin-top: var(--space-m); + padding-left: var(--space-s); + } + + &__Tab { + cursor: var(--cursor-pointer); + padding: var(--space-m); + background-color: var(--tab-background); + color: var(--tab-color); + border-right: var(--tab-indicator-size) solid transparent; + border-radius: var(--tab-border-radius) 0 0 var(--tab-border-radius); + transition-property: border-color, background-color; + transition-duration: var(--transition-time-fast); + transition-timing-function: ease-out; + + &:hover, + &--active { + background-color: var(--tab-background-hover); + } + + &--active { + cursor: var(--cursor-default); + color: var(--tab-color-selected); + border-color: var(--color-primary); + } + } + + &__Label { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + } +} diff --git a/tgui/packages/tgui/styles/interfaces/FactionSelect.scss b/tgui/packages/tgui/styles/interfaces/FactionSelect.scss index d01b13e937c..5446cd188bc 100644 --- a/tgui/packages/tgui/styles/interfaces/FactionSelect.scss +++ b/tgui/packages/tgui/styles/interfaces/FactionSelect.scss @@ -1,4 +1,4 @@ -@use '../components/Divider.scss'; +@use 'tgui-core/styles/components/Divider.scss'; // Colours based on the companies' 'Official Colours' sections on the wiki. $company-colors: ( @@ -15,7 +15,8 @@ $company-colors: ( .theme-faction_select { .Divider { &--vertical--dashed { - border-left: Divider.$thickness dashed Divider.$color; + border-left: var(--divider-border); + border-left-style: dashed; } } diff --git a/tgui/packages/tgui/styles/interfaces/HellishRunes.scss b/tgui/packages/tgui/styles/interfaces/HellishRunes.scss new file mode 100644 index 00000000000..0861cad58ff --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/HellishRunes.scss @@ -0,0 +1,20 @@ +@use '../colors.scss'; +@use '../base.scss'; + +.HellishRunes__demonrune { + font-size: 20px; + margin-top: -240px; + animation-duration: 5s; + animation-name: demonrune; + animation-timing-function: linear; + animation-iteration-count: infinite; +} + +@keyframes demonrune { + from { + transform: translate(0px, 0px); + } + to { + transform: translate(0px, 194px); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/HotKeysHelp.scss b/tgui/packages/tgui/styles/interfaces/HotKeysHelp.scss new file mode 100644 index 00000000000..0e92f8a78b4 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/HotKeysHelp.scss @@ -0,0 +1,4 @@ +.HotkeysHelp__pill { + border-radius: var(--border-radius-large); + background-color: hsla(0, 0%, 100%, 0.125); +} diff --git a/tgui/packages/tgui/styles/interfaces/Hypertorus.scss b/tgui/packages/tgui/styles/interfaces/Hypertorus.scss new file mode 100644 index 00000000000..bb0e7dbfad5 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Hypertorus.scss @@ -0,0 +1,158 @@ +@use '../colors.scss'; + +/// Index @{ + +.hypertorus-layout { + margin-right: -0.5em; +} + +.hypertorus-layout > * { + margin-bottom: 0.5em; + margin-right: 0.5em; +} + +/// @} + +/// Recipes @{ + +// Subtle horizontal stripes for the table +.hypertorus-recipes__row:nth-child(odd) { + background-color: rgba(0, 0, 0, 0.37); +} +.hypertorus-recipes__row:nth-child(even) { + background-color: rgba(14, 14, 14, 0.37); +} + +// Highlight an active row +.hypertorus-recipes__activerow:nth-child(odd) { + background-color: rgba(20, 50, 81, 0.37); +} +.hypertorus-recipes__activerow:nth-child(even) { + background-color: rgba(29, 61, 98, 0.37); +} + +// Headers shouldn't get stripes, but should take the label text color. +// Headers get left borders as a separator, except if they're furtherest left. +.hypertorus-recipes__row.Table__row--header { + color: colors.fg(var(--color-label)); + background-color: rgba(0, 0, 0, 0); +} +.hypertorus-recipes__row.Table__row--header > td { + border-left: 1px solid colors.bg(var(--color-label)); + text-align: center; +} +.hypertorus-recipes__row.Table__row--header > td:first-child { + border-left: none; +} + +// Recipe icons are red, unless they're in a header +.hypertorus-recipes__icon { + text-align: center; + position: relative; + color: colors.fg(var(--color-red)); + width: 10px; +} +.hypertorus-recipes__row.Table__row--header * .hypertorus-recipes__icon { + color: colors.fg(var(--color-label)); +} + +/// @} + +/// Temperatures @{ + +// Note: Height must be kept in sync with Hypertorus/Temperatures.js +$height: 200px; + +// Calculate the space needed for the labels to the left of the chart +$yAxisLabelWidth: 60px; +$yAxisIconPadding: 2px; +$yAxisIconWidth: 14px; +$yAxisMargin: $yAxisLabelWidth + $yAxisIconWidth + $yAxisIconPadding * 2; + +// Relative container respects the padding provided by Section +.hypertorus-temperatures__container { + position: relative; + margin-right: 10px; + overflow-y: hidden; +} + +.hypertorus-temperatures__y-axis-marks { + margin-left: 1px; + margin-right: 1px; + width: $yAxisMargin; +} + +.hypertorus-temperatures__x-axis { + background-color: colors.bg(var(--color-label)); + position: absolute; + top: $height; + height: 1px; + left: $yAxisMargin; + right: 0; +} + +.hypertorus-temperatures__y-axis { + background-color: colors.bg(var(--color-label)); + position: absolute; + width: 1px; + left: $yAxisMargin; + height: $height; +} + +// Note: top set in js +.hypertorus-temperatures__y-axis-tick-anchor { + position: absolute; + left: 0px; + right: 0; +} + +.hypertorus-temperatures__y-axis-tick { + background-color: colors.bg(var(--color-label)); + position: absolute; + left: $yAxisMargin; + right: 0; + height: 1px; +} + +.hypertorus-temperatures__y-axis-label { + text-align: right; + color: colors.fg(var(--color-label)); + position: absolute; + top: 0; + left: 0; + width: $yAxisMargin; +} + +.hypertorus-temperatures__y-axis-icon { + display: inline-block; + margin-right: $yAxisIconPadding; +} + +.hypertorus-temperatures__chart { + left: 0; + right: 0; + margin-left: $yAxisMargin; +} + +.hypertorus-temperatures__vertical-bar { + height: $height; + position: relative; + width: 17px; + bottom: 0; +} + +// Note: top set in js +.hypertorus-temperatures__vertical-bar > * { + position: absolute; + left: -0.5px; + right: -0.5px; + bottom: 0px; + border-radius: 0.16em; +} + +.hypertorus__unselectable { + user-select: none; + -ms-user-select: none; +} + +/// @} diff --git a/tgui/packages/tgui/styles/interfaces/IntegratedCircuit.scss b/tgui/packages/tgui/styles/interfaces/IntegratedCircuit.scss new file mode 100644 index 00000000000..6c344819924 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/IntegratedCircuit.scss @@ -0,0 +1,143 @@ +@use 'sass:map'; +@use '../colors.scss'; +@use '../base.scss'; + +$map-keys: colors.$color-map !default; + +.CircuitInfo__Examined { + background-color: var(--color-black); + padding: var(--space-ml); + border-radius: var(--border-radius-large); + + user-select: none; + pointer-events: none; +} + +.ObjectComponent { + pointer-events: auto; +} + +.ObjectComponent__Titlebar { + border-top-left-radius: var(--border-radius-huge); + border-top-right-radius: var(--border-radius-huge); + + white-space: nowrap; + + -ms-user-select: none; + user-select: none; +} + +.ObjectComponent__Content { + white-space: nowrap; + background-color: hsla(0, 0%, 0%, 0.5); + + -ms-user-select: none; + user-select: none; +} + +.ObjectComponent__Greyed_Content { + white-space: nowrap; + background-color: hsla(0, 0%, 7.5%, 0.5); + + -ms-user-select: none; + user-select: none; +} + +.ObjectComponent__Port { + position: relative; + width: 13px; + height: 13px; +} + +.ObjectComponent__PortPos { + position: absolute; + inset: 0; +} + +.Tooltip__Port { + backdrop-filter: var(--tooltip-blur); + background-color: var(--tooltip-background); + border-radius: var(--tooltip-border-radius); + box-shadow: 0.1em 0.1em 1.25em -0.1em hsla(0, 0%, 0%, 0.5); + color: var(--tooltip-color); + max-width: base.em(250px); + padding: var(--space-m) var(--space-l); + text-align: left; +} + +@each $color-name, $color-value in $map-keys { + .color-stroke-#{$color-name} { + stroke: hsl(from $color-value h s calc(l + var(--adjust-color))) !important; + } + + .color-fill-#{$color-name} { + fill: hsl(from $color-value h s calc(l + var(--adjust-color))) !important; + } +} + +.IntegratedCircuit__BlueBorder { + border: var(--border-thickness-tiny) solid var(--color-border-primary); + border-radius: var(--border-radius-small); +} + +$category-colors: ( + 'Utility': ( + bg: hsl(136, 77%, 23%), + contrast: white, + ), + 'Entity': ( + bg: hsl(288, 60%, 49%), + contrast: white, + ), + 'Sensor': ( + bg: hsl(337, 67%, 66%), + contrast: white, + ), + 'Math': ( + bg: hsl(113, 65%, 47%), + contrast: black, + ), + 'Unassigned': ( + bg: hsl(208, 65%, 47%), + contrast: white, + ), + 'String': ( + bg: hsl(24, 84%, 48%), + contrast: white, + ), + 'List': ( + bg: hsl(0, 0%, 67%), + contrast: black, + ), + 'Action': ( + bg: hsl(178, 59%, 45%), + contrast: black, + ), + 'ID': ( + bg: hsl(52, 75%, 48%), + contrast: black, + ), + 'NTNet': ( + bg: hsl(239, 64%, 44%), + contrast: white, + ), + 'Abstract': ( + bg: hsl(208, 65%, 47%), + contrast: white, + ), + 'Admin': ( + bg: hsl(0, 72%, 50%), + contrast: white, + ), + 'BCI': ( + bg: black, + contrast: white, + ), +); + +@each $category-name, $values in $category-colors { + .ObjectComponent__Category__#{$category-name} { + background-color: map.get($values, bg); + color: map.get($values, contrast); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/LibraryAdmin.scss b/tgui/packages/tgui/styles/interfaces/LibraryAdmin.scss new file mode 100644 index 00000000000..501b6c6e4c9 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/LibraryAdmin.scss @@ -0,0 +1,18 @@ +.LibraryAdmin_RecordCell { + text-align: center; + vertical-align: middle; + padding: var(--space-sm) 0; + white-space: nowrap; +} + +.LibraryAdmin_RecordHeader { + text-align: center; + font-size: 150%; + vertical-align: middle; + padding: var(--space-sm) 0; + white-space: nowrap; +} + +.LibraryAdmin_RecordCell:nth-child(odd) { + background: hsla(0, 0%, 0%, 0.1); +} diff --git a/tgui/packages/tgui/styles/interfaces/LibraryComputer.scss b/tgui/packages/tgui/styles/interfaces/LibraryComputer.scss new file mode 100644 index 00000000000..581932265ac --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/LibraryComputer.scss @@ -0,0 +1,11 @@ +.LibraryComputer__CultNonsense { + font-size: 28px; + width: 100%; + font-family: copperplate; + height: 100%; +} + +.LibraryComputer__CultText { + font-family: copperplate; + font-size: 20px; +} diff --git a/tgui/packages/tgui/styles/interfaces/ListInput.scss b/tgui/packages/tgui/styles/interfaces/ListInput.scss index a7c74e6252d..43fb73ea9bc 100644 --- a/tgui/packages/tgui/styles/interfaces/ListInput.scss +++ b/tgui/packages/tgui/styles/interfaces/ListInput.scss @@ -11,20 +11,20 @@ } .ListInput__Section .Section__titleText { - font-size: base.em(12px); + font-size: 1rem; } .ListInput__Loader { - width: 100%; position: relative; + width: 100%; height: 4px; } .ListInput__LoaderProgress { position: absolute; - transition: - background-color 500ms ease-out, - width 500ms ease-out; - background-color: colors.bg(colors.$primary); height: 100%; + background-color: colors.bg(var(--color-primary)); + transition-property: background-color, width; + transition-duration: var(--transition-time-slow); + transition-timing-function: ease-out; } diff --git a/tgui/packages/tgui/styles/interfaces/Mecha.scss b/tgui/packages/tgui/styles/interfaces/Mecha.scss new file mode 100644 index 00000000000..7697262b0d1 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Mecha.scss @@ -0,0 +1,41 @@ +.Mecha__displayBox { + background-color: hsl(150, 100%, 1%); + border: 0.167em inset hsl(50, 33%, 91%); + color: hsl(132, 100%, 45%); + font-size: 2em; + font-family: monospace; + padding: 0.25em; +} + +.Mecha__displayBoxRed { + background-color: hsl(150, 100%, 1%); + border: 0.167em inset hsl(50, 33%, 91%); + color: hsl(0, 89%, 64%); + font-size: 2em; + font-family: var(--font-family-mono); + padding: 0.25em; +} + +.Mecha__Button { + outline-width: 0.25rem !important; + border-width: 0.65rem !important; + padding-left: 0 !important; + padding-right: 0 !important; +} + +.Mecha__ButtonDanger { + background-color: var(--button-background-danger) !important; + border-color: var(--button-background-danger) !important; + outline-width: 0.25rem !important; + border-width: 0.65rem !important; + padding-left: 0 !important; + padding-right: 0 !important; + &:hover { + background-color: hsl( + from var(--button-background-danger) h s calc(l + var(--adjust-hover)) + ) !important; + border-color: hsl( + from var(--button-background-danger) h s calc(l + var(--adjust-hover)) + ) !important; + } +} diff --git a/tgui/packages/tgui/styles/interfaces/NtosMessenger.scss b/tgui/packages/tgui/styles/interfaces/NtosMessenger.scss new file mode 100644 index 00000000000..b89209d4fb9 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/NtosMessenger.scss @@ -0,0 +1,101 @@ +/* Some themes have bad contrast on primary color */ +.NtosChatMessage { + .theme-ntOS95 & { + --color-primary: var(--color-section); + border: var(--border-thickness-small) outset var(--95-outline); + } + + .theme-ntos_terminal & { + --color-primary: hsl(from var(--terminal-color) h s calc(l - 40)); + } +} + +.NtosChatMessage { + display: inline-flex; + flex-direction: column; + max-width: 25rem; + margin: 0; + padding: var(--space-sm) var(--space-ml); + border-radius: var(--border-radius-small); + background-color: hsl(from var(--color-primary) h s calc(l - 12.5)); + + &_outgoing { + @extend .NtosChatMessage; + background-color: hsl(from var(--color-primary) h s calc(l + 7.5)); + text-align: right; + float: right; + } + + &__timestamp { + height: 0.9rem; + margin-top: var(--space-sm); + margin-left: var(--space-m); + } + + &__content { + display: flex; + justify-content: space-between; + min-width: 9rem; + overflow-wrap: break-word; + text-align: left; + word-break: break-word; + } + + &__everyone { + margin-top: var(--space-m); + font-size: 0.8rem; + color: lightgrey; + } + + &__image { + image-rendering: pixelated; + align-self: flex-start; + margin-top: var(--space-m); + max-width: 25rem; + } +} + +.NtosChatLog { + padding: var(--space-l); + min-height: 99.5%; + margin: 0; +} + +.NtosChatLog__ImagePreview { + width: fit-content; + height: fit-content; + + & img { + image-rendering: pixelated; + height: auto; + width: 30rem; + justify-self: center; + align-self: center; + } +} + +.UnreadDivider { + position: relative; + display: flex; + font-size: 1rem; + text-align: center; + + & > span { + color: var(--color-red); + } + + & > div { + display: inline-flex; + flex: 1; + border-bottom: var(--border-thickness-small) solid var(--color-red); + height: 50%; + + &:last-child { + margin-left: 1%; + } + + &:first-child { + margin-right: 1%; + } + } +} diff --git a/tgui/packages/tgui/styles/interfaces/NtosNanopaint.scss b/tgui/packages/tgui/styles/interfaces/NtosNanopaint.scss new file mode 100644 index 00000000000..f3dbed400a6 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/NtosNanopaint.scss @@ -0,0 +1,34 @@ +@use '../colors.scss'; + +.NtosNanopaint__NewDialog__TemplateCell { + border-radius: 0%; + background-color: var(--color-base); + + &:nth-child(odd) { + background-color: colors.fg(var(--color-base)); + } + + &:hover { + background-color: colors.fg(var(--color-primary)); + } +} + +.NtosNanopaint__NewDialog__TemplatePreview { + border-color: black; + border-width: 1px; + background-color: white; + margin: 0.5rem; +} + +.NtosNanopaint__SelectDialog__EntryCell { + border-radius: 0%; + background-color: var(--color-base); + + &.Button--selected { + background-color: var(--color-primary); + } + + &:hover { + background-color: colors.fg(var(--color-primary)); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/NtosNotepad.scss b/tgui/packages/tgui/styles/interfaces/NtosNotepad.scss new file mode 100644 index 00000000000..2d3431ef322 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/NtosNotepad.scss @@ -0,0 +1,43 @@ +.NtosNotepad__layout { + display: flex; + flex-direction: column; + height: 100%; +} + +.NtosNotepad__AboutDialog__logo { + display: inline-block; + text-align: center; + width: 100%; + font-family: var(--font-family-mono); + font-size: 2rem; +} + +.NtosNotepad__AboutDialog__text { + display: flex; + flex-direction: column; + font-size: 1rem; +} + +.NtosNotepad__textarea { + background-color: var(--color-section); + height: 100%; + resize: none; + color: inherit; + outline: none; + width: 100%; + font-family: var(--font-family-mono); +} + +.NtosNotepad__StatusBar { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-end; +} + +.NtosNotepad__StatusBar__entry { + display: block; + border-left: var(--color-thickness-tiny) solid var(--color-border-dark); + padding-left: var(--space-xl); + padding-right: var(--space-s); +} diff --git a/tgui/packages/tgui/styles/interfaces/NuclearBomb.scss b/tgui/packages/tgui/styles/interfaces/NuclearBomb.scss new file mode 100644 index 00000000000..5aaee319114 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/NuclearBomb.scss @@ -0,0 +1,102 @@ +@use 'sass:color'; + +@use '../base.scss'; +@use '../colors.scss'; +@use '../functions.scss' as *; + +:root { + --nuclear-beige: hsl(50, 33%, 84%); +} + +.NuclearBomb__displayBox { + background-color: hsl(150, 100%, 1%); + border: var(--border-thickness-small) inset var(--nuclear-beige); + color: hsl(132, 100%, 45%); + font-size: 2em; + font-family: var(--font-family-mono); + padding: var(--space-s); +} + +.NuclearBomb__Button { + outline-width: 0.25rem !important; + border-width: 0.65rem !important; + padding-left: 0 !important; + padding-right: 0 !important; + transition-duration: 0s; + border-style: outset !important; + border-color: var(--nuclear-beige); + + i.Icon { + margin: 0; + } + + &:active { + border-style: inset !important; + + .Button__content { + opacity: 0.75; + transform: translate(0px, 2px); + } + } +} + +.NuclearBomb__Button--keypad { + background-color: var(--nuclear-beige); + border-color: ar(--nuclear-beige); + + &:hover:not(:active) { + background-color: hsl( + from var(--nuclear-beige) h s calc(l + var(--adjust-hover)) + ) !important; + border-color: hsl( + from var(--nuclear-beige) h s calc(l + var(--adjust-hover)) + ) !important; + } +} + +.NuclearBomb__Button--1, +.NuclearBomb__Button--2, +.NuclearBomb__Button--3, +.NuclearBomb__Button--4, +.NuclearBomb__Button--5, +.NuclearBomb__Button--6, +.NuclearBomb__Button--7, +.NuclearBomb__Button--8, +.NuclearBomb__Button--9, +.NuclearBomb__Button--0 { + color: rgb(56, 52, 52); + background-color: var(--nuclear-beige) !important; +} + +.NuclearBomb__Button--E { + background-color: var(--button-background-caution) !important; + border-color: var(--button-background-caution) !important; + &:hover:not(:active) { + background-color: hsl( + from var(--button-background-caution) h s calc(l + var(--adjust-hover)) + ) !important; + border-color: hsl( + from var(--button-background-caution) h s calc(l + var(--adjust-hover)) + ) !important; + } +} + +.NuclearBomb__Button--C { + background-color: var(--button-background-danger) !important; + border-color: var(--button-background-danger) !important; + &:hover:not(:active) { + background-color: hsl( + from var(--button-background-danger) h s calc(l + var(--adjust-hover)) + ) !important; + border-color: hsl( + from var(--button-background-danger) h s calc(l + var(--adjust-hover)) + ) !important; + } +} + +.NuclearBomb__NTIcon { + background-image: url('tgui-core/assets/bg-nanotrasen.svg'); + background-size: 70%; + background-position: center; + background-repeat: no-repeat; +} diff --git a/tgui/packages/tgui/styles/interfaces/OperatingComputer.scss b/tgui/packages/tgui/styles/interfaces/OperatingComputer.scss new file mode 100644 index 00000000000..b7b3cf03fbf --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/OperatingComputer.scss @@ -0,0 +1,25 @@ +.theme-operating_computer { + .Layout__content { + background-image: url('../assets/bg-deforest.svg'); + background-size: 90%; + } + // Base + --color-base: hsl(150, 100%, 18%); + --color-primary: hsl(from var(--color-base) h s calc(l + 5)); + --color-border-primary: hsla(0, 0%, 100%, 0.75); + --secondary-lightness-adjustment: -10; + --base-gradient-spread: 0; + + // Components + --button-background-selected: hsl(0, 90.3%, 32.35%); + --button-background-caution: hsl(29.5, 90.95%, 39.02%); + --button-background-danger: hsl(61.15, 100%, 30.78%); + --button-border-radius: 0; + + --collapsible-background-selected: hsl(0, 90.3%, 32.35%); + --collapsible-background-caution: hsl(29.5, 90.95%, 39.02%); + --collapsible-background-danger: hsl(61.15, 100%, 30.78%); + + --progress-bar-background: hsla(0, 0%, 0%, 0.5); + --tab-background-selected: var(--color-base); +} diff --git a/tgui/packages/tgui/styles/interfaces/Orbit.scss b/tgui/packages/tgui/styles/interfaces/Orbit.scss new file mode 100644 index 00000000000..aeeab2bcca9 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Orbit.scss @@ -0,0 +1,19 @@ +.JobIcon { + background: var(--color-black); + width: 20px; + height: 20px; + padding: var(--space-xxs) var(--space-xxs) 0; + overflow: hidden; +} + +.OrbitItem__selected { + position: absolute; + top: 0; + right: 0; + width: 0; + height: 0; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid white; + transform: translateX(-50%); +} diff --git a/tgui/packages/tgui/styles/interfaces/Paper.scss b/tgui/packages/tgui/styles/interfaces/Paper.scss new file mode 100644 index 00000000000..8bbfe4601ab --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Paper.scss @@ -0,0 +1,18 @@ +/** + * @file + * @copyright 2020 + * @author ThePotato97 (https://github.com/ThePotato97) + * @license ISC + */ + +.Paper { + &__Stamp { + position: absolute; + pointer-events: none; + user-select: none; + } + &__Page { + word-break: break-word; + word-wrap: break-word; + } +} diff --git a/tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss b/tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss new file mode 100644 index 00000000000..cff7b09fbe8 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/PreferencesMenu.scss @@ -0,0 +1,240 @@ +@use 'sass:color'; +@use 'sass:map'; +@use '../colors.scss'; +@use '../base.scss'; + +$department_map: ( + 'Assistant': var(--color-gray), + 'Captain': colors.fg(var(--color-blue)), + 'Cargo': var(--color-brown), + 'Command': var(--color-yellow), + 'Security': var(--color-red), + 'Engineering': hsl(from var(--color-orange) h s calc(l + 7.5)), + 'Medical': var(--color-teal), + 'Science': colors.fg(var(--color-purple)), + 'Service': var(--color-green), + 'Silicon': var(--color-pink), +); + +.ChoicedSelection { + padding: var(--space-m); + background-color: var(--color-base); + box-shadow: 0 0.5em 1em hsla(0, 0%, 0%, 0.5); +} + +.PreferencesMenu { + &__Antags { + &__antagSelection { + gap: var(--space-l); + + @mixin animate-hover { + .antagonist-icon-parent .antagonist-icon { + &:hover { + transform: scale(1.3); + transition: transform var(--transition-time-fast) ease-out; + } + } + } + + &__antagonist { + .antagonist-icon-parent { + cursor: var(--cursor-pointer); + border-style: solid; + border-radius: var(--border-radius-circular); + border-width: var(--border-thickness-large); + box-sizing: content-box; + overflow: hidden; + position: relative; + + height: 96px; + width: 96px; + + .antagonist-icon { + image-rendering: pixelated; + border-radius: var(--border-radius-circular); + overflow: hidden; + transition: transform var(--transition-time-fast) ease-in; + } + } + + &--off { + @include animate-hover; + + .antagonist-icon-parent { + border-color: var(--color-red); + + .antagonist-icon { + opacity: 0.5; + + &:hover { + opacity: 1; + } + } + } + } + + &--on { + @include animate-hover; + + .antagonist-icon-parent { + border-color: var(--color-green); + } + } + + &--banned { + .antagonist-icon-parent { + border-color: var(--color-grey); + } + + .antagonist-icon { + opacity: 0.5; + } + } + + .antagonist-banned-slash { + background: var(--color-grey); + + width: 100%; + height: 3px; + + position: absolute; + top: 50%; + left: 50%; + transform: translateY(-50%) translateX(-50%) rotate(35deg); + + opacity: 0.8; + } + + .antagonist-days-left { + text-align: center; + text-shadow: 1px 1px 1px hsl(0, 0%, 13.3%); + + width: 100%; + + position: absolute; + top: 50%; + left: 50%; + transform: translateY(-50%) translateX(-50%); + } + } + } + } + + &__Jobs { + > * { + flex: 1; + } + + &__departments { + @each $department-name, $color-value in $department_map { + &--#{$department-name} { + &.head { + background: $color-value; + + .job-name { + font-weight: bold; + } + } + + background: colors.fg($color-value); + border: var(--border-thickness-small) outset colors.fg($color-value); + color: black; + + > * { + height: calc(100% + 0.2em); + padding-bottom: 0.2em; + } + + .options { + margin-right: var(--space-xxs); + background: hsla(0, 0%, 0%, 0.2); + height: 100%; + } + } + + &--Captain { + border: var(--border-thickness-medium) + outset + hsla(60, 100%, 39.2%, 1); + + &:first-child { + border-top: var(--border-thickness-medium) + outset + hsla(60, 100%, 39.2%, 1); + } + + .job-name { + font-size: 17px; + } + } + } + + &__priority { + border: var(--border-thickness-tiny) solid hsla(0, 0%, 0%, 0.3); + + &--off::after { + content: ''; + + background: hsla(0, 0%, 0%, 0.2); + display: block; + height: 80%; + left: 50%; + position: relative; + top: 50%; + transform: translateX(-50%) translateY(-50%) rotate(40deg); + width: 2px; + } + } + } + + &__PriorityHeader { + font-weight: bold; + transform: translateX(-4px) translateY(-8px) rotate(315deg); + white-space: nowrap; + width: 19px; + } + } + + &__Quirks { + &__QuirkList { + scrollbar-color: var(--color-grey) transparent; + background-color: var(--color-light-grey); + width: 100%; + overflow-x: hidden; + overflow-y: scroll; + + &__quirk { + cursor: var(--cursor-pointer); + background-color: var(--color-white); + border-bottom: var(--border-thickness-tiny) solid var(--color-black); + color: hsl(0, 0%, 6.7%); + transition: background-color var(--transition-time-fast) ease-in; + + $quality_map: ( + 'positive': var(--color-green), + 'neutral': var(--color-white), + 'negative': var(--color-red), + ); + + @each $quality, $color-value in $quality_map { + &--#{$quality} { + background-color: $color-value; + transition: background-color var(--transition-time-fast) ease-in; + } + } + + &:hover { + background-color: var(--color-grey); + transition: background-color var(--transition-time-fast) ease-out; + + @each $quality, $color-value in $quality_map { + .PreferencesMenu__Quirks__QuirkList__quirk--#{$quality} { + background-color: hsl(from $color-value h s calc(l - 10)); + transition: background-color var(--transition-time-fast) ease-out; + } + } + } + } + } + } +} diff --git a/tgui/packages/tgui/styles/interfaces/RequestManager.scss b/tgui/packages/tgui/styles/interfaces/RequestManager.scss index 1003440243a..3780d07b0a0 100644 --- a/tgui/packages/tgui/styles/interfaces/RequestManager.scss +++ b/tgui/packages/tgui/styles/interfaces/RequestManager.scss @@ -3,100 +3,81 @@ * SPDX-License-Identifier: MIT */ -@use '../base.scss'; -@use '../colors.scss'; -@use '../functions.scss'; - -$color-prayer: colors.bg(colors.$purple) !default; -$color-centcom: colors.bg(colors.$yellow) !default; -$color-syndicate: colors.bg(colors.$red) !default; -$color-nuke: colors.bg(colors.$yellow) !default; -$color-fax: colors.bg(colors.$green) !default; -$color-music: colors.bg(colors.$teal) !default; -$color-muted: colors.bg(colors.$label) !default; -$color-header: colors.bg(colors.$label) !default; -$background-color: base.$color-bg-section !default; -$text-color: base.$color-fg !default; - .RequestManager__request_centcom, .RequestManager__request_nuke, .RequestManager__request_prayer, .RequestManager__request_syndicate { - margin-right: 0.5rem; + margin-right: var(--space-m); } .RequestManager__request_prayer { - color: $color-prayer; + color: var(--color-purple); } .RequestManager__request_centcom { - color: $color-centcom; + color: var(--color-yellow); } .RequestManager__request_syndicate { - color: $color-syndicate; + color: var(--color-red); } .RequestManager__request_nuke { - color: $color-nuke; + color: var(--color-orange); } .RequestManager__request_fax { - color: $color-fax; + color: var(--color-green); } .RequestManager__request_internet_sound { - color: $color-music; + color: var(--color-teal); } .RequestManager__header { line-height: 1.375rem; min-height: 1.375rem; - color: $color-muted; + padding: 0; + color: var(--color-label); white-space: break-spaces; - word-wrap: pre-wrap; vertical-align: baseline; - margin-bottom: 0; - padding-bottom: 0.1rem; + margin-bottom: var(--space-xs); } .RequestManager__headerText { - margin-right: 0.5rem; + margin-right: var(--space-m); font-size: 1rem; font-weight: bold; - color: $color-header; + color: var(--color-label); } .RequestManager__timestamp { - font-size: 0.75rem; -} - -.RequestManager__row:first-of-type { - margin-top: 0rem; + font-size: var(--space-l); } .RequestManager__row { - padding-top: 0.125rem; - padding-bottom: 0.125rem; - padding-left: 0.5rem; - padding-right: 0.5rem; - margin-top: 0.75rem; + padding: var(--space-s) var(--space-m); + margin-top: var(--space-l); min-height: 2.75rem; -} -.RequestManager__row:hover { - background-color: rgba(0, 0, 0, 0.25); -} + &:first-of-type { + margin-top: 0; + } -.RequestManager__row:hover .RequestManager__controlsContainer { - opacity: 1; + &:hover { + background-color: hsl(from var(--color-hover) h s 0); + } + + &:hover .RequestManager__controlsContainer { + opacity: 1; + } } .RequestManager__controlsContainer { opacity: 0; position: absolute; - right: 3px; - top: 3px; + right: var(--space-s); + top: var(--space-s); } .RequestManager__row { @@ -104,13 +85,17 @@ $text-color: base.$color-fg !default; } .RequestManager__filterPanel { - margin: 0.5rem; - padding: 0.5rem; - background-color: functions.fake-alpha($background-color, base.$color-bg); - background-color: $background-color; - color: $text-color; -} + overflow: hidden; + margin: var(--space-m); + padding: var(--space-m); + background-color: var(--color-section); + color: var(--color-text); + border: var(--border-thickness-tiny) solid var(--color-border); + border-radius: var(--border-radius-medium); + box-shadow: var(--shadow-glow-medium) hsla(0, 0%, 0%, 0.5); + backdrop-filter: var(--blur-medium); -.RequestManager__filterPanel tr:not(:last-of-type) { - margin-bottom: 0.5rem; + tr:not(:last-of-type) { + margin-bottom: var(--space-m); + } } diff --git a/tgui/packages/tgui/styles/interfaces/Roulette.scss b/tgui/packages/tgui/styles/interfaces/Roulette.scss new file mode 100644 index 00000000000..72dfc49b5b6 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Roulette.scss @@ -0,0 +1,96 @@ +.Roulette__container { + display: flex; +} + +.Roulette__board-cell { + display: table-cell; + padding: 0; + margin: 0; + border: var(--border-thickness-tiny) solid var(--color-white); + vertical-align: bottom; +} + +.Roulette__board-cell-number { + width: 35px; +} + +.Roulette__board-cell-number--colspan-2 { + width: 71px; +} + +.Roulette__board-cell-number--colspan-4 { + width: 143px; +} + +.Roulette__board-button { + display: table-cell !important; + border: none !important; + width: inherit; + height: 40px; + padding: 0; + margin: 0; + text-align: center; + vertical-align: middle; +} + +.Roulette__board-button--rowspan-3 { + height: 122px; +} + +.Roulette__board-button-text { + text-align: center; + font-size: 16px; + font-weight: bold; +} + +.Roulette__lowertable { + margin-top: 8px; + border-collapse: collapse; + border: var(--border-thickness-tiny) solid var(--color-white); + border-spacing: 0; +} + +.Roulette__lowertable--cell { + border: var(--border-thickness-small) solid var(--color-white); + padding: 0px; + margin: 0px; +} + +.Roulette__lowertable--betscell { + vertical-align: top; +} + +.Roulette__lowertable--spinresult { + text-align: center; + font-size: 100px; + font-weight: bold; + vertical-align: middle; +} + +.Roulette__lowertable--spinresult-black { + background-color: var(--color-black); +} + +.Roulette__lowertable--spinresult-red { + background-color: var(--color-red); +} + +.Roulette__lowertable--spinresult-green { + background-color: var(--color-green); +} + +.Roulette__lowertable--spinbutton { + margin: 0 !important; + border: none !important; + font-size: 50px; + line-height: 60px !important; + text-align: center; + font-weight: bold; +} + +.Roulette__lowertable--header { + width: 1%; + text-align: center; + font-size: 16px; + font-weight: bold; +} diff --git a/tgui/packages/tgui/styles/interfaces/Safe.scss b/tgui/packages/tgui/styles/interfaces/Safe.scss new file mode 100644 index 00000000000..8e24d2c83a3 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Safe.scss @@ -0,0 +1,92 @@ +.Safe__engraving { + position: absolute; + width: 95%; + height: 96%; + left: 2.5%; + top: 2%; + border: var(--border-thickness-larger) outset hsl(217, 27%, 34%); + padding: var(--space-m); + text-align: center; +} + +.Safe__engraving-arrow { + color: var(--color-primary); +} + +.Safe__engraving-hinge { + content: ' '; + background-color: hsl(217, 27%, 15%); + width: 25px; + height: 40px; + position: absolute; + right: -15px; + margin-top: -20px; +} + +.Safe__dialer { + margin-bottom: 1.25rem; + .Button { + width: 80px; + } +} + +.Safe__dialer-right { + .Button { + i { + z-index: -100; + } + } +} + +.Safe__dialer-number { + color: hsl(0, 0%, 73.3%); + display: inline; + background-color: hsl(217, 27%, 15%); + font-size: 1.5rem; + font-weight: bold; + padding: 0 var(--space-m); +} + +.Safe__contents { + border: 10px solid hsl(217, 27%, 15%); + background-color: hsl(217, 27%, 10%); + height: calc(85% + 7.5px); + text-align: left; + padding: var(--space-m); +} + +.Safe__help { + position: absolute; + top: 73%; + left: 10px; + width: 50%; + + font-family: 'Comic Sans MS', cursive, sans-serif; + font-style: italic; + color: black; + box-shadow: 5px 5px hsl(0, 0%, 6.7%); + background-image: linear-gradient( + to bottom, + hsl(50, 20%, 58.8%) 0%, + hsl(50, 6%, 45.5%) 100% + ); + transform: rotate(-1deg); + + &:before { + content: ' '; + display: block; + width: 24px; + height: 40px; + background-image: linear-gradient( + to bottom, + transparent 0%, + hsl(0, 0%, 100%) 100% + ); + box-shadow: 1px 1px hsl(0, 0%, 6.7%); + opacity: 0.2; + position: absolute; + top: -30px; + left: calc(50% - 12px); + transform: rotate(-5deg); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/SlotMachine.scss b/tgui/packages/tgui/styles/interfaces/SlotMachine.scss new file mode 100644 index 00000000000..48583d4d982 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/SlotMachine.scss @@ -0,0 +1,186 @@ +.SlotMachine__Banner { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 60px; + font-size: 18px; + text-align: center; + text-shadow: + 2px 2px 6px #000, + 0 2px #000, + 0 -2px #000, + 2px 0 #000, + -2px 0 #000; + + background: linear-gradient(-45deg, #d16949, #ce3771, #229dca, #189175); + background-size: 400% 400%; + animation: SlotMachine__GradientMove 10s ease infinite; +} + +@keyframes SlotMachine__GradientMove { + 0% { + background-position: 0% 50%; + } + 50% { + background-position: 100% 50%; + } + 100% { + background-position: 0% 50%; + } +} + +.SlotMachine__Banner--winning { + animation: SlotMachine__Winning 0.4s step-end infinite !important; +} + +@keyframes SlotMachine__Winning { + 0% { + color: #ff0; + background: #f00; + } + 50% { + color: #f00; + background: #ff0; + } + 100% { + color: #f00; + background: #ff0; + } +} + +.SlotMachine__BannerTitle { + font-size: 26px; + font-weight: bold; + font-family: 'Courier New', Courier, monospace; + white-space: pre; +} + +.SlotMachine__BannerTitle span { + animation: + SlotMachine__Depth1 1.2s ease-in-out alternate infinite, + SlotMachine__Depth2 0.8s ease-in-out alternate infinite; + animation-composition: replace, add; + position: relative; + display: inline-block; + padding: 0 0.075em; + @for $i from 1 through 14 { + &:nth-child(#{$i}) { + animation-delay: $i * -0.2s; + } + } +} + +@keyframes SlotMachine__Depth1 { + 0% { + transform: translatex(-0.2em) translatey(-0.1em); + } + 100% { + transform: translatex(0.2em) translatey(0.1em); + } +} + +@keyframes SlotMachine__Depth2 { + 0% { + transform: translatex(0.1em) translatey(-0.1em); + } + 100% { + transform: translatex(-0.1em) translatey(0.1em); + } +} + +.SlotMachine__Reels { + display: flex; + margin: 0 -3px; +} + +.SlotMachine__Reel { + position: relative; + flex: 1; + margin: 0 3px; + overflow: hidden; + height: 180px; + background: linear-gradient( + to bottom, + #888 0%, + #ccc 15%, + #eee 40%, + #ddd 60%, + #aaa 85%, + #666 100% + ); +} + +.SlotMachine__Reel::after { + position: absolute; + top: 58px; + left: 0; + bottom: 58px; + right: 0; + display: block; + content: ''; + border-top: 2px solid black; + border-bottom: 2px solid black; +} + +.SlotMachine__Reel:nth-child(1) .SlotMachine__IconStrip { + animation-delay: 0s; + animation-duration: 2.8s; +} + +.SlotMachine__Reel:nth-child(2) .SlotMachine__IconStrip { + animation-delay: 0.1s; + animation-duration: 3s; +} + +.SlotMachine__Reel:nth-child(3) .SlotMachine__IconStrip { + animation-delay: 0.2s; + animation-duration: 3.2s; +} + +.SlotMachine__Reel:nth-child(4) .SlotMachine__IconStrip { + animation-delay: 0.3s; + animation-duration: 3.4s; +} + +.SlotMachine__Reel:nth-child(5) .SlotMachine__IconStrip { + animation-delay: 0.4s; + animation-duration: 3.6s; +} + +.SlotMachine__IconStrip { + transform: translateY(calc(-60px * 27)); + // animation-duration: 3.5s; + text-align: center; +} + +.SlotMachine__IconStrip--spinning { + transform: translateY(0); + animation-name: SlotMachine__Spin; + animation-iteration-count: 1; + animation-fill-mode: forwards; + animation-timing-function: cubic-bezier(1, 1.26, 0.88, 0.96); +} + +.SlotMachine__Symbol { + height: 60px; + display: flex; + align-items: center; + justify-content: center; + + .slotmachines32x32 { + width: 32px; + height: 32px; + image-rendering: pixelated; + filter: drop-shadow(1px 1px 1px black); + } +} + +@keyframes SlotMachine__Spin { + 0% { + transform: translateY(0); + } + 100% { + transform: translateY(calc(-60px * 27)); + } +} diff --git a/tgui/packages/tgui/styles/interfaces/SpriteAuditor.scss b/tgui/packages/tgui/styles/interfaces/SpriteAuditor.scss new file mode 100644 index 00000000000..fe7c2c5ae23 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/SpriteAuditor.scss @@ -0,0 +1,3 @@ +.SpriteAuditor_EntryCell:nth-child(odd) { + background: hsla(0, 0%, 0%, 0.1); +} diff --git a/tgui/packages/tgui/styles/interfaces/Techweb.scss b/tgui/packages/tgui/styles/interfaces/Techweb.scss new file mode 100644 index 00000000000..4c1b1517d24 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Techweb.scss @@ -0,0 +1,68 @@ +.Techweb__NodeProgress { + margin-bottom: var(--space-xl); +} + +.Techweb__DesignIcon { + margin: 0 var(--space-s); +} + +.Techweb__OverviewNodes { + padding-top: var(--space-m); +} + +.Techweb__HeaderContent { + padding: var(--space-m); + background-color: var(--color-black); + border: var(--border-thickness-tiny) solid var(--color-primary); +} + +.Techweb__HeaderContent > * > :not(:last-child) { + margin-bottom: var(--space-m); +} + +.Techweb__HeaderSectionTabs { + margin-top: var(--space-l); + background-color: var(--color-black); + border: var(--border-thickness-tiny) solid var(--color-primary); + padding-left: var(--space-m); + padding-right: var(--space-m); +} + +.Techweb__HeaderTabTitle { + border-right: var(--border-thickness-tiny) solid var(--color-primary); + padding-right: var(--space-m); + margin-right: var(--space-m); + font-weight: bold; +} + +.Techweb__HeaderSectionTabs input { + background-color: hsla(0, 0%, 100%, 0.05); +} + +.Techweb__PointSummary { + list-style: none; + margin: var(--space-m) 0 0 var(--space-l); + padding: 0; +} + +.Techweb__SecProtocol { + color: var(--color-bad); + margin-left: var(--space-s); +} + +.Techweb__SecProtocol.engaged { + color: var(--color-good); +} + +.Techweb__DesignModal > :not(:last-child) { + margin-bottom: var(--space-m); +} + +.Techweb__LockedModal > :not(:last-child) { + margin-bottom: var(--space-m); +} + +.Techweb__ExperimentDiscount { + color: var(--color-label); + margin: var(--space-m) 0; +} diff --git a/tgui/packages/tgui/styles/interfaces/Trophycase.scss b/tgui/packages/tgui/styles/interfaces/Trophycase.scss new file mode 100644 index 00000000000..8b2972db4e5 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Trophycase.scss @@ -0,0 +1,5 @@ +.Trophycase-description { + word-break: break-word; + word-wrap: break-word; + font-style: italic; +} diff --git a/tgui/packages/tgui/styles/interfaces/Uplink.scss b/tgui/packages/tgui/styles/interfaces/Uplink.scss new file mode 100644 index 00000000000..17d5ea78aac --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/Uplink.scss @@ -0,0 +1,103 @@ +$badGradient: linear-gradient( + to right, + hsl(0, 67%, 37%), + hsl(0, 43%, 28%), + hsl(0, 67%, 37%) +); +$normalGradient: linear-gradient( + to right, + hsl(30, 14%, 34%), + hsl(30, 20%, 19%), + hsl(30, 14%, 34%) +); +$goodGradient: linear-gradient( + to right, + hsl(210, 11%, 37%), + hsl(210, 14%, 17%), + hsl(210, 11%, 37%) +); +$veryGoodGradient: linear-gradient( + to right, + hsl(36, 38%, 44%), + hsl(36, 33%, 19%), + hsl(36, 38%, 44%) +); +$superGoodGradient: linear-gradient( + to right, + hsl(60, 39%, 45%), + hsl(60, 35%, 34%), + hsl(60, 39%, 45%) +); +$bestGradient: linear-gradient( + to right, + hsl(330, 34%, 45%), + hsl(330, 43%, 26%), + hsl(330, 34%, 45%) +); + +$_rep_map: ( + 'bad': $badGradient, + 'normal': $normalGradient, + 'good': $goodGradient, + 'very-good': $veryGoodGradient, + 'super-good': $superGoodGradient, + 'best': $bestGradient, +); + +@each $reputation-name, $gradient-value in $_rep_map { + .reputation-#{$reputation-name} { + background-image: $gradient-value !important; + } + + .reputation-#{$reputation-name}.Button { + background-position: 0 0; + transition: background-position var(--transition-time-fast); + + &:hover { + transition: background-position 0ms; + } + + &:active { + transition: background-position var(--transition-time-medium); + } + + &:hover, + &:active { + background-position: 50em 0; + } + } +} + +.UplinkObjective__Titlebar { + padding: var(--space-ml) var(--space-l) var(--space-m); + font-weight: bold; + border: var(--border-thickness-small) solid var(--color-black); + border-bottom: none; + border-top-left-radius: var(--border-radius-huge); + border-top-right-radius: var(--border-radius-huge); +} + +.UplinkObjective__EmptyObjective { + background-color: hsla(0, 0%, 0%, 0.4); + border: var(--border-thickness-small) solid var(--color-black); + padding: 1rem; + width: 100%; + height: 100%; + text-align: center; + vertical-align: center; +} + +.UplinkObjective__Content { + background-color: hsla(0, 0%, 0%, 0.4); + border: var(--border-thickness-small) solid var(--color-black); + border-top: none; + border-bottom: none; + padding: var(--space-l); +} + +.UplinkObjective__Footer { + background-color: rgba(0, 0, 0, 0.4); + border: var(--border-thickness-small) solid var(--color-black); + border-top: none; + padding: var(--space-m) 0 var(--space-l); +} diff --git a/tgui/packages/tgui/styles/layouts/Layout.scss b/tgui/packages/tgui/styles/layouts/Layout.scss index b66b2769f5e..3c71db27576 100644 --- a/tgui/packages/tgui/styles/layouts/Layout.scss +++ b/tgui/packages/tgui/styles/layouts/Layout.scss @@ -3,68 +3,22 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use '../base.scss'; -@use '../functions.scss' as *; +@use '../base'; +$background-color: base.$color-bg !default; $scrollbar-color-multiplier: 1 !default; -$luminance: luminance(base.$color-bg); -$scrollbar-base: color.scale( - base.$color-bg, - $lightness: -25% * $scrollbar-color-multiplier -); -$scrollbar-face: color.scale( - base.$color-bg, - $lightness: if($luminance > 0.05, 30%, 10%) * $scrollbar-color-multiplier -); -// Fancy scrollbar -html, -body { - scrollbar-color: $scrollbar-face $scrollbar-base; -} - -.Layout, -.Layout * { - // Fancy scrollbar - scrollbar-base-color: color.scale( - base.$color-bg, - $lightness: -25% * $scrollbar-color-multiplier - ); - scrollbar-face-color: color.scale( - base.$color-bg, - $lightness: 10% * $scrollbar-color-multiplier - ); - scrollbar-3dlight-color: color.scale( - base.$color-bg, - $lightness: 0% * $scrollbar-color-multiplier - ); - scrollbar-highlight-color: color.scale( - base.$color-bg, - $lightness: 0% * $scrollbar-color-multiplier - ); - scrollbar-track-color: color.scale( - base.$color-bg, - $lightness: -25% * $scrollbar-color-multiplier - ); - scrollbar-arrow-color: color.scale( - base.$color-bg, - $lightness: 50% * $scrollbar-color-multiplier - ); - scrollbar-shadow-color: color.scale( - base.$color-bg, - $lightness: 10% * $scrollbar-color-multiplier - ); +.Layout { + --color-base: #{$background-color}; + --base-gradient-spread: #{base.$color-bg-grad-spread}; + --scrollbar-color-multiplier: #{$scrollbar-color-multiplier}; } .Layout__content { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; overflow-x: hidden; overflow-y: hidden; + position: absolute; + inset: 0; } .Layout__content--scrollable { diff --git a/tgui/packages/tgui/styles/layouts/NtosHeader.scss b/tgui/packages/tgui/styles/layouts/NtosHeader.scss index 2a429051f56..3c71302b37e 100644 --- a/tgui/packages/tgui/styles/layouts/NtosHeader.scss +++ b/tgui/packages/tgui/styles/layouts/NtosHeader.scss @@ -18,3 +18,31 @@ margin-bottom: -0.5em; vertical-align: middle; } + +.alertIndicator { + font-weight: bold; + right: '0px'; + text-align: 'center'; + vertical-align: 'center'; + font-family: 'Courier New'; +} + +.alertBlink { + color: #ffffff; + animation: alertBlinkAnimation 1s infinite; +} + +@keyframes alertBlinkAnimation { + 0% { + color: #dddddd; + } + 49% { + color: #dddddd; + } + 50% { + color: #333333; + } + 100% { + color: #333333; + } +} diff --git a/tgui/packages/tgui/styles/layouts/NtosWindow.scss b/tgui/packages/tgui/styles/layouts/NtosWindow.scss index bed4abab53c..00159e3a965 100644 --- a/tgui/packages/tgui/styles/layouts/NtosWindow.scss +++ b/tgui/packages/tgui/styles/layouts/NtosWindow.scss @@ -3,7 +3,7 @@ * SPDX-License-Identifier: MIT */ -@use '../base.scss'; +@use '../base'; .NtosWindow__header { position: absolute; @@ -12,8 +12,8 @@ right: 0; height: 2em; line-height: 1.928em; - background-color: rgba(0, 0, 0, 0.5); - font-family: Consolas, monospace; + background-color: hsla(0, 0%, 0%, 0.5); + font-family: var(--font-family-mono); font-size: base.em(14px); user-select: none; -ms-user-select: none; @@ -21,6 +21,6 @@ .NtosWindow__content .Layout__content { margin-top: 2em; - font-family: Consolas, monospace; + font-family: var(--font-family-mono); font-size: base.em(14px); } diff --git a/tgui/packages/tgui/styles/layouts/TitleBar.scss b/tgui/packages/tgui/styles/layouts/TitleBar.scss index 1a26dd9e29e..b81fda74e3c 100644 --- a/tgui/packages/tgui/styles/layouts/TitleBar.scss +++ b/tgui/packages/tgui/styles/layouts/TitleBar.scss @@ -4,108 +4,100 @@ */ @use 'sass:color'; -@use '../base.scss'; -@use '../colors.scss'; +@use '../base'; +@use '../colors'; +@use '../functions.scss' as *; -$text-color: rgba(255, 255, 255, 0.75) !default; -$background-color: #363636 !default; -$shadow-color-core: #161616 !default; -$shadow-color: rgba(0, 0, 0, 0.1) !default; +$background-color: var(--titlebar-background) !default; +$text-color: var(--titlebar-text) !default; +$shadow-color-core: var(--titlebar-shadow-core) !default; +$scrollbar-color-multiplier: 1 !default; .TitleBar { - background-color: $background-color; - border-bottom: 1px solid $shadow-color-core; - box-shadow: 0 2px 2px $shadow-color; - box-shadow: 0 base.rem(2px) base.rem(2px) $shadow-color; + --titlebar-background: #{$background-color}; + --titlebar-text: #{$text-color}; + --titlebar-shadow-core: #{$shadow-color-core}; + --scrollbar-color-multiplier: #{$scrollbar-color-multiplier}; + user-select: none; - -ms-user-select: none; -} + position: fixed; + display: flex; + align-items: center; + width: vp(100vw); + height: base.rem(32px); + background-color: var(--titlebar-background); + border-bottom: var(--border-thickness-tiny) solid var(--titlebar-shadow-core); + box-shadow: 0px 0px base.em(6px) base.em(-1px) var(--titlebar-shadow-color); + z-index: 101; // More than Dimmer -.TitleBar__clickable { - color: color.change($text-color, $alpha: 0.5); - background-color: $background-color; - transition: - color 250ms ease-out, - background-color 250ms ease-out; + &__dragZone { + position: absolute; + inset: 0; + } - &:hover { - color: rgba(255, 255, 255, 1); - background-color: #cc0000; - transition: - color 0ms, - background-color 0ms; + &__statusIcon { + text-align: center; + font-size: base.rem(20px); + transition: color var(--transition-time-slow); + } + + &__title { + pointer-events: none; + display: inline-block; + flex: 1; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: var(--titlebar-text); + font-size: base.rem(14px); + } + + &__buttons { + pointer-events: all; + overflow: hidden; + white-space: nowrap; + display: inline-block; + margin: 0 base.rem(9px); + z-index: 102; + } + + &__KitchenSink { + background-color: hsl( + from var(--color-green) h s calc(l - var(--adjust-hover)) + ); + color: var(--color-text-fixed-white); + text-align: center; + border-radius: 0; + + &:hover { + background-color: var(--color-green) !important; + } + } + + &__close { + cursor: var(--cursor-pointer); + opacity: 0.5; + pointer-events: all; + align-content: center; + text-align: center; + font-size: base.rem(16px); + height: 100%; + color: var(--color-text); + transition-property: background-color, opacity; + transition-duration: var(--transition-time-medium); + z-index: 102; + + &:hover { + opacity: 1; + background-color: var(--button-background-danger); + transition-duration: 0s; + } + } + + &__statusIcon, + &__close { + width: base.rem(45px); + min-width: base.rem(45px); + max-width: base.rem(45px); } } - -.TitleBar__title { - position: absolute; - display: inline-block; - top: 0; - left: 46px; - left: base.rem(46px); - color: $text-color; - font-size: 14px; - font-size: base.rem(14px); - line-height: 31px; - line-height: base.rem(31px); - white-space: nowrap; - pointer-events: none; -} - -.TitleBar__buttons { - pointer-events: initial; - display: inline-block; - width: 100%; - margin-left: 10px; -} - -.TitleBar__dragZone { - position: absolute; - top: 0; - left: 0; - right: 0; - height: 32px; - height: base.rem(32px); -} - -.TitleBar__statusIcon { - position: absolute; - top: 0; - left: 12px; - left: base.rem(12px); - transition: color 0.5s; - font-size: 20px; - font-size: base.rem(20px); - line-height: 32px !important; - line-height: base.rem(32px) !important; -} - -.TitleBar__close { - position: absolute; - top: -1px; - right: 0; - width: 45px; - width: base.rem(45px); - height: 32px; - height: base.rem(32px); - font-size: 20px; - font-size: base.rem(20px); - line-height: 31px; - line-height: base.rem(31px); - text-align: center; -} - -.TitleBar__devBuildIndicator { - position: absolute; - top: 6px; - top: base.rem(6px); - right: 52px; - right: base.rem(52px); - min-width: 20px; - min-width: base.rem(20px); - padding: 2px 4px; - padding: base.rem(2px) base.rem(4px); - background-color: rgba(colors.$good, 0.75); - color: #fff; - text-align: center; -} diff --git a/tgui/packages/tgui/styles/layouts/Window.scss b/tgui/packages/tgui/styles/layouts/Window.scss index 232dd8396bb..6106ac87d8a 100644 --- a/tgui/packages/tgui/styles/layouts/Window.scss +++ b/tgui/packages/tgui/styles/layouts/Window.scss @@ -3,35 +3,25 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use '../base.scss'; -@use '../functions.scss' as *; +@use '../base'; + +$background-color: base.$color-bg !default; .Window { + --window-background: #{$background-color}; + --border-radius-unit: #{base.$border-radius}; + position: fixed; - top: 0; - bottom: 0; - left: 0; - right: 0; - color: base.$color-fg; - background-color: base.$color-bg; + inset: 0; + color: var(--color-text); + background-color: var(--color-base); background-image: linear-gradient( to bottom, - base.$color-bg-start 0%, - base.$color-bg-end 100% + var(--color-base-start) 0%, + var(--color-base-end) 100% ); } -.Window__titleBar { - position: fixed; - z-index: 1; - top: 0; - left: 0; - width: 100%; - height: 32px; - height: base.rem(32px); -} - // Everything after the title bar .Window__rest { position: fixed; @@ -44,11 +34,7 @@ .Window__contentPadding { margin: 0.5rem; - // IE8: Calc not supported - height: 100%; - // 0.01 is needed to make the scrollbar not appear - // due to rem rendering inaccuracies in IE11. - height: calc(100% - 1.01rem); + height: calc(100% - 1rem); } .Window__contentPadding:after { @@ -56,48 +42,41 @@ } .Layout__content--scrollable .Window__contentPadding:after { - display: block; content: ''; + display: block; height: 0.5rem; } .Window__dimmer { - position: fixed; - top: 0; - bottom: 0; - left: 0; - right: 0; - background-color: rgba(lighten(base.$color-bg, 30%), 0.25); pointer-events: none; + position: fixed; + inset: 0; + background-color: hsl(from var(--color-base) h s calc(l + 15) / 0.25); } .Window__resizeHandle__se { + cursor: var(--cursor-se-resize); position: fixed; bottom: 0; right: 0; - width: 20px; width: base.rem(20px); - height: 20px; height: base.rem(20px); - cursor: se-resize; } .Window__resizeHandle__s { + cursor: var(--cursor-s-resize); position: fixed; bottom: 0; left: 0; right: 0; - height: 6px; height: base.rem(6px); - cursor: s-resize; } .Window__resizeHandle__e { + cursor: var(--cursor-e-resize); position: fixed; top: 0; bottom: 0; right: 0; - width: 3px; width: base.rem(3px); - cursor: e-resize; } diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index 5bcee3437c1..ed7d56d4b10 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -4,56 +4,58 @@ */ @use 'sass:meta'; -@use './base.scss'; +@use 'base'; +@use '~tgui-core/styles'; // Core styles @include meta.load-css('./reset.scss'); +@include meta.load-css('./css-variables.scss'); -// Atomic classes -@include meta.load-css('./atomic/candystripe.scss'); -@include meta.load-css('./atomic/centered-image.scss'); -@include meta.load-css('./atomic/color.scss'); -@include meta.load-css('./atomic/debug-layout.scss'); -@include meta.load-css('./atomic/fit-text.scss'); -@include meta.load-css('./atomic/links.scss'); -@include meta.load-css('./atomic/outline.scss'); -@include meta.load-css('./atomic/text.scss'); - -// Components -@include meta.load-css('./components/BlockQuote.scss'); -@include meta.load-css('./components/Button.scss'); -@include meta.load-css('./components/ColorBox.scss'); -@include meta.load-css('./components/Dialog.scss'); -@include meta.load-css('./components/Dimmer.scss'); -@include meta.load-css('./components/Divider.scss'); -@include meta.load-css('./components/Dropdown.scss'); -@include meta.load-css('./components/Flex.scss'); -@include meta.load-css('./components/Icon.scss'); -@include meta.load-css('./components/Input.scss'); -@include meta.load-css('./components/Knob.scss'); -@include meta.load-css('./components/LabeledList.scss'); -@include meta.load-css('./components/MenuBar.scss'); -@include meta.load-css('./components/Modal.scss'); -@include meta.load-css('./components/NoticeBox.scss'); -@include meta.load-css('./components/NumberInput.scss'); -@include meta.load-css('./components/ProgressBar.scss'); -@include meta.load-css('./components/RoundGauge.scss'); -@include meta.load-css('./components/Section.scss'); -@include meta.load-css('./components/Slider.scss'); -@include meta.load-css('./components/Stack.scss'); -@include meta.load-css('./components/Table.scss'); -@include meta.load-css('./components/Tabs.scss'); -@include meta.load-css('./components/TextArea.scss'); -@include meta.load-css('./components/Tooltip.scss'); +// Tgui core bulk imports +@include meta.load-css('~tgui-core/styles/all-atomic.scss'); +@include meta.load-css('~tgui-core/styles/all-themes.scss'); // Interfaces +@include meta.load-css('./interfaces/Accounting.scss'); @include meta.load-css('./interfaces/AlertModal.scss'); +@include meta.load-css('./interfaces/Changelog.scss'); @include meta.load-css('./interfaces/CrewManifest.scss'); +@include meta.load-css('./interfaces/Emojipedia.scss'); +@include meta.load-css('./interfaces/ExperimentConfigure.scss'); +@include meta.load-css('./interfaces/Fabricator.scss'); +@include meta.load-css('./interfaces/HellishRunes.scss'); +@include meta.load-css('./interfaces/HotKeysHelp.scss'); +@include meta.load-css('./interfaces/Hypertorus.scss'); +@include meta.load-css('./interfaces/IntegratedCircuit.scss'); +@include meta.load-css('./interfaces/LibraryAdmin.scss'); +@include meta.load-css('./interfaces/LibraryComputer.scss'); +@include meta.load-css('./interfaces/ListInput.scss'); +@include meta.load-css('./interfaces/Mecha.scss'); +@include meta.load-css('./interfaces/NtosMessenger.scss'); +@include meta.load-css('./interfaces/NtosNanopaint.scss'); +@include meta.load-css('./interfaces/NtosNotepad.scss'); +@include meta.load-css('./interfaces/NuclearBomb.scss'); +@include meta.load-css('./interfaces/Orbit.scss'); +@include meta.load-css('./interfaces/Paper.scss'); +@include meta.load-css('./interfaces/PreferencesMenu.scss'); +@include meta.load-css('./interfaces/RequestManager.scss'); +@include meta.load-css('./interfaces/Roulette.scss'); +@include meta.load-css('./interfaces/Safe.scss'); +@include meta.load-css('./interfaces/SlotMachine.scss'); +@include meta.load-css('./interfaces/SpriteAuditor.scss'); +@include meta.load-css('./interfaces/Techweb.scss'); +@include meta.load-css('./interfaces/Trophycase.scss'); +@include meta.load-css('./interfaces/Uplink.scss'); +@include meta.load-css('./interfaces/DetectiveBoard.scss'); +@include meta.load-css('./interfaces/ColorPicker.scss'); +@include meta.load-css('./interfaces/AnomalyTower.scss'); +@include meta.load-css('./interfaces/CivCargoHoldTerminal.scss'); +@include meta.load-css('./interfaces/EventLogger.scss'); +@include meta.load-css('./interfaces/AlertModal.scss'); @include meta.load-css('./interfaces/FactionSelect.scss'); @include meta.load-css('./interfaces/HealthAnalyzer.scss'); @include meta.load-css('./interfaces/ListInput.scss'); @include meta.load-css('./interfaces/PersonalCrafting.scss'); -@include meta.load-css('./interfaces/RequestManager.scss'); @include meta.load-css('./interfaces/Radio.scss'); @include meta.load-css('./interfaces/LoreConsole.scss'); @@ -64,7 +66,7 @@ @include meta.load-css('./layouts/TitleBar.scss'); @include meta.load-css('./layouts/Window.scss'); -@include meta.load-css('highlight.js/scss/github-dark.scss'); +@include meta.load-css('~highlight.js/scss/a11y-dark.scss'); // SCC Theme .Layout__content { @@ -73,7 +75,6 @@ background-position: center; background-repeat: no-repeat; } - // A default, in case someone uses the vp() function outside of a :root { --scaling-amount: 1; diff --git a/tgui/packages/tgui/styles/reset.scss b/tgui/packages/tgui/styles/reset.scss index e7fff7f936d..fa028f7a430 100644 --- a/tgui/packages/tgui/styles/reset.scss +++ b/tgui/packages/tgui/styles/reset.scss @@ -3,24 +3,26 @@ * SPDX-License-Identifier: MIT */ -@use './base.scss'; +@use 'base'; html, body { box-sizing: border-box; height: 100%; margin: 0; - font-size: base.$font-size; + font-size: var(--font-size, 12px); + color: var(--color-text, hsl(0, 0%, 100%)); + scrollbar-color: var(--color-scrollbar-thumb) var(--color-scrollbar-base); } html { + cursor: var(--cursor-default, default); // Reset the cursor. overflow: hidden; - cursor: default; // Reset the cursor. } body { overflow: auto; - font-family: Verdana, Geneva, sans-serif; + font-family: var(--font-family, Verdana, Geneva, sans-serif); } *, @@ -33,27 +35,23 @@ body { h1, h2, h3, h4, h5, h6 { display: block; margin: 0; - padding: 6px 0; - padding: 0.5rem 0; + padding: var(--space-m, 6px) 0; + padding: var(--space-m, 0.5rem) 0; } h1 { - font-size: 18px; font-size: 1.5rem; } h2 { - font-size: 16px; font-size: 1.333rem; } h3 { - font-size: 14px; font-size: 1.167rem; } h4 { - font-size: 12px; font-size: 1rem; } diff --git a/tgui/packages/tgui/styles/themes/abductor.scss b/tgui/packages/tgui/styles/themes/abductor.scss index 39dac5773c0..3989dcc029c 100644 --- a/tgui/packages/tgui/styles/themes/abductor.scss +++ b/tgui/packages/tgui/styles/themes/abductor.scss @@ -3,64 +3,27 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #ad2350, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #2a314a, - $color-bg-grad-spread: 6%, - $border-radius: 2px -); - .theme-abductor { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #363636, - 'color-selected': #465899, - 'color-caution': #be6209, - 'color-danger': #9a9d00 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #404b6e) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #a82d55) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #404b6e) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #a82d55) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #9e1b46) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #363636; + --button-background-selected: #465899; + --button-background-caution: #be6209; + --button-background-danger: #9a9d00; + --input-border-color: #404b6e; + --input-border-color-focus: #404b6e; + --number-input-border-color: #404b6e; + --number-input-border-color-active: #404b6e; + --notice-box-background: #a82d55; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: var(--color-primary); + --tooltip-background: #a82d55; + --titlebar-background: #9e1b46; + --color-base: #2a314a; + --color-primary: #ad2350; + --base-gradient-spread: 6; + --border-radius-unit: 2px; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: none; diff --git a/tgui/packages/tgui/styles/themes/admin.scss b/tgui/packages/tgui/styles/themes/admin.scss index 75399ee04a5..43366c65b98 100644 --- a/tgui/packages/tgui/styles/themes/admin.scss +++ b/tgui/packages/tgui/styles/themes/admin.scss @@ -3,27 +3,13 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #1596b6, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #29333a, - $color-bg-grad-spread: 6%, - $border-radius: 2px -); - .theme-admin { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); + --color-base: #29333a; + --color-primary: #1596b6; + --base-gradient-spread: 6; + --border-radius-unit: 2px; - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); + .Layout__content { background-image: url('../../assets/bg-admin.svg'); diff --git a/tgui/packages/tgui/styles/themes/cardtable.scss b/tgui/packages/tgui/styles/themes/cardtable.scss index e5047e2e2f0..4f402cc17ba 100644 --- a/tgui/packages/tgui/styles/themes/cardtable.scss +++ b/tgui/packages/tgui/styles/themes/cardtable.scss @@ -3,53 +3,24 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #000000, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #117039, - $color-bg-grad-spread: 0%, - $border-radius: 0 -); - +@use '../base.scss'; //Made for the roulette table, probably requires a bunch of manual hacks to work for anything else .theme-cardtable { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #117039, - 'color-disabled': #363636, - 'color-selected': #9d0808, - 'color-caution': #be6209, - 'color-danger': #9a9d00 - ) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #fff) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #381608) - ); + --button-background-default: #117039; + --button-background-disabled: #363636; + --button-background-selected: #9d0808; + --button-background-caution: #be6209; + --button-background-danger: #9a9d00; + --number-input-border-color: #fff; + --number-input-border-color-active: #fff; + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #117039; + --titlebar-background: #381608; + --color-base: #117039; + --color-primary: #000000; + --base-gradient-spread: 0; + --border-radius-unit: 0; + --section-background: rgba(0, 0, 0, 0.33); .Button { border: base.em(2px) solid #fff; diff --git a/tgui/packages/tgui/styles/themes/hackerman.scss b/tgui/packages/tgui/styles/themes/hackerman.scss index 51befcf1b36..3422a47b2bb 100644 --- a/tgui/packages/tgui/styles/themes/hackerman.scss +++ b/tgui/packages/tgui/styles/themes/hackerman.scss @@ -3,54 +3,20 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #00ff00, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #121b12, - $color-bg-grad-spread: 0% -); - +@use '../base.scss'; .theme-hackerman { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #4a6a4a, - 'color-selected': #00ff00 - ) - ); - @include meta.load-css( - '../components/Tabs.scss', - $with: ( - 'color-default': colors.$primary, - 'tab-color-selected': #00ff003f, - 'text-color': #e7e7e7 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': colors.$primary) - ); - @include meta.load-css('../components/Modal.scss'); - @include meta.load-css('../components/Section.scss'); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #223d22) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #4a6a4a; + --button-background-selected: #00ff00; + --tab-background-selected: #00ff003f; + --tab-color: #e7e7e7; + --input-border-color: var(--color-primary); + --input-border-color-focus: var(--color-primary); + --titlebar-background: #223d22; + --color-base: #121b12; + --color-primary: #00ff00; + --base-gradient-spread: 0; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: none; diff --git a/tgui/packages/tgui/styles/themes/hammertail.scss b/tgui/packages/tgui/styles/themes/hammertail.scss index 1f8c66ddd9a..d19a5d6d250 100644 --- a/tgui/packages/tgui/styles/themes/hammertail.scss +++ b/tgui/packages/tgui/styles/themes/hammertail.scss @@ -3,63 +3,26 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #397439, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #550202, - $color-bg-grad-spread: 6% -); - .theme-hammertail { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #363636, - 'color-selected': #9d0808, - 'color-caution': #be6209, - 'color-danger': #9a9d00 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #87ce87) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #910101) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #87ce87) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #4a0202) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #cbd600) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #363636; + --button-background-selected: #9d0808; + --button-background-caution: #be6209; + --button-background-danger: #9a9d00; + --input-border-color: #87ce87; + --input-border-color-focus: #87ce87; + --number-input-border-color: #87ce87; + --number-input-border-color-active: #87ce87; + --notice-box-background: #910101; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: var(--color-primary); + --tooltip-background: #4a0202; + --titlebar-background: #cbd600; + --color-base: #550202; + --color-primary: #397439; + --base-gradient-spread: 6; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-hammertail.svg'); diff --git a/tgui/packages/tgui/styles/themes/hephaestus.scss b/tgui/packages/tgui/styles/themes/hephaestus.scss index 6e8c12e3a60..5748557cc63 100644 --- a/tgui/packages/tgui/styles/themes/hephaestus.scss +++ b/tgui/packages/tgui/styles/themes/hephaestus.scss @@ -1,61 +1,29 @@ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #db6700, - $bad: #991100, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #192616, - $color-bg-grad-spread: 6% -); - .theme-hephaestus { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); + --color-base: #192616; + --color-primary: #db6700; + --color-red: #991100; + --color-bad: #991100; + --base-gradient-spread: 6; - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #db6700, - 'color-disabled': #a54a00, - 'color-selected': #ffffff, - 'color-caution': #be6209, - 'color-danger': #991100 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #db6700) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #8c470d) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #c09524) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #c09524) - ); + --button-background-default: #db6700; + --button-background-disabled: #a54a00; + --button-background-selected: #77aa00; + --button-background-caution: #be6209; + --button-background-danger: #991100; - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #263e23) - ); + --input-border-color: #db6700; + --input-border-color-focus: #db6700; + --number-input-border-color: #c09524; + --number-input-border-color-active: #c09524; + + --notice-box-background: #8c470d; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #db6700; + --section-background: rgba(0, 0, 0, 0.33); + --section-separator-color: #db6700; + --tooltip-background: #c09524; + --titlebar-background: #263e23; .Layout__content { background-image: url('../../assets/bg-heph.svg'); diff --git a/tgui/packages/tgui/styles/themes/idris.scss b/tgui/packages/tgui/styles/themes/idris.scss index 09ed2971f69..11ec33b2f3b 100644 --- a/tgui/packages/tgui/styles/themes/idris.scss +++ b/tgui/packages/tgui/styles/themes/idris.scss @@ -1,61 +1,26 @@ -@use 'sass:color'; -@use 'sass:meta'; -@use '../colors.scss' with ( - $primary: #ffffff, - $bad: #ad2727, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #274646, - $color-bg-grad-spread: 6% -); .theme-idris { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #297676, - 'color-disabled': #363636, - 'color-selected': #ffffff, - 'color-caution': #be6209, - 'color-danger': #ad2727 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #ffffff) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #284d4d) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #ffffff) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #284d4d) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #284d4d) - ); + --button-background-default: #297676; + --button-background-disabled: #363636; + --button-background-selected: #66ddff; + --button-background-caution: #be6209; + --button-background-danger: #ad2727; + --input-border-color: #ffffff; + --input-border-color-focus: #ffffff; + --number-input-border-color: #ffffff; + --number-input-border-color-active: #ffffff; + --notice-box-background: #284d4d; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #297676; + --tooltip-background: #284d4d; + --titlebar-background: #284d4d; + --color-base: #274646; + --color-primary: #ffffff; + --color-bad: #ad2727; + --base-gradient-spread: 6; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-idris.svg'); diff --git a/tgui/packages/tgui/styles/themes/malfunction.scss b/tgui/packages/tgui/styles/themes/malfunction.scss index d32113ba5e6..84eb16beae0 100644 --- a/tgui/packages/tgui/styles/themes/malfunction.scss +++ b/tgui/packages/tgui/styles/themes/malfunction.scss @@ -3,63 +3,26 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #910101, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #1b3443, - $color-bg-grad-spread: 6% -); - .theme-malfunction { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #363636, - 'color-selected': #1e5881, - 'color-caution': #be6209, - 'color-danger': #9a9d00 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #910101) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #1a3f57) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #910101) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #235577) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #1a3f57) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #363636; + --button-background-selected: #1e5881; + --button-background-caution: #be6209; + --button-background-danger: #9a9d00; + --input-border-color: #910101; + --input-border-color-focus: #910101; + --number-input-border-color: #910101; + --number-input-border-color-active: #910101; + --notice-box-background: #1a3f57; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: var(--color-primary); + --tooltip-background: #235577; + --titlebar-background: #1a3f57; + --color-base: #1b3443; + --color-primary: #910101; + --base-gradient-spread: 6; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: none; diff --git a/tgui/packages/tgui/styles/themes/nanotrasen.scss b/tgui/packages/tgui/styles/themes/nanotrasen.scss index c86e90b8f01..a0243db3ef0 100644 --- a/tgui/packages/tgui/styles/themes/nanotrasen.scss +++ b/tgui/packages/tgui/styles/themes/nanotrasen.scss @@ -1,61 +1,26 @@ -@use 'sass:color'; -@use 'sass:meta'; -@use '../colors.scss' with ( - $primary: #ffffff, - $bad: #ad2727, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #092437, - $color-bg-grad-spread: 6% -); .theme-nanotrasen { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #093452, - 'color-disabled': #363636, - 'color-selected': #ffffff, - 'color-caution': #be6209, - 'color-danger': #ad2727 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #ffffff) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #06243a) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #ffffff) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #182935) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #051520) - ); + --button-background-default: #295482; + --button-background-disabled: #363636; + --button-background-selected: #88ccff; + --button-background-caution: #be6209; + --button-background-danger: #ad2727; + --input-border-color: #ffffff; + --input-border-color-focus: #ffffff; + --number-input-border-color: #ffffff; + --number-input-border-color-active: #ffffff; + --notice-box-background: #06243a; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #093452; + --tooltip-background: #182935; + --titlebar-background: #051520; + --color-base: #092437; + --color-primary: #ffffff; + --color-bad: #ad2727; + --base-gradient-spread: 6; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-nanotrasen.svg'); diff --git a/tgui/packages/tgui/styles/themes/neutral.scss b/tgui/packages/tgui/styles/themes/neutral.scss index e8ed3ca7da9..229200161eb 100644 --- a/tgui/packages/tgui/styles/themes/neutral.scss +++ b/tgui/packages/tgui/styles/themes/neutral.scss @@ -4,45 +4,19 @@ */ @use 'sass:color'; -@use 'sass:meta'; $neutral: #ffb300; -@use '../colors.scss' with ( - $primary: $neutral, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: color.scale($neutral, $lightness: -40%), - $color-bg-grad-spread: 6% -); - .theme-neutral { - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': color.scale($neutral, $lightness: -30%), - 'color-transparent-text': color.scale($neutral, $lightness: 30%) - ) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ( - 'color-default-fill': $neutral, - 'background-color': rgba(0, 0, 0, 0.5) - ) - ); - @include meta.load-css('../components/Section.scss'); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': color.scale($neutral, $lightness: -25%)) - ); + --button-background-default: #{color.scale($neutral, $lightness: -30%)}; + --button-color-transparent: #{color.scale($neutral, $lightness: 30%)}; + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #{$neutral}; + --titlebar-background: #{color.scale($neutral, $lightness: -25%)}; + --color-base: #{color.scale($neutral, $lightness: -40%)}; + --color-primary: #{$neutral}; + --base-gradient-spread: 6; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-neutral.svg'); diff --git a/tgui/packages/tgui/styles/themes/ntOS95.scss b/tgui/packages/tgui/styles/themes/ntOS95.scss index 5d418f23d2c..851b1bb0516 100644 --- a/tgui/packages/tgui/styles/themes/ntOS95.scss +++ b/tgui/packages/tgui/styles/themes/ntOS95.scss @@ -4,60 +4,31 @@ */ @use 'sass:color'; -@use 'sass:meta'; +@use '../base.scss'; $light-gray: #c3c3c3; $dark-gray: #858585; $scrollbar-color-multiplier: 1; -@use '../colors.scss' with ( - $primary: #000000, - $good: #007c11, - $average: #f0ec11, - $bad: #db2828, - $label: #000000 -); -@use '../base.scss' with ( - $color-bg: #008081, - $color-bg-grad-spread: 0%, - $border-radius: 0 -); - .theme-ntOS95 { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #e8e4c9, - 'color-disabled': #363636, - 'color-selected': #007c11, - 'color-caution': #be6209, - 'color-danger': #9d0808 - ) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css( - '../components/Section.scss', - $with: ('background-color': rgba(0, 0, 0, 0.4)) - ); - - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #ecee9e) - ); - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #000080) - ); + --button-background-default: #e8e4c9; + --button-background-disabled: #363636; + --button-background-selected: #007c11; + --button-background-caution: #be6209; + --button-background-danger: #9d0808; + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #e8e4c9; + --section-background: rgba(0, 0, 0, 0.4); + --tooltip-background: #ecee9e; + --titlebar-background: #000080; + --color-base: #008081; + --color-primary: #000000; + --color-good: #007c11; + --color-average: #f0ec11; + --color-bad: #db2828; + --color-label: #000000; + --base-gradient-spread: 0; + --border-radius-unit: 0; .Button { color: #161613; diff --git a/tgui/packages/tgui/styles/themes/ntos.scss b/tgui/packages/tgui/styles/themes/ntos.scss index 8b102b47778..f9a6b95407d 100644 --- a/tgui/packages/tgui/styles/themes/ntos.scss +++ b/tgui/packages/tgui/styles/themes/ntos.scss @@ -4,41 +4,16 @@ */ @use 'sass:color'; -@use 'sass:meta'; $nanotrasen: #384e68; -@use '../colors.scss' with ( - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: color.scale($nanotrasen, $lightness: -45%) -); - .theme-ntos { - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': $nanotrasen, - 'color-transparent-text': rgba(227, 240, 255, 0.75) - ) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ( - 'color-default-fill': $nanotrasen, - 'background-color': rgba(0, 0, 0, 0.5) - ) - ); - @include meta.load-css('../components/Section.scss'); + --button-background-default: #{$nanotrasen}; + --button-color-transparent: rgba(227, 240, 255, 0.75); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #{$nanotrasen}; + --titlebar-background: #{color.scale($nanotrasen, $lightness: -25%)}; + --color-base: #{color.scale($nanotrasen, $lightness: -45%)}; + --section-background: rgba(0, 0, 0, 0.33); - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': color.scale($nanotrasen, $lightness: -25%)) - ); } diff --git a/tgui/packages/tgui/styles/themes/ntos_cat.scss b/tgui/packages/tgui/styles/themes/ntos_cat.scss index 90affabc929..577c3e0cadf 100644 --- a/tgui/packages/tgui/styles/themes/ntos_cat.scss +++ b/tgui/packages/tgui/styles/themes/ntos_cat.scss @@ -4,7 +4,7 @@ */ @use 'sass:color'; -@use 'sass:meta'; +@use '../base.scss'; //@use 'sass:map'; //palette @@ -17,56 +17,22 @@ $light-gray: #c3c3c3; $dark-gray: #858585; $scrollbar-color-multiplier: 0.5; -@use '../colors.scss' with ( - $primary: black, - $label: rgb(255, 132, 153), - $good: pink, - - $bad: red, - // $fg-map-keys: (), - // $bg-map-keys: (), -); - -@use '../base.scss' with ( - $color-bg: orange, - $color-bg-grad-spread: 12% //$border-radius: 0, -); - .theme-ntos_cat { - // Atomic classes - @include meta.load-css('../atomic/color.scss', $with: ()); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': pink, - 'color-transparent-text': rgba(227, 240, 255, 0.75), - 'color-disabled': #363636, - 'color-selected': #465899, - 'color-caution': #be6209 - ) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('color-default-fill': rgb(255, 132, 153, 0.75)) - ); - @include meta.load-css( - '../components/Section.scss', - $with: ('background-color': rgba(124, 62, 34, 0.75)) - ); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': rgba(255, 153, 0, 0.75)) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': rgb(255, 132, 153, 0.75)) - ); + --button-background-default: pink; + --button-background-disabled: #363636; + --button-background-selected: #465899; + --button-background-caution: #be6209; + --button-color-transparent: rgba(227, 240, 255, 0.75); + --progress-bar-fill: rgb(255, 132, 153, 0.75); + --section-background: rgba(124, 62, 34, 0.75); + --tooltip-background: rgba(255, 153, 0, 0.75); + --titlebar-background: rgb(255, 132, 153, 0.75); + --color-base: orange; + --color-primary: black; + --color-good: pink; + --color-bad: red; + --color-label: rgb(255, 132, 153); + --base-gradient-spread: 12; .Section { color: black; diff --git a/tgui/packages/tgui/styles/themes/ntos_darkmode.scss b/tgui/packages/tgui/styles/themes/ntos_darkmode.scss index b22ad60fc3f..4d4f08c2df1 100644 --- a/tgui/packages/tgui/styles/themes/ntos_darkmode.scss +++ b/tgui/packages/tgui/styles/themes/ntos_darkmode.scss @@ -4,41 +4,16 @@ */ @use 'sass:color'; -@use 'sass:meta'; $nanotrasen: #2c2c2c; -@use '../colors.scss' with ( - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: color.scale($nanotrasen, $lightness: -45%) -); - .theme-ntos_darkmode { - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': $nanotrasen, - 'color-transparent-text': rgba(227, 240, 255, 0.75) - ) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ( - 'color-default-fill': $nanotrasen, - 'background-color': rgba(0, 0, 0, 0.5) - ) - ); - @include meta.load-css('../components/Section.scss'); + --button-background-default: #{$nanotrasen}; + --button-color-transparent: rgba(227, 240, 255, 0.75); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #{$nanotrasen}; + --titlebar-background: #{color.scale($nanotrasen, $lightness: -25%)}; + --color-base: #{color.scale($nanotrasen, $lightness: -45%)}; + --section-background: rgba(0, 0, 0, 0.33); - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': color.scale($nanotrasen, $lightness: -25%)) - ); } diff --git a/tgui/packages/tgui/styles/themes/ntos_lightmode.scss b/tgui/packages/tgui/styles/themes/ntos_lightmode.scss index 9cf1a647b77..b485c80eebf 100644 --- a/tgui/packages/tgui/styles/themes/ntos_lightmode.scss +++ b/tgui/packages/tgui/styles/themes/ntos_lightmode.scss @@ -3,49 +3,19 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - $nanotrasen: #ffffff; -@use '../colors.scss' with ( - $primary: #000000, - $label: #000000 -); -@use '../base.scss' with ( - $color-bg: white -); - .theme-ntos_lightmode { - @include meta.load-css('../atomic/color.scss', $with: ()); - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ('color-default': $nanotrasen) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ( - 'color-default-fill': $nanotrasen, - 'background-color': rgba(0, 0, 0, 0.5) - ) - ); - @include meta.load-css( - '../components/Section.scss', - $with: ('background-color': rgba(119, 119, 119, 0.4)) - ); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': white) - ); + --button-background-default: #{$nanotrasen}; + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #{$nanotrasen}; + --section-background: rgba(119, 119, 119, 0.4); + --tooltip-background: white; + --titlebar-background: gray; + --color-base: white; + --color-primary: #000000; + --color-label: #000000; - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': gray) - ); .Button { color: #161613; } diff --git a/tgui/packages/tgui/styles/themes/ntos_spooky.scss b/tgui/packages/tgui/styles/themes/ntos_spooky.scss index 14746421856..9f470f8f681 100644 --- a/tgui/packages/tgui/styles/themes/ntos_spooky.scss +++ b/tgui/packages/tgui/styles/themes/ntos_spooky.scss @@ -1,67 +1,26 @@ -@use 'sass:color'; -@use 'sass:meta'; -@use 'sass:map'; -@use '../colors.scss' with ( - $primary: #3f021a, - $good: #e62626, - $bad: #970934 -); -@use '../base.scss' with ( - $color-bg: #240101, - $color-bg-grad-spread: 12% -); .theme-ntos_spooky { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #7e0322, - 'color-disabled': #363636, - 'color-selected': #610a0a, - 'color-caution': #1416a3, - 'color-danger': #5c1e80 - ) - ); - @include meta.load-css( - '../components/Dimmer.scss', - $with: ('background-dimness': 0.45) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #473a37) - ); - @include meta.load-css('../components/Modal.scss'); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #740707) - ); - @include meta.load-css('../components/NumberInput.scss'); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css('../components/Table.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #000000) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ( - 'color-default-fill': rgba(190, 0, 0, 0.75), - 'background-color': rgba(34, 1, 1, 0.5) - ) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #6b0808) - ); + --button-background-default: #7e0322; + --button-background-disabled: #363636; + --button-background-selected: #610a0a; + --button-background-caution: #1416a3; + --button-background-danger: #5c1e80; + --input-border-color: #473a37; + --input-border-color-focus: #473a37; + --notice-box-background: #740707; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(34, 1, 1, 0.5); + --progress-bar-fill: rgba(190, 0, 0, 0.75); + --tooltip-background: #000000; + --dimmer-background: rgba(0, 0, 0, 0.45); + --titlebar-background: #6b0808; + --color-base: #240101; + --color-primary: #3f021a; + --color-good: #e62626; + --color-bad: #970934; + --base-gradient-spread: 12; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-spookycomp-compressed.svg'); diff --git a/tgui/packages/tgui/styles/themes/ntos_synth.scss b/tgui/packages/tgui/styles/themes/ntos_synth.scss index 242d4b0d04b..6a28d4e59f8 100644 --- a/tgui/packages/tgui/styles/themes/ntos_synth.scss +++ b/tgui/packages/tgui/styles/themes/ntos_synth.scss @@ -3,9 +3,8 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; -//@use 'sass:map'; +@use '../base.scss'; + //palette $cyan: #5edba5; @@ -13,54 +12,21 @@ $pink: #ed12f5; $orange: #ff9900; $purple: #463191; -@use '../colors.scss' with ( - $primary: $pink, - $label: $orange, - $good: $cyan, - // $fg-map-keys: (), - // $bg-map-keys: (), -); - -@use '../base.scss' with ( - $color-bg: $purple, - $color-bg-grad-spread: 12% -); - .theme-ntos_synth { - // Atomic classes - @include meta.load-css('../atomic/color.scss', $with: ()); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': $cyan, - 'color-transparent-text': rgba(227, 240, 255, 0.75), - 'color-disabled': #363636, - 'color-selected': #465899, - 'color-caution': #be6209 - ) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('color-default-fill': rgba(237, 18, 245, 0.75)) - ); - @include meta.load-css( - '../components/Section.scss', - $with: ('background-color': rgba(0, 0, 0, 0.3)) - ); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': rgba(255, 153, 0, 0.75)) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': rgba(3, 100, 117, 0.75)) - ); + --button-background-default: #{$cyan}; + --button-background-disabled: #363636; + --button-background-selected: #465899; + --button-background-caution: #be6209; + --button-color-transparent: rgba(227, 240, 255, 0.75); + --progress-bar-fill: rgba(237, 18, 245, 0.75); + --section-background: rgba(0, 0, 0, 0.3); + --tooltip-background: rgba(255, 153, 0, 0.75); + --titlebar-background: rgba(3, 100, 117, 0.75); + --color-base: #{$purple}; + --color-primary: #{$pink}; + --color-good: #{$cyan}; + --color-label: #{$orange}; + --base-gradient-spread: 12; .Section { color: $cyan; diff --git a/tgui/packages/tgui/styles/themes/ntos_terminal.scss b/tgui/packages/tgui/styles/themes/ntos_terminal.scss index b5a0ad3c82c..7afdbfea5cc 100644 --- a/tgui/packages/tgui/styles/themes/ntos_terminal.scss +++ b/tgui/packages/tgui/styles/themes/ntos_terminal.scss @@ -3,55 +3,21 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #24e87e, - $label: #24e87e, - $good: rgba(36, 232, 127, 0.5), - // $fg-map-keys: (), - // $bg-map-keys: (), -); -@use '../base.scss' with ( - $color-bg: #121b12, - $color-bg-grad-spread: 0% -); - .theme-ntos_terminal { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': rgba(0, 0, 0, 0), - 'color-disabled': #4a6a4a, - 'color-selected': rgba(36, 232, 127, 0.25) - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': colors.$primary) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ( - 'background-color': rgba(0, 0, 0, 0.5), - 'color-default-fill': rgba(36, 232, 127, 0.5) - ) - ); - @include meta.load-css('../components/Modal.scss'); - @include meta.load-css('../components/Section.scss'); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': rgba(0, 97, 0, 0.25)) - ); + --button-background-default: rgba(0, 0, 0, 0); + --button-background-disabled: #4a6a4a; + --button-background-selected: rgba(36, 232, 127, 0.25); + --input-border-color: var(--color-primary); + --input-border-color-focus: var(--color-primary); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: rgba(36, 232, 127, 0.5); + --titlebar-background: rgba(0, 97, 0, 0.25); + --color-base: #121b12; + --color-primary: #24e87e; + --color-good: rgba(36, 232, 127, 0.5); + --color-label: #24e87e; + --base-gradient-spread: 0; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { //background-image: none; diff --git a/tgui/packages/tgui/styles/themes/paper.scss b/tgui/packages/tgui/styles/themes/paper.scss index 2f9fa6e16f2..80d08c0e237 100644 --- a/tgui/packages/tgui/styles/themes/paper.scss +++ b/tgui/packages/tgui/styles/themes/paper.scss @@ -3,64 +3,27 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #ffffff, - $bg-lightness: 25%, - $fg-lightness: -10%, - // Commenting out color maps will adjust all colors based on the lightness - // settings above, but will add extra 10KB to the theme. - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-fg: #000000, - $color-bg: #dfdfdf, - $color-bg-grad-spread: 0% -); - +@use '../base.scss'; $font-size: 24px; // A fat warning to anyone who wants to use this: this only half works. // It was made almost purely for the nuke ui, and requires a good amount of manual hacks to get it working as intended. .theme-paper { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css('../components/Tabs.scss'); - @include meta.load-css( - '../components/Section.scss', - $with: ('background-color': rgba(0, 0, 0, 0.1)) - ); - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #e8e4c9, - 'color-disabled': #363636, - 'color-selected': #9d0808, - 'color-caution': #be6209, - 'color-danger': #9a9d00, - 'color-transparent-text': rgba(0, 0, 0, 0.5) - ) - ); - - // Layouts - @include meta.load-css( - '../layouts/Layout.scss', - $with: ('scrollbar-color-multiplier': -1) - ); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ( - 'text-color': rgba(0, 0, 0, 0.75), - 'background-color': base.$color-bg, - 'shadow-color-core': rgba(0, 0, 0, 0.25) - ) - ); + --scrollbar-color-multiplier: -1; + --button-background-default: #e8e4c9; + --button-background-disabled: #363636; + --button-background-selected: #9d0808; + --button-background-caution: #be6209; + --button-background-danger: #9a9d00; + --button-color-transparent: rgba(0, 0, 0, 0.5); + --section-background: rgba(0, 0, 0, 0.1); + --titlebar-background: var(--color-base); + --titlebar-text: rgba(0, 0, 0, 0.75); + --titlebar-shadow-core: rgba(0, 0, 0, 0.25); + --color-fg: #000000; + --color-base: #dfdfdf; + --color-primary: #ffffff; + --base-gradient-spread: 0; .PaperInput { position: relative; @@ -115,7 +78,7 @@ $font-size: 24px; .Window { background-image: none; - color: base.$color-fg; + color: var(--color-fg); } .paper-text { diff --git a/tgui/packages/tgui/styles/themes/retro.scss b/tgui/packages/tgui/styles/themes/retro.scss index 9e08c8b9cae..f3878fc3bbf 100644 --- a/tgui/packages/tgui/styles/themes/retro.scss +++ b/tgui/packages/tgui/styles/themes/retro.scss @@ -3,50 +3,23 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #000000, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #e8e4c9, - $color-bg-grad-spread: 0%, - $border-radius: 0 -); - +@use '../base.scss'; // A fat warning to anyone who wants to use this: this only half works. // It was made almost purely for the nuke ui, and requires a good amount of manual hacks to get it working as intended. .theme-retro { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #e8e4c9, - 'color-disabled': #505046, - 'color-selected': #9d0808, - 'color-caution': #be6209, - 'color-danger': #9a9d00 - ) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #585337) - ); + --button-background-default: #c8b4a9; + --button-background-disabled: #505046; + --button-background-selected: #9d0808; + --button-background-caution: #be6209; + --button-background-danger: #9a9d00; + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #e8e4c9; + --titlebar-background: #585337; + --color-base: #a89469; + --color-primary: #000000; + --base-gradient-spread: 0; + --border-radius-unit: 0; + --section-background: rgba(0, 0, 0, 0.33); .Button { font-family: monospace; @@ -59,10 +32,10 @@ color: #c5c5c2; font-family: monospace; &:hover { - color: #ffffff; + color: #aaaaaa; } &:focus { - color: #ffffff; + color: #aaaaaa; } } diff --git a/tgui/packages/tgui/styles/themes/spookyconsole.scss b/tgui/packages/tgui/styles/themes/spookyconsole.scss index 07fd5b4dbe3..f0cb90a28a7 100644 --- a/tgui/packages/tgui/styles/themes/spookyconsole.scss +++ b/tgui/packages/tgui/styles/themes/spookyconsole.scss @@ -1,71 +1,23 @@ -@use 'sass:color'; -@use 'sass:meta'; -@use 'sass:map'; - -@use '../colors.scss' with ( - $primary: #3f021a, - $good: #010005, - $bad: #970934, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #240101, - $color-bg-grad-spread: 12% -); - -$updated-bg-map: colors.$bg-map !default; - -$updated-bg-map: map.set($updated-bg-map, 'good', colors.$good); -$updated-bg-map: map.set($updated-bg-map, 'bad', colors.$bad); .theme-spookyconsole { - // Atomic classes - @include meta.load-css( - '../atomic/color.scss', - $with: ('bg-map': $updated-bg-map) - ); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #7e0322, - 'color-disabled': #363636, - 'color-selected': #610a0a, - 'color-caution': #1416a3, - 'color-danger': #5c1e80, - 'bg-map': $updated-bg-map - ) - ); - @include meta.load-css( - '../components/Dimmer.scss', - $with: ('background-dimness': 0.45) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #473a37) - ); - @include meta.load-css('../components/Modal.scss'); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #740707) - ); - @include meta.load-css('../components/NumberInput.scss'); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css('../components/Table.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #000000) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #6b0808) - ); + --button-background-default: #7e0322; + --button-background-disabled: #363636; + --button-background-selected: #610a0a; + --button-background-caution: #1416a3; + --button-background-danger: #5c1e80; + --input-border-color: #473a37; + --input-border-color-focus: #473a37; + --notice-box-background: #740707; + --notice-box-color: var(--color-text-fixed-white); + --tooltip-background: #000000; + --dimmer-background: rgba(0, 0, 0, 0.45); + --titlebar-background: #6b0808; + --color-base: #240101; + --color-primary: #3f021a; + --color-good: #010005; + --color-bad: #970934; + --base-gradient-spread: 12; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-spookycomp-compressed.svg'); diff --git a/tgui/packages/tgui/styles/themes/syndicate.scss b/tgui/packages/tgui/styles/themes/syndicate.scss index 4a547edef9b..76e6079156d 100644 --- a/tgui/packages/tgui/styles/themes/syndicate.scss +++ b/tgui/packages/tgui/styles/themes/syndicate.scss @@ -3,63 +3,26 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #397439, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #550202, - $color-bg-grad-spread: 6% -); - .theme-syndicate { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #363636, - 'color-selected': #9d0808, - 'color-caution': #be6209, - 'color-danger': #9a9d00 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #87ce87) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #910101) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #87ce87) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #4a0202) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #910101) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #363636; + --button-background-selected: #9d0808; + --button-background-caution: #be6209; + --button-background-danger: #9a9d00; + --input-border-color: #87ce87; + --input-border-color-focus: #87ce87; + --number-input-border-color: #87ce87; + --number-input-border-color-active: #87ce87; + --notice-box-background: #910101; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: var(--color-primary); + --tooltip-background: #4a0202; + --titlebar-background: #910101; + --color-base: #550202; + --color-primary: #397439; + --base-gradient-spread: 6; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-syndicate.svg'); diff --git a/tgui/packages/tgui/styles/themes/vaurca.scss b/tgui/packages/tgui/styles/themes/vaurca.scss index 2647b3d5053..3b197cc520a 100644 --- a/tgui/packages/tgui/styles/themes/vaurca.scss +++ b/tgui/packages/tgui/styles/themes/vaurca.scss @@ -1,55 +1,18 @@ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #ff0000, - $fg-map-keys: (), - $bg-map-keys: () -); - -@use '../base.scss' with ( - $color-bg: #1b1212, - $color-bg-grad-spread: 0% -); +@use '../base.scss'; .theme-vaurca { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Import Crew Manifest for color values - @include meta.load-css('../interfaces/CrewManifest.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #6a4a4a, - 'color-selected': #ff0000 - ) - ); - @include meta.load-css( - '../components/Tabs.scss', - $with: ( - 'color-default': colors.$primary, - 'tab-color-selected': #ff00003f, - 'text-color': #e7e7e7 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': colors.$primary) - ); - @include meta.load-css('../components/Modal.scss'); - @include meta.load-css('../components/Section.scss'); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #3d2222) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #6a4a4a; + --button-background-selected: #ff0000; + --tab-background-selected: #ff00003f; + --tab-color: #e7e7e7; + --input-border-color: var(--color-primary); + --input-border-color-focus: var(--color-primary); + --titlebar-background: #3d2222; + --color-base: #1b1212; + --color-primary: #ff0000; + --base-gradient-spread: 0; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: none; diff --git a/tgui/packages/tgui/styles/themes/wizard.scss b/tgui/packages/tgui/styles/themes/wizard.scss index 9c4056cc128..f98ea552497 100644 --- a/tgui/packages/tgui/styles/themes/wizard.scss +++ b/tgui/packages/tgui/styles/themes/wizard.scss @@ -3,64 +3,27 @@ * SPDX-License-Identifier: MIT */ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #1596b6, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #213e4e, - $color-bg-grad-spread: 6%, - $border-radius: 2px -); - .theme-wizard { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #02426d, - 'color-selected': #465899, - 'color-caution': #be6209, - 'color-danger': #b30707 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #404b6e) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #a82d55) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #404b6e) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #2da848) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #1b9e26) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #02426d; + --button-background-selected: #465899; + --button-background-caution: #be6209; + --button-background-danger: #b30707; + --input-border-color: #404b6e; + --input-border-color-focus: #404b6e; + --number-input-border-color: #404b6e; + --number-input-border-color-active: #404b6e; + --notice-box-background: #a82d55; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: var(--color-primary); + --tooltip-background: #2da848; + --titlebar-background: #1b9e26; + --color-base: #213e4e; + --color-primary: #1596b6; + --base-gradient-spread: 6; + --border-radius-unit: 2px; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-wizard.svg'); diff --git a/tgui/packages/tgui/styles/themes/zavodskoi.scss b/tgui/packages/tgui/styles/themes/zavodskoi.scss index a9b8db2bda9..8d2321f077a 100644 --- a/tgui/packages/tgui/styles/themes/zavodskoi.scss +++ b/tgui/packages/tgui/styles/themes/zavodskoi.scss @@ -1,60 +1,25 @@ -@use 'sass:color'; -@use 'sass:meta'; -@use '../colors.scss' with ( - $primary: #490b0b, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #350404, - $color-bg-grad-spread: 6% -); .theme-zavodskoi { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); - - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': colors.$primary, - 'color-disabled': #363636, - 'color-selected': #1c5f24, - 'color-caution': #be6209, - 'color-danger': #be0f0f - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #080101) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #910101) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #080101) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #4a0202) - ); - - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #350303) - ); + --button-background-default: var(--color-primary); + --button-background-disabled: #363636; + --button-background-selected: #1c5f24; + --button-background-caution: #be6209; + --button-background-danger: #be0f0f; + --input-border-color: #080101; + --input-border-color-focus: #080101; + --number-input-border-color: #080101; + --number-input-border-color-active: #080101; + --notice-box-background: #910101; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: var(--color-primary); + --tooltip-background: #4a0202; + --titlebar-background: #350303; + --color-base: #350404; + --color-primary: #490b0b; + --base-gradient-spread: 6; + --section-background: rgba(0, 0, 0, 0.33); .Layout__content { background-image: url('../../assets/bg-zavod.svg'); diff --git a/tgui/packages/tgui/styles/themes/zenghu.scss b/tgui/packages/tgui/styles/themes/zenghu.scss index 4ea9be69b4d..6d3211d4041 100644 --- a/tgui/packages/tgui/styles/themes/zenghu.scss +++ b/tgui/packages/tgui/styles/themes/zenghu.scss @@ -1,61 +1,29 @@ -@use 'sass:color'; -@use 'sass:meta'; - -@use '../colors.scss' with ( - $primary: #272727, - $bad: #991100, - $fg-map-keys: (), - $bg-map-keys: () -); -@use '../base.scss' with ( - $color-bg: #1f1527, - $color-bg-grad-spread: 6% -); - .theme-zenghu { - // Atomic classes - @include meta.load-css('../atomic/color.scss'); + --color-base: #1f1527; + --color-primary: #272727; + --color-red: #991100; + --color-bad: #991100; + --base-gradient-spread: 6; - // Components - @include meta.load-css( - '../components/Button.scss', - $with: ( - 'color-default': #47354f, - 'color-disabled': #363636, - 'color-selected': #ffffff, - 'color-caution': #be6209, - 'color-danger': #ad2727 - ) - ); - @include meta.load-css( - '../components/Input.scss', - $with: ('border-color': #ffffff) - ); - @include meta.load-css( - '../components/NoticeBox.scss', - $with: ('background-color': #a681c1) - ); - @include meta.load-css( - '../components/NumberInput.scss', - $with: ('border-color': #ffffff) - ); - @include meta.load-css( - '../components/ProgressBar.scss', - $with: ('background-color': rgba(0, 0, 0, 0.5)) - ); - @include meta.load-css('../components/Section.scss'); - @include meta.load-css( - '../components/Tooltip.scss', - $with: ('background-color': #a681c1) - ); + --button-background-default: #47354f; + --button-background-disabled: #363636; + --button-background-selected: #bb44cc; + --button-background-caution: #be6209; + --button-background-danger: #ad2727; - // Layouts - @include meta.load-css('../layouts/Layout.scss'); - @include meta.load-css('../layouts/Window.scss'); - @include meta.load-css( - '../layouts/TitleBar.scss', - $with: ('background-color': #121014) - ); + --input-border-color: #ffffff; + --input-border-color-focus: #ffffff; + --number-input-border-color: #ffffff; + --number-input-border-color-active: #ffffff; + + --notice-box-background: #a681c1; + --notice-box-color: var(--color-text-fixed-white); + --progress-bar-background: rgba(0, 0, 0, 0.5); + --progress-bar-fill: #47354f; + --section-background: rgba(0, 0, 0, 0.33); + --section-separator-color: #272727; + --tooltip-background: #a681c1; + --titlebar-background: #121014; .Layout__content { background-image: url('../../assets/bg-zenghu.svg'); diff --git a/tgui/public/bg-deforest.svg b/tgui/public/bg-deforest.svg new file mode 100644 index 00000000000..018c2e984bd --- /dev/null +++ b/tgui/public/bg-deforest.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/tgui/public/bg-nanotrasen.svg b/tgui/public/bg-nanotrasen.svg new file mode 100644 index 00000000000..d21b9f0a2a0 --- /dev/null +++ b/tgui/public/bg-nanotrasen.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/tgui/public/helpers.min.js b/tgui/public/helpers.min.js new file mode 100644 index 00000000000..6c5fc969b84 --- /dev/null +++ b/tgui/public/helpers.min.js @@ -0,0 +1 @@ +(function(){var hasOwn=Object.prototype.hasOwnProperty;var assign=function(target){for(var i=1;i0){url+="&"}var value=params[key];if(value===null||value===undefined){value=""}url+=encodeURIComponent(key)+"="+encodeURIComponent(value)}}}if(window.cef_to_byond){cef_to_byond("byond://"+url);return}if(url.length<2048){location.href="byond://"+url;return}var xhr=new XMLHttpRequest;xhr.open("GET",url);xhr.send()};Byond.callAsync=function(path,params){if(!window.Promise){throw new Error("Async calls require API level of ES2015 or later.")}var index=Byond.__callbacks__.length;var promise=new window.Promise(function(resolve){Byond.__callbacks__.push(resolve)});Byond.call(path,assign({},params,{callback:"Byond.__callbacks__["+index+"]"}));return promise};Byond.topic=function(params){return Byond.call("",params)};Byond.command=function(command){return Byond.call("winset",{command:command})};Byond.winget=function(id,propName){if(id===null){id=""}var isArray=propName instanceof Array;var isSpecific=propName&&propName!=="*"&&!isArray;var promise=Byond.callAsync("winget",{id:id,property:isArray&&propName.join(",")||propName||"*"});if(isSpecific){promise=promise.then(function(props){return props[propName]})}return promise};Byond.winset=function(id,propName,propValue){if(id===null){id=""}else if(typeof id==="object"){return Byond.call("winset",id)}var props={};if(typeof propName==="string"){props[propName]=propValue}else{assign(props,propName)}props.id=id;return Byond.call("winset",props)};Byond.parseJson=function(json){try{return JSON.parse(json,byondJsonReviver)}catch(err){throw new Error("JSON parsing error: "+(err&&err.message))}};Byond.sendMessage=function(type,payload){var message=typeof type==="string"?{type:type,payload:payload}:type;if(message.payload!==null&&message.payload!==undefined){message.payload=JSON.stringify(message.payload)}assign(message,{tgui:1,window_id:Byond.windowId});Byond.topic(message)};Byond.injectMessage=function(type,payload){window.update(JSON.stringify({type:type,payload:payload}))};Byond.subscribe=function(listener){window.update.flushQueue(listener);window.update.listeners.push(listener)};Byond.subscribeTo=function(type,listener){var _listener=function(_type,payload){if(_type===type){listener(payload)}};window.update.flushQueue(_listener);window.update.listeners.push(_listener)};var RETRY_ATTEMPTS=5;var RETRY_WAIT_INITIAL=500;var RETRY_WAIT_INCREMENT=500;var loadedAssetByUrl={};var isStyleSheetLoaded=function(node,url){var styleSheet=node.sheet;if(styleSheet){return styleSheet.rules.length>0}return false};var injectNode=function(node){if(!document.body){setTimeout(function(){injectNode(node)});return}var refs=document.body.childNodes;var ref=refs[refs.length-1];ref.parentNode.insertBefore(node,ref.nextSibling)};var loadAsset=function(options){var url=options.url;var type=options.type;var sync=options.sync;var attempt=options.attempt||0;if(loadedAssetByUrl[url]){return}loadedAssetByUrl[url]=options;var retry=function(){if(attempt>=RETRY_ATTEMPTS){var errorMessage="Error: Failed to load the asset "+"'"+url+"' after several attempts.";if(type==="css"){errorMessage+=+"\nStylesheet was either not found, "+"or you're trying to load an empty stylesheet "+"that has no CSS rules in it."}throw new Error(errorMessage)}setTimeout(function(){loadedAssetByUrl[url]=null;options.attempt+=1;loadAsset(options)},RETRY_WAIT_INITIAL+attempt*RETRY_WAIT_INCREMENT)};if(type==="js"){var node=document.createElement("script");node.type="text/javascript";node.crossOrigin="anonymous";node.src=url;if(sync){node.defer=true}else{node.async=true}node.onerror=function(){node.onerror=null;node.parentNode.removeChild(node);node=null;retry()};injectNode(node);return}if(type==="css"){var node=document.createElement("link");node.type="text/css";node.rel="stylesheet";node.crossOrigin="anonymous";node.href=url;if(!sync){node.media="only x"}var removeNodeAndRetry=function(){node.parentNode.removeChild(node);node=null;retry()};node.onerror=function(){node.onerror=null;removeNodeAndRetry()};node.onload=function(){node.onload=null;if(isStyleSheetLoaded(node,url)){node.media="all";return}removeNodeAndRetry()};injectNode(node);return}};Byond.loadJs=function(url,sync){loadAsset({url:url,sync:sync,type:"js"})};Byond.loadCss=function(url,sync){loadAsset({url:url,sync:sync,type:"css"})};Byond.saveBlob=function(blob,filename,ext){if(window.navigator.msSaveBlob){window.navigator.msSaveBlob(blob,filename)}else if(window.showSaveFilePicker){var accept={};accept[blob.type]=[ext];var opts={suggestedName:filename,types:[{description:"SS13 file",accept:accept}]};window.showSaveFilePicker(opts).then(function(file){return file.createWritable()}).then(function(file){return file.write(blob).then(function(){return file.close()})}).catch(function(){})}};Byond.iconRefMap={}})();window.onerror=function(msg,url,line,col,error){window.onerror.errorCount=(window.onerror.errorCount||0)+1;var stack=error&&error.stack;if(!stack){stack=msg+"\n at "+url+":"+line;if(col){stack+=":"+col}}stack=window.__augmentStack__(stack,error);if(Byond.strictMode){var errorRoot=document.getElementById("FatalError");var errorStack=document.getElementById("FatalError__stack");if(errorRoot){errorRoot.className="FatalError FatalError--visible";if(window.onerror.__stack__){window.onerror.__stack__+="\n\n"+stack}else{window.onerror.__stack__=stack}var textProp="textContent";errorStack[textProp]=window.onerror.__stack__}var setFatalErrorGeometry=function(){Byond.winset(Byond.windowId,{titlebar:true,"is-visible":true,"can-resize":true})};setFatalErrorGeometry();setInterval(setFatalErrorGeometry,1e3)}if(Byond.strictMode){Byond.sendMessage({type:"log",fatal:1,message:stack})}else if(window.onerror.errorCount<=1){stack+="\nWindow is in non-strict mode, future errors are suppressed.";Byond.sendMessage({type:"log",message:stack})}if(Byond.strictMode){window.update=function(){};window.update.queue=[]}return true};window.onunhandledrejection=function(e){var msg="UnhandledRejection";if(e.reason){msg+=": "+(e.reason.message||e.reason.description||e.reason);if(e.reason.stack){e.reason.stack="UnhandledRejection: "+e.reason.stack}}window.onerror(msg,null,null,null,e.reason)};window.__augmentStack__=function(stack,error){return stack+"\nUser Agent: "+navigator.userAgent};window.update=function(rawMessage){if(window.update.queueActive){window.update.queue.push(rawMessage);return}var message=Byond.parseJson(rawMessage);var listeners=window.update.listeners;for(var i=0;i + + + - - - + - + const getStore = async (mode) => { + return dbPromise.then((db) => + db + .transaction(INDEXED_DB_STORE_NAME, mode) + .objectStore(INDEXED_DB_STORE_NAME), + ); + }; + + const get = async (key) => { + const store = await getStore(READ_ONLY); + return new Promise((resolve, reject) => { + const req = store.get(key); + req.onsuccess = () => resolve(req.result); + req.onerror = () => reject(req.error); + }); + }; + + const set = async (key, value) => { + const store = await getStore(READ_WRITE); + store.put(value, key); + }; + + const remove = async (key) => { + const store = await getStore(READ_WRITE); + store.delete(key); + }; + + const clear = async () => { + const store = await getStore(READ_WRITE); + store.clear(); + }; + + window.onload = () => { + window.parent.postMessage("ready", "*"); + } + + diff --git a/tgui/public/ntos-error.min.css b/tgui/public/ntos-error.min.css new file mode 100644 index 00000000000..73259a99689 --- /dev/null +++ b/tgui/public/ntos-error.min.css @@ -0,0 +1 @@ +blink{animation:1s linear infinite condemned-blink-effect}@keyframes condemned-blink-effect{0%{visibility:hidden}50%{visibility:hidden}100%{visibility:visible}}.FatalError{display:none;position:absolute;top:0;left:0;right:0;bottom:0;padding:12px;font-size:12px;font-family:Consolas,monospace;color:#fff;background-color:#00d;z-index:1000;overflow:hidden;text-align:center}.FatalError--visible{display:block!important}.FatalError__logo{display:inline-block;text-align:left;font-size:10px;line-height:12px;position:relative;margin:16px;top:0;left:0;animation:FatalError__rainbow 2s linear infinite alternate,FatalError__shadow 4s linear infinite alternate,FatalError__tfmX 3s infinite alternate,FatalError__tfmY 4s infinite alternate;white-space:pre}.FatalError__header{margin-top:12px}.FatalError__stack{text-align:left;white-space:pre-wrap;word-break:break-all;margin-top:24px;margin-bottom:24px}.FatalError__footer{margin-bottom:24px}@keyframes FatalError__rainbow{0%{color:#ff0}50%{color:#0ff}100%{color:#f0f}}@keyframes FatalError__shadow{0%{left:-2px;text-shadow:4px 0 #f0f}50%{left:0;text-shadow:0 0 #0ff}100%{left:2px;text-shadow:-4px 0 #ff0}}@keyframes FatalError__tfmX{0%{left:15px}100%{left:-15px}}@keyframes FatalError__tfmY{100%{top:-15px}} \ No newline at end of file diff --git a/tgui/public/tgui-polyfill.min.js b/tgui/public/tgui-polyfill.min.js deleted file mode 100644 index 91be6dc8765..00000000000 --- a/tgui/public/tgui-polyfill.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(window,document){var version="3.7.3";var options=window.html5||{};var reSkip=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;var saveClones=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;var supportsHtml5Styles;var expando="_html5shiv";var expanID=0;var expandoData={};var supportsUnknownElements;(function(){try{var a=document.createElement("a");a.innerHTML="";supportsHtml5Styles="hidden"in a;supportsUnknownElements=a.childNodes.length==1||function(){document.createElement("a");var frag=document.createDocumentFragment();return typeof frag.cloneNode=="undefined"||typeof frag.createDocumentFragment=="undefined"||typeof frag.createElement=="undefined"}()}catch(e){supportsHtml5Styles=true;supportsUnknownElements=true}})();function addStyleSheet(ownerDocument,cssText){var p=ownerDocument.createElement("p"),parent=ownerDocument.getElementsByTagName("head")[0]||ownerDocument.documentElement;p.innerHTML="x";return parent.insertBefore(p.lastChild,parent.firstChild)}function getElements(){var elements=html5.elements;return typeof elements=="string"?elements.split(" "):elements}function addElements(newElements,ownerDocument){var elements=html5.elements;if(typeof elements!="string"){elements=elements.join(" ")}if(typeof newElements!="string"){newElements=newElements.join(" ")}html5.elements=elements+" "+newElements;shivDocument(ownerDocument)}function getExpandoData(ownerDocument){var data=expandoData[ownerDocument[expando]];if(!data){data={};expanID++;ownerDocument[expando]=expanID;expandoData[expanID]=data}return data}function createElement(nodeName,ownerDocument,data){if(!ownerDocument){ownerDocument=document}if(supportsUnknownElements){return ownerDocument.createElement(nodeName)}if(!data){data=getExpandoData(ownerDocument)}var node;if(data.cache[nodeName]){node=data.cache[nodeName].cloneNode()}else if(saveClones.test(nodeName)){node=(data.cache[nodeName]=data.createElem(nodeName)).cloneNode()}else{node=data.createElem(nodeName)}return node.canHaveChildren&&!reSkip.test(nodeName)&&!node.tagUrn?data.frag.appendChild(node):node}function createDocumentFragment(ownerDocument,data){if(!ownerDocument){ownerDocument=document}if(supportsUnknownElements){return ownerDocument.createDocumentFragment()}data=data||getExpandoData(ownerDocument);var clone=data.frag.cloneNode(),i=0,elems=getElements(),l=elems.length;for(;i3?getModifier(init):null,key=String(init.key),chr=String(init.char),location=init.location,keyCode=init.keyCode||(init.keyCode=key)&&key.charCodeAt(0)||0,charCode=init.charCode||(init.charCode=chr)&&chr.charCodeAt(0)||0,bubbles=init.bubbles,cancelable=init.cancelable,repeat=init.repeat,locale=init.locale,view=init.view||window,args;if(!init.which)init.which=init.keyCode;if("initKeyEvent"in out){out.initKeyEvent(type,bubbles,cancelable,view,ctrlKey,altKey,shiftKey,metaKey,keyCode,charCode)}else if(0>>0);var proto=Element.prototype;var querySelector=proto.querySelector;var querySelectorAll=proto.querySelectorAll;proto.querySelector=function qS(css){return find(this,querySelector,css)};proto.querySelectorAll=function qSA(css){return find(this,querySelectorAll,css)};function find(node,method,css){node.setAttribute(dataScope,null);var result=method.call(node,String(css).replace(/(^|,\s*)(:scope([ >]|$))/g,(function($0,$1,$2,$3){return $1+"["+dataScope+"]"+($3||" ")})));node.removeAttribute(dataScope);return result}})()}})(window);(function(global){"use strict";var DOMMap=global.WeakMap||function(){var counter=0,dispatched=false,drop=false,value;function dispatch(key,ce,shouldDrop){drop=shouldDrop;dispatched=false;value=undefined;key.dispatchEvent(ce)}function Handler(value){this.value=value}Handler.prototype.handleEvent=function handleEvent(e){dispatched=true;if(drop){e.currentTarget.removeEventListener(e.type,this,false)}else{value=this.value}};function DOMMap(){counter++;this.__ce__=new Event("@DOMMap:"+counter+Math.random())}DOMMap.prototype={constructor:DOMMap,"delete":function del(key){return dispatch(key,this.__ce__,true),dispatched},get:function get(key){dispatch(key,this.__ce__,false);var v=value;value=undefined;return v},has:function has(key){return dispatch(key,this.__ce__,false),dispatched},set:function set(key,value){dispatch(key,this.__ce__,true);key.addEventListener(this.__ce__.type,new Handler(value),false);return this}};return DOMMap}();function Dict(){}Dict.prototype=(Object.create||Object)(null);function createEventListener(type,callback,options){function eventListener(e){if(eventListener.once){e.currentTarget.removeEventListener(e.type,callback,eventListener);eventListener.removed=true}if(eventListener.passive){e.preventDefault=createEventListener.preventDefault}if(typeof eventListener.callback==="function"){eventListener.callback.call(this,e)}else if(eventListener.callback){eventListener.callback.handleEvent(e)}if(eventListener.passive){delete e.preventDefault}}eventListener.type=type;eventListener.callback=callback;eventListener.capture=!!options.capture;eventListener.passive=!!options.passive;eventListener.once=!!options.once;eventListener.removed=false;return eventListener}createEventListener.preventDefault=function preventDefault(){};var Event=global.CustomEvent,dE=global.dispatchEvent,aEL=global.addEventListener,rEL=global.removeEventListener,counter=0,increment=function(){counter++},indexOf=[].indexOf||function indexOf(value){var length=this.length;while(length--){if(this[length]===value){break}}return length},getListenerKey=function(options){return"".concat(options.capture?"1":"0",options.passive?"1":"0",options.once?"1":"0")},augment;try{aEL("_",increment,{once:true});dE(new Event("_"));dE(new Event("_"));rEL("_",increment,{once:true})}catch(o_O){}if(counter!==1){(function(){var dm=new DOMMap;function createAEL(aEL){return function addEventListener(type,handler,options){if(options&&typeof options!=="boolean"){var info=dm.get(this),key=getListenerKey(options),i,tmp,wrap;if(!info)dm.set(this,info=new Dict);if(!(type in info))info[type]={handler:[],wrap:[]};tmp=info[type];i=indexOf.call(tmp.handler,handler);if(i<0){i=tmp.handler.push(handler)-1;tmp.wrap[i]=wrap=new Dict}else{wrap=tmp.wrap[i]}if(!(key in wrap)){wrap[key]=createEventListener(type,handler,options);aEL.call(this,type,wrap[key],wrap[key].capture)}}else{aEL.call(this,type,handler,options)}}}function createREL(rEL){return function removeEventListener(type,handler,options){if(options&&typeof options!=="boolean"){var info=dm.get(this),key,i,tmp,wrap;if(info&&type in info){tmp=info[type];i=indexOf.call(tmp.handler,handler);if(-1>>0;if(typeof callback!=="function"){throw new TypeError(callback+" is not a function")}if(arguments.length>1){T=thisArg}k=0;while(k - + - - - - + + - - - + @@ -730,30 +27,20 @@
    - +

    A fatal exception has occurred at 002B:C562F1B7 in TGUI. The current application will be terminated. Send the copy of the following stack - trace to an authorized NanoTrasen incident handler at - https://github.com/Aurorastation/Aurora.3. Thank you for your - cooperation. -

    + trace to an authorized Nanotrasen incident handler at + https://github.com/Aurorastation/Aurora.3. Thank you for your cooperation. +

    @@ -766,6 +53,7 @@ NNNNNNNN NNNNNNN TTTTTTTTTTT OOOOOOOOO SSSSSSSSSSSSS
    Please enable Javascript and restart the game.
    +