diff --git a/.github/workflows/auto_changelog.yml b/.github/workflows/auto_changelog.yml index 1469a0f983dc16..a7280acd15f935 100644 --- a/.github/workflows/auto_changelog.yml +++ b/.github/workflows/auto_changelog.yml @@ -14,7 +14,7 @@ jobs: if: github.event.pull_request.merged == true steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Run auto changelog uses: actions/github-script@v6 with: diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml index 740b5d7d9eb21f..91ab12cdb19f6e 100644 --- a/.github/workflows/autowiki.yml +++ b/.github/workflows/autowiki.yml @@ -20,13 +20,13 @@ jobs: echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT - name: Checkout if: steps.secrets_set.outputs.SECRETS_ENABLED - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Restore BYOND cache if: steps.secrets_set.outputs.SECRETS_ENABLED - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: ~/BYOND - key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} + key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }} - name: Install rust-g if: steps.secrets_set.outputs.SECRETS_ENABLED run: | diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 46d72c298a2c78..22abc209c99090 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -13,125 +13,98 @@ on: merge_group: branches: - master - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - jobs: run_linters: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Run Linters runs-on: ubuntu-22.04 - timeout-minutes: 5 - + concurrency: + group: run_linters-${{ github.head_ref || github.run_id }} + cancel-in-progress: true steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Restore SpacemanDMM cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: ~/SpacemanDMM - key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }} - restore-keys: | - ${{ runner.os }}-spacemandmm- + key: ${{ runner.os }}-spacemandmm - name: Restore Yarn cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn- - - name: Restore Node cache - uses: actions/cache@v4 - with: - path: ~/.nvm - key: ${{ runner.os }}-node-${{ hashFiles('dependencies.sh') }} - restore-keys: | - ${{ runner.os }}-node- - - name: Restore Bootstrap cache - uses: actions/cache@v4 - with: - path: tools/bootstrap/.cache - key: ${{ runner.os }}-bootstrap-${{ hashFiles('tools/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-bootstrap- + ${{ runner.os }}-build- + ${{ runner.os }}- - name: Restore Rust cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: ~/.cargo - key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}} + key: ${{ runner.os }}-rust restore-keys: | - ${{ runner.os }}-rust- - - name: Install OpenDream - uses: robinraju/release-downloader@v1.9 - with: - repository: "OpenDreamProject/OpenDream" - tag: "latest" - fileName: "DMCompiler_linux-x64.tar.gz" - extract: true + ${{ runner.os }}-build- + ${{ runner.os }}- - name: Install Tools run: | pip3 install setuptools bash tools/ci/install_node.sh bash tools/ci/install_spaceman_dmm.sh dreamchecker - bash tools/ci/install_ripgrep.sh + cargo install ripgrep --features pcre2 tools/bootstrap/python -c '' - - name: Give Linters A Go - id: linter-setup - run: ':' - - name: Run Grep Checks - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: bash tools/ci/check_grep.sh - - name: Ticked File Enforcement - if: steps.linter-setup.conclusion == 'success' && !cancelled() + - name: Run Linters run: | + bash tools/ci/check_filedirs.sh tgstation.dme + bash tools/ci/check_changelogs.sh + bash tools/ci/check_grep.sh + bash tools/ci/check_misc.sh tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/tgstation_dme.json tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json - - name: Check Define Sanity - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: tools/bootstrap/python -m define_sanity.check - - name: Run DreamChecker - if: steps.linter-setup.conclusion == 'success' && !cancelled() - shell: bash - run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh + tools/bootstrap/python -m tools.maplint.source --github + tools/build/build --ci lint tgui-test + tools/bootstrap/python -m define_sanity.check + tools/bootstrap/python -m dmi.test + tools/bootstrap/python -m mapmerge2.dmm_test + ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1 + - name: Annotate Lints + uses: yogstation13/DreamAnnotate@v2 + if: success() || failure() + with: + outputFile: output-annotations.txt + + odlint: + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + name: "Lint with OpenDream" + runs-on: ubuntu-22.04 + concurrency: + group: odlint-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + steps: + - uses: actions/checkout@v4 + - uses: robinraju/release-downloader@v1.9 + with: + repository: "OpenDreamProject/OpenDream" + tag: "latest" + fileName: "DMCompiler_linux-x64.tar.gz" + extract: true - name: Run OpenDream - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: ./DMCompiler_linux-x64/DMCompiler tgstation.dme --suppress-unimplemented --define=CIBUILDING | bash tools/ci/annotate_od.sh - - name: Run Map Checks - if: steps.linter-setup.conclusion == 'success' && !cancelled() run: | - tools/bootstrap/python -m mapmerge2.dmm_test - tools/bootstrap/python -m tools.maplint.source - - name: Run DMI Tests - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: tools/bootstrap/python -m dmi.test - - name: Check File Directories - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: bash tools/ci/check_filedirs.sh tgstation.dme - - name: Check Changelogs - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: bash tools/ci/check_changelogs.sh - - name: Check Miscellaneous Files - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: bash tools/ci/check_misc.sh - - name: Run TGUI Checks - if: steps.linter-setup.conclusion == 'success' && !cancelled() - run: tools/build/build --ci lint tgui-test + ./DMCompiler_linux-x64/DMCompiler tgstation.dme --suppress-unimplemented --define=CIBUILDING compile_all_maps: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Compile Maps needs: [collect_data] - runs-on: ubuntu-22.04 - timeout-minutes: 5 - + runs-on: ubuntu-20.04 + concurrency: + group: compile_all_maps-${{ github.head_ref || github.run_id }} + cancel-in-progress: true steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Restore BYOND cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: ~/BYOND - key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} + key: ${{ runner.os }}-byond - name: Compile All Maps run: | bash tools/ci/install_byond.sh @@ -146,15 +119,16 @@ jobs: collect_data: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Collect data for other tasks - runs-on: ubuntu-22.04 - timeout-minutes: 5 + runs-on: ubuntu-20.04 outputs: maps: ${{ steps.map_finder.outputs.maps }} alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }} max_required_byond_client: ${{ steps.max_required_byond_client.outputs.max_required_byond_client }} - + concurrency: + group: find_all_maps-${{ github.head_ref || github.run_id }} + cancel-in-progress: true steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Find Maps id: map_finder run: | @@ -177,26 +151,29 @@ jobs: if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Integration Tests needs: [collect_data] - strategy: fail-fast: false matrix: map: ${{ fromJSON(needs.collect_data.outputs.maps).paths }} - + concurrency: + group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.map }} + cancel-in-progress: true uses: ./.github/workflows/run_integration_tests.yml with: map: ${{ matrix.map }} max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}} run_alternate_tests: - if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.collect_data.outputs.alternate_tests != '[]' ) + if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'" name: Alternate Tests needs: [collect_data] strategy: fail-fast: false matrix: setup: ${{ fromJSON(needs.collect_data.outputs.alternate_tests) }} - + concurrency: + group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.setup.major }}.${{ matrix.setup.minor }}-${{ matrix.setup.map }} + cancel-in-progress: true uses: ./.github/workflows/run_integration_tests.yml with: map: ${{ matrix.setup.map }} @@ -205,27 +182,23 @@ jobs: max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}} check_alternate_tests: - if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.collect_data.outputs.alternate_tests != '[]' ) + if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'" name: Check Alternate Tests needs: [run_alternate_tests] - runs-on: ubuntu-22.04 - timeout-minutes: 5 + runs-on: ubuntu-20.04 steps: - run: echo Alternate tests passed. compare_screenshots: - if: ( !contains(github.event.head_commit.message, '[ci skip]') && (success() || failure()) ) + if: "!contains(github.event.head_commit.message, '[ci skip]') && (success() || failure())" needs: [run_all_tests, run_alternate_tests] name: Compare Screenshot Tests - timeout-minutes: 15 - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4 - - name: Setup directory - run: mkdir -p artifacts + - uses: actions/checkout@v3 # If we ever add more artifacts, this is going to break, but it'll be obvious. - name: Download screenshot tests - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: path: artifacts - name: ls -R @@ -246,7 +219,7 @@ jobs: echo ${{ github.event.pull_request.number }} > artifacts/screenshot_comparisons/pull_request_number.txt - name: Upload bad screenshots if: failure() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: bad-screenshots path: artifacts/screenshot_comparisons @@ -256,17 +229,19 @@ jobs: name: Windows Build needs: [collect_data] runs-on: windows-latest - timeout-minutes: 5 - + concurrency: + group: test_windows-${{ github.head_ref || github.run_id }} + cancel-in-progress: true steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Restore Yarn cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn- + ${{ runner.os }}-build- + ${{ runner.os }}- - name: Compile run: pwsh tools/ci/build.ps1 env: diff --git a/.github/workflows/codeowner_reviews.yml b/.github/workflows/codeowner_reviews.yml index e6cfb980279018..ed06f9b8a99d71 100644 --- a/.github/workflows/codeowner_reviews.yml +++ b/.github/workflows/codeowner_reviews.yml @@ -9,11 +9,10 @@ jobs: assign-users: runs-on: ubuntu-latest - timeout-minutes: 5 steps: # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 #Parse the Codeowner file on non draft PRs - name: CodeOwnersParser diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml index dd60b07b86bdf3..fefd9de30ea28f 100644 --- a/.github/workflows/compile_changelogs.yml +++ b/.github/workflows/compile_changelogs.yml @@ -31,7 +31,7 @@ jobs: sudo apt-get install dos2unix - name: "Checkout" if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 25 persist-credentials: false diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml index 6daec1ded10579..529a706ff6da1e 100644 --- a/.github/workflows/docker_publish.yml +++ b/.github/workflows/docker_publish.yml @@ -5,10 +5,10 @@ on: workflow_dispatch: jobs: publish: - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Build and Publish Docker Image to Registry uses: elgohr/Publish-Docker-Github-Action@v5 diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index 0dc79584b9e42a..5f13472ca524ba 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -9,13 +9,13 @@ jobs: generate_documentation: permissions: contents: write # for JamesIves/github-pages-deploy-action to push changes in repo - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-20.04 concurrency: gen-docs steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Setup cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: ~/SpacemanDMM key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }} diff --git a/.github/workflows/pr_emoji.yml b/.github/workflows/pr_emoji.yml index a9d35d2456fb13..219b319298ad59 100644 --- a/.github/workflows/pr_emoji.yml +++ b/.github/workflows/pr_emoji.yml @@ -10,7 +10,7 @@ jobs: title_and_changelog: runs-on: ubuntu-20.04 steps: - - uses: Wayland-Smithy/emoji-stripper-action@de0c1d158edee50700583d6454aa5f5117337599 + - uses: Wayland-Smithy/emoji-stripper-action@8f4c2fe9748bb9b02f105be4e72a1a42b0f34d84 with: repo-token: ${{ secrets.GITHUB_TOKEN }} title: true diff --git a/.github/workflows/remove_guide_comments.yml b/.github/workflows/remove_guide_comments.yml index e3a4ac3feda067..d5d405909e2119 100644 --- a/.github/workflows/remove_guide_comments.yml +++ b/.github/workflows/remove_guide_comments.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Remove guide comments uses: actions/github-script@v6 with: diff --git a/.github/workflows/rerun_flaky_tests.yml b/.github/workflows/rerun_flaky_tests.yml index 7f498de1443085..24c3ec95197d87 100644 --- a/.github/workflows/rerun_flaky_tests.yml +++ b/.github/workflows/rerun_flaky_tests.yml @@ -10,7 +10,7 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Rerun flaky tests uses: actions/github-script@v6 with: @@ -22,7 +22,7 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.run_attempt == 2 }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Report flaky tests uses: actions/github-script@v6 with: diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index d239ef3547b6b5..49978ca25a3f60 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -16,11 +16,9 @@ on: max_required_byond_client: required: true type: string - jobs: run_integration_tests: runs-on: ubuntu-latest - timeout-minutes: 30 # Monkestation edit: Our CI takes nearly twice as long, so the timeout is twice as long services: mysql: image: mysql:latest @@ -30,12 +28,12 @@ jobs: - 3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Restore BYOND cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: ~/BYOND - key: ${{ runner.os }}-byond-${{ hashFiles('dependencies.sh') }} + key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }} - name: Setup database run: | sudo systemctl start mysql @@ -66,9 +64,9 @@ jobs: bash tools/ci/run_server.sh ${{ inputs.map }} - name: Upload screenshot tests if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: - name: test_artifacts_${{ inputs.map }}_${{ inputs.major }}_${{ inputs.minor }} + name: test_artifacts_${{ inputs.map }} path: data/screenshots_new/ retention-days: 1 - name: Check client Compatibility diff --git a/.github/workflows/show_screenshot_test_results.yml b/.github/workflows/show_screenshot_test_results.yml index 70eed354d5c6ca..8e463e46c05fff 100644 --- a/.github/workflows/show_screenshot_test_results.yml +++ b/.github/workflows/show_screenshot_test_results.yml @@ -11,7 +11,7 @@ on: - completed jobs: show_screenshot_test_results: - if: ( !contains(github.event.head_commit.message, '[ci skip]') && github.event.workflow_run.run_attempt == 1 ) + if: "!contains(github.event.head_commit.message, '[ci skip]') && github.event.workflow_run.run_attempt == 1" name: Show Screenshot Test Results runs-on: ubuntu-20.04 steps: @@ -25,7 +25,7 @@ jobs: echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT - name: Checkout if: steps.secrets_set.outputs.SECRETS_ENABLED - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Prepare module if: steps.secrets_set.outputs.SECRETS_ENABLED run: | diff --git a/.github/workflows/test_merge_bot.yml b/.github/workflows/test_merge_bot.yml index 224ff070751498..ebf8928f435dfe 100644 --- a/.github/workflows/test_merge_bot.yml +++ b/.github/workflows/test_merge_bot.yml @@ -23,7 +23,7 @@ jobs: echo "GET_TEST_MERGES_URL=$SECRET_EXISTS" >> $GITHUB_OUTPUT - name: Checkout if: steps.secrets_set.outputs.GET_TEST_MERGES_URL - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Prepare module if: steps.secrets_set.outputs.GET_TEST_MERGES_URL run: | diff --git a/.tgs.yml b/.tgs.yml index dd18c3b8a2577a..76a53577b505b0 100644 --- a/.tgs.yml +++ b/.tgs.yml @@ -3,7 +3,7 @@ version: 1 # The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job) # Must be interpreted as a string, keep quoted -byond: "515.1637" +byond: "515.1633" # Folders to create in "/Configuration/GameStaticFiles/" static_files: # Config directory should be static diff --git a/.vscode/settings.json b/.vscode/settings.json index 5477c9a90bf6a1..6b9aaddb45c219 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,9 +1,7 @@ { "eslint.nodePath": "./tgui/.yarn/sdks", - "eslint.workingDirectories": [ - "./tgui" - ], - "prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.cjs", + "eslint.workingDirectories": ["./tgui"], + "prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.js", "typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib", "typescript.enablePromptUseWorkspaceTsdk": true, "search.exclude": { @@ -15,50 +13,36 @@ }, "files.eol": "\n", "files.insertFinalNewline": true, - "gitlens.advanced.blame.customArguments": [ - "-w" - ], + "git.branchProtection": ["master"], + "gitlens.advanced.blame.customArguments": ["-w"], "tgstationTestExplorer.project.resultsType": "json", "[javascript]": { - "editor.rulers": [ - 80 - ], + "editor.rulers": [80], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true }, "[javascriptreact]": { - "editor.rulers": [ - 80 - ], + "editor.rulers": [80], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true }, "[typescript]": { - "editor.rulers": [ - 80 - ], + "editor.rulers": [80], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true }, "[typescriptreact]": { - "editor.rulers": [ - 80 - ], + "editor.rulers": [80], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true }, "[scss]": { - "editor.rulers": [ - 80 - ], + "editor.rulers": [80], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true }, "workbench.editorAssociations": { "*.dmi": "dmiEditor.dmiEditor" }, - "Lua.diagnostics.enable": false, - "git.branchProtection": [ - "master" - ] -} \ No newline at end of file + "Lua.diagnostics.enable": false +} diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm index 2d06c716c2f8b3..50cdbe733db9dc 100644 --- a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm +++ b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm @@ -1187,7 +1187,7 @@ "BL" = ( /obj/structure/table/wood, /obj/item/folder/white, -/obj/item/stamp/head/rd, +/obj/item/stamp/rd, /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/powered/hilbertresearchfacility) "BM" = ( diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm index e62ea1e36e7638..4e92c32d61eb80 100644 --- a/_maps/RandomRuins/SpaceRuins/waystation.dmm +++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm @@ -29,7 +29,7 @@ pixel_x = 7; pixel_y = 4 }, -/obj/item/stamp/head/qm{ +/obj/item/stamp/qm{ pixel_x = 7; pixel_y = -2 }, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index e93c32049931f1..6a8be5f8c6e29e 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -2904,7 +2904,7 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /obj/item/folder/white, -/obj/item/stamp/head/rd{ +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 049d4ef2470f0c..850824bc433659 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -5519,7 +5519,7 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /obj/item/folder/white, -/obj/item/stamp/head/rd{ +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, @@ -10161,7 +10161,7 @@ /obj/item/clothing/glasses/meson{ pixel_y = 4 }, -/obj/item/stamp/head/ce, +/obj/item/stamp/ce, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron{ heat_capacity = 1e+006 diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 42de3d0ab59dc0..a3c509373e77e6 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -44,6 +44,18 @@ /mob/living/basic/mothroach, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"aaR" = ( +/obj/machinery/camera/directional/north{ + c_tag = " Prison - East"; + dir = 2; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/upper) "aaU" = ( /obj/structure/railing/wrestling{ dir = 8 @@ -59,11 +71,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"aaZ" = ( -/obj/structure/closet, -/obj/effect/spawner/random/medical/medkit, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "abj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -524,6 +531,18 @@ /obj/structure/cable, /turf/open/floor/iron/large, /area/station/cargo/lobby) +"afI" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "afL" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/machinery/light/directional/west, @@ -542,7 +561,6 @@ dir = 1 }, /obj/machinery/light_switch/directional/west, -/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/carpet/black, /area/station/commons/dorms/room5) "aga" = ( @@ -655,6 +673,11 @@ /obj/effect/mapping_helpers/airlock/access/all/command/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"agZ" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/computer/order_console/bitrunning, +/turf/open/floor/iron, +/area/station/security/prison/upper) "ahd" = ( /obj/effect/turf_decal/delivery/blue, /obj/structure/cable, @@ -774,9 +797,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"ais" = ( -/turf/closed/wall/r_wall, -/area/station/security/bitden) "ait" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -789,12 +809,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"aiw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/mess, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "aiC" = ( /obj/machinery/suit_storage_unit/engine, /turf/open/floor/iron/dark, @@ -823,7 +837,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/white, /area/station/commons/toilet/restrooms) "aiN" = ( @@ -860,6 +873,17 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron, /area/station/security/checkpoint/customs/auxiliary) +"aiV" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/structure/bed/roller{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "ajc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -1050,6 +1074,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/upper) +"akv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "akw" = ( /obj/structure/chair/sofa/bench/right{ dir = 8; @@ -1259,12 +1288,6 @@ /obj/structure/flora/grass/jungle, /turf/open/floor/grass, /area/station/service/hydroponics) -"anf" = ( -/obj/structure/closet/secure_closet/brig/genpop, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "ani" = ( /obj/structure/cable, /turf/open/floor/circuit/telecomms/mainframe, @@ -1362,11 +1385,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/prison/mess) -"aod" = ( -/obj/structure/chair/sofa/bench/right, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "aoh" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -1444,6 +1462,15 @@ dir = 8 }, /area/station/security/prison/workout) +"aoI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/security/prison) "aoK" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -1477,6 +1504,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"aoU" = ( +/obj/effect/decal/remains/human, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "apa" = ( /obj/machinery/vending/coffee, /obj/structure/cable, @@ -1558,9 +1592,19 @@ }, /obj/machinery/status_display/evac/directional/south, /obj/effect/landmark/start/hangover, -/obj/machinery/atm/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/command) +"aqa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "aqb" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, @@ -1699,14 +1743,6 @@ /obj/effect/landmark/start/hangover, /turf/open/water/overlay, /area/station/hallway/primary/central) -"arx" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/security/prison) "arA" = ( /turf/open/floor/iron/smooth_edge{ dir = 4 @@ -1976,10 +2012,6 @@ dir = 4 }, /area/station/security/range) -"aub" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "auv" = ( /obj/effect/turf_decal/bot_white/left, /obj/effect/spawner/random/structure/crate, @@ -2001,6 +2033,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +"auR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/red, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "auS" = ( /obj/structure/table, /obj/item/stack/package_wrap, @@ -2495,17 +2535,6 @@ "azk" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/crew_quarters/bar) -"azm" = ( -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, -/obj/machinery/recharge_station, -/obj/machinery/light_switch/directional/south, -/obj/machinery/button/door/directional/east{ - name = "Security Mech Garage Door Controls"; - id = "SecMech"; - req_access = list("security") - }, -/turf/open/floor/iron/dark, -/area/station/security/mechbay) "azu" = ( /obj/structure/bed/double, /obj/item/bedsheet/captain/double, @@ -2541,18 +2570,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/stairs/old, /area/station/cargo/warehouse) -"azM" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/random/entertainment/money, -/obj/item/storage/pill_bottle/maintenance_pill/full, -/obj/item/coin/adamantine, -/obj/item/clothing/glasses/sunglasses, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/storage/belt/utility/full/engi, -/obj/item/clothing/suit/armor/vest/old, -/obj/effect/spawner/random/contraband/plus, -/turf/open/floor/plating, -/area/station/security/prison) "azU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/moisture_trap, @@ -2607,19 +2624,6 @@ /obj/machinery/chem_dispenser/drinks, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"aAC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "aAF" = ( /obj/structure/chair{ dir = 4 @@ -2662,9 +2666,6 @@ /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/eighties/red, /area/station/common/arcade) -"aAZ" = ( -/turf/open/floor/plating, -/area/station/security/prison/upper) "aBf" = ( /turf/open/floor/plating, /area/station/engineering/atmos/test_chambers) @@ -2835,6 +2836,10 @@ "aCA" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/storage) +"aCD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth, +/area/station/security/prison/upper) "aCJ" = ( /obj/item/kirbyplants/random, /turf/open/floor/plating, @@ -2860,6 +2865,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"aCT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "aCY" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/cup/bowl{ @@ -2886,14 +2900,6 @@ }, /turf/open/floor/wood, /area/station/security/courtroom) -"aDf" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "aDi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2901,12 +2907,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"aDo" = ( -/obj/effect/turf_decal/siding/dark_red, -/obj/machinery/defibrillator_mount/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/station/security/medical) "aDt" = ( /obj/machinery/door/airlock/highsecurity{ name = "Gravity Generator Room" @@ -3081,6 +3081,10 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"aFg" = ( +/obj/structure/bed/maint, +/turf/open/floor/plating, +/area/station/security/prison/upper) "aFk" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -3116,21 +3120,6 @@ /obj/item/screwdriver, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"aFN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/red/corner, -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 9 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 9 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/security/execution/transfer) "aFO" = ( /obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes{ @@ -3172,13 +3161,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) -"aFX" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/station_map/engineering/directional/north, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) "aGc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3410,11 +3392,11 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"aId" = ( -/obj/machinery/netpod, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) +"aHZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "aIe" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -3431,15 +3413,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"aIm" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/execution/transfer) "aIv" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Science Maintenance" @@ -3457,6 +3430,11 @@ "aIC" = ( /turf/closed/wall/r_wall, /area/station/maintenance/eva_shed/starboard) +"aIF" = ( +/obj/structure/table, +/obj/item/wrench, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "aIH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -3674,12 +3652,6 @@ }, /turf/open/floor/iron, /area/station/science/research) -"aKW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "aLa" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/bot, @@ -3741,13 +3713,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva/upper) -"aLE" = ( -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/structure/window/spawner/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "aLP" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -3802,13 +3767,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"aMk" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "aMl" = ( /obj/item/kirbyplants/random, /obj/machinery/camera/autoname/directional/east, @@ -3991,7 +3949,6 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) "aOC" = ( @@ -4060,7 +4017,6 @@ /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atm/directional/east, /turf/open/floor/iron, /area/station/commons/dorms) "aPq" = ( @@ -4246,12 +4202,6 @@ }, /turf/open/floor/wood, /area/station/maintenance/abandon_art_studio) -"aQX" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "aQY" = ( /turf/closed/wall, /area/station/medical/psychology) @@ -4302,20 +4252,6 @@ /obj/structure/railing, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"aRP" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/security/glass{ - id_tag = "permainner"; - name = "Permabrig Transfer" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "perma-transfer" - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "aSc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4403,15 +4339,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) -"aSJ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) +"aSL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "aSV" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -4420,6 +4351,10 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"aSZ" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "aTe" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 @@ -4591,7 +4526,6 @@ /obj/effect/turf_decal/arrows/white{ dir = 1 }, -/obj/machinery/atm/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "aUY" = ( @@ -4620,6 +4554,12 @@ "aVs" = ( /turf/closed/wall/mineral/titanium, /area/station/science/ordnance/bomb) +"aVv" = ( +/obj/structure/sink/directional/east, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "aVy" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -4679,14 +4619,6 @@ dir = 1 }, /area/station/hallway/primary/upper) -"aWf" = ( -/obj/item/kirbyplants/random, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison/upper) "aWh" = ( /obj/structure/chair/pew/left{ dir = 1 @@ -4928,13 +4860,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"aYv" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/station/security/execution/transfer) "aYz" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine, @@ -5019,6 +4944,15 @@ dir = 8 }, /area/station/common/gaskiosk) +"aZo" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "aZq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -5101,12 +5035,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"bag" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "baj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -5197,6 +5125,10 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/central) +"bba" = ( +/obj/structure/closet/crate, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "bbi" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -5255,8 +5187,8 @@ /area/station/maintenance/fore/upper) "bbG" = ( /obj/structure/table/reinforced, +/obj/item/binoculars, /obj/effect/turf_decal/tile/dark_blue/half/contrasted, -/obj/machinery/station_map/engineering, /turf/open/floor/iron/dark, /area/station/command/bridge) "bbH" = ( @@ -5280,11 +5212,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"bbZ" = ( -/obj/structure/decorative/shelf/crates, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/security/prison/upper) "bcb" = ( /obj/machinery/conveyor{ dir = 9; @@ -5310,17 +5237,6 @@ /obj/item/circular_saw, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/prison_upper) -"bci" = ( -/obj/structure/table/reinforced/rglass, -/obj/item/razor{ - pixel_x = -8 - }, -/obj/item/razor, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "bcl" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -5482,6 +5398,21 @@ dir = 1 }, /area/station/hallway/secondary/command) +"bdt" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "bdu" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -5595,6 +5526,31 @@ }, /turf/open/floor/catwalk_floor/iron, /area/station/engineering/atmos/office) +"beF" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/carbon{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/stamp{ + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/stamp/hop{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/stamp/denied{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/structure/cable, +/obj/machinery/recharger{ + pixel_x = 8; + pixel_y = 5 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "beI" = ( /obj/structure/lattice, /obj/structure/billboard/nanotrasen, @@ -5627,10 +5583,6 @@ name = "Ultra Reinforced Glass Floor" }, /area/station/ai_monitored/turret_protected/aisat_interior) -"bfk" = ( -/obj/structure/ore_box, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "bfo" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, @@ -5683,25 +5635,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"bfU" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Wing" - }, -/obj/machinery/door/poddoor/preopen{ - id = "Prison Gate"; - name = "Prison Blast Door" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery/blue, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "bga" = ( /obj/structure/chair/office, /obj/effect/decal/cleanable/dirt, @@ -5803,12 +5736,6 @@ /obj/structure/sign/departments/chemistry/pharmacy/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/upper) -"bhs" = ( -/obj/effect/turf_decal/vg_decals/numbers/one, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "bhB" = ( /obj/machinery/door/airlock/external{ space_dir = 1 @@ -5948,6 +5875,25 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"biV" = ( +/obj/structure/table, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/glasses/blindfold, +/obj/item/restraints/legcuffs, +/obj/item/restraints/legcuffs, +/obj/item/storage/box/prisoner, +/obj/item/storage/box/prisoner{ + pixel_y = 8 + }, +/obj/item/paper/fluff/genpop_instructions, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) "biW" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -5996,11 +5942,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"bjD" = ( -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/execution/transfer) "bjE" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes, @@ -6126,6 +6067,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/clown_chamber) +"bkC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/prison/upper) "bkG" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -6279,7 +6226,6 @@ }, /obj/effect/turf_decal/siding/wood/corner, /obj/effect/landmark/start/hangover, -/obj/machinery/atm/directional/east, /turf/open/floor/wood, /area/station/hallway/primary/central) "bmu" = ( @@ -6378,6 +6324,18 @@ }, /turf/open/floor/iron/dark/small, /area/station/security/brig) +"bng" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/fans/tiny/forcefield, +/obj/machinery/door/poddoor/preopen{ + id = "securityblast2"; + name = "Shuttle Bay Blast Door" + }, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "bnj" = ( /turf/open/floor/iron/dark/side{ dir = 6 @@ -6551,6 +6509,18 @@ /obj/item/computer_disk, /turf/open/floor/iron, /area/station/science/ordnance) +"bop" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/obj/structure/table, +/obj/item/poster/random_official{ + pixel_y = 10 + }, +/obj/item/poster/random_official, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) "bos" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -6648,6 +6618,14 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/port/central) +"boS" = ( +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark/side, +/area/station/security/prison) "boW" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -6846,6 +6824,18 @@ /obj/item/stack/sheet/cardboard, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"bqH" = ( +/obj/structure/table/reinforced, +/obj/item/folder/blue{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/folder/yellow, +/obj/item/lighter, +/obj/item/stamp/ce, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/large, +/area/station/command/heads_quarters/ce) "bqI" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -6877,13 +6867,6 @@ }, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/captain/private) -"bqY" = ( -/obj/effect/decal/remains/human, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "brg" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -7092,6 +7075,17 @@ "bsG" = ( /turf/closed/wall/r_wall, /area/space/nearstation) +"bsN" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Shuttle Bay East" + }, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/security/execution/transfer) "bsR" = ( /obj/structure/railing{ dir = 4 @@ -7278,18 +7272,6 @@ dir = 4 }, /area/station/hallway/secondary/command) -"bvh" = ( -/obj/machinery/door/airlock/research{ - name = "Cytology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/cytology) "bvj" = ( /obj/structure/rack, /obj/item/reagent_containers/blood/random, @@ -7301,6 +7283,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/medical/abandoned) +"bvl" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "bvs" = ( /obj/structure/table, /obj/item/stack/sheet/iron/five, @@ -7400,12 +7391,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/iron, /area/station/command/bridge) -"bwi" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "bwk" = ( /obj/structure/dresser, /turf/open/floor/carpet/green, @@ -7449,18 +7434,6 @@ }, /turf/open/floor/plating, /area/station/science/research/abandoned) -"bwU" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 5; - name = "fore bay 1"; - roundstart_template = /datum/map_template/shuttle/labour/nova; - shuttle_id = "laborcamp_home"; - width = 9 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "bwW" = ( /obj/structure/flora/bush/jungle/b/style_2, /obj/structure/flora/bush/flowers_pp, @@ -7554,6 +7527,20 @@ dir = 1 }, /area/station/science/xenobiology) +"bxW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/security/glass{ + id_tag = "permainner"; + name = "Permabrig Transfer" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "perma-transfer" + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "bya" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -7710,22 +7697,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/science/xenobiology) -"bzd" = ( -/obj/machinery/button/door/directional/west{ - id = "prison release"; - name = "Labor Camp Shuttle Lockdown"; - req_access = list("brig") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Security - Security Labor Transfer Dock"; - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "bzj" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -7751,9 +7722,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"bzz" = ( -/turf/closed/wall/rust, -/area/station/security/bitden) "bzA" = ( /obj/effect/turf_decal/bot, /obj/vehicle/ridden/wheelchair{ @@ -7957,18 +7925,6 @@ dir = 1 }, /area/station/hallway/secondary/command) -"bBw" = ( -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "bBC" = ( /obj/machinery/holopad, /turf/open/floor/wood/parquet, @@ -7997,13 +7953,6 @@ dir = 8 }, /area/station/service/hydroponics) -"bBR" = ( -/obj/item/radio/intercom/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "bBU" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, @@ -8112,14 +8061,6 @@ }, /turf/open/floor/grass, /area/station/security/prison/garden) -"bCW" = ( -/obj/structure/chair/office, -/obj/effect/turf_decal/vg_decals/numbers/four, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "bDe" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/cable, @@ -8484,17 +8425,13 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/station/service/lawoffice) -"bGO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/paper/fluff{ - default_raw_text = "Going to miss this spot once the shift ends, wonder who'll be the next one to find it.. whoever reads this, the stash is yours."; - name = "Assistant's note" +"bGT" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 5 }, -/turf/open/floor/wood, -/area/station/security/prison) +/obj/structure/railing, +/turf/closed/wall/rust, +/area/station/security/prison/upper) "bHc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8928,14 +8865,6 @@ }, /turf/open/floor/wood, /area/station/service/bar/atrium) -"bLp" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/dark/side, -/area/station/security/execution/transfer) "bLs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, @@ -9004,13 +8933,6 @@ "bLL" = ( /turf/open/floor/plating, /area/station/maintenance/department/security/lower) -"bLP" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/prison) "bLR" = ( /obj/effect/turf_decal/stripes/white/box, /obj/machinery/porta_turret/ai, @@ -9413,6 +9335,20 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"bPE" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Gulag Processing" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "bPG" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -9659,6 +9595,18 @@ /obj/item/reagent_containers/cup/glass/mug/britcup, /turf/open/floor/wood, /area/station/hallway/primary/central) +"bRW" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/cytology) "bSa" = ( /obj/structure/table, /obj/structure/window/reinforced/spawner/directional/east, @@ -9751,10 +9699,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"bSZ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall, -/area/station/security/prison) "bTb" = ( /obj/structure/table/reinforced, /obj/machinery/light_switch/directional/west, @@ -9890,17 +9834,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) -"bUd" = ( -/obj/machinery/computer/cryopod{ - dir = 1; - pixel_y = -30 - }, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/prison) "bUe" = ( /turf/open/floor/wood, /area/station/service/barber) @@ -9940,6 +9873,21 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"bUp" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/storage/box/evidence{ + pixel_x = 9; + pixel_y = 8 + }, +/obj/item/storage/box/prisoner{ + pixel_x = 9 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "bUu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/bounty, @@ -10018,6 +9966,15 @@ /obj/structure/bookcase/random/nonfiction, /turf/open/floor/wood, /area/station/command/meeting_room/council) +"bVB" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "bVF" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral, @@ -10097,20 +10054,6 @@ /obj/item/flatpacked_machine/rtg, /turf/open/floor/plating, /area/station/maintenance/department/engineering/atmos_aux_port) -"bWq" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/machinery/netpod, -/obj/structure/sign/poster/contraband/random/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/item/food/pizzaslice/sassysage{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "bWr" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -10313,6 +10256,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"bYs" = ( +/obj/structure/cable, +/obj/item/electronics/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "bYx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -10499,12 +10449,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/mess) -"caP" = ( -/obj/effect/turf_decal/trimline/blue/filled/end{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "caS" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -10619,21 +10563,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) -"cbK" = ( -/obj/structure/closet/crate/bin, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/contraband/prison, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/station/security/prison) "cbL" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal/delivery_chute, @@ -10748,13 +10677,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"ccW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "cdd" = ( /obj/structure/chair/sofa/bench{ dir = 4; @@ -10834,6 +10756,21 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/science/auxlab/firing_range) +"cdU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/red/corner, +/obj/effect/turf_decal/trimline/red/filled/line{ + color = "#DE3A3A"; + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison) "cdY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -11036,15 +10973,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) -"cfO" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/structure/chair/sofa/corp/corner, -/obj/machinery/light/small/blacklight/directional/east, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "cfP" = ( /obj/structure/closet/crate/bin, /obj/effect/spawner/random/trash/garbage, @@ -11078,6 +11006,10 @@ /obj/machinery/camera/directional/west, /turf/open/floor/engine/vacuum, /area/station/maintenance/department/engineering/atmos_aux_port) +"cgu" = ( +/obj/effect/turf_decal/box/white/corners, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "cgB" = ( /obj/structure/showcase/cyborg/old{ pixel_y = 20 @@ -11111,10 +11043,6 @@ "cgN" = ( /turf/closed/wall/rust, /area/station/maintenance/department/engineering/atmos_aux_port) -"cgO" = ( -/obj/structure/closet/crate/wooden, -/turf/open/floor/iron, -/area/station/security/prison/upper) "cgP" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -11223,6 +11151,13 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"chC" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "chF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -11247,7 +11182,6 @@ /obj/structure/bed/double, /obj/item/bedsheet/green/double, /obj/machinery/light_switch/directional/east, -/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/carpet/green, /area/station/commons/dorms/room2) "chS" = ( @@ -11328,10 +11262,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/gateway) -"ciC" = ( -/obj/structure/railing, -/turf/closed/wall, -/area/station/security/bitden) "ciE" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -11363,6 +11293,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/maintenance/abandon_art_studio) +"ciS" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/machinery/recharger{ + pixel_x = 8; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "ciT" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -11543,6 +11485,24 @@ dir = 1 }, /area/station/hallway/secondary/entry) +"ckZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/sign/departments/medbay/alt/directional/west, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/brig) "clb" = ( /obj/structure/cable, /turf/open/floor/iron/stairs{ @@ -11661,12 +11621,6 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) -"cmx" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "cmy" = ( /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, @@ -12019,6 +11973,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/engineering/engine_aft_starboard) +"cpw" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/razor{ + pixel_x = -8 + }, +/obj/item/razor, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "cpE" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/iron/shuttle/evac/airless, @@ -12091,13 +12056,6 @@ dir = 8 }, /area/station/hallway/primary/port) -"cqv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/maintenance_hatch, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/security/bitden) "cqy" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12543,6 +12501,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"cue" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/maintenance/port/fore) "cuf" = ( /turf/closed/wall, /area/station/engineering/atmos/office) @@ -12558,6 +12523,13 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) +"cuh" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/photobooth/security, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison) "cuk" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, @@ -12998,6 +12970,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/security/range) +"cyc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/stairs/right{ + dir = 8 + }, +/area/station/security/execution/transfer) "cyg" = ( /obj/machinery/door/airlock/external{ space_dir = 4 @@ -13269,6 +13250,12 @@ /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet/royalblack, /area/station/commons/dorms/room8) +"cAi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "cAj" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -13321,15 +13308,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"cAO" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "cAV" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 6 @@ -13435,16 +13413,6 @@ dir = 1 }, /area/station/ai_monitored/security/armory) -"cBJ" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/stairs{ - dir = 4 - }, -/area/station/security/prison/upper) "cBY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/smes/engineering, @@ -13462,25 +13430,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/prison/safe) -"cCh" = ( -/obj/structure/table, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/glasses/blindfold, -/obj/item/restraints/legcuffs, -/obj/item/restraints/legcuffs, -/obj/item/storage/box/prisoner, -/obj/item/storage/box/prisoner{ - pixel_y = 8 - }, -/obj/item/paper/fluff/genpop_instructions, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/execution/transfer) "cCk" = ( /obj/structure/flora/bush/stalky, /obj/structure/flora/ocean/coral, @@ -13528,10 +13477,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/common/pool) -"cCU" = ( -/obj/effect/decal/cleanable/oil/streak, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "cCX" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -13693,20 +13638,6 @@ /obj/item/clothing/head/utility/welding, /turf/open/floor/iron/dark, /area/station/engineering/main) -"cDV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "cDZ" = ( /obj/structure/railing, /turf/open/floor/plating/rust, @@ -13732,13 +13663,6 @@ /mob/living/basic/drone/snowflake/bardrone, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) -"cEm" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side, -/area/station/security/prison) "cEo" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13953,6 +13877,11 @@ }, /turf/open/floor/wood, /area/station/medical/psychology) +"cFI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "cFK" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -13999,25 +13928,6 @@ "cGl" = ( /turf/open/floor/glass, /area/station/commons/dorms) -"cGn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/corner, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "cGp" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/wood/corner{ @@ -14218,6 +14128,18 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/station/commons/toilet/auxiliary) +"cHs" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/fans/tiny/forcefield, +/obj/machinery/door/poddoor/preopen{ + id = "securityblast1"; + name = "Shuttle Bay Blast Door" + }, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "cHF" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/grassy, @@ -14397,10 +14319,6 @@ "cIP" = ( /turf/closed/wall, /area/station/security/prison) -"cIT" = ( -/obj/structure/chair/sofa/bench/left, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "cJc" = ( /obj/structure/table/reinforced, /obj/item/storage/box/ids{ @@ -14512,12 +14430,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) -"cKc" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen" - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "cKf" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/siding/thinplating/dark, @@ -14683,6 +14595,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"cLP" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison) "cLR" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -14795,18 +14714,6 @@ /obj/item/mod/module/thermal_regulator, /turf/open/floor/iron, /area/station/medical/storage) -"cMQ" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 - }, -/obj/machinery/light/small/blacklight/directional/west, -/obj/structure/trash_pile, -/obj/effect/spawner/random/trash/garbage, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/mapping_helpers/apc/cell_10k, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "cMX" = ( /obj/structure/table/reinforced, /obj/item/crowbar/red, @@ -14865,13 +14772,6 @@ /obj/effect/turf_decal/trimline/purple/line, /turf/open/floor/iron/white/side, /area/station/science/research) -"cNQ" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/red/filled/corner, -/turf/open/floor/iron/dark/corner, -/area/station/security/prison) "cNU" = ( /obj/structure/closet/lasertag/red, /obj/effect/turf_decal/tile/red/real_red/half/contrasted, @@ -15104,6 +15004,14 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/commons/dorms/room5) +"cQf" = ( +/obj/structure/table/rolling, +/obj/item/wrench{ + pixel_y = 3 + }, +/obj/item/crowbar, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "cQg" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -15131,17 +15039,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/dorms) -"cQU" = ( -/obj/effect/turf_decal/delivery/white{ - color = "#00ff00"; - name = "green" - }, -/obj/machinery/cryopod{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/prison) "cQY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -15524,12 +15421,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"cUG" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "cUJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -15827,13 +15718,6 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"cXS" = ( -/obj/item/stack/sheet/cardboard, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance, -/obj/structure/closet/crate, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "cYb" = ( /obj/structure/rack/shelf, /obj/effect/turf_decal/bot, @@ -16024,11 +15908,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology/control) -"cZN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/prison/upper) "cZQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16191,11 +16070,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/test_chambers) -"dbJ" = ( -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/station/security/prison) "dbM" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16306,6 +16180,14 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"dda" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/security/prison/upper) "ddd" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -16723,10 +16605,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"dhi" = ( -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "dhs" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/computer/crew{ @@ -17394,6 +17272,14 @@ }, /turf/open/floor/engine, /area/station/science/ordnance) +"dnD" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "dnF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17430,6 +17316,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"dnO" = ( +/obj/structure/chair/office, +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "dnV" = ( /obj/structure/table/wood, /obj/structure/closet/mini_fridge{ @@ -17492,21 +17386,17 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology/control) +"doG" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "doH" = ( /obj/machinery/light/small/broken/directional/east, /obj/structure/cable, /turf/open/floor/iron/stairs, /area/station/maintenance/cult_chapel_maint) -"doI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/mechbay) "doP" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -17522,14 +17412,6 @@ }, /turf/open/floor/iron, /area/station/science/ordnance) -"dpa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/falsewall, -/turf/open/floor/plating, -/area/station/security/prison) "dpg" = ( /obj/machinery/light/small/broken/directional/north, /obj/effect/decal/cleanable/dirt, @@ -17649,6 +17531,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/abandon_arcade) +"dqS" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red, +/obj/item/pen/red, +/obj/item/stamp/hos, +/obj/machinery/keycard_auth{ + pixel_x = 15 + }, +/obj/item/clothing/accessory/badge/holo/hos{ + pixel_x = -7; + pixel_y = 9 + }, +/turf/open/floor/carpet/red, +/area/station/command/heads_quarters/hos) "dqY" = ( /obj/effect/turf_decal/tile/purple/half{ dir = 4 @@ -17736,17 +17632,6 @@ dir = 1 }, /area/station/science/xenobiology) -"drN" = ( -/obj/machinery/gulag_item_reclaimer{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/camera/directional/east{ - c_tag = "Security - Prisoner Labor Transfer Dock" - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "drQ" = ( /obj/machinery/door/airlock/bathroom{ name = "Restroom" @@ -17768,6 +17653,11 @@ }, /turf/open/floor/grass, /area/station/medical/aslyum) +"dsi" = ( +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/security/prison/upper) "dsm" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/computer/atmos_alert{ @@ -17916,6 +17806,17 @@ /obj/item/kirbyplants/organic/plant22, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"dtw" = ( +/obj/structure/table/wood, +/obj/structure/showcase/machinery/microwave{ + desc = "The smell tells you it at least used to work at one point in time."; + name = "Old broken microwave"; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/prison/upper) "dtx" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -18101,17 +18002,6 @@ "dvB" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage/tech) -"dvL" = ( -/obj/structure/table/wood, -/obj/structure/showcase/machinery/microwave{ - desc = "The smell tells you it at least used to work at one point in time."; - name = "Old broken microwave"; - pixel_y = 7 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/security/prison) "dvY" = ( /turf/closed/wall/rust, /area/station/maintenance/department/medical/morgue) @@ -18187,6 +18077,11 @@ /obj/effect/turf_decal/arrows/red, /turf/open/floor/engine/hull, /area/space/nearstation) +"dwK" = ( +/obj/structure/chair/sofa/bench/right, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "dwM" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/structure/railing{ @@ -18204,6 +18099,18 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/central) +"dwO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/red/filled/line{ + color = "#DE3A3A"; + dir = 9 + }, +/obj/effect/turf_decal/trimline/red/corner, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison/upper) "dwR" = ( /obj/structure/rack/gunrack, /turf/open/floor/plating, @@ -18372,27 +18279,6 @@ "dyT" = ( /turf/open/floor/plating, /area/station/maintenance/disposal) -"dzj" = ( -/obj/machinery/door/airlock/research{ - name = "Xenobiology Controll Room" - }, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "XenoOffice"; - name = "Xenobiology Controll Room Shutters" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/control) "dzs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18434,6 +18320,10 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"dzS" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "dzT" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -18458,6 +18348,13 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/eva) +"dAg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "dAm" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -18542,6 +18439,17 @@ /obj/structure/transit_tube/crossing/horizontal, /turf/open/floor/iron/shuttle/arrivals/airless, /area/space/nearstation) +"dBh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/paper/fluff{ + default_raw_text = "Going to miss this spot once the shift ends, wonder who'll be the next one to find it.. whoever reads this, the stash is yours."; + name = "Assistant's note" + }, +/turf/open/floor/wood, +/area/station/security/prison/upper) "dBj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18556,6 +18464,16 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/carpet/purple, /area/station/science/breakroom) +"dBq" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "prisonlockdown1"; + name = "Lockdown" + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "dBr" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Cargo Maintenance" @@ -18862,33 +18780,6 @@ }, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) -"dEj" = ( -/obj/structure/table/wood, -/obj/item/folder/blue{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/folder/blue, -/obj/item/stamp/denied{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/stamp/head/captain{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/stamp{ - pixel_x = -6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/window/brigdoor/right/directional/west{ - name = "Captain's Desk"; - req_access = list("captain") - }, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/captain/private) "dEz" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -18899,14 +18790,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/upper) -"dEE" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain/bounty/start_closed, -/turf/open/floor/iron/dark/herringbone, -/area/station/security/bitden) "dEF" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer4{ dir = 5 @@ -19071,11 +18954,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"dGm" = ( -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/execution/transfer) "dGp" = ( /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 @@ -19203,6 +19081,10 @@ /obj/structure/closet/crate/medical, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"dHq" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "dHx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -19274,21 +19156,6 @@ dir = 1 }, /area/station/security/checkpoint/science/research) -"dIh" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "dIj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -19335,11 +19202,6 @@ /obj/structure/flora/bush/stalky, /turf/open/water/overlay, /area/station/hallway/primary/central) -"dIC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "dIF" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -19727,15 +19589,6 @@ dir = 4 }, /area/station/hallway/secondary/command) -"dLD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "dLE" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -19803,17 +19656,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"dLV" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "dLW" = ( /obj/machinery/module_duplicator, /turf/open/floor/iron/dark/small, @@ -19984,15 +19826,6 @@ }, /turf/open/floor/carpet, /area/station/medical/patients_rooms) -"dOd" = ( -/obj/effect/turf_decal/stripes/end, -/obj/machinery/shower/directional/south, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/item/reagent_containers/blood, -/obj/machinery/iv_drip, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "dOk" = ( /obj/effect/turf_decal/tile/red, /obj/structure/cable, @@ -20091,6 +19924,14 @@ dir = 8 }, /area/station/hallway/primary/port) +"dQz" = ( +/obj/structure/table/reinforced, +/obj/item/wrench, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "dQD" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/door/airlock/captain{ @@ -20161,22 +20002,6 @@ "dRu" = ( /turf/open/floor/iron/dark, /area/station/service/barber) -"dRF" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/roller, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/security/medical) "dRI" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/loading_area{ @@ -20203,13 +20028,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/mineral/plastitanium/red, /area/station/maintenance/cult_chapel_maint) -"dSa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/security/execution/transfer) "dSd" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes{ @@ -20457,6 +20275,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"dTy" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) "dTz" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/light/directional/south, @@ -20613,6 +20436,11 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/disposal) +"dUF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison) "dUP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20678,6 +20506,15 @@ }, /turf/open/floor/mineral/plastitanium, /area/station/science/robotics/lab) +"dVC" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Flight Control" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/stairs/old, +/area/station/security/execution/transfer) "dVD" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -21026,7 +20863,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/machinery/atm/directional/east, /turf/open/floor/iron, /area/station/commons/storage/primary) "dZR" = ( @@ -21452,7 +21288,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron, /area/station/commons/dorms) "efd" = ( @@ -21636,13 +21471,6 @@ /obj/machinery/shieldgen, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva/upper) -"egV" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atm/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "egW" = ( /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ dir = 4 @@ -21812,6 +21640,11 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"eir" = ( +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "eit" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21882,6 +21715,10 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) +"ejd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "eje" = ( /obj/structure/cable, /turf/open/floor/iron/cafeteria, @@ -21946,10 +21783,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/carpet/black, /area/station/service/barber) -"eka" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "ekg" = ( /obj/structure/table/wood, /obj/item/stack/sheet/mineral/sandstone/thirty, @@ -22340,6 +22173,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/science/research/abandoned) +"eoQ" = ( +/obj/effect/turf_decal/delivery/white{ + color = "#00ff00"; + name = "green" + }, +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "eoV" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -22412,7 +22255,6 @@ /obj/item/bedsheet/medical{ dir = 1 }, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/white, /area/station/medical/patients_rooms) "epH" = ( @@ -22633,13 +22475,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) -"esf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/security/bitden) "esg" = ( /obj/item/trash/waffles, /obj/structure/cable, @@ -22787,6 +22622,12 @@ /obj/machinery/camera/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) +"etj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance/six, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "etk" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -22854,6 +22695,26 @@ /obj/structure/flora/bush/grassy, /turf/open/floor/grass, /area/station/service/chapel) +"etR" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/clothing/under/misc/burial, +/obj/item/food/grown/harebell, +/obj/item/food/grown/harebell, +/obj/machinery/newscaster/directional/west, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/prison) "etW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -23108,11 +22969,6 @@ dir = 1 }, /area/station/security/prison/safe) -"evF" = ( -/obj/machinery/vending/wallmed/directional/north, -/obj/structure/table/optable, -/turf/open/floor/iron/dark, -/area/station/security/medical) "evG" = ( /obj/structure/flora/bush/sparsegrass, /obj/effect/turf_decal/siding/thinplating/light, @@ -23163,6 +23019,17 @@ dir = 1 }, /area/station/medical/aslyum) +"ewk" = ( +/obj/structure/decorative/shelf/crates, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"ewr" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "ews" = ( /obj/effect/turf_decal/box, /obj/structure/ore_box, @@ -23215,6 +23082,20 @@ "ewF" = ( /turf/closed/wall/rust, /area/station/maintenance/solars/port/fore) +"ewH" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/bodycontainer/crematorium{ + dir = 4; + id = "crematoriumSec" + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "ewI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23275,14 +23156,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"exg" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "exn" = ( /turf/open/floor/carpet, /area/station/service/theater) @@ -23310,14 +23183,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) -"exx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "exy" = ( /obj/structure/rack/shelf, /obj/effect/turf_decal/bot, @@ -23537,6 +23402,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"ezQ" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/reagent_dispensers/watertank{ + pixel_y = -2 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/security/prison/upper) "ezW" = ( /obj/structure/transit_tube/diagonal{ dir = 4 @@ -23784,11 +23657,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"eBK" = ( -/obj/machinery/door/window/left/directional/north, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "eBL" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -23852,13 +23720,6 @@ /obj/effect/spawner/random/entertainment/cigar, /turf/open/floor/plating, /area/station/maintenance/central) -"eCl" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, -/area/station/security/prison/upper) "eCp" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -23955,15 +23816,6 @@ dir = 8 }, /area/station/commons/locker) -"eCX" = ( -/obj/structure/table/reinforced/rglass, -/obj/item/storage/box/hug{ - pixel_y = 5 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "eCZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -24026,6 +23878,10 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"eDx" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "eDF" = ( /turf/closed/wall, /area/station/maintenance/abandon_psych) @@ -24203,6 +24059,15 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/disposal) +"eFq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/security/prison/upper) "eFs" = ( /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/siding/wood/corner, @@ -24560,6 +24425,9 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"eIU" = ( +/turf/open/floor/glass/reinforced, +/area/station/security/prison/upper) "eIV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24745,6 +24613,13 @@ "eKs" = ( /turf/open/floor/iron/white/smooth_half, /area/station/science/explab) +"eKt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "eKx" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -24756,6 +24631,13 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/wood, /area/station/service/bar/atrium) +"eKF" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "eKU" = ( /turf/closed/wall/r_wall, /area/station/security/prison/visit) @@ -24849,6 +24731,18 @@ dir = 4 }, /area/station/security/prison/workout) +"eLF" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/security_space_law{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) +"eLK" = ( +/turf/open/floor/iron/stairs/right{ + dir = 8 + }, +/area/station/security/prison/upper) "eLU" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/science/research) @@ -24957,13 +24851,19 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) "eMI" = ( /obj/effect/spawner/random/trash/botanical_waste, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) +"eMK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/security/prison) "eMM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -25232,10 +25132,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/checker, /area/station/engineering/atmos/hfr_room) -"ePh" = ( -/obj/machinery/byteforge, -/turf/open/floor/circuit/green, -/area/station/security/bitden) "ePj" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -25258,7 +25154,6 @@ dir = 1 }, /obj/machinery/light_switch/directional/west, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/carpet/orange, /area/station/commons/dorms/room1) "ePt" = ( @@ -25308,6 +25203,14 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"ePN" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison) "ePO" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -25391,10 +25294,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"eQz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/smooth, -/area/station/security/bitden) "eQE" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/bed{ @@ -25408,8 +25307,8 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "eQF" = ( +/obj/machinery/airalarm/directional/east, /obj/effect/landmark/blobstart, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/white, /area/station/medical/coldroom) "eQK" = ( @@ -25438,13 +25337,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/department/security/lower) -"eQX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/execution/transfer) "eQZ" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -25528,10 +25420,10 @@ /area/station/command/gateway) "eRP" = ( /obj/item/kirbyplants/random, +/obj/machinery/status_display/evac/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) "eRY" = ( @@ -25562,10 +25454,6 @@ /obj/item/trash/energybar, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"eSf" = ( -/obj/machinery/station_map/engineering/directional/south, -/turf/open/floor/carpet, -/area/station/medical/patients_rooms) "eSi" = ( /obj/effect/turf_decal/stripes/blue/line{ dir = 8 @@ -25586,13 +25474,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/station/science/robotics/lab) -"eSm" = ( -/obj/structure/cable, -/obj/item/screwdriver, -/obj/machinery/light/directional/south, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "eSo" = ( /turf/closed/wall/rust, /area/station/maintenance/department/science/ordnance_maint) @@ -25700,6 +25581,13 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/blueshield) +"eTH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "eTI" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -25710,6 +25598,11 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"eTL" = ( +/obj/effect/turf_decal/vg_decals/numbers/two, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "eTS" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/door/poddoor/shutters/window/preopen{ @@ -25973,6 +25866,12 @@ "eWt" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/engineering/engine_aft_starboard) +"eWy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison) "eWz" = ( /obj/structure/railing{ dir = 8 @@ -26092,6 +25991,13 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/break_room) +"eXo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/security/prison/upper) "eXv" = ( /obj/structure/railing{ dir = 8 @@ -26143,21 +26049,6 @@ /obj/machinery/duct, /turf/open/floor/wood, /area/station/service/barber) -"eYn" = ( -/obj/machinery/light_switch/directional/east, -/obj/machinery/firealarm/directional/east{ - pixel_x = 38 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/closet/secure_closet/brig_physician, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/side{ - dir = 8 - }, -/area/station/security/medical) "eYp" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -26175,6 +26066,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/side, /area/station/ai_monitored/command/storage/eva) +"eYw" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Xenobiology Kill Room" + }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) "eYC" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -26425,6 +26326,10 @@ /obj/structure/aquarium/lawyer, /turf/open/floor/carpet/blue, /area/station/service/lawoffice) +"faw" = ( +/obj/effect/decal/cleanable/oil/slippery, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "faz" = ( /obj/effect/spawner/random/trash/cigbutt, /obj/effect/decal/cleanable/dirt, @@ -26579,6 +26484,13 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"fbS" = ( +/obj/structure/rack, +/obj/item/pushbroom, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "fbV" = ( /obj/machinery/computer/crew, /turf/open/floor/iron, @@ -26726,6 +26638,25 @@ /obj/structure/cable, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +"fdm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) +"fdu" = ( +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/security/prison/upper) "fdz" = ( /obj/machinery/door/airlock/freezer{ name = "Medical Freezer" @@ -26806,18 +26737,6 @@ }, /turf/open/floor/wood, /area/station/hallway/primary/central) -"fej" = ( -/obj/machinery/door/poddoor/preopen{ - id = "prison release"; - name = "Prisoner Processing Blast Door" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison/upper) "fem" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -26882,23 +26801,12 @@ "feB" = ( /turf/open/floor/noslip, /area/station/maintenance/gag_room) -"feC" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ +"feJ" = ( +/obj/structure/railing{ dir = 8 }, -/area/station/security/brig) +/turf/open/floor/iron/stairs, +/area/station/security/execution/transfer) "feL" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -26957,6 +26865,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/security/detectives_office) +"ffG" = ( +/obj/structure/closet/crate/trashcart/laundry, +/obj/effect/spawner/random/contraband/prison, +/obj/machinery/camera/directional/north{ + c_tag = " Prison - Custodial Closet"; + network = list("ss13","prison") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/spawner/random/contraband/prison, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "ffH" = ( /obj/structure/window/spawner/directional/east, /obj/structure/window/spawner/directional/west, @@ -26973,6 +26902,12 @@ "fge" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat_interior) +"fgg" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "fgj" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -27576,10 +27511,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) -"fmQ" = ( -/obj/machinery/atm/directional/south, -/turf/open/floor/engine, -/area/station/command/secure_bunker) "fmR" = ( /obj/structure/chair/office{ dir = 8 @@ -27681,6 +27612,12 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/atmos) +"fnG" = ( +/obj/structure/reagent_dispensers/plumbed{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/security/prison/upper) "fnH" = ( /obj/effect/turf_decal/stripes, /obj/structure/cable, @@ -27729,14 +27666,6 @@ }, /turf/open/floor/wood/large, /area/station/science/auxlab/firing_range) -"foj" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atm/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/upper) "fom" = ( /obj/structure/closet/bombcloset/security, /obj/item/clothing/suit/utility/bomb_suit/security, @@ -27860,12 +27789,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/breakroom) -"fps" = ( -/obj/machinery/light_switch/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "fpt" = ( /obj/structure/table/wood/fancy/red, /obj/item/reagent_containers/cup/glass/bottle/champagne{ @@ -28015,18 +27938,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/maintenance/solars/port/fore) -"fqv" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/fans/tiny/forcefield, -/obj/machinery/door/poddoor/preopen{ - id = "securityblast1"; - name = "Shuttle Bay Blast Door" - }, -/turf/open/floor/plating, -/area/station/security/prison/upper) "fqw" = ( /obj/structure/rack, /obj/item/storage/toolbox/mechanical, @@ -28040,15 +27951,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/service/chapel) -"fqB" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/camera/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "fqD" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ dir = 4 @@ -28070,6 +27972,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/small, /area/station/security/brig) +"fqM" = ( +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/contraband/prison, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "fqP" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -28134,6 +28052,10 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/dark/textured_edge, /area/station/security/office) +"fri" = ( +/obj/machinery/power/shuttle_engine/heater, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "fro" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet, @@ -28220,24 +28142,12 @@ /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/hallway/secondary/service) -"fsV" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "fsY" = ( /obj/effect/spawner/random/trash/cigbutt, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"fsZ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/security/prison) "fta" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -28276,6 +28186,10 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/iron/dark/small, /area/station/medical/morgue) +"ftI" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/station/security/prison/upper) "ftJ" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -28475,6 +28389,9 @@ }, /turf/open/floor/wood, /area/station/service/bar/atrium) +"fvF" = ( +/turf/open/floor/plating, +/area/station/security/execution/transfer) "fvZ" = ( /obj/structure/chair/sofa/bench/right{ dir = 4; @@ -28721,7 +28638,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "fxV" = ( @@ -28796,11 +28712,6 @@ dir = 8 }, /area/station/hallway/secondary/command) -"fyC" = ( -/obj/machinery/atmospherics/components/tank/air, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible/layer4, -/turf/open/floor/plating, -/area/station/security/prison) "fyD" = ( /turf/open/floor/iron/dark, /area/station/security/lockers) @@ -28850,13 +28761,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"fzi" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "fzj" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/o2{ @@ -28879,19 +28783,6 @@ "fzm" = ( /turf/open/openspace, /area/station/hallway/secondary/command) -"fzp" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Sanitarium" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "fzq" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -28914,13 +28805,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/abandon_office) -"fzC" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "fzJ" = ( /obj/structure/chair/office{ dir = 4 @@ -29137,7 +29021,6 @@ /area/station/maintenance/department/crew_quarters/dorms) "fCB" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/wood, /area/station/service/library) "fCD" = ( @@ -29311,22 +29194,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/engineering/lesser) -"fFu" = ( -/obj/structure/table/glass, -/obj/item/petri_dish{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/petri_dish{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/random_virus{ - pixel_x = 6; - pixel_y = 16 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "fFB" = ( /obj/structure/sink/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29510,6 +29377,16 @@ }, /turf/open/floor/iron/cafeteria, /area/station/engineering/atmos) +"fHM" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "fHR" = ( /obj/item/kirbyplants/random, /obj/structure/cable, @@ -29719,6 +29596,13 @@ /obj/machinery/duct, /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) +"fJP" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "fJT" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29764,6 +29648,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"fKw" = ( +/obj/machinery/washing_machine, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "fKz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30152,12 +30042,15 @@ }, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/captain/private) -"fOf" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/light/directional/south, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) +"fOj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/security/prison/upper) "fOk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -30295,6 +30188,44 @@ /obj/structure/flora/bush/flowers_yw, /turf/open/floor/grass, /area/station/hallway/primary/central/fore) +"fPm" = ( +/obj/structure/table, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = -13; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/clothing/under/rank/prisoner/skirt{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = -8 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/clothing/shoes/sneakers/orange{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/clothing/under/rank/prisoner{ + pixel_x = 8; + pixel_y = 5 + }, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) "fPo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30314,17 +30245,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood, /area/station/security/courtroom) -"fPs" = ( -/obj/structure/closet/crate/wooden, -/obj/item/stack/tile/iron{ - amount = 6 - }, -/obj/effect/turf_decal/vg_decals/numbers/three, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "fPu" = ( /obj/structure/filingcabinet/chestdrawer/wheeled, /obj/machinery/newscaster/directional/north, @@ -30483,6 +30403,11 @@ }, /turf/open/floor/iron, /area/station/medical/aslyum) +"fRu" = ( +/obj/structure/mirror/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/floor/carpet/black, +/area/station/security/prison) "fRw" = ( /obj/structure/table, /obj/item/stock_parts/subspace/filter, @@ -30544,20 +30469,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) -"fRF" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/machinery/netpod, -/obj/structure/sign/poster/contraband/lusty_xenomorph/directional/east, -/obj/machinery/light/small/blacklight/directional/east, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "fRM" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -30614,11 +30525,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet/lone, /area/station/service/bar/atrium) -"fSD" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, -/area/station/security/prison/upper) "fSM" = ( /obj/structure/chair/wood{ dir = 1 @@ -30631,12 +30537,6 @@ "fSN" = ( /turf/open/floor/iron/stairs/right, /area/station/hallway/primary/upper) -"fSX" = ( -/obj/item/kirbyplants/organic/plant21, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/execution/transfer) "fTa" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -30668,16 +30568,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/fitness) -"fTu" = ( -/obj/effect/turf_decal/delivery/white, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/door/airlock/security/glass{ - name = "Flight Control" - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "fTv" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -30996,10 +30886,6 @@ }, /turf/open/floor/eighties/red, /area/station/common/arcade) -"fWC" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/prison) "fWI" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/yellow{ @@ -31226,6 +31112,12 @@ }, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/qm) +"fYU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/security/prison/upper) "fYW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -31637,6 +31529,12 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/commons/dorms) +"gcP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/mess, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "gcU" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 @@ -31811,6 +31709,18 @@ /obj/structure/drain, /turf/open/floor/iron/freezer, /area/station/command/heads_quarters/captain/private) +"geu" = ( +/obj/machinery/camera/directional/north{ + c_tag = " Prison - West"; + dir = 2; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/upper) "geF" = ( /obj/machinery/door/airlock/research/glass{ name = "Robotics Workshop" @@ -31950,13 +31860,11 @@ dir = 1 }, /area/station/science/xenobiology) -"ggz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/storage/toolbox/mechanical/old, -/turf/open/floor/wood, -/area/station/security/prison) +"ggy" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/security/prison/upper) "ggC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32015,10 +31923,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/medical/break_room) -"ghk" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "ghm" = ( /obj/structure/chair/office{ dir = 8 @@ -32071,6 +31975,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"ghV" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "gib" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32086,6 +31996,11 @@ /obj/item/beacon, /turf/open/floor/iron, /area/station/command/bridge) +"gim" = ( +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/station/security/prison/upper) "gir" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/red/corner, @@ -32238,21 +32153,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/iron, /area/station/maintenance/department/engineering/atmos_aux_port) -"gjZ" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/item/folder/blue{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/folder/white, -/obj/item/stamp/head/cmo{ - pixel_y = 5 - }, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/cmo) "gkd" = ( /obj/effect/decal/cleanable/dirt, /mob/living/basic/spider/growing/spiderling, @@ -32268,6 +32168,14 @@ dir = 8 }, /area/station/engineering/storage) +"gkk" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/upper) "gkl" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/south, @@ -32392,6 +32300,17 @@ /obj/item/wrench, /turf/open/floor/iron, /area/station/hallway/secondary/construction) +"gly" = ( +/obj/structure/closet/crate/wooden, +/obj/item/stack/tile/iron{ + amount = 6 + }, +/obj/effect/turf_decal/vg_decals/numbers/three, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "glz" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -32422,6 +32341,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"glJ" = ( +/obj/item/reagent_containers/cup/bucket/wooden{ + name = "waste bucket" + }, +/turf/open/floor/plating, +/area/station/security/prison/upper) "glK" = ( /turf/open/floor/carpet/black, /area/station/service/barber) @@ -32442,6 +32367,11 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/commons/dorms/room3) +"glU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "glW" = ( /obj/structure/chair{ dir = 4 @@ -32553,16 +32483,6 @@ dir = 1 }, /area/station/security/prison/shower) -"gmR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron, -/area/station/security/prison/upper) "gmU" = ( /obj/structure/chair/office{ dir = 1 @@ -32598,10 +32518,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"gnd" = ( -/obj/effect/turf_decal/box/white/corners, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "gne" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -32832,6 +32748,25 @@ /obj/machinery/duct, /turf/open/floor/carpet, /area/station/service/chapel) +"gpq" = ( +/obj/structure/table/glass, +/obj/item/petri_dish{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/petri_dish{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/random_virus{ + pixel_x = 6; + pixel_y = 16 + }, +/obj/item/reagent_containers/cup/beaker/vial, +/obj/item/reagent_containers/cup/beaker/vial, +/obj/item/reagent_containers/cup/beaker/vial, +/turf/open/floor/iron/white, +/area/station/medical/virology) "gpr" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral, @@ -32901,26 +32836,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) -"gqm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "gqn" = ( /obj/structure/mirror{ pixel_y = 32 @@ -33069,6 +32984,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/department/engineering/atmos_aux_port) +"grD" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "grJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33091,6 +33018,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"grX" = ( +/obj/structure/closet/crate/wooden, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "gsd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -33121,23 +33052,6 @@ dir = 8 }, /area/station/cargo/miningdock) -"gsE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 5 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 5 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/security/execution/transfer) "gsF" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -33214,17 +33128,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/abandon_art_studio) -"gtc" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Gulag Processing" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/prison/upper) "gtd" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -33244,14 +33147,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark/corner, /area/station/maintenance/xenobio_disposals) -"gti" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/prison) "gtm" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank, @@ -33369,11 +33264,6 @@ /obj/item/book/manual/wiki/security_space_law, /turf/open/floor/carpet/red, /area/station/security/warden) -"guJ" = ( -/turf/open/floor/iron/stairs/right{ - dir = 8 - }, -/area/station/security/prison) "guK" = ( /obj/machinery/door/airlock/public/glass{ name = "Bar" @@ -33548,14 +33438,6 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/common/night_club/back_stage) -"gwn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/basic/mouse/brown/tom, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) "gww" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -33687,7 +33569,6 @@ dir = 1 }, /obj/machinery/light_switch/directional/west, -/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/carpet/blue, /area/station/commons/dorms/room3) "gxT" = ( @@ -33807,44 +33688,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/library/private) -"gzb" = ( -/obj/structure/table, -/obj/item/clothing/under/rank/prisoner/skirt{ - pixel_x = -13; - pixel_y = 5 - }, -/obj/item/clothing/under/rank/prisoner{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/clothing/under/rank/prisoner/skirt{ - pixel_x = 9; - pixel_y = 5 - }, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_x = -6; - pixel_y = -8 - }, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_x = -6; - pixel_y = -2 - }, -/obj/item/clothing/shoes/sneakers/orange{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/clothing/under/rank/prisoner{ - pixel_x = 8; - pixel_y = 5 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/execution/transfer) "gzl" = ( /obj/structure/toilet{ dir = 1 @@ -33855,17 +33698,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/dorms/vacantroom) -"gzn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "gzo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, @@ -33903,6 +33735,16 @@ /obj/structure/flora/tree/jungle, /turf/open/floor/grass, /area/station/hallway/primary/central/aft) +"gzE" = ( +/obj/machinery/door/airlock/security/old{ + name = "Cryopods" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/security/prison/upper) "gzF" = ( /obj/structure/railing, /obj/structure/chair/plastic{ @@ -33969,11 +33811,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"gAp" = ( -/obj/structure/table, -/obj/item/wrench, -/turf/open/floor/iron, -/area/station/security/prison/upper) "gAt" = ( /obj/structure/table/greyscale, /obj/item/toy/plush/beeplushie, @@ -33990,7 +33827,6 @@ dir = 4 }, /obj/effect/landmark/start/assistant, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -34034,6 +33870,15 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"gAV" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Airlock" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "gAW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -34064,6 +33909,13 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) +"gBc" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "gBd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34285,7 +34137,6 @@ dir = 8 }, /obj/machinery/light/directional/south, -/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/upper) "gDy" = ( @@ -34334,13 +34185,6 @@ "gDN" = ( /turf/closed/wall, /area/station/science/xenobiology) -"gDP" = ( -/obj/structure/chair/comfy/barber_chair{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "gDW" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -34801,16 +34645,6 @@ }, /turf/open/floor/carpet, /area/station/service/library/printer) -"gJA" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "prisonlockdown1"; - name = "Lockdown" - }, -/turf/open/floor/iron/dark, -/area/station/security/prison) "gJC" = ( /obj/structure/chair/comfy/barber_chair{ dir = 8 @@ -34888,6 +34722,24 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/engineering/break_room) +"gKf" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/machinery/netpod, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/item/food/pizzaslice/sassysage{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) +"gKk" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "gKn" = ( /turf/open/floor/iron/stairs/right, /area/station/hallway/primary/central/aft) @@ -34932,13 +34784,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"gKW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) "gKY" = ( /obj/effect/turf_decal/weather/sand{ dir = 6 @@ -34957,7 +34802,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "gLj" = ( @@ -35198,26 +35042,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"gNP" = ( -/obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/syndicate, -/obj/item/food/sandwich{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - desc = "Takes you to a whole new level of thinking."; - name = "Meta-Cider"; - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -14; - pixel_y = 1 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/security/prison) "gNT" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/engineering_electrical, @@ -35388,6 +35212,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/port) +"gPp" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "gPq" = ( /obj/machinery/light/directional/east, /obj/machinery/camera/directional/east{ @@ -35785,12 +35616,6 @@ dir = 6 }, /area/station/security/prison) -"gSN" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/carpet/black, -/area/station/security/execution/transfer) "gSQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36083,6 +35908,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"gWf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "gWh" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -36112,14 +35949,6 @@ }, /turf/open/floor/engine/vacuum, /area/station/maintenance/disposal/incinerator) -"gWy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "gWC" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/tool, @@ -36169,6 +35998,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/hallway/secondary/construction) +"gXf" = ( +/obj/effect/turf_decal/trimline/red/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/security/prison/upper) "gXl" = ( /obj/structure/closet/crate/bin, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -36180,6 +36023,15 @@ }, /turf/open/floor/wood, /area/station/commons/dorms/room8) +"gXp" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + color = "#DE3A3A" + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/upper) "gXw" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -36295,6 +36147,25 @@ dir = 8 }, /area/station/hallway/primary/port) +"gZf" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Prison Wing" + }, +/obj/machinery/door/poddoor/preopen{ + id = "Prison Gate"; + name = "Prison Blast Door" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery/blue, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark, +/area/station/security/prison) "gZk" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -36359,16 +36230,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics) -"haA" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Shaving Station" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "haD" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -36467,13 +36328,6 @@ /obj/machinery/smartfridge/organ, /turf/open/floor/iron/white, /area/station/maintenance/abandon_surgery) -"hbs" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "hbt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -36493,6 +36347,12 @@ "hbA" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/science/central) +"hbD" = ( +/obj/structure/closet/secure_closet/brig/genpop, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/security/prison) "hbG" = ( /obj/effect/turf_decal/bot, /obj/structure/bed{ @@ -36533,19 +36393,18 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"hbX" = ( -/obj/machinery/power/shuttle_engine/propulsion, -/obj/structure/fluff/big_chain{ - pixel_y = 30 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "hbZ" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"hce" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "hcf" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -36686,6 +36545,18 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) +"hdl" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + color = "#DE3A3A"; + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/security/prison/upper) "hds" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36749,6 +36620,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"hef" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "heh" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -37194,10 +37073,6 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/plating, /area/station/tcommsat/computer) -"hiq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/prison) "hiy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -37290,13 +37165,6 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/turret_protected/ai_upload) -"hjb" = ( -/obj/structure/closet/secure_closet/brig/genpop, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "hjd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37403,11 +37271,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/small, /area/station/security/range) -"hkm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible/layer4, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/prison) "hkt" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -37537,12 +37400,6 @@ /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"hlJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "hlM" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -37964,7 +37821,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/upper) "hqv" = ( @@ -38025,14 +37881,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/mineral/plastitanium/red, /area/station/science/robotics/lab) -"hri" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/south, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/side, -/area/station/security/execution/transfer) "hrj" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank, @@ -38191,19 +38039,6 @@ /obj/structure/sink/directional/south, /turf/open/floor/iron/freezer, /area/station/science/breakroom) -"hth" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 5 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/security/prison) "htq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38285,12 +38120,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"huc" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron/stairs, -/area/station/security/prison/upper) "hud" = ( /obj/machinery/light/directional/south, /obj/effect/landmark/start/chaplain, @@ -38298,10 +38127,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) -"huh" = ( -/obj/effect/decal/cleanable/oil/slippery, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "hui" = ( /turf/closed/wall/rust, /area/station/maintenance/department/security/prison_upper) @@ -38338,22 +38163,6 @@ dir = 8 }, /area/station/hallway/secondary/entry) -"huD" = ( -/obj/machinery/door/poddoor/preopen{ - id = "XenoOffice"; - name = "Xenobiology Lockdown Blast Doors" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Toxins Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "huI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38506,22 +38315,12 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) -"hwo" = ( -/obj/structure/closet/crate/large, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/iron, -/area/station/security/prison/upper) "hwp" = ( /obj/machinery/door/airlock/wood{ name = "Sauna" }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"hwu" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/computer/order_console/bitrunning, -/turf/open/floor/iron, -/area/station/security/prison) "hwx" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38645,6 +38444,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"hxO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "hxV" = ( /obj/structure/railing{ dir = 4 @@ -38714,25 +38518,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, /area/station/service/chapel) -"hyH" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/light/cold/directional/east, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/storage/medkit/regular, -/obj/item/clothing/gloves/latex, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/syringe, -/obj/item/storage/box/bodybags, -/obj/item/storage/medkit/regular, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/corner{ - dir = 8 - }, -/area/station/security/medical) "hyM" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -38740,6 +38525,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/openspace, /area/station/maintenance/department/medical/central) +"hyU" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 + }, +/obj/machinery/light/small/blacklight/directional/west, +/obj/structure/trash_pile, +/obj/effect/spawner/random/trash/garbage, +/obj/structure/cable, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "hyY" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, @@ -39373,6 +39168,11 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/fore) +"hEX" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/structure/railing, +/turf/closed/wall, +/area/station/security/prison/upper) "hFf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39431,12 +39231,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/common/wrestling/beverage) -"hFz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "hFB" = ( /obj/structure/window/reinforced/plasma/spawner/directional/south, /obj/machinery/power/shuttle_engine/heater{ @@ -39477,11 +39271,6 @@ "hFR" = ( /turf/open/floor/iron/white/textured, /area/station/medical/aslyum) -"hFV" = ( -/obj/item/stack/sheet/cardboard, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "hFX" = ( /obj/machinery/power/smes, /obj/structure/cable, @@ -39499,7 +39288,6 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -39639,6 +39427,12 @@ dir = 4 }, /area/station/hallway/primary/port) +"hHM" = ( +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "hHN" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -39801,17 +39595,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) -"hJv" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "hJw" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -39855,6 +39638,15 @@ "hJH" = ( /turf/closed/wall, /area/station/maintenance/fore/upper) +"hJJ" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/barricade/wooden/crude, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/bounty/start_closed, +/turf/open/floor/iron/dark/herringbone, +/area/station/security/prison/upper) "hJL" = ( /obj/structure/table, /obj/structure/cable, @@ -39904,13 +39696,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/shuttle/arrivals/airless, /area/space/nearstation) -"hKq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/can, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/security/bitden) "hKt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40014,6 +39799,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"hLH" = ( +/obj/structure/ore_box, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "hLJ" = ( /obj/structure/frame/machine, /turf/open/floor/plating, @@ -40022,20 +39811,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/hallway/primary/central) -"hLT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "hLY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, @@ -40130,19 +39905,6 @@ dir = 8 }, /area/station/security/brig) -"hMC" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "prisonlockdown1"; - name = "Lockdown" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/prison) "hMF" = ( /turf/open/floor/plating, /area/space/nearstation) @@ -40201,12 +39963,6 @@ dir = 8 }, /area/station/hallway/primary/central/aft) -"hNf" = ( -/obj/structure/reagent_dispensers/plumbed{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "hNh" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/light/directional/east, @@ -40674,10 +40430,6 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/captain/private) -"hRs" = ( -/obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating, -/area/station/security/prison) "hRu" = ( /obj/item/crowbar/large/heavy, /turf/open/floor/plating, @@ -40714,11 +40466,6 @@ "hRO" = ( /turf/closed/wall, /area/station/command/captain_dining) -"hRR" = ( -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/station/security/prison) "hSd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -40868,10 +40615,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"hTj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "hTp" = ( /turf/closed/wall, /area/station/command/heads_quarters/captain) @@ -41021,6 +40764,14 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/lockers) +"hVk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/mob/living/basic/mouse/brown/tom, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "hVo" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office" @@ -41042,11 +40793,6 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) -"hVv" = ( -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "hVx" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, @@ -41334,6 +41080,12 @@ /obj/machinery/slime_extract_requestor, /turf/open/floor/glass/reinforced, /area/station/science) +"hYo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "hYs" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/west, @@ -41400,13 +41152,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"hZe" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "hZg" = ( /obj/machinery/light/small/directional/north, /obj/machinery/duct, @@ -41452,6 +41197,17 @@ "hZy" = ( /turf/closed/wall, /area/station/commons/locker) +"hZz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Prison Side Wing" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark, +/area/station/security/prison) "hZB" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -41474,6 +41230,9 @@ }, /turf/open/floor/iron, /area/station/science/ordnance) +"hZI" = ( +/turf/closed/wall, +/area/station/security/execution/transfer) "hZO" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/structure/disposalpipe/segment{ @@ -41765,6 +41524,21 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"icN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/corner, +/obj/effect/turf_decal/trimline/red/filled/line{ + color = "#DE3A3A"; + dir = 9 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison/upper) "icO" = ( /obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/effect/turf_decal/stripes{ @@ -42081,15 +41855,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"ifM" = ( -/obj/structure/table/reinforced/rglass, -/obj/structure/mirror/directional/west, -/obj/machinery/light/directional/west, -/obj/item/scissors, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "ifQ" = ( /obj/structure/cable, /obj/machinery/light_switch/directional/south, @@ -42204,10 +41969,6 @@ /obj/machinery/shower/directional/north, /turf/open/floor/iron/checker, /area/station/engineering/gravity_generator) -"ihe" = ( -/obj/machinery/station_map/engineering/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "ihg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42217,13 +41978,6 @@ /obj/structure/bookcase/manuals/engineering, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"ihA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/station/security/prison/upper) "ihD" = ( /obj/effect/landmark/start/security_officer, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42572,15 +42326,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"ikN" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/security/prison) "ikQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42672,6 +42417,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, /area/station/service/barber) +"ilY" = ( +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "ima" = ( /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/plating, @@ -42783,8 +42534,9 @@ }, /turf/open/floor/wood, /area/station/commons/dorms/room1) -"ina" = ( -/turf/open/floor/glass/reinforced, +"inc" = ( +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/iron/dark, /area/station/security/execution/transfer) "ine" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -42800,19 +42552,17 @@ dir = 8 }, /area/station/security/checkpoint/escape) -"ini" = ( -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/east, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "inj" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/research_director, /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) +"inl" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron/stairs/left{ + dir = 8 + }, +/area/station/security/execution/transfer) "inm" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/west, @@ -43062,14 +42812,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/barber) -"iqd" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "iqf" = ( /obj/machinery/atmospherics/components/binary/valve/digital/layer4{ dir = 8 @@ -43300,7 +43042,6 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/newscaster/directional/west, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -43357,6 +43098,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating/airless, /area/station/maintenance/fore/upper) +"ita" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "itv" = ( /turf/open/floor/iron/dark, /area/station/maintenance/aux_eva) @@ -43459,6 +43207,17 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"iuT" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Gulag Processing" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "iuU" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -43669,12 +43428,12 @@ /area/station/maintenance/starboard/fore) "iwv" = ( /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/light_switch/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/white, /area/station/science) "iwD" = ( @@ -43714,10 +43473,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) -"ixc" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "ixe" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -43827,6 +43582,12 @@ }, /turf/open/floor/iron/dark, /area/station/service/power_station) +"ixK" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "ixQ" = ( /obj/machinery/shower/directional/east, /obj/structure/drain, @@ -44229,6 +43990,12 @@ }, /turf/open/floor/wood, /area/station/hallway/primary/port) +"iCC" = ( +/obj/machinery/computer/shuttle/labor{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "iCD" = ( /obj/structure/railing, /obj/structure/rack, @@ -44314,6 +44081,17 @@ initial_gas_mix = "TEMP=2.7" }, /area/station/science/ordnance/bomb) +"iDH" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/item/clothing/mask/cigarette/pipe/crackpipe, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "iDM" = ( /obj/structure/disposalpipe/junction/flip{ dir = 4 @@ -44323,12 +44101,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/port) -"iDR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/security/prison) "iDX" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -44346,6 +44118,13 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/engineering/main) +"iEp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/upper) "iEr" = ( /obj/effect/spawner/random/trash/mess, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44573,6 +44352,13 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"iFX" = ( +/obj/structure/table, +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "iGa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44715,6 +44501,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"iHC" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "iHD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -44753,6 +44543,15 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"iIe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "iIf" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/cigarette, @@ -44852,13 +44651,6 @@ /obj/machinery/duct, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) -"iJi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "iJw" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, @@ -44965,13 +44757,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/law) -"iKO" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/security_space_law{ - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "iKV" = ( /obj/machinery/camera/directional/west{ c_tag = "Recreation - Arcade Lower"; @@ -45195,14 +44980,6 @@ dir = 8 }, /area/station/hallway/primary/central/fore) -"iMZ" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/reagent_dispensers/watertank{ - pixel_y = -2 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/security/prison) "iNb" = ( /obj/effect/turf_decal/vg_decals/numbers/two, /turf/open/floor/iron/dark/side{ @@ -45231,6 +45008,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"iNB" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "iNE" = ( /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, @@ -45287,14 +45071,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"iOt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/stairs/medium{ - dir = 4 - }, -/area/station/security/prison) "iOG" = ( /obj/structure/cable, /obj/machinery/duct, @@ -45413,13 +45189,34 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/dark, /area/station/security/checkpoint) -"iPY" = ( -/obj/machinery/light/directional/south, +"iQb" = ( +/obj/effect/turf_decal/delivery/white, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/airlock/security/glass{ + name = "Flight Control" + }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"iQi" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "iQl" = ( /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"iQv" = ( +/obj/machinery/byteforge, +/turf/open/floor/circuit/green, +/area/station/security/prison/upper) "iQx" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -45485,6 +45282,12 @@ /obj/machinery/duct, /turf/open/floor/engine, /area/station/science/xenobiology) +"iRb" = ( +/obj/item/kirbyplants/random, +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "iRe" = ( /obj/structure/chair{ dir = 8 @@ -45520,6 +45323,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"iRJ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Security - Shuttle Bay West"; + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "iRO" = ( /obj/structure/railing{ dir = 4 @@ -45680,7 +45490,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/wood/parquet, /area/station/service/theater) "iTW" = ( @@ -45902,7 +45711,7 @@ normaldoorcontrol = 1; pixel_y = -7 }, -/obj/machinery/station_map/engineering/directional/west, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/security/checkpoint/science/research) "iVF" = ( @@ -45990,7 +45799,6 @@ "iWJ" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/white, /area/station/medical/patients_rooms) "iWN" = ( @@ -46480,6 +46288,10 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"jaK" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/security/prison/upper) "jaM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46721,6 +46533,18 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"jcV" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + color = "#DE3A3A"; + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "jda" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/north, @@ -46937,6 +46761,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"jfW" = ( +/obj/effect/spawner/random/trash/mess, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/security/prison/upper) "jgd" = ( /turf/open/floor/circuit/green, /area/station/engineering/gravity_generator) @@ -46991,11 +46823,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/dorms) -"jgA" = ( -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/station/security/prison) "jgJ" = ( /obj/structure/stairs/north, /obj/structure/railing{ @@ -47019,15 +46846,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engineering/engine_aft_port) -"jhe" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "jhg" = ( /obj/structure/railing{ dir = 1 @@ -47184,10 +47002,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"jiM" = ( -/obj/effect/spawner/random/trash/graffiti, -/turf/closed/wall/rust, -/area/station/security/bitden) "jiS" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -47677,6 +47491,11 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"jnr" = ( +/obj/machinery/atmospherics/components/tank/air, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible/layer4, +/turf/open/floor/plating, +/area/station/security/prison/upper) "jnt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -47824,6 +47643,14 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/dark/textured_edge, /area/station/ai_monitored/security/armory) +"joC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "joF" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -47836,6 +47663,12 @@ /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"joM" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/security/prison) "joN" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -47853,11 +47686,6 @@ dir = 4 }, /area/station/hallway/primary/upper) -"joZ" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/structure/railing, -/turf/closed/wall, -/area/station/security/bitden) "jpm" = ( /obj/item/organ/internal/liver, /turf/open/floor/material/meat, @@ -47901,6 +47729,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"jpA" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/stairs, +/area/station/security/execution/transfer) "jpC" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 9 @@ -48040,6 +47876,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/structure/sign/poster/random/directional/east, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "jqK" = ( @@ -48256,17 +48093,6 @@ dir = 8 }, /area/station/command/gateway) -"jsS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/item/reagent_containers/cup/soda_cans/pwr_game, -/obj/effect/spawner/random/trash/garbage, -/obj/item/food/pizzaslice/moldy/bacteria, -/obj/structure/closet/mini_fridge, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "jsT" = ( /obj/machinery/computer/telecomms/monitor{ dir = 4; @@ -48349,6 +48175,18 @@ initial_gas_mix = "TEMP=2.7" }, /area/station/science/ordnance/bomb) +"jtO" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/entertainment/money, +/obj/item/storage/pill_bottle/maintenance_pill/full, +/obj/item/coin/adamantine, +/obj/item/clothing/glasses/sunglasses, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/storage/belt/utility/full/engi, +/obj/item/clothing/suit/armor/vest/old, +/obj/effect/spawner/random/contraband/plus, +/turf/open/floor/plating, +/area/station/security/prison/upper) "jtP" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -48360,11 +48198,6 @@ }, /turf/open/floor/iron, /area/station/cargo/office) -"jtX" = ( -/obj/machinery/prisongate, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "jub" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -48395,6 +48228,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"juD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison) "juE" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/layer_manifold/visible{ @@ -48413,18 +48252,6 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office) -"juI" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/prison) "juK" = ( /turf/closed/wall/r_wall, /area/station/common/locker_room_shower) @@ -48507,11 +48334,6 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/hallway) -"jvw" = ( -/obj/effect/decal/cleanable/oil/slippery, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "jvx" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -48549,6 +48371,13 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"jvQ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "jvV" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, @@ -48691,6 +48520,11 @@ }, /turf/open/floor/carpet, /area/station/service/library) +"jxr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison) "jxs" = ( /obj/structure/trash_pile, /turf/open/floor/plating, @@ -49037,20 +48871,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/tele_sci) -"jAE" = ( -/obj/effect/turf_decal/delivery/white{ - color = "#00ff00"; - name = "green" - }, -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison) -"jAO" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plating, -/area/station/security/prison) "jAS" = ( /obj/machinery/door/airlock/hatch, /obj/structure/barricade/wooden/crude, @@ -49114,6 +48934,19 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"jBC" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "prisonlockdown1"; + name = "Lockdown" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "jBI" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -49579,6 +49412,13 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) +"jGf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "jGk" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -49664,18 +49504,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"jHe" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "jHf" = ( /obj/machinery/door/airlock/bathroom{ name = "Restroom" @@ -49767,13 +49595,6 @@ }, /turf/open/floor/carpet, /area/station/service/library/printer) -"jHS" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "jHV" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, @@ -49921,6 +49742,21 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) +"jJA" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "prisonlockdown1"; + name = "Lockdown" + }, +/obj/machinery/button/door{ + id = "prisonlockdown1"; + name = "Lockdown"; + pixel_x = 24; + req_access = list("security") + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "jJF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -50061,6 +49897,10 @@ /obj/item/clothing/gloves/latex, /turf/open/floor/iron/white, /area/station/service/barber) +"jLj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "jLo" = ( /obj/effect/decal/cleanable/dirt, /obj/item/seeds/liberty, @@ -50191,20 +50031,20 @@ /obj/effect/landmark/start/chemist, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"jMu" = ( -/obj/structure/table, -/obj/item/weldingtool/largetank{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/clothing/head/utility/welding, -/turf/open/floor/iron, -/area/station/security/prison/upper) "jMy" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +"jMz" = ( +/obj/machinery/computer/security/labor{ + dir = 4 + }, +/obj/structure/window/spawner/directional/north, +/obj/machinery/newscaster/directional/west, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "jME" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -50216,11 +50056,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"jMJ" = ( -/obj/effect/spawner/random/trash/mess, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "jMO" = ( /obj/structure/easel, /obj/item/canvas/twentythree_twentythree{ @@ -50285,9 +50120,14 @@ dir = 1 }, /area/station/hallway/secondary/service) -"jNo" = ( -/turf/open/floor/iron/dark/side, -/area/station/security/execution/transfer) +"jNq" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/prison/upper) "jNs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ @@ -50389,13 +50229,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) -"jNW" = ( -/obj/structure/chair, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "jOg" = ( /obj/machinery/plumbing/ooze_sucker{ mapping_id = "4"; @@ -50475,15 +50308,6 @@ /obj/machinery/duct, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/captain) -"jOP" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/station/hallway/secondary/entry) "jOV" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -50631,10 +50455,6 @@ /obj/effect/landmark/carpspawn, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) -"jPX" = ( -/obj/structure/trash_pile, -/turf/open/floor/plating, -/area/station/security/prison) "jQe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -50860,13 +50680,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/research) -"jRQ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/prison) "jRR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -50954,6 +50767,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"jSV" = ( +/obj/structure/closet/secure_closet/brig/genpop, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/security/prison) "jSY" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/west, @@ -50979,11 +50797,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron/dark, /area/station/maintenance/abandon_exam/cat) -"jTp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "jTz" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -51068,6 +50881,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"jUg" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/security/prison) "jUh" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -51140,6 +50959,11 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/common/wrestling/arena) +"jUN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "jUO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51193,6 +51017,10 @@ /obj/item/rack_parts, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"jUX" = ( +/obj/machinery/door/window/left/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "jVd" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -51283,15 +51111,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"jVM" = ( -/obj/machinery/computer/security/labor{ - dir = 4 - }, -/obj/structure/window/spawner/directional/north, -/obj/machinery/newscaster/directional/west, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "jVO" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -51414,15 +51233,6 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/engineering/storage) -"jWC" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname/directional/west, -/obj/machinery/station_map/engineering/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "jWJ" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/stairs/right, @@ -51447,9 +51257,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"jXw" = ( -/turf/closed/wall/rust, -/area/station/security/prison) "jXA" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -51518,6 +51325,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science) +"jXV" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/storage/box/hug{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) +"jYd" = ( +/obj/structure/closet/crate/large, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "jYj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -51531,6 +51352,26 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/law) +"jYm" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red, +/obj/item/storage/box/bodybags{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/storage/box/prisoner{ + pixel_x = -4 + }, +/obj/item/radio/intercom/directional/west, +/obj/item/pushbroom, +/turf/open/floor/iron/dark, +/area/station/security/prison) "jYp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -51647,15 +51488,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/mineral/plastitanium, /area/station/science/robotics/lab) -"jZj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/security/prison) "jZk" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/decal/cleanable/dirt, @@ -51711,6 +51543,13 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"jZy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/storage/toolbox/mechanical/old, +/turf/open/floor/wood, +/area/station/security/prison/upper) "jZA" = ( /obj/item/kirbyplants/random, /obj/machinery/light/directional/south, @@ -51791,6 +51630,14 @@ dir = 4 }, /area/station/service/bar/atrium) +"kas" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/security/prison) "kau" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/cable, @@ -51834,11 +51681,6 @@ "kbi" = ( /turf/open/floor/mineral/plastitanium/red, /area/station/maintenance/cult_chapel_maint) -"kbn" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/station/security/prison) "kbo" = ( /turf/open/space/openspace, /area/station/cargo/mining/asteroid_magnet) @@ -51918,13 +51760,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"kcz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "kcI" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -51957,6 +51792,15 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/common/pool/sauna) +"kcW" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/closet, +/obj/effect/spawner/random/medical/medkit, +/turf/open/floor/iron/white, +/area/station/security/medical) "kcZ" = ( /obj/effect/turf_decal/bot, /obj/structure/liquid_pump, @@ -52015,6 +51859,20 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"kdE" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/brig) "kdH" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -52069,20 +51927,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/grass, /area/station/hallway/primary/central) -"kew" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "key" = ( /obj/structure/cable, /obj/effect/landmark/event_spawn, @@ -52390,21 +52234,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners, /turf/open/floor/iron/dark, /area/station/common/laser_tag) -"kgu" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "prisonlockdown3"; - name = "Lockdown" - }, -/obj/machinery/button/door{ - id = "prisonlockdown3"; - name = "Lockdown"; - pixel_x = 24; - req_access = list("security") - }, -/turf/open/floor/iron/dark, -/area/station/security/prison) "kgv" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/chair/sofa/bench/left, @@ -52665,6 +52494,11 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"kif" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "kih" = ( /obj/machinery/door/airlock{ name = "Commentator Studio" @@ -52754,14 +52588,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/pool_maintenance) -"kjl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "kjr" = ( /obj/structure/table/reinforced, /obj/item/storage/box/beakers{ @@ -52939,6 +52765,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"klO" = ( +/obj/machinery/status_display/shuttle, +/turf/closed/wall, +/area/station/hallway/secondary/entry) "klU" = ( /obj/machinery/power/solar{ id = "aftstarboard"; @@ -52947,6 +52777,19 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/aft) +"klV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "klX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -53068,6 +52911,15 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/maintenance/department/engineering/atmos_aux_port) +"kmG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "kmI" = ( /obj/structure/chair/comfy/brown{ color = "#A46106"; @@ -53139,6 +52991,11 @@ dir = 4 }, /area/station/security/checkpoint/supply) +"knn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/security/prison/upper) "kno" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53207,20 +53064,6 @@ }, /turf/open/floor/iron, /area/station/science/research) -"knE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/security{ - name = "Shuttle Bay" - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/security/prison/upper) "knM" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/extinguisher_cabinet/directional/east, @@ -53263,6 +53106,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/aux_eva) +"kow" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "kox" = ( /obj/structure/bookcase/manuals/research_and_development, /obj/machinery/digital_clock/directional/north, @@ -53294,15 +53145,20 @@ dir = 1 }, /area/station/hallway/primary/starboard) -"kpa" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +"kpg" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 }, -/obj/structure/chair/office, -/obj/effect/landmark/start/brig_physician, -/turf/open/floor/iron/white/side, -/area/station/security/medical) +/obj/machinery/netpod, +/obj/structure/sign/poster/contraband/lusty_xenomorph/directional/east, +/obj/machinery/light/small/blacklight/directional/east, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "kpo" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/west, @@ -53453,21 +53309,6 @@ /obj/structure/window/reinforced/tinted/spawner/directional/south, /turf/open/floor/iron, /area/station/service/theater) -"kqq" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/structure/sign/departments/medbay/alt/directional/west, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/brig) "kqs" = ( /obj/machinery/door/airlock/external{ name = "External Thrusters Access"; @@ -53615,10 +53456,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/common/wrestling/arena) -"krL" = ( -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark, -/area/station/security/medical) "krU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54086,7 +53923,6 @@ /obj/structure/bed/double, /obj/item/bedsheet/purple/double, /obj/machinery/light_switch/directional/east, -/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/carpet/purple, /area/station/commons/dorms/room4) "kww" = ( @@ -54207,6 +54043,10 @@ dir = 4 }, /area/station/command/gateway) +"kxy" = ( +/obj/structure/railing, +/turf/closed/wall, +/area/station/security/prison/upper) "kxz" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron/smooth_large, @@ -54451,25 +54291,14 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/wood/tile, /area/station/service/bar/atrium) -"kzu" = ( -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - id_tag = "xeno_airlock_interior"; - name = "Xenobiology Lab Internal Airlock" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 1 +"kzx" = ( +/obj/structure/railing{ + dir = 8 }, -/obj/effect/turf_decal/trimline/purple/filled/warning, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "kzy" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -54766,13 +54595,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"kCv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/prison) "kCB" = ( /turf/open/floor/iron/white/small, /area/station/medical/break_room) @@ -55054,19 +54876,6 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) -"kFx" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) -"kFJ" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white/side, -/area/station/security/medical) "kFL" = ( /obj/structure/railing{ dir = 10 @@ -55436,9 +55245,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/machinery/duct, -/obj/machinery/atm/directional/west, /turf/open/floor/iron, /area/station/commons/dorms) +"kKk" = ( +/obj/structure/door_assembly/door_assembly_sec, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "kKm" = ( /obj/machinery/door/airlock/external{ name = "Arrivals Dock"; @@ -55643,20 +55456,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"kMa" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 10 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/security/execution/transfer) "kMb" = ( /obj/machinery/light_switch/directional/south, /turf/open/floor/wood, @@ -55885,11 +55684,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"kOy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "kOB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -56137,15 +55931,6 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/smooth_large/airless, /area/space/nearstation) -"kRE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/station/security/execution/transfer) "kRF" = ( /obj/structure/chair/sofa/bench{ dir = 4; @@ -56333,6 +56118,12 @@ }, /turf/open/floor/wood, /area/station/hallway/primary/central) +"kUy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "kUD" = ( /obj/structure/railing{ dir = 8 @@ -56401,12 +56192,6 @@ /obj/structure/closet/crate/freezer/blood, /turf/open/floor/iron/white, /area/station/medical/coldroom) -"kVx" = ( -/obj/structure/sink/directional/east, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) "kVJ" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4 @@ -56417,13 +56202,19 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) -"kVR" = ( -/obj/machinery/door/window/brigdoor/right/directional/east{ - name = "Crematorium"; - req_access = list("security") +"kVN" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) +/obj/effect/turf_decal/trimline/red/filled/line{ + color = "#DE3A3A"; + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "kWb" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -56432,6 +56223,18 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/service/hydroponics/garden/abandoned) +"kWs" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 5; + name = "fore bay 1"; + roundstart_template = /datum/map_template/shuttle/labour/nova; + shuttle_id = "laborcamp_home"; + width = 9 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "kWu" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -56505,14 +56308,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/iron/dark/side, /area/station/ai_monitored/security/armory) -"kXj" = ( -/obj/structure/cable, -/obj/machinery/light/directional/south, -/obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "kXl" = ( /obj/structure/rack/shelf, /obj/effect/spawner/random/techstorage/medical_all, @@ -56532,14 +56327,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"kXq" = ( -/obj/item/radio/intercom/directional/south, -/obj/machinery/light/directional/south, -/obj/machinery/computer/security/labor{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "kXs" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -56562,12 +56349,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"kXC" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/duct, -/obj/machinery/station_map/engineering/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/patients_rooms) "kXG" = ( /obj/item/screwdriver, /obj/item/clothing/glasses/welding, @@ -56640,6 +56421,20 @@ }, /turf/open/floor/eighties/red, /area/station/common/arcade) +"kYo" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/table, +/obj/item/folder/red, +/obj/item/stamp/denied{ + pixel_y = 5 + }, +/obj/item/stamp, +/obj/item/reagent_containers/spray/pepper{ + pixel_x = 14 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "kYw" = ( /obj/machinery/light_switch/directional/south, /obj/machinery/duct, @@ -56863,15 +56658,6 @@ /obj/item/holosign_creator/robot_seat/restaurant, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"laE" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - color = "#DE3A3A" - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/security/prison) "laI" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -57199,6 +56985,14 @@ }, /turf/open/floor/carpet, /area/station/service/theater) +"lcR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "lcS" = ( /obj/structure/grille, /obj/structure/window/reinforced/spawner/directional/north, @@ -57460,6 +57254,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) +"lfI" = ( +/obj/structure/bed/roller{ + dir = 1 + }, +/obj/item/bedsheet/medical, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) "lfK" = ( /obj/structure/railing, /obj/structure/railing{ @@ -57566,6 +57370,10 @@ /obj/structure/drain, /turf/open/floor/iron/freezer, /area/station/medical/aslyum) +"lgZ" = ( +/obj/structure/ore_box, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "lhd" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -58030,10 +57838,10 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, +/obj/machinery/newscaster/directional/east, /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atm/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "lmd" = ( @@ -58083,19 +57891,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"lmp" = ( -/obj/machinery/status_display/ai/directional/north, -/obj/machinery/computer/operating, -/turf/open/floor/iron/dark, -/area/station/security/medical) "lms" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 }, +/obj/machinery/status_display/ai/directional/east, /obj/machinery/light/directional/east, -/obj/machinery/status_display/supply{ - pixel_x = 32 - }, /turf/open/floor/iron, /area/station/cargo/lobby) "lmz" = ( @@ -58115,20 +57916,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"lmF" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/structure/bodycontainer/crematorium{ - dir = 4; - id = "crematoriumSec" - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "lmH" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -58137,15 +57924,6 @@ "lmI" = ( /turf/open/floor/iron, /area/station/security/prison) -"lmL" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/pipe_dispenser, -/obj/item/wrench, -/obj/item/analyzer, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plating, -/area/station/security/prison) "lmP" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -58246,19 +58024,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"lnD" = ( -/obj/structure/bed/roller{ - dir = 1 - }, -/obj/item/bedsheet/medical, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "lnJ" = ( /turf/closed/wall/rust, /area/station/service/power_station) @@ -58439,15 +58204,6 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) -"lpB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "Labor Camp Shuttle Airlock" - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "lpC" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -58522,11 +58278,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"lqy" = ( -/obj/effect/turf_decal/stripes, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/prison/upper) "lqB" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/loading_area{ @@ -58540,21 +58291,6 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/plating, /area/station/maintenance/central) -"lqF" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison/upper) "lqG" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -58770,18 +58506,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) -"lsv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/warning{ - color = "#DE3A3A" - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/security/prison) "lsD" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -58887,6 +58611,15 @@ dir = 8 }, /area/station/engineering/lobby) +"ltK" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/structure/closet, +/obj/effect/spawner/random/medical/medkit, +/turf/open/floor/iron/dark, +/area/station/security/prison) "ltN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -59029,7 +58762,6 @@ /obj/structure/bed/double, /obj/item/bedsheet/red/double, /obj/machinery/light_switch/directional/east, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/carpet/red, /area/station/commons/dorms/room6) "lvA" = ( @@ -59129,18 +58861,6 @@ dir = 4 }, /area/station/hallway/secondary/command) -"lwL" = ( -/obj/structure/bed/maint, -/obj/item/bedsheet/grey{ - dir = 1 - }, -/obj/structure/sink/kitchen/directional/south{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/station/security/prison) "lwQ" = ( /obj/structure/transit_tube/curved{ dir = 8 @@ -59202,17 +58922,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/science/robotics) -"lxT" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/south{ - c_tag = "Security - Shuttle Bay East" - }, -/turf/open/floor/iron/stairs/medium{ - dir = 8 - }, -/area/station/security/prison/upper) "lyc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -59282,7 +58991,6 @@ c_tag = "Bar - Aft 2"; name = "service camera" }, -/obj/machinery/atm/directional/east, /turf/open/floor/wood, /area/station/service/bar/atrium) "lyW" = ( @@ -59529,6 +59237,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"lBj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) "lBn" = ( /obj/structure/chair{ dir = 1 @@ -59641,14 +59357,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"lCA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/red, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "lCF" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -59825,7 +59533,6 @@ dir = 4 }, /obj/machinery/light_switch/directional/west, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/carpet, /area/station/commons/dorms/room7) "lDX" = ( @@ -59904,21 +59611,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"lEZ" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "prisonlockdown1"; - name = "Lockdown" - }, -/obj/machinery/button/door{ - id = "prisonlockdown1"; - name = "Lockdown"; - pixel_x = 24; - req_access = list("security") - }, -/turf/open/floor/iron/dark, -/area/station/security/prison) "lFa" = ( /obj/structure/chair/sofa/right/brown, /obj/effect/turf_decal/siding/wood{ @@ -60000,6 +59692,11 @@ /obj/effect/mapping_helpers/airlock/access/all/command/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"lFY" = ( +/obj/machinery/netpod, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "lFZ" = ( /obj/structure/closet, /obj/item/stack/sheet/iron{ @@ -60022,6 +59719,13 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) +"lGf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/prison/upper) "lGl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -60136,14 +59840,6 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron, /area/station/security/office) -"lHo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) "lHt" = ( /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment, @@ -60178,6 +59874,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"lHT" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, +/obj/machinery/recharge_station, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) "lHW" = ( /obj/structure/table/wood, /obj/machinery/fax{ @@ -60648,6 +60350,14 @@ /obj/item/clothing/mask/breath, /turf/open/floor/engine, /area/station/command/secure_bunker) +"lMz" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "lME" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/loading_area{ @@ -60686,6 +60396,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/command/secure_bunker) +"lMR" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "lMX" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 4 @@ -60694,6 +60412,17 @@ dir = 4 }, /area/station/science/research) +"lNb" = ( +/obj/effect/turf_decal/delivery/white{ + color = "#00ff00"; + name = "green" + }, +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "lNc" = ( /obj/structure/rack, /obj/item/coffee_cartridge, @@ -60947,21 +60676,6 @@ }, /turf/open/floor/iron/white, /area/station/science) -"lPS" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "lQa" = ( /obj/machinery/firealarm{ dir = 1; @@ -60987,26 +60701,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"lQh" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/clothing/under/misc/burial, -/obj/item/clothing/under/misc/burial, -/obj/item/clothing/under/misc/burial, -/obj/item/food/grown/harebell, -/obj/item/food/grown/harebell, -/obj/machinery/newscaster/directional/west, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "lQo" = ( /turf/open/floor/iron/dark/corner{ dir = 8 @@ -61200,6 +60894,16 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/station/security/brig) +"lRK" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/spawner/random/trash/mopbucket, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/security/prison/upper) "lRL" = ( /obj/structure/closet/crate/bin, /obj/effect/decal/cleanable/dirt, @@ -61666,6 +61370,13 @@ "lWL" = ( /turf/open/floor/iron/dark, /area/station/security/prison/safe) +"lWM" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "lWO" = ( /obj/machinery/shower/directional/west, /obj/structure/drain, @@ -61720,6 +61431,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"lXr" = ( +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/upper) "lXs" = ( /obj/structure/trash_pile, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61729,6 +61447,20 @@ "lXw" = ( /turf/closed/wall, /area/station/command/heads_quarters/captain/private) +"lXx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "lXy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -62100,18 +61832,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/plating, /area/station/engineering/atmos) -"maC" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "maF" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/stripes, @@ -62136,29 +61856,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/freezer, /area/station/maintenance/abandon_kitchen_upper) -"mbb" = ( -/obj/machinery/light/floor/has_bulb, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "mbg" = ( /obj/machinery/light/directional/north, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) -"mbh" = ( -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = " Prison - Upper"; - network = list("ss13","prison") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/newscaster/directional/north, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "mbk" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -62253,14 +61954,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/office) -"mcr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "mcu" = ( /obj/machinery/computer/station_alert{ dir = 8 @@ -62535,7 +62228,6 @@ /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atm/directional/east, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "mex" = ( @@ -62558,15 +62250,6 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) -"meR" = ( -/obj/effect/turf_decal/delivery/white, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/door/airlock/security/glass{ - name = "Flight Control" - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "meY" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /obj/structure/cable, @@ -62586,6 +62269,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"mfh" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "mfi" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/cup/glass/coffee/no_lid{ @@ -62616,10 +62303,11 @@ dir = 9 }, /area/station/security/lockers) -"mfG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +"mfE" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, -/area/station/security/prison/upper) +/area/station/security/execution/transfer) "mfI" = ( /obj/structure/closet/secure_closet/detective, /turf/open/floor/wood/parquet, @@ -62682,15 +62370,34 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"mgt" = ( +/obj/machinery/button/door/directional/west{ + id = "prison release"; + name = "Labor Camp Shuttle Lockdown"; + req_access = list("brig") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Security Labor Transfer Dock"; + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) +"mgu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) "mgz" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"mgC" = ( -/obj/item/stack/cable_coil, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "mgF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62736,11 +62443,6 @@ }, /turf/open/floor/wood/parquet, /area/station/common/night_club) -"mgS" = ( -/obj/machinery/newscaster/directional/west, -/obj/structure/cable, -/turf/open/floor/iron/stairs/old, -/area/station/security/prison/upper) "mgX" = ( /obj/structure/disposalpipe/segment, /obj/structure/falsewall, @@ -62855,18 +62557,6 @@ }, /turf/open/floor/iron/white, /area/station/science) -"mib" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/red/filled/corner{ - color = "#DE3A3A"; - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/station/security/prison) "mid" = ( /obj/structure/chair/sofa/bench{ dir = 4; @@ -62879,6 +62569,15 @@ dir = 8 }, /area/station/hallway/primary/central) +"miw" = ( +/obj/structure/table, +/obj/item/weldingtool/largetank{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/clothing/head/utility/welding, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "miB" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 9 @@ -62978,7 +62677,6 @@ /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 1 }, -/obj/item/binoculars, /turf/open/floor/iron/dark, /area/station/command/bridge) "mjB" = ( @@ -62999,13 +62697,6 @@ /obj/structure/dresser, /turf/open/floor/carpet/blue, /area/station/commons/dorms/room3) -"mjJ" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "mjK" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -63371,22 +63062,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/hallway/primary/port) -"moD" = ( -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/closet/crate/bin, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/trash/garbage, -/obj/effect/spawner/random/contraband/prison, -/obj/effect/turf_decal/trimline/red/filled/line{ +"moF" = ( +/obj/structure/railing{ dir = 1 }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 +/obj/machinery/light/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/stairs{ + dir = 4 }, -/area/station/security/prison) +/area/station/security/execution/transfer) "moI" = ( /obj/effect/turf_decal/stripes{ dir = 9 @@ -63507,12 +63192,6 @@ }, /turf/open/floor/iron/stairs, /area/station/command/gateway) -"mpU" = ( -/obj/item/reagent_containers/cup/bucket/wooden{ - name = "waste bucket" - }, -/turf/open/floor/plating, -/area/station/security/prison) "mqa" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -63798,6 +63477,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"msT" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "msV" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -63866,13 +63551,6 @@ /obj/machinery/computer/shuttle/mining, /turf/open/floor/iron/dark/small, /area/station/cargo/miningdock) -"mtA" = ( -/obj/structure/closet/crate/trashcart, -/obj/effect/turf_decal/bot, -/obj/item/storage/bag/trash, -/obj/effect/spawner/random/contraband/prison, -/turf/open/floor/iron, -/area/station/security/prison) "mtF" = ( /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron, @@ -64347,15 +64025,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/service/kitchen/diner) -"mzi" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/door/poddoor/shutters{ - id = "securitydock1"; - name = "Security Dock 1" - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "mzj" = ( /obj/machinery/door/airlock/glass{ name = "Cryopods" @@ -64462,6 +64131,20 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/cmo) +"mzV" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "mAe" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -64485,19 +64168,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva/upper) -"mAp" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "mAB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64720,6 +64390,21 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/common/wrestling/lobby) +"mDg" = ( +/obj/machinery/door/poddoor/preopen{ + id = "XenoOffice"; + name = "Xenobiology Lockdown Blast Doors" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Toxins Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "mDi" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -64833,6 +64518,17 @@ }, /turf/open/floor/iron/dark/small, /area/station/science/circuits) +"mEr" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Shuttle Airlock" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/execution/transfer) "mEs" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -64971,13 +64667,6 @@ "mFy" = ( /turf/open/floor/iron, /area/station/engineering/main) -"mFF" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/security/prison/upper) "mFI" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -65144,6 +64833,21 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/primary/port) +"mHe" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "mHg" = ( /obj/structure/chair/stool{ pixel_y = 3 @@ -65179,6 +64883,12 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/upper) +"mHx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison) "mHA" = ( /obj/structure/table/reinforced, /obj/item/pipe_dispenser, @@ -65330,6 +65040,18 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +"mIY" = ( +/obj/structure/table, +/obj/item/fuel_pellet, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"mJa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/security/prison/upper) "mJc" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -65343,6 +65065,11 @@ }, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) +"mJh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall, +/area/station/security/prison/upper) "mJi" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, @@ -65507,6 +65234,15 @@ /obj/structure/chair/stool, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"mKJ" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/door/poddoor/shutters{ + id = "securitydock1"; + name = "Security Dock 1" + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "mKN" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -65780,11 +65516,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/library/private) -"mNo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/medical) "mNy" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -66060,6 +65791,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"mQE" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/door/poddoor/shutters{ + id = "securitydock2"; + name = "Security Dock 2" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "mQG" = ( /obj/machinery/door/airlock/research{ name = "Robotics Surgery" @@ -66196,13 +65937,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/grass, /area/station/common/night_club) -"mRr" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/closet/crate/bin, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "mRu" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/syndi_cakes, @@ -66620,12 +66354,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron/dark, /area/station/maintenance/aux_eva) -"mVR" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "mVS" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/smooth_large, @@ -66797,20 +66525,6 @@ /obj/item/food/cake/chocolate, /turf/open/floor/iron/dark, /area/station/command/captain_dining) -"mXJ" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Gulag Processing" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron, -/area/station/security/prison/upper) "mXK" = ( /obj/effect/turf_decal/delivery/white, /turf/open/floor/iron/dark/small, @@ -66821,6 +66535,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/herringbone, /area/station/security/brig) +"mXO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "mYc" = ( /obj/effect/decal/cleanable/glass, /obj/item/shard, @@ -66847,6 +66570,12 @@ /obj/machinery/rnd/production/circuit_imprinter/department/science, /turf/open/floor/mineral/plastitanium, /area/station/science/robotics/lab) +"mYn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison) "mYo" = ( /obj/machinery/door/airlock/external{ space_dir = 8 @@ -66976,6 +66705,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"mZZ" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/item/pipe_dispenser, +/obj/item/wrench, +/obj/item/analyzer, +/obj/machinery/atmospherics/pipe/layer_manifold, +/turf/open/floor/plating, +/area/station/security/prison/upper) "nah" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -67024,12 +66762,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/openspace, /area/station/maintenance/fore/upper) -"nar" = ( -/obj/machinery/washing_machine, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) "nav" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67383,12 +67115,6 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/department/security/prison_upper) -"neq" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "nes" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -67468,18 +67194,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -"nfl" = ( -/obj/machinery/camera/directional/north{ - c_tag = " Prison - West"; - dir = 2; - network = list("ss13","prison") - }, -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/security/prison) "nfn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -67539,18 +67253,6 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"nfH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 9 - }, -/obj/effect/turf_decal/trimline/red/corner, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/security/prison) "nfL" = ( /turf/closed/wall, /area/station/common/wrestling/beverage) @@ -67726,6 +67428,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"nhb" = ( +/obj/effect/turf_decal/trimline/blue/filled/end{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) "nhj" = ( /obj/structure/guncase, /obj/effect/turf_decal/delivery, @@ -67802,17 +67510,6 @@ /obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine/vacuum, /area/station/maintenance/disposal/incinerator) -"nim" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Airlock" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison/upper) "nin" = ( /obj/structure/lattice, /obj/item/stack/ore/glass, @@ -67990,6 +67687,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"nkn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/bounty/start_closed, +/turf/open/floor/plating, +/area/station/security/prison/upper) "nko" = ( /turf/closed/wall/r_wall, /area/station/maintenance/abandon_arcade) @@ -68008,10 +67710,6 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"nkM" = ( -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "nkN" = ( /obj/machinery/door/airlock/research{ name = "Research Division Access" @@ -68122,15 +67820,6 @@ dir = 4 }, /area/station/security/checkpoint/escape) -"nlW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "nlZ" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -68211,13 +67900,11 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"nmU" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/iron/dark, +"nnc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/plating, /area/station/security/prison/upper) "nng" = ( /obj/structure/sign/directions/security{ @@ -68242,10 +67929,11 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron/white, /area/station/science/research) "nnx" = ( @@ -68262,7 +67950,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/white, /area/station/commons/toilet/restrooms) "nnB" = ( @@ -68346,13 +68033,6 @@ /obj/item/stack/sheet/cardboard, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"nom" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Security - Shuttle Bay West"; - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "noo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68367,10 +68047,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"nos" = ( -/obj/structure/bed/maint, -/turf/open/floor/plating, -/area/station/security/prison) "noz" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, @@ -68629,24 +68305,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/power_station) -"nrY" = ( -/obj/effect/spawner/random/trash/mess, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/prison) "nsb" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/newscaster/directional/west, /obj/machinery/camera/directional/west{ c_tag = "Upper Central Hallway - Upper Starboard Central"; name = "hallway camera" }, /obj/machinery/light/directional/west, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/upper) "nsg" = ( @@ -69507,6 +69175,12 @@ /obj/structure/flora/bush/lavendergrass, /turf/open/floor/grass, /area/station/command/heads_quarters/captain) +"nBh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/security/prison/upper) "nBi" = ( /obj/structure/rack/shelf, /obj/effect/turf_decal/bot, @@ -69534,11 +69208,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) -"nBw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall, -/area/station/security/prison) "nBz" = ( /obj/structure/chair/sofa/left/brown, /obj/effect/decal/cleanable/dirt, @@ -69688,10 +69357,18 @@ initial_gas_mix = "TEMP=2.7" }, /area/station/science/ordnance/bomb) -"nCL" = ( -/obj/structure/ore_box, -/turf/open/floor/iron, -/area/station/security/prison/upper) +"nCJ" = ( +/obj/structure/closet/secure_closet/brig/genpop, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/prison) +"nCO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) "nCP" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 9 @@ -69854,7 +69531,6 @@ "nEW" = ( /obj/machinery/light_switch/directional/north, /obj/structure/closet/crate/freezer/blood, -/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/coldroom) "nFc" = ( @@ -70308,6 +69984,16 @@ dir = 8 }, /area/station/security/checkpoint/escape) +"nJe" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Shuttlebay" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "nJh" = ( /obj/structure/chair/sofa/corp{ dir = 1 @@ -70345,23 +70031,6 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/central) -"nJo" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Medbay" - }, -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "nJv" = ( /obj/machinery/computer/slot_machine, /obj/machinery/light/directional/south, @@ -70396,12 +70065,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/brig) -"nJN" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "nJT" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -70409,6 +70072,12 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/night_club) +"nJY" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison) "nKc" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ @@ -70496,14 +70165,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/warehouse) -"nKO" = ( -/obj/structure/closet/secure_closet/brig/genpop, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "nKV" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -70652,6 +70313,11 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark, /area/station/security/office) +"nMV" = ( +/obj/structure/closet, +/obj/effect/spawner/random/medical/medkit, +/turf/open/floor/iron/dark, +/area/station/security/prison) "nMW" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -70690,14 +70356,6 @@ /obj/machinery/light/small/broken/directional/north, /turf/open/floor/plating, /area/station/service/theater/abandoned) -"nNy" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/stairs, -/area/station/security/prison/upper) "nNB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, @@ -70764,6 +70422,13 @@ }, /turf/open/floor/carpet/purple, /area/station/science/breakroom) +"nOf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "nOi" = ( /turf/closed/wall/r_wall, /area/station/security/office) @@ -70819,6 +70484,10 @@ }, /turf/open/floor/carpet, /area/station/medical/psychology) +"nOQ" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "nPa" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks{ @@ -70913,6 +70582,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/power_station) +"nQe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "nQf" = ( /obj/machinery/airalarm/directional/west, /obj/item/radio/intercom/directional/south, @@ -71188,17 +70871,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"nSB" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/obj/machinery/station_map/engineering/directional/north, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/brig) "nSD" = ( /obj/structure/chair/plastic, /turf/open/floor/plating, @@ -71258,14 +70930,6 @@ dir = 1 }, /area/station/hallway/secondary/entry) -"nSZ" = ( -/obj/structure/table/reinforced, -/obj/item/wrench, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "nTd" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Science Maintenance" @@ -71294,6 +70958,13 @@ dir = 8 }, /area/station/commons/fitness/recreation) +"nTp" = ( +/obj/structure/table, +/obj/effect/spawner/random/decoration/ornament, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/security/prison/upper) "nTw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -71322,6 +70993,14 @@ /obj/structure/flora/bush/lavendergrass, /turf/open/floor/grass, /area/station/common/night_club) +"nTK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "nTM" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/fueltank, @@ -71446,6 +71125,13 @@ /obj/structure/flora/bush/grassy, /turf/open/floor/grass, /area/station/service/chapel) +"nUH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "nUJ" = ( /obj/effect/turf_decal/stripes, /obj/structure/cable, @@ -71562,6 +71248,14 @@ "nVz" = ( /turf/closed/wall/r_wall, /area/station/science/research) +"nVB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/security/prison/upper) "nVD" = ( /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) @@ -71688,18 +71382,6 @@ /obj/machinery/duct, /turf/open/floor/iron/dark/textured_edge, /area/station/security/prison/garden) -"nWV" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 - }, -/obj/machinery/quantum_server, -/obj/machinery/light/small/blacklight/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/item/pizzabox/meat{ - pixel_y = 14 - }, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "nWZ" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/wardrobe/sec_wardrobe, @@ -71731,13 +71413,6 @@ dir = 4 }, /area/station/hallway/secondary/command) -"nXF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "nXK" = ( /obj/machinery/chem_mass_spec, /obj/effect/turf_decal/bot, @@ -71811,12 +71486,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"nYK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/side, -/area/station/security/execution/transfer) "nYM" = ( /obj/structure/cable, /obj/machinery/duct, @@ -71940,11 +71609,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"nZv" = ( -/turf/open/floor/iron/stairs/left{ - dir = 8 - }, -/area/station/security/prison) "nZz" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -72027,6 +71691,22 @@ "oar" = ( /turf/open/floor/iron/dark, /area/station/security/detectives_office) +"oav" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/rack, +/obj/item/clothing/suit/caution, +/obj/item/clothing/suit/caution, +/obj/item/clothing/suit/caution, +/obj/item/clothing/suit/caution, +/obj/item/mop, +/obj/item/mop, +/obj/item/pushbroom, +/obj/item/pushbroom, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/storage/bag/trash, +/turf/open/floor/iron, +/area/station/security/prison/upper) "oax" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -72052,19 +71732,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/solars/starboard/fore) -"oaW" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/item/stack/medical/mesh{ - pixel_x = -6 - }, -/obj/item/healthanalyzer/simple{ - pixel_y = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "obc" = ( /obj/structure/flora/bush/sparsegrass, /obj/structure/flora/bush/flowers_yw, @@ -72124,18 +71791,18 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/science/ordnance) -"obF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/spawner/random/structure/steam_vent, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "obI" = ( /obj/machinery/growing/tray, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) +"obJ" = ( +/obj/structure/chair, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "obM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -72161,6 +71828,13 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/carpet, /area/station/security/detectives_office) +"occ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "oci" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ color = "#DE3A3A"; @@ -72234,14 +71908,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"ocU" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "ocY" = ( /obj/machinery/computer/warrant{ dir = 4 @@ -72256,6 +71922,11 @@ dir = 8 }, /area/station/commons/fitness) +"odg" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/stairs/old, +/area/station/security/execution/transfer) "odj" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -72349,7 +72020,6 @@ /area/station/maintenance/department/security/lesser) "odS" = ( /obj/machinery/camera/autoname/directional/west, -/obj/machinery/atm/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -72854,12 +72524,6 @@ /obj/structure/table, /turf/open/floor/wood, /area/station/service/kitchen/diner) -"ohJ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "ohK" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -72915,6 +72579,10 @@ /obj/item/organ/internal/brain, /turf/open/floor/iron/white, /area/station/maintenance/abandon_surgery) +"oih" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "oil" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72997,6 +72665,12 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/stone, /area/station/hallway/primary/central) +"oiU" = ( +/obj/item/kirbyplants/organic/plant21, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/security/prison) "oiX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -73074,6 +72748,16 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/wood, /area/station/maintenance/abandon_art_studio) +"ojW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Prison Sanitarium" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/white/side, +/area/station/security/prison) "oke" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -73264,13 +72948,6 @@ }, /turf/open/floor/iron, /area/station/science/ordnance/storage) -"olx" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/security/prison) "oly" = ( /turf/open/floor/iron/stairs/medium{ dir = 4 @@ -73302,7 +72979,6 @@ /obj/structure/bed/double, /obj/item/bedsheet/brown/double, /obj/machinery/light_switch/directional/east, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/carpet/royalblack, /area/station/commons/dorms/room8) "olW" = ( @@ -73564,6 +73240,12 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"ooh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/trash/can, +/turf/open/floor/iron/smooth, +/area/station/security/prison/upper) "ooi" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 8 @@ -73764,6 +73446,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/medical) +"oql" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "oqn" = ( /obj/machinery/door/poddoor/shutters{ id = "aux_base_shutters"; @@ -73860,6 +73546,13 @@ /obj/structure/cable, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"orl" = ( +/obj/structure/closet/crate/trashcart, +/obj/effect/turf_decal/bot, +/obj/item/storage/bag/trash, +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/iron, +/area/station/security/prison/upper) "orn" = ( /obj/effect/turf_decal/vg_decals/numbers/three, /turf/open/floor/iron/shuttle/arrivals/airless, @@ -73946,6 +73639,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/virology/isolation) +"osb" = ( +/obj/machinery/door/poddoor/preopen{ + id = "prison release"; + name = "Prisoner Processing Blast Door" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/execution/transfer) "osc" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -74059,17 +73764,6 @@ }, /turf/open/floor/engine, /area/station/science/auxlab/firing_range) -"ote" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "otk" = ( /obj/machinery/photocopier, /obj/machinery/light/directional/north, @@ -74093,16 +73787,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/mineral/plastitanium, /area/station/maintenance/cult_chapel_maint) -"otH" = ( -/obj/structure/bed/roller{ - dir = 1 - }, -/obj/item/bedsheet/medical, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "otQ" = ( /obj/structure/chair/pew/left{ dir = 4 @@ -74179,17 +73863,16 @@ dir = 8 }, /area/station/engineering/atmos/hfr_room) -"ouA" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "ouH" = ( /turf/open/floor/iron/checker, /area/station/hallway/secondary/service) +"ouK" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "ouM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74524,13 +74207,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/visible, /turf/closed/wall, /area/station/engineering/atmos/pumproom) -"oya" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "oyb" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen/ordnance{ @@ -74573,6 +74249,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) +"oyy" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "oyz" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -74601,6 +74282,11 @@ }, /turf/open/floor/carpet, /area/station/common/tailoring) +"oyI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "oyK" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/siding/wood{ @@ -74910,6 +74596,10 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"oBL" = ( +/obj/machinery/door/window/right/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "oBO" = ( /obj/machinery/conveyor{ dir = 8; @@ -74932,11 +74622,6 @@ /obj/structure/sign/departments/psychology/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"oBU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/closet_maintenance, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "oBV" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -75042,13 +74727,13 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) -"oDk" = ( -/obj/machinery/washing_machine, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) +"oDh" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/closet/crate/bin, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "oDl" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -75259,17 +74944,6 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"oFM" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Kill Room" - }, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/freezer, -/area/station/science/xenobiology) "oFP" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -75701,18 +75375,6 @@ dir = 8 }, /area/station/cargo/miningdock) -"oKh" = ( -/obj/structure/table/reinforced, -/obj/item/folder/blue{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/folder/yellow, -/obj/item/lighter, -/obj/item/stamp/head/ce, -/obj/effect/turf_decal/tile/yellow/full, -/turf/open/floor/iron/large, -/area/station/command/heads_quarters/ce) "oKi" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 @@ -75974,35 +75636,6 @@ }, /turf/open/floor/wood, /area/station/service/barber) -"oLZ" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) -"oMa" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison/upper) "oMd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -76042,7 +75675,6 @@ /obj/structure/disposalpipe/trunk{ dir = 2 }, -/obj/machinery/atm/directional/north, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) "oMC" = ( @@ -76531,15 +76163,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/medical/psychology) -"oRx" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/medical) "oRy" = ( /obj/machinery/computer/monitor, /obj/structure/cable, @@ -76839,6 +76462,12 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/locker) +"oUI" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "oUJ" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom/directional/north{ @@ -77007,6 +76636,14 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"oWD" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/vg_decals/numbers/four, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "oWE" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -77052,28 +76689,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"oXl" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/folder/yellow, -/obj/item/stamp/head/qm, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 6; - pixel_y = 16 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -4; - pixel_y = 16 - }, -/obj/item/hand_labeler_refill{ - pixel_x = -8; - pixel_y = -8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/qm) "oXm" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -77165,19 +76780,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"oYn" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "prisonlockdown3"; - name = "Lockdown" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/prison) "oYq" = ( /obj/machinery/button/door{ desc = "A remote control-switch for secure storage."; @@ -77355,6 +76957,21 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/library/upper) +"pai" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Prison Wing" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery/blue, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark, +/area/station/security/prison) "paj" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 10 @@ -77376,20 +76993,6 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/central) -"pap" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red, -/obj/item/pen/red, -/obj/item/stamp/head/hos, -/obj/machinery/keycard_auth{ - pixel_x = 15 - }, -/obj/item/clothing/accessory/badge/holo/hos{ - pixel_x = -7; - pixel_y = 9 - }, -/turf/open/floor/carpet/red, -/area/station/command/heads_quarters/hos) "paq" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -77399,13 +77002,6 @@ }, /turf/open/floor/carpet, /area/station/command/meeting_room/council) -"pas" = ( -/obj/structure/table, -/obj/machinery/power/shuttle_engine/heater{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "pat" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -77455,12 +77051,6 @@ }, /turf/open/misc/beach/sand, /area/station/hallway/primary/central) -"paT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "paW" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -77562,14 +77152,6 @@ /obj/machinery/pipedispenser, /turf/open/floor/iron, /area/station/maintenance/department/engineering/atmos_aux_port) -"pcb" = ( -/obj/machinery/door/airlock/hatch{ - name = "Secure Pen" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "pcf" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table/reinforced, @@ -77595,22 +77177,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/engineering/atmos) -"pco" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/rack, -/obj/machinery/button/crematorium{ - id = "crematoriumSec"; - pixel_y = 26; - req_access = list("crematorium") - }, -/obj/item/book/bible, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "pcs" = ( /obj/machinery/mecha_part_fabricator/maint{ name = "forgotten exosuit fabricator" @@ -77795,6 +77361,10 @@ }, /turf/open/floor/iron, /area/station/security/prison/mess) +"peU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "peV" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -77997,6 +77567,13 @@ dir = 4 }, /area/station/cargo/power_station/upper) +"phD" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "phG" = ( /obj/machinery/light/directional/north, /obj/machinery/newscaster/directional/north, @@ -78117,6 +77694,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/common/wrestling/arena) +"pir" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Shaving Station" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/station/security/prison) "pit" = ( /obj/structure/flora/bush/jungle/c, /obj/structure/flora/bush/flowers_pp/style_2, @@ -78150,9 +77737,28 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"piE" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Medbay Waiting Room" + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/white, +/area/station/security/medical) +"piH" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "piL" = ( /turf/closed/wall, /area/station/hallway/secondary/exit) +"piO" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark/herringbone, +/area/station/security/brig) "piQ" = ( /obj/structure/chair/office, /turf/open/floor/iron/dark, @@ -78212,16 +77818,6 @@ dir = 4 }, /area/station/maintenance/xenobio_disposals) -"pjj" = ( -/obj/structure/chair/sofa/corp/right, -/obj/item/toy/katana{ - pixel_x = -12; - pixel_y = 2 - }, -/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "pjl" = ( /obj/structure/chair/pew/right{ dir = 4 @@ -78438,6 +78034,17 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/common/wrestling/lobby) +"plQ" = ( +/obj/machinery/firealarm/directional/north{ + pixel_x = -22 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison) "plR" = ( /obj/structure/railing{ dir = 4 @@ -78745,6 +78352,10 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/science/lower) +"poM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall, +/area/station/security/prison/upper) "poY" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -78773,14 +78384,14 @@ /obj/machinery/light/small/directional/south, /turf/open/openspace, /area/station/maintenance/port/upper) -"ppu" = ( -/obj/structure/railing{ - dir = 8 +"pps" = ( +/obj/item/kirbyplants/random, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 4 }, -/obj/machinery/light/directional/north, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/security/prison/upper) +/area/station/security/execution/transfer) "ppC" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -79204,14 +78815,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/break_room) -"puP" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/duct, -/turf/open/floor/iron/white/corner, -/area/station/security/medical) "puT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -79386,22 +78989,6 @@ }, /turf/open/floor/iron/dark/side, /area/station/security/checkpoint/escape) -"pwd" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/spawner/random/trash/mopbucket, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/security/prison) -"pwf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "pwj" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery/white, @@ -79871,12 +79458,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/cargo/power_station/upper) -"pzV" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/security/prison) "pAm" = ( /obj/structure/curtain/bounty, /obj/effect/turf_decal/siding/wood{ @@ -79942,7 +79523,6 @@ dir = 10 }, /obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/atm/directional/south, /turf/open/floor/iron/white, /area/station/science) "pAO" = ( @@ -79980,12 +79560,14 @@ /obj/effect/landmark/navigate_destination, /turf/open/floor/wood, /area/station/common/arcade) -"pBl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/trash/can, -/turf/open/floor/iron/smooth, -/area/station/security/bitden) +"pBb" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "pBo" = ( /turf/closed/wall, /area/station/commons/fitness) @@ -80001,16 +79583,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"pBy" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/door/poddoor/shutters{ - id = "securitydock2"; - name = "Security Dock 2" - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "pBD" = ( /obj/structure/table, /obj/item/clothing/gloves/botanic_leather, @@ -80187,6 +79759,14 @@ dir = 10 }, /area/station/hallway/secondary/exit) +"pDW" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/bounty/start_closed, +/turf/open/floor/iron/dark/herringbone, +/area/station/security/prison/upper) "pEc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -80267,10 +79847,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/textured, /area/station/engineering/atmos/test_chambers) -"pFc" = ( -/obj/effect/spawner/random/trash/moisture_trap, -/turf/open/floor/plating, -/area/station/security/prison) "pFg" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/exit) @@ -80814,15 +80390,6 @@ /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/iron/telecomms, /area/station/tcommsat/server) -"pKo" = ( -/obj/effect/turf_decal/stripes/full, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/door/poddoor/shutters{ - id = "securitydock2"; - name = "Security Dock 2" - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "pKp" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -80836,15 +80403,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"pKs" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/security/prison) "pKx" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /obj/structure/cable, @@ -80884,15 +80442,6 @@ /obj/machinery/power/energy_accumulator/grounding_rod/anchored, /turf/open/floor/engine, /area/station/engineering/supermatter) -"pKI" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "pKM" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ dir = 5 @@ -80918,6 +80467,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/command/gateway) +"pKX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/security{ + name = "Shuttle Bay" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/execution/transfer) "pKZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -81126,11 +80689,6 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) -"pME" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "pMI" = ( /obj/machinery/door/airlock/public/glass{ name = "N-O2 Stop Shop" @@ -81220,12 +80778,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"pNz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/prison/upper) "pNA" = ( /obj/structure/grille, /obj/structure/window/reinforced/spawner/directional/south, @@ -81389,6 +80941,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/parquet, /area/station/command/gateway) +"pPF" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "pPJ" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/innards, @@ -81414,6 +80975,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/library/lower) +"pQr" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "pQs" = ( /obj/structure/table/wood, /obj/item/storage/briefcase/secure{ @@ -81527,6 +81094,24 @@ /obj/structure/railing, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"pRF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"pRI" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/security/prison/upper) "pRM" = ( /obj/effect/turf_decal/stripes, /obj/structure/disposalpipe/segment, @@ -81572,6 +81157,10 @@ }, /turf/open/floor/wood, /area/station/service/chapel/funeral) +"pSi" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "pSk" = ( /obj/effect/turf_decal/bot, /obj/item/beacon, @@ -81609,6 +81198,27 @@ dir = 4 }, /area/station/security/checkpoint/escape) +"pSF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "pSH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/port_gen/pacman/pre_loaded, @@ -81641,12 +81251,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/iron, /area/station/security/warden) -"pTb" = ( -/obj/structure/table, -/obj/item/folder/red, -/obj/item/pen, -/turf/open/floor/iron, -/area/station/security/prison/upper) "pTj" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks/beer{ @@ -81742,6 +81346,9 @@ dir = 8 }, /area/station/command/secure_bunker) +"pUq" = ( +/turf/open/floor/iron/dark/side, +/area/station/security/prison) "pUr" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/decal/cleanable/dirt, @@ -81860,6 +81467,15 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"pVI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/security/prison) "pVL" = ( /obj/machinery/modular_computer/preset/id{ dir = 1 @@ -81940,6 +81556,19 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +"pWk" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "prisonlockdown3"; + name = "Lockdown" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "pWl" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -81983,6 +81612,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/space/basic, /area/space/nearstation) +"pWt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "pWv" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral{ @@ -82026,6 +81666,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"pWG" = ( +/turf/open/floor/iron/stairs{ + dir = 1 + }, +/area/station/security/prison/upper) "pWK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -82040,10 +81685,28 @@ }, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"pWT" = ( +/obj/machinery/camera/directional/north{ + c_tag = " Prison - Middle"; + dir = 2; + network = list("ss13","prison") + }, +/turf/open/floor/iron/stairs/left{ + dir = 4 + }, +/area/station/security/prison/upper) "pWU" = ( /obj/machinery/status_display/supply, /turf/closed/wall, /area/station/cargo/storage) +"pWV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/stairs/medium{ + dir = 8 + }, +/area/station/security/prison/upper) "pWY" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -82067,12 +81730,6 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/grass, /area/station/security/prison/garden) -"pXf" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "pXg" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron/dark/small, @@ -82086,6 +81743,18 @@ /obj/item/reagent_containers/cup/bowl/soup/hotchili, /turf/open/misc/asteroid/airless, /area/space/nearstation) +"pXp" = ( +/obj/structure/bed/maint, +/obj/item/bedsheet/grey{ + dir = 1 + }, +/obj/structure/sink/kitchen/directional/south{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + name = "old sink" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/station/security/prison/upper) "pXu" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 4 @@ -82238,6 +81907,13 @@ }, /turf/open/floor/iron, /area/station/cargo/office) +"pYt" = ( +/obj/structure/cable, +/obj/item/screwdriver, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "pYF" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/port_gen/pacman/pre_loaded, @@ -82257,11 +81933,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/stone, /area/station/common/wrestling/arena) -"pYU" = ( -/obj/structure/decorative/shelf/crates1, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/security/prison/upper) "pYX" = ( /turf/closed/wall, /area/station/maintenance/eva_shed/starboard) @@ -82467,6 +82138,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/electronic_marketing_den) +"qby" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "qbD" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/east, @@ -82639,6 +82317,36 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/security/detectives_office/private_investigators_office) +"qdm" = ( +/obj/machinery/button/flasher{ + id = "transferflash"; + pixel_y = -36 + }, +/obj/machinery/button/door{ + id = "permaouter"; + name = "Outer Bolt Control"; + normaldoorcontrol = 1; + pixel_x = 6; + pixel_y = -25; + req_access = list("brig"); + specialfunctions = 4 + }, +/obj/machinery/button/door{ + id = "permainner"; + name = "Inner Bolt Control"; + normaldoorcontrol = 1; + pixel_x = -6; + pixel_y = -25; + req_access = list("brig"); + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/security/prison) "qdq" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/disposalpipe/segment{ @@ -82657,10 +82365,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/bar/atrium) -"qds" = ( -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/security/prison/upper) "qdC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82688,6 +82392,11 @@ /obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible, /turf/closed/wall/r_wall, /area/station/engineering/atmos) +"qdQ" = ( +/obj/machinery/light/floor/has_bulb, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "qdV" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 @@ -82863,6 +82572,23 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"qgb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + color = "#DE3A3A"; + dir = 5 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/security/prison/upper) "qgf" = ( /obj/item/stack/sheet/cardboard, /turf/open/floor/plating, @@ -82912,13 +82638,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/workout) -"qgF" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/obj/structure/railing, -/turf/closed/wall, -/area/station/security/bitden) "qgJ" = ( /obj/machinery/button/door/directional/south{ name = "Security Mech Garage Door Controls"; @@ -82972,6 +82691,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"qgZ" = ( +/obj/structure/cable, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "qhe" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/closed/wall/r_wall, @@ -83317,6 +83046,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/port) +"qkw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison/upper) "qkx" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 8 @@ -83359,6 +83092,14 @@ /obj/machinery/nanite_programmer, /turf/open/floor/iron/dark/small, /area/station/science/circuits) +"qkI" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "qkR" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/delivery, @@ -83397,6 +83138,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"qlC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "qlH" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -83495,13 +83245,6 @@ }, /turf/open/floor/iron/dark/side, /area/station/security/brig) -"qmO" = ( -/obj/structure/closet/secure_closet/brig/genpop, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "qmP" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 4 @@ -83696,6 +83439,14 @@ /obj/machinery/light/directional/south, /turf/open/floor/circuit, /area/station/command/gateway) +"qoJ" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/color/fyellow/old, +/obj/item/clothing/under/color/grey, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/mask/gas, +/turf/open/floor/plating, +/area/station/security/prison/upper) "qoL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -83846,6 +83597,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"qpU" = ( +/obj/structure/closet/secure_closet/brig/genpop, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/prison) "qpZ" = ( /obj/machinery/door/airlock/security{ name = "Armory" @@ -83875,11 +83634,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"qqg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "qqo" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -83967,6 +83721,15 @@ }, /turf/open/floor/plating/airless, /area/station/security/prison/mess) +"qrh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock" + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "qrm" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -84238,6 +84001,22 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/command/secure_bunker) +"qtl" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Controll Room" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "XenoOffice"; + name = "Xenobiology Controll Room Shutters" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/control) "qtm" = ( /obj/structure/window/spawner/directional/west, /obj/effect/turf_decal/bot, @@ -84268,14 +84047,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/plating, /area/station/maintenance/central) -"qtz" = ( -/obj/structure/rack, -/obj/item/clothing/gloves/color/fyellow/old, -/obj/item/clothing/under/color/grey, -/obj/item/clothing/shoes/sneakers/black, -/obj/item/clothing/mask/gas, -/turf/open/floor/plating, -/area/station/security/prison) "qtE" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/starboard/fore) @@ -84362,18 +84133,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, /area/station/security/courtroom) -"quq" = ( -/obj/machinery/camera/directional/north{ - c_tag = " Prison - East"; - dir = 2; - network = list("ss13","prison") - }, -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/security/prison) "qur" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/west, @@ -84575,6 +84334,13 @@ "qvX" = ( /turf/closed/wall/r_wall, /area/station/science/server) +"qwc" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "qwf" = ( /turf/open/floor/iron/stairs/medium{ dir = 4 @@ -84702,6 +84468,12 @@ /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"qxT" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "qxV" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/south, @@ -84892,16 +84664,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/barber) -"qzw" = ( -/obj/machinery/door/airlock/security/old{ - name = "Cryopods" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/prison) "qzx" = ( /obj/machinery/modular_computer/preset/command, /obj/structure/plaque/static_plaque/golden{ @@ -84975,22 +84737,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, /area/station/service/lawoffice) -"qzZ" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 8 - }, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/siding/dark_red, -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "qAa" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -85093,6 +84839,14 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) +"qBh" = ( +/obj/structure/cable, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "qBm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood/parquet, @@ -85137,17 +84891,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) -"qBI" = ( -/obj/machinery/door/airlock/security/old{ - name = "Janitorial" - }, -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison) "qBK" = ( /obj/item/kirbyplants/random, /obj/machinery/newscaster/directional/north, @@ -85170,20 +84913,26 @@ "qBT" = ( /turf/open/floor/iron/dark, /area/station/security/prison/workout) -"qBU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +"qBX" = ( +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + id_tag = "xeno_airlock_exterior"; + name = "Xenobiology Lab External Airlock" }, -/obj/structure/cable, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) -"qBV" = ( -/obj/structure/chair/sofa/bench/left{ - dir = 4; - pixel_x = -5 +/obj/machinery/door_buttons/access_button{ + idDoor = "xeno_airlock_exterior"; + idSelf = "xeno_airlock_control"; + name = "Access Button"; + pixel_x = 25; + req_access = list("xenobiology") }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron, +/area/station/science/xenobiology/hallway) "qCg" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -85241,6 +84990,18 @@ /obj/item/toy/talking/codex_gigas, /turf/open/floor/cult, /area/station/maintenance/cult_chapel_maint) +"qCI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/warning{ + color = "#DE3A3A" + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/upper) "qCJ" = ( /obj/structure/chair/sofa/bench/right{ dir = 8; @@ -85465,10 +85226,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/wood, /area/station/command/meeting_room/council) -"qEl" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "qEn" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/caution/stand_clear{ @@ -85651,15 +85408,6 @@ dir = 1 }, /area/station/cargo/miningdock) -"qFY" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "qGc" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -85705,6 +85453,10 @@ }, /turf/open/floor/iron/white, /area/station/science) +"qGA" = ( +/obj/structure/sign/departments/xenobio/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/aft/upper) "qGC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, @@ -85750,6 +85502,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central) +"qGZ" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/rack, +/obj/machinery/button/crematorium{ + id = "crematoriumSec"; + pixel_y = 26; + req_access = list("crematorium") + }, +/obj/item/book/bible, +/turf/open/floor/iron/dark, +/area/station/security/prison) "qHg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -85820,6 +85588,13 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/white/side, /area/station/science/xenobiology) +"qHK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "qHM" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -85962,6 +85737,21 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/service) +"qIZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "qJb" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes{ @@ -86124,6 +85914,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"qKH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/can, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/station/security/prison/upper) "qKN" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -86213,6 +86010,13 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/security/detectives_office/private_investigators_office) +"qMm" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "qMs" = ( /obj/effect/turf_decal/weather/sand{ dir = 1 @@ -86336,6 +86140,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"qNF" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison) "qNG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -86347,9 +86155,6 @@ /obj/structure/curtain, /turf/open/floor/iron/white, /area/station/medical/patients_rooms) -"qNZ" = ( -/turf/closed/wall, -/area/station/security/bitden) "qOc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -86487,17 +86292,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/commons/dorms/vacantroom) -"qPw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Prison Side Wing" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "qPz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -86505,16 +86299,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) -"qPB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/table/reinforced/rglass, -/obj/machinery/computer/records/medical/laptop{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "qPC" = ( /obj/item/rack_parts, /obj/effect/decal/cleanable/dirt, @@ -86533,17 +86317,6 @@ /obj/item/flashlight/flare/candle/infinite, /turf/open/floor/material/meat, /area/station/maintenance/department/science/xenobiology) -"qPL" = ( -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics Maintenance" - }, -/obj/machinery/atmospherics/components/binary/pump/layer4{ - name = "Airmix Reserve to Distribution" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/prison) "qPM" = ( /obj/item/cigbutt, /turf/open/floor/plating, @@ -86587,14 +86360,6 @@ /obj/effect/spawner/random/maintenance/four, /turf/open/floor/plating, /area/station/maintenance/department/science/central) -"qQm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "qQn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -86613,15 +86378,6 @@ dir = 8 }, /area/station/hallway/primary/port) -"qQx" = ( -/obj/item/radio/intercom/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, -/area/station/security/prison/upper) "qQA" = ( /obj/machinery/door_buttons/airlock_controller{ idExterior = "virology_airlock_exterior"; @@ -86748,6 +86504,13 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"qRV" = ( +/obj/structure/closet/secure_closet/brig/genpop, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison) "qSc" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -86783,13 +86546,6 @@ dir = 5 }, /area/station/commons/vacant_room/commissary) -"qSr" = ( -/obj/structure/chair/office, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "qSs" = ( /obj/structure/chair/stool/bar/directional{ dir = 1 @@ -86994,6 +86750,13 @@ }, /turf/open/floor/plating, /area/station/security/prison/safe) +"qUg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "qUm" = ( /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen/interrogation{ @@ -87435,18 +87198,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"qYn" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "qYp" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -87554,11 +87305,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"qZk" = ( -/obj/structure/railing, -/obj/effect/spawner/random/trash/graffiti, -/turf/closed/wall/rust, -/area/station/security/bitden) "qZs" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -87643,10 +87389,12 @@ dir = 8 }, /area/station/security/brig) -"qZW" = ( -/obj/machinery/gulag_teleporter, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) +"qZR" = ( +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/stamp/rd, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "rah" = ( /obj/structure/flora/bush/lavendergrass, /obj/effect/turf_decal/siding/thinplating/light{ @@ -87703,6 +87451,20 @@ dir = 8 }, /area/station/hallway/primary/central) +"raG" = ( +/obj/machinery/washing_machine, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) +"raI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/station/security/prison/upper) "raJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -87803,6 +87565,19 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating/airless, /area/station/maintenance/fore/upper) +"rbJ" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/item/stack/medical/mesh{ + pixel_x = -6 + }, +/obj/item/healthanalyzer/simple{ + pixel_y = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) "rbL" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -87859,10 +87634,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) -"rcA" = ( -/obj/structure/table, -/obj/item/fuel_pellet, -/turf/open/floor/iron, +"rcw" = ( +/turf/open/floor/iron/dark/side{ + dir = 10 + }, /area/station/security/prison/upper) "rcB" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -87935,6 +87710,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/security/prison_upper) +"rdj" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 3 + }, +/obj/item/borg/sight/hud/sec{ + pixel_y = 17 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rdo" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/light/directional/east, @@ -87966,6 +87755,12 @@ }, /turf/open/floor/plating, /area/station/cargo/miningdock) +"rdz" = ( +/obj/structure/table, +/obj/item/folder/red, +/obj/item/pen, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "rdB" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/siding/wood{ @@ -88134,6 +87929,10 @@ }, /turf/open/floor/carpet, /area/station/commons/dorms/vacantroom) +"reQ" = ( +/obj/item/clothing/head/utility/hardhat, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "reW" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -88168,6 +87967,12 @@ /obj/structure/girder, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"rfs" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rfv" = ( /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral{ @@ -88211,6 +88016,14 @@ }, /turf/open/floor/plating, /area/station/common/tailoring) +"rfQ" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/security/prison/upper) "rfX" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/bed{ @@ -88317,12 +88130,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/engineering/engine_aft_port) -"rhd" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/security/execution/transfer) "rhi" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible/layer2, @@ -88346,6 +88153,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/service/hydroponics) +"rhp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "rhs" = ( /obj/structure/chair/office/light, /obj/effect/turf_decal/stripes/white/corner{ @@ -88374,20 +88189,6 @@ /obj/effect/turf_decal/box/white, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"rhP" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/table, -/obj/item/folder/red, -/obj/item/stamp/denied{ - pixel_y = 5 - }, -/obj/item/stamp, -/obj/item/reagent_containers/spray/pepper{ - pixel_x = 14 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "rhV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -88502,10 +88303,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) -"riE" = ( -/obj/structure/closet/crate, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "riS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -88610,6 +88407,17 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/dorms) +"rjM" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/cytology) "rjO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -88819,6 +88627,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/chapel) +"rlG" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Prison Sanitarium" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron/dark, +/area/station/security/prison) "rlI" = ( /mob/living/basic/chicken/brown{ forced_gender = "female" @@ -88861,6 +88682,15 @@ /obj/structure/chair/sofa/middle/brown, /turf/open/floor/wood, /area/station/service/bar/atrium) +"rme" = ( +/obj/effect/turf_decal/delivery/white, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/airlock/security/glass{ + name = "Flight Control" + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rmf" = ( /obj/structure/curtain/cloth, /turf/open/floor/iron/freezer, @@ -88883,18 +88713,6 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/dark, /area/station/hallway/primary/upper) -"rmo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "rmp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -88907,6 +88725,17 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"rmr" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "rmz" = ( /obj/machinery/camera/directional/east{ c_tag = "Leisure Area - Lasertag Red Fore"; @@ -88950,6 +88779,10 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/science/cytology) +"rnl" = ( +/obj/machinery/gulag_teleporter, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rno" = ( /turf/closed/wall, /area/station/science/ordnance/testlab) @@ -89027,21 +88860,6 @@ }, /turf/open/floor/carpet, /area/station/service/theater) -"roj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/red/corner, -/obj/effect/turf_decal/trimline/red/filled/line{ - color = "#DE3A3A"; - dir = 9 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 9 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/security/prison) "roA" = ( /obj/structure/flora/tree/jungle/small{ pixel_x = -30 @@ -89242,16 +89060,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/eighties/red, /area/station/common/arcade) -"rqd" = ( -/obj/effect/turf_decal/delivery/white{ - color = "#00ff00"; - name = "green" - }, -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison) "rqj" = ( /obj/structure/flora/bush/jungle/a/style_3, /turf/open/floor/grass, @@ -89270,6 +89078,10 @@ dir = 8 }, /area/station/security/checkpoint/escape) +"rqq" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/security/prison/upper) "rqt" = ( /obj/structure/chair{ dir = 8 @@ -89396,10 +89208,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"rrL" = ( -/obj/item/stack/cable_coil, -/turf/open/floor/plating, -/area/station/security/prison/upper) "rrO" = ( /turf/closed/wall/rust, /area/station/maintenance/abandon_holding_cell) @@ -89409,11 +89217,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"rrW" = ( -/obj/structure/door_assembly/door_assembly_sec, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "rsc" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -89482,6 +89285,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"rsK" = ( +/obj/machinery/door/poddoor/preopen{ + id = "XenoOffice"; + name = "Xenobiology Lockdown Blast Doors" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Toxins Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "rsO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -89594,6 +89408,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/central) +"rtH" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/security/prison/upper) "rtK" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -89657,12 +89478,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/main) -"ruf" = ( -/obj/machinery/computer/shuttle/labor{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "rum" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -89957,6 +89772,14 @@ dir = 8 }, /area/station/common/locker_room_shower) +"rwX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "rwZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -90121,7 +89944,6 @@ dir = 1 }, /obj/effect/landmark/start/medical_doctor, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/white, /area/station/medical/break_room) "ryu" = ( @@ -90275,6 +90097,18 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) +"rAQ" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 + }, +/obj/machinery/quantum_server, +/obj/machinery/light/small/blacklight/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/item/pizzabox/meat{ + pixel_y = 14 + }, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "rAY" = ( /obj/machinery/modular_computer/preset/cargochat/medical, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -90382,14 +90216,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"rBY" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "rBZ" = ( /obj/structure/stairs/north, /obj/structure/sign/directions/command{ @@ -90602,16 +90428,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"rDC" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "prisonlockdown3"; - name = "Lockdown" - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/prison) "rDJ" = ( /obj/structure/chair/sofa/corp/left, /obj/item/toy/plush/space_lizard_plushie{ @@ -90772,24 +90588,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science) -"rEF" = ( -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/machinery/station_map/engineering/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/virology/isolation) "rEH" = ( /obj/structure/curtain/bounty, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/electronic_marketing_den) -"rEN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/execution/transfer) "rER" = ( /obj/structure/grille, /obj/structure/window/reinforced/spawner/directional/south, @@ -90812,6 +90615,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/science/tele_sci) +"rFh" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = " Prison - Upper"; + network = list("ss13","prison") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/newscaster/directional/north, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "rFk" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Plasma to Pure" @@ -90821,6 +90638,13 @@ }, /turf/open/floor/plating/airless, /area/station/engineering/atmos/upper) +"rFr" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/red/filled/corner, +/turf/open/floor/iron/dark/corner, +/area/station/security/prison/upper) "rFv" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -90938,21 +90762,21 @@ dir = 8 }, /area/station/hallway/secondary/entry) -"rGg" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 +"rGh" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/machinery/computer/quantum_console{ +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/soda_cans/pwr_game{ - pixel_x = -5; - pixel_y = 12 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rGl" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Launch Site" @@ -91045,12 +90869,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/parquet, /area/station/security/detectives_office) -"rGY" = ( -/obj/structure/closet/secure_closet/brig/genpop, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "rGZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, @@ -91250,16 +91068,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/dorms) -"rJc" = ( -/obj/machinery/camera/directional/north{ - c_tag = " Prison - Middle"; - dir = 2; - network = list("ss13","prison") - }, -/turf/open/floor/iron/stairs/left{ - dir = 4 +"rIX" = ( +/obj/machinery/computer/prisoner/gulag_teleporter_computer{ + dir = 8 }, -/area/station/security/prison) +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rJf" = ( /obj/structure/window/reinforced/tinted/spawner/directional/east, /obj/item/toy/plush/slimeplushie{ @@ -91270,18 +91084,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners, /turf/open/floor/iron/dark, /area/station/common/laser_tag) -"rJg" = ( -/obj/machinery/door/poddoor/preopen{ - id = "XenoOffice"; - name = "Xenobiology Lockdown Blast Doors" - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Toxins Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "rJh" = ( /obj/machinery/corral_corner{ mapping_id = "6" @@ -91328,11 +91130,6 @@ dir = 4 }, /area/station/hallway/secondary/entry) -"rJp" = ( -/obj/effect/turf_decal/vg_decals/numbers/two, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "rJC" = ( /obj/structure/disposalpipe/junction/flip{ dir = 2 @@ -91424,6 +91221,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +"rKP" = ( +/obj/structure/sign/departments/cargo, +/turf/closed/wall, +/area/station/security/prison/upper) "rKQ" = ( /obj/machinery/photocopier, /turf/open/floor/carpet, @@ -91671,19 +91472,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/ai_monitored/security/armory) -"rNU" = ( -/obj/machinery/door/airlock/research{ - name = "Cytology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/cytology) "rNV" = ( /obj/structure/railing{ dir = 8 @@ -91851,7 +91639,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/white, /area/station/commons/toilet/restrooms) "rPQ" = ( @@ -91868,15 +91655,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/fore/upper) -"rPU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "rPX" = ( /obj/structure/chair/wood{ dir = 8 @@ -92136,11 +91914,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/office) -"rTq" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain/bounty/start_closed, -/turf/open/floor/plating, -/area/station/security/bitden) "rTv" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/west, @@ -92178,19 +91951,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"rTQ" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Security - Perma Airlock"; - dir = 6 - }, -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/station/security/execution/transfer) "rUb" = ( /obj/machinery/button/curtain{ id = "prisoncell7"; @@ -92208,13 +91968,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"rUk" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "rUl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/closet_maintenance, @@ -92226,6 +91979,10 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) +"rUv" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rUA" = ( /obj/machinery/door/airlock/external{ space_dir = 8 @@ -92291,6 +92048,16 @@ }, /turf/open/floor/iron/dark, /area/station/science/auxlab/firing_range) +"rVz" = ( +/obj/effect/turf_decal/delivery/white{ + color = "#00ff00"; + name = "green" + }, +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "rVD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -92476,7 +92243,6 @@ /area/station/science/xenobiology) "rXp" = ( /obj/machinery/camera/autoname/directional/west, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/command) "rXr" = ( @@ -92527,22 +92293,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engineering/engine_aft_port) -"rXQ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/corner, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "rXY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -92698,6 +92448,24 @@ /obj/structure/table/wood, /turf/open/floor/grass, /area/station/medical/patients_rooms) +"rZz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/side, +/area/station/security/prison) +"rZC" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/security/prison) "rZG" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -93062,16 +92830,6 @@ /mob/living/basic/chicken/teshari, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) -"scV" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/obj/structure/chair/sofa/corp/left{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "sdh" = ( /obj/machinery/door/airlock/external{ name = "External Thrusters Access" @@ -93088,13 +92846,6 @@ "sdi" = ( /turf/open/floor/engine, /area/station/cargo/miningdock) -"sdq" = ( -/obj/structure/chair/office, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "sdu" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -93251,10 +93002,6 @@ "seM" = ( /turf/closed/wall, /area/station/cargo/miningoffice) -"seN" = ( -/obj/effect/spawner/random/trash/graffiti, -/turf/closed/wall, -/area/station/security/bitden) "seO" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -93403,15 +93150,6 @@ /obj/structure/window/fulltile, /turf/open/floor/grass, /area/station/hallway/primary/upper) -"sgv" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/structure/closet, -/obj/effect/spawner/random/medical/medkit, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "sgw" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -93696,6 +93434,10 @@ "sjA" = ( /turf/closed/wall, /area/station/service/bar/atrium) +"sjE" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/closed/wall, +/area/station/security/prison/upper) "sjF" = ( /obj/machinery/door/airlock/bathroom{ name = "Restroom" @@ -93761,6 +93503,24 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/lower) +"skk" = ( +/obj/effect/decal/cleanable/oil/slippery, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) +"skq" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenosecure"; + name = "Secure Pen Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Creature Pen"; + req_access = list("research") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "skx" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes{ @@ -93997,6 +93757,14 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/barber/spa) +"smY" = ( +/obj/structure/table, +/obj/item/screwdriver{ + pixel_y = 3 + }, +/obj/item/wirecutters, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "sna" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -94100,6 +93868,26 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"sof" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/upper) "soi" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -94188,7 +93976,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/machinery/atm/directional/north, /turf/open/floor/iron/dark/textured_edge{ dir = 1 }, @@ -94241,6 +94028,13 @@ "spO" = ( /turf/open/floor/iron/white, /area/station/science/genetics) +"spR" = ( +/obj/machinery/door/window/brigdoor/right/directional/east{ + name = "Crematorium"; + req_access = list("security") + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "spS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -94275,12 +94069,6 @@ }, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"sqr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/security/prison) "squ" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -94297,15 +94085,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/science/lower) -"sqL" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/light_switch/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "sqS" = ( /obj/structure/railing{ dir = 8 @@ -94412,6 +94191,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) +"srD" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/execution/transfer) "srJ" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark/side{ @@ -94481,6 +94267,17 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/lawoffice) +"sst" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "ssv" = ( /obj/machinery/growing/soil, /turf/open/floor/grass, @@ -94571,21 +94368,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/station/maintenance/abandon_wrestle) -"stw" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/item/storage/box/evidence{ - pixel_x = 9; - pixel_y = 8 - }, -/obj/item/storage/box/prisoner{ - pixel_x = 9 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "stz" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint" @@ -94626,15 +94408,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) -"stL" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "stP" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster/directional/north, @@ -94676,15 +94449,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) -"sub" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/stairs/right{ - dir = 8 - }, -/area/station/security/prison/upper) "suc" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -95120,6 +94884,15 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"sxI" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "sxJ" = ( /obj/structure/table, /obj/item/storage/photo_album, @@ -95200,19 +94973,6 @@ /obj/effect/decal/cleanable/food/flour, /turf/open/floor/iron/cafeteria, /area/station/common/wrestling/concessions) -"syG" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "syJ" = ( /turf/open/floor/iron, /area/station/engineering/lobby) @@ -95320,6 +95080,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark/small, /area/station/cargo/storage) +"sAv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad/secure, +/turf/open/floor/iron/white, +/area/station/security/medical) "sAy" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/grassy, @@ -95355,6 +95121,19 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) +"sAH" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/closed/wall/rust, +/area/station/security/prison/upper) +"sAN" = ( +/obj/effect/turf_decal/stripes/full, +/obj/effect/turf_decal/stripes/white/full, +/obj/machinery/door/poddoor/shutters{ + id = "securitydock2"; + name = "Security Dock 2" + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "sAW" = ( /obj/structure/railing{ dir = 8 @@ -95381,6 +95160,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) +"sBh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "sBj" = ( /obj/structure/window/spawner/directional/east, /obj/structure/flora/bush/jungle/a/style_3, @@ -95490,6 +95275,10 @@ /obj/structure/sign/departments/lawyer/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/central) +"sCh" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, +/area/station/security/prison/upper) "sCm" = ( /turf/closed/wall, /area/station/science/ordnance/office) @@ -95555,12 +95344,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"sCC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/prison) "sCE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -95748,11 +95531,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/dark, /area/station/service/bar/atrium) -"sEA" = ( -/obj/structure/closet/secure_closet/brig/genpop, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "sEF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -95914,15 +95692,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/plating, /area/station/security/courtroom) -"sFQ" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Shuttle Airlock" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "sFU" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/plating, @@ -95938,6 +95707,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"sGa" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "sGk" = ( /obj/structure/reagent_dispensers/fueltank{ pixel_y = 1 @@ -96049,6 +95822,14 @@ }, /turf/open/floor/wood, /area/station/service/library) +"sHr" = ( +/obj/structure/cable, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "sHt" = ( /turf/open/floor/iron/white, /area/station/medical/treatment_center) @@ -96129,6 +95910,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"sIg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) +"sIh" = ( +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/structure/window/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "sIk" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/random/maintenance, @@ -96145,12 +95940,6 @@ /obj/structure/hedge, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) -"sIx" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "sIz" = ( /turf/open/floor/iron, /area/station/hallway/primary/upper) @@ -96244,6 +96033,28 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"sJC" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/folder/yellow, +/obj/item/stamp/qm, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 6; + pixel_y = 16 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -4; + pixel_y = 16 + }, +/obj/item/hand_labeler_refill{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet/royalblack, +/area/station/command/heads_quarters/qm) "sJE" = ( /obj/machinery/light_switch{ pixel_y = 26 @@ -96557,6 +96368,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"sMb" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/station/security/prison) "sMd" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -96690,6 +96507,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/blueshield) +"sNl" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/obj/structure/chair/sofa/corp/corner, +/obj/machinery/light/small/blacklight/directional/east, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "sNn" = ( /obj/structure/trash_pile, /turf/open/floor/plating, @@ -96763,31 +96589,6 @@ }, /turf/open/floor/grass, /area/station/common/night_club/back_stage) -"sNV" = ( -/obj/structure/table/wood, -/obj/item/paper_bin/carbon{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/stamp{ - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/stamp/head/hop{ - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/stamp/denied{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/structure/cable, -/obj/machinery/recharger{ - pixel_x = 8; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "sNY" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ @@ -97122,6 +96923,13 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) +"sRx" = ( +/obj/structure/table, +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "sRD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -97205,12 +97013,6 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"sSw" = ( -/obj/structure/reagent_dispensers/plumbed{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/security/prison) "sSz" = ( /obj/structure/table/wood, /obj/item/taperecorder, @@ -97288,14 +97090,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/engineering/transit_tube) -"sTi" = ( -/obj/structure/cable, -/obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "sTk" = ( /turf/closed/wall, /area/station/service/theater) @@ -97308,6 +97102,13 @@ dir = 4 }, /area/station/science/xenobiology) +"sTA" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/security/medical) "sTB" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Controls" @@ -97341,6 +97142,20 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/maintenance/abandon_psych) +"sUe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "sUg" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ color = "#DE3A3A"; @@ -97609,6 +97424,12 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) +"sWd" = ( +/obj/structure/closet/secure_closet/brig/genpop, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/prison) "sWk" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt, @@ -97625,17 +97446,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"sWs" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/item/clothing/mask/cigarette/pipe/crackpipe, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) "sWA" = ( /turf/closed/wall, /area/station/service/janitor) @@ -97681,15 +97491,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) -"sWQ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/station_map/engineering/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "sWX" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -97700,11 +97501,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"sWY" = ( -/obj/structure/sign/departments/xenobio/directional/north, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/aft/upper) "sXb" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -97843,6 +97639,20 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"sYa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "sYd" = ( /obj/structure/sign/poster/contraband/have_a_puff/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -97879,6 +97689,20 @@ /obj/structure/flora/bush/flowers_pp, /turf/open/floor/grass, /area/station/hallway/primary/central) +"sYB" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/security/prison/upper) "sYE" = ( /mob/living/basic/chicken/brown{ forced_gender = "female" @@ -97985,15 +97809,6 @@ dir = 4 }, /area/station/command/secure_bunker) -"sZv" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/barricade/wooden/crude, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain/bounty/start_closed, -/turf/open/floor/iron/dark/herringbone, -/area/station/security/bitden) "sZz" = ( /turf/open/floor/plating, /area/station/maintenance/department/medical/central) @@ -98048,14 +97863,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"sZN" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "sZO" = ( /obj/structure/chair/sofa/corp{ dir = 8 @@ -98066,6 +97873,16 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"sZT" = ( +/obj/structure/chair/sofa/corp/right, +/obj/item/toy/katana{ + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "sZV" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, @@ -98081,6 +97898,16 @@ initial_gas_mix = "TEMP=2.7" }, /area/station/science/ordnance/bomb) +"tai" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/structure/chair/sofa/corp/left{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "tan" = ( /obj/machinery/door/airlock/security{ name = "Courtroom Tunnel" @@ -98096,6 +97923,13 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron, /area/station/command/teleporter) +"tax" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "tay" = ( /obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, @@ -98417,10 +98251,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"tcK" = ( -/obj/structure/sign/departments/cargo, -/turf/closed/wall, -/area/station/security/bitden) "tcL" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -98428,6 +98258,11 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/security/checkpoint/medical) +"tcM" = ( +/turf/open/floor/iron/stairs/right{ + dir = 4 + }, +/area/station/security/prison/upper) "tcS" = ( /obj/structure/girder, /obj/structure/grille/broken, @@ -98461,16 +98296,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology/control) -"tdp" = ( -/obj/structure/cable, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "tdr" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -98515,6 +98340,12 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"tdH" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/can, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "tdK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -98756,6 +98587,9 @@ dir = 8 }, /area/station/command/bridge) +"tfE" = ( +/turf/closed/wall/rust, +/area/station/security/prison/upper) "tfG" = ( /obj/structure/chair/plastic{ dir = 8 @@ -98813,6 +98647,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"tgc" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/red/filled/line{ + color = "#DE3A3A"; + dir = 5 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/security/prison/upper) "tgl" = ( /obj/item/kirbyplants/organic/plant22, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -98876,6 +98723,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/transit_tube) +"thg" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "thj" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/effect/spawner/random/maintenance, @@ -99272,20 +99124,13 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"tlW" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenosecure"; - name = "Secure Pen Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Creature Pen"; - req_access = list("research") +"tlT" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 6 }, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) +/area/station/security/prison) "tme" = ( /obj/effect/decal/cleanable/glass, /obj/effect/mapping_helpers/broken_floor, @@ -99517,14 +99362,6 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) -"ton" = ( -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/security/prison) "toq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/moisture, @@ -99540,6 +99377,33 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"toE" = ( +/obj/structure/table/wood, +/obj/item/folder/blue{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/folder/blue, +/obj/item/stamp/denied{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/stamp/captain{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/stamp{ + pixel_x = -6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/right/directional/west{ + name = "Captain's Desk"; + req_access = list("captain") + }, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/captain/private) "toI" = ( /obj/effect/spawner/random/trash/mess, /obj/effect/decal/cleanable/dirt, @@ -99947,14 +99811,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/science/circuits) -"ttR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/stairs/medium{ - dir = 8 - }, -/area/station/security/prison) "ttS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/duct, @@ -100015,13 +99871,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"tuy" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "tuC" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -100240,10 +100089,6 @@ }, /turf/open/floor/wood/parquet, /area/station/common/night_club) -"twJ" = ( -/obj/machinery/door/window/right/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "twL" = ( /obj/structure/chair{ dir = 4 @@ -100587,10 +100432,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"tzB" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/security/prison) "tzE" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -100701,13 +100542,6 @@ "tAj" = ( /turf/closed/wall, /area/station/hallway/secondary/entry) -"tAm" = ( -/obj/structure/rack, -/obj/item/pushbroom, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "tAn" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -100726,15 +100560,6 @@ "tAt" = ( /turf/closed/wall, /area/station/maintenance/department/crew_quarters/bar) -"tAv" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "tAw" = ( /obj/structure/table, /obj/item/restraints/handcuffs{ @@ -100979,10 +100804,6 @@ /obj/item/stamp, /turf/open/floor/iron/dark, /area/station/cargo/office) -"tCG" = ( -/obj/machinery/power/shuttle_engine/heater, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "tCJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -101287,10 +101108,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/security/courtroom) -"tGc" = ( -/obj/structure/curtain/bounty, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "tGf" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer4{ @@ -101298,6 +101115,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"tGg" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "Prison Gate"; + name = "Prison Blast Door" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison) "tGh" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -101353,36 +101179,6 @@ }, /turf/open/floor/iron/white, /area/station/science) -"tGO" = ( -/obj/machinery/button/flasher{ - id = "transferflash"; - pixel_y = -36 - }, -/obj/machinery/button/door{ - id = "permaouter"; - name = "Outer Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 6; - pixel_y = -25; - req_access = list("brig"); - specialfunctions = 4 - }, -/obj/machinery/button/door{ - id = "permainner"; - name = "Inner Bolt Control"; - normaldoorcontrol = 1; - pixel_x = -6; - pixel_y = -25; - req_access = list("brig"); - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/station/security/execution/transfer) "tHn" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, @@ -101568,13 +101364,6 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) -"tIC" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "tID" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 @@ -101701,13 +101490,6 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"tJY" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "tKi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -101757,7 +101539,6 @@ "tKH" = ( /obj/machinery/photocopier, /obj/structure/noticeboard/directional/north, -/obj/machinery/status_display/evac/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) "tKJ" = ( @@ -101835,20 +101616,6 @@ }, /turf/open/floor/iron/white, /area/station/science) -"tLF" = ( -/obj/effect/turf_decal/trimline/red/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 6 - }, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/station/security/execution/transfer) "tLI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -101882,6 +101649,19 @@ }, /turf/open/floor/iron/white, /area/station/medical/aslyum) +"tMc" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Security - Perma Airlock"; + dir = 6 + }, +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/security/prison) "tMh" = ( /obj/structure/bed{ dir = 1 @@ -101890,7 +101670,6 @@ dir = 1 }, /obj/effect/landmark/start/hangover, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/carpet/black, /area/station/commons/dorms/room5) "tMn" = ( @@ -101933,6 +101712,14 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"tMz" = ( +/obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/south, +/obj/machinery/computer/security/labor{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "tMA" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/smart/simple/general/visible, @@ -102003,6 +101790,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"tNa" = ( +/obj/structure/chair/comfy/barber_chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/prison) "tNg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -102025,22 +101819,6 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/central) -"tNm" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/rack, -/obj/item/clothing/suit/caution, -/obj/item/clothing/suit/caution, -/obj/item/clothing/suit/caution, -/obj/item/clothing/suit/caution, -/obj/item/mop, -/obj/item/mop, -/obj/item/pushbroom, -/obj/item/pushbroom, -/obj/item/reagent_containers/cup/bucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/storage/bag/trash, -/turf/open/floor/iron, -/area/station/security/prison) "tNn" = ( /obj/machinery/modular_computer/preset/civilian, /obj/effect/turf_decal/stripes, @@ -102307,10 +102085,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/upper) -"tPq" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/small, -/area/station/security/bitden) "tPs" = ( /obj/structure/frame/computer{ anchored = 1; @@ -102351,18 +102125,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, /area/station/engineering/atmos/hfr_room) -"tPP" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/machinery/recharger{ - pixel_x = 8; - pixel_y = 3 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "tPS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -102648,7 +102410,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/science/lower) "tSE" = ( -/obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "tSF" = ( @@ -102688,6 +102449,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"tSR" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/security/prison) "tSU" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/side{ @@ -102983,6 +102750,26 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"tWh" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/syndicate, +/obj/item/food/sandwich{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + desc = "Takes you to a whole new level of thinking."; + name = "Meta-Cider"; + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -14; + pixel_y = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/security/prison/upper) "tWi" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -103111,12 +102898,13 @@ /obj/machinery/duct, /turf/open/floor/wood, /area/station/medical/patients_rooms) -"tXV" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, +"tXW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/falsewall, +/turf/open/floor/plating, /area/station/security/prison/upper) "tXX" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -103386,27 +103174,25 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/security) +"ubj" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 5 + }, +/obj/machinery/computer/quantum_console{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ + pixel_x = -5; + pixel_y = 12 + }, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "ubp" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"uby" = ( -/obj/machinery/door/airlock/research{ - name = "Xenobiology Controll Room" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "XenoOffice"; - name = "Xenobiology Controll Room Shutters" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/control) "ubC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -103425,22 +103211,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos/hfr_room) -"ubI" = ( -/obj/machinery/button/door/directional/west{ - id = "prison release"; - name = "Labor Camp Shuttle Lockdown"; - req_access = list("brig") - }, -/obj/structure/chair/sofa/bench/right{ - dir = 4; - pixel_x = -5 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "ubU" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 6 @@ -103492,6 +103262,13 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/station/commons/dorms) +"ucn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "ucs" = ( /obj/effect/spawner/random/trash/box, /turf/open/floor/plating, @@ -103540,6 +103317,13 @@ /obj/machinery/door/window/right/directional/north, /turf/open/floor/wood, /area/station/service/theater) +"uda" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 4; + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "udb" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -103648,6 +103432,14 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/carpet/black, /area/station/service/barber) +"udR" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison) "udT" = ( /obj/effect/turf_decal/bot, /obj/machinery/conveyor_switch/oneway{ @@ -104207,13 +103999,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"uiP" = ( -/obj/structure/table, -/obj/machinery/power/shuttle_engine/propulsion{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "uiR" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -104394,6 +104179,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"ukA" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "ukD" = ( /obj/effect/turf_decal/stripes, /obj/structure/cable, @@ -104469,11 +104260,6 @@ /obj/structure/shipping_container/nakamura, /turf/open/floor/iron/dark/small, /area/station/cargo/miningdock) -"ula" = ( -/obj/structure/mirror/directional/north, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/black, -/area/station/security/execution/transfer) "ulc" = ( /obj/structure/window/reinforced/plasma/spawner/directional/north, /obj/machinery/power/shuttle_engine/heater{ @@ -104481,18 +104267,6 @@ }, /turf/open/floor/plating/airless, /area/station/maintenance/fore/upper) -"uld" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/fans/tiny/forcefield, -/obj/machinery/door/poddoor/preopen{ - id = "securityblast2"; - name = "Shuttle Bay Blast Door" - }, -/turf/open/floor/plating, -/area/station/security/prison/upper) "ulk" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -104639,6 +104413,14 @@ }, /turf/open/floor/carpet/blue, /area/station/command/captain_dining) +"ulK" = ( +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/east, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "ulM" = ( /obj/structure/closet/crate/bin, /obj/effect/spawner/random/trash/garbage, @@ -105076,6 +104858,26 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/service/chapel) +"uqs" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Controll Room" + }, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "XenoOffice"; + name = "Xenobiology Controll Room Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/control) "uqt" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -105109,6 +104911,49 @@ dir = 8 }, /area/station/hallway/primary/port) +"uqK" = ( +/obj/machinery/light/directional/south, +/obj/machinery/computer/security/labor{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Security - Flight Control"; + dir = 5 + }, +/obj/machinery/button/door{ + id = "securitydock1"; + name = "Security Dock 1 Shutters"; + pixel_x = 26; + pixel_y = -6; + req_access = list("armory") + }, +/obj/machinery/button/door{ + id = "securitydock2"; + name = "Security Dock 2 Shutters"; + pixel_x = 37; + pixel_y = -6; + req_access = list("armory") + }, +/obj/machinery/button/door{ + id = "securityblast1"; + name = "Dock 1 blast doors"; + pixel_x = 26; + pixel_y = 5; + req_access = list("security") + }, +/obj/machinery/button/door{ + id = "securityblast2"; + name = "Dock 2 blast doors"; + pixel_x = 37; + pixel_y = 5; + req_access = list("security") + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "uqL" = ( /obj/structure/closet/crate/bin, /obj/machinery/light_switch/directional/west, @@ -105208,13 +105053,6 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/shuttle/arrivals/airless, /area/space/nearstation) -"urO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "usb" = ( /obj/structure/flora/bush/fullgrass, /obj/structure/flora/bush/sunny, @@ -105367,6 +105205,19 @@ /obj/machinery/shower/directional/south, /turf/open/floor/iron/freezer, /area/station/commons/dorms/room5) +"utC" = ( +/obj/structure/bed/roller{ + dir = 1 + }, +/obj/item/bedsheet/medical, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) "utD" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 10 @@ -105465,6 +105316,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/hydroponics/garden/abandoned) +"uur" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/effect/spawner/random/trash/garbage, +/obj/item/food/pizzaslice/moldy/bacteria, +/obj/structure/closet/mini_fridge, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "uut" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -105514,6 +105376,16 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"uuZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Labor Camp Shuttle Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "uve" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -105568,15 +105440,6 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"uvH" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Flight Control" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron/stairs/old, -/area/station/security/prison/upper) "uvM" = ( /obj/structure/chair/office, /obj/effect/landmark/start/cargo_technician, @@ -105643,15 +105506,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"uwp" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "Prison Gate"; - name = "Prison Blast Door" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/execution/transfer) "uwr" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -105675,6 +105529,15 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/wood, /area/station/medical/psychology) +"uwC" = ( +/obj/item/kirbyplants/organic/plant21, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "uwH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -105685,6 +105548,12 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/science/genetics) +"uwI" = ( +/obj/effect/turf_decal/vg_decals/numbers/one, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "uwO" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -105942,6 +105811,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/upper) +"uzh" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "uzi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -105970,6 +105846,13 @@ "uzo" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/office) +"uzs" = ( +/obj/machinery/door/airlock/hatch{ + name = "Secure Pen" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/engine, +/area/station/science/xenobiology) "uzz" = ( /obj/structure/showcase/cyborg/old{ dir = 8; @@ -106028,6 +105911,21 @@ /obj/effect/turf_decal/vg_decals/numbers/one, /turf/open/floor/iron, /area/station/hallway/primary/port) +"uAq" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/folder/blue{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/folder/white, +/obj/item/stamp/cmo{ + pixel_y = 5 + }, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/cmo) "uAr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -106041,14 +105939,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"uAv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "uAI" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -106110,10 +106000,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"uBk" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/security/prison/upper) "uBm" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes{ @@ -106185,12 +106071,6 @@ /obj/structure/grandfatherclock, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) -"uBE" = ( -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "uBN" = ( /obj/structure/cable, /obj/machinery/duct, @@ -106226,12 +106106,6 @@ /obj/machinery/portable_atmospherics/pump, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"uBX" = ( -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/mechbay) "uCa" = ( /turf/closed/wall/r_wall, /area/station/maintenance/pool_maintenance) @@ -106277,11 +106151,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/abandon_exam/cat) -"uCt" = ( -/turf/open/floor/iron/stairs/right{ - dir = 4 - }, -/area/station/security/prison) "uCu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/button/door/directional/west{ @@ -106346,6 +106215,12 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"uCY" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "uDb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, @@ -106411,27 +106286,6 @@ /obj/effect/turf_decal/tile/yellow/full, /turf/open/floor/iron/large, /area/station/command/heads_quarters/ce) -"uDQ" = ( -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - id_tag = "xeno_airlock_exterior"; - name = "Xenobiology Lab External Airlock" - }, -/obj/machinery/door_buttons/access_button{ - idDoor = "xeno_airlock_exterior"; - idSelf = "xeno_airlock_control"; - name = "Access Button"; - pixel_x = 25; - req_access = list("xenobiology") - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology/hallway) "uDU" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/dark, @@ -106521,20 +106375,6 @@ }, /turf/open/floor/iron, /area/station/science/research) -"uEB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "uEE" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -106543,6 +106383,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"uEP" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/structure/railing, +/turf/closed/wall, +/area/station/security/prison/upper) "uEV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -106924,12 +106771,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/prison/safe) -"uIw" = ( -/obj/machinery/light/floor/has_bulb, -/obj/effect/turf_decal/bot_white, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "uID" = ( /obj/structure/cable, /obj/machinery/duct, @@ -106991,17 +106832,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva/upper) -"uJw" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/research) "uJz" = ( /obj/effect/spawner/random/trash/garbage, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -107156,13 +106986,6 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) -"uLc" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "uLe" = ( /obj/structure/chair{ dir = 1 @@ -107459,7 +107282,6 @@ name = "Command Chair"; req_access = list("command") }, -/obj/machinery/atm/directional/south, /turf/open/floor/iron, /area/station/command/bridge) "uOU" = ( @@ -107927,16 +107749,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"uTo" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "uTp" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/cable, @@ -108038,11 +107850,6 @@ dir = 1 }, /area/station/security/warden) -"uUr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/prison/upper) "uUt" = ( /obj/item/stack/sheet/plasmarglass{ amount = 2 @@ -108137,6 +107944,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/office) +"uVj" = ( +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) "uVm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -108422,12 +108234,6 @@ /obj/item/stack/cable_coil, /turf/open/floor/iron/dark, /area/station/maintenance/solars/port/fore) -"uYq" = ( -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/stamp/head/rd, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) "uYs" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -108628,17 +108434,23 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"vaq" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/iron/stairs/left{ - dir = 8 - }, -/area/station/security/prison/upper) "vaB" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/departments/botany/directional/east, /turf/open/floor/iron/stairs/right, /area/station/hallway/primary/central) +"vaE" = ( +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "vaK" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -108697,6 +108509,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"vbd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "vbj" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 8 @@ -108857,6 +108676,13 @@ }, /turf/open/floor/plating, /area/station/common/arcade) +"vdS" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "vdT" = ( /obj/structure/reflector/box, /turf/open/floor/plating, @@ -109079,11 +108905,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) -"vfS" = ( -/obj/effect/spawner/random/trash/mess, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "vfU" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -109245,6 +109066,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"vhs" = ( +/obj/effect/spawner/random/trash/moisture_trap, +/turf/open/floor/plating, +/area/station/security/prison/upper) "vhv" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -109488,12 +109313,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"vjG" = ( -/obj/item/kirbyplants/random, -/obj/machinery/airalarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/security/prison/upper) "vjJ" = ( /turf/closed/wall/r_wall, /area/station/science/cytology) @@ -109627,16 +109446,6 @@ /obj/item/storage/photo_album/library, /turf/open/floor/carpet, /area/station/service/library) -"vkA" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Prison Sanitarium" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/white/side, -/area/station/security/execution/transfer) "vkC" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -110023,10 +109832,6 @@ "vor" = ( /turf/closed/wall/rust, /area/station/maintenance/department/security) -"vot" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "voA" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -110062,13 +109867,6 @@ dir = 1 }, /area/station/hallway/primary/port) -"voJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "voN" = ( /obj/structure/sign/warning/vacuum/external/directional/west, /turf/closed/wall/r_wall, @@ -110080,15 +109878,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/xenobio_disposals) -"voR" = ( -/obj/machinery/door/airlock/research{ - name = "Cytology Lab" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "voV" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/conveyor_switch/oneway{ @@ -110255,6 +110044,16 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine, /area/station/command/secure_bunker) +"vqT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/bluespace_vendor/directional/east, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) "vqU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -110962,6 +110761,15 @@ dir = 4 }, /area/station/medical/medbay/lobby) +"vxj" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "vxk" = ( /obj/structure/rack/shelf, /obj/item/radio/intercom/directional/north, @@ -111298,14 +111106,6 @@ "vzh" = ( /turf/closed/wall, /area/station/maintenance/department/medical/central) -"vzl" = ( -/obj/structure/table, -/obj/item/screwdriver{ - pixel_y = 3 - }, -/obj/item/wirecutters, -/turf/open/floor/iron, -/area/station/security/prison/upper) "vzq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -111436,14 +111236,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating/airless, /area/space/nearstation) -"vAG" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/security/prison) "vAH" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -111452,6 +111244,21 @@ /obj/structure/flora/bush/lavendergrass, /turf/open/floor/grass, /area/station/hallway/primary/central) +"vAO" = ( +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/trash/garbage, +/obj/effect/spawner/random/contraband/prison, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/security/prison/upper) "vAT" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -111484,6 +111291,19 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"vBr" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "vBs" = ( /obj/effect/turf_decal/tile/red, /obj/structure/cable, @@ -111543,6 +111363,16 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/shuttle/arrivals/airless, /area/space/nearstation) +"vCl" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/security/prison) "vCp" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -111563,12 +111393,13 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"vCK" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/can, +"vCC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, /turf/open/floor/iron/dark/small, -/area/station/security/bitden) +/area/station/security/prison/upper) "vCM" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4; @@ -111646,13 +111477,16 @@ /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/west, -/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron, /area/station/science/breakroom) "vDO" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/common/cryopods) +"vDP" = ( +/obj/structure/chair/sofa/bench/left, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "vDR" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -111821,6 +111655,11 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"vFo" = ( +/obj/structure/decorative/shelf/crates1, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "vFr" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron, @@ -111871,14 +111710,6 @@ dir = 1 }, /area/station/command/heads_quarters/ce) -"vFQ" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "vFS" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/carpet, @@ -111901,11 +111732,10 @@ }, /turf/open/floor/iron/dark, /area/station/service/kitchen/coldroom) -"vGk" = ( -/obj/structure/table/reinforced/rglass, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/prison) +"vGh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible/layer4, +/turf/open/floor/plating, +/area/station/security/prison/upper) "vGm" = ( /obj/structure/toilet{ pixel_y = 10 @@ -111920,7 +111750,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/white, /area/station/commons/toilet/restrooms) "vGn" = ( @@ -112071,7 +111900,6 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/white, /area/station/medical/cryo) "vHQ" = ( @@ -112146,6 +111974,13 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/engineering/main) +"vIi" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "vIm" = ( /obj/structure/chair{ dir = 4 @@ -112268,6 +112103,10 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"vJe" = ( +/obj/structure/curtain/bounty, +/turf/open/floor/iron/dark, +/area/station/security/prison) "vJi" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/mapping_helpers/burnt_floor, @@ -112358,19 +112197,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"vKt" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) -"vKu" = ( -/obj/structure/table, -/obj/effect/spawner/random/decoration/ornament, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/security/prison) "vKI" = ( /turf/closed/wall/r_wall, /area/station/maintenance/abandon_wrestle) @@ -112692,6 +112518,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"vMY" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/light_switch/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "vNd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -112720,6 +112555,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/commons/dorms) +"vNi" = ( +/obj/machinery/prisongate, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/security/prison) "vNm" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -113185,10 +113025,6 @@ }, /turf/open/floor/plating, /area/station/command/captain_dining) -"vTa" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "vTd" = ( /obj/effect/decal/cleanable/oil, /obj/structure/cable, @@ -113302,19 +113138,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos/office) -"vTU" = ( -/obj/machinery/computer/prisoner/gulag_teleporter_computer{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) -"vTW" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 - }, -/obj/structure/railing, -/turf/closed/wall/rust, -/area/station/security/bitden) "vUa" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -113366,12 +113189,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"vUv" = ( -/obj/structure/closet/secure_closet/brig/genpop, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "vUz" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -113583,6 +113400,13 @@ /obj/machinery/light/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"vWk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/prison/upper) "vWp" = ( /obj/item/trash/syndi_cakes, /obj/structure/cable, @@ -113703,6 +113527,17 @@ name = "pool" }, /area/station/command/heads_quarters/captain/private) +"vYb" = ( +/obj/machinery/door/airlock/security/old{ + name = "Janitorial" + }, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "vYi" = ( /obj/structure/cable, /obj/machinery/power/emitter{ @@ -113785,27 +113620,11 @@ }, /turf/open/floor/wood, /area/station/service/library/printer) -"vZu" = ( -/obj/structure/closet/crate/trashcart/laundry, -/obj/effect/spawner/random/contraband/prison, -/obj/machinery/camera/directional/north{ - c_tag = " Prison - Custodial Closet"; - network = list("ss13","prison") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/spawner/random/contraband/prison, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison) +"vZt" = ( +/obj/effect/spawner/random/trash/mess, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "vZv" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -113815,20 +113634,6 @@ }, /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/command) -"vZz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible/layer4, -/turf/open/floor/plating, -/area/station/security/prison) -"vZD" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "vZI" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -113853,27 +113658,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"vZL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/execution/transfer) "vZN" = ( /obj/structure/chair/office/light{ dir = 4 @@ -113932,6 +113716,16 @@ /obj/structure/flora/bush/flowers_pp/style_2, /turf/open/floor/grass, /area/station/maintenance/port/fore) +"was" = ( +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/machinery/disease2/centrifuge, +/obj/item/reagent_containers/cup/beaker/vial, +/obj/item/reagent_containers/cup/beaker/vial, +/obj/item/reagent_containers/cup/beaker/vial, +/obj/item/reagent_containers/cup/beaker/vial, +/turf/open/floor/iron, +/area/station/medical/virology) "wax" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -113974,13 +113768,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/hydroponics/garden/abandoned) -"waW" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/prison/upper) "waY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/shuttle/evac/airless, @@ -114073,12 +113860,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/pool_maintenance) -"wbZ" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "wcf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -114193,13 +113974,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"wcM" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/station/security/prison/upper) "wcO" = ( /obj/effect/landmark/event_spawn, /obj/structure/flora/grass/jungle, @@ -114224,7 +113998,6 @@ dir = 8 }, /obj/machinery/light/directional/east, -/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "wde" = ( @@ -114305,6 +114078,21 @@ }, /turf/open/floor/wood, /area/station/hallway/primary/port) +"wdA" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "prisonlockdown3"; + name = "Lockdown" + }, +/obj/machinery/button/door{ + id = "prisonlockdown3"; + name = "Lockdown"; + pixel_x = 24; + req_access = list("security") + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "wdE" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -114736,27 +114524,6 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"whf" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 3 - }, -/obj/item/borg/sight/hud/sec{ - pixel_y = 17 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) -"whh" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "whj" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -114976,10 +114743,34 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/port/central) +"wjd" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/corner, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/upper) "wjj" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) +"wjv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/south, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark/side, +/area/station/security/prison) "wjw" = ( /obj/structure/cable, /obj/structure/sign/warning/vacuum/directional/west, @@ -115046,21 +114837,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"wkg" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prison Wing" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery/blue, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "wks" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -115358,6 +115134,24 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/dorms) +"wmS" = ( +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + id_tag = "xeno_airlock_interior"; + name = "Xenobiology Lab Internal Airlock" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/warning, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) "wmV" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -115631,17 +115425,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/aux_eva) -"wpP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/prison) "wpT" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, @@ -115840,49 +115623,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/herringbone, /area/station/security/brig) -"wrQ" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/security/labor{ - dir = 1 - }, -/obj/item/radio/intercom/directional/south, -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Security - Flight Control"; - dir = 5 - }, -/obj/machinery/button/door{ - id = "securitydock1"; - name = "Security Dock 1 Shutters"; - pixel_x = 26; - pixel_y = -6; - req_access = list("armory") - }, -/obj/machinery/button/door{ - id = "securitydock2"; - name = "Security Dock 2 Shutters"; - pixel_x = 37; - pixel_y = -6; - req_access = list("armory") - }, -/obj/machinery/button/door{ - id = "securityblast1"; - name = "Dock 1 blast doors"; - pixel_x = 26; - pixel_y = 5; - req_access = list("security") - }, -/obj/machinery/button/door{ - id = "securityblast2"; - name = "Dock 2 blast doors"; - pixel_x = 37; - pixel_y = 5; - req_access = list("security") - }, -/turf/open/floor/iron, -/area/station/security/prison/upper) "wrR" = ( /obj/effect/decal/cleanable/glass, /obj/structure/grille/broken, @@ -115913,6 +115653,16 @@ }, /turf/open/floor/plating, /area/station/cargo/drone_bay) +"wsg" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "prisonlockdown3"; + name = "Lockdown" + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "wsh" = ( /obj/item/kirbyplants/random, /obj/effect/mapping_helpers/broken_floor, @@ -115968,6 +115718,18 @@ }, /turf/open/floor/iron, /area/station/medical/storage) +"wsy" = ( +/obj/item/spear, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/obj/item/clothing/head/helmet/old{ + pixel_y = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "wsF" = ( /obj/structure/grille/broken, /turf/open/floor/plating, @@ -116207,6 +115969,13 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) +"wuE" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison/upper) "wuF" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/under/rank/cargo/miner, @@ -116250,11 +116019,6 @@ /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/plating, /area/station/maintenance/department/science/lower) -"wva" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "wvd" = ( /obj/structure/railing, /turf/open/floor/carpet, @@ -116368,14 +116132,6 @@ "www" = ( /turf/closed/wall, /area/station/maintenance/department/security/lesser) -"wwx" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/execution/transfer) "wwD" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/smooth_large, @@ -116440,6 +116196,11 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"wxH" = ( +/obj/structure/railing, +/obj/effect/spawner/random/trash/graffiti, +/turf/closed/wall/rust, +/area/station/security/prison/upper) "wxI" = ( /obj/structure/chair/office{ dir = 1 @@ -116481,11 +116242,6 @@ "wyc" = ( /turf/open/floor/carpet, /area/station/service/chapel/funeral) -"wyd" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "wyf" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -116947,13 +116703,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"wCm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/photobooth/security, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/security/execution/transfer) "wCw" = ( /obj/machinery/camera/directional/south{ c_tag = "Courtroom - Holding Cell" @@ -117112,6 +116861,14 @@ }, /turf/open/floor/carpet, /area/station/service/lawoffice) +"wDi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison) "wDj" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -117278,6 +117035,13 @@ name = "Padded tile" }, /area/station/medical/aslyum) +"wEJ" = ( +/obj/structure/closet/secure_closet/brig/genpop, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison) "wEM" = ( /obj/machinery/power/shuttle_engine/heater{ dir = 8 @@ -117432,20 +117196,6 @@ /obj/item/clothing/mask/breath, /turf/open/floor/plating/airless, /area/space/nearstation) -"wGq" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/station_map/engineering/directional/west, -/turf/open/floor/iron, -/area/station/commons/dorms) "wGx" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -117468,16 +117218,6 @@ }, /turf/open/floor/iron, /area/station/service/bar/atrium) -"wGG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Shuttlebay" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron, -/area/station/security/prison/upper) "wGO" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating, @@ -117621,13 +117361,6 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /turf/open/floor/iron/dark/side, /area/station/security/brig) -"wIB" = ( -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/prison) "wIE" = ( /turf/open/floor/iron, /area/station/maintenance/abandon_holding_cell) @@ -117693,6 +117426,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"wJg" = ( +/obj/machinery/button/door/directional/west{ + id = "prison release"; + name = "Labor Camp Shuttle Lockdown"; + req_access = list("brig") + }, +/obj/structure/chair/sofa/bench/right{ + dir = 4; + pixel_x = -5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "wJj" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -117732,6 +117481,24 @@ /obj/machinery/light/directional/west, /turf/open/floor/carpet, /area/station/science/ordnance/office) +"wJB" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light_switch/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/stack/medical/mesh{ + pixel_x = -6 + }, +/obj/item/healthanalyzer/simple{ + pixel_y = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "wJQ" = ( /obj/structure/chair/office{ dir = 8 @@ -117997,10 +117764,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"wMG" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron, -/area/station/security/prison/upper) "wMN" = ( /obj/structure/chair/sofa/bench/right{ dir = 8; @@ -118171,6 +117934,11 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"wOH" = ( +/obj/effect/turf_decal/stripes, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "wOR" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch{ @@ -118567,6 +118335,13 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/department/science/upper) +"wSj" = ( +/obj/machinery/power/shuttle_engine/propulsion, +/obj/structure/fluff/big_chain{ + pixel_y = 30 + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "wSn" = ( /obj/structure/closet{ name = "security locker" @@ -118763,9 +118538,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /obj/machinery/light/directional/north, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) "wUv" = ( @@ -118890,6 +118665,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"wWj" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "wWk" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/airalarm/directional/south, @@ -118938,13 +118720,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark/side, /area/station/maintenance/department/engineering/engine_aft_starboard) -"wWS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/prison) "wWZ" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/wood{ @@ -118996,13 +118771,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/medical/morgue) -"wXp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "wXw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -119041,11 +118809,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/detectives_office) -"wYg" = ( -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "wYj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -119197,6 +118960,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"wZr" = ( +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Maintenance" + }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "Airmix Reserve to Distribution" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/security/prison/upper) "wZt" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -119243,10 +119017,6 @@ }, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) -"wZP" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/security/prison/upper) "wZQ" = ( /turf/closed/wall, /area/station/service/kitchen/coldroom) @@ -119257,6 +119027,18 @@ }, /turf/open/floor/iron/white/telecomms, /area/station/tcommsat/server) +"wZT" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + name = "Security Mech Garage Door Controls"; + id = "SecMech"; + req_access = list("security") + }, +/obj/machinery/recharge_station, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) "wZW" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -119266,12 +119048,6 @@ dir = 1 }, /area/station/hallway/secondary/command) -"wZY" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "xah" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -119452,13 +119228,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/solars/starboard/fore) -"xce" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "xcn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -119579,10 +119348,6 @@ dir = 8 }, /area/station/hallway/primary/upper) -"xdA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/r_wall, -/area/station/security/medical) "xdB" = ( /obj/structure/table/reinforced, /obj/item/folder/blue, @@ -119681,18 +119446,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"xeF" = ( -/obj/structure/table, -/obj/item/poster/random_official{ - pixel_y = 10 - }, -/obj/item/poster/random_official, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/mechbay) "xeQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Teleporter Maintenance" @@ -119813,17 +119566,6 @@ /obj/item/construction/rcd, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva/upper) -"xgc" = ( -/obj/machinery/firealarm/directional/north{ - pixel_x = -22 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/security/execution/transfer) "xgg" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/turf_decal/bot, @@ -120193,6 +119935,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/common/pool/sauna) +"xkm" = ( +/obj/structure/table/reinforced/rglass, +/obj/structure/mirror/directional/west, +/obj/machinery/light/directional/west, +/obj/item/scissors, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "xko" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -120366,14 +120117,6 @@ }, /turf/open/floor/wood, /area/station/service/bar/atrium) -"xma" = ( -/obj/structure/table/rolling, -/obj/item/wrench{ - pixel_y = 3 - }, -/obj/item/crowbar, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "xml" = ( /obj/item/trash/pistachios, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -120557,13 +120300,6 @@ }, /turf/open/floor/grass, /area/station/command/heads_quarters/nt_rep) -"xoi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/plumbed{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "xon" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 4 @@ -120593,18 +120329,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"xoA" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "xoC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -120640,18 +120364,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"xoN" = ( -/obj/item/spear, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/obj/item/clothing/head/helmet/old{ - pixel_y = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "xoO" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, @@ -120860,7 +120572,6 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "xrl" = ( @@ -120897,6 +120608,12 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"xrF" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/security/prison/upper) "xrI" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -121026,14 +120743,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/sorting) -"xsB" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/station_map/engineering/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "xsC" = ( /obj/item/stack/ore/iron, /turf/open/floor/plating/airless, @@ -121093,12 +120802,6 @@ dir = 8 }, /area/station/science/explab) -"xtc" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/execution/transfer) "xtd" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/engine, @@ -121149,6 +120852,11 @@ }, /turf/open/floor/wood, /area/station/security/courtroom) +"xtG" = ( +/obj/structure/table/reinforced/rglass, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/security/prison/upper) "xtI" = ( /obj/structure/flora/tree/jungle/small, /turf/open/floor/grass, @@ -121328,11 +121036,6 @@ dir = 1 }, /area/station/security/brig) -"xuQ" = ( -/turf/open/floor/iron/stairs{ - dir = 1 - }, -/area/station/security/prison) "xuR" = ( /obj/structure/filingcabinet/security, /obj/machinery/camera/directional/east{ @@ -121344,6 +121047,13 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +"xuV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/opposingcorners, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "xuX" = ( /obj/machinery/computer/shuttle/mining, /obj/effect/turf_decal/tile/brown, @@ -121352,10 +121062,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"xuY" = ( -/obj/machinery/station_map/engineering/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "xva" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -121399,6 +121105,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"xvo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison/upper) "xvy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -121555,6 +121270,17 @@ "xxp" = ( /turf/closed/wall/rust, /area/station/maintenance/library/lower) +"xxz" = ( +/obj/machinery/computer/cryopod{ + dir = 1; + pixel_y = -30 + }, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/upper) "xxH" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -121713,6 +121439,11 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, /area/station/medical/cryo) +"xzF" = ( +/turf/open/floor/iron/stairs/left{ + dir = 8 + }, +/area/station/security/prison/upper) "xzG" = ( /obj/effect/landmark/start/medical_doctor, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -121803,6 +121534,25 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +"xAL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/corner, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "xAU" = ( /obj/effect/turf_decal/stripes, /obj/machinery/light/directional/south, @@ -122394,14 +122144,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"xGu" = ( -/obj/structure/chair/office, -/obj/structure/window/spawner/directional/west, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "xGF" = ( /obj/structure/table/wood/poker, /obj/effect/decal/cleanable/dirt, @@ -122557,6 +122299,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"xIb" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "xIf" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/computer/shuttle/mining/common{ @@ -122788,7 +122534,6 @@ /area/station/maintenance/rus_gambling) "xKH" = ( /obj/machinery/cassette/mailbox, -/obj/machinery/atm/directional/north, /turf/open/floor/wood, /area/station/service/library) "xKK" = ( @@ -122927,7 +122672,6 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/west, -/obj/machinery/atm/directional/west, /turf/open/floor/iron, /area/station/commons/dorms) "xMj" = ( @@ -123021,7 +122765,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atm/directional/south, /turf/open/floor/iron/white/corner{ dir = 8 }, @@ -123054,6 +122797,12 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"xNm" = ( +/obj/machinery/light/floor/has_bulb, +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "xNy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/liquids_spawner, @@ -123348,12 +123097,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/wood, /area/station/hallway/primary/central) -"xQJ" = ( -/obj/effect/turf_decal/bot, -/obj/structure/cable, -/obj/machinery/disease2/centrifuge, -/turf/open/floor/iron, -/area/station/medical/virology) "xQR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -123364,8 +123107,8 @@ }, /area/station/security/interrogation) "xQS" = ( +/obj/machinery/light_switch/directional/south, /obj/machinery/camera/autoname/directional/south, -/obj/machinery/atm/directional/south, /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) "xQY" = ( @@ -123488,10 +123231,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"xSI" = ( -/obj/item/clothing/head/utility/hardhat, -/turf/open/floor/plating, -/area/station/security/prison/upper) "xSK" = ( /turf/open/floor/iron/white/side{ dir = 4 @@ -123555,7 +123294,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron, /area/station/science/research) "xTr" = ( @@ -123612,20 +123350,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/upper) -"xUa" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/security/prison) "xUb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -124037,6 +123761,17 @@ "xYg" = ( /turf/open/floor/iron/grimy, /area/station/maintenance/starboard/fore) +"xYh" = ( +/obj/machinery/gulag_item_reclaimer{ + pixel_x = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Prisoner Labor Transfer Dock" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "xYm" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -124142,26 +123877,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"xZe" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/red, -/obj/item/storage/box/bodybags{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/storage/box/prisoner{ - pixel_x = -4 - }, -/obj/item/radio/intercom/directional/west, -/obj/item/pushbroom, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "xZi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -124229,6 +123944,7 @@ /area/station/engineering/main) "xZS" = ( /obj/effect/turf_decal/bot, +/obj/machinery/status_display/ai/directional/south, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/science/auxlab/firing_range) @@ -124571,12 +124287,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) -"ycG" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/security/execution/transfer) "ycI" = ( /obj/machinery/light/small/directional/north, /obj/machinery/duct, @@ -124803,6 +124513,12 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) +"yez" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) "yeC" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -125047,13 +124763,6 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/white, /area/station/command/gateway) -"ygH" = ( -/obj/structure/cable, -/obj/item/electronics/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "ygI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/window/preopen{ @@ -125233,11 +124942,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery) -"yie" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/red, -/turf/open/floor/iron/dark/small, -/area/station/security/prison) "yif" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ @@ -125275,6 +124979,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/science/auxlab/firing_range) +"yiy" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/dark/small, +/area/station/security/prison/upper) "yiA" = ( /obj/machinery/computer/slot_machine, /turf/open/floor/plating, @@ -125379,11 +125091,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, /area/station/security/courtroom) -"yjg" = ( -/obj/machinery/light_switch/directional/north, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "yjp" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -125439,25 +125146,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"ykv" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) -"ykx" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/station_map/engineering/directional/south, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) "yky" = ( /obj/item/assembly/shock_kit, /obj/structure/rack, @@ -125608,6 +125296,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"ymb" = ( +/obj/effect/turf_decal/trimline/red/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/line, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison/upper) "ymf" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -146488,14 +146185,14 @@ egv iKs iKs iKs -lSv -lSv -lSv -lSv -lSv -lSv +mjE +mjE +mjE +mjE +mjE +mjE gLI -lSv +mjE ltN cDn cDn @@ -146745,14 +146442,14 @@ iKs iKs fZI exN -lSv -riE -bfk -jcg -riE -cKc -waW -lSv +mjE +bba +hLH +euE +bba +hHM +chC +mjE ltN ltN fNe @@ -147002,14 +146699,14 @@ bsG bsG fZI sJq -lSv -jcg -cCU -dhi -jcg -bfk -waW -lSv +mjE +euE +inc +rUv +euE +hLH +chC +mjE ylg frJ uWm @@ -147258,21 +146955,21 @@ fZI fZI bsG bsG -lSv -lSv -dLD -dLD -dLD -dLD -dLD -cBJ -lSv -lSv -lSv -lSv -lSv -lSv -lSv +mjE +mjE +iIe +iIe +iIe +iIe +iIe +moF +mjE +mjE +mjE +mjE +mjE +mjE +mjE bbm aXM ltX @@ -147515,21 +147212,21 @@ fZI fZI fZI fZI -uld -neq -jcg -jcg -jcg -jcg -jcg -vot -nom -jvw -jcg -cUG -pKo -jcg -ixc +bng +rfs +euE +euE +euE +euE +euE +iHC +iRJ +skk +euE +hce +sAN +euE +gKk bbm dfX uCl @@ -147772,21 +147469,21 @@ fZI fZI fZI fZI -uld -jcg -huh -jcg -jcg -xma -jcg -vot -jcg -jcg -jcg -jcg -pKo -jcg -jcg +bng +euE +faw +euE +euE +cQf +euE +iHC +euE +euE +euE +euE +sAN +euE +euE bbm jVT cBY @@ -148029,21 +147726,21 @@ fZI fZI fZI fZI -uld -jcg -jcg -jcg -mbb -jcg -rJp -vot -uIw -vot -vot -vot -pBy -vot -eSm +bng +euE +euE +euE +qdQ +euE +eTL +iHC +xNm +iHC +iHC +iHC +mQE +iHC +pYt bbm bmN nct @@ -148286,21 +147983,21 @@ fZI fZI fZI fZI -uld -jcg -jcg -cCU -jcg -jcg -jcg -jcg -jcg -tCG -hbX -jcg -pKo -jcg -vot +bng +euE +euE +inc +euE +euE +euE +euE +euE +fri +wSj +euE +sAN +euE +iHC bbm oRy igP @@ -148543,21 +148240,21 @@ fZI fZI fZI fZI -uld -nJN -jcg -jcg -jcg -huh -jcg -jcg -mgC -jcg -jcg -gnd -pKo -jcg -vot +bng +qxT +euE +euE +euE +faw +euE +euE +nOQ +euE +euE +cgu +sAN +euE +iHC bbm bbm bbm @@ -148799,28 +148496,28 @@ fZI fZI fZI fZI -lSv -lSv -ppu -pXf -pXf -oya -rUk -huc -huh -qPi -lqF -qPi -lWC -lWC -mfG -wyd -wMG -cgO -pYU -lWC -uBk -lSv +mjE +mjE +kzx +doG +doG +eTH +iNB +feJ +faw +mhN +bdt +mhN +hZI +hZI +jLj +glU +eDx +grX +vFo +hZI +mfh +mjE cXk rYT mWp @@ -149056,28 +148753,28 @@ fZI fZI fZI fZI -hmu -dIh -mfN -gAp -uiP -vzl -eka -pXf -pXf -qPi -tPP -lqy -mgS -uvH -vot -wyd -jcg -jcg -jcg -meR -jcg -fTu +oql +rGh +jHK +aIF +iFX +smY +ejd +doG +doG +mhN +ciS +wOH +odg +dVC +iHC +glU +euE +euE +euE +rme +euE +iQb tcI mzK rKn @@ -149313,28 +149010,28 @@ fZI fZI fZI fZI -hmu -lPS -mfN -jMu -pas -rcA -eka -cmx -cmx -qPi -pTb -vKt -wrQ -lWC -yjg -wyd -jcg -jcg -jcg -meR -jcg -fTu +oql +qIZ +jHK +miw +sRx +mIY +ejd +msT +msT +mhN +rdz +ixK +uqK +hZI +mfE +glU +euE +euE +euE +rme +euE +iQb tcI ctM vpO @@ -149570,28 +149267,28 @@ fZI fZI fZI fZI -lSv -lSv -mFF -cmx -cmx -eCl -iqd -nNy -jcg -qPi -oMa -qPi -lWC -lWC -hTj -wZY -wMG -nCL -bbZ -lWC -wZP -lSv +mjE +mjE +occ +msT +msT +wWj +lMz +jpA +euE +mhN +mHe +mhN +hZI +hZI +aSL +sBh +eDx +lgZ +ewk +hZI +sGa +mjE wMc rYT xyx @@ -149828,27 +149525,27 @@ fZI fZI fZI fZI -fqv -neq -jcg -jcg -jcg -jcg -kOy -jcg -jcg -jcg -jcg -cUG -mzi -jcg -wZY -qPi -qPi -qPi -lWC -lWC -lSv +cHs +rfs +euE +euE +euE +euE +oyI +euE +euE +euE +euE +hce +mKJ +euE +sBh +mhN +mhN +mhN +hZI +hZI +mjE rKn pEk mWp @@ -150085,27 +149782,27 @@ fZI fZI fZI fZI -fqv -jcg -huh -jcg -jcg -jcg -kOy -cCU -jcg -jcg -jcg -jcg -mzi -jcg -wZY -qPi -hwo -nSZ -tuy -aMk -lSv +cHs +euE +faw +euE +euE +euE +oyI +inc +euE +euE +euE +euE +mKJ +euE +sBh +mhN +jYd +dQz +lWM +uzh +mjE iNU rYT rtp @@ -150342,27 +150039,27 @@ fZI fZI fZI fZI -fqv -jcg -jcg -jcg -mbb -jcg -bhs -jcg -mbb -jcg -jcg -cCU -mzi -jcg -kXj -lWC -qds -uBE -fPs -ini -lSv +cHs +euE +euE +euE +qdQ +euE +uwI +euE +qdQ +euE +euE +inc +mKJ +euE +sHr +hZI +oih +ghV +gly +ulK +mjE qaa rYT eKa @@ -150599,27 +150296,27 @@ fZI fZI fZI fZI -fqv -jcg -jcg -jcg -jcg -cCU -kOy -jcg -huh -jcg -jcg -jcg -mzi -jcg -ygH -rrW -mfN -aAZ -bCW -xGu -lSv +cHs +euE +euE +euE +euE +inc +oyI +euE +faw +euE +euE +euE +mKJ +euE +bYs +kKk +jHK +fvF +oWD +dnO +mjE rYi rYT rKn @@ -150856,31 +150553,31 @@ fZI fZI fZI fZI -fqv -nJN -jcg -qEl -jcg -jcg -kOy -jcg -bwU -qEl -jcg -gnd -mzi -jcg -wZY -lWC -rrL -xSI -qSr -sdq -lSv +cHs +qxT +euE +piH +euE +euE +oyI +euE +kWs +piH +euE +cgu +mKJ +euE +sBh +hZI +aSZ +reQ +eKF +gPp +mjE ofH -wYg -eBw -xoi +laf +hXY +etj rKn xrJ ejO @@ -151113,29 +150810,29 @@ fZI fZI mcS hQc -lSv -lWC -qPi -lWC -gmR -lWC -lxT -lWC -lpB -lWC -qPi -lWC -lWC -vaq -sub -lWC -lSv -nkM -nkM -nkM -lSv -hFV -paT +mjE +hZI +mhN +hZI +uuZ +hZI +bsN +hZI +qrh +hZI +mhN +hZI +hZI +inl +cyc +hZI +mjE +pSi +pSi +pSi +mjE +wVz +rYT rKn rKn rKn @@ -151372,35 +151069,35 @@ mcS brg gBn ebG -aod -bzd -vot -qPi -qqg -qPi -vot -drN -dIC -lWC -sTi -whh -pKI -sqL -lSv -qPi -qPi -qPi -lSv -wYg -gWy -eBw -vfS -pME -eBw -eBw +dwK +mgt +iHC +mhN +vUC +mhN +iHC +xYh +aHZ +hZI +qBh +phD +aCT +vMY +mjE +mhN +mhN +mhN +mjE +laf +dAg +hXY +mjK +kbf +eKa +eKa tNz -xeF -doI +bop +dTy fYr kxe dyS @@ -151629,38 +151326,38 @@ mcS aSr mcS ebG -cIT -aub -ruf -qPi -pNz -qPi -jHS -lWC -sFQ -lWC -exg -mRr -vFQ -aWf -qPi +vDP +peU +iCC +mhN +yfU +mhN +fJP +hZI +gAV +hZI +pBb +oDh +kow +pps +mhN xVt cFu poD hGf -obF +pRF fAy rKn -bii -bii -bii -oRx -bii -cZT -uBX +rKn +kif +tPT +ufv +tNz +wZT bAo bAo -azm +bAo +lHT cZT lSs qDO @@ -151886,33 +151583,33 @@ mcS als dkM ebG -lWC -nim -lWC -lWC -wGG -lWC -qPi -lWC -fej -lWC -qQx -twJ -wva -kXq -lSv +hZI +mEr +hZI +hZI +nJe +hZI +mhN +hZI +osb +hZI +pPF +oBL +hxO +tMz +mjE cYq saz nnK hGf -paT -vfS -hNf -bii -dOd -qzZ -puP -dRF +rYT +mjK +wMc +rKn +tNz +tNz +cue +tNz cZT hAz nDO @@ -152143,33 +151840,33 @@ hjL uLe fDq ebG -vjG -uUr -jVM -aLE -qqg -lWC -qBV -ubI -cZN -qPi -whh -rhP -sZN -wbZ -lSv +iRb +xJs +jMz +sIh +vUC +hZI +uda +wJg +cFI +mhN +phD +kYo +lMR +oUI +mjE dsA nwj pAF hGf rYT -cXS -oBU -bii -nJo -maC -kpa -qPB +wno +kbf +thg +tNz +kcW +cAi +bVB yiK ipO eSi @@ -152400,21 +152097,21 @@ hjL btQ iuU lzN -fSD -bBR -ihA -bag -ihA -gtc -ihA -bag -wcM -mXJ -pKI -nmU -whf -tXV -qPi +akv +qby +jvQ +qnt +jvQ +iuT +jvQ +qnt +xuV +bPE +aCT +hef +rdj +srD +mhN cYq nwj nnK @@ -152422,11 +152119,11 @@ hGf rYT kbf cXk -xdA -lmp -krL -kFJ -mNo +kbf +tNz +piE +sAv +sTA fxE enO vNg @@ -152657,33 +152354,33 @@ hjL lhI iuU mcS -lSv -lSv -vTU -qZW -stw -lWC -jNW -iKO -fsV -qPi -vZD -aSJ -aSJ -nlW -knE +mjE +mjE +rIX +rnl +bUp +hZI +obJ +eLF +fgg +mhN +fHM +qlC +qlC +mXO +pKX wQP asc nnK hGf uTp hGf +hGf nLa -bii -evF -aDo -hyH -eYn +hGf +wJB +aiV +ewr yiK aEA qTW @@ -152914,30 +152611,30 @@ mcS ptx bbi nZp -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv -lSv +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE +mjE kts lTN nnK hGf mZP hGf +piO cyK -bii -bii +hGf bii bii bii @@ -153193,8 +152890,8 @@ euj eAn mrc fOy -kqq -feC +kdE +ckZ tbW tbW qZQ @@ -153970,7 +153667,7 @@ gdj lBJ lBJ gdj -nSB +cYq pvr sXy fAw @@ -154088,7 +153785,7 @@ qhV wTj jmk uDH -oKh +bqH dFZ fhB kLf @@ -154577,7 +154274,7 @@ bkw ail wGh slp -xsB +amx uTj xMs lwf @@ -155535,7 +155232,7 @@ csj uiE ceg mOg -jWC +knY mME ntd qGV @@ -157031,7 +156728,7 @@ fZI ugq mbg sjx -pap +dqS lRD eEZ nHB @@ -161250,7 +160947,7 @@ sNz sNz sNz sNz -egV +sNz pSa rfv bTx @@ -161416,11 +161113,11 @@ cLU bIr caW lWh -mjE -lQh -lmF -xZe -mjE +fBz +etR +ewH +jYm +fBz guH koJ iLK @@ -161673,22 +161370,22 @@ cLU cLU cLU qlm -mjE -pco -euE -tIC -mjE +fBz +qGZ +nCt +vdS +fBz iLK iLK iLK -uwp -bfU -uwp -mjE -fzp -mjE -mjE -mjE +tGg +gZf +tGg +fBz +rlG +fBz +fBz +fBz ltC jte jte @@ -161928,24 +161625,24 @@ usE qeT ktT cLU -ycG -sIx -xtc -ykv -kVR -oLZ -tAv -hVv -bjD -mhN -xgc -voJ -aIm -mhN -caP -aQX -aaZ -mjE +nJY +pQr +uCY +rZC +spR +mzV +vxj +ssh +dDf +chV +plQ +qHK +pVI +chV +nhb +ukA +nMV +fBz iwe ogh ixJ @@ -162001,7 +161698,7 @@ wtf bZp qBm uoz -oXl +sJC lUP vms aky @@ -162185,24 +161882,24 @@ ciT ciT jfR rVN -rEN -yfU -yfU -yfU -xce -qnt -ohJ -hFz -nYK -qPw -eQX -ina -jNo -mhN -ouA -jhe -iPY -mjE +lBj +mHx +mHx +mHx +cLP +juD +mYn +eWy +rZz +hZz +mgu +rSs +pUq +chV +kas +bvl +qNF +fBz wJa oNH oUt @@ -162442,24 +162139,24 @@ usE jqG mKX cLU -rhd -uAv -exx -fqB -ocU -ocU -tJY -fps -aYv -mhN -rTQ -ccW -kRE -mhN -ouA -hZe -sgv -mjE +jUg +wDi +rwX +sxI +dnD +dnD +ouK +ilY +tlT +chV +tMc +tax +aoI +chV +kas +qwc +ltK +fBz mne qzO qzO @@ -162704,19 +162401,19 @@ cwO eKU eKU eKU -mjE -mjE -mjE -mjE -mjE -mhN -wkg -mhN -mjE -uTo -mVR -oaW -mjE +fBz +fBz +fBz +fBz +fBz +chV +pai +chV +fBz +vCl +yez +rbJ +fBz jId erj cHP @@ -162961,19 +162658,19 @@ oqu knV eoX eKU -gSN -mjE -sEA -sEA -rGY -wCm -mcr -fSX -mjE -wwx -hlJ -fOf -mjE +sMb +fBz +jSV +jSV +hbD +cuh +rhp +oiU +fBz +ePN +nCO +joM +fBz jte wJl jte @@ -163218,19 +162915,19 @@ voj tim tim eKU -ula -tGc -dGm -jHK -jHK -jHK -yfU -yfU -vkA -aDf -lnD -otH -mjE +fRu +vJe +uVj +lmI +lmI +lmI +mHx +mHx +ojW +udR +utC +lfI +fBz qjr sCM qlI @@ -163475,19 +163172,19 @@ keD sHg ojn eKU -mjE -mjE -nKO -vUv -qmO -gzb -ina -bLp -mjE -mjE -mjE -mjE -mjE +fBz +fBz +qpU +sWd +wEJ +fPm +rSs +boS +fBz +fBz +fBz +fBz +fBz gaz xgN hEu @@ -163732,19 +163429,19 @@ evJ jTj jZN eKU -gSN -mjE -anf -anf -hjb -cCh -ina -hri -mjE -bci -ifM -eCX -mjE +sMb +fBz +nCJ +nCJ +qRV +biV +rSs +wjv +fBz +cpw +xkm +jXV +fBz pxu hEu rES @@ -163989,19 +163686,19 @@ uCB tTy xEA eKU -ula -tGc -dGm -jHK -jHK -vUC -yfU -yfU -haA -xJs -gDP -bwi -mjE +fRu +vJe +uVj +lmI +lmI +dUF +mHx +mHx +pir +jxr +tNa +tSR +fBz mrV vGn dVy @@ -164246,19 +163943,19 @@ qvK wbc hCX eKU -mjE -mjE -sEA -sEA -rGY -dSa -urO -tGO -mjE -kjl -tAm -stL -mjE +fBz +fBz +jSV +jSV +hbD +eMK +qUg +qdm +fBz +joC +fbS +uwC +fBz qgy hEu kqd @@ -164500,18 +164197,18 @@ qvK wDK wDK hZE -nfH -cDV -juI +dwO +sUe +pRI fLW fLW fLW fLW fLW -aRP -mhN -jtX -mjE +bxW +chV +vNi +fBz cIP cIP cIP @@ -164757,18 +164454,18 @@ kkM fzZ qGh aFR -wpP -vTa -olx +pWt +dHq +rtH hCF sOD upE mVi fLW -aFN -cGn -kMa -mjE +cdU +xAL +rFW +fBz qHR tVI jqr @@ -165014,18 +164711,18 @@ cfv ygo rvW ykH -wpP -yie -olx +pWt +oyy +rtH hCF wos sCo ybd fLW -gsE -vZL -tLF -mjE +bQp +pSF +gSL +fBz kXG jPh tVI @@ -165271,18 +164968,18 @@ eNX vfL oSo hZE -moD -qBU -nfl +fqM +sIg +geu fLW sOD upE lwp fLW -aRP -mhN -jtX -mjE +bxW +chV +vNi +fBz jxo jxo jxo @@ -165528,18 +165225,18 @@ obs qrD bjv lCu -wpP -jTp -olx +pWt +jUN +rtH hCF wos sCo kIH lkS -roj -rXQ -rFW -fWC +icN +wjd +sYB +hmu aYN eEq lWL @@ -165776,8 +165473,8 @@ xqy hwT xUM tKm -bLP -nCt +nUH +jcg hZE bpN fIr @@ -165785,18 +165482,18 @@ pXe pnj iUM xPu -wpP -jTp -olx +pWt +jUN +rtH hCF lIC jYJ kIH lkS -bQp -gqm -gSL -fWC +qgb +sof +gXf +hmu aYN qUa nnC @@ -166033,8 +165730,8 @@ wnF wVn hss aef -bLP -nCt +nUH +jcg hZE luD dmS @@ -166042,19 +165739,19 @@ hZE oUs qjb hZE -wpP -aKW -ton +pWt +kUy +gkk fLW hCF cwm fLW fLW -uCt -iOt -rJc -fBz -fBz +tcM +nVB +pWT +lSv +lSv sqS fsn aor @@ -166290,28 +165987,28 @@ saS dJp nPa tKm -ikN -ssh -ssh -ssh -ssh -ssh -ssh -dDf -rDC -gzn -jTp -mib -dLV -dLV -uEB -gJA -syG -hLT -cDV -hJv -jHe -gJA +xvo +eir +eir +eir +eir +eir +eir +rcw +wsg +aqa +jUN +hdl +rmr +rmr +sYa +dBq +vBr +lXx +sUe +sst +grD +dBq jbr eid nPi @@ -166547,28 +166244,28 @@ tKm tKm tKm tKm -mbh -lmI -rSs -rSs -rSs -rSs -kCv -cEm -oYn -aAC -rBY -nXF -lCA -nXF -iJi -hMC -lCA -iJi -iJi -nXF -lCA -hMC +rFh +mfN +eIU +eIU +eIU +eIU +vWk +iEp +pWk +klV +yiy +eKt +auR +eKt +vbd +jBC +auR +vbd +vbd +eKt +auR +jBC rbq wyz nPi @@ -166801,31 +166498,31 @@ eAw fhV vKf tKm -jRQ -jRQ -gti -pKs -rPU -rPU -tdp -rPU -rPU -rPU -dbJ -kgu -cAO -pwf -cNQ -qYn -qYn -qYn -lEZ -mAp -ote -kew -xUa -mAp -lEZ +mJa +mJa +dda +fOj +kmG +kmG +qgZ +kmG +kmG +kmG +fdu +wdA +ymb +hYo +rFr +jcV +jcV +jcV +jJA +kVN +iQi +nQe +fdm +kVN +jJA tHo jZq iYU @@ -167058,11 +166755,11 @@ eAw oAZ siV tKm -nrY -cIP -cIP -qBI -tzB +jfW +lWC +lWC +vYb +jaK jGp jGp xBL @@ -167070,19 +166767,19 @@ xBL xBL jGp jGp -qFY -kcz -olx +aZo +jGf +rtH nes nes nes vwF vwF -nZv -ttR -guJ -fBz -fBz +xzF +pWV +eLK +lSv +lSv noo dyM tex @@ -167315,11 +167012,11 @@ eAw tKm tKm tKm -jRQ -cIP -oDk -lHo -kVx +mJa +lWC +raG +nTK +aVv jGp ngQ jdy @@ -167327,9 +167024,9 @@ kGe sVR xfL xBL -qFY -pwf -olx +aZo +hYo +rtH nes qCL oDC @@ -167568,15 +167265,15 @@ fpm aOU hcM tfU -fyC -lmL -sSw -cIP -jRQ -cIP -nar -gKW -kFx +jnr +mZZ +fnG +lWC +mJa +lWC +fKw +nOf +qMm jGp yiR kOs @@ -167584,9 +167281,9 @@ muY pRs bns sUs -rmo -pwf -olx +gWf +hYo +rtH nes arP pda @@ -167825,15 +167522,15 @@ xYZ hcM nbp tfU -fyC -vZz -hkm -qPL -wWS -cIP -vZu -gwn -sWs +jnr +vGh +knn +wZr +eXo +lWC +ffG +hVk +iDH jGp lkn hiH @@ -167841,9 +167538,9 @@ hiH fbY wUF xBL -wpP -hbs -olx +pWt +vCC +rtH nes xAb bEU @@ -168082,15 +167779,15 @@ lTn clo gXM tfU -jAO -arx -sSw -cIP -sqr -cIP -iMZ -lmI -tNm +ftI +rfQ +fnG +lWC +nBh +lWC +ezQ +mfN +oav jGp aWj qwx @@ -168098,9 +167795,9 @@ hiH pTR rBW jGp -bBw -yie -quq +vaE +oyy +aaR vwF aqd hPZ @@ -168332,22 +168029,22 @@ fZI tfU tfU iMF -bSZ -cIP -cIP -jXw -jXw -cIP -fBz -fBz -cIP -cIP -cIP -sqr -cIP -hwu -lmI -mtA +poM +lWC +lWC +tfE +tfE +lWC +lSv +lSv +lWC +lWC +lWC +nBh +lWC +agZ +mfN +orl jGp gjv jAq @@ -168355,10 +168052,10 @@ bvy fqn atF xBL -wpP -vTa -laE -xuQ +pWt +dHq +gXp +pWG eyi oSX oSX @@ -168589,22 +168286,22 @@ fZI fZI tfU qXA -bSZ -hRR -jgA -cIP -lwL -vKu -azM -fBz -mpU -fsZ -cIP -sqr -cIP -cIP -hRs -cIP +poM +dsi +gim +lWC +pXp +nTp +jtO +lSv +glJ +bkC +lWC +nBh +lWC +lWC +sCh +lWC jGp rBW pTR @@ -168612,9 +168309,9 @@ hiH rOj ihM xBL -wpP -vTa -ton +pWt +dHq +gkk vwF vwF nes @@ -168846,22 +168543,22 @@ fZI fZI tfU qXA -nBw -qQm -qQm -dpa -jZj -xoN -pwd -fzC -bqY -uLc -fzi -sqr -ghk -ghk -ghk -kbn +mJh +lcR +lcR +tXW +eFq +wsy +lRK +vIi +aoU +wuE +ucn +nBh +dzS +dzS +dzS +ggy jGp gjv jAq @@ -168869,16 +168566,16 @@ hiH fyW iwm xBL -wpP -vTa -olx -tzB -rqd -rqd -wIB -rqd -rqd -fBz +pWt +dHq +rtH +jaK +eoQ +eoQ +lXr +eoQ +eoQ +lSv rtc ehq eXH @@ -169101,24 +168798,24 @@ fZI fZI fZI fZI -tcK -seN -bzz -cqv -qNZ -jiM -dvL -bGO -qtz -fBz -nos -iDR -cIP -jPX -ghk -cIP -ghk -pFc +rKP +sjE +tfE +raI +lWC +sAH +dtw +dBh +qoJ +lSv +aFg +nnc +lWC +rqq +dzS +lWC +dzS +vhs jGp mCG uuD @@ -169126,16 +168823,16 @@ wUP sgi sgi jGp -wpP -wXp -lsv -qzw -sCC -sCC -sCC -hiq -bUd -fBz +pWt +ita +qCI +gzE +fYU +fYU +fYU +qkw +xxz +lSv ajA mNQ fhf @@ -169358,24 +169055,24 @@ fZI fZI fZI fZI -dEE -nWV -rGg -esf -cMQ -vTW -gNP -vAG -ggz -fBz -fBz -fBz -fBz -chV -chV -fBz -mjJ -pzV +pDW +rAQ +ubj +lGf +hyU +bGT +tWh +jNq +jZy +lSv +lSv +lSv +lSv +qPi +qPi +lSv +gBc +xrF mln mln mln @@ -169383,16 +169080,16 @@ mln mln mln mln -hth -xoA -cbK -tzB -cQU -jAE -vGk -jAE -jAE -fBz +tgc +afI +vAO +jaK +lNb +rVz +xtG +rVz +rVz +lSv dOm eLD lWF @@ -169615,24 +169312,24 @@ fZI fZI fZI fZI -sZv -jMJ -tPq -pBl -jsS -ciC -fWC -fWC -fWC -fBz +hJJ +vZt +xIb +ooh +uur +kxy +hmu +hmu +hmu +lSv fZI fZI fZI fZI fZI -fBz -chV -chV +lSv +qPi +qPi mln soz soz @@ -169640,16 +169337,16 @@ soz soz soz mln -chV -chV -chV -fBz -fBz -chV -chV -chV -fBz -fBz +qPi +qPi +qPi +lSv +lSv +qPi +qPi +qPi +lSv +lSv wLC wLC wLC @@ -169737,8 +169434,8 @@ iwN mpD tAy iwN -tAj -jOP +klO +ilJ aqq olO llO @@ -169872,12 +169569,12 @@ fZI fZI fZI fZI -dEE -ePh -vCK -eQz -bWq -joZ +pDW +iQv +tdH +aCD +gKf +hEX fZI fZI fZI @@ -170129,12 +169826,12 @@ fZI fZI fZI fZI -ais -pjj -aiw -eQz -aId -qZk +lSv +sZT +gcP +aCD +lFY +wxH iqz wQY qLU @@ -170252,7 +169949,7 @@ rfm mWW hCB eId -ixC +vqT kXP kXP uFh @@ -170386,12 +170083,12 @@ fZI fZI fZI fZI -ais -cfO -scV -hKq -fRF -qgF +lSv +sNl +tai +qKH +kpg +uEP fZI fZI fZI @@ -170510,7 +170207,7 @@ aAb iwN ahn ahn -aFX +adv dFQ ixC kXP @@ -170518,7 +170215,7 @@ xSK jec jNK uAS -ykx +adv ahn ahn gLc @@ -170643,12 +170340,12 @@ fZI fZI fZI fZI -ais -ais -rTq -rTq -ais -ais +lSv +lSv +nkn +nkn +lSv +lSv fZI fZI fZI @@ -213137,7 +212834,7 @@ rCV bcK ucm fjj -wGq +rCV bcK fic eVg @@ -217531,7 +217228,7 @@ dBJ tJS bGf aOY -uYq +qZR sCa adx pfs @@ -218581,14 +218278,14 @@ nYY bet rPv rmY -bvh +rjM ggt krV paj fwe ewU fDT -sWY +qGA nko oAL rLE @@ -218842,7 +218539,7 @@ vjJ czk fDT jwX -pcb +uzs krV fDT xhn @@ -219018,7 +218715,7 @@ rXp qsP gwW qsP -xuY +qsP neN hcL sIz @@ -219333,7 +219030,7 @@ hJR hJR hJR hJR -uJw +uIq aKI fQu hJR @@ -219521,7 +219218,7 @@ bbX xEE rdo iKj -ihe +qsP qsP qsP qsP @@ -219863,7 +219560,7 @@ snw gOs snw nYY -rNU +bRW vjJ lqt lqt @@ -219877,7 +219574,7 @@ mBc mOS oEB hWT -tlW +skq mzy qaH lXo @@ -220048,7 +219745,7 @@ jYP xai xai xai -foj +hCo sIz xFd cJU @@ -220126,7 +219823,7 @@ uTg cmJ kpH cWg -eBK +jUX rYe bSd fDT @@ -220361,7 +220058,7 @@ xwD lZX nLy hJR -nnj +uIq sXH etB vtz @@ -220632,7 +220329,7 @@ lMa gZO rFd nYY -voR +qkI fDT krV krV @@ -221069,7 +220766,7 @@ mMZ mMZ mMZ ccV -sNV +beF bZH eMw kus @@ -221917,7 +221614,7 @@ eKe qPf vxY pog -dzj +uqs pog byl hGm @@ -222680,11 +222377,11 @@ sFG iqZ mah mah -uDQ +qBX gpD wlu lEf -kzu +wmS geG vRO oWi @@ -223459,7 +223156,7 @@ pog vtk pog pog -uby +qtl pog byl mVo @@ -224487,7 +224184,7 @@ ofB ofB ofB ofB -rJg +rsK fDT gnn eax @@ -224748,7 +224445,7 @@ hXo fDT gDN jwX -oFM +eYw krV gDN fDT @@ -224756,7 +224453,7 @@ fDT fDT fDT fDT -huD +mDg fDT fDT fDT @@ -229030,7 +228727,7 @@ fUa gTZ gTZ aOC -dEj +toE uvY iZC gTZ @@ -231632,7 +231329,7 @@ lNi nNB fem hTD -sWQ +hTD iOb gzR tph @@ -231843,7 +231540,7 @@ eOw vzW kxk aFD -fmQ +vhb uhZ rOD uJF @@ -232164,7 +231861,7 @@ bcQ ybu dbM cFT -gjZ +uAq mJc bcQ bcQ @@ -234450,7 +234147,7 @@ sPm sPm sPm tff -kXC +dRn kys dRn dRn @@ -234974,7 +234671,7 @@ iWJ cGO nBU aEh -eSf +qma cmP hwO cEu @@ -236505,11 +236202,11 @@ tSL tSL sPm dZZ -rEF +tNy cmP cjk xlA -fFu +gpq cYe tOH ben @@ -237021,7 +236718,7 @@ sPm jky cWw uLA -xQJ +was vZN yiD iXD diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 03125504e5244b..8cdb0345d2246a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -761,25 +761,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"aoI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 6 - }, -/obj/item/clipboard{ - pixel_y = 6 - }, -/obj/item/folder/yellow{ - pixel_y = 6 - }, -/obj/item/paper/monitorkey, -/obj/item/pen{ - pixel_y = 4 - }, -/obj/item/stamp/head/ce, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) "aoL" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -2166,13 +2147,6 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) -"aNl" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/stamp/head/hop, -/turf/open/floor/carpet/royalblue, -/area/station/command/heads_quarters/hop) "aNs" = ( /obj/machinery/light/small/directional/north, /obj/machinery/firealarm/directional/north, @@ -4609,6 +4583,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/security/courtroom) +"bBK" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/light_switch/directional/west, +/obj/structure/closet/secure_closet/brig, +/turf/open/floor/iron/white, +/area/station/security/medical) "bBO" = ( /obj/effect/turf_decal/box/white{ color = "#EFB341" @@ -4629,6 +4612,14 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) +"bBR" = ( +/obj/effect/turf_decal/stripes/end, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/shower/directional/south, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "bCg" = ( /obj/machinery/light/small/built/directional/north, /obj/structure/toilet{ @@ -6716,7 +6707,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -9108,6 +9099,22 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"cYM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "testlab"; + name = "Xenobiology Secure Chamber Blast Door" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/door/window/left/directional/north{ + name = "Test Chamber"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "cYN" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/airalarm/directional/west, @@ -9178,22 +9185,6 @@ /obj/structure/table/reinforced/plasmarglass, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"cZM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/obj/structure/cable, -/obj/machinery/door/airlock/hatch{ - name = "Cytology Pen" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "cZU" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -11209,6 +11200,25 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/science/research) +"dJA" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/table/glass, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/storage/medkit/regular{ + pixel_y = 3 + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner, +/turf/open/floor/iron/white, +/area/station/security/medical) "dJV" = ( /obj/machinery/light/neon_lining{ dir = 8 @@ -12591,28 +12601,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/large, /area/station/commons/storage/primary) -"eji" = ( -/obj/machinery/status_display/supply{ - pixel_x = -32 - }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/stamp/head/qm{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/item/stamp{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/stamp/denied{ - pixel_x = 8 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/qm) "ejt" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -16388,11 +16376,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"fyK" = ( -/obj/structure/chair/office, -/obj/effect/landmark/start/brig_physician, -/turf/open/floor/iron/white, -/area/station/security/medical) "fyZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16541,23 +16524,6 @@ /obj/machinery/holopad, /turf/open/floor/carpet, /area/station/service/library) -"fCd" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/west, -/obj/machinery/light_switch/directional/west, -/obj/structure/rack, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/storage/medkit/regular{ - pixel_y = 3 - }, -/obj/item/storage/box/bodybags, -/turf/open/floor/iron/white, -/area/station/security/medical) "fCw" = ( /obj/effect/spawner/random/structure/table, /obj/effect/spawner/random/entertainment/cigarette_pack, @@ -16973,12 +16939,6 @@ dir = 4 }, /area/station/service/janitor) -"fJr" = ( -/obj/effect/turf_decal/stripes/end, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "fJv" = ( /obj/structure/bed{ dir = 4 @@ -17485,6 +17445,21 @@ dir = 6 }, /area/station/cargo/sorting) +"fSG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "fSM" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/dark_blue{ @@ -17602,20 +17577,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood, /area/station/security/detectives_office) -"fVg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "fVh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -18140,20 +18101,6 @@ /obj/item/crowbar/red, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"gdF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "gea" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18299,38 +18246,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"ghn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door_buttons/access_button{ - idDoor = "xeno_airlock_exterior"; - idSelf = "xeno_airlock_control"; - name = "Access Button"; - req_access = list("xenobiology"); - pixel_x = 24 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - id_tag = "xeno_airlock_exterior"; - name = "Xenobiology Lab External Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white/textured, -/area/station/science/xenobiology/hallway) "ghp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -20029,15 +19944,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/engineering) -"gIw" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/structure/closet/secure_closet/brig_physician, -/obj/item/clothing/suit/jacket/straight_jacket, -/turf/open/floor/iron/white, -/area/station/security/medical) "gIy" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -23395,7 +23301,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "hLW" = ( @@ -24485,6 +24391,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"iiQ" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "ija" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -25366,6 +25278,28 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) +"iue" = ( +/obj/machinery/status_display/supply{ + pixel_x = -32 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 7 + }, +/obj/item/stamp/qm{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/item/stamp{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/stamp/denied{ + pixel_x = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/qm) "ium" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -27631,6 +27565,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"jhk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "jhq" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -28770,23 +28717,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"jCM" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/table, -/obj/item/folder/white, -/obj/item/folder/blue{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/blue{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/stamp/head/cmo, -/turf/open/floor/iron/dark/side, -/area/station/command/heads_quarters/cmo) "jCP" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -30128,24 +30058,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/science/genetics) -"jYQ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/airalarm/directional/north, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/table/reinforced/rglass, -/obj/item/reagent_containers/syringe{ - name = "steel point" - }, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/clothing/neck/stethoscope, -/obj/item/clothing/gloves/latex, -/obj/item/reagent_containers/spray/cleaner, -/turf/open/floor/iron/white, -/area/station/security/medical) "jZa" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -30952,6 +30864,19 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"knW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "knX" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, @@ -31889,7 +31814,7 @@ /area/station/hallway/primary/central) "kFc" = ( /obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "kFf" = ( @@ -32383,6 +32308,37 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) +"kNH" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door_buttons/access_button{ + idDoor = "xeno_airlock_exterior"; + idSelf = "xeno_airlock_control"; + name = "Access Button"; + req_access = list("xenobiology"); + pixel_x = 24 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + id_tag = "xeno_airlock_exterior"; + name = "Xenobiology Lab External Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/textured, +/area/station/science/xenobiology/hallway) "kNJ" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -33475,6 +33431,26 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"lfd" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_y = 6 + }, +/obj/item/folder/red{ + pixel_x = 3 + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/pen, +/turf/open/floor/iron/white, +/area/station/security/medical) "lfg" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 4 @@ -35600,23 +35576,6 @@ /obj/machinery/power/energy_accumulator/tesla_coil, /turf/open/floor/plating, /area/station/engineering/main) -"lOq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/machinery/door/airlock/research/glass{ - name = "Kill Chamber"; - normalspeed = 0 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/freezer, -/area/station/science/xenobiology) "lOA" = ( /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ @@ -36725,6 +36684,26 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"mkx" = ( +/obj/structure/table/wood, +/obj/item/phone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/machinery/recharger{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = 9 + }, +/obj/item/stamp/hos{ + pixel_x = 10; + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "mky" = ( /obj/effect/turf_decal/trimline/red/filled/warning, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36812,22 +36791,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/security/prison/visit) -"mlw" = ( -/obj/machinery/requests_console/directional/west{ - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Captain's Desk"; - name = "Captain's Requests Console"; - can_send_announcements = 1 - }, -/obj/machinery/camera/autoname/directional/west, -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/folder/blue, -/obj/item/pen/fountain, -/obj/item/stamp/head/captain, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "mlJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37918,6 +37881,10 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"mFi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/security/medical) "mFK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/decal/cleanable/dirt, @@ -38093,22 +38060,6 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"mJu" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 5 - }, -/obj/item/folder/white{ - pixel_y = 7 - }, -/obj/item/pen{ - pixel_y = 7 - }, -/obj/item/stamp/head/rd{ - pixel_y = 10 - }, -/turf/open/floor/carpet/purple, -/area/station/command/heads_quarters/rd) "mJw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -40078,7 +40029,7 @@ /area/station/hallway/primary/aft) "nrX" = ( /obj/machinery/light/small/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron/dark/side{ dir = 1 @@ -41881,26 +41832,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/science/robotics/mechbay) -"nVB" = ( -/obj/structure/table/wood, -/obj/item/phone{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/machinery/recharger{ - pixel_x = -4; - pixel_y = -1 - }, -/obj/item/paper_bin{ - pixel_y = 4; - pixel_x = 9 - }, -/obj/item/stamp/head/hos{ - pixel_x = 10; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) "nVC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -42977,6 +42908,25 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/station/service/library/lounge) +"ond" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 6 + }, +/obj/item/clipboard{ + pixel_y = 6 + }, +/obj/item/folder/yellow{ + pixel_y = 6 + }, +/obj/item/paper/monitorkey, +/obj/item/pen{ + pixel_y = 4 + }, +/obj/item/stamp/ce, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "one" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -43766,7 +43716,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "oAe" = ( @@ -45966,6 +45916,21 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) +"poD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/structure/cable, +/obj/machinery/door/airlock/hatch{ + name = "Cytology Pen" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/engine, +/area/station/science/xenobiology) "poG" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/nuke_storage) @@ -47129,6 +47094,22 @@ /obj/structure/sign/departments/botany/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"pHn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/door/airlock/research/glass{ + name = "Kill Chamber"; + normalspeed = 0 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/freezer, +/area/station/science/xenobiology) "pHr" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -47186,7 +47167,7 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) @@ -48877,6 +48858,23 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"qph" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/table/glass, +/obj/item/storage/box/bodybags, +/obj/item/reagent_containers/syringe{ + name = "steel point" + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/storage/backpack/duffelbag/sec/surgery, +/obj/item/clothing/neck/stethoscope, +/obj/machinery/defibrillator_mount/directional/west, +/turf/open/floor/iron/white, +/area/station/security/medical) "qpi" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -50493,15 +50491,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/iron/textured, /area/station/command/heads_quarters/ce) -"qSt" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/item/radio/intercom/directional/north, -/obj/structure/table/reinforced/rglass, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/iron/white, -/area/station/security/medical) "qSw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/chair_flipped{ @@ -50982,20 +50971,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"rbO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "rbW" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 @@ -51960,27 +51935,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"rrs" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/table/reinforced/rglass, -/obj/item/paper_bin{ - pixel_y = 6 - }, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/pen, -/obj/item/roller, -/turf/open/floor/iron/white, -/area/station/security/medical) "rrv" = ( /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -56621,7 +56575,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/line, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/aft) "sWq" = ( @@ -57603,23 +57557,6 @@ /obj/effect/spawner/random/entertainment/money, /turf/open/floor/carpet/green, /area/station/maintenance/starboard/aft) -"tlI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "testlab"; - name = "Xenobiology Secure Chamber Blast Door" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/door/window/left/directional/north{ - name = "Test Chamber"; - req_access = list("xenobiology") - }, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "tlO" = ( /turf/closed/wall/r_wall, /area/station/tcommsat/computer) @@ -58442,6 +58379,13 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron, /area/station/science/ordnance/office) +"tyF" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/stamp/hop, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hop) "tyG" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/airalarm/directional/south, @@ -59358,6 +59302,22 @@ /obj/item/disk/nuclear, /turf/open/floor/iron/dark, /area/station/command/bridge) +"tQH" = ( +/obj/machinery/requests_console/directional/west{ + anon_tips_receiver = 1; + assistance_requestable = 1; + department = "Captain's Desk"; + name = "Captain's Requests Console"; + can_send_announcements = 1 + }, +/obj/machinery/camera/autoname/directional/west, +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/folder/blue, +/obj/item/pen/fountain, +/obj/item/stamp/captain, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "tQJ" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -60902,22 +60862,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/library) -"upi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "upz" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/defibrillator_mount/directional/east, @@ -61843,6 +61787,19 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"uIQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "uJk" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/button/door/directional/south{ @@ -63395,6 +63352,43 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig/entrance) +"vhh" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/door_buttons/access_button{ + idDoor = "xeno_airlock_interior"; + idSelf = "xeno_airlock_control"; + name = "Access Button"; + pixel_x = -24; + pixel_y = -5; + req_access = list("xenobiology") + }, +/obj/machinery/door_buttons/airlock_controller{ + idExterior = "xeno_airlock_exterior"; + idInterior = "xeno_airlock_interior"; + idSelf = "xeno_airlock_control"; + name = "Access Console"; + pixel_x = 25; + req_access = list("xenobiology") + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + id_tag = "xeno_airlock_interior"; + name = "Xenobiology Lab Internal Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/textured, +/area/station/science/xenobiology/hallway) "vho" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65305,6 +65299,23 @@ /obj/effect/spawner/random/structure/girder, /turf/open/floor/plating, /area/station/maintenance/department/security/brig) +"vPF" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/table, +/obj/item/folder/white, +/obj/item/folder/blue{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/blue{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/stamp/cmo, +/turf/open/floor/iron/dark/side, +/area/station/command/heads_quarters/cmo) "vPG" = ( /obj/structure/cable, /turf/open/floor/carpet/red, @@ -65540,6 +65551,22 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"vSA" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 5 + }, +/obj/item/folder/white{ + pixel_y = 7 + }, +/obj/item/pen{ + pixel_y = 7 + }, +/obj/item/stamp/rd{ + pixel_y = 10 + }, +/turf/open/floor/carpet/purple, +/area/station/command/heads_quarters/rd) "vSE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -66967,7 +66994,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "wtt" = ( @@ -69443,44 +69470,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"xkI" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/door_buttons/access_button{ - idDoor = "xeno_airlock_interior"; - idSelf = "xeno_airlock_control"; - name = "Access Button"; - pixel_x = -24; - pixel_y = -5; - req_access = list("xenobiology") - }, -/obj/machinery/door_buttons/airlock_controller{ - idExterior = "xeno_airlock_exterior"; - idInterior = "xeno_airlock_interior"; - idSelf = "xeno_airlock_control"; - name = "Access Console"; - pixel_x = 25; - req_access = list("xenobiology") - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - id_tag = "xeno_airlock_interior"; - name = "Xenobiology Lab Internal Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white/textured, -/area/station/science/xenobiology/hallway) "xkQ" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -69758,6 +69747,15 @@ /obj/machinery/recharge_station, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"xqZ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/white, +/area/station/security/medical) "xrf" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -70767,13 +70765,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/patients_rooms/room_b) -"xHC" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/defibrillator_mount/directional/south, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, -/turf/open/floor/iron/white, -/area/station/security/medical) "xHH" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/chemist, @@ -84874,7 +84865,7 @@ bKO oIc fvH vyC -eji +iue suW boe wAR @@ -99201,9 +99192,9 @@ sUf qQg qow ait -jYQ -gIw -fCd +dJA +qph +bBK eaW ait xbP @@ -99266,7 +99257,7 @@ bxK tzm mqu qdk -aNl +tyF oJX aZW lFc @@ -99458,10 +99449,10 @@ twl qQg jTa ait -rrs +lfd pbF avB -xHC +mFi ait utj bYk @@ -99715,8 +99706,8 @@ lfi qQg uwf ait -qSt -fyK +xqZ +iiQ ezd msS ait @@ -99972,7 +99963,7 @@ twl qQg qVR ait -fJr +bBR vCs pLV oLJ @@ -101360,7 +101351,7 @@ eRr nVC kQz oJd -aoI +ond mdk qRR goC @@ -103370,7 +103361,7 @@ pDD qDK mUJ aUx -mlw +tQH vBp hDl trg @@ -104847,7 +104838,7 @@ xXP mrP pOC rQs -nVB +mkx uUq bLO mrP @@ -110288,7 +110279,7 @@ kaP qvC mkl gSE -mJu +vSA min cst qQz @@ -113653,7 +113644,7 @@ hTS tLN dWN ydu -jCM +vPF uwq rjn mHp @@ -114112,10 +114103,10 @@ cDv cDv cDv cDv -rbO +knW cDv owu -lOq +pHn owu wtF wtF @@ -114864,7 +114855,7 @@ cDv cDv cDv cDv -upi +fSG cDv cDv nBS @@ -115889,7 +115880,7 @@ dYt wpO uAP nYl -tlI +cYM rEL cmn kRS @@ -115916,11 +115907,11 @@ qjq rYV hyd nJb -xkI +vhh sos aEg aEg -ghn +kNH mvc saI dQL @@ -116920,7 +116911,7 @@ cDv cDv cDv cDv -gdF +jhk cDv cDv nBS @@ -117710,10 +117701,10 @@ cDv cDv cDv cDv -fVg +uIQ cDv owu -cZM +poD owu wtF wtF diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2835d6b71a5ae7..34e143d7eab3e8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -417,6 +417,20 @@ }, /turf/open/floor/circuit, /area/station/science/research/abandoned) +"aeY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron, +/area/station/security/brig) "aff" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -1913,6 +1927,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) +"auu" = ( +/obj/structure/table/glass, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Medbay" + }, +/obj/machinery/computer/records/medical/laptop, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark, +/area/station/security/medical) "aux" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cyborg, @@ -5770,6 +5794,17 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"bqE" = ( +/obj/structure/rack, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "bqF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -5856,17 +5891,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) -"brJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/department/security) "brQ" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -6320,6 +6344,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"bxj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-toxins-passthrough" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/xenobiology) "bxp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/shard, @@ -6697,13 +6745,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"bCg" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "bCn" = ( /obj/effect/turf_decal/trimline/yellow/corner, /turf/open/floor/iron, @@ -7184,11 +7225,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/project) -"bGI" = ( -/obj/machinery/vending/wallmed/directional/north, -/obj/structure/table/optable, -/turf/open/floor/iron/dark, -/area/station/security/medical) "bGM" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -7467,6 +7503,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"bJC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/security) "bJE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/spawner/random/structure/steam_vent, @@ -8653,13 +8699,6 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"bXh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "bXl" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/rack, @@ -9562,23 +9601,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"cjh" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "cjj" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -9829,6 +9851,24 @@ }, /turf/open/floor/iron/dark/corner, /area/station/maintenance/disposal/incinerator) +"clE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/department/security) "clG" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/decal/cleanable/dirt, @@ -11122,17 +11162,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/station/engineering/main) -"cCp" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/folder/yellow, -/obj/item/folder/blue{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stamp/head/ce, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) "cCw" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, @@ -12129,6 +12158,25 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +"cOE" = ( +/obj/machinery/door/airlock/security{ + name = "Brig" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/security/brig) "cOJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12231,13 +12279,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"cQa" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "cQh" = ( /obj/machinery/porta_turret/ai, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -13077,6 +13118,13 @@ dir = 4 }, /area/station/security/prison/workout) +"dbw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) "dbx" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -13331,7 +13379,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/secondary/command) "dep" = ( @@ -14067,6 +14115,18 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"dpN" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Xenobiology Kill Room" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/iron, +/area/station/science/xenobiology) "dpQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box, @@ -14525,6 +14585,24 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) +"dvh" = ( +/obj/structure/rack, +/obj/structure/cable, +/obj/item/storage/box/bodybags, +/obj/item/clothing/under/rank/medical/scrubs/purple, +/obj/item/clothing/under/rank/medical/scrubs/purple{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/clothing/gloves/latex, +/obj/item/healthanalyzer, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/security/medical) "dvu" = ( /obj/machinery/door/airlock/engineering{ name = "Starboard Quarter Solar Access" @@ -15953,12 +16031,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/space/nearstation) -"dNu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "dNF" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -16250,15 +16322,6 @@ }, /turf/open/floor/iron/telecomms, /area/station/tcommsat/server) -"dRn" = ( -/obj/structure/cable, -/obj/machinery/holopad/secure, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment, -/obj/machinery/duct, -/turf/open/floor/iron/large, -/area/station/security/brig) "dRo" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/decal/cleanable/dirt, @@ -16714,12 +16777,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/station/service/library/abandoned) -"dXC" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "dXF" = ( /obj/structure/table/reinforced, /obj/machinery/light_switch/directional/south{ @@ -16878,7 +16935,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "dZD" = ( @@ -18630,14 +18687,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"euh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "euk" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -20051,15 +20100,6 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/department/chapel) -"eMX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/chair/office, -/obj/effect/landmark/start/brig_physician, -/turf/open/floor/iron/white/side, -/area/station/security/medical) "eNd" = ( /obj/effect/landmark/start/hangover, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20513,7 +20553,7 @@ dir = 4 }, /obj/machinery/status_display/ai/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/cafeteria, /area/station/service/cafeteria) "eSq" = ( @@ -20902,20 +20942,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/project) -"eWX" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 8 - }, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/siding/dark_red, -/obj/machinery/duct, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "eXf" = ( /obj/structure/cable, /obj/structure/chair/comfy/brown{ @@ -21577,20 +21603,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"feQ" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark_red, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "feS" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -23571,11 +23583,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"fBH" = ( -/obj/effect/turf_decal/stripes/end, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "fBK" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/decal/cleanable/dirt, @@ -23850,15 +23857,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"fGx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/office) "fGD" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24993,12 +24991,6 @@ /obj/item/reagent_containers/dropper, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"fUZ" = ( -/obj/effect/turf_decal/siding/dark_red, -/obj/machinery/defibrillator_mount/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/station/security/medical) "fVa" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 9 @@ -26324,6 +26316,17 @@ }, /turf/open/floor/iron, /area/station/cargo/quartermaster) +"gmr" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/machinery/light/cold/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/corner, +/area/station/security/medical) "gms" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -27501,15 +27504,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"gyV" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "gyW" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood/corner{ @@ -27894,6 +27888,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"gDP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/security/office) "gDS" = ( /obj/structure/sign/directions/supply{ dir = 4; @@ -27909,16 +27911,6 @@ /obj/structure/displaycase_chassis, /turf/open/floor/wood/large, /area/station/service/library/abandoned) -"gDU" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/office) "gDV" = ( /turf/closed/wall, /area/station/service/library/lounge) @@ -28865,23 +28857,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"gPN" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Medbay" - }, -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "gPO" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp/green, @@ -29097,6 +29072,14 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) +"gTb" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/large, +/area/station/security/brig) "gTc" = ( /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, @@ -30818,21 +30801,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/medical/cryo) -"hoy" = ( -/obj/machinery/light_switch/directional/east, -/obj/machinery/firealarm/directional/east{ - pixel_x = 38 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/closet/secure_closet/brig_physician, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/side{ - dir = 8 - }, -/area/station/security/medical) "hoz" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/decal/cleanable/dirt, @@ -30877,6 +30845,20 @@ }, /turf/open/floor/plating, /area/station/science/research/abandoned) +"hpe" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "hps" = ( /obj/structure/table/reinforced, /obj/item/clothing/shoes/magboots{ @@ -30915,15 +30897,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/research) -"hpF" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/maintenance/department/security) "hpG" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/corner{ @@ -30984,6 +30957,24 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"hrq" = ( +/obj/structure/table/wood, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/clipboard, +/obj/item/pen/red{ + pixel_x = 1 + }, +/obj/item/stamp/hos{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/iron/grimy, +/area/station/command/heads_quarters/hos) "hrs" = ( /obj/structure/lattice, /obj/structure/sign/warning/secure_area/directional/north, @@ -30999,16 +30990,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood, /area/station/maintenance/starboard/aft) -"hrC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/duct, -/turf/open/floor/iron/large, -/area/station/security/brig) "hrG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -32796,6 +32777,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/office) +"hPx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/maintenance/department/security) "hPJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 8 @@ -33119,21 +33112,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/black, /area/station/security/prison/mess) -"hTF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "hTR" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -35094,7 +35072,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "ipN" = ( @@ -36043,6 +36021,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"iBB" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/item/stamp/rd, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "iBO" = ( /obj/machinery/power/turbine/inlet_compressor, /turf/open/floor/engine, @@ -36071,7 +36055,7 @@ /obj/effect/turf_decal/trimline/hot_pink/filled/line{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark/textured_edge{ dir = 1 }, @@ -37072,16 +37056,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/fore) -"iPO" = ( -/obj/structure/closet/secure_closet/brig{ - name = "Prisoner Locker" - }, -/obj/machinery/status_display/ai/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "iQf" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/wood/corner, @@ -37321,26 +37295,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"iSY" = ( -/obj/machinery/door/airlock/security{ - name = "Brig" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = -32 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "iTi" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -38857,6 +38811,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"jkw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/office) "jky" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/navigate_destination/research, @@ -40497,6 +40456,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"jDB" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "jDU" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -40768,20 +40733,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/engineering/atmos) -"jGU" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/prisoner, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "jGX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -41355,23 +41306,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/station/science/research/abandoned) -"jOW" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/roller, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/duct, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/security/medical) "jOY" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/lattice, @@ -41451,6 +41385,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/main) +"jPR" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/large, +/area/station/security/brig) "jPS" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced/tinted, @@ -42814,6 +42757,20 @@ /obj/item/ai_module/core/full/crewsimov, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"keC" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "keE" = ( /obj/structure/table/reinforced, /obj/item/plant_analyzer, @@ -43814,24 +43771,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/disposal) -"kqT" = ( -/obj/structure/table/wood, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/clipboard, -/obj/item/pen/red{ - pixel_x = 1 - }, -/obj/item/stamp/head/hos{ - pixel_x = 1; - pixel_y = -1 - }, -/turf/open/floor/iron/grimy, -/area/station/command/heads_quarters/hos) "kri" = ( /obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/plating, @@ -43885,6 +43824,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) +"krP" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "krT" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -45288,6 +45239,12 @@ }, /turf/open/floor/carpet/blue, /area/station/service/library/lounge) +"kKa" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/brig) "kKf" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/radiation, @@ -45907,6 +45864,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/medical/abandoned) +"kSg" = ( +/obj/structure/closet/secure_closet/brig{ + name = "Prisoner Locker" + }, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "kSi" = ( /obj/structure/nestbox, /obj/machinery/light/directional/west, @@ -46980,15 +46947,6 @@ "leE" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage_shared) -"leP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/office) "leU" = ( /obj/machinery/duct, /obj/effect/decal/cleanable/dirt, @@ -47575,6 +47533,13 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/science/lobby) +"lmG" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) "lmI" = ( /obj/structure/table/glass, /obj/machinery/computer/records/medical/laptop, @@ -48415,6 +48380,17 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"lwM" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/folder/yellow, +/obj/item/folder/blue{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stamp/ce, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "lwN" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -48618,6 +48594,15 @@ }, /turf/open/floor/iron, /area/station/science/research) +"lzJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/large, +/area/station/security/brig) "lzM" = ( /obj/item/paper/pamphlet/violent_video_games, /obj/effect/spawner/random/entertainment/money_small, @@ -49102,14 +49087,6 @@ dir = 4 }, /area/station/maintenance/department/electrical) -"lFi" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "lFl" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -49708,23 +49685,6 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"lKV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/office) "lLy" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -50017,7 +49977,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/fore) "lPs" = ( @@ -50445,6 +50405,16 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) +"lTJ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "lTT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51149,6 +51119,16 @@ /obj/structure/cable, /turf/open/floor/iron/large, /area/station/security/brig) +"meV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table, +/obj/item/folder/yellow, +/obj/item/stamp/qm, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/quartermaster) "meW" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/green, @@ -51514,6 +51494,13 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron, /area/station/command/gateway) +"mjr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/station/security/medical) "mjz" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -51669,16 +51656,6 @@ }, /turf/open/floor/engine, /area/station/science/research) -"mmh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/duct, -/turf/open/floor/iron/large, -/area/station/security/brig) "mmj" = ( /obj/machinery/computer/prisoner/management{ dir = 8 @@ -53563,6 +53540,14 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/paramedic) +"mIb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) "mIc" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/broken_floor, @@ -54481,18 +54466,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) -"mSb" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/machinery/light/cold/directional/west, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/computer/records/medical/laptop, -/obj/structure/table/reinforced/rglass, -/obj/machinery/duct, -/turf/open/floor/iron/white/corner, -/area/station/security/medical) "mSe" = ( /turf/closed/wall/r_wall, /area/station/security/prison/safe) @@ -55154,19 +55127,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/warden) -"nbs" = ( -/obj/structure/table/wood, -/obj/item/paper_bin/carbon, -/obj/item/stamp/head/hop, -/obj/machinery/requests_console/directional/north{ - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console"; - can_send_announcements = 1 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "nbv" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -56467,6 +56427,12 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) +"nuc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig) "nuj" = ( /obj/item/kirbyplants/random, /obj/machinery/airalarm/directional/south, @@ -57418,6 +57384,19 @@ /obj/structure/sign/departments/xenobio/directional/east, /turf/open/floor/iron, /area/station/maintenance/department/science) +"nFj" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/item/paper_bin, +/obj/item/stamp/cmo, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "nFq" = ( /obj/machinery/computer/warrant{ dir = 1 @@ -58597,6 +58576,14 @@ "nUp" = ( /turf/closed/wall/r_wall, /area/station/engineering/gravity_generator) +"nUr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/large, +/area/station/security/brig) "nUu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59474,21 +59461,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/arrivals) -"ogh" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Infirmary" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/medical) "ogj" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -60415,25 +60387,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"orQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/maintenance/department/security) "orR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60835,13 +60788,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay) -"oyY" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "ozm" = ( /obj/structure/tank_holder/extinguisher, /obj/effect/turf_decal/tile/red, @@ -61513,15 +61459,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"oHn" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/reagent_dispensers/wall/peppertank/directional/south, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "oHo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -62437,6 +62374,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/chapel) +"oTg" = ( +/obj/structure/sink/directional/west, +/obj/machinery/light_switch/directional/east, +/obj/machinery/firealarm/directional/east{ + pixel_x = 38 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/security/medical) "oTs" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -63035,31 +62985,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"pbS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "sci-toxins-passthrough" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/landmark/navigate_destination, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/cable, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "pbU" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -63106,10 +63031,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"pci" = ( -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark, -/area/station/security/medical) "pck" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63954,6 +63875,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) +"plh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig) "pln" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/water_vapor, @@ -65027,6 +64957,12 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel) +"pzJ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/brig) "pzN" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -65036,6 +64972,14 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"pzP" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/brig) "pzS" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -65072,6 +65016,16 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/stone, /area/station/science/xenobiology) +"pAs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/security/brig) "pAu" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/siding/white{ @@ -65190,7 +65144,7 @@ c_tag = "Cargo - Waiting Room"; name = "cargo camera" }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/cargo/lobby) "pBH" = ( @@ -65384,16 +65338,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/main) -"pEg" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "pEi" = ( /turf/open/floor/iron/grimy, /area/station/service/theater/abandoned) @@ -66244,7 +66188,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "pNq" = ( @@ -67042,6 +66986,22 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron, /area/station/maintenance/port) +"pVY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/xenobiology) "pWd" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -67334,6 +67294,21 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/service/library/abandoned) +"pZs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/pen/fourcolor, +/obj/item/stamp/captain, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Captain's Desk"; + req_access = list("captain") + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "pZy" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/structure/closet/secure_closet/medical3, @@ -68388,14 +68363,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"qnz" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/rack, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "qnG" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -68436,6 +68403,14 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"qnU" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "qnY" = ( /turf/closed/wall, /area/station/science/lobby) @@ -68892,6 +68867,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"quH" = ( +/obj/structure/table/glass, +/obj/item/storage/medkit/regular, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -15; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/syringe, +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 + }, +/obj/machinery/vending/wallmed/directional/north, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark, +/area/station/security/medical) "quQ" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -69081,7 +69072,7 @@ }, /obj/machinery/duct, /obj/machinery/light/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -69193,6 +69184,14 @@ dir = 4 }, /area/station/security/prison/workout) +"qyK" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "qyX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69246,13 +69245,6 @@ /obj/structure/cable, /turf/open/floor/iron/vaporwave, /area/station/security/prison/mess) -"qzI" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "qzK" = ( /obj/structure/sign/warning/secure_area/directional/south, /obj/structure/table/reinforced, @@ -69426,12 +69418,6 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"qBA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/office) "qBF" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -70813,19 +70799,6 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) -"qRs" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Kill Room" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "qRu" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "gulagdoor"; @@ -71757,16 +71730,20 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"rfs" = ( -/obj/structure/cable, +"rfG" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Infirmary" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table, -/obj/item/folder/yellow, -/obj/item/stamp/head/qm, -/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, -/area/station/cargo/quartermaster) +/area/station/security/medical) "rfH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -74062,6 +74039,14 @@ }, /turf/open/floor/iron, /area/station/security/warden) +"rIh" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/department/security) "rIk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -75041,6 +75026,11 @@ }, /turf/open/floor/iron, /area/station/security/warden) +"rSg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/station/security/medical) "rSi" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/west{ @@ -75849,21 +75839,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/maintenance/solars/port/fore) -"sdG" = ( -/obj/machinery/door/window/brigdoor{ - dir = 8; - name = "Secure Creature Pen"; - req_access = list("research") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenosecure"; - name = "Secure Pen Shutters" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/delivery, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "sdJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line{ @@ -76052,6 +76027,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/quartermaster) +"sgh" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "sgj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/valve, @@ -77413,11 +77394,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/main) -"syd" = ( -/obj/machinery/status_display/ai/directional/north, -/obj/machinery/computer/operating, -/turf/open/floor/iron/dark, -/area/station/security/medical) "sye" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -77990,13 +77966,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/corporate_showroom) -"sFM" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "sFR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -78149,17 +78118,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) -"sHq" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "sHt" = ( /turf/open/space/basic, /area/space/nearstation) @@ -78211,6 +78169,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/port) +"sIi" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) "sIk" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 @@ -78831,21 +78796,6 @@ dir = 8 }, /area/station/service/chapel) -"sOv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/pen/fourcolor, -/obj/item/stamp/head/captain, -/obj/machinery/door/window/brigdoor/left/directional/north{ - name = "Captain's Desk"; - req_access = list("captain") - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "sOM" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall4"; @@ -79135,6 +79085,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/service/theater) +"sRQ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "sRT" = ( /obj/structure/bookcase/random/adult, /obj/effect/turf_decal/siding/wood{ @@ -79854,25 +79809,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/service/chapel) -"taQ" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/light/cold/directional/east, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/storage/medkit/regular, -/obj/item/clothing/gloves/latex, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/syringe, -/obj/item/storage/box/bodybags, -/obj/item/storage/medkit/regular, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/corner{ - dir = 8 - }, -/area/station/security/medical) "tbd" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -80233,15 +80169,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"tfS" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "tgl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -81188,6 +81115,12 @@ /obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, /area/station/security/prison/garden) +"tsU" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) "tsZ" = ( /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/stripes/corner{ @@ -82989,6 +82922,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"tOP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/brig) "tOS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -84179,6 +84120,19 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ucZ" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/carbon, +/obj/item/stamp/hop, +/obj/machinery/requests_console/directional/north{ + anon_tips_receiver = 1; + assistance_requestable = 1; + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console"; + can_send_announcements = 1 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "udb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -84367,15 +84321,6 @@ /obj/structure/filingcabinet, /turf/open/floor/iron/dark, /area/station/service/library/printer) -"ufA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "ufE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -85145,19 +85090,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"upA" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/item/paper_bin, -/obj/item/stamp/head/cmo, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "upB" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -85450,6 +85382,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) +"uui" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/station/security/medical) "uuj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -85529,19 +85468,6 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron, /area/station/maintenance/department/science) -"uuO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/maintenance/department/security) "uvb" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ dir = 4 @@ -86858,6 +86784,22 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) +"uLG" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) "uLZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -87329,6 +87271,19 @@ }, /turf/open/floor/iron/white, /area/station/service/kitchen/abandoned) +"uQO" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "uQY" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -91125,13 +91080,6 @@ "vNa" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/aft) -"vNf" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/disposalpipe/segment, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "vNi" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -93333,6 +93281,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/pathology) +"wnF" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "wnI" = ( /obj/item/sign, /obj/effect/spawner/random/structure/crate_empty, @@ -93938,6 +93892,18 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"wtv" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/machinery/airalarm/directional/east, +/obj/machinery/light/cold/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/security/medical) "wtz" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -96564,7 +96530,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "xbu" = ( @@ -96787,14 +96753,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"xed" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "xef" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -97363,6 +97321,19 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/security/prison) +"xlF" = ( +/obj/effect/turf_decal/trimline/green/end, +/obj/machinery/growing/tray, +/obj/effect/turf_decal/trimline/green/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/mid_joiner{ + dir = 4 + }, +/turf/open/floor/iron/half{ + dir = 8 + }, +/area/station/service/hydroponics/garden) "xlG" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -97863,6 +97834,20 @@ /obj/machinery/light/small/red/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/security) +"xsH" = ( +/obj/machinery/door/window/brigdoor{ + dir = 8; + name = "Secure Creature Pen"; + req_access = list("research") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenosecure"; + name = "Secure Pen Shutters" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "xsP" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/outlet_injector/on, @@ -98004,15 +97989,6 @@ /obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"xuZ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/obj/machinery/duct, -/turf/open/floor/iron/large, -/area/station/security/brig) "xva" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -98865,24 +98841,9 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"xEe" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/stamp/head/rd, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) "xEt" = ( /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"xEA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/office) "xED" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -99612,10 +99573,6 @@ dir = 8 }, /area/station/service/kitchen) -"xNn" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/closed/wall/r_wall, -/area/station/security/medical) "xNu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/structure/sink/kitchen/directional/south, @@ -99971,6 +99928,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"xRF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) "xRO" = ( /obj/structure/fireplace, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -100425,6 +100390,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port) +"xXI" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/prisoner, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "xXK" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -101310,12 +101286,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"yjb" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white/side, -/area/station/security/medical) "yjn" = ( /obj/structure/extinguisher_cabinet/directional/north{ pixel_x = 6; @@ -120730,7 +120700,7 @@ uhb ebW kNG imx -sdG +xsH umb kNG lZF @@ -121248,7 +121218,7 @@ vxQ vxQ lzc plQ -qRs +dpN qUB qUB nCi @@ -121496,7 +121466,7 @@ bWp gAw xbj aLK -cjh +pVY rdq gwx mgr @@ -124547,7 +124517,7 @@ oez bAR xqG gsV -cCp +lwM fzY tEE tEw @@ -128181,7 +128151,7 @@ qXx kQr jDd jDd -pbS +bxj jDd jDd wEI @@ -131784,7 +131754,7 @@ sLY bCc pML uzo -xEe +iBB dGp czL epF @@ -137401,7 +137371,7 @@ aiO hWq mGw pRS -nbs +ucZ lNA ozz lNA @@ -138480,7 +138450,7 @@ uws dQT vuS pMF -upA +nFj wqz loe gaC @@ -140697,7 +140667,7 @@ gvq wkP wZo dGr -ayQ +xlF qAV daR dla @@ -142796,7 +142766,7 @@ pXK mBd btZ fPn -sOv +pZs jim eoF cXB @@ -147650,7 +147620,7 @@ aad aJE ejX aAU -rfs +meV xhJ vMd tgX @@ -152316,7 +152286,7 @@ pJq tNZ dth avF -orQ +clE avF rYA qkC @@ -152573,7 +152543,7 @@ nht oXV fIj hie -hpF +rIh ewb avF mEb @@ -152803,34 +152773,34 @@ sFW meT fOH fOH -lFi -gyV -oyY -dXC -xuZ -xed -sHq -euh -iSY -pEg -ufA +lmG +qnU +wnF +sRQ +nUr +sIi +pAs +dbw +cOE +plh +tOP wUY -mmh +jPR wUY -dRn +gTb wUY -cQa +jDB wUY -vNf +kKa qFA -vNf -hrC -tfS -sFM -bCg -hTF -uuO -brJ +kKa +lzJ +pzP +pzJ +tsU +aeY +hPx +bJC ieh tuv vHY @@ -153060,7 +153030,7 @@ vCk owO owO dxT -bXh +nuc flD cDm owO @@ -153317,7 +153287,7 @@ lET hQq cjN hQq -lKV +uLG jXt hQq cjN @@ -153566,15 +153536,15 @@ hLz iCo nYt lET -fBH -eWX -mSb -jOW +hpe +uQO +gmr +dvh pWT eVE nzR gKp -leP +gDP rTG nsG ozu @@ -153823,15 +153793,15 @@ hLz iuk puN lET -gPN -feQ -eMX -dNu -ogh -gDU -fGx -qBA -xEA +keC +krP +mjr +rSg +rfG +ymb +mIb +jkw +xRF wdM cbX one @@ -154080,9 +154050,9 @@ mcb iCo spB lET -syd -pci -yjb +lET +auu +uui rJR fcE ymb @@ -154336,11 +154306,11 @@ ouc mcb iCo krO -xNn -bGI -fUZ -taQ -hoy +qyK +lET +quH +wtv +oTg pWT mif qlN @@ -154592,8 +154562,8 @@ tAn lMN mcb iCo -oHn -lET +krO +bqE lET lET lET @@ -154850,7 +154820,7 @@ hPN hLz iCo krO -jGU +xXI qIH aaa aaa @@ -155105,9 +155075,9 @@ uuf kPY xPz hLz -qzI -yiA -qnz +sgh +lTJ +gJk qIH etw qYo @@ -155364,7 +155334,7 @@ lAj vxs kiB krO -iPO +kSg qIH aaa aaa @@ -156914,7 +156884,7 @@ bRF gby jfR lPV -kqT +hrq bAS uTM nHJ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 56f44ae5a0d361..7fd5cb2cc1bcf6 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1441,12 +1441,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/lobby) -"ayf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "aym" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/red{ @@ -2122,6 +2116,16 @@ /obj/machinery/holopad, /turf/open/floor/iron/large, /area/station/commons/storage/tools) +"aKt" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Security Medpost" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "aKG" = ( /obj/structure/table, /turf/open/floor/iron/smooth, @@ -2718,16 +2722,6 @@ /obj/structure/sign/departments/maint/alt, /turf/closed/wall, /area/station/maintenance/department/medical/morgue) -"aUE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/processing) "aUK" = ( /obj/machinery/camera/directional/west{ c_tag = "Engineering Equipment Storage" @@ -3012,16 +3006,6 @@ /obj/item/kirbyplants/potty, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"aZv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/brig/upper) "aZx" = ( /obj/machinery/camera/directional/east{ c_tag = "Telecomms Monitoring"; @@ -3377,7 +3361,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "ben" = ( @@ -4365,18 +4349,6 @@ "btU" = ( /turf/closed/wall, /area/station/medical/morgue) -"bui" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Security Medpost"; - req_access = list("security") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "bum" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -5583,6 +5555,19 @@ /obj/structure/closet, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"bLI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Transport Parlor" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron, +/area/station/security/processing) "bLL" = ( /obj/structure/sink/kitchen/directional/west{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -5709,16 +5694,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/cryo) -"bNP" = ( -/obj/structure/table, -/obj/item/folder/white, -/obj/item/pen, -/obj/item/stamp/head/rd{ - pixel_x = 3; - pixel_y = -2 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) "bOg" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6388,6 +6363,16 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/smooth, /area/station/security/execution/transfer) +"bYF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/security/processing) "bYK" = ( /obj/effect/landmark/start/chemist, /obj/structure/chair/office/light{ @@ -6801,14 +6786,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ceA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/fore) "ceE" = ( /obj/machinery/door/airlock/virology/glass{ name = "Isolation B" @@ -7475,7 +7452,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/fore) "coB" = ( @@ -7525,21 +7502,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"cpk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Upper Brig South" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig/upper) "cpl" = ( /obj/machinery/camera/directional/south{ c_tag = "Atmospherics Storage Room - East" @@ -10124,18 +10086,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"dcv" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance{ - name = "Transport Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/processing) "dcw" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/hollow/reinforced/middle, @@ -10298,6 +10248,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"dez" = ( +/obj/structure/table, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/stamp/rd{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "deN" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/misc/asteroid/snow/icemoon, @@ -10863,17 +10823,6 @@ }, /turf/closed/wall, /area/station/maintenance/starboard/upper) -"doE" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Security - Infirmary" - }, -/obj/machinery/light_switch/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "doG" = ( /obj/structure/rack, /obj/machinery/light/small/directional/north, @@ -12115,17 +12064,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/station/tcommsat/computer) -"dKk" = ( -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/regular, -/obj/structure/table/reinforced/rglass, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "dKl" = ( /obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -12174,6 +12112,19 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/sorting) +"dKP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/processing) "dKS" = ( /obj/structure/sign/warning/electric_shock/directional/south, /obj/effect/decal/cleanable/dirt, @@ -13303,11 +13254,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"efV" = ( -/obj/structure/table, -/obj/item/stamp/head/qm, -/turf/open/floor/carpet, -/area/station/cargo/quartermaster) "ega" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, @@ -14049,13 +13995,6 @@ /obj/item/lipstick/random, /turf/open/floor/iron, /area/station/commons/locker) -"erK" = ( -/obj/structure/reagent_dispensers/plumbed{ - name = "dormitory water reservoir"; - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/fore) "erN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14068,10 +14007,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"erV" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "erY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14944,6 +14879,10 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/wood, /area/station/commons/dorms) +"eGj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "eGl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/event_spawn, @@ -16225,12 +16164,12 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen/diner) "fbt" = ( /obj/effect/turf_decal/tile/green, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/central) "fbK" = ( @@ -16910,12 +16849,6 @@ /obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/iron/dark, /area/station/science/breakroom) -"foI" = ( -/obj/structure/reagent_dispensers/watertank{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/fore) "foN" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -17162,19 +17095,6 @@ }, /turf/closed/wall, /area/station/hallway/primary/central) -"fsD" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security Vestibule" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/iron/smooth, -/area/station/security/processing) "fsF" = ( /obj/effect/spawner/structure/window, /obj/effect/mapping_helpers/broken_floor, @@ -17348,6 +17268,16 @@ /obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"fwh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) "fwm" = ( /obj/effect/turf_decal/plaque{ icon_state = "L14" @@ -17783,6 +17713,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/service/janitor) +"fEA" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + name = "Transport Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/security/processing) "fEC" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -18250,6 +18191,12 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/science/research) +"fLX" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "fLY" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser{ @@ -18908,16 +18855,6 @@ /obj/structure/curtain/cloth, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) -"fZr" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig/upper) "fZT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -19485,6 +19422,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"ghI" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/directional/east, +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/stamp/cmo, +/obj/item/clothing/neck/stethoscope, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "ghJ" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -19770,13 +19718,6 @@ /obj/item/stock_parts/subspace/treatment, /turf/open/floor/plating, /area/station/engineering/storage/tech) -"gmM" = ( -/obj/machinery/light/directional/north, -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "gmO" = ( /obj/structure/frame/machine, /obj/item/circuitboard/machine/chem_master, @@ -19969,19 +19910,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) -"gqe" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/duct, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/security/processing) "gqh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink/kitchen/directional/north{ @@ -20980,15 +20908,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"gGL" = ( -/obj/structure/table/reinforced, -/obj/effect/landmark/event_spawn, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/item/paper/monitorkey, -/obj/item/stamp/head/ce, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) "gGZ" = ( /obj/machinery/computer/bank_machine, /obj/effect/turf_decal/bot_white, @@ -21745,6 +21664,18 @@ /obj/item/trash/sosjerky, /turf/open/floor/plating, /area/station/maintenance/fore) +"gUs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/security/processing) "gUx" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -22023,10 +21954,6 @@ /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/medical/pathology) -"gZd" = ( -/obj/machinery/computer/operating, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "gZj" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, @@ -22409,16 +22336,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/service/library) -"hfg" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig/upper) "hfh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22634,12 +22551,6 @@ /obj/machinery/electroplater, /turf/open/floor/wood, /area/station/smithing) -"hkd" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/closed/wall/r_wall, -/area/station/security/medical) "hke" = ( /obj/machinery/light/directional/east, /obj/structure/cable, @@ -22970,9 +22881,6 @@ dir = 1 }, /area/station/commons/storage/art) -"hqw" = ( -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "hqx" = ( /obj/effect/landmark/start/assistant, /obj/structure/disposalpipe/segment, @@ -23308,11 +23216,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"hwo" = ( -/obj/effect/turf_decal/stripes/end, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "hwu" = ( /obj/machinery/door/poddoor/preopen{ id = "lawyer_blast"; @@ -23822,14 +23725,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) -"hGK" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/fore) "hHb" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/hallway) @@ -24331,6 +24226,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"hQd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "hQi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24535,7 +24435,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "hTo" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/port) "hTt" = ( @@ -25519,6 +25419,14 @@ /obj/structure/transit_tube/horizontal, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +"ijU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/brig/upper) "ijY" = ( /obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, @@ -25710,12 +25618,6 @@ /obj/item/clothing/mask/breath, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"imQ" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/light/directional/north, -/obj/structure/table/optable, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "imU" = ( /obj/machinery/artifact_zapper{ dir = 4 @@ -25880,17 +25782,6 @@ "ipf" = ( /turf/open/genturf, /area/icemoon/underground/unexplored/rivers/deep/shoreline) -"ipi" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Xenobiology Maintenance" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "ipw" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, @@ -25926,6 +25817,13 @@ /obj/structure/cable, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) +"ipP" = ( +/obj/structure/bed, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "ipZ" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -26265,6 +26163,16 @@ "iwf" = ( /turf/closed/wall/r_wall, /area/mine/mechbay) +"iwx" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Xenobiology Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "iwz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26859,12 +26767,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) -"iHf" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/closed/wall/r_wall, -/area/station/security/medical) "iHm" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/firealarm/directional/west, @@ -27111,6 +27013,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"iLe" = ( +/obj/item/radio/intercom/directional/north, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "iLf" = ( /obj/machinery/atmospherics/pipe/smart/simple/brown/visible, /turf/open/floor/iron, @@ -28116,6 +28025,15 @@ /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) +"jaw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) "jaN" = ( /obj/machinery/suit_storage_unit/atmos, /obj/effect/turf_decal/stripes/line{ @@ -28600,6 +28518,15 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"jjt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) "jjx" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -30700,16 +30627,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"jSE" = ( -/obj/structure/table, -/obj/item/paper_bin/carbon{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/item/stamp/head/hop, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "jSL" = ( /obj/structure/stairs/east, /turf/open/floor/plating, @@ -31236,6 +31153,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"kcc" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Infirmary" + }, +/obj/machinery/light_switch/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "kce" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ color = "#ff0000"; @@ -31343,6 +31270,13 @@ /obj/structure/flora/grass/brown/style_3, /turf/open/misc/asteroid/snow/standard_air, /area/station/science/research) +"kdT" = ( +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "kdW" = ( /obj/machinery/camera/directional/south{ c_tag = "Customs Security Checkpoint" @@ -31876,17 +31810,6 @@ "klc" = ( /turf/closed/wall, /area/station/medical/cryo) -"klh" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/light/directional/east, -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/stamp/head/cmo, -/obj/item/clothing/neck/stethoscope, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "klk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -32168,6 +32091,9 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/carpet, /area/station/service/library) +"kqc" = ( +/turf/closed/wall, +/area/station/security/medical) "kqh" = ( /obj/structure/chair/wood{ dir = 8 @@ -32900,16 +32826,6 @@ /obj/item/storage/medkit/regular, /turf/open/floor/iron, /area/station/command/bridge) -"kBx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/landmark/event_spawn, -/obj/structure/chair/office, -/obj/effect/landmark/start/brig_physician, -/obj/machinery/duct, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "kBL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -33819,6 +33735,10 @@ /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"kQE" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/station/maintenance/fore) "kQM" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -33910,7 +33830,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/central) "kRE" = ( @@ -34433,6 +34353,18 @@ }, /turf/open/floor/carpet/blue, /area/station/medical/psychology) +"law" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security Vestibule" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/smooth, +/area/station/security/processing) "laD" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -34620,19 +34552,6 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/circuit/green, /area/mine/mechbay) -"ldg" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig/upper) "ldi" = ( /obj/structure/table, /obj/item/wallframe/camera, @@ -36625,15 +36544,6 @@ "lLm" = ( /turf/open/floor/iron/cafeteria, /area/station/maintenance/port/aft) -"lLJ" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig/upper) "lLN" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, @@ -37283,19 +37193,6 @@ }, /turf/closed/wall, /area/station/commons/dorms/laundry) -"lWp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/processing) "lWw" = ( /obj/machinery/firealarm/directional/north, /obj/structure/chair, @@ -37942,11 +37839,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"mjb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "mjg" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine/n2o, @@ -38687,19 +38579,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"mwe" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig/upper) "mwh" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -38937,22 +38816,6 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/security/prison/rec) -"mAP" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/poddoor/preopen{ - id = "xenobiomain"; - name = "Containment Blast Door" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "mAV" = ( /obj/machinery/camera/directional/east{ c_tag = "Garden" @@ -38989,6 +38852,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"mBK" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "mBQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -40153,6 +40023,15 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"mWM" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/brig/upper) "mWU" = ( /obj/machinery/light/directional/west, /obj/machinery/status_display/evac/directional/west, @@ -40904,14 +40783,6 @@ /obj/structure/mirror/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/security/prison/toilet) -"nhr" = ( -/obj/item/clothing/gloves/latex, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/table/reinforced/rglass, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "nhw" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41690,16 +41561,6 @@ }, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"nsh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/processing) "nsi" = ( /obj/machinery/door/airlock/external{ name = "Construction Zone" @@ -41738,6 +41599,18 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"nsL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/processing) "nsO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, @@ -42294,6 +42167,35 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"nBx" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - HoS Office" + }, +/obj/item/flashlight/lamp/green{ + on = 0; + pixel_x = -6; + pixel_y = 16 + }, +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/stamp/hos{ + pixel_x = 10; + pixel_y = 6 + }, +/obj/machinery/recharger{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/machinery/airalarm/directional/west, +/obj/item/phone{ + pixel_x = -9; + pixel_y = 7 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hos) "nBB" = ( /obj/machinery/power/smes, /obj/structure/cable, @@ -43256,6 +43158,16 @@ /obj/item/pillow/random, /turf/open/floor/carpet, /area/station/commons/dorms) +"nOv" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/security_assistant, +/turf/open/floor/iron, +/area/station/security/brig/upper) "nOw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -43546,6 +43458,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"nSH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "nSK" = ( /obj/structure/sign/departments/xenobio/directional/west, /obj/effect/spawner/random/structure/crate, @@ -43761,6 +43682,11 @@ /obj/item/plate, /turf/open/floor/iron/checker, /area/station/maintenance/port/fore) +"nWk" = ( +/obj/structure/table, +/obj/item/stamp/qm, +/turf/open/floor/carpet, +/area/station/cargo/quartermaster) "nWr" = ( /obj/machinery/growing/soil{ pixel_y = 8 @@ -43960,22 +43886,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"oag" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/south{ - c_tag = "Security - Vestibule" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/processing) "oal" = ( /obj/machinery/light/directional/south, /obj/machinery/computer/records/security{ @@ -45264,11 +45174,6 @@ /obj/structure/cable, /turf/closed/wall/r_wall, /area/station/hallway/secondary/exit/departure_lounge) -"ovq" = ( -/obj/structure/closet/secure_closet/brig_physician, -/obj/item/clothing/suit/jacket/straight_jacket, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "ovt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46140,6 +46045,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"oIC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) "oIJ" = ( /obj/effect/landmark/start/medical_doctor, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -46369,20 +46281,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"oNt" = ( -/obj/machinery/door/poddoor/preopen{ - id = "misclab"; - name = "Test Chamber Blast Door" - }, -/obj/machinery/door/window/left/directional/south{ - dir = 8; - name = "Test Chamber"; - req_access = list("xenobiology") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "oNA" = ( /obj/effect/turf_decal/bot, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -46791,7 +46689,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "oUE" = ( @@ -47483,17 +47381,6 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/maintenance/department/electrical) -"pfQ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/processing) "pgi" = ( /obj/machinery/status_display/evac/directional/west, /obj/machinery/light/small/directional/west, @@ -50547,20 +50434,6 @@ dir = 8 }, /area/station/service/chapel) -"qeT" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/south{ - c_tag = "Security - Transport Parlor" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/processing) "qfe" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral/diagonal_edge, @@ -50962,21 +50835,6 @@ /obj/structure/sign/warning/gas_mask, /turf/closed/wall/r_wall, /area/station/hallway/secondary/exit/departure_lounge) -"qmY" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Labor Shuttle Dock" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/processing) "qna" = ( /obj/machinery/camera/directional/east{ c_tag = "Security - Permabrig Chapel"; @@ -52462,6 +52320,19 @@ /obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, /area/station/service/lawoffice) +"qLN" = ( +/obj/machinery/door/poddoor/preopen{ + id = "misclab"; + name = "Test Chamber Blast Door" + }, +/obj/machinery/door/window/left/directional/south{ + dir = 8; + name = "Test Chamber"; + req_access = list("xenobiology") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/engine, +/area/station/science/xenobiology) "qLX" = ( /obj/effect/decal/cleanable/dirt, /obj/item/toy/basketball, @@ -52681,6 +52552,21 @@ /obj/structure/lattice/catwalk, /turf/open/openspace/icemoon, /area/station/science/server) +"qOP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Vestibule" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/processing) "qOW" = ( /obj/structure/sign/warning/biohazard/directional/west, /turf/open/openspace, @@ -52812,20 +52698,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"qRc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/processing) "qRk" = ( /obj/item/chair/wood, /turf/open/floor/carpet, @@ -53991,13 +53863,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"rkq" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig/upper) "rkt" = ( /obj/structure/cable, /obj/machinery/light/directional/east, @@ -54490,6 +54355,14 @@ }, /turf/open/floor/iron/textured, /area/mine/mechbay) +"rud" = ( +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "ruo" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -54596,7 +54469,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "rwQ" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/central) "rwW" = ( @@ -55959,6 +55832,20 @@ /obj/structure/gulag_beacon, /turf/open/floor/iron, /area/mine/laborcamp) +"rTX" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Labor Shuttle Dock" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/security/processing) "rUb" = ( /obj/structure/railing, /obj/machinery/flasher/portable, @@ -56462,6 +56349,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"scu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig/upper) "scw" = ( /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) @@ -57651,13 +57545,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"svV" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "swc" = ( /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, @@ -59915,18 +59802,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"tki" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig/upper) "tkk" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -60230,6 +60105,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) +"tpj" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/brig/upper) "tpx" = ( /obj/machinery/material_analyzer, /turf/open/floor/wood, @@ -60256,6 +60137,18 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"tpX" = ( +/obj/item/storage/box/bodybags, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/reagent_containers/syringe{ + name = "steel point" + }, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "tqb" = ( /obj/machinery/siren/weather, /turf/open/misc/asteroid/snow/icemoon, @@ -60588,19 +60481,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"twa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/duct, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/security/processing) "twt" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -61084,6 +60964,12 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"tDk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig/upper) "tDv" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -62289,7 +62175,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/commons/fitness) "tYe" = ( @@ -63164,10 +63050,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/security/prison/safe) -"ulQ" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "uma" = ( /obj/item/chisel, /obj/item/storage/toolbox/artistic, @@ -64367,6 +64249,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/visit) +"uHF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/fore) "uHS" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -64723,12 +64612,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) -"uNM" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/stamp/head/captain, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "uNX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65537,35 +65420,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"vcI" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Security - HoS Office" - }, -/obj/item/flashlight/lamp/green{ - on = 0; - pixel_x = -6; - pixel_y = 16 - }, -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/stamp/head/hos{ - pixel_x = 10; - pixel_y = 6 - }, -/obj/machinery/recharger{ - pixel_x = -4; - pixel_y = -1 - }, -/obj/machinery/airalarm/directional/west, -/obj/item/phone{ - pixel_x = -9; - pixel_y = 7 - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/hos) "vcO" = ( /obj/machinery/vending/wardrobe/chap_wardrobe, /turf/open/floor/iron/dark, @@ -65883,6 +65737,20 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"vhL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/station/security/processing) "vhT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ @@ -66780,6 +66648,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) +"vxc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "vxd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -67294,6 +67169,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/atmos) +"vEA" = ( +/obj/structure/table, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/stamp/hop, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "vEE" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67950,6 +67835,15 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"vRN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/security/processing) "vRO" = ( /obj/machinery/mineral/unloading_machine{ dir = 1; @@ -67989,13 +67883,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"vSh" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/table/reinforced/rglass, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "vSi" = ( /turf/closed/wall, /area/mine/eva) @@ -68104,17 +67991,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"vTD" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/brig/upper) "vTJ" = ( /obj/structure/table, /obj/item/toy/plush/slimeplushie{ @@ -68199,13 +68075,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"vWd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/reagent_containers/blood, -/obj/machinery/iv_drip, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "vWe" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -68887,6 +68756,17 @@ dir = 4 }, /area/station/science/xenobiology) +"whd" = ( +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/regular, +/obj/structure/table/glass, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "whf" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /turf/open/floor/glass/reinforced, @@ -69346,6 +69226,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"wox" = ( +/obj/structure/table/reinforced, +/obj/effect/landmark/event_spawn, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/paper/monitorkey, +/obj/item/stamp/ce, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "woF" = ( /obj/machinery/modular_computer/preset/cargochat/medical{ dir = 1 @@ -70036,6 +69925,18 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"wAq" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Upper Brig South" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) "wAv" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -70228,20 +70129,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) -"wCR" = ( -/obj/item/storage/box/bodybags, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/item/reagent_containers/syringe{ - name = "steel point" - }, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/structure/table/reinforced/rglass, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/item/roller, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "wCU" = ( /obj/structure/cable, /obj/structure/table, @@ -73265,6 +73152,21 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"xyn" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor/preopen{ + id = "xenobiomain"; + name = "Containment Blast Door" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/xenobiology) "xyx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73403,6 +73305,15 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"xAQ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) "xAS" = ( /obj/item/seeds/apple, /obj/item/seeds/banana, @@ -74157,6 +74068,11 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) +"xMn" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/holopad, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "xMq" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/explored) @@ -74385,6 +74301,18 @@ dir = 1 }, /area/mine/eva/lower) +"xQG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/processing) "xQO" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/directional/west, @@ -75184,21 +75112,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) -"ydk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/duct, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/station/security/processing) "ydt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -75539,6 +75452,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"ykW" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/stamp/captain, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "ykZ" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/item/radio/intercom/directional/east, @@ -184752,7 +184671,7 @@ ffe pXj cZT qSE -oNt +qLN cZT cZT pXj @@ -185013,7 +184932,7 @@ hRC euM mVO sfv -mAP +xyn dmj rXD rXD @@ -186292,7 +186211,7 @@ alM oxO ffe ffe -ipi +iwx ffe ffe xwd @@ -227645,7 +227564,7 @@ sdi tKI ouZ vGC -efV +nWk sim bAa xal @@ -233312,7 +233231,7 @@ rpu ybI nnR tuz -jSE +vEA bhK rAA cpm @@ -235305,7 +235224,7 @@ nbp mgU nlz ioi -vcI +nBx azx tDw rhf @@ -235569,8 +235488,8 @@ eDM xFm tGB nCh -aZv -vTD +fwh +ijU bqG lbk fqH @@ -235823,11 +235742,11 @@ kGc kWh qVJ mgU -kzw -kzw -kzw -hkd -cpk +kqc +kqc +kqc +wAq +jaw xwf aPd cUf @@ -236080,12 +235999,12 @@ loI ehy sBt mgU -hwo -doE -ovq -wCR -tki -lLJ +fLX +kcc +tpX +oIC +jjt +tpj jNp jNp jNp @@ -236337,11 +236256,11 @@ bUx bUx bUx bUx -gmM -mjb -ulQ -erV -tki +mBK +eGj +xMn +cAC +jjt bRG hfA idv @@ -236594,11 +236513,11 @@ bUx jOQ bxQ bUx -vSh -kBx -ayf -bui -hfg +ipP +vxc +aKt +tDk +jjt lUw iWS vwt @@ -236851,12 +236770,12 @@ bUx xmO ubE bUx -imQ +iLe aOS -hqw -nhr -ldg -bRG +rud +cAC +mWM +scu pmr qPp ryG @@ -236947,7 +236866,7 @@ mBB mQH ojv htc -gGL +wox vTi qKQ aTj @@ -237108,12 +237027,12 @@ bUx xmO deY bUx -gZd -vWd -svV -dKk -ldg -rkq +kdT +hQd +whd +cAC +mWM +bRG kpj fGq eig @@ -237368,8 +237287,8 @@ bUx kzw kzw kzw -iHf -mwe +cAC +xAQ mEI jNp jNp @@ -237414,7 +237333,7 @@ oRk mvc mvc rAW -uNM +ykW ghJ uEm sqU @@ -237623,10 +237542,10 @@ eyb gck ykw fXi -ydk -fsD +vhL +law eqI -fZr +nOv wAT lbk bln @@ -237880,7 +237799,7 @@ rVy wOc lEj cKv -twa +nsL eyb hAQ ksC @@ -238137,7 +238056,7 @@ clq qgO qgO qgO -lWp +xQG ykw mfH cIY @@ -238394,7 +238313,7 @@ rVy lEj fCW nUg -qRc +dKP ykw ybD kfc @@ -238651,7 +238570,7 @@ mvl mvl kkl ezO -oag +qOP ykw nOQ cqx @@ -238908,7 +238827,7 @@ bLd dAa kkl dhU -lWp +xQG olY hQi mAl @@ -239165,7 +239084,7 @@ bEf iME tsH bLb -lWp +xQG ykw pDB wNt @@ -239422,7 +239341,7 @@ nsO eWB kkl rEP -lWp +xQG ykw jpE gnL @@ -239679,7 +239598,7 @@ bnM mWq kkl viO -gqe +gUs ykw lbk lbk @@ -239936,7 +239855,7 @@ kkl kkl kkl eyb -qmY +rTX ykw bln bln @@ -240193,7 +240112,7 @@ arT eyb iKS xIk -pfQ +bYF ykw bUx bUx @@ -240450,7 +240369,7 @@ ufm eyb wug uLF -aUE +nSH hqi dKA deY @@ -240707,7 +240626,7 @@ bOg hFC xyS fhu -qeT +bLI ykw skl deY @@ -240964,10 +240883,10 @@ blT ntq cWG ekW -nsh -dcv -ceA -hGK +vRN +fEA +uHF +eqq eqq qdK eqq @@ -241223,12 +241142,12 @@ aML hPq hSJ ykw -erK -foI deY deY deY deY +kQE +deY fhz deY fhz @@ -247699,7 +247618,7 @@ vBG wvW lmM vBG -klh +ghI oMR hsC vBG @@ -251827,7 +251746,7 @@ jbU iyP dUe ank -bNP +dez fUM vaQ jbU diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5c953f9801aa43..aba32bd4f1ab90 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -587,49 +587,6 @@ }, /turf/open/floor/plating, /area/station/security/execution/transfer) -"agL" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/pen/fountain, -/obj/item/stamp{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/stamp/denied{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/stamp/head/qm{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/item/lighter{ - pixel_x = 11; - pixel_y = -7 - }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = 10; - pixel_y = -1 - }, -/obj/item/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 7 - }, -/turf/open/floor/carpet/orange, -/area/station/cargo/quartermaster) "ahz" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -1836,10 +1793,6 @@ "aAu" = ( /turf/open/floor/plating, /area/station/security/prison/mess) -"aAI" = ( -/obj/machinery/duct, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "aAP" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, @@ -2707,13 +2660,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) -"aQS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "aRI" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -3336,15 +3282,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark, /area/station/command/bridge) -"bdx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "bdF" = ( /obj/machinery/door/airlock/engineering{ name = "Emergency Storage" @@ -4352,21 +4289,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) -"bvP" = ( -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/item/stamp/head/captain{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/pen/fountain/captain, -/obj/item/radio/intercom/directional/south, -/obj/structure/table/wood, -/turf/open/floor/carpet/royalblue, -/area/station/command/heads_quarters/captain) "bvR" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -5594,6 +5516,13 @@ /obj/structure/transit_tube/diagonal/topleft, /turf/open/space/basic, /area/space/nearstation) +"bRo" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "bRv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -7190,19 +7119,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"cmb" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/bodycontainer/crematorium{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "cme" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/tile/brown/opposingcorners{ @@ -8344,6 +8260,26 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"cHI" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/pen/fourcolor, +/obj/item/stamp/hop{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "cHL" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/stripes/line{ @@ -9141,19 +9077,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) -"cWs" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/effect/mapping_helpers/airlock/access/any/science/genetics, -/obj/effect/decal/cleanable/dirt, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "cWu" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -9475,6 +9398,16 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/fore) +"dbR" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "dbW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11022,25 +10955,6 @@ /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"dyH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop, -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "dyK" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -15433,6 +15347,49 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/cargo/warehouse) +"eYb" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/pen/fountain, +/obj/item/stamp{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/stamp/denied{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/stamp/qm{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/pen, +/obj/item/lighter{ + pixel_x = 11; + pixel_y = -7 + }, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = 10; + pixel_y = -1 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 7 + }, +/turf/open/floor/carpet/orange, +/area/station/cargo/quartermaster) "eYd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16472,6 +16429,20 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"fnp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/door/window/left/directional/south{ + dir = 1; + name = "Maximum Security Test Chamber" + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/full, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "fnu" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -16700,35 +16671,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"frB" = ( -/obj/structure/table/wood, -/obj/item/storage/photo_album{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/taperecorder{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/camera, -/obj/item/pen{ - pixel_x = -7; - pixel_y = -5 - }, -/obj/machinery/light/small/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Library Backroom"; - name = "library camera" - }, -/obj/structure/sign/painting/large/library_private{ - dir = 8; - pixel_x = -29 - }, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/item/radio/radio_mic, -/turf/open/floor/iron/dark, -/area/station/service/library) "frO" = ( /turf/closed/wall/r_wall, /area/station/science/genetics) @@ -17305,18 +17247,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"fAb" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/obj/structure/grille/broken, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "fAp" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -17715,6 +17645,21 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) +"fEr" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/table/glass, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/healthanalyzer, +/obj/item/clothing/gloves/latex, +/turf/open/floor/iron/dark, +/area/station/security/medical) "fEu" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -17746,6 +17691,14 @@ /obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) +"fEI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) "fEP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -18215,23 +18168,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/central) -"fLz" = ( -/obj/machinery/door/poddoor/preopen{ - id = "prisonblast"; - name = "Prison Blast Door" - }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/button/door/directional/north{ - id = "prisonblast"; - name = "Prison Lockdown"; - req_access = list("brig") - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/brig) "fLD" = ( /obj/machinery/power/terminal{ dir = 8 @@ -19292,20 +19228,6 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office) -"gdY" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-maint-passthrough" - }, -/obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "gel" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -19470,18 +19392,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"ggK" = ( -/obj/structure/cable, -/obj/structure/table/wood, -/obj/item/stamp/head/hos, -/obj/item/stamp/denied{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/red, -/obj/item/clipboard, -/turf/open/floor/carpet/red, -/area/station/command/heads_quarters/hos) "ggS" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance) @@ -20528,10 +20438,6 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/science/lab) -"gxB" = ( -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "gyb" = ( /turf/open/floor/plating/rust, /area/station/security/prison) @@ -20619,6 +20525,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"gzh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "gzm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21086,7 +21003,7 @@ name = "service camera" }, /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "gHA" = ( @@ -22152,6 +22069,15 @@ /obj/item/radio/intercom/prison/directional/west, /turf/open/floor/iron, /area/station/security/prison/garden) +"haZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "hbf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22332,20 +22258,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/bitden) -"hdW" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/brig_physician, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "hea" = ( /obj/effect/turf_decal/siding/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -22446,6 +22358,17 @@ }, /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) +"hfP" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security{ + name = "Prison Wing" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-maint-passthrough" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "hfR" = ( /obj/structure/flora/bush/flowers_br/style_random, /mob/living/basic/chicken/brown{ @@ -22558,24 +22481,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/lab) -"hhF" = ( -/obj/structure/table/reinforced, -/obj/item/folder/blue{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/yellow, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/folder{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/lighter, -/obj/item/clothing/mask/cigarette/cigar/cohiba, -/obj/item/stamp/head/ce, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "hib" = ( /obj/machinery/door/airlock/maintenance/external{ name = "Construction Zone" @@ -23045,16 +22950,6 @@ /obj/item/hand_labeler, /turf/open/floor/iron/dark, /area/station/engineering/lobby) -"hnF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "hnL" = ( /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -23359,6 +23254,18 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/storage/art) +"hsQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/storage/secure/briefcase{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "htn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners, @@ -23495,16 +23402,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) -"hwo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "hwA" = ( /turf/closed/wall/rust, /area/station/maintenance/solars/starboard/aft) @@ -26466,6 +26363,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) +"inI" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "ios" = ( /turf/closed/wall/rust, /area/station/service/kitchen) @@ -29529,6 +29433,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"jgv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/medical/glass{ + name = "Infirmary" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/dark, +/area/station/security/medical) "jgz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -29700,6 +29615,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"jiZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "jjf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30173,16 +30099,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"jsC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark_red{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "jsI" = ( /obj/structure/hoop{ dir = 8 @@ -30377,18 +30293,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"jwz" = ( -/obj/structure/bodycontainer/morgue, -/obj/effect/turf_decal/delivery, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "jwQ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -30770,7 +30674,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "jDU" = ( @@ -30905,26 +30809,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"jGK" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/pen/fourcolor, -/obj/item/stamp/head/hop{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "jGU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -30955,6 +30839,29 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/service/janitor) +"jHN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/bed{ + dir = 1 + }, +/obj/item/bedsheet/medical{ + dir = 1 + }, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "jHR" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -31339,6 +31246,13 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/aft) +"jMh" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "jMo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31403,6 +31317,24 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"jNM" = ( +/obj/structure/table/reinforced, +/obj/item/folder/blue{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/folder{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/lighter, +/obj/item/clothing/mask/cigarette/cigar/cohiba, +/obj/item/stamp/ce, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "jNR" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -32384,18 +32316,6 @@ /obj/structure/sign/warning/biohazard, /turf/closed/wall, /area/station/maintenance/starboard) -"khV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "kii" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/neon_lining{ @@ -32702,49 +32622,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/white, /area/station/security/prison/safe) -"koo" = ( -/obj/structure/table/wood, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/item/device/walkman{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/cassette_rack/prefilled, -/turf/open/floor/iron/dark, -/area/station/service/library) "kox" = ( /obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, @@ -33115,18 +32992,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/station/service/chapel/dock) -"kwq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/mapping_helpers/burnt_floor, -/obj/structure/reagent_dispensers/plumbed{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "kwu" = ( /obj/machinery/camera/directional/south{ c_tag = "Xenobiology Entrance"; @@ -33758,24 +33623,6 @@ /obj/structure/reagent_dispensers/servingdish, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"kGZ" = ( -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/machinery/recharger{ - pixel_x = -3 - }, -/obj/structure/cable, -/obj/item/toy/figure/rd{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/stamp/head/rd{ - pixel_x = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "kHh" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34136,6 +33983,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"kNe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "kNf" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -35397,19 +35256,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore) -"lha" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/security/execution/transfer) "lhf" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -40249,19 +40095,6 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/security/office) -"mLZ" = ( -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "mMb" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/cobweb, @@ -40462,6 +40295,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/satellite) +"mPG" = ( +/obj/machinery/vending/wallmed/directional/east, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/dark, +/area/station/security/medical) "mPP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41403,18 +41242,6 @@ /obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"ndy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Prison Wing" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-maint-passthrough" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "ndP" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /obj/effect/decal/cleanable/dirt, @@ -41786,6 +41613,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/detectives_office) +"nmc" = ( +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "nml" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -42051,15 +41890,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"npE" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "npR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall, @@ -42757,6 +42587,15 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) +"nCF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) "nCI" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/dark, @@ -44175,6 +44014,14 @@ }, /turf/open/floor/plating, /area/station/security/prison/safe) +"oes" = ( +/obj/structure/table/optable, +/obj/machinery/button/crematorium/indestructible{ + pixel_x = 22 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/medical) "oeF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, @@ -44960,6 +44807,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) +"oux" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "ouC" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -47772,6 +47627,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/courtroom) +"pon" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/brig) "pop" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47782,17 +47646,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"pov" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Infirmary" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "poK" = ( /obj/machinery/suit_storage_unit/ce, /obj/effect/turf_decal/delivery, @@ -49204,17 +49057,6 @@ /obj/machinery/station_map/engineering/directional/east, /turf/open/floor/carpet/orange, /area/station/cargo/quartermaster) -"pMR" = ( -/obj/structure/table/optable, -/obj/machinery/button/crematorium/indestructible{ - pixel_x = 22 - }, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "pMS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49350,6 +49192,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/garden) +"pOS" = ( +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/stamp/captain{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/pen/fountain/captain, +/obj/item/radio/intercom/directional/south, +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/captain) "pOV" = ( /turf/closed/wall, /area/station/service/chapel/storage) @@ -49653,6 +49510,12 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"pUm" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "pUA" = ( /obj/structure/table/reinforced, /obj/structure/disposalpipe/segment{ @@ -50862,14 +50725,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/service/lawoffice) -"qnN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/obj/structure/reagent_dispensers/plumbed{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "qnT" = ( /obj/structure/closet/secure_closet/chemical, /obj/structure/window/reinforced/spawner/directional/north, @@ -51423,19 +51278,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) -"qwY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/duct, -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "qxh" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -53160,7 +53002,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "qXA" = ( @@ -53246,14 +53088,6 @@ "qZx" = ( /turf/closed/wall/r_wall/rust, /area/station/tcommsat/server) -"qZC" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/closet/secure_closet/brig_physician, -/obj/item/clothing/suit/jacket/straight_jacket, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "qZL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53618,6 +53452,18 @@ }, /turf/open/floor/iron/dark, /area/station/medical/pathology) +"reO" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "reT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -54082,6 +53928,17 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"rnW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "ron" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /obj/effect/landmark/start/scientist, @@ -55466,6 +55323,9 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/hallway/primary/central/fore) +"rJs" = ( +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "rJJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56473,6 +56333,24 @@ "sbq" = ( /turf/open/floor/carpet/green, /area/station/security/detectives_office) +"sbu" = ( +/obj/machinery/requests_console/directional/west{ + anon_tips_receiver = 1; + assistance_requestable = 1; + department = "Security"; + name = "Security Requests Console"; + pixel_y = -32 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/table/glass, +/obj/machinery/camera/directional/east{ + c_tag = "Security Infirmary" + }, +/obj/item/storage/medkit/regular, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/syringe, +/turf/open/floor/iron/dark, +/area/station/security/medical) "sby" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/siding/white{ @@ -56886,7 +56764,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -57211,16 +57089,6 @@ "slC" = ( /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"slJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "slM" = ( /obj/machinery/door/airlock/external{ name = "Medical Escape Pod"; @@ -57435,6 +57303,11 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/security/upper) +"soW" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "spd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -58287,6 +58160,16 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) +"sEs" = ( +/obj/item/storage/box/bodybags, +/obj/item/pen, +/obj/structure/table, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "sEx" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -62309,6 +62192,17 @@ /obj/machinery/telecomms/bus/preset_three, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +"tRx" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/bodycontainer/crematorium{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "tRL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62529,16 +62423,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"tWA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "tWL" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -63644,25 +63528,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) -"unZ" = ( -/obj/machinery/requests_console/directional/west{ - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Security"; - name = "Security Requests Console"; - pixel_y = -32 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/table/glass, -/obj/machinery/camera/directional/east{ - c_tag = "Security Infirmary" - }, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/syringe, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "uok" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -63817,20 +63682,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/port) -"uqn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/siding/dark_red{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "uqp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64326,14 +64177,6 @@ /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/lesser) -"uzH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark_red{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "uzQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -64443,6 +64286,11 @@ /obj/effect/landmark/navigate_destination/gateway, /turf/open/floor/iron, /area/station/command/gateway) +"uCd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "uCf" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -64552,15 +64400,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"uEe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/security/brig) "uEi" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot, @@ -64682,16 +64521,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/chapel/monastery) -"uGr" = ( -/obj/machinery/vending/wallmed/directional/east, -/obj/machinery/computer/operating{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "uGA" = ( /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, @@ -65660,28 +65489,16 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) -"uZI" = ( -/obj/item/storage/box/bodybags, -/obj/item/pen, -/obj/structure/table, -/obj/item/radio/intercom/directional/west, -/obj/item/clothing/gloves/latex, -/obj/item/healthanalyzer, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) +"uZr" = ( +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "uZN" = ( /obj/structure/table/wood, /obj/structure/mirror/directional/east, @@ -65830,17 +65647,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) -"vbk" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/burnt_floor, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "vbo" = ( /obj/structure/chair/stool/bar/directional/east, /obj/effect/decal/cleanable/dirt, @@ -66016,6 +65822,14 @@ /obj/structure/cable, /turf/open/floor/wood/parquet, /area/station/service/bar/backroom) +"veN" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Infirmary" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/dark, +/area/station/security/medical) "veP" = ( /obj/machinery/door/airlock/grunge{ name = "Restrooms" @@ -66074,18 +65888,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) -"vfn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/medical/glass{ - name = "Infirmary" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/medical) "vfu" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -66659,6 +66461,24 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) +"voa" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/machinery/recharger{ + pixel_x = -3 + }, +/obj/structure/cable, +/obj/item/toy/figure/rd{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/stamp/rd{ + pixel_x = 8 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "voj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -67923,6 +67743,75 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"vFD" = ( +/obj/structure/table/wood, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/walkman{ + pixel_y = 7; + pixel_x = -8 + }, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/blank, +/obj/item/device/cassette_tape/random{ + pixel_y = 8 + }, +/obj/item/device/cassette_tape/random{ + pixel_y = 8 + }, +/obj/item/device/cassette_tape/random{ + pixel_y = 8 + }, +/obj/item/device/cassette_tape/random{ + pixel_y = 8 + }, +/obj/item/device/cassette_tape/random{ + pixel_y = 8 + }, +/obj/item/device/cassette_tape/friday{ + pixel_y = 2; + pixel_x = 9 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/dark, +/area/station/service/library) "vFH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -67951,6 +67840,22 @@ "vFY" = ( /turf/closed/wall, /area/station/science/lab) +"vGn" = ( +/obj/machinery/door/poddoor/preopen{ + id = "prisonblast"; + name = "Prison Blast Door" + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/button/door/directional/north{ + id = "prisonblast"; + name = "Prison Lockdown"; + req_access = list("brig") + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "vGs" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/bush/leavy/style_random, @@ -69530,16 +69435,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"wbD" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/shower/directional/north, -/obj/effect/turf_decal/stripes/end{ - dir = 1 - }, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "wbG" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment{ @@ -69928,7 +69823,7 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) "wio" = ( @@ -71648,6 +71543,16 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) +"wKw" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "wKG" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -72216,6 +72121,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/cargo/warehouse) +"wTK" = ( +/obj/structure/cable, +/obj/structure/table/wood, +/obj/item/stamp/hos, +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/red, +/obj/item/clipboard, +/turf/open/floor/carpet/red, +/area/station/command/heads_quarters/hos) "wTP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72570,19 +72487,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"xak" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/storage/secure/briefcase{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/item/stamp/head/cmo, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) "xaz" = ( /obj/structure/railing/corner{ dir = 4 @@ -72840,6 +72744,15 @@ /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron/dark, /area/station/security/brig) +"xeL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "xeP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -73147,11 +73060,6 @@ /obj/item/clothing/gloves/latex, /turf/open/floor/iron/dark, /area/station/science/genetics) -"xkc" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "xkd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -73208,6 +73116,34 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"xkP" = ( +/obj/structure/table/wood, +/obj/item/storage/photo_album{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/taperecorder{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/camera, +/obj/item/pen{ + pixel_x = -7; + pixel_y = -5 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Library Backroom"; + name = "library camera" + }, +/obj/structure/sign/painting/large/library_private{ + dir = 8; + pixel_x = -29 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/library) "xle" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74818,6 +74754,16 @@ /obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) +"xMM" = ( +/obj/structure/bodycontainer/morgue, +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "xNc" = ( /turf/closed/wall/r_wall/rust, /area/station/command/heads_quarters/cmo) @@ -75132,21 +75078,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) -"xTj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/door/window/left/directional/south{ - dir = 1; - name = "Maximum Security Test Chamber" - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/full, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "xTw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -76309,11 +76240,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) -"ykr" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "ykv" = ( /obj/structure/railing/corner{ dir = 8 @@ -93552,11 +93478,11 @@ kho shZ xNq mlB -qnN -kwq -vbk -gdY -lha +vWU +gzh +dbR +kgc +kNe qSB gPA pQi @@ -93809,11 +93735,11 @@ htJ nJQ pqD kzh -tWA -khV -fAb +uZr +rnW +bRo wDz -ndy +hfP viX cuR iaY @@ -94070,7 +93996,7 @@ rnc rnc pkl rnc -fLz +vGn hjs cuR cuR @@ -94327,7 +94253,7 @@ dwx qvt mrB rMl -slJ +pon iZa rbz iFU @@ -94584,7 +94510,7 @@ azG bPr jki hRq -hwo +nCF ddP bEs bEs @@ -94841,7 +94767,7 @@ cXh rnc rnc bmi -bdx +fEI wFJ nzW kKG @@ -95309,7 +95235,7 @@ xxk xCt rtU rLp -xak +hsQ hJH vam hXi @@ -95355,12 +95281,12 @@ pEa phs iMK gyA -uEe +enU gRd -dyH -uZI -jwz -cmb +jHN +sEs +xMM +tRx yfx vBS rhv @@ -95612,13 +95538,13 @@ cXh rnc rnc vVt -aQS -vfn -qwY -jsC -uzH -uqn -pov +vtf +jgv +xeL +uCd +uCd +jiZ +veN iHP qWS kiZ @@ -95871,11 +95797,11 @@ sOi crk jmw kxG -qZC -aAI -aAI -wbD -uax +pUm +rJs +rJs +jMh +ijl lmA rCF eqA @@ -96128,10 +96054,10 @@ wUi uDu wHh gRd -hdW -xkc -gxB -ykr +wKw +oux +inI +soW uax ijl hJn @@ -96143,7 +96069,7 @@ pSG gpM cFO pIS -ggK +wTK tZf amR qQS @@ -96385,10 +96311,10 @@ rnc xex dSv gRd -uGr -pMR -npE -unZ +mPG +oes +fEr +sbu gRd brP vtf @@ -101747,12 +101673,12 @@ sLb lbO jcN oKV -koo +vFD oTT fcs lbO mHe -frB +xkP dcr jCm cYZ @@ -105113,7 +105039,7 @@ cEr dFA nGJ soC -jGK +cHI axt ixO kqD @@ -108964,7 +108890,7 @@ swA lBj qaF xUk -bvP +pOS rcM jlh qgu @@ -112265,7 +112191,7 @@ wuc vJc vJc qIE -mLZ +reO vJc mrA fJq @@ -112582,7 +112508,7 @@ vHF jjs cwj cLx -hhF +jNM ueJ tav snU @@ -114047,7 +113973,7 @@ vct rRz rFr tGx -xTj +fnp sOo cyn pFB @@ -114065,7 +113991,7 @@ iFi iFi pQc jWN -cWs +nmc jTy dgB uNi @@ -115613,7 +115539,7 @@ bkK xLC tnR gtW -kGZ +voa ncC kmN mVh @@ -115635,7 +115561,7 @@ rZV vOX svY jms -agL +eYb vhX dMo bWu @@ -115863,7 +115789,7 @@ vJc vJc vJc vJc -hnF +haZ vJc vJc wZZ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 36a260e70e0635..3c0e1b7eac149a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1636,15 +1636,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"aEE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "aEH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -1811,28 +1802,6 @@ "aIw" = ( /turf/open/floor/plating/airless, /area/station/solars/port/fore) -"aIx" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/rice{ - pixel_x = -8 - }, -/obj/machinery/light/directional/west, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/item/reagent_containers/condiment/sugar{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 5 - }, -/obj/item/storage/fancy/egg_box, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "aIz" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -3425,6 +3394,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"bhI" = ( +/obj/structure/window/spawner/directional/north, +/obj/structure/bodycontainer/morgue, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "bhM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -3574,6 +3551,12 @@ }, /turf/open/floor/plating, /area/station/medical/treatment_center) +"bkT" = ( +/obj/structure/chair/office/light, +/obj/structure/cable, +/obj/item/stamp/cmo, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "bla" = ( /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/wood, @@ -4919,14 +4902,6 @@ /obj/effect/turf_decal/trimline/brown/filled/warning, /turf/open/floor/iron, /area/station/cargo/sorting) -"bLp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/effect/landmark/start/brig_physician, -/obj/structure/chair/office, -/turf/open/floor/iron/white, -/area/station/security/medical) "bLQ" = ( /turf/closed/wall, /area/station/medical/coldroom) @@ -5259,21 +5234,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/medical/storage) -"bTg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/small/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/duct, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "bTj" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -8092,24 +8052,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"dah" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/camera/directional/south{ - c_tag = "Brig - Infirmary" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/computer/operating{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "das" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -8118,7 +8060,7 @@ /area/station/engineering/atmospherics_engine) "daz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "daC" = ( @@ -9037,12 +8979,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, /area/station/medical/pathology) -"dso" = ( -/obj/structure/chair/office/light, -/obj/structure/cable, -/obj/item/stamp/head/cmo, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "dsq" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -9419,7 +9355,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "dAG" = ( @@ -10027,21 +9963,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"dMh" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Containment Pen #1"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio1"; - name = "Xenobio Pen 1 Blast Door" - }, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "dMu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/holopad, @@ -10368,15 +10289,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"dSM" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/closet/secure_closet/brig_physician, -/obj/item/clothing/suit/jacket/straight_jacket, -/turf/open/floor/iron/white, -/area/station/security/medical) "dTi" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -10464,24 +10376,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"dUT" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/window/left/directional/north{ - dir = 8; - name = "Containment Pen #6"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "Xenobio Pen 6 Blast Door" - }, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "dVb" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -14752,7 +14646,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "fAI" = ( @@ -14844,18 +14738,6 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central) -"fCu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "fDa" = ( /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/dark, @@ -15771,6 +15653,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/service/theater) +"fVz" = ( +/obj/structure/window/spawner/directional/east, +/obj/structure/rack, +/obj/machinery/camera/directional/south{ + c_tag = "Brig - Infirmary" + }, +/obj/item/clothing/under/rank/medical/scrubs/purple, +/obj/item/storage/medkit/regular, +/obj/item/healthanalyzer{ + pixel_y = -2 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "fVA" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -16372,6 +16277,20 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"gga" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Xenobiology Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "ggi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -17398,6 +17317,22 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/engineering/main) +"gyI" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/north{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Containment Pen #8"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/xenobiology) "gyK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/engine, @@ -17672,19 +17607,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"gEK" = ( -/obj/machinery/door/window/left/directional/west{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Infirmary"; - req_access = list("security") - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "gES" = ( /obj/machinery/computer/shuttle/labor{ dir = 4 @@ -17723,24 +17645,6 @@ }, /turf/open/space/basic, /area/space) -"gFc" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/storage/medkit/regular, -/obj/item/storage/medkit/regular, -/obj/item/clothing/gloves/latex, -/obj/item/roller, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/syringe, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/iron/white, -/area/station/security/medical) "gFd" = ( /obj/machinery/power/terminal, /obj/machinery/light/small/directional/east, @@ -18069,6 +17973,18 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"gMg" = ( +/obj/structure/table, +/obj/item/storage/medkit/regular, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/syringe, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "gMi" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/west, @@ -19035,6 +18951,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/storage/gas) +"hcb" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/processor{ + pixel_y = 9 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "hcv" = ( /obj/effect/landmark/observer_start, /obj/effect/turf_decal/plaque{ @@ -19380,22 +19308,6 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) -"hjj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/structure/table/optable, -/obj/machinery/defibrillator_mount/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/security/medical) "hjo" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -19430,26 +19342,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"hjt" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen #3"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio3"; - name = "Xenobio Pen 3 Blast Door" - }, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "hjw" = ( /turf/open/floor/iron/white, /area/station/science/cytology) @@ -20832,23 +20724,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"hKd" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Containment Pen #8"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "Xenobio Pen 8 Blast Door" - }, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "hKg" = ( /turf/closed/wall, /area/station/cargo/miningoffice) @@ -21023,6 +20898,20 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"hMv" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/north{ + dir = 4; + name = "Containment Pen #1"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/xenobiology) "hMy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21143,7 +21032,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/central) "hOR" = ( @@ -22038,19 +21927,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"ieN" = ( -/obj/machinery/door/window/left/directional/west{ - dir = 4; - name = "Infirmary"; - req_access = list("security") - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "ieV" = ( /turf/closed/wall/r_wall, /area/station/security/holding_cell) @@ -22083,7 +21959,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/port) "ifJ" = ( @@ -22653,6 +22529,18 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) +"iom" = ( +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Infirmary" + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "iov" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -22829,15 +22717,6 @@ /obj/effect/turf_decal/siding/yellow, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"iqV" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/griddle, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "irL" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -22979,26 +22858,6 @@ /mob/living/basic/parrot/poly, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"itl" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - id_tag = "xeno_airlock_interior"; - name = "Xenobiology Lab Internal Airlock" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) "itp" = ( /obj/structure/chair{ dir = 8 @@ -23891,6 +23750,11 @@ dir = 8 }, /area/station/service/chapel) +"iIw" = ( +/obj/structure/bed/roller, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/medical) "iIC" = ( /obj/structure/sign/map/right{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; @@ -25989,19 +25853,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"jpp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Brig Infirmary Maintenance" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "jpr" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -29117,6 +28968,27 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ksM" = ( +/obj/structure/table/wood, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/clipboard{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/stamp{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/stamp/denied{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/stamp/qm{ + pixel_x = 7; + pixel_y = -2 + }, +/turf/open/floor/wood, +/area/station/cargo/quartermaster) "ksT" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -30000,6 +29872,30 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"kLC" = ( +/obj/machinery/door_buttons/access_button{ + idDoor = "xeno_airlock_exterior"; + idSelf = "xeno_airlock_control"; + name = "Access Button"; + pixel_y = -24; + req_access = list("xenobiology") + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + id_tag = "xeno_airlock_exterior"; + name = "Xenobiology Lab External Airlock" + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) "kLF" = ( /obj/machinery/light/small/directional/south, /obj/machinery/light_switch/directional/south{ @@ -30431,6 +30327,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"kSs" = ( +/obj/structure/table, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/directional/north, +/obj/item/folder/red{ + pixel_x = 3 + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/healthanalyzer, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "kSw" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -31222,6 +31135,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"lhc" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/medical) "lhk" = ( /obj/structure/table, /obj/item/storage/medkit/brute, @@ -31451,6 +31379,38 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"llT" = ( +/obj/structure/table/wood, +/obj/machinery/button/ticket_machine{ + pixel_x = 32 + }, +/obj/item/paper_bin/carbon{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/stamp/hop{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = 6; + pixel_y = -34 + }, +/obj/machinery/button/door/directional/south{ + id = "hop"; + name = "Privacy Shutters Control"; + pixel_x = -6; + req_access = list("hop") + }, +/obj/machinery/button/door/directional/south{ + id = "hopqueue"; + name = "Queue Shutters Control"; + pixel_x = -6; + pixel_y = -34; + req_access = list("hop") + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "llW" = ( /obj/structure/fluff/broken_flooring{ dir = 4; @@ -32098,6 +32058,17 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"lvu" = ( +/obj/machinery/door/window/left/directional/west{ + dir = 4; + name = "Infirmary" + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/medical) "lvG" = ( /obj/machinery/light/directional/north, /obj/machinery/door/window{ @@ -32225,21 +32196,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"lxy" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - name = "Xenobiology Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "lxC" = ( /obj/item/radio/intercom/directional/south, /obj/structure/chair/sofa/corp/left{ @@ -32312,15 +32268,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"lzB" = ( -/obj/structure/table/wood, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/item/radio/intercom/directional/east, -/obj/item/folder/blue, -/obj/item/hand_tele, -/obj/item/stamp/head/captain, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain/private) "lzJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34810,6 +34757,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"muu" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/oven, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "mux" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral{ @@ -35965,6 +35921,15 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/cargo/storage) +"mOa" = ( +/obj/structure/table, +/obj/item/folder/white, +/obj/item/stamp/rd, +/obj/item/toy/figure/rd{ + pixel_y = 10 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "mOt" = ( /obj/effect/landmark/start/detective, /obj/structure/chair/office{ @@ -36491,11 +36456,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"mXV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "mXX" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -36599,24 +36559,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"mZe" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/storage/bag/tray, -/obj/item/kitchen/rollingpin{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/kitchen/rollingpin{ - pixel_x = 5; - pixel_y = -3 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "mZy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37041,6 +36983,19 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"nhO" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Prison Cafeteria"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/griddle, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "nhP" = ( /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) @@ -37077,6 +37032,15 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"niz" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/radio/intercom/directional/east, +/obj/item/folder/blue, +/obj/item/hand_tele, +/obj/item/stamp/captain, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) "niG" = ( /obj/machinery/light/small/directional/west, /obj/machinery/conveyor{ @@ -39385,14 +39349,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) -"nYv" = ( -/obj/effect/turf_decal/stripes/end, -/obj/machinery/shower/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "nYJ" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -39974,6 +39930,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"ohD" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/window/left/directional/north{ + dir = 8; + name = "Containment Pen #6"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/xenobiology) "ohE" = ( /turf/closed/wall/r_wall, /area/station/maintenance/central) @@ -41743,6 +41716,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) +"oPn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/medical) "oPp" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/tcomms_all, @@ -42120,6 +42097,15 @@ /obj/effect/mapping_helpers/airlock/access/any/command/hop, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +"oWZ" = ( +/obj/structure/table, +/obj/machinery/airalarm/directional/north, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "oXd" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 4 @@ -42337,10 +42323,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"pal" = ( -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "pan" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, @@ -43050,6 +43032,18 @@ /obj/machinery/holopad, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) +"poE" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" + }, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "poJ" = ( /obj/machinery/telecomms/hub/preset, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -43584,7 +43578,7 @@ /turf/open/floor/iron, /area/station/security/courtroom) "pyc" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/wood, /area/station/commons/lounge) "pyd" = ( @@ -44602,7 +44596,7 @@ /area/station/service/bar/backroom) "pQD" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/construction/storage_wing) "pQG" = ( @@ -44635,6 +44629,29 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/central) +"pQV" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice{ + pixel_x = -10 + }, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 7 + }, +/obj/item/storage/fancy/egg_box, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "pQW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44732,18 +44749,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"pTA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "pTK" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/structure/window/reinforced/spawner/directional/north, @@ -45007,15 +45012,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"pXW" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "pYh" = ( /obj/structure/cable, /turf/open/floor/iron/white, @@ -45366,7 +45362,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/engineering/tracking_beacon, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "qfL" = ( @@ -45845,25 +45841,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"qnx" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/pen, -/obj/item/folder/red{ - pixel_x = 3 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "qnK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46506,7 +46483,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/central) "qyT" = ( @@ -46577,6 +46554,16 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space) +"qAr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/airlock/hatch{ + name = "Xenobiology Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "qAA" = ( /obj/machinery/newscaster/directional/east, /obj/machinery/computer/security/mining{ @@ -46603,6 +46590,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) +"qBo" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + id_tag = "xeno_airlock_interior"; + name = "Xenobiology Lab Internal Airlock" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/iron/white, +/area/station/science/xenobiology/hallway) "qBq" = ( /obj/structure/rack, /obj/effect/landmark/blobstart, @@ -46740,16 +46746,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"qDz" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced/rglass, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/iron/white, -/area/station/security/medical) "qDI" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47636,27 +47632,6 @@ "qST" = ( /turf/open/floor/iron, /area/station/cargo/drone_bay) -"qTo" = ( -/obj/structure/table/wood, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/clipboard{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/stamp{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/stamp/denied{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/stamp/head/qm{ - pixel_x = 7; - pixel_y = -2 - }, -/turf/open/floor/wood, -/area/station/cargo/quartermaster) "qTx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48047,21 +48022,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"rat" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - dir = 8; - name = "Containment Pen #5"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio5"; - name = "Xenobio Pen 5 Blast Door" - }, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "raz" = ( /obj/structure/cable, /turf/open/floor/plating/airless, @@ -48846,6 +48806,22 @@ /obj/effect/spawner/random/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"rrL" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/north{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen #4"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door" + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/xenobiology) "rrT" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -49099,6 +49075,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"rvK" = ( +/obj/machinery/door/poddoor/preopen{ + id = "Xenolab"; + name = "Test Chamber Blast Door" + }, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/door/window/left/directional/south{ + dir = 4; + name = "Maximum Security Test Chamber"; + req_access = list("xenobiology") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "rvL" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment, @@ -49140,6 +49131,25 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"rwx" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/window/left/directional/north{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Containment Pen #3"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/xenobiology) "rwE" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -50022,15 +50032,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/plating, /area/station/command/teleporter) -"rKL" = ( -/obj/machinery/door/airlock/hatch{ - name = "Secure Pen" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/cytology) "rKQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -51136,6 +51137,9 @@ /obj/structure/table, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"sch" = ( +/turf/closed/wall, +/area/station/security/medical) "sck" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -51305,7 +51309,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/fore) "sfl" = ( @@ -52011,10 +52015,6 @@ /obj/machinery/duct, /turf/open/floor/stone, /area/station/science/xenobiology) -"ssG" = ( -/obj/structure/reagent_dispensers/plumbed, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "ssI" = ( /obj/machinery/power/emitter, /turf/open/floor/plating, @@ -52533,6 +52533,20 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, /area/station/engineering/atmospherics_engine) +"sCv" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/north{ + dir = 8; + name = "Containment Pen #5"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/science/xenobiology) "sCz" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -52695,6 +52709,12 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"sEH" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/item/tank/internals/oxygen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "sEI" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -52756,31 +52776,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"sGF" = ( -/obj/machinery/door_buttons/access_button{ - idDoor = "xeno_airlock_exterior"; - idSelf = "xeno_airlock_control"; - name = "Access Button"; - pixel_y = -24; - req_access = list("xenobiology") - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - id_tag = "xeno_airlock_exterior"; - name = "Xenobiology Lab External Airlock" - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/xenobiology/hallway) "sGL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -53848,17 +53843,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"sYE" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/structure/table/reinforced, -/obj/machinery/processor{ - pixel_y = 10 - }, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "sZH" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -55006,38 +54990,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/station/maintenance/port/aft) -"tsT" = ( -/obj/structure/table/wood, -/obj/machinery/button/ticket_machine{ - pixel_x = 32 - }, -/obj/item/paper_bin/carbon{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/stamp/head/hop{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = 6; - pixel_y = -34 - }, -/obj/machinery/button/door/directional/south{ - id = "hop"; - name = "Privacy Shutters Control"; - pixel_x = -6; - req_access = list("hop") - }, -/obj/machinery/button/door/directional/south{ - id = "hopqueue"; - name = "Queue Shutters Control"; - pixel_x = -6; - pixel_y = -34; - req_access = list("hop") - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "tsZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/lattice/catwalk, @@ -55151,13 +55103,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"tvn" = ( -/obj/structure/bodycontainer/morgue, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "tvE" = ( /turf/closed/wall/r_wall, /area/station/command/gateway) @@ -56077,17 +56022,6 @@ }, /turf/open/floor/wood, /area/station/command/corporate_showroom) -"tNF" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "tNH" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -57231,6 +57165,21 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"uin" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/folder/red{ + pixel_x = -7 + }, +/obj/item/folder/red{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/stamp/hos, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "uiB" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -57563,15 +57512,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) -"uoO" = ( -/obj/structure/table, -/obj/item/folder/white, -/obj/item/stamp/head/rd, -/obj/item/toy/figure/rd{ - pixel_y = 10 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) "upe" = ( /obj/machinery/camera/directional/east{ c_tag = "Interrogation room"; @@ -58902,6 +58842,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/hallway/primary/port) +"uKR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/white, +/area/station/security/medical) "uLa" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/effect/spawner/random/maintenance/two, @@ -59068,14 +59019,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"uOy" = ( -/obj/structure/table/reinforced, -/obj/item/folder/yellow, -/obj/item/stamp/head/ce, -/obj/item/reagent_containers/pill/patch/aiuri, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) "uOH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59655,6 +59598,17 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/range) +"vaH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/medical) "vbq" = ( /obj/structure/sign/map/right{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; @@ -60201,6 +60155,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"vkO" = ( +/obj/structure/table, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "vkP" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/plasteel{ @@ -60436,14 +60400,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/pathology) -"voZ" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/oven, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "vpe" = ( /obj/structure/sign/poster/random/directional/east, /obj/structure/railing{ @@ -61513,17 +61469,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"vJD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/airlock/hatch{ - name = "Xenobiology Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/plating, -/area/station/maintenance/department/science/xenobiology) "vJI" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5, /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, @@ -61685,6 +61630,24 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) +"vMW" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/airalarm/directional/west, +/obj/item/storage/bag/tray, +/obj/item/kitchen/rollingpin{ + pixel_y = -4; + pixel_x = -5 + }, +/obj/item/kitchen/rollingpin{ + pixel_y = -4; + pixel_x = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "vMX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63639,6 +63602,18 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"wwj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Brig Infirmary Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "wwt" = ( /obj/machinery/door/airlock/research{ name = "Mech Bay" @@ -64387,6 +64362,19 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"wLH" = ( +/obj/structure/table, +/obj/structure/window/spawner/directional/east, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "wMk" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65313,21 +65301,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"xbE" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/folder/red{ - pixel_x = -7 - }, -/obj/item/folder/red{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/stamp/head/hos, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) "xbP" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/suit_storage_unit/standard_unit, @@ -65530,6 +65503,14 @@ dir = 6 }, /area/station/medical/treatment_center) +"xfA" = ( +/obj/machinery/door/airlock/hatch{ + name = "Secure Pen" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/engine, +/area/station/science/cytology) "xfD" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -67643,23 +67624,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/station/engineering/atmos) -"xRz" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen #4"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio4"; - name = "Xenobio Pen 4 Blast Door" - }, -/obj/machinery/duct, -/obj/structure/liquid_barrier, -/turf/open/floor/iron, -/area/station/science/xenobiology) "xRB" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/spawner/random/trash/mess, @@ -67676,6 +67640,14 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"xSA" = ( +/obj/structure/table/reinforced, +/obj/item/folder/yellow, +/obj/item/stamp/ce, +/obj/item/reagent_containers/pill/patch/aiuri, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "xSQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -67762,6 +67734,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"xUH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "xUK" = ( /obj/structure/sign/poster/contraband/missing_gloves, /turf/closed/wall, @@ -67862,22 +67840,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"xWf" = ( -/obj/machinery/door/poddoor/preopen{ - id = "Xenolab"; - name = "Test Chamber Blast Door" - }, -/obj/effect/turf_decal/bot, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/door/window/left/directional/south{ - dir = 4; - name = "Maximum Security Test Chamber"; - req_access = list("xenobiology") - }, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "xWm" = ( /obj/structure/rack, /obj/item/restraints/handcuffs{ @@ -68080,6 +68042,10 @@ /obj/structure/mirror/directional/west, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"xZv" = ( +/obj/effect/spawner/random/loafer, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "xZx" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -86116,7 +86082,7 @@ kQP kQP mxO qkD -qTo +ksM qIK xWV kKr @@ -88629,12 +88595,12 @@ hfU aXa jMx umN -tNF -voZ -iqV -aIx -mZe -sYE +poE +muu +nhO +pQV +vMW +hcb aXa fbX oGr @@ -90966,8 +90932,8 @@ aaa aaa aaa jXu -ssG -pal +sEH +knQ siY jXu jXu @@ -91223,9 +91189,9 @@ aaa aaa bxr jXu -ssG -pal -pXW +rOz +xZv +siY jXu aaa aaa @@ -91482,7 +91448,7 @@ uza hZQ jXu jXu -pXW +siY jXu aaa aaa @@ -91739,7 +91705,7 @@ vxC hZQ qmO fsQ -aEE +oyO jXu aaa aaa @@ -91996,7 +91962,7 @@ gdZ hZQ qmO dqc -pTA +wfn jXu aaa aaa @@ -92253,7 +92219,7 @@ uza hZQ hZQ hZQ -jpp +wwj hZQ aaa aaa @@ -92507,10 +92473,10 @@ iQW mzL qWT nRZ -qnx -dSM -tvn -fCu +vkO +gMg +bhI +vaH nRZ cGu cGu @@ -92763,11 +92729,11 @@ tjh pav wsX dla -nRZ -qDz -bLp +sch +kSs +xUH euX -bTg +uKR nRZ gES cGu @@ -92838,7 +92804,7 @@ jhk cOR vgZ ijZ -dso +bkT edo pXM iNc @@ -93020,12 +92986,12 @@ tjh hQH eXj vSo -nRZ -gFc -mXV -mXV -hjj -nRZ +sch +oWZ +oPn +iIw +lhc +sch bhn tjh uTF @@ -93277,12 +93243,12 @@ tjh wsX wsX fTm -nRZ -nYv -ieN -gEK -dah -nRZ +sch +wLH +lvu +iom +fVz +sch pHb guS vVy @@ -93834,7 +93800,7 @@ pJR lJn psy htG -tsT +llT pJR uwC ndS @@ -99743,7 +99709,7 @@ uGj tyY iDh csS -lzB +niz gpS xuH rVC @@ -101239,7 +101205,7 @@ aaa rrg iFF gfk -xbE +uin mBf sjM sPj @@ -102861,7 +102827,7 @@ yeI gIM tAg tcx -uoO +mOa vYE eDf nfs @@ -108213,7 +108179,7 @@ acs uXd qJd nLz -uOy +xSA rSi pCt aRS @@ -109556,7 +109522,7 @@ aaa aaa oCX wmL -sGF +kLC wmL wmL lMJ @@ -110584,7 +110550,7 @@ oMA oMA wmL gUS -itl +qBo gUS wmL oMA @@ -111361,7 +111327,7 @@ mBj mKD hxY nae -rKL +xfA cvn jaY dPF @@ -112890,7 +112856,7 @@ bPB kWc jlU gTK -dMh +hMv wKT vGq vXi @@ -112904,7 +112870,7 @@ gSM frt vGq qko -hKd +gyI phI jlU kvO @@ -113401,7 +113367,7 @@ lAu lMJ wrc oyj -vJD +qAr uVk xen mdo @@ -113421,7 +113387,7 @@ nYL nYL ddK hoV -lxy +gga hAN wrc aaa @@ -116231,7 +116197,7 @@ oyj oyj xiL nkq -hjt +rwx wEu vul kkT @@ -116245,7 +116211,7 @@ qID jdj qqq kKG -dUT +ohD dQa xiL lmn @@ -116491,7 +116457,7 @@ jgq imw aft ygF -xRz +rrL cHV jlU aYt @@ -116499,7 +116465,7 @@ gva aYt jlU jlU -rat +sCv ixR shY eOP @@ -118037,7 +118003,7 @@ hdy cbn tQJ tQJ -xWf +rvK tQJ tQJ nnc diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 5d8e9b1e4c7e97..e4e7c3b9100ca9 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -225,7 +225,9 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/holopad, /obj/effect/landmark/navigate_destination/dockarrival, -/obj/machinery/atm/directional/south, +/obj/machinery/atm{ + pixel_y = -30 + }, /turf/open/floor/iron/textured_large, /area/station/hallway/secondary/entry) "acl" = ( @@ -585,11 +587,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"ahv" = ( -/obj/effect/turf_decal/siding/white, -/obj/item/kirbyplants/random/fullysynthetic, -/turf/open/floor/mineral/silver, -/area/station/service/chapel/funeral) "ahG" = ( /obj/machinery/modular_computer/preset/research{ dir = 4 @@ -989,6 +986,26 @@ }, /turf/open/floor/plating, /area/station/construction/mining/aux_base) +"amR" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/folder/white, +/obj/item/taperecorder{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/stamp/rd{ + pixel_x = 5 + }, +/obj/item/toy/figure/rd{ + pixel_x = 2; + pixel_y = 13 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/siding{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "amU" = ( /obj/structure/closet/secure_closet/research_director, /obj/effect/turf_decal/tile/neutral/opposingcorners{ @@ -1456,24 +1473,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"asE" = ( -/obj/effect/turf_decal/trimline/brown/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/brown/line, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 8 - }, -/area/station/cargo/drone_bay) "asI" = ( /obj/structure/industrial_lift/public, /turf/open/floor/plating/elevatorshaft, @@ -2296,7 +2295,7 @@ /area/station/maintenance/floor1/starboard/fore) "aDl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "aDn" = ( @@ -2873,6 +2872,15 @@ "aKx" = ( /turf/closed/wall/r_wall, /area/station/maintenance/floor3/starboard/aft) +"aKy" = ( +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table, +/obj/structure/disposalpipe/segment, +/obj/item/stamp/hos, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) "aKC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5198,6 +5206,14 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/science/robotics/lab) +"bnm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/drone_bay) "bnu" = ( /obj/machinery/light/blacklight/directional/west, /obj/structure/table, @@ -6751,6 +6767,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/safe) +"bFU" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/drone_bay) "bFZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6990,13 +7016,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/medical/abandoned) -"bJI" = ( -/obj/machinery/quantum_server, -/obj/effect/turf_decal/bot/left, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 - }, -/area/station/cargo/drone_bay) "bJQ" = ( /obj/structure/railing/corner{ dir = 1 @@ -7944,14 +7963,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"bVH" = ( -/obj/machinery/netpod, -/obj/machinery/airalarm/directional/east, -/obj/machinery/airalarm/directional/east, -/obj/machinery/airalarm/directional/east, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/cargo/drone_bay) "bVK" = ( /obj/structure/table, /mob/living/basic/mouse/brown/tom, @@ -11056,15 +11067,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/tile, /area/station/service/library) -"cOw" = ( -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table, -/obj/structure/disposalpipe/segment, -/obj/item/stamp/head/hos, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) "cOz" = ( /obj/machinery/vending/wardrobe/chap_wardrobe, /obj/item/radio/intercom/directional/west, @@ -12790,12 +12792,6 @@ "dnU" = ( /turf/closed/wall, /area/station/security/office) -"dob" = ( -/obj/machinery/computer/quantum_console{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_corner, -/area/station/cargo/drone_bay) "dog" = ( /obj/structure/showcase/cyborg/old{ dir = 8; @@ -15440,7 +15436,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm/directional/south, +/obj/machinery/atm{ + pixel_y = -30 + }, /turf/open/floor/carpet/red, /area/station/service/theater) "dYr" = ( @@ -17454,12 +17452,6 @@ }, /turf/open/floor/iron/white, /area/station/science/circuits) -"eBn" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/stamp/head/captain, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "eBu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/structure/crate_abandoned, @@ -19422,17 +19414,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/cargo/office) -"fhi" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/arrows{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/trunk/multiz, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/drone_bay) "fhl" = ( /obj/structure/bed{ dir = 1 @@ -21464,6 +21445,14 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/floor2/starboard/aft) +"fIS" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/freezerchamber) "fIX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -21760,13 +21749,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) -"fNv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/stairs{ - dir = 1 - }, -/area/station/cargo/drone_bay) "fNA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22213,14 +22195,6 @@ name = "lab floor" }, /area/station/science/robotics/lab) -"fTs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/machinery/holopad, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/drone_bay) "fTu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/shreds, @@ -24142,7 +24116,7 @@ /obj/structure/cable, /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/half{ dir = 1 }, @@ -26478,26 +26452,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/engine, /area/station/engineering/supermatter) -"hdw" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/folder/white, -/obj/item/taperecorder{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/stamp/head/rd{ - pixel_x = 5 - }, -/obj/item/toy/figure/rd{ - pixel_x = 2; - pixel_y = 13 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/siding{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) "hdx" = ( /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/machinery/door/airlock/hatch{ @@ -28420,14 +28374,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) -"hFC" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/light/directional/south, -/obj/effect/decal/cleanable/oil/streak, -/obj/machinery/byteforge, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/dark/smooth_large, -/area/station/cargo/drone_bay) "hFE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28842,21 +28788,6 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) -"hKX" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/mining/glass{ - name = "Bitrunning Den" - }, -/turf/open/floor/pod/dark, -/area/station/cargo/drone_bay) "hKZ" = ( /obj/machinery/button/door/directional/south{ id = "dorms_1_bolts"; @@ -29357,6 +29288,13 @@ }, /turf/open/floor/wood, /area/station/commons/dorms/apartment2) +"hSr" = ( +/obj/machinery/quantum_server, +/obj/effect/turf_decal/bot/left, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/cargo/drone_bay) "hSC" = ( /obj/structure/railing{ dir = 4 @@ -30183,16 +30121,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/floor3/aft) -"ifn" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/arrows{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/drone_bay) "ifo" = ( /obj/structure/tank_holder/emergency_oxygen, /obj/effect/turf_decal/stripes/line{ @@ -31448,6 +31376,13 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"ixP" = ( +/obj/machinery/netpod, +/obj/structure/railing{ + layer = 3.1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/drone_bay) "ixQ" = ( /obj/effect/turf_decal/tile/green/full, /obj/structure/railing{ @@ -32798,12 +32733,6 @@ }, /turf/open/floor/engine/airless, /area/station/solars/port/aft) -"iRu" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/tlv_cold_room, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "iRD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -33033,7 +32962,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) "iVL" = ( @@ -36199,7 +36128,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "jMn" = ( @@ -36495,7 +36424,7 @@ /area/station/science/lobby) "jPs" = ( /obj/machinery/camera/autoname/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -39718,24 +39647,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) -"kIn" = ( -/obj/effect/turf_decal/trimline/brown/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/brown/line, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/station/cargo/drone_bay) "kIu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -40327,6 +40238,12 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"kQJ" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/baseturf_helper/reinforced_plating/ceiling, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "kQN" = ( /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41336,21 +41253,6 @@ /obj/machinery/research/anomaly_refinery, /turf/open/floor/iron/dark/textured, /area/station/science/ordnance/storage) -"leE" = ( -/obj/structure/table/wood, -/obj/item/folder/yellow{ - pixel_x = -6 - }, -/obj/item/stamp/head/qm{ - pixel_x = -6 - }, -/obj/structure/cable, -/obj/item/flashlight/lamp/green{ - pixel_x = 6; - pixel_y = 15 - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/qm) "leF" = ( /obj/effect/turf_decal/siding/yellow{ dir = 10 @@ -42016,6 +41918,12 @@ dir = 8 }, /area/station/ai_monitored/command/storage/eva) +"lmi" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "lmk" = ( /obj/effect/turf_decal/trimline/red/warning{ dir = 8 @@ -43038,21 +42946,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/pod/light, /area/station/maintenance/floor1/port/aft) -"lzV" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 7 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/iron/dark/smooth_half, -/area/station/cargo/drone_bay) "lzX" = ( /obj/effect/turf_decal/trimline/red/line, /obj/effect/turf_decal/trimline/white/warning, @@ -43133,6 +43026,21 @@ "lAU" = ( /turf/closed/wall, /area/station/service/library/printer) +"lBb" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/mining/glass{ + name = "Bitrunning Den" + }, +/turf/open/floor/pod/dark, +/area/station/cargo/drone_bay) "lBo" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ dir = 10 @@ -43569,16 +43477,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/commons/fitness) -"lGu" = ( -/obj/machinery/netpod, -/obj/effect/decal/cleanable/vomit/old{ - pixel_x = -12; - pixel_y = -13 - }, -/obj/item/radio/intercom/directional/north, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/cargo/drone_bay) "lGw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44193,14 +44091,6 @@ /obj/item/restraints/handcuffs, /turf/open/floor/iron/dark, /area/station/security/brig) -"lOF" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/freezerchamber) "lOI" = ( /obj/machinery/airalarm/directional/west, /obj/structure/noticeboard/ce{ @@ -44504,6 +44394,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/floor3/aft) +"lRL" = ( +/obj/machinery/button/ignition/incinerator/ordmix{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/machinery/button/door/incinerator_vent_ordmix{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/burnchamber) "lRO" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/musical_instrument, @@ -45233,6 +45137,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/station/medical/abandoned) +"mbR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/cargo/drone_bay) "mbS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /obj/effect/spawner/structure/window/hollow/reinforced/plasma/middle, @@ -45376,12 +45287,6 @@ /obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron, /area/station/hallway/floor1/aft) -"mdu" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/engine_access, -/obj/effect/baseturf_helper/reinforced_plating/ceiling, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "mdB" = ( /turf/open/floor/iron, /area/station/commons/fitness/recreation) @@ -45702,6 +45607,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/textured_large, /area/station/cargo/sorting) +"mho" = ( +/obj/structure/table, +/obj/item/paper_bin/carbon{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/stamp/hop{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "mhq" = ( /obj/structure/table, /obj/item/paper_bin, @@ -46760,6 +46677,20 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/floor2/aft) +"muC" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/paper_bin/construction{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/stamp/ce{ + pixel_x = -8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/command/heads_quarters/ce) "muI" = ( /obj/machinery/door/airlock/hatch{ name = "Maintenance Bulkhead" @@ -47726,6 +47657,11 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/lockers) +"mId" = ( +/obj/item/kirbyplants/random/dead, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "mIh" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/bot, @@ -48198,6 +48134,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/tcommsat/server) +"mNq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/stairs{ + dir = 1 + }, +/area/station/cargo/drone_bay) "mNT" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -50618,6 +50561,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port) +"nri" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/oil/streak, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/cargo/drone_bay) "nrk" = ( /obj/structure/cable, /obj/structure/table, @@ -51504,6 +51455,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/pod/dark, /area/station/maintenance/floor4/port/aft) +"nCB" = ( +/obj/machinery/computer/quantum_console{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_corner, +/area/station/cargo/drone_bay) "nCD" = ( /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, @@ -51899,7 +51856,7 @@ /turf/open/floor/iron/dark, /area/station/security/lockers) "nHB" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -52319,6 +52276,15 @@ }, /turf/open/floor/iron, /area/station/hallway/floor3/aft) +"nNy" = ( +/obj/structure/sign/poster/random/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/drone_bay) "nNJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -55834,6 +55800,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +"oJZ" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/item/kirbyplants/random/fullysynthetic, +/turf/open/floor/mineral/silver, +/area/station/service/chapel/funeral) "oKc" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 8 @@ -55943,6 +55916,11 @@ /obj/structure/railing, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"oMk" = ( +/obj/effect/turf_decal/siding/white, +/obj/item/kirbyplants/random/fullysynthetic, +/turf/open/floor/mineral/silver, +/area/station/service/chapel/funeral) "oMn" = ( /obj/item/grenade/barrier{ pixel_x = -3; @@ -57450,13 +57428,6 @@ }, /turf/open/floor/pod/light, /area/station/cargo/sorting) -"pjG" = ( -/obj/machinery/netpod, -/obj/structure/railing{ - layer = 3.1 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/cargo/drone_bay) "pjM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -61173,6 +61144,14 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) +"qlP" = ( +/obj/machinery/netpod, +/obj/machinery/airalarm/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/drone_bay) "qlX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -61577,6 +61556,21 @@ dir = 8 }, /area/station/service/chapel) +"qsc" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = 7 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/iron/dark/smooth_half, +/area/station/cargo/drone_bay) "qse" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron/dark, @@ -67513,6 +67507,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"rWL" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/stamp/captain, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "rWT" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/rd) @@ -69245,20 +69245,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"szr" = ( -/obj/effect/turf_decal/trimline/brown/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/stripes, -/obj/effect/turf_decal/trimline/brown/line, -/turf/open/floor/iron/dark/smooth_half, -/area/station/cargo/drone_bay) "szt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70187,15 +70173,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/hallway/floor3/fore) -"sMk" = ( -/obj/structure/sign/poster/random/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/decal/cleanable/oil, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/drone_bay) "sMm" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -71165,7 +71142,7 @@ /turf/open/floor/eighties, /area/station/commons/fitness/recreation/entertainment) "sZF" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -71239,10 +71216,6 @@ "tat" = ( /turf/open/openspace, /area/station/maintenance/floor3/starboard/aft) -"taC" = ( -/obj/structure/cable, -/turf/closed/wall, -/area/station/cargo/drone_bay) "taD" = ( /obj/machinery/door/airlock/external/glass, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -73086,6 +73059,24 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/kitchen, /area/station/command/heads_quarters/rd) +"tCm" = ( +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/line, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/cargo/drone_bay) "tCB" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -73172,18 +73163,6 @@ dir = 1 }, /area/station/engineering/atmos/office) -"tDO" = ( -/obj/structure/table, -/obj/item/paper_bin/carbon{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/stamp/head/hop{ - pixel_x = -4; - pixel_y = 4 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "tEb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/textured_large, @@ -73460,6 +73439,21 @@ }, /turf/open/floor/carpet/blue, /area/station/command/meeting_room) +"tIf" = ( +/obj/structure/table/wood, +/obj/item/folder/yellow{ + pixel_x = -6 + }, +/obj/item/stamp/qm{ + pixel_x = -6 + }, +/obj/structure/cable, +/obj/item/flashlight/lamp/green{ + pixel_x = 6; + pixel_y = 15 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) "tIj" = ( /obj/structure/railing, /obj/structure/chair, @@ -73550,6 +73544,15 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"tIW" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/paper_bin, +/obj/item/stamp/cmo, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "tJd" = ( /obj/structure/closet/firecloset, /turf/open/floor/pod/light, @@ -73613,7 +73616,7 @@ dir = 8 }, /obj/machinery/light_switch/directional/east, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/wood, /area/station/commons/dorms/apartment2) "tJZ" = ( @@ -76763,6 +76766,20 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/engine, /area/station/maintenance/floor4/starboard/aft) +"uHw" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/obj/structure/railing{ + layer = 3.1 + }, +/obj/effect/decal/cleanable/robot_debris, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/drone_bay) "uHx" = ( /obj/structure/grille/broken, /turf/open/floor/plating, @@ -77719,13 +77736,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"uUi" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/cargo/drone_bay) "uUj" = ( /obj/structure/transit_tube/curved{ dir = 8 @@ -78499,20 +78509,6 @@ }, /turf/open/floor/wood, /area/station/service/theater) -"veD" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/arrows{ - dir = 4 - }, -/obj/structure/railing{ - layer = 3.1 - }, -/obj/effect/decal/cleanable/robot_debris, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/drone_bay) "veF" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -78779,15 +78775,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/service/chapel/office) -"viE" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/paper_bin, -/obj/item/stamp/head/cmo, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "viL" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 5 @@ -79845,7 +79832,7 @@ }, /area/station/engineering/lobby) "vvT" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/hallway/floor1/fore) "vvX" = ( @@ -79892,20 +79879,6 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"vwC" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/paper_bin/construction{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/pen, -/obj/item/stamp/head/ce{ - pixel_x = -8 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/command/heads_quarters/ce) "vwD" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -81352,6 +81325,20 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) +"vQF" = ( +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/trimline/brown/line, +/turf/open/floor/iron/dark/smooth_half, +/area/station/cargo/drone_bay) "vQR" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/dark/side{ @@ -84816,13 +84803,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor2/starboard) -"wJM" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/obj/item/kirbyplants/random/fullysynthetic, -/turf/open/floor/mineral/silver, -/area/station/service/chapel/funeral) "wJR" = ( /obj/structure/table, /obj/item/plate{ @@ -86047,6 +86027,17 @@ dir = 1 }, /area/station/hallway/floor3/aft) +"xal" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/trunk/multiz, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/drone_bay) "xam" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 8 @@ -87465,6 +87456,24 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor2/port/aft) +"xur" = ( +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/station/cargo/drone_bay) "xuv" = ( /turf/closed/wall/r_wall, /area/station/maintenance/floor2/starboard/fore) @@ -87664,20 +87673,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) -"xwP" = ( -/obj/machinery/button/ignition/incinerator/ordmix{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/machinery/button/door/incinerator_vent_ordmix{ - pixel_x = -8; - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/burnchamber) "xwX" = ( /obj/structure/easel, /turf/open/floor/bamboo/tatami/black, @@ -87807,6 +87802,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/pod/dark, /area/station/maintenance/floor2/starboard) +"xyT" = ( +/obj/machinery/netpod, +/obj/effect/decal/cleanable/vomit/old{ + pixel_x = -12; + pixel_y = -13 + }, +/obj/item/radio/intercom/directional/north, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/drone_bay) "xyU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/picket_sign, @@ -88798,6 +88803,10 @@ /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) +"xNr" = ( +/obj/structure/cable, +/turf/closed/wall, +/area/station/cargo/drone_bay) "xNx" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -89200,11 +89209,6 @@ /obj/effect/turf_decal/tile/green/full, /turf/open/floor/iron, /area/station/service/hydroponics) -"xUp" = ( -/obj/item/kirbyplants/random/dead, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) "xUI" = ( /obj/structure/cable, /obj/structure/chair/sofa/bench/left, @@ -113169,8 +113173,8 @@ owI owI aQK aQK -dob -bJI +nCB +hSr aQK aQK aQK @@ -113426,11 +113430,11 @@ owI owI aQK aQK -sMk -fTs -fNv -szr -hFC +nNy +bnm +mNq +vQF +nri aQK rGF yiZ @@ -113683,11 +113687,11 @@ owI owI aQK aQK -ifn -fhi -veD -kIn -uUi +bFU +xal +uHw +tCm +mbR gfn hBR qWJ @@ -113940,11 +113944,11 @@ owI owI aQK aQK -lGu -bVH -pjG -asE -lzV +xyT +qlP +ixP +xur +qsc gfn rYA eEB @@ -114199,8 +114203,8 @@ aQK aQK aQK aQK -taC -hKX +xNr +lBb aQK aQK fxr @@ -119856,7 +119860,7 @@ wZN lWH lNE pZU -leE +tIf cmT sMS mar @@ -133251,7 +133255,7 @@ nPb qDs kSF cpE -vwC +muC qIf xGI kzE @@ -136326,7 +136330,7 @@ sly uyD aFJ mMq -mdu +kQJ uyD sHL ddT @@ -184110,10 +184114,10 @@ hge dPi hge oiO -xUp +mId aeI aiN -hdw +amR anN vIp asz @@ -188508,7 +188512,7 @@ obM kKr dXt wRD -viE +tIW okN cBa dYv @@ -248909,7 +248913,7 @@ ftp pzi eMj diA -iRu +lmi dDn pmQ pDK @@ -307995,7 +307999,7 @@ qlp qlp oKq mFS -eBn +rWL dWu wfx vLW @@ -310809,7 +310813,7 @@ tQO mXH qyH mXH -xwP +lRL nmc xJx rov @@ -312603,7 +312607,7 @@ ucA ucA ucA lYx -lOF +fIS koC oOA tyR @@ -314191,7 +314195,7 @@ apg sWm kHO iAq -cOw +aKy iAq cBx vEa @@ -314936,7 +314940,7 @@ hMm ipn pYl geD -tDO +mho mKs lif jmI @@ -328800,9 +328804,9 @@ fVV fVV fVV ulj -wJM +oJZ gbZ -ahv +oMk iWQ xeQ fVV diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 85742b5df225fa..1f36125564c369 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -9266,7 +9266,7 @@ pixel_x = 18; pixel_y = 5 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/structure/table, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/arcade) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ce8f17253144d0..a0186f0e8889a2 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3774,11 +3774,6 @@ "awE" = ( /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"awQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/eva) "awT" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 @@ -4164,23 +4159,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) -"aBk" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/obj/structure/rack, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/regular, -/obj/item/storage/box/bodybags, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver, -/turf/open/floor/iron/white, -/area/station/security/medical) "aBo" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -7229,6 +7207,22 @@ }, /turf/open/floor/wood/large, /area/station/service/barber) +"bjb" = ( +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + dir = 4; + icon_state = "right"; + name = "Brig Infirmary" + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/medical) "bju" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 @@ -7831,28 +7825,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) -"bup" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "rdoffice"; - name = "Privacy Shutter Control"; - pixel_x = -7; - pixel_y = -2; - req_access = list("research") - }, -/obj/item/folder/white{ - pixel_x = 5 - }, -/obj/item/stamp/head/rd{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/pen/fountain{ - pixel_x = -4; - pixel_y = 7 - }, -/turf/open/floor/glass/reinforced, -/area/station/command/heads_quarters/rd) "buv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/freezer, @@ -8908,12 +8880,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/maint) -"bKP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/eva) "bKT" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, @@ -10283,6 +10249,14 @@ }, /turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) +"ceO" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/security/medical) "ceQ" = ( /turf/open/floor/engine/hull, /area/station/solars/starboard/fore) @@ -11091,14 +11065,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/engine_smes) -"csL" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "csR" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12184,14 +12150,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"cMU" = ( -/obj/structure/table/glass, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/stamp/head/cmo, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "cNc" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -12947,6 +12905,27 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"daU" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/stamp/hop, +/obj/item/trapdoor_remote/preloaded{ + pixel_x = -8 + }, +/obj/machinery/requests_console/directional/west{ + anon_tips_receiver = 1; + assistance_requestable = 1; + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console"; + supplies_requestable = 1; + can_send_announcements = 1 + }, +/obj/item/paper_bin/carbon, +/obj/item/pen{ + pixel_x = -4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "dbc" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 4 @@ -13776,23 +13755,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"doe" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/east{ - name = "Containment Pen #6"; - req_access = list("xenobiology") - }, -/obj/machinery/door/window/left/directional/west{ - name = "Containment Pen #6"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "containdeez6"; - name = "Xenobiology Containment Blast Door" - }, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "dor" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -14190,14 +14152,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/blue, /area/station/maintenance/starboard/central) -"dvJ" = ( -/obj/machinery/door/airlock/hatch{ - name = "Secure Pen" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "dvQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -15251,12 +15205,6 @@ /obj/item/storage/box/disks_nanite, /turf/open/floor/iron/white, /area/station/science/ordnance/office) -"dNT" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/structure/table/optable, -/obj/machinery/defibrillator_mount/directional/south, -/turf/open/floor/iron/white, -/area/station/security/medical) "dNY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -21026,6 +20974,22 @@ "fFl" = ( /turf/open/floor/wood/large, /area/station/service/barber) +"fFu" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen #2"; + req_access = list("xenobiology") + }, +/obj/machinery/door/window/left/directional/west{ + name = "Containment Pen #2"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "containdeez2"; + name = "Xenobiology Containment Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "fFx" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron, @@ -21362,15 +21326,6 @@ /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"fKm" = ( -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/iron/white, -/area/station/security/medical) "fKx" = ( /obj/machinery/door/airlock/bananium, /turf/open/floor/iron/grimy, @@ -23357,6 +23312,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/science) +"gws" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/stamp/hos, +/obj/item/food/spaghetti/pastatomato/soulful, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) "gwy" = ( /obj/structure/sign/warning/no_smoking{ pixel_x = -28 @@ -25744,13 +25706,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/security) -"hkU" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/stamp/head/hos, -/obj/item/food/spaghetti/pastatomato/soulful, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hos) "hla" = ( /obj/structure/railing{ dir = 8; @@ -25941,7 +25896,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/effect/landmark/navigate_destination/common/dorms, /turf/open/floor/iron, /area/station/commons/dorms) @@ -26474,21 +26429,6 @@ /obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/plastic, /area/station/engineering/break_room) -"hyM" = ( -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "Xenolab"; - name = "Test Chamber Blast Door" - }, -/obj/machinery/door/window/left/directional/south{ - dir = 1; - name = "Maximum Security Test Chamber"; - req_access = list("xenobiology") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "hyO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/spawner, @@ -27141,6 +27081,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/tram/right) +"hKz" = ( +/obj/structure/bed, +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/station/security/medical) "hKH" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/bot/mulebot{ @@ -28844,7 +28790,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/escapepodbay) "imY" = ( @@ -28876,7 +28822,7 @@ pixel_x = -25; pixel_y = -5 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "int" = ( @@ -28928,6 +28874,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"inO" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/security/medical) "inP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -30054,7 +30007,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 1 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) "iGg" = ( @@ -30697,18 +30650,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"iQx" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/stamp/head/captain, -/obj/machinery/door/window{ - base_state = "right"; - icon_state = "right"; - name = "Captain's Desk"; - req_access = list("captain") - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "iQC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -31710,6 +31651,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) +"jfU" = ( +/obj/machinery/door/airlock/hatch{ + name = "Secure Pen" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/engine, +/area/station/science/xenobiology) "jge" = ( /obj/structure/cable/layer1, /obj/machinery/power/apc/auto_name/directional/west, @@ -32766,17 +32714,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/dorms) -"jwu" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance Hatch" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/eva) "jwT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34120,14 +34057,6 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"jTT" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/structure/closet/secure_closet/brig_physician, -/obj/item/clothing/suit/jacket/straight_jacket, -/turf/open/floor/iron/dark, -/area/station/security/medical) "jUa" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -34706,16 +34635,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"kcQ" = ( -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/item/radio/intercom/directional/west, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/iron/white, -/area/station/security/medical) "kcT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/brigdoor/left/directional/east{ @@ -37464,6 +37383,21 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) +"kUf" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/item/storage/box/bodybags, +/obj/item/reagent_containers/syringe, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/camera{ + c_tag = "Security - Medical Center"; + dir = 10; + network = list("ss13","Security") + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "kUh" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -39741,6 +39675,13 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/center) +"lGn" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/security/medical) "lGu" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, @@ -44743,13 +44684,6 @@ /obj/effect/decal/cleanable/plastic, /turf/closed/wall/r_wall, /area/ruin/powered/clownplanet) -"nlB" = ( -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 4 - }, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "nlD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44928,15 +44862,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/central) -"noq" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/machinery/computer/operating{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/security/medical) "noy" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -45634,6 +45559,20 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"nzg" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "Xenolab"; + name = "Test Chamber Blast Door" + }, +/obj/machinery/door/window/left/directional/south{ + dir = 1; + name = "Maximum Security Test Chamber"; + req_access = list("xenobiology") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/engine, +/area/station/science/xenobiology) "nzh" = ( /obj/structure/fluff/tram_rail/end{ dir = 8 @@ -46133,6 +46072,12 @@ /obj/item/pen/fourcolor, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) +"nHo" = ( +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "nHu" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -46810,6 +46755,13 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/freezerchamber) +"nSs" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "nSI" = ( /turf/closed/wall/r_wall, /area/station/commons/vacant_room/commissary) @@ -46957,23 +46909,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/grass, /area/station/hallway/primary/tram/center) -"nUV" = ( -/obj/machinery/door/window/left/directional/west{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Brig Infirmary"; - req_access = list("security") - }, -/obj/effect/turf_decal/trimline/red/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/corner, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/medical) "nUW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/green/visible, @@ -47142,6 +47077,13 @@ }, /turf/open/space/basic, /area/space/nearstation) +"nYY" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "nZJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -47938,14 +47880,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"olt" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "olw" = ( /obj/structure/industrial_lift/tram/white, /obj/structure/fluff/tram_rail, @@ -48005,7 +47939,7 @@ dir = 9 }, /obj/effect/turf_decal/trimline/dark_blue/corner, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "omT" = ( @@ -48033,21 +47967,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/dorms) -"one" = ( -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/camera{ - c_tag = "Security - Medical Center"; - dir = 10; - network = list("ss13","Security") - }, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/roller, -/turf/open/floor/iron/white, -/area/station/security/medical) "onf" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 6 @@ -49601,23 +49520,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/warning, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"oQQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/item/folder/yellow, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/structure/table, -/obj/item/paper_bin/carbon{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/stamp/head/qm, -/turf/open/floor/carpet, -/area/station/cargo/quartermaster) "oQW" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -52303,23 +52205,6 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"pHW" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/east{ - name = "Containment Pen #2"; - req_access = list("xenobiology") - }, -/obj/machinery/door/window/left/directional/west{ - name = "Containment Pen #2"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "containdeez2"; - name = "Xenobiology Containment Blast Door" - }, -/obj/structure/liquid_barrier, -/turf/open/floor/engine, -/area/station/science/xenobiology) "pHX" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -53176,6 +53061,23 @@ }, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"pUV" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/item/folder/yellow, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/structure/table, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/stamp/qm, +/turf/open/floor/carpet, +/area/station/cargo/quartermaster) "pVb" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -53601,6 +53503,14 @@ /obj/machinery/station_map/engineering/directional/east, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) +"qcV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance Hatch" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/eva) "qcY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -53643,6 +53553,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"qdr" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/regular, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/white, +/area/station/security/medical) "qdv" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/east, @@ -53737,16 +53660,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"qeO" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/landmark/start/brig_physician, -/obj/structure/chair/office, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "qeV" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -54686,7 +54599,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) "qvt" = ( @@ -55018,6 +54931,13 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) +"qAg" = ( +/obj/structure/bodycontainer/morgue, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "qAi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -55286,15 +55206,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) -"qEv" = ( -/obj/structure/table/reinforced, -/obj/item/folder/yellow, -/obj/item/stamp/head/ce, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "qEw" = ( /obj/effect/spawner/random/trash/bacteria, /obj/effect/decal/cleanable/dirt/dust, @@ -57519,6 +57430,18 @@ /obj/structure/industrial_lift/public, /turf/open/floor/plating/elevatorshaft, /area/station/commons/dorms) +"rnc" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/obj/item/stamp/captain, +/obj/machinery/door/window{ + base_state = "right"; + icon_state = "right"; + name = "Captain's Desk"; + req_access = list("captain") + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "rnd" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -58244,17 +58167,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"rzk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Cytology Maintenance Hatch" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, -/turf/open/floor/catwalk_floor, -/area/station/science/xenobiology) "rzt" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -58561,6 +58473,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating/airless, /area/station/engineering) +"rFF" = ( +/obj/structure/bed, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/security/medical) "rFW" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/holosign/barrier/atmos/tram, @@ -60008,6 +59927,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/right) +"sgu" = ( +/obj/structure/table/reinforced, +/obj/item/folder/yellow, +/obj/item/stamp/ce, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "sgA" = ( /obj/structure/table, /obj/machinery/light/small/directional/west, @@ -61258,11 +61186,33 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) +"szO" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "rdoffice"; + name = "Privacy Shutter Control"; + pixel_x = -7; + pixel_y = -2; + req_access = list("research") + }, +/obj/item/folder/white{ + pixel_x = 5 + }, +/obj/item/stamp/rd{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/pen/fountain{ + pixel_x = -4; + pixel_y = 7 + }, +/turf/open/floor/glass/reinforced, +/area/station/command/heads_quarters/rd) "szY" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron, /area/station/hallway/secondary/service) "szZ" = ( @@ -62885,6 +62835,15 @@ }, /turf/open/floor/carpet, /area/station/service/chapel) +"sZD" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/white, +/area/station/security/medical) "sZH" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Public Garden Maintenance Hatch" @@ -63586,11 +63545,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"tky" = ( -/obj/effect/turf_decal/stripes/end, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "tkB" = ( /obj/structure/disposalpipe/junction/flip, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64016,15 +63970,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"trh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance Hatch" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/duct, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/eva) "trm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -64747,11 +64692,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) -"tDs" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/security/medical) "tDz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, @@ -65909,6 +65849,22 @@ /obj/structure/lattice, /turf/open/openspace, /area/station/ai_monitored/turret_protected/aisat/hallway) +"tXW" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen #6"; + req_access = list("xenobiology") + }, +/obj/machinery/door/window/left/directional/west{ + name = "Containment Pen #6"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "containdeez6"; + name = "Xenobiology Containment Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "tXY" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -66188,6 +66144,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) +"udb" = ( +/obj/structure/table/glass, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "udc" = ( /obj/structure/chair/sofa/bench/corner{ dir = 8 @@ -66435,6 +66398,24 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) +"uiC" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Entrance" + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "uiI" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 4 @@ -66962,25 +66943,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"uqB" = ( -/obj/machinery/door/airlock/research{ - name = "Xenobiology Entrance" - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/disposalpipe/segment, -/obj/structure/liquid_barrier, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "uqC" = ( /obj/structure/table, /obj/machinery/recharger, @@ -67975,27 +67937,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"uFt" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/stamp/head/hop, -/obj/item/trapdoor_remote/preloaded{ - pixel_x = -8 - }, -/obj/machinery/requests_console/directional/west{ - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console"; - supplies_requestable = 1; - can_send_announcements = 1 - }, -/obj/item/paper_bin/carbon, -/obj/item/pen{ - pixel_x = -4 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "uFD" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 4 @@ -70180,13 +70121,6 @@ /obj/effect/artifact_spawner, /turf/open/floor/engine, /area/station/science/explab) -"vmU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/plumbed{ - name = "dormitory water reservoir" - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/eva) "vnd" = ( /obj/structure/ladder, /obj/machinery/door/firedoor/border_only{ @@ -70428,6 +70362,16 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance) +"vqe" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Cytology Maintenance Hatch" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/floor/catwalk_floor, +/area/station/science/xenobiology) "vqn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -72238,6 +72182,10 @@ "vRv" = ( /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"vRy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/security/medical) "vRA" = ( /obj/machinery/flasher/portable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -73339,16 +73287,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"wkA" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, -/turf/open/floor/iron/white, -/area/station/security/medical) "wkC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -78223,6 +78161,16 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xSB" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance Hatch" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/eva) "xSD" = ( /obj/structure/chair/office/light{ dir = 8 @@ -111595,7 +111543,7 @@ gKJ wIg rSj vRv -qEv +sgu joI fkq sHH @@ -123427,7 +123375,7 @@ fkf qVr fUz rkI -pHW +fFu jQE lIY tzq @@ -125215,11 +125163,11 @@ hWI bFQ hNw sqI -uqB +uiC aHr nDM apL -uqB +uiC rdU uon whd @@ -127025,7 +126973,7 @@ ohh qVr qVr wdD -doe +tXW vTx qVr vxy @@ -158563,10 +158511,10 @@ aaa aaa aaa osk -vmU -awQ -trh -bKP +gKX +gKX +qcV +jta ayR tVp mdV @@ -158823,7 +158771,7 @@ osk vkc gKX osk -bKP +jta ayR xMg xMg @@ -159080,7 +159028,7 @@ run run run ayR -bKP +jta ayR hzN hzN @@ -159331,13 +159279,13 @@ dkO rGN dTL mjM -jTT -kcQ -fKm -one +qAg +qdr +sZD +kUf lqP ayR -bKP +jta ayR dsF dsF @@ -159588,13 +159536,13 @@ aBK ceF dta mjM -wkA -csL -qeO -csL -olt -jwu -bKP +ceO +inO +inO +inO +lGn +xSB +jta ayR eeL kHZ @@ -159845,11 +159793,11 @@ aBK dkO dta mjM -aBk -tDs +nSs +vRy gbr kMR -dNT +hKz ayR gKX ayR @@ -160102,11 +160050,11 @@ gvQ kEc ntp mjM -tky -nlB +nYY +nHo bxH aFg -noq +rFF ayR gKX ayR @@ -160361,7 +160309,7 @@ gki mjM mjM aDl -nUV +bjb awW ayR ayR @@ -160389,7 +160337,7 @@ xSr umf qjW kqR -uFt +daU swc wHT omH @@ -164970,7 +164918,7 @@ aaa rmB qjw gJI -hkU +gws qUY auP qxT @@ -167061,7 +167009,7 @@ tth rKP kOr fpR -iQx +rnc aBt kbM qiN @@ -175334,7 +175282,7 @@ qOY iae qeL sYh -cMU +udb wdj oGJ oGJ @@ -189164,7 +189112,7 @@ gbW uUE nms int -oQQ +pUV gSi byL whL @@ -189475,7 +189423,7 @@ aaa aaa qVr qVr -dvJ +jfU glp soq soq @@ -189737,7 +189685,7 @@ rzt xyA wXi soq -rzk +vqe soq soq soq @@ -190758,7 +190706,7 @@ ttj bhf ttj ttj -hyM +nzg cwj xmY bsh @@ -191002,7 +190950,7 @@ jwe rBb vZD tes -bup +szO xPR kye cwX @@ -192045,7 +191993,7 @@ aaa aaa qVr qVr -dvJ +jfU qtB qVr qVr diff --git a/_maps/multiz_debug.json b/_maps/multiz_debug.json index 15cf73d599a4b1..b380a2b7fd0aae 100644 --- a/_maps/multiz_debug.json +++ b/_maps/multiz_debug.json @@ -3,9 +3,6 @@ "map_name": "MultiZ Debug", "map_path": "map_files/debug", "map_file": "multiz.dmm", - "ignored_unit_tests": [ - "/datum/unit_test/required_map_items" - ], "traits": [ { "Up": true, diff --git a/_maps/northstar.json b/_maps/northstar.json index 9de8a4fd6866e8..0dc25fd0df2f09 100644 --- a/_maps/northstar.json +++ b/_maps/northstar.json @@ -12,9 +12,6 @@ }, "space_ruin_levels": 0, "space_empty_levels": 2, - "ignored_unit_tests": [ - "/datum/unit_test/required_map_items" - ], "traits": [ { "Up": true, diff --git a/_maps/runtimestation.json b/_maps/runtimestation.json index ccc971a9cc55fe..6b77a7321f21b8 100644 --- a/_maps/runtimestation.json +++ b/_maps/runtimestation.json @@ -4,9 +4,6 @@ "map_path": "map_files/debug", "map_file": "runtimestation.dmm", "space_ruin_levels": 1, - "ignored_unit_tests": [ - "/datum/unit_test/required_map_items" - ], "shuttles": { "cargo": "cargo_delta" } diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm index ffa5f86a6d4889..3c61e456b8ae32 100644 --- a/_maps/shuttles/emergency_cruise.dmm +++ b/_maps/shuttles/emergency_cruise.dmm @@ -1119,7 +1119,7 @@ /turf/open/floor/plastic, /area/shuttle/escape/luxury) "uQ" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/wood/tile, /area/shuttle/escape) "uV" = ( diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency_tranquility.dmm index 71bf3f0f4dccf8..88c061cd027641 100644 --- a/_maps/shuttles/emergency_tranquility.dmm +++ b/_maps/shuttles/emergency_tranquility.dmm @@ -898,7 +898,7 @@ /obj/item/stamp/denied{ pixel_x = 8 }, -/obj/item/stamp/head/qm{ +/obj/item/stamp/qm{ pixel_y = -5; pixel_x = 8 }, diff --git a/_maps/~monkestation/RandomBars/Icebox/Drunkopsbar.dmm b/_maps/~monkestation/RandomBars/Icebox/Drunkopsbar.dmm index 746f3cd0fdebc5..5b6c97d5451a3a 100644 --- a/_maps/~monkestation/RandomBars/Icebox/Drunkopsbar.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/Drunkopsbar.dmm @@ -534,7 +534,7 @@ "CF" = ( /obj/machinery/restaurant_portal/bar, /obj/machinery/camera/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/mineral/plastitanium, /area/station/service/bar) "Ds" = ( diff --git a/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm b/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm index 3b4c3b15c4dadf..7ba68244769b96 100644 --- a/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/Magbar.dmm @@ -851,7 +851,7 @@ "CU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron{ base_icon_state = "basalt0"; icon_state = "basalt0"; diff --git a/_maps/~monkestation/RandomBars/Icebox/clockwork_icebox.dmm b/_maps/~monkestation/RandomBars/Icebox/clockwork_icebox.dmm index 884feffcabd908..a8890927c179b1 100644 --- a/_maps/~monkestation/RandomBars/Icebox/clockwork_icebox.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/clockwork_icebox.dmm @@ -424,7 +424,7 @@ /turf/open/floor/bronze, /area/station/commons/lounge) "wb" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/bronze, /area/station/commons/lounge) "wg" = ( diff --git a/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm b/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm index 34267a809206ec..1201953d35550c 100644 --- a/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm @@ -570,7 +570,9 @@ dir = 1; name = "old bloody sofa" }, -/obj/machinery/atm/directional/south, +/obj/machinery/atm{ + pixel_y = -30 + }, /obj/machinery/airalarm/directional/east, /turf/open/floor/cult, /area/station/commons/lounge) @@ -830,7 +832,7 @@ dir = 4; name = "old bloody sofa" }, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/cult, /area/station/commons/lounge) "Ov" = ( diff --git a/_maps/~monkestation/RandomBars/Icebox/green_bar_disco.dmm b/_maps/~monkestation/RandomBars/Icebox/green_bar_disco.dmm index 19a3317f9a3d81..6a4bc206155b7a 100644 --- a/_maps/~monkestation/RandomBars/Icebox/green_bar_disco.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/green_bar_disco.dmm @@ -489,7 +489,7 @@ /turf/open/floor/carpet/green, /area/station/commons/lounge) "tJ" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/structure/chair/wood{ dir = 4 }, diff --git a/_maps/~monkestation/RandomBars/Icebox/icebox_bar_abductor.dmm b/_maps/~monkestation/RandomBars/Icebox/icebox_bar_abductor.dmm index f8f0aefbc2e236..5a588d418ebbe7 100644 --- a/_maps/~monkestation/RandomBars/Icebox/icebox_bar_abductor.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/icebox_bar_abductor.dmm @@ -395,7 +395,7 @@ /turf/open/floor/mineral/fake_abductor, /area/station/commons/lounge) "sH" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/mineral/fake_abductor, /area/station/commons/lounge) "tL" = ( diff --git a/_maps/~monkestation/RandomBars/Icebox/icebox_bar_arcade.dmm b/_maps/~monkestation/RandomBars/Icebox/icebox_bar_arcade.dmm index 68bcd6dec5aec9..40a48926706b65 100644 --- a/_maps/~monkestation/RandomBars/Icebox/icebox_bar_arcade.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/icebox_bar_arcade.dmm @@ -204,7 +204,7 @@ /area/station/service/bar) "jP" = ( /obj/machinery/light/directional/north, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/effect/turf_decal/siding/purple{ dir = 4 }, diff --git a/_maps/~monkestation/RandomBars/Icebox/icebox_bar_base.dmm b/_maps/~monkestation/RandomBars/Icebox/icebox_bar_base.dmm index 5dc6cd68802d28..0b4a15f881d406 100644 --- a/_maps/~monkestation/RandomBars/Icebox/icebox_bar_base.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/icebox_bar_base.dmm @@ -972,7 +972,7 @@ /turf/open/floor/stone, /area/station/service/bar) "Tm" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/wood/parquet, /area/station/commons/lounge) "Uq" = ( diff --git a/_maps/~monkestation/RandomBars/Icebox/junglebar.dmm b/_maps/~monkestation/RandomBars/Icebox/junglebar.dmm index 6ead7780b6b03b..e9dbf68c65bbd4 100644 --- a/_maps/~monkestation/RandomBars/Icebox/junglebar.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/junglebar.dmm @@ -467,7 +467,7 @@ /turf/open/floor/wood, /area/station/commons/lounge) "Vd" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, diff --git a/_maps/~monkestation/RandomBars/Icebox/mime_bar.dmm b/_maps/~monkestation/RandomBars/Icebox/mime_bar.dmm index b1d9b9a25c3121..082161fd595b4f 100644 --- a/_maps/~monkestation/RandomBars/Icebox/mime_bar.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/mime_bar.dmm @@ -1962,7 +1962,7 @@ /turf/open/floor/stone, /area/station/service/bar) "Tm" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/structure/window/reinforced/plasma{ dir = 1; alpha = 0 diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_base.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_base.dmm index 3d15998567b2e2..cc58ec88902da7 100644 --- a/_maps/~monkestation/RandomBars/Tram/tram_bar_base.dmm +++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_base.dmm @@ -823,7 +823,7 @@ "wu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/wood/large, /area/station/service/theater) "wx" = ( @@ -1784,7 +1784,7 @@ "Vq" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/iron/dark, /area/station/commons/lounge) "Vs" = ( diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm index c3966427f4bdaf..041c608df6f363 100644 --- a/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm +++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_beachside.dmm @@ -1667,7 +1667,7 @@ /turf/open/floor/fakesand, /area/station/commons/lounge) "Wq" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/effect/turf_decal/sand, /turf/open/misc/beach/sand, /area/station/commons/lounge) diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_biodome.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_biodome.dmm index e5ce805f2b7593..15c9c93944e6d5 100644 --- a/_maps/~monkestation/RandomBars/Tram/tram_bar_biodome.dmm +++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_biodome.dmm @@ -893,7 +893,7 @@ "wu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/misc/snow/actually_safe, /area/station/service/theater) "wx" = ( @@ -1991,7 +1991,7 @@ "Vq" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/pod/light, /area/station/commons/lounge) "Vs" = ( diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm index c0938396a97543..253eb1f6538dca 100644 --- a/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm +++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm @@ -1418,7 +1418,9 @@ /turf/open/floor/cult, /area/station/service/theater) "FA" = ( -/obj/machinery/atm/directional/south, +/obj/machinery/atm{ + pixel_y = -30 + }, /obj/effect/turf_decal/arrows{ pixel_x = -8 }, @@ -1944,7 +1946,10 @@ /turf/open/floor/cult, /area/station/commons/lounge) "Ud" = ( -/obj/machinery/atm/directional/west, +/obj/machinery/atm{ + pixel_x = -30; + pixel_y = 0 + }, /turf/open/floor/cult, /area/station/service/theater) "Uf" = ( diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_maints_grape.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_maints_grape.dmm index 61876b3614f1a7..ca61184f313826 100644 --- a/_maps/~monkestation/RandomBars/Tram/tram_bar_maints_grape.dmm +++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_maints_grape.dmm @@ -967,7 +967,7 @@ "wu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/service/theater) @@ -2083,7 +2083,7 @@ /area/station/commons/lounge) "Vq" = ( /obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /obj/item/shard{ pixel_x = 14 }, diff --git a/_maps/~monkestation/RandomBars/Tram/tram_bar_ocean.dmm b/_maps/~monkestation/RandomBars/Tram/tram_bar_ocean.dmm index 0363b7620519d2..3df847a9c38073 100644 --- a/_maps/~monkestation/RandomBars/Tram/tram_bar_ocean.dmm +++ b/_maps/~monkestation/RandomBars/Tram/tram_bar_ocean.dmm @@ -795,7 +795,7 @@ /turf/open/floor/fake_seafloor/ironsand, /area/station/service/theater) "JI" = ( -/obj/machinery/atm/directional/north, +/obj/machinery/atm, /turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Kh" = ( diff --git a/_maps/~monkestation/RandomBars/Tram/tram_rvb_bar.dmm b/_maps/~monkestation/RandomBars/Tram/tram_rvb_bar.dmm index 7bda319a155475..e161d9ce8ff8dc 100644 --- a/_maps/~monkestation/RandomBars/Tram/tram_rvb_bar.dmm +++ b/_maps/~monkestation/RandomBars/Tram/tram_rvb_bar.dmm @@ -192,7 +192,10 @@ /obj/effect/turf_decal/tile/dark{ dir = 8 }, -/obj/machinery/atm/directional/east, +/obj/machinery/atm{ + pixel_x = 30; + pixel_y = 0 + }, /turf/open/floor/iron, /area/station/commons/lounge) "dn" = ( @@ -2268,7 +2271,10 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/machinery/duct, -/obj/machinery/atm/directional/west, +/obj/machinery/atm{ + pixel_x = -30; + pixel_y = 0 + }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index bac63226394a5f..86e484c7dcac08 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -154,7 +154,6 @@ GLOBAL_LIST_INIT(syndicate_employers, list( "Tiger Cooperative Fanatic", "Waffle Corporation Terrorist", "Waffle Corporation", - "The Ashen Forge Member", )) ///employers that are from nanotrasen GLOBAL_LIST_INIT(nanotrasen_employers, list( @@ -172,7 +171,6 @@ GLOBAL_LIST_INIT(hijack_employers, list( "Gone Postal", "Tiger Cooperative Fanatic", "Waffle Corporation Terrorist", - "The Ashen Forge Member", )) ///employers who hire agents to do a task and escape... or martyrdom. whatever @@ -186,7 +184,6 @@ GLOBAL_LIST_INIT(normal_employers, list( "Legal Trouble", "MI13", "Waffle Corporation", - "The Ashen Forge Member", )) ///employers for malfunctioning ais. they do not have sides, unlike traitors. diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 42bca6794547e1..9d591178c574fe 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -95,7 +95,6 @@ #define SECHUD_BARTENDER "hudbartender" #define SECHUD_BITRUNNER "hudbitrunner" #define SECHUD_BOTANIST "hudbotanist" -#define SECHUD_BRIG_PHYSICIAN "hudbrigphysician" #define SECHUD_CAPTAIN "hudcaptain" #define SECHUD_CARGO_TECHNICIAN "hudcargotechnician" #define SECHUD_CHAPLAIN "hudchaplain" diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 3af15188f8b832..a4c6bdc05795ac 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -190,15 +190,12 @@ GLOBAL_LIST_INIT(crafting_category, list( #define RCD_FLOODLIGHT 8 #define RCD_WALLFRAME 9 #define RCD_REFLECTOR 10 -#define RCD_GIRDER 11 #define RCD_UPGRADE_FRAMES (1<<0) #define RCD_UPGRADE_SIMPLE_CIRCUITS (1<<1) #define RCD_UPGRADE_SILO_LINK (1<<2) #define RCD_UPGRADE_FURNISHING (1<<3) -#define RCD_UPGRADE_ANTI_INTERRUPT (1<<4) -#define RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN (1<<5) #define RPD_UPGRADE_UNWRENCH (1<<0) @@ -216,9 +213,6 @@ GLOBAL_LIST_INIT(crafting_category, list( /// How much less resources the RCD uses when reconstructing #define RCD_MEMORY_COST_BUFF 8 -/// If set to TRUE in rcd_vals, will bypass the cooldown on slowing down frequent use -#define RCD_RESULT_BYPASS_FREQUENT_USE_COOLDOWN "bypass_frequent_use_cooldown" - // Defines for the construction component #define FORWARD 1 #define BACKWARD -1 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 5fccd7a3de84fc..6475319329cc35 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -224,6 +224,3 @@ /// from /mob/proc/change_mob_type_unchecked() : () #define COMSIG_MOB_CHANGED_TYPE "mob_changed_type" - -/// from /mob/proc/key_down(): (key, client/client, full_key) -#define COMSIG_MOB_KEYDOWN "mob_key_down" diff --git a/code/__DEFINES/dcs/signals/signals_turf.dm b/code/__DEFINES/dcs/signals/signals_turf.dm index 397345cc498d15..f5a91db4c93dbd 100644 --- a/code/__DEFINES/dcs/signals/signals_turf.dm +++ b/code/__DEFINES/dcs/signals/signals_turf.dm @@ -28,8 +28,6 @@ ///called on liquid creation #define COMSIG_TURF_LIQUIDS_CREATION "turf_liquids_creation" - /// Blocks the liquid from being created. - #define BLOCK_LIQUID_CREATION (1 << 0) #define COMSIG_TURF_MOB_FALL "turf_mob_fall" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 77f6a7f9823f65..8ab7647d47e8c4 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -46,7 +46,6 @@ #define JOB_PERSONAL_AI "Personal AI" //Security #define JOB_WARDEN "Warden" -#define JOB_BRIG_PHYSICIAN "Brig Physician" #define JOB_DETECTIVE "Detective" #define JOB_SECURITY_OFFICER "Security Officer" #define JOB_SECURITY_OFFICER_MEDICAL "Security Officer (Medical)" @@ -151,11 +150,10 @@ #define JOB_DISPLAY_ORDER_GENETICIST 31 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 32 #define JOB_DISPLAY_ORDER_WARDEN 33 -#define JOB_DISPLAY_ORDER_BRIG_PHYSICIAN 34 -#define JOB_DISPLAY_ORDER_DETECTIVE 35 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 36 -#define JOB_DISPLAY_ORDER_SECURITY_ASSISTANT 37 // monkestation edit: security assistants -#define JOB_DISPLAY_ORDER_PRISONER 38 +#define JOB_DISPLAY_ORDER_DETECTIVE 34 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 35 +#define JOB_DISPLAY_ORDER_SECURITY_ASSISTANT 36 // monkestation edit: security assistants +#define JOB_DISPLAY_ORDER_PRISONER 37 #define DEPARTMENT_UNASSIGNED "No Department" diff --git a/code/__DEFINES/unit_tests.dm b/code/__DEFINES/unit_tests.dm index 60482923ec205e..29deeb1716c5ea 100644 --- a/code/__DEFINES/unit_tests.dm +++ b/code/__DEFINES/unit_tests.dm @@ -18,34 +18,3 @@ #else #define TEST_ONLY_ASSERT(test, explanation) #endif - -/** - * Used for registering typepaths of item to be tracked as a "required map item" - * This is used to ensure that that all station maps have certain items mapped in that they should have - * Or that people aren't mapping in an excess of items that they shouldn't be - * (For example, all map should only ever have 1 Pun Pun) - * - * Min is inclusive, Max is inclusive (so 1, 1 means min of 1, max of 1, or only 1 allowed) - * - * This should only be used in Initialize(). And don't forget to update the unit test with the type itself! - */ -#ifdef UNIT_TESTS -#define REGISTER_REQUIRED_MAP_ITEM(min, max) \ - do { \ - if(mapload) { \ - var/turf/spawn_turf = get_turf(src); \ - var/fixed_type = trim_directional_helper_suffix(type); \ - if(is_station_level(spawn_turf?.z || 0)) { \ - var/datum/required_item/existing_value = GLOB.required_map_items[fixed_type]; \ - if(isnull(existing_value)) { \ - var/datum/required_item/new_value = new(fixed_type, min, max); \ - GLOB.required_map_items[fixed_type] = new_value; \ - } else { \ - existing_value.total_amount += 1; \ - }; \ - }; \ - }; \ - } while (FALSE) -#else -#define REGISTER_REQUIRED_MAP_ITEM(min, max) -#endif diff --git a/code/__DEFINES/~monkestation/company.dm b/code/__DEFINES/~monkestation/company.dm index a01765a02ba83c..bc7bf4e7329f88 100644 --- a/code/__DEFINES/~monkestation/company.dm +++ b/code/__DEFINES/~monkestation/company.dm @@ -29,7 +29,6 @@ #define COMPANY_REMOVED "It has had [span_grey("all identifying marks scrubbed off")]." -#define COMPANY_ASHENFORGE "It has a [span_green("unlit forge")] engraved into it along with the words [span_grey("The Ashen Forge")] below it." #define span_emote(str) ("" + str + "") #define span_maptext(str) ("" + str + "") diff --git a/code/__DEFINES/~monkestation/holomaps.dm b/code/__DEFINES/~monkestation/holomaps.dm index 34d40f6a7aed01..a03999cea984eb 100644 --- a/code/__DEFINES/~monkestation/holomaps.dm +++ b/code/__DEFINES/~monkestation/holomaps.dm @@ -17,9 +17,6 @@ #define HOLOMAP_ROCK "#66666644" // Color of mineral walls #define HOLOMAP_HOLOFIER "#0096bb" // Whole map is multiplied by this to give it a green holoish look -#define HOLOMAP_AREACOLOR_SHIELD_1 rgb(0, 119, 255, 64) -#define HOLOMAP_AREACOLOR_SHIELD_2 rgb(0, 255, 255, 64) - #define HOLOMAP_AREACOLOR_COMMAND "#3434d499" #define HOLOMAP_AREACOLOR_SECURITY "#AE121299" #define HOLOMAP_AREACOLOR_MEDICAL "#447bc299" diff --git a/code/__DEFINES/~monkestation/traits.dm b/code/__DEFINES/~monkestation/traits.dm index a56f05ae57fde3..4388c7e409c7ac 100644 --- a/code/__DEFINES/~monkestation/traits.dm +++ b/code/__DEFINES/~monkestation/traits.dm @@ -36,13 +36,5 @@ #define ABDUCTOR_GLAND_VENTCRAWLING_TRAIT "abductor_gland_ventcrawling" #define TRAIT_BETTER_CYBERCONNECTOR "better_cyberconnector_hacking" - /// Allows the user to instantly reload. #define TRAIT_INSTANT_RELOAD "instant_reload" - - -// /turf/open -/// If a trait is considered as having "coverage" by a meteor shield. -#define TRAIT_COVERED_BY_METEOR_SHIELD "covered_by_meteor_shield" -/// Liquids cannot spread over this turf. -#define TRAIT_BLOCK_LIQUID_SPREAD "block_liquid_spread" diff --git a/code/__HELPERS/colors.dm b/code/__HELPERS/colors.dm index a58721a6603b40..1c4cbbd9704c1d 100644 --- a/code/__HELPERS/colors.dm +++ b/code/__HELPERS/colors.dm @@ -84,10 +84,6 @@ /// But paired down and modified to work for our color range /// Accepts the color cutoffs as two 3 length list(0-100,...) arguments /proc/blend_cutoff_colors(list/first_color, list/second_color) - // These runtimes usually mean that either the eye or the glasses have an incorrect color_cutoffs - ASSERT(first_color?.len == 3, "First color must be a 3 length list, received [json_encode(first_color)]") - ASSERT(second_color?.len == 3, "Second color must be a 3 length list, received [json_encode(second_color)]") - var/list/output = new /list(3) // Invert the colors, multiply to "darken" (actually lights), then uninvert to get back to what we want diff --git a/code/__HELPERS/construction.dm b/code/__HELPERS/construction.dm index fe4971b894fb02..ad9f24cef3c176 100644 --- a/code/__HELPERS/construction.dm +++ b/code/__HELPERS/construction.dm @@ -5,7 +5,6 @@ return defaults + list( "cost" = defaults["cost"] / RCD_MEMORY_COST_BUFF, "delay" = defaults["delay"] / RCD_MEMORY_SPEED_BUFF, - RCD_RESULT_BYPASS_FREQUENT_USE_COOLDOWN = TRUE, ) else return defaults diff --git a/code/__HELPERS/paths/jps.dm b/code/__HELPERS/paths/jps.dm index 79a4d0204f5162..6ef883c7d2b4d5 100644 --- a/code/__HELPERS/paths/jps.dm +++ b/code/__HELPERS/paths/jps.dm @@ -34,7 +34,7 @@ previous_node = incoming_previous_node number_tiles = previous_node.number_tiles + jumps node_goal = previous_node.node_goal - heuristic = get_dist_euclidean(tile, node_goal) + heuristic = get_dist(tile, node_goal) f_value = number_tiles + heuristic // otherwise, no parent node means this is from a subscan lateral scan, so we just need the tile for now until we call [datum/jps/proc/update_parent] on it @@ -47,7 +47,7 @@ node_goal = previous_node.node_goal jumps = get_dist(tile, previous_node.tile) number_tiles = previous_node.number_tiles + jumps - heuristic = get_dist_euclidean(tile, node_goal) + heuristic = get_dist(tile, node_goal) f_value = number_tiles + heuristic /// TODO: Macro this to reduce proc overhead diff --git a/code/__HELPERS/spatial_info.dm b/code/__HELPERS/spatial_info.dm index f5d0155343cacd..f3d47da9f77f89 100644 --- a/code/__HELPERS/spatial_info.dm +++ b/code/__HELPERS/spatial_info.dm @@ -253,7 +253,7 @@ return atoms ///Returns the distance between two atoms -/proc/get_dist_euclidean(atom/first_location as turf|mob|obj, atom/second_location as turf|mob|obj) +/proc/get_dist_euclidian(atom/first_location as turf|mob|obj, atom/second_location as turf|mob|obj) var/dx = first_location.x - second_location.x var/dy = first_location.y - second_location.y diff --git a/code/__HELPERS/~monkestation-helpers/mapping.dm b/code/__HELPERS/~monkestation-helpers/mapping.dm index a4d0a68fca7eea..62d6f30564dad9 100644 --- a/code/__HELPERS/~monkestation-helpers/mapping.dm +++ b/code/__HELPERS/~monkestation-helpers/mapping.dm @@ -4,13 +4,3 @@ if(a.z == b.z) return TRUE return (b.z in SSmapping.get_connected_levels(a)) - -/// Trims "directional/dir" suffixes from typepaths. -/proc/trim_directional_helper_suffix(typepath) - if(!ispath(typepath)) - CRASH("Passed non-typepath [typepath] to trim_directional_helper_suffix") - var/static/regex/directional_helper_regex - if(!directional_helper_regex) - directional_helper_regex = new(@"\/directional\/(north|south|east|west)$") - var/replaced = replacetext("[typepath]", directional_helper_regex, "") - return text2path(replaced) || typepath diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index f493e82c1eb6b2..b2066d68077fd9 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -144,7 +144,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/megaphone/sec, /obj/item/melee/baton, /obj/item/restraints/handcuffs, - /obj/item/stamp/head/hos, + /obj/item/stamp/hos, /obj/item/toy/figure/hos, /obj/item/toy/figure/secofficer, /obj/machinery/door/airlock/security, @@ -238,8 +238,14 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/radio/headset/heads, /obj/item/megaphone/command, /obj/item/melee/baton/abductor, + /obj/item/stamp/captain, + /obj/item/stamp/ce, /obj/item/stamp/centcom, - /obj/item/stamp/head, + /obj/item/stamp/cmo, + /obj/item/stamp/hop, + /obj/item/stamp/hos, + /obj/item/stamp/rd, + /obj/item/stamp/qm, /obj/item/storage/belt/military/abductor, /obj/item/toy/figure/captain, /obj/item/toy/figure/ce, @@ -396,8 +402,14 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/encryptionkey/heads, /obj/item/radio/headset/heads, /obj/item/melee/baton/telescopic, + /obj/item/stamp/captain, + /obj/item/stamp/ce, /obj/item/stamp/centcom, - /obj/item/stamp/head, + /obj/item/stamp/cmo, + /obj/item/stamp/hop, + /obj/item/stamp/hos, + /obj/item/stamp/rd, + /obj/item/stamp/qm, /obj/item/toy/figure/captain, /obj/item/toy/figure/ce, /obj/item/toy/figure/cmo, diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 3092722c79dfc3..71a162db212f06 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -18,8 +18,6 @@ /// A weakref of the last thing we hovered over /// God I hate how dragging works var/datum/weakref/last_hovored_ref - /// overlay for keybind maptext - var/mutable_appearance/keybind_maptext /atom/movable/screen/movable/action_button/Destroy() if(our_hud) @@ -50,9 +48,6 @@ return FALSE var/list/modifiers = params2list(params) - if(LAZYACCESS(modifiers, ALT_CLICK)) - begin_creating_bind(usr) - return TRUE if(LAZYACCESS(modifiers, SHIFT_CLICK)) var/datum/hud/our_hud = usr.hud_used our_hud.position_action(src, SCRN_OBJ_DEFAULT) @@ -66,14 +61,6 @@ linked_action.Trigger(trigger_flags = trigger_flags) return TRUE -/atom/movable/screen/movable/action_button/proc/begin_creating_bind(mob/user) - if(!isnull(linked_action.full_key)) - linked_action.full_key = null - linked_action.update_button_status(src) - return - linked_action.full_key = tgui_input_keycombo(user, "Please bind a key for this action.") - linked_action.update_button_status(src) - // Entered and Exited won't fire while you're dragging something, because you're still "holding" it // Very much byond logic, but I want nice behavior, so we fake it with drag /atom/movable/screen/movable/action_button/MouseDrag(atom/over_object, src_location, over_location, src_control, over_control, params) @@ -162,15 +149,6 @@ return user.client.prefs.action_buttons_screen_locs -= "[name]_[id]" -/atom/movable/screen/movable/action_button/proc/update_keybind_maptext(key) - cut_overlay(keybind_maptext) - if(!key) - return - keybind_maptext = new - keybind_maptext.maptext = MAPTEXT("[key]") - keybind_maptext.transform = keybind_maptext.transform.Translate(-4, length(key) > 1 ? -6 : 2) //with modifiers, its placed lower so cooldown is visible - add_overlay(keybind_maptext) - /** * This is a silly proc used in hud code code to determine what icon and icon state we should be using * for hud elements (such as action buttons) that don't have their own icon and icon state set. @@ -263,7 +241,7 @@ action.HideFrom(src) /atom/movable/screen/button_palette - desc = "Drag buttons to move them
Shift-click any button to reset it
Alt-click any button to begin binding it to a key
Alt-click this to reset all buttons" + desc = "Drag buttons to move them
Shift-click any button to reset it
Alt-click this to reset all buttons" icon = 'icons/hud/64x16_actions.dmi' icon_state = "screen_gen_palette" screen_loc = ui_action_palette diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index d86471375b128a..e9933a57993228 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -514,7 +514,7 @@ SUBSYSTEM_DEF(explosions) * - [creaking_sound][/sound]: The sound that plays when the station creaks during the explosion. * - [hull_creaking_sound][/sound]: The sound that plays when the station creaks after the explosion. */ -/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx(SFX_EXPLOSION)), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx(SFX_EXPLOSION_CREAKING)), hull_creaking_sound = sound(get_sfx(SFX_HULL_CREAKING)), pressure_affected = TRUE, disable_shaking = FALSE) // monkestation edit: add pressure_affected, disable_shaking +/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx(SFX_EXPLOSION)), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx(SFX_EXPLOSION_CREAKING)), hull_creaking_sound = sound(get_sfx(SFX_HULL_CREAKING))) var/frequency = get_rand_frequency() var/blast_z = epicenter.z if(isnull(creaking)) // Autoset creaking. @@ -535,20 +535,20 @@ SUBSYSTEM_DEF(explosions) var/base_shake_amount = sqrt(near_distance / (distance + 1)) if(distance <= round(near_distance + world.view - 2, 1)) // If you are close enough to see the effects of the explosion first-hand (ignoring walls) - listener.playsound_local(epicenter, null, 100, TRUE, frequency, pressure_affected = pressure_affected, sound_to_use = near_sound) // monkestation edit: pressure_affected - if(base_shake_amount > 0 && !disable_shaking) // monkestation edit: disable_shaking + listener.playsound_local(epicenter, null, 100, TRUE, frequency, sound_to_use = near_sound) + if(base_shake_amount > 0) shake_camera(listener, NEAR_SHAKE_DURATION, clamp(base_shake_amount, 0, NEAR_SHAKE_CAP)) else if(distance < far_distance) // You can hear a far explosion if you are outside the blast radius. Small explosions shouldn't be heard throughout the station. var/far_volume = clamp(far_distance / 2, FAR_LOWER, FAR_UPPER) if(creaking) - listener.playsound_local(epicenter, null, far_volume, TRUE, frequency, pressure_affected = pressure_affected, sound_to_use = creaking_sound, distance_multiplier = 0) // monkestation edit: pressure_affected + listener.playsound_local(epicenter, null, far_volume, TRUE, frequency, sound_to_use = creaking_sound, distance_multiplier = 0) else if(prob(FAR_SOUND_PROB)) // Sound variety during meteor storm/tesloose/other bad event - listener.playsound_local(epicenter, null, far_volume, TRUE, frequency, pressure_affected = pressure_affected, sound_to_use = far_sound, distance_multiplier = 0) // monkestation edit: pressure_affected + listener.playsound_local(epicenter, null, far_volume, TRUE, frequency, sound_to_use = far_sound, distance_multiplier = 0) else - listener.playsound_local(epicenter, null, far_volume, TRUE, frequency, pressure_affected = pressure_affected, sound_to_use = echo_sound, distance_multiplier = 0) // monkestation edit: pressure_affected + listener.playsound_local(epicenter, null, far_volume, TRUE, frequency, sound_to_use = echo_sound, distance_multiplier = 0) - if(!disable_shaking && (base_shake_amount || quake_factor)) // monkestation edit: disable_shaking + if(base_shake_amount || quake_factor) base_shake_amount = max(base_shake_amount, quake_factor * 3, 0) // Devastating explosions rock the station and ground shake_camera(listener, FAR_SHAKE_DURATION, min(base_shake_amount, FAR_SHAKE_CAP)) @@ -556,11 +556,10 @@ SUBSYSTEM_DEF(explosions) var/echo_volume if(quake_factor) echo_volume = 60 - if(!disable_shaking) // monkestation edit: disable_shaking - shake_camera(listener, FAR_SHAKE_DURATION, clamp(quake_factor / 4, 0, FAR_SHAKE_CAP)) + shake_camera(listener, FAR_SHAKE_DURATION, clamp(quake_factor / 4, 0, FAR_SHAKE_CAP)) else echo_volume = 40 - listener.playsound_local(epicenter, null, echo_volume, TRUE, frequency, pressure_affected = pressure_affected, sound_to_use = echo_sound, distance_multiplier = 0) // monkestation edit: pressure_affected + listener.playsound_local(epicenter, null, echo_volume, TRUE, frequency, sound_to_use = echo_sound, distance_multiplier = 0) if(creaking) // 5 seconds after the bang, the station begins to creak addtimer(CALLBACK(listener, TYPE_PROC_REF(/mob, playsound_local), epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), TRUE, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 7ba49d221cce2b..b7bde6a8f01aad 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -157,10 +157,7 @@ SUBSYSTEM_DEF(garbage) lastlevel = level -// 1 from the hard reference in the queue, and 1 from the variable used before this -#define REFS_WE_EXPECT 2 - - //We do this rather then for(var/list/ref_info in queue) because that sort of for loop copies the whole list. + //We do this rather then for(var/refID in queue) because that sort of for loop copies the whole list. //Normally this isn't expensive, but the gc queue can grow to 40k items, and that gets costly/causes overrun. for (var/i in 1 to length(queue)) var/list/L = queue[i] @@ -176,9 +173,10 @@ SUBSYSTEM_DEF(garbage) count++ var/datum/D = L[GC_QUEUE_ITEM_REF] - + // 1 from the hard reference in the queue, and 1 from the variable used before this // If that's all we've got, send er off - if (refcount(D) == REFS_WE_EXPECT) + if (refcount(D) == 2) + ++gcedlasttick ++totalgcs pass_counts[level]++ @@ -199,15 +197,12 @@ SUBSYSTEM_DEF(garbage) switch (level) if (GC_QUEUE_CHECK) #ifdef REFERENCE_TRACKING - // Decides how many refs to look for (potentially) - // Based off the remaining and the ones we can account for - var/remaining_refs = refcount(D) - REFS_WE_EXPECT if(reference_find_on_fail[text_ref(D)]) - INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references), remaining_refs) + INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references)) ref_searching = TRUE #ifdef GC_FAILURE_HARD_LOOKUP else - INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references), remaining_refs) + INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references)) ref_searching = TRUE #endif reference_find_on_fail -= text_ref(D) @@ -255,8 +250,6 @@ SUBSYSTEM_DEF(garbage) queue.Cut(1,count+1) count = 0 -#undef REFS_WE_EXPECT - /datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_FILTER) if (isnull(D)) return diff --git a/code/controllers/subsystem/radiation.dm b/code/controllers/subsystem/radiation.dm index 6a9cc631cf529e..d52fe83856a454 100644 --- a/code/controllers/subsystem/radiation.dm +++ b/code/controllers/subsystem/radiation.dm @@ -74,7 +74,7 @@ SUBSYSTEM_DEF(radiation) if(pulse_information.chance < 100) // Prevents log(0) runtime if chance is 100% intensity = -log(1 - pulse_information.chance / 100) * (1 + pulse_information.max_range / 2) ** 2 - perceived_intensity = intensity * INVERSE((1 + get_dist_euclidean(source, target)) ** 2) // Diminishes over range. + perceived_intensity = intensity * INVERSE((1 + get_dist_euclidian(source, target)) ** 2) // Diminishes over range. perceived_intensity *= (current_insulation - pulse_information.threshold) * INVERSE(1 - pulse_information.threshold) // Perceived intensity decreases as objects that absorb radiation block its trajectory. perceived_chance = 100 * (1 - NUM_E ** -perceived_intensity) else diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm index 3aa40284811def..06967d509ec31d 100644 --- a/code/datums/actions/action.dm +++ b/code/datums/actions/action.dm @@ -47,9 +47,6 @@ /// This is the icon state for any FOREGROUND overlay icons on the button (such as borders) var/overlay_icon_state - /// full key we are bound to - var/full_key - /datum/action/New(Target) link_to(Target) @@ -82,17 +79,16 @@ /// Grants the action to the passed mob, making it the owner /datum/action/proc/Grant(mob/grant_to) - if(isnull(grant_to)) + if(!grant_to) Remove(owner) return - if(grant_to == owner) - return // We already have it - var/mob/previous_owner = owner + if(owner) + if(owner == grant_to) + return + Remove(owner) + SEND_SIGNAL(src, COMSIG_ACTION_GRANTED, grant_to) + SEND_SIGNAL(grant_to, COMSIG_MOB_GRANTED_ACTION, src) owner = grant_to - if(!isnull(previous_owner)) - Remove(previous_owner) - SEND_SIGNAL(src, COMSIG_ACTION_GRANTED, owner) - SEND_SIGNAL(owner, COMSIG_MOB_GRANTED_ACTION, src) RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(clear_ref), override = TRUE) // Register some signals based on our check_flags @@ -111,7 +107,6 @@ RegisterSignals(owner, list(SIGNAL_ADDTRAIT(TRAIT_MAGICALLY_PHASED), SIGNAL_REMOVETRAIT(TRAIT_MAGICALLY_PHASED)), PROC_REF(update_status_on_signal)) if(owner_has_control) - RegisterSignal(grant_to, COMSIG_MOB_KEYDOWN, PROC_REF(keydown), override = TRUE) GiveAction(grant_to) /// Remove the passed mob from being owner of our action @@ -124,31 +119,28 @@ HideFrom(hud.mymob) LAZYREMOVE(remove_from?.actions, src) // We aren't always properly inserted into the viewers list, gotta make sure that action's cleared viewers = list() - UnregisterSignal(remove_from, COMSIG_MOB_KEYDOWN) - if(isnull(owner)) - return - SEND_SIGNAL(src, COMSIG_ACTION_REMOVED, owner) - SEND_SIGNAL(owner, COMSIG_MOB_REMOVED_ACTION, src) - UnregisterSignal(owner, COMSIG_QDELETING) - - // Clean up our check_flag signals - UnregisterSignal(owner, list( - COMSIG_LIVING_SET_BODY_POSITION, - COMSIG_MOB_STATCHANGE, - SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), - SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), - SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), - SIGNAL_ADDTRAIT(TRAIT_MAGICALLY_PHASED), - SIGNAL_REMOVETRAIT(TRAIT_HANDS_BLOCKED), - SIGNAL_REMOVETRAIT(TRAIT_IMMOBILIZED), - SIGNAL_REMOVETRAIT(TRAIT_INCAPACITATED), - SIGNAL_REMOVETRAIT(TRAIT_MAGICALLY_PHASED), - )) - - if(target == owner) - RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_ref)) - if (owner == remove_from) + if(owner) + SEND_SIGNAL(src, COMSIG_ACTION_REMOVED, owner) + SEND_SIGNAL(owner, COMSIG_MOB_REMOVED_ACTION, src) + UnregisterSignal(owner, COMSIG_QDELETING) + + // Clean up our check_flag signals + UnregisterSignal(owner, list( + COMSIG_LIVING_SET_BODY_POSITION, + COMSIG_MOB_STATCHANGE, + SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), + SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), + SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), + SIGNAL_ADDTRAIT(TRAIT_MAGICALLY_PHASED), + SIGNAL_REMOVETRAIT(TRAIT_HANDS_BLOCKED), + SIGNAL_REMOVETRAIT(TRAIT_IMMOBILIZED), + SIGNAL_REMOVETRAIT(TRAIT_INCAPACITATED), + SIGNAL_REMOVETRAIT(TRAIT_MAGICALLY_PHASED), + )) + + if(target == owner) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_ref)) owner = null /// Actually triggers the effects of the action. @@ -312,7 +304,6 @@ * force - whether an update is forced regardless of existing status */ /datum/action/proc/update_button_status(atom/movable/screen/movable/action_button/current_button, force = FALSE) - current_button.update_keybind_maptext(full_key) if(IsAvailable()) current_button?.color = rgb(255,255,255,255) else @@ -414,14 +405,3 @@ /// Checks if our action is actively selected. Used for selecting icons primarily. /datum/action/proc/is_action_active(atom/movable/screen/movable/action_button/current_button) return FALSE - -/datum/action/proc/keydown(mob/source, key, client/client, full_key) - SIGNAL_HANDLER - if(isnull(full_key) || full_key != src.full_key) - return - if(istype(source)) - if(source.next_click > world.time) - return - else - source.next_click = world.time + CLICK_CD_RANGE - INVOKE_ASYNC(src, PROC_REF(Trigger)) diff --git a/code/datums/ai/objects/mod.dm b/code/datums/ai/objects/mod.dm index 84f5678addbfa1..2bb555d281bf73 100644 --- a/code/datums/ai/objects/mod.dm +++ b/code/datums/ai/objects/mod.dm @@ -4,7 +4,6 @@ BB_MOD_TARGET, BB_MOD_IMPLANT, ) - can_idle = FALSE max_target_distance = MOD_AI_RANGE //a little spicy but its one specific item that summons it, and it doesn't run otherwise ai_movement = /datum/ai_movement/jps ///ID card generated from the suit's required access. Used for pathing. diff --git a/code/datums/components/crafting/misc.dm b/code/datums/components/crafting/misc.dm index dd850874d68ffa..e73c56ca67d525 100644 --- a/code/datums/components/crafting/misc.dm +++ b/code/datums/components/crafting/misc.dm @@ -32,5 +32,5 @@ /obj/item/paper/paperslip = 1, /obj/item/stack/sheet/plastic = 3, ) - tool_paths = list(/obj/item/stamp/head/captain) + tool_paths = list(/obj/item/stamp/captain) category = CAT_MISC diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 72c945ef29f675..b17cef4fe6e58f 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -60,12 +60,8 @@ var/list/filter_data #ifdef REFERENCE_TRACKING - /// When was this datum last touched by a reftracker? - /// If this value doesn't match with the start of the search - /// We know this datum has never been seen before, and we should check it + var/running_find_references var/last_find_references = 0 - /// How many references we're trying to find when searching - var/references_to_clear = 0 #ifdef REFERENCE_TRACKING_DEBUG ///Stores info about where refs are found, used for sanity checks and testing var/list/found_refs diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index d1926a76e58b43..3a1d921fce3f59 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -170,7 +170,7 @@ if(!each_once) . = play_from while(!isfile(.) && !isnull(.)) - . = pick_weight(fill_with_ones(.)) + . = pick_weight(.) return . @@ -182,7 +182,7 @@ // Tree is a list of lists containign files // If an entry in the tree goes to 0 length, we cut it from the list tree += list(.) - . = pick_weight(fill_with_ones(.)) + . = pick_weight(.) if(!isfile(.)) return diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index bc3985009a8c3a..cd141561bd788b 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -41,9 +41,6 @@ /// List of additional areas that count as a part of the library var/library_areas = list() - /// List of unit tests that are skipped when running this map - var/list/skipped_tests - //List of particle_weather types for this map var/particle_weathers = list() //Monkestation addition @@ -213,16 +210,6 @@ continue library_areas += path -#ifdef UNIT_TESTS - // Check for unit tests to skip, no reason to check these if we're not running tests - for(var/path_as_text in json["ignored_unit_tests"]) - var/path_real = text2path(path_as_text) - if(!ispath(path_real, /datum/unit_test)) - stack_trace("Invalid path in mapping config for ignored unit tests: \[[path_as_text]\]") - continue - LAZYADD(skipped_tests, path_real) -#endif - defaulted = FALSE return TRUE #undef CHECK_EXISTS diff --git a/code/datums/status_effects/agent_pinpointer.dm b/code/datums/status_effects/agent_pinpointer.dm index 3f64ff252a02b2..d620ce3796c3b0 100644 --- a/code/datums/status_effects/agent_pinpointer.dm +++ b/code/datums/status_effects/agent_pinpointer.dm @@ -43,7 +43,7 @@ if(here.z != there.z) linked_alert.icon_state = "pinonnull" return - if(get_dist_euclidean(here,there) <= minimum_range + rand(0, range_fuzz_factor)) + if(get_dist_euclidian(here,there) <= minimum_range + rand(0, range_fuzz_factor)) linked_alert.icon_state = "pinondirect" return linked_alert.setDir(get_dir(here, there)) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 704377e6aaf8ef..0a983d97d08f07 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -113,11 +113,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) /obj/machinery/camera/proc/create_prox_monitor() if(!proximity_monitor) proximity_monitor = new(src, 1) - RegisterSignal(proximity_monitor, COMSIG_QDELETING, PROC_REF(proximity_deleted)) - -/obj/machinery/camera/proc/proximity_deleted() - SIGNAL_HANDLER - proximity_monitor = null /obj/machinery/camera/proc/set_area_motion(area/A) area_motion = A diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index a047ea743033a5..8ffaba16f6d698 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -87,9 +87,6 @@ /obj/machinery/computer/communications/Initialize(mapload) . = ..() - // All maps should have at least 1 comms console - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) - GLOB.shuttle_caller_list += src AddComponent(/datum/component/gps, "Secured Communications Signal") diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index e151967a1c7f37..4abc323961def5 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -106,13 +106,12 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_SECURITY_OFFICER_SUPPLY = 16, JOB_DETECTIVE = 17, JOB_SECURITY_ASSISTANT = 18, // monkestation edit: add security assistants - JOB_BRIG_PHYSICIAN = 19, // monkestation edit: add brig physician // 20-29: Medbay - JOB_CHIEF_MEDICAL_OFFICER = 21, - JOB_CHEMIST = 22, - JOB_VIROLOGIST = 23, - JOB_MEDICAL_DOCTOR = 24, - JOB_PARAMEDIC = 25, + JOB_CHIEF_MEDICAL_OFFICER = 20, + JOB_CHEMIST = 21, + JOB_VIROLOGIST = 22, + JOB_MEDICAL_DOCTOR = 23, + JOB_PARAMEDIC = 24, // 30-39: Science JOB_RESEARCH_DIRECTOR = 30, JOB_SCIENTIST = 31, diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 9b9fedce401d95..45aed88e0630de 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1587,7 +1587,7 @@ if(security_level != AIRLOCK_SECURITY_NONE) to_chat(user, span_notice("[src]'s reinforcement needs to be removed first.")) return FALSE - return list("mode" = RCD_DECONSTRUCT, "delay" = 5 SECONDS, "cost" = 32) + return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 32) return FALSE /obj/machinery/door/airlock/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 73ae0994eb5176..4c5e080c653b46 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -22,25 +22,6 @@ . = ..() . += span_notice("Has a neat selection menu for modifying airlock access levels.") -/** - * Create a copy of the electronics - * Arguments - * * [location][atom]- the location to create the new copy in - */ -/obj/item/electronics/airlock/proc/create_copy(atom/location) - //create a copy - var/obj/item/electronics/airlock/new_electronics = new(location) - //copy all params - new_electronics.accesses = accesses.Copy() - new_electronics.one_access = one_access - new_electronics.unres_sides = unres_sides - new_electronics.passed_name = passed_name - new_electronics.passed_cycle_id = passed_cycle_id - new_electronics.shell = shell - //return copy - return new_electronics - - /obj/item/electronics/airlock/ui_state(mob/user) return GLOB.hands_state diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index e24582aef73c18..df8eb2e031f4fa 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -901,9 +901,9 @@ /obj/structure/firelock_frame/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.mode == RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 5 SECONDS, "cost" = 16) + return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 16) else if((constructionStep == CONSTRUCTION_NO_CIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) - return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 2 SECONDS, "cost" = 1) + return list("mode" = RCD_UPGRADE_SIMPLE_CIRCUITS, "delay" = 20, "cost" = 1) return FALSE /obj/structure/firelock_frame/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 70401f7eda6559..541bc67d6870c2 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -441,7 +441,7 @@ /obj/machinery/door/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 5 SECONDS, "cost" = 32) + return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 32) return FALSE /obj/machinery/door/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 65077390c81ec2..e79869dfbf7183 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -434,7 +434,7 @@ /obj/machinery/firealarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if((buildstage == ALARM_NO_CIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) - return list("mode" = RCD_WALLFRAME, "delay" = 2 SECONDS, "cost" = 1) + return list("mode" = RCD_WALLFRAME, "delay" = 20, "cost" = 1) return FALSE /obj/machinery/firealarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 558fae298e16a4..550ec554a055f4 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -30,7 +30,6 @@ I.forceMove(get_turf(src)) if(linked_teleporter) linked_teleporter.linked_reclaimer = null - linked_teleporter = null return ..() /obj/machinery/gulag_item_reclaimer/emag_act(mob/user, obj/item/card/emag/emag_card) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index f05c799418474f..067a6b990a7ab0 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -43,7 +43,6 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/Destroy() if(linked_reclaimer) linked_reclaimer.linked_teleporter = null - linked_reclaimer = null return ..() /obj/machinery/gulag_teleporter/interact(mob/user) diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index d03cfea3f1789c..4776cf2743169f 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -507,12 +507,11 @@ layer = ABOVE_ALL_MOB_LAYER plane = ABOVE_GAME_PLANE anchored = TRUE - obj_flags = CAN_BE_HIT - mouse_opacity = MOUSE_OPACITY_OPAQUE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/status = 0 var/delay = 0 -/obj/effect/constructing_effect/Initialize(mapload, rcd_delay, rcd_status, rcd_upgrades) +/obj/effect/constructing_effect/Initialize(mapload, rcd_delay, rcd_status) . = ..() status = rcd_status delay = rcd_delay @@ -523,26 +522,6 @@ else update_appearance() - if (rcd_upgrades & RCD_UPGRADE_ANTI_INTERRUPT) - color = list( - 1.0, 0.5, 0.5, 0.0, - 0.1, 0.0, 0.0, 0.0, - 0.1, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 1.0, - 0.0, 0.0, 0.0, 0.0, - ) - - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - obj_flags &= ~CAN_BE_HIT - -/obj/effect/constructing_effect/update_name(updates) - . = ..() - - if (status == RCD_DECONSTRUCT) - name = "deconstruction effect" - else - name = "construction effect" - /obj/effect/constructing_effect/update_icon_state() icon_state = "rcd" if(delay < 10) @@ -562,26 +541,12 @@ if (status == RCD_DECONSTRUCT) qdel(src) else - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - obj_flags &= ~CAN_BE_HIT icon_state = "rcd_end" addtimer(CALLBACK(src, PROC_REF(end)), 15) /obj/effect/constructing_effect/proc/end() qdel(src) -/obj/effect/constructing_effect/proc/attacked(mob/user) - user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - user.changeNext_move(CLICK_CD_MELEE) - playsound(loc, 'sound/weapons/egloves.ogg', vol = 80, vary = TRUE) - end() - -/obj/effect/constructing_effect/attackby(obj/item/weapon, mob/user, params) - attacked(user) - -/obj/effect/constructing_effect/attack_hand(mob/living/user, list/modifiers) - attacked(user) - /obj/effect/temp_visual/electricity icon_state = "electricity3" duration = 0.5 SECONDS diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index 05c68e04eba6c5..2d4ce0b304863d 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -82,7 +82,7 @@ ///Called by update_icon after sanity. There is a target /obj/item/pinpointer/proc/get_direction_icon(here, there) - if(get_dist_euclidean(here,there) <= minimum_range) + if(get_dist_euclidian(here,there) <= minimum_range) return "pinon[alert ? "alert" : ""]direct[icon_suffix]" else setDir(get_dir(here, there)) diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm index 83207ff7a0700c..df221086a88c31 100644 --- a/code/game/objects/items/rcd/RCD.dm +++ b/code/game/objects/items/rcd/RCD.dm @@ -19,9 +19,6 @@ #define CATEGORY_ICON_SUFFIX "category_icon_suffix" #define TITLE_ICON "ICON=TITLE" -///multiplier applied on construction & deconstruction time when building multiple structures -#define FREQUENT_USE_DEBUFF_MULTIPLIER 3 - //RAPID CONSTRUCTION DEVICE /obj/item/construction/rcd @@ -31,7 +28,7 @@ worn_icon_state = "RCD" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - custom_premium_price = PAYCHECK_COMMAND * 2 + custom_premium_price = PAYCHECK_COMMAND * 10 max_matter = 160 slot_flags = ITEM_SLOT_BELT item_flags = NO_MAT_REDEMPTION | NOBLUDGEON @@ -51,7 +48,6 @@ list(CONSTRUCTION_MODE = RCD_WINDOWGRILLE, WINDOW_TYPE = /obj/structure/window/reinforced/fulltile, ICON = "rwindow0", TITLE = "Full Tile Reinforced Window"), list(CONSTRUCTION_MODE = RCD_CATWALK, ICON = "catwalk-0", TITLE = "Catwalk"), list(CONSTRUCTION_MODE = RCD_REFLECTOR, ICON = "reflector_base", TITLE = "Reflector"), - list(CONSTRUCTION_MODE = RCD_GIRDER, ICON = "girder", TITLE = "Girder"), list(CONSTRUCTION_MODE = RCD_WINDOWGRILLE, WINDOW_TYPE = /obj/structure/window_sill, ICON = "window_sill-0", TITLE = "Window Sill"), ), @@ -165,9 +161,6 @@ COOLDOWN_DECLARE(destructive_scan_cooldown) - ///number of active rcd effects in use e.g. when building multiple walls at once this value increases - var/current_active_effects = 0 - GLOBAL_VAR_INIT(icon_holographic_wall, init_holographic_wall()) GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) @@ -266,54 +259,39 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) user.visible_message(span_suicide("[user] pulls the trigger... But there is not enough ammo!")) return SHAME -/** - * checks if we can build the structure - * Arguments - * - * * [atom][target]- the target we are trying to build on/deconstruct e.g. turf, wall etc - * * rcd_results- list of params specifically the build type of our structure - * * [mob][user]- the user - */ -/obj/item/construction/rcd/proc/can_place(atom/target, list/rcd_results, mob/user) +/// check can the structure be placed on the turf +/obj/item/construction/rcd/proc/can_place(atom/A, list/rcd_results, mob/user) /** *For anything that does not go an a wall we have to make sure that turf is clear for us to put the structure on it *If we are just trying to destory something then this check is not nessassary *RCD_WALLFRAME is also returned as the mode when upgrading apc, airalarm, firealarm using simple circuits upgrade */ if(rcd_results["mode"] != RCD_WALLFRAME && rcd_results["mode"] != RCD_DECONSTRUCT) - var/turf/target_turf = get_turf(target) - //if we are trying to build a window we check for specific edge cases - if(rcd_results["mode"] == RCD_WINDOWGRILLE) - var/is_full_tile = initial(window_type.fulltile) - + var/turf/target_turf = get_turf(A) + //if we are trying to build a window on top of a grill we check for specific edge cases + if(rcd_results["mode"] == RCD_WINDOWGRILLE && istype(A, /obj/structure/grille)) var/list/structures_to_ignore - if(istype(target, /obj/structure/grille)) - if(is_full_tile) //if we are trying to build full-tile windows we ignore the grille - structures_to_ignore = list(target) - else //no building directional windows on grills - return FALSE - else //for directional windows we ignore other directional windows as they can be in diffrent directions on the turf. - structures_to_ignore = list(/obj/structure/window) + //if we are trying to build full-tile windows we only ignore the grille but other directional windows on the grill can block its construction if(window_type == /obj/structure/window/fulltile || window_type == /obj/structure/window/reinforced/fulltile) - structures_to_ignore = list(/obj/structure/grille, /obj/structure/window_sill) + structures_to_ignore = list(A, /obj/structure/window_sill) //for normal directional windows we ignore the grille & other directional windows as they can be in diffrent directions on the grill. There is a later check during construction to deal with those else structures_to_ignore = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window_sill) //check if we can build our window on the grill - if(target_turf.is_blocked_turf(exclude_mobs = !is_full_tile, source_atom = null, ignore_atoms = structures_to_ignore, type_list = !is_full_tile)) + if(target_turf.is_blocked_turf(exclude_mobs = FALSE, source_atom = null, ignore_atoms = structures_to_ignore, type_list = (length(structures_to_ignore) == 2))) playsound(loc, 'sound/machines/click.ogg', 50, TRUE) - balloon_alert(user, "something is blocking the turf") + balloon_alert(user, "something is on the grille!") return FALSE /** * if we are trying to create plating on turf which is not a proper floor then dont check for objects on top of the turf just allow that turf to be converted into plating. e.g. create plating beneath a player or underneath a machine frame/any dense object * if we are trying to finish a wall girder then let it finish then make sure no one/nothing is stuck in the girder */ - else if(rcd_results["mode"] == RCD_FLOORWALL && (!istype(target_turf, /turf/open/floor) || istype(target, /obj/structure/girder))) + else if(rcd_results["mode"] == RCD_FLOORWALL && (!istype(target_turf, /turf/open/floor) || istype(A, /obj/structure/girder))) //if a player builds a wallgirder on top of himself manually with iron sheets he can't finish the wall if he is still on the girder. Exclude the girder itself when checking for other dense objects on the turf - if(istype(target, /obj/structure/girder) && target_turf.is_blocked_turf(exclude_mobs = FALSE, source_atom = null, ignore_atoms = list(target))) + if(istype(A, /obj/structure/girder) && target_turf.is_blocked_turf(exclude_mobs = FALSE, source_atom = null, ignore_atoms = list(A))) playsound(loc, 'sound/machines/click.ogg', 50, TRUE) balloon_alert(user, "something is on the girder!") return FALSE @@ -362,58 +340,27 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) return TRUE -/** - * actual proc to create the structure - * - * Arguments - * * [atom][target]- the target we are trying to build on/deconstruct e.g. turf, wall etc - * * [mob][user]- the user building this structure - */ -/obj/item/construction/rcd/proc/rcd_create(atom/target, mob/user) +/obj/item/construction/rcd/proc/rcd_create(atom/A, mob/user) //does this atom allow for rcd actions? - var/list/rcd_results = target.rcd_vals(user, src) + var/list/rcd_results = A.rcd_vals(user, src) if(!rcd_results) return FALSE - var/delay = rcd_results["delay"] * delay_mod - if ( - !(upgrade & RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN) \ - && !rcd_results[RCD_RESULT_BYPASS_FREQUENT_USE_COOLDOWN] \ - && current_active_effects > 0 - ) - delay *= FREQUENT_USE_DEBUFF_MULTIPLIER - - current_active_effects += 1 - _rcd_create_effect(target, user, delay, rcd_results) - current_active_effects -= 1 - -/** - * Internal proc which creates the rcd effects & creates the structure - * - * Arguments - * * [atom][target]- the target we are trying to build on/deconstruct e.g. turf, wall etc - * * [mob][user]- the user trying to build the structure - * * delay- the delay with the disk upgrades applied - * * rcd_results- list of params which contains the cost & build mode to create the structure - */ -/obj/item/construction/rcd/proc/_rcd_create_effect(atom/target, mob/user, delay, list/rcd_results) - var/obj/effect/constructing_effect/rcd_effect = new(get_turf(target), delay, src.mode, upgrade) + var/obj/effect/constructing_effect/rcd_effect = new(get_turf(A), delay, src.mode) //resource & structure placement sanity checks before & after delay along with beam effects - if(!checkResource(rcd_results["cost"], user) || !can_place(target, rcd_results, user)) + if(!checkResource(rcd_results["cost"], user) || !can_place(A, rcd_results, user)) qdel(rcd_effect) return FALSE var/beam if(ranged) - beam = user.Beam(target,icon_state="rped_upgrade", time = delay) - if(!do_after(user, delay, target = target)) + beam = user.Beam(A,icon_state="rped_upgrade", time = delay) + if(!do_after(user, delay, target = A)) qdel(rcd_effect) if(!isnull(beam)) qdel(beam) return FALSE - if (QDELETED(rcd_effect)) - return FALSE - if(!checkResource(rcd_results["cost"], user) || !can_place(target, rcd_results, user)) + if(!checkResource(rcd_results["cost"], user) || !can_place(A, rcd_results, user)) qdel(rcd_effect) return FALSE @@ -421,7 +368,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) qdel(rcd_effect) return FALSE activate() - if(!target.rcd_act(user, src, rcd_results["mode"])) + if(!A.rcd_act(user, src, rcd_results["mode"])) qdel(rcd_effect) return FALSE playsound(loc, 'sound/machines/click.ogg', 50, TRUE) @@ -674,7 +621,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) matter = 160 /obj/item/construction/rcd/loaded/upgraded - upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING | RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN + upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING /obj/item/construction/rcd/combat name = "industrial RCD" @@ -683,22 +630,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) max_matter = 500 matter = 500 canRturf = TRUE - upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING | RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN - -/obj/item/construction/rcd/ce - name = "professional RCD" - desc = "A higher-end model of the rapid construction device, prefitted with improved cooling and disruption prevention. Provided to the chief engineer." - upgrade = RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN - matter = 160 - color = list( - 0.3, 0.3, 0.7, 0.0, - 1.0, 1.0, 0.2, 0.0, - -0.2, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0, - 0.0, 0.0, 0.0, 0.0, - ) - -#undef FREQUENT_USE_DEBUFF_MULTIPLIER + upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING #undef CONSTRUCTION_MODE #undef WINDOW_TYPE @@ -733,7 +665,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) name = "admin RCD" max_matter = INFINITY matter = INFINITY - upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING | RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN + upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING // Ranged RCD @@ -747,4 +679,4 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) icon_state = "arcd" inhand_icon_state = "oldrcd" has_ammobar = FALSE - upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING | RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN + upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm index a3b1f1edf7327d..50ebce21c9286c 100644 --- a/code/game/objects/items/rcd/RHD.dm +++ b/code/game/objects/items/rcd/RHD.dm @@ -283,14 +283,6 @@ desc = "It contains the design for firelock, air alarm, fire alarm, apc circuits and crap power cells." upgrade = RCD_UPGRADE_SIMPLE_CIRCUITS -/obj/item/rcd_upgrade/anti_interrupt - desc = "It contains the upgrades necessary to prevent interruption of RCD construction and deconstruction." - upgrade = RCD_UPGRADE_ANTI_INTERRUPT - -/obj/item/rcd_upgrade/cooling - desc = "It contains the upgrades necessary to allow more frequent use of the RCD." - upgrade = RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN - /obj/item/rcd_upgrade/silo_link desc = "It contains direct silo connection RCD upgrade." upgrade = RCD_UPGRADE_SILO_LINK diff --git a/code/game/objects/items/rcd/RLD.dm b/code/game/objects/items/rcd/RLD.dm index f737c4e819a396..9d07929a909196 100644 --- a/code/game/objects/items/rcd/RLD.dm +++ b/code/game/objects/items/rcd/RLD.dm @@ -18,7 +18,7 @@ has_ammobar = TRUE ammo_sections = 6 ///it does not make sense why any of these should be installed - banned_upgrades = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING | RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN + banned_upgrades = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING var/mode = LIGHT_MODE var/wallcost = 10 diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm index 253d93a5aab4f4..a90836aac4414a 100644 --- a/code/game/objects/items/rcd/RPLD.dm +++ b/code/game/objects/items/rcd/RPLD.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/tools.dmi' slot_flags = ITEM_SLOT_BELT ///it does not make sense why any of these should be installed. - banned_upgrades = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING | RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN + banned_upgrades = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING matter = 200 max_matter = 200 diff --git a/code/game/objects/items/rcd/RTD.dm b/code/game/objects/items/rcd/RTD.dm index 78408af895c505..9141e77ae95a51 100644 --- a/code/game/objects/items/rcd/RTD.dm +++ b/code/game/objects/items/rcd/RTD.dm @@ -23,7 +23,7 @@ slot_flags = ITEM_SLOT_BELT item_flags = NO_MAT_REDEMPTION | NOBLUDGEON has_ammobar = TRUE - banned_upgrades = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING | RCD_UPGRADE_ANTI_INTERRUPT | RCD_UPGRADE_NO_FREQUENT_USE_COOLDOWN + banned_upgrades = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING /// main category for tile design var/root_category = "Conventional" diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 41e2b77399fb04..4b7c51ab8ebdaf 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -234,7 +234,6 @@ name = "improvised gauze" singular_name = "improvised gauze" desc = "A roll of cloth roughly cut from something that does a decent job of stabilizing wounds, but less efficiently so than real medical gauze." - icon_state = "gauze_imp" self_delay = 6 SECONDS other_delay = 3 SECONDS splint_factor = 0.85 diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index a2cad69e8b2a73..73eaaeef316a3a 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -239,8 +239,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( . += GLOB.titaniumglass_recipes GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( - new/datum/stack_recipe("plastitanium window", /obj/structure/window/reinforced/plasma/plastitanium/unanchored, 2, time = 0, on_solid_ground = TRUE, is_fulltile = TRUE, category = CAT_WINDOWS), \ - new/datum/stack_recipe("plastitanium glass shard", /obj/item/shard/plastitanium, time = 60, on_solid_ground = TRUE, category = CAT_MISC) \ + new/datum/stack_recipe("plastitanium window", /obj/structure/window/reinforced/plasma/plastitanium/unanchored, 2, time = 0, on_solid_ground = TRUE, is_fulltile = TRUE, category = CAT_WINDOWS) \ )) /obj/item/stack/sheet/plastitaniumglass diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index cf1d76bab1f00d..ae3187b927ed85 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -450,7 +450,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4, check_density = FALSE, category = CAT_CONTAINERS), \ new/datum/stack_recipe("science bag", /obj/item/storage/bag/xeno, 4, check_density = FALSE, category = CAT_CONTAINERS), \ new/datum/stack_recipe("construction bag", /obj/item/storage/bag/construction, 4, check_density = FALSE, category = CAT_CONTAINERS), \ - new/datum/stack_recipe("egg bag", /obj/item/storage/bag/egg, 4, check_density = FALSE, category = CAT_CONTAINERS), \ null, \ new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6, check_density = FALSE, category = CAT_TOOLS), \ new/datum/stack_recipe("rag", /obj/item/reagent_containers/cup/rag, 1, check_density = FALSE, category = CAT_CHEMISTRY), \ diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index c00b9cb60e9907..79550320237e43 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -92,7 +92,7 @@ new /obj/item/circuitboard/machine/techfab/department/medical(src) new /obj/item/storage/photo_album/cmo(src) new /obj/item/storage/lockbox/medal/med(src) -// new /obj/item/extrapolator(src) //MONKESTATION EDIT: extrapolators are not useful! missed this single case! -Dexee, 04/13/24 + new /obj/item/extrapolator(src) /obj/structure/closet/secure_closet/chief_medical/populate_contents_immediate() . = ..() diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 48a48ab9b1485f..084c804dc08429 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -260,6 +260,7 @@ door = new airlock_type( loc ) door.setDir(dir) door.unres_sides = electronics.unres_sides + //door.req_access = req_access door.electronics = electronics door.heat_proof = heat_proof_finished door.security_level = 0 @@ -287,12 +288,9 @@ door.unres_sensor = TRUE door.previous_airlock = previous_assembly electronics.forceMove(door) - door.autoclose = TRUE - door.close() - door.auto_dir_align() // monkestation edit: ensure doors get aligned properly on creation door.update_appearance() - qdel(src) + return door /obj/structure/door_assembly/update_overlays() . = ..() @@ -352,7 +350,7 @@ /obj/structure/door_assembly/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.mode == RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 5 SECONDS, "cost" = 16) + return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 16) return FALSE /obj/structure/door_assembly/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 99317dd61aed23..a048766bec916f 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -452,7 +452,7 @@ get_turf(src), RCD_MEMORY_WALL, ) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 2 SECONDS, "cost" = 13) + return list("mode" = RCD_DECONSTRUCT, "delay" = 20, "cost" = 13) return FALSE /obj/structure/girder/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 076c79ccafb659..d08d2d50b4e289 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -63,15 +63,21 @@ /obj/structure/grille/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 2 SECONDS, "cost" = 5) + return list("mode" = RCD_DECONSTRUCT, "delay" = 20, "cost" = 5) if(RCD_WINDOWGRILLE) var/cost = 0 var/delay = 0 - if(the_rcd.window_type == /obj/structure/window/fulltile) - cost = 8 + if(the_rcd.window_type == /obj/structure/window) + cost = 6 + delay = 2 SECONDS + else if(the_rcd.window_type == /obj/structure/window/reinforced) + cost = 9 + delay = 2.5 SECONDS + else if(the_rcd.window_type == /obj/structure/window/fulltile) + cost = 12 delay = 3 SECONDS else if(the_rcd.window_type == /obj/structure/window/reinforced/fulltile) - cost = 12 + cost = 15 delay = 4 SECONDS if(!cost) return FALSE @@ -95,13 +101,15 @@ if(repair_grille()) balloon_alert(user, "grille rebuilt") + if(!clear_tile(user)) return FALSE var/obj/structure/window/window_path = the_rcd.window_type if(!ispath(window_path)) CRASH("Invalid window path type in RCD: [window_path]") - if(!initial(window_path.fulltile)) //only fulltile windows can be built here + if(!valid_build_direction(T, user.dir, is_fulltile = initial(window_path.fulltile))) + balloon_alert(user, "window already here!") return FALSE var/obj/structure/window/WD = new the_rcd.window_type(T, user.dir) WD.set_anchored(TRUE) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 50f31d76346fba..42dadf19ff593f 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -65,15 +65,15 @@ /obj/structure/lattice/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.mode == RCD_FLOORWALL) - return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 1) + return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 2) if(the_rcd.mode == RCD_CATWALK) - return list("mode" = RCD_CATWALK, "delay" = 0, "cost" = 2) + return list("mode" = RCD_CATWALK, "delay" = 0, "cost" = 1) /obj/structure/lattice/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) if(passed_mode == RCD_FLOORWALL) to_chat(user, span_notice("You build a floor.")) var/turf/T = src.loc - if(isgroundlessturf(T)) + if(isspaceturf(T)) T.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) qdel(src) return TRUE @@ -123,7 +123,7 @@ /obj/structure/lattice/catwalk/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(the_rcd.mode == RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 1 SECONDS, "cost" = 5) + return list("mode" = RCD_DECONSTRUCT, "delay" = 10, "cost" = 5) return FALSE /obj/structure/lattice/catwalk/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 9efdd4e5bf6270..c6c7377490174f 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -316,7 +316,7 @@ /obj/structure/table/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 2.4 SECONDS, "cost" = 16) + return list("mode" = RCD_DECONSTRUCT, "delay" = 24, "cost" = 16) return FALSE /obj/structure/table/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index e33441ebdc4e39..ae705bdf8928af 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -30,7 +30,7 @@ var/state = "01" //How far the door assembly has progressed can_atmos_pass = ATMOS_PASS_PROC -/obj/structure/windoor_assembly/Initialize(mapload, set_dir) +/obj/structure/windoor_assembly/Initialize(mapload, loc, set_dir) . = ..() if(set_dir) setDir(set_dir) @@ -267,11 +267,55 @@ span_notice("You start prying the windoor into the frame...")) if(W.use_tool(src, user, 40, volume=100) && electronics) - set_density(TRUE) //Shouldn't matter but just incase + set_density(TRUE) //Shouldn't matter but just incase to_chat(user, span_notice("You finish the windoor.")) - finish_door() + if(secure) + var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(loc) + if(facing == "l") + windoor.icon_state = "leftsecureopen" + windoor.base_state = "leftsecure" + else + windoor.icon_state = "rightsecureopen" + windoor.base_state = "rightsecure" + windoor.setDir(dir) + windoor.set_density(FALSE) + + if(electronics.one_access) + windoor.req_one_access = electronics.accesses + else + windoor.req_access = electronics.accesses + windoor.electronics = electronics + electronics.forceMove(windoor) + if(created_name) + windoor.name = created_name + qdel(src) + windoor.close() + + + else + var/obj/machinery/door/window/windoor = new /obj/machinery/door/window(loc) + if(facing == "l") + windoor.icon_state = "leftopen" + windoor.base_state = "left" + else + windoor.icon_state = "rightopen" + windoor.base_state = "right" + windoor.setDir(dir) + windoor.set_density(FALSE) + + if(electronics.one_access) + windoor.req_one_access = electronics.accesses + else + windoor.req_access = electronics.accesses + windoor.electronics = electronics + electronics.forceMove(windoor) + if(created_name) + windoor.name = created_name + qdel(src) + windoor.close() + else return ..() @@ -279,54 +323,6 @@ //Update to reflect changes(if applicable) update_appearance() -/obj/structure/windoor_assembly/proc/finish_door() - var/obj/machinery/door/window/windoor - if(secure) - windoor = new /obj/machinery/door/window/brigdoor(loc) - if(facing == "l") - windoor.icon_state = "leftsecureopen" - windoor.base_state = "leftsecure" - else - windoor.icon_state = "rightsecureopen" - windoor.base_state = "rightsecure" - - else - windoor = new /obj/machinery/door/window(loc) - if(facing == "l") - windoor.icon_state = "leftopen" - windoor.base_state = "left" - else - windoor.icon_state = "rightopen" - windoor.base_state = "right" - - windoor.setDir(dir) - windoor.set_density(FALSE) - if(created_name) - windoor.name = created_name - else if(electronics.passed_name) - windoor.name = electronics.passed_name - if(electronics.one_access) - windoor.req_one_access = electronics.accesses - else - windoor.req_access = electronics.accesses - if(electronics.unres_sides) - windoor.unres_sides = electronics.unres_sides - switch(dir) - if(NORTH,SOUTH) - windoor.unres_sides &= ~EAST - windoor.unres_sides &= ~WEST - if(EAST,WEST) - windoor.unres_sides &= ~NORTH - windoor.unres_sides &= ~SOUTH - windoor.unres_sensor = TRUE - electronics.forceMove(windoor) - windoor.electronics = electronics - windoor.autoclose = TRUE - windoor.close() - windoor.update_appearance() - - qdel(src) - /obj/structure/windoor_assembly/AltClick(mob/user) return ..() // This hotkey is BLACKLISTED since it's used by /datum/component/simple_rotation diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e645a334c42f8c..a4bbc3c2fe0d10 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -105,7 +105,7 @@ /obj/structure/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 2 SECONDS, "cost" = 5) + return list("mode" = RCD_DECONSTRUCT, "delay" = 20, "cost" = 5) return FALSE /obj/structure/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd) @@ -489,7 +489,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/spawner, 0) /obj/structure/window/reinforced/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 3 SECONDS, "cost" = 15) + return list("mode" = RCD_DECONSTRUCT, "delay" = 30, "cost" = 15) return FALSE /obj/structure/window/reinforced/attackby_secondary(obj/item/tool, mob/user, params) @@ -678,7 +678,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/fulltile/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 2.5 SECONDS, "cost" = 10) + return list("mode" = RCD_DECONSTRUCT, "delay" = 25, "cost" = 10) return FALSE /obj/structure/window/fulltile/unanchored @@ -735,7 +735,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/reinforced/fulltile/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 4 SECONDS, "cost" = 20) + return list("mode" = RCD_DECONSTRUCT, "delay" = 40, "cost" = 20) return FALSE /obj/structure/window/reinforced/fulltile/unanchored diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index adef8f10e718e1..d496c7f438b5b2 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -211,12 +211,12 @@ dismantle_wall() /turf/closed/wall/r_wall/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) - if(the_rcd.canRturf || the_rcd.construction_mode == RCD_WALLFRAME) + if(the_rcd.canRturf) return ..() /turf/closed/wall/r_wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) - if(the_rcd.canRturf || passed_mode == RCD_WALLFRAME) + if(the_rcd.canRturf) return ..() /turf/closed/wall/r_wall/rust_heretic_act() diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index baf7cd48808623..bb4299a8416acb 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -321,9 +321,9 @@ /turf/closed/wall/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 4 SECONDS, "cost" = 26) + return list("mode" = RCD_DECONSTRUCT, "delay" = 40, "cost" = 26) if(RCD_WALLFRAME) - return list("mode" = RCD_WALLFRAME, "delay" = 1 SECONDS, "cost" = 8) + return list("mode" = RCD_WALLFRAME, "delay" = 10, "cost" = 25) return FALSE /turf/closed/wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 142a7aad9a5cc4..28abba12b200d6 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -255,57 +255,49 @@ src, RCD_MEMORY_WALL, ) if(RCD_REFLECTOR) - return list("mode" = RCD_REFLECTOR, "delay" = 2 SECONDS, "cost" = 20) + return list("mode" = RCD_REFLECTOR, "delay" = 20, "cost" = 30) if(RCD_AIRLOCK) if(the_rcd.airlock_glass) - return list("mode" = RCD_AIRLOCK, "delay" = 5 SECONDS, "cost" = 20) + return list("mode" = RCD_AIRLOCK, "delay" = 50, "cost" = 20) else - return list("mode" = RCD_AIRLOCK, "delay" = 5 SECONDS, "cost" = 16) + return list("mode" = RCD_AIRLOCK, "delay" = 50, "cost" = 16) if(RCD_DECONSTRUCT) - return list("mode" = RCD_DECONSTRUCT, "delay" = 5 SECONDS, "cost" = 33) + return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 33) if(RCD_WINDOWGRILLE) - //default cost for building a grill for fulltile windows - var/cost = 4 - var/delay = 1 SECONDS - if(the_rcd.window_type == /obj/structure/window) - cost = 4 - delay = 2 SECONDS - else if(the_rcd.window_type == /obj/structure/window/reinforced) - cost = 6 - delay = 2.5 SECONDS return rcd_result_with_memory( - list("mode" = RCD_WINDOWGRILLE, "delay" = delay, "cost" = cost), + list("mode" = RCD_WINDOWGRILLE, "delay" = 1 SECONDS, "cost" = 4), src, RCD_MEMORY_WINDOWGRILLE, ) if(RCD_MACHINE) - return list("mode" = RCD_MACHINE, "delay" = 2 SECONDS, "cost" = 20) + return list("mode" = RCD_MACHINE, "delay" = 20, "cost" = 25) if(RCD_COMPUTER) - return list("mode" = RCD_COMPUTER, "delay" = 2 SECONDS, "cost" = 20) + return list("mode" = RCD_COMPUTER, "delay" = 20, "cost" = 25) if(RCD_FLOODLIGHT) - return list("mode" = RCD_FLOODLIGHT, "delay" = 3 SECONDS, "cost" = 20) - if(RCD_GIRDER) - return list("mode" = RCD_GIRDER, "delay" = 1.3 SECONDS, "cost" = 8) + return list("mode" = RCD_FLOODLIGHT, "delay" = 30, "cost" = 35) if(RCD_FURNISHING) var/cost = 0 var/delay = 0 if(the_rcd.furnish_type == /obj/structure/chair || the_rcd.furnish_type == /obj/structure/chair/stool) + cost = 8 + delay = 10 + else if(the_rcd.furnish_type == /obj/structure/chair/stool/bar) cost = 4 - delay = 1 SECONDS + delay = 5 else if(the_rcd.furnish_type == /obj/structure/chair/stool/bar) cost = 4 - delay = 0.5 SECONDS + delay = 5 else if(the_rcd.furnish_type == /obj/structure/table) - cost = 8 - delay = 2 SECONDS + cost = 15 + delay = 20 else if(the_rcd.furnish_type == /obj/structure/table/glass) - cost = 8 - delay = 2 SECONDS + cost = 12 + delay = 15 else if(the_rcd.furnish_type == /obj/structure/rack) - cost = 4 - delay = 2.5 SECONDS + cost = 20 + delay = 25 else if(the_rcd.furnish_type == /obj/structure/bed) - cost = 8 - delay = 1.5 SECONDS + cost = 10 + delay = 15 if(cost == 0) return FALSE return list("mode" = RCD_FURNISHING, "delay" = cost, "cost" = delay) @@ -337,11 +329,15 @@ continue balloon_alert(user, "there's already a door!") return FALSE - //create the assembly and let it finish itself - var/obj/structure/windoor_assembly/assembly = new /obj/structure/windoor_assembly(src, user.dir) - assembly.secure = ispath(the_rcd.airlock_type, /obj/machinery/door/window/brigdoor) - assembly.electronics = the_rcd.airlock_electronics.create_copy(assembly) - assembly.finish_door() + var/obj/machinery/door/window/new_window = new the_rcd.airlock_type(src, user.dir, the_rcd.airlock_electronics?.unres_sides) + if(the_rcd.airlock_electronics) + new_window.name = the_rcd.airlock_electronics.passed_name || initial(new_window.name) + if(the_rcd.airlock_electronics.one_access) + new_window.req_one_access = the_rcd.airlock_electronics.accesses.Copy() + else + new_window.req_access = the_rcd.airlock_electronics.accesses.Copy() + new_window.autoclose = TRUE + new_window.update_appearance() return TRUE for(var/obj/machinery/door/door in src) @@ -349,15 +345,29 @@ continue balloon_alert(user, "there's already a door!") return FALSE - //create the assembly and let it finish itself - var/obj/structure/door_assembly/assembly = new (src) - if(ispath(the_rcd.airlock_type, /obj/machinery/door/airlock/glass)) - assembly.glass = TRUE - assembly.glass_type = the_rcd.airlock_type + var/obj/machinery/door/airlock/new_airlock = new the_rcd.airlock_type(src) + new_airlock.electronics = new /obj/item/electronics/airlock(new_airlock) + if(the_rcd.airlock_electronics) + new_airlock.electronics.accesses = the_rcd.airlock_electronics.accesses.Copy() + new_airlock.electronics.one_access = the_rcd.airlock_electronics.one_access + new_airlock.electronics.unres_sides = the_rcd.airlock_electronics.unres_sides + new_airlock.electronics.passed_name = the_rcd.airlock_electronics.passed_name + new_airlock.electronics.passed_cycle_id = the_rcd.airlock_electronics.passed_cycle_id + new_airlock.electronics.shell = the_rcd.airlock_electronics.shell + if(new_airlock.electronics.one_access) + new_airlock.req_one_access = new_airlock.electronics.accesses else - assembly.airlock_type = the_rcd.airlock_type - assembly.electronics = the_rcd.airlock_electronics.create_copy(assembly) - assembly.finish_door() + new_airlock.req_access = new_airlock.electronics.accesses + if(new_airlock.electronics.unres_sides) + new_airlock.unres_sides = new_airlock.electronics.unres_sides + new_airlock.unres_sensor = TRUE + if(new_airlock.electronics.passed_name) + new_airlock.name = sanitize(new_airlock.electronics.passed_name) + if(new_airlock.electronics.passed_cycle_id) + new_airlock.closeOtherId = new_airlock.electronics.passed_cycle_id + new_airlock.update_other_id() + new_airlock.autoclose = TRUE + new_airlock.update_appearance() return TRUE if(RCD_DECONSTRUCT) if(rcd_proof) @@ -367,21 +377,6 @@ return FALSE return TRUE if(RCD_WINDOWGRILLE) - //check if we are building a window - var/obj/structure/window/window_path = the_rcd.window_type - if(!ispath(window_path)) - CRASH("Invalid window path type in RCD: [window_path]") - - //allow directional windows to be built without grills - if(!initial(window_path.fulltile)) - if(!valid_build_direction(src, user.dir, is_fulltile = FALSE)) - balloon_alert(user, "window already here!") - return FALSE - var/obj/structure/window/WD = new the_rcd.window_type(src, user.dir) - WD.set_anchored(TRUE) - return TRUE - - //build grills to deal with full tile windows if(locate(/obj/structure/grille) in src) return FALSE var/obj/structure/grille/new_grille = new(src) @@ -412,11 +407,6 @@ new_floodlight.icon_state = "floodlight_c3" new_floodlight.state = FLOODLIGHT_NEEDS_LIGHTS return TRUE - if(RCD_GIRDER) - if(locate(/obj/structure/girder) in src) - return FALSE - new /obj/structure/girder(src) - return TRUE if(RCD_FURNISHING) if(locate(the_rcd.furnish_type) in src) return FALSE diff --git a/code/game/turfs/open/misc.dm b/code/game/turfs/open/misc.dm index d47212e38d1738..55e6ca05b139dc 100644 --- a/code/game/turfs/open/misc.dm +++ b/code/game/turfs/open/misc.dm @@ -84,46 +84,47 @@ else return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3) if(RCD_REFLECTOR) - return list("mode" = RCD_REFLECTOR, "delay" = 2 SECONDS, "cost" = 20) + return list("mode" = RCD_REFLECTOR, "delay" = 20, "cost" = 30) if(RCD_AIRLOCK) if(the_rcd.airlock_glass) - return list("mode" = RCD_AIRLOCK, "delay" = 5 SECONDS, "cost" = 20) + return list("mode" = RCD_AIRLOCK, "delay" = 50, "cost" = 20) else - return list("mode" = RCD_AIRLOCK, "delay" = 5 SECONDS, "cost" = 16) + return list("mode" = RCD_AIRLOCK, "delay" = 50, "cost" = 16) if(RCD_WINDOWGRILLE) return rcd_result_with_memory( list("mode" = RCD_WINDOWGRILLE, "delay" = 1 SECONDS, "cost" = 4), src, RCD_MEMORY_WINDOWGRILLE, ) if(RCD_MACHINE) - return list("mode" = RCD_MACHINE, "delay" = 2 SECONDS, "cost" = 20) + return list("mode" = RCD_MACHINE, "delay" = 20, "cost" = 25) if(RCD_COMPUTER) - return list("mode" = RCD_COMPUTER, "delay" = 2 SECONDS, "cost" = 20) + return list("mode" = RCD_COMPUTER, "delay" = 20, "cost" = 25) if(RCD_FLOODLIGHT) - return list("mode" = RCD_FLOODLIGHT, "delay" = 3 SECONDS, "cost" = 20) - if(RCD_GIRDER) - return list("mode" = RCD_GIRDER, "delay" = 1.3 SECONDS, "cost" = 8) + return list("mode" = RCD_FLOODLIGHT, "delay" = 30, "cost" = 35) if(RCD_FURNISHING) var/cost = 0 var/delay = 0 if(the_rcd.furnish_type == /obj/structure/chair || the_rcd.furnish_type == /obj/structure/chair/stool) + cost = 8 + delay = 10 + else if(the_rcd.furnish_type == /obj/structure/chair/stool/bar) cost = 4 - delay = 1 SECONDS + delay = 5 else if(the_rcd.furnish_type == /obj/structure/chair/stool/bar) cost = 4 - delay = 0.5 SECONDS + delay = 5 else if(the_rcd.furnish_type == /obj/structure/table) - cost = 8 - delay = 2 SECONDS + cost = 15 + delay = 20 else if(the_rcd.furnish_type == /obj/structure/table/glass) - cost = 8 - delay = 2 SECONDS + cost = 12 + delay = 15 else if(the_rcd.furnish_type == /obj/structure/rack) - cost = 4 - delay = 2.5 SECONDS + cost = 20 + delay = 25 else if(the_rcd.furnish_type == /obj/structure/bed) - cost = 8 - delay = 1.5 SECONDS + cost = 10 + delay = 15 if(!cost) return FALSE return list("mode" = RCD_FURNISHING, "delay" = cost, "cost" = delay) @@ -221,11 +222,6 @@ new_floodlight.icon_state = "floodlight_c3" new_floodlight.state = FLOODLIGHT_NEEDS_LIGHTS return TRUE - if(RCD_GIRDER) - if(locate(/obj/structure/girder) in src) - return FALSE - new /obj/structure/girder(src) - return TRUE if(RCD_FURNISHING) if(locate(the_rcd.furnish_type) in src) return FALSE diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index 5b172d2a7efa44..3cb8222d07faf6 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -218,9 +218,9 @@ GLOBAL_VAR_INIT(starlight_color, pick(COLOR_TEAL, COLOR_GREEN, COLOR_CYAN, COLOR if(RCD_CATWALK) var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src) if(lattice) - return list("mode" = RCD_CATWALK, "delay" = 0, "cost" = 2) + return list("mode" = RCD_CATWALK, "delay" = 0, "cost" = 1) else - return list("mode" = RCD_CATWALK, "delay" = 0, "cost" = 4) + return list("mode" = RCD_CATWALK, "delay" = 0, "cost" = 2) return FALSE /turf/open/space/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/modules/admin/view_variables/reference_tracking.dm b/code/modules/admin/view_variables/reference_tracking.dm index b9fd0e6d2ad616..6be224cdd86f0b 100644 --- a/code/modules/admin/view_variables/reference_tracking.dm +++ b/code/modules/admin/view_variables/reference_tracking.dm @@ -1,29 +1,36 @@ #ifdef REFERENCE_TRACKING -#define REFSEARCH_RECURSE_LIMIT 64 -/datum/proc/find_references(references_to_clear = INFINITY) +/datum/proc/find_references(skip_alert) + running_find_references = type if(usr?.client) - if(tgui_alert(usr,"Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", list("Yes", "No")) != "Yes") + if(usr.client.running_find_references) + log_reftracker("CANCELLED search for references to a [usr.client.running_find_references].") + usr.client.running_find_references = null + running_find_references = null + //restart the garbage collector + SSgarbage.can_fire = TRUE + SSgarbage.update_nextfire(reset_time = TRUE) + return + + if(!skip_alert && tgui_alert(usr,"Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", list("Yes", "No")) != "Yes") + running_find_references = null return - src.references_to_clear = references_to_clear //this keeps the garbage collector from failing to collect objects being searched for in here SSgarbage.can_fire = FALSE - _search_references() - //restart the garbage collector - SSgarbage.can_fire = TRUE - SSgarbage.update_nextfire(reset_time = TRUE) + if(usr?.client) + usr.client.running_find_references = type -/datum/proc/_search_references() - log_reftracker("Beginning search for references to a [type], looking for [references_to_clear] refs.") + log_reftracker("Beginning search for references to a [type].") var/starting_time = world.time + + log_reftracker("Refcount for [type]: [refcount(src)]") + //Time to search the whole game for our ref - DoSearchVar(GLOB, "GLOB", starting_time) //globals + DoSearchVar(GLOB, "GLOB", search_time = starting_time) //globals log_reftracker("Finished searching globals") - if(src.references_to_clear == 0) - return //Yes we do actually need to do this. The searcher refuses to read weird lists //And global.vars is a really weird list @@ -31,46 +38,45 @@ for(var/key in global.vars) global_vars[key] = global.vars[key] - DoSearchVar(global_vars, "Native Global", starting_time) + DoSearchVar(global_vars, "Native Global", search_time = starting_time) log_reftracker("Finished searching native globals") - if(src.references_to_clear == 0) - return for(var/datum/thing in world) //atoms (don't beleive its lies) - DoSearchVar(thing, "World -> [thing.type]", starting_time) - if(src.references_to_clear == 0) - break + DoSearchVar(thing, "World -> [thing.type]", search_time = starting_time) log_reftracker("Finished searching atoms") - if(src.references_to_clear == 0) - return for(var/datum/thing) //datums - DoSearchVar(thing, "Datums -> [thing.type]", starting_time) - if(src.references_to_clear == 0) - break + DoSearchVar(thing, "Datums -> [thing.type]", search_time = starting_time) log_reftracker("Finished searching datums") - if(src.references_to_clear == 0) - return //Warning, attempting to search clients like this will cause crashes if done on live. Watch yourself #ifndef REFERENCE_DOING_IT_LIVE for(var/client/thing) //clients - DoSearchVar(thing, "Clients -> [thing.type]", starting_time) - if(src.references_to_clear == 0) - break + DoSearchVar(thing, "Clients -> [thing.type]", search_time = starting_time) log_reftracker("Finished searching clients") - if(src.references_to_clear == 0) - return #endif log_reftracker("Completed search for references to a [type].") -/datum/proc/DoSearchVar(potential_container, container_name, search_time, recursion_count, is_special_list) - if(recursion_count >= REFSEARCH_RECURSE_LIMIT) - log_reftracker("Recursion limit reached. [container_name]") + if(usr?.client) + usr.client.running_find_references = null + running_find_references = null + + //restart the garbage collector + SSgarbage.can_fire = TRUE + SSgarbage.update_nextfire(reset_time = TRUE) + +/datum/proc/DoSearchVar(potential_container, container_name, recursive_limit = 64, search_time = world.time) + #ifdef REFERENCE_TRACKING_DEBUG + if(SSgarbage.should_save_refs && !found_refs) + found_refs = list() + #endif + + if(usr?.client && !usr.client.running_find_references) return - if(references_to_clear == 0) + if(!recursive_limit) + log_reftracker("Recursion limit reached. [container_name]") return //Check each time you go down a layer. This makes it a bit slow, but it won't effect the rest of the game at all @@ -86,122 +92,68 @@ datum_container.last_find_references = search_time var/list/vars_list = datum_container.vars - var/is_atom = FALSE - var/is_area = FALSE - if(isatom(datum_container)) - is_atom = TRUE - if(isarea(datum_container)) - is_area = TRUE for(var/varname in vars_list) + #ifndef FIND_REF_NO_CHECK_TICK + CHECK_TICK + #endif + if (varname == "vars" || varname == "vis_locs") //Fun fact, vis_locs don't count for references + continue var/variable = vars_list[varname] - if(islist(variable)) - //Fun fact, vis_locs don't count for references - if(varname == "vars" || (is_atom && (varname == "vis_locs" || varname == "overlays" || varname == "underlays" || varname == "filters" || varname == "verbs" || (is_area && varname == "contents")))) - continue - // We do this after the varname check to avoid area contents (reading it incures a world loop's worth of cost) - if(!length(variable)) - continue - DoSearchVar(variable,\ - "[container_name] [datum_container.ref_search_details()] -> [varname] (list)",\ - search_time,\ - recursion_count + 1,\ - /*is_special_list = */ is_atom && (varname == "contents" || varname == "vis_contents" || varname == "locs")) - else if(variable == src) + + if(variable == src) #ifdef REFERENCE_TRACKING_DEBUG if(SSgarbage.should_save_refs) - if(!found_refs) - found_refs = list() found_refs[varname] = TRUE continue //End early, don't want these logging - else - log_reftracker("Found [type] [text_ref(src)] in [datum_container.type]'s [datum_container.ref_search_details()] [varname] var. [container_name]") - #else - log_reftracker("Found [type] [text_ref(src)] in [datum_container.type]'s [datum_container.ref_search_details()] [varname] var. [container_name]") #endif - references_to_clear -= 1 - if(references_to_clear == 0) - log_reftracker("All references to [type] [text_ref(src)] found, exiting.") - return + log_reftracker("Found [type] [text_ref(src)] in [datum_container.type]'s [text_ref(datum_container)] [varname] var. [container_name]") continue + if(islist(variable)) + DoSearchVar(variable, "[container_name] [text_ref(datum_container)] -> [varname] (list)", recursive_limit - 1, search_time) + else if(islist(potential_container)) + var/normal = IS_NORMAL_LIST(potential_container) var/list/potential_cache = potential_container for(var/element_in_list in potential_cache) - //Check normal sublists - if(islist(element_in_list)) - if(length(element_in_list)) - DoSearchVar(element_in_list, "[container_name] -> [element_in_list] (list)", search_time, recursion_count + 1) + #ifndef FIND_REF_NO_CHECK_TICK + CHECK_TICK + #endif //Check normal entrys - else if(element_in_list == src) + if(element_in_list == src) #ifdef REFERENCE_TRACKING_DEBUG if(SSgarbage.should_save_refs) - if(!found_refs) - found_refs = list() found_refs[potential_cache] = TRUE - continue - else - log_reftracker("Found [type] [text_ref(src)] in list [container_name].") - #else - log_reftracker("Found [type] [text_ref(src)] in list [container_name].") + continue //End early, don't want these logging #endif + log_reftracker("Found [type] [text_ref(src)] in list [container_name].") + continue - // This is dumb as hell I'm sorry - // I don't want the garbage subsystem to count as a ref for the purposes of this number - // If we find all other refs before it I want to early exit, and if we don't I want to keep searching past it - var/ignore_ref = FALSE - var/list/queues = SSgarbage.queues - for(var/list/queue in queues) - if(potential_cache in queue) - ignore_ref = TRUE - break - if(ignore_ref) - log_reftracker("[container_name] does not count as a ref for our count") - else - references_to_clear -= 1 - if(references_to_clear == 0) - log_reftracker("All references to [type] [text_ref(src)] found, exiting.") - return - - if(!isnum(element_in_list) && !is_special_list) - // This exists to catch an error that throws when we access a special list - // is_special_list is a hint, it can be wrong - try - var/assoc_val = potential_cache[element_in_list] - //Check assoc sublists - if(islist(assoc_val)) - if(length(assoc_val)) - DoSearchVar(potential_container[element_in_list], "[container_name]\[[element_in_list]\] -> [assoc_val] (list)", search_time, recursion_count + 1) - //Check assoc entry - else if(assoc_val == src) - #ifdef REFERENCE_TRACKING_DEBUG - if(SSgarbage.should_save_refs) - if(!found_refs) - found_refs = list() - found_refs[potential_cache] = TRUE - continue - else - log_reftracker("Found [type] [text_ref(src)] in list [container_name]\[[element_in_list]\]") - #else - log_reftracker("Found [type] [text_ref(src)] in list [container_name]\[[element_in_list]\]") - #endif - references_to_clear -= 1 - if(references_to_clear == 0) - log_reftracker("All references to [type] [text_ref(src)] found, exiting.") - return - catch - // So if it goes wrong we kill it - is_special_list = TRUE - log_reftracker("Curiosity: [container_name] lead to an error when acessing [element_in_list], what is it?") - -#undef REFSEARCH_RECURSE_LIMIT -#endif + var/assoc_val = null + if(!isnum(element_in_list) && normal) + assoc_val = potential_cache[element_in_list] + //Check assoc entrys + if(assoc_val == src) + #ifdef REFERENCE_TRACKING_DEBUG + if(SSgarbage.should_save_refs) + found_refs[potential_cache] = TRUE + continue //End early, don't want these logging + #endif + log_reftracker("Found [type] [text_ref(src)] in list [container_name]\[[element_in_list]\]") + continue + //We need to run both of these checks, since our object could be hiding in either of them + //Check normal sublists + if(islist(element_in_list)) + DoSearchVar(element_in_list, "[container_name] -> [element_in_list] (list)", recursive_limit - 1, search_time) + //Check assoc sublists + if(islist(assoc_val)) + DoSearchVar(potential_container[element_in_list], "[container_name]\[[element_in_list]\] -> [assoc_val] (list)", recursive_limit - 1, search_time) -// Kept outside the ifdef so overrides are easy to implement +/proc/qdel_and_find_ref_if_fail(datum/thing_to_del, force = FALSE) + thing_to_del.qdel_and_find_ref_if_fail(force) -/// Return info about us for reference searching purposes -/// Will be logged as a representation of this datum if it's a part of a search chain -/datum/proc/ref_search_details() - return text_ref(src) +/datum/proc/qdel_and_find_ref_if_fail(force = FALSE) + SSgarbage.reference_find_on_fail[text_ref(src)] = TRUE + qdel(src, force) -/datum/callback/ref_search_details() - return "[text_ref(src)] (obj: [object] proc: [delegate] args: [json_encode(arguments)] user: [user?.resolve() || "null"])" +#endif diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm index e7fb3820c0198f..8ed9c27599b33e 100644 --- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm +++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm @@ -52,7 +52,7 @@ var/datum/antagonist/changeling/antag_datum = C.mind.has_antag_datum(/datum/antagonist/changeling) if(istype(antag_datum)) var/their_loc = get_turf(C) - var/distance = get_dist_euclidean(my_loc, their_loc) + var/distance = get_dist_euclidian(my_loc, their_loc) if (distance < CHANGELING_PHEROMONE_MAX_DISTANCE) changelings[C] = (CHANGELING_PHEROMONE_MAX_DISTANCE ** 2) - (distance ** 2) diff --git a/code/modules/asset_cache/assets/rcd.dm b/code/modules/asset_cache/assets/rcd.dm index 8487df3c91c4a0..2125c67f68782f 100644 --- a/code/modules/asset_cache/assets/rcd.dm +++ b/code/modules/asset_cache/assets/rcd.dm @@ -15,7 +15,7 @@ 'icons/obj/objects.dmi' = list("bed"), 'icons/obj/smooth_structures/catwalk.dmi' = list("catwalk-0"), 'icons/hud/radial.dmi' = list("cnorth", "csouth", "ceast", "cwest", "chair", "secure_windoor", "stool", "wallfloor", "windowsize", "windowtype", "windoor"), - 'icons/obj/structures.dmi' = list("glass_table", "rack", "rwindow0", "reflector_base", "table", "window0", "girder"), + 'icons/obj/structures.dmi' = list("glass_table", "rack", "rwindow0", "reflector_base", "table", "window0"), ) var/icon/icon diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm index d90fcd8096c471..7e3039158d2e54 100644 --- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm @@ -47,7 +47,7 @@ /obj/machinery/airalarm/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if((buildstage == AIR_ALARM_BUILD_NO_CIRCUIT) && (the_rcd.upgrade & RCD_UPGRADE_SIMPLE_CIRCUITS)) - return list("mode" = RCD_WALLFRAME, "delay" = 2 SECONDS, "cost" = 1) + return list("mode" = RCD_WALLFRAME, "delay" = 20, "cost" = 1) return FALSE /obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) diff --git a/code/modules/cargo/department_order.dm b/code/modules/cargo/department_order.dm index 66b67a885b8610..57c0cbf0a814e5 100644 --- a/code/modules/cargo/department_order.dm +++ b/code/modules/cargo/department_order.dm @@ -33,8 +33,6 @@ GLOBAL_LIST_INIT(department_order_cooldowns, list( /obj/machinery/computer/department_orders/Initialize(mapload, obj/item/circuitboard/board) . = ..() - // All maps should have ONLY ONE of each order console roundstart - REGISTER_REQUIRED_MAP_ITEM(1, 1) if (radio_channel && radio_key_typepath) radio = new(src) diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index f3ddf19bbe640d..2185dd19fde4f7 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -51,7 +51,7 @@ if(MODE_TRAY) //undoes the last mode, meson vision_flags = NONE - color_cutoffs = null + color_cutoffs = list() change_glass_color(user, /datum/client_colour/glass_colour/lightblue) if(MODE_PIPE_CONNECTABLE) diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index b97da885372631..8866f795b30bb3 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -85,6 +85,7 @@ GLOBAL_LIST_INIT(hailer_phrases, list( visor_flags_inv = 0 flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF + has_fov = TRUE supports_variations_flags = CLOTHING_SNOUTED_VARIATION /obj/item/clothing/mask/gas/sechailer/swat/spacepol @@ -92,6 +93,7 @@ GLOBAL_LIST_INIT(hailer_phrases, list( desc = "A close-fitting tactical mask created in cooperation with a certain megacorporation, comes with an especially aggressive Compli-o-nator 3000." icon_state = "spacepol" inhand_icon_state = "spacepol_mask" + tint = 1.5 flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF diff --git a/code/modules/hydroponics/grown/aloe.dm b/code/modules/hydroponics/grown/aloe.dm index 27992a58f345ea..d873eccba2fbf0 100644 --- a/code/modules/hydroponics/grown/aloe.dm +++ b/code/modules/hydroponics/grown/aloe.dm @@ -11,7 +11,7 @@ endurance = 25 maturation = 12 production = 12 - yield = 60 + yield = 6 growthstages = 5 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05) diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index a9cc7b361eec01..ee01a447de7e6c 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -20,7 +20,7 @@ product = /obj/item/food/grown/ambrosia/vulgaris lifespan = 60 endurance = 25 - yield = 60 + yield = 6 potency = 5 icon_dead = "ambrosia-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index c9a644038b6780..d6001514f51ab6 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/apple lifespan = 55 endurance = 35 - yield = 50 + yield = 5 harvest_age = 200 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "apple-grow" diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 3d0a62b7eea9a8..c8f19237ae26d2 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 25 production = 5 - yield = 20 + yield = 2 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "berry-grow" // Uses one growth icons set for all the subtypes icon_dead = "berry-dead" // Same for the dead icon @@ -118,7 +118,7 @@ endurance = 25 maturation = 30 production = 5 - yield = 40 + yield = 4 growthstages = 2 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "grape-grow" @@ -171,7 +171,7 @@ lifespan = 20 maturation = 25 production = 5 - yield = 20 + yield = 2 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "toechtauese-grow" icon_dead = "toechtauese-dead" diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index e4b2170a472652..46d455ae27c9bc 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -7,7 +7,7 @@ plantname = "Wheat Stalks" product = /obj/item/food/grown/wheat production = 1 - yield = 40 + yield = 4 potency = 15 icon_dead = "wheat-dead" possible_mutations = list(/datum/hydroponics/plant_mutation/oat_wheat, /datum/hydroponics/plant_mutation/meat_wheat) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 15b11f43fcdfeb..a1be42dd08f81a 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 20 production = 20 - yield = 40 + yield = 4 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "chili-grow" // Uses one growth icons set for all the subtypes @@ -67,7 +67,7 @@ endurance = 10 maturation = 10 production = 10 - yield = 30 + yield = 3 rarity = 20 genes = list(/datum/plant_gene/trait/chem_heating, /datum/plant_gene/trait/backfire/chili_heat) possible_mutations = list() @@ -96,7 +96,7 @@ endurance = 10 maturation = 10 production = 10 - yield = 30 + yield = 3 rarity = 20 genes = list(/datum/plant_gene/trait/repeated_harvest) possible_mutations = list() diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index d368e95f8bceb2..491b8c3f026bff 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -17,7 +17,7 @@ product = /obj/item/food/grown/citrus/lime lifespan = 55 endurance = 50 - yield = 40 + yield = 4 potency = 15 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -41,7 +41,7 @@ product = /obj/item/food/grown/citrus/orange lifespan = 60 endurance = 50 - yield = 50 + yield = 5 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "lime-grow" @@ -69,7 +69,7 @@ product = /obj/item/food/grown/citrus/lemon lifespan = 55 endurance = 45 - yield = 40 + yield = 4 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "lime-grow" icon_dead = "lime-dead" @@ -98,7 +98,7 @@ genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/bomb_plant/potency_based) lifespan = 55 endurance = 45 - yield = 40 + yield = 4 reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/fuel = 0.05) /obj/item/food/grown/firelemon @@ -120,7 +120,7 @@ product = /obj/item/food/grown/citrus/orange_3d lifespan = 60 endurance = 50 - yield = 50 + yield = 5 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "lime-grow" diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index 3407e0e06b37cb..e3a87c31613cb9 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 25 production = 25 - yield = 20 + yield = 2 growthstages = 5 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "cocoapod-grow" @@ -60,7 +60,7 @@ product = /obj/item/food/grown/bungofruit lifespan = 30 maturation = 12 - yield = 30 + yield = 3 production = 7 genes = list(/datum/plant_gene/trait/repeated_harvest) possible_mutations = list() diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm index 89a3431af2436c..c67c304405389d 100644 --- a/code/modules/hydroponics/grown/cotton.dm +++ b/code/modules/hydroponics/grown/cotton.dm @@ -10,7 +10,7 @@ endurance = 25 maturation = 15 production = 1 - yield = 20 + yield = 2 potency = 50 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing.dmi' @@ -68,7 +68,7 @@ endurance = 50 maturation = 15 production = 1 - yield = 20 + yield = 2 potency = 50 //growthstages = 3 //growing_icon = 'icons/obj/hydroponics/growing.dmi' diff --git a/code/modules/hydroponics/grown/cucumber.dm b/code/modules/hydroponics/grown/cucumber.dm index a22670a8f32e07..5180044be60d9d 100644 --- a/code/modules/hydroponics/grown/cucumber.dm +++ b/code/modules/hydroponics/grown/cucumber.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/cucumber maturation = 10 production = 1 - yield = 50 + yield = 5 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "cucumber-grow" icon_dead = "cucumber-dead" diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm index 0147d9a37bd781..fac6c7eed8ed6f 100644 --- a/code/modules/hydroponics/grown/eggplant.dm +++ b/code/modules/hydroponics/grown/eggplant.dm @@ -6,7 +6,7 @@ species = "eggplant" plantname = "Eggplants" product = /obj/item/food/grown/eggplant - yield = 20 + yield = 2 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "eggplant-grow" diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 848e4e870fb007..10c05b8586c3a6 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/poppy endurance = 10 maturation = 8 - yield = 60 + yield = 6 potency = 20 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' @@ -65,7 +65,7 @@ production = 5 endurance = 10 maturation = 12 - yield = 40 + yield = 4 potency = 20 growthstages = 4 weed_rate = 2 @@ -140,7 +140,7 @@ endurance = 20 maturation = 7 production = 1 - yield = 20 + yield = 2 potency = 30 growthstages = 4 genes = list(/datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/preserved) @@ -169,7 +169,7 @@ genes = list(/datum/plant_gene/trait/attack/sunflower_attack, /datum/plant_gene/trait/preserved) endurance = 20 production = 2 - yield = 20 + yield = 2 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' icon_grow = "sunflower-grow" diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm index b61150b4da407f..ea228e09b9d6fd 100644 --- a/code/modules/hydroponics/grown/garlic.dm +++ b/code/modules/hydroponics/grown/garlic.dm @@ -5,7 +5,7 @@ species = "garlic" plantname = "Garlic Sprouts" product = /obj/item/food/grown/garlic - yield = 60 + yield = 6 potency = 25 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' diff --git a/code/modules/hydroponics/grown/gatfruit.dm b/code/modules/hydroponics/grown/gatfruit.dm index 5671f4b1a79978..866944b390e1c0 100644 --- a/code/modules/hydroponics/grown/gatfruit.dm +++ b/code/modules/hydroponics/grown/gatfruit.dm @@ -12,7 +12,7 @@ endurance = 20 maturation = 1 production = 10 - yield = 20 + yield = 2 potency = 60 growthstages = 2 rarity = 60 // Obtainable only with xenobio+superluck. diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index 78c745e1561ea2..920e048830696e 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -10,7 +10,7 @@ endurance = 40 maturation = 80 production = 5 - yield = 50 + yield = 5 growthstages = 2 icon_grow = "grass-grow" icon_dead = "grass-dead" diff --git a/code/modules/hydroponics/grown/hedges.dm b/code/modules/hydroponics/grown/hedges.dm index 951abd86feaa0e..02a2b5a5dd2d08 100644 --- a/code/modules/hydroponics/grown/hedges.dm +++ b/code/modules/hydroponics/grown/hedges.dm @@ -9,7 +9,7 @@ endurance = 30 maturation = 12 production = 6 - yield = 20 + yield = 2 growthstages = 3 reagents_add = list() possible_mutations = list(/datum/hydroponics/plant_mutation/kudzu_vines) diff --git a/code/modules/hydroponics/grown/herbs.dm b/code/modules/hydroponics/grown/herbs.dm index 9e095475348e09..5416de9becf1f4 100644 --- a/code/modules/hydroponics/grown/herbs.dm +++ b/code/modules/hydroponics/grown/herbs.dm @@ -7,7 +7,7 @@ plantname = "Herbs" product = /obj/item/food/grown/herbs growthstages = 2 - yield = 50 + yield = 5 potency = 20 growing_icon = 'icons/obj/hydroponics/growing.dmi' icon_grow = "herbs-grow" diff --git a/code/modules/hydroponics/grown/korta_nut.dm b/code/modules/hydroponics/grown/korta_nut.dm index bfc6777c21ac96..4c6787a91822e3 100644 --- a/code/modules/hydroponics/grown/korta_nut.dm +++ b/code/modules/hydroponics/grown/korta_nut.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/korta_nut lifespan = 55 endurance = 35 - yield = 50 + yield = 5 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "kortanut-grow" icon_dead = "kortanut-dead" diff --git a/code/modules/hydroponics/grown/kronkus.dm b/code/modules/hydroponics/grown/kronkus.dm index 17ca34f755c340..732a6e26c83493 100644 --- a/code/modules/hydroponics/grown/kronkus.dm +++ b/code/modules/hydroponics/grown/kronkus.dm @@ -11,7 +11,7 @@ endurance = 10 maturation = 12 production = 4 - yield = 30 + yield = 3 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.05) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 3b94cebeab6a2f..3562c80a346ef2 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -18,7 +18,7 @@ endurance = 35 maturation = 10 production = 5 - yield = 40 + yield = 4 potency = 15 growthstages = 4 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -44,7 +44,7 @@ endurance = 35 maturation = 10 production = 5 - yield = 40 + yield = 4 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' @@ -71,7 +71,7 @@ endurance = 35 maturation = 12 production = 5 - yield = 20 + yield = 2 potency = 35 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -97,7 +97,7 @@ product = /obj/item/food/grown/mushroom/libertycap maturation = 7 production = 1 - yield = 50 + yield = 5 potency = 15 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -122,7 +122,7 @@ product = /obj/item/food/grown/mushroom/plumphelmet maturation = 8 production = 1 - yield = 40 + yield = 4 potency = 15 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -149,7 +149,7 @@ lifespan = 30 endurance = 30 maturation = 22 - yield = 10 + yield = 1 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/mob_transformation/shroom) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' possible_mutations = list() @@ -176,7 +176,7 @@ endurance = 20 maturation = 7 production = 1 - yield = 50 + yield = 5 potency = 15 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -202,7 +202,7 @@ lifespan = 40 production = 4 endurance = 8 - yield = 40 + yield = 4 growthstages = 2 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/preset/liquidelectricity, /datum/plant_gene/trait/carnivory/jupitercup) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' @@ -228,7 +228,7 @@ endurance = 30 maturation = 15 production = 1 - yield = 30 //-> spread + yield = 3 //-> spread potency = 30 //-> brightness growthstages = 4 rarity = 20 diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm index 29e03fcf08cf68..8f93a9695ecfb2 100644 --- a/code/modules/hydroponics/grown/olive.dm +++ b/code/modules/hydroponics/grown/olive.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/olive lifespan = 150 endurance = 35 - yield = 50 + yield = 5 maturation = 10 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "olive-grow" diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index eb9fc33484b9cd..79650dab3193a4 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -8,7 +8,7 @@ lifespan = 20 maturation = 30 production = 4 - yield = 60 + yield = 6 endurance = 25 growthstages = 3 weed_chance = 3 diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm index b9d21b7d11850e..bda79a10a6be77 100644 --- a/code/modules/hydroponics/grown/peanut.dm +++ b/code/modules/hydroponics/grown/peanut.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/peanut lifespan = 55 endurance = 35 - yield = 50 + yield = 5 growing_icon = 'icons/obj/hydroponics/growing.dmi' icon_grow = "peanut-grow" icon_dead = "peanut-dead" diff --git a/code/modules/hydroponics/grown/peas.dm b/code/modules/hydroponics/grown/peas.dm index 9bd23f6483ba10..a813601bee3b6f 100644 --- a/code/modules/hydroponics/grown/peas.dm +++ b/code/modules/hydroponics/grown/peas.dm @@ -36,7 +36,7 @@ product = /obj/item/food/grown/laugh maturation = 7 potency = 10 - yield = 70 + yield = 7 production = 5 growthstages = 3 icon_grow = "laughpeas-grow" @@ -68,7 +68,7 @@ product = /obj/item/food/grown/peace maturation = 20 potency = 75 - yield = 10 + yield = 1 production = 10 genes = list (/datum/plant_gene/trait/glow/blue) reagents_add = list (/datum/reagent/pax = 0.1, /datum/reagent/drug/happiness = 0.1, /datum/reagent/consumable/nutriment = 0.15) diff --git a/code/modules/hydroponics/grown/plum.dm b/code/modules/hydroponics/grown/plum.dm index 56c2e20536b1b4..d12718d4ebf54b 100644 --- a/code/modules/hydroponics/grown/plum.dm +++ b/code/modules/hydroponics/grown/plum.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/plum lifespan = 55 endurance = 35 - yield = 50 + yield = 5 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "plum-grow" icon_dead = "plum-dead" diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index 5375d3e2a0d451..2f478b6b27b8a9 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -9,7 +9,7 @@ lifespan = 30 maturation = 10 production = 1 - yield = 40 + yield = 4 growthstages = 4 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "potato-grow" diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm index a15fa08a7722a7..3b60906c3f51ae 100644 --- a/code/modules/hydroponics/grown/rainbow_bunch.dm +++ b/code/modules/hydroponics/grown/rainbow_bunch.dm @@ -10,7 +10,7 @@ endurance = 10 maturation = 6 production = 3 - yield = 50 + yield = 5 potency = 20 growthstages = 4 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index be51fe2d9e9898..5dd01a418fa26f 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -12,7 +12,7 @@ endurance = 25 maturation = 30 production = 5 - yield = 40 + yield = 4 growthstages = 1 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -41,7 +41,7 @@ endurance = 8 maturation = 10 production = 1 - yield = 10 + yield = 1 //seeds if there isn't a dna inside potency = 30 var/volume = 5 var/ckey diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index ccbcae86492962..dbb67d0e88826e 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/carrot maturation = 10 production = 1 - yield = 50 + yield = 5 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' possible_mutations = list(/datum/hydroponics/plant_mutation/parsnip) @@ -66,7 +66,7 @@ product = /obj/item/food/grown/whitebeet lifespan = 60 endurance = 50 - yield = 60 + yield = 6 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_dead = "whitebeet-dead" possible_mutations = list(/datum/hydroponics/plant_mutation/redbeet) @@ -91,7 +91,7 @@ product = /obj/item/food/grown/redbeet lifespan = 60 endurance = 50 - yield = 50 + yield = 5 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_dead = "whitebeet-dead" genes = list(/datum/plant_gene/trait/maxchem) diff --git a/code/modules/hydroponics/grown/seedling.dm b/code/modules/hydroponics/grown/seedling.dm index bd0e1a37e819a8..e50b8fe10d134b 100644 --- a/code/modules/hydroponics/grown/seedling.dm +++ b/code/modules/hydroponics/grown/seedling.dm @@ -12,7 +12,7 @@ maturation = 10 production = 1 growthstages = 2 - yield = 10 + yield = 1 potency = 30 /obj/item/seeds/seedling/harvest(mob/harvester) diff --git a/code/modules/hydroponics/grown/sugarcane.dm b/code/modules/hydroponics/grown/sugarcane.dm index a32fe8fb58c561..90f87fce8539df 100644 --- a/code/modules/hydroponics/grown/sugarcane.dm +++ b/code/modules/hydroponics/grown/sugarcane.dm @@ -11,7 +11,7 @@ lifespan = 60 endurance = 50 maturation = 30 - yield = 40 + yield = 4 growthstages = 2 reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/sugar = 0.25) possible_mutations = list(/datum/hydroponics/plant_mutation/bamboo) diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm index 9231102097f433..a83a7a09d40ea4 100644 --- a/code/modules/hydroponics/grown/tea_coffee.dm +++ b/code/modules/hydroponics/grown/tea_coffee.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 5 production = 5 - yield = 50 + yield = 5 growthstages = 5 icon_dead = "tea-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -56,7 +56,7 @@ endurance = 20 maturation = 5 production = 5 - yield = 50 + yield = 5 growthstages = 5 icon_dead = "coffee-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm index 08e1ec675fd809..7a5679e66f125c 100644 --- a/code/modules/hydroponics/grown/tobacco.dm +++ b/code/modules/hydroponics/grown/tobacco.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 35 production = 5 - yield = 100 + yield = 10 growthstages = 3 icon_dead = "tobacco-dead" possible_mutations = list(/datum/hydroponics/plant_mutation/space_tobacco) diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 3a2af110e9d69a..387cf0a5678282 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -82,7 +82,7 @@ species = "bluespacetomato" plantname = "Bluespace Tomato Plants" product = /obj/item/food/grown/tomato/blue/bluespace - yield = 20 + yield = 2 possible_mutations = list() genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/backfire/bluespace) reagents_add = list(/datum/reagent/lube = 0.2, /datum/reagent/bluespace = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) @@ -106,7 +106,7 @@ species = "killertomato" plantname = "Killer-Tomato Plants" product = /obj/item/food/grown/tomato/killer - yield = 20 + yield = 2 genes = list(/datum/plant_gene/trait/mob_transformation/tomato) growthstages = 2 icon_grow = "killertomato-grow" diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index bc46dd77e5579e..5c1aa0d40013a1 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -9,7 +9,7 @@ endurance = 50 maturation = 15 production = 1 - yield = 50 + yield = 5 potency = 50 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' diff --git a/code/modules/hydroponics/grown/weeds/kudzu.dm b/code/modules/hydroponics/grown/weeds/kudzu.dm index 7e95ae00f4b4ce..679e99d500c93b 100644 --- a/code/modules/hydroponics/grown/weeds/kudzu.dm +++ b/code/modules/hydroponics/grown/weeds/kudzu.dm @@ -11,7 +11,7 @@ genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy) lifespan = 20 endurance = 10 - yield = 40 + yield = 4 growthstages = 4 rarity = 30 var/list/mutations = list() diff --git a/code/modules/hydroponics/grown/weeds/nettle.dm b/code/modules/hydroponics/grown/weeds/nettle.dm index 375c031e0ab95c..3e4301c7508357 100644 --- a/code/modules/hydroponics/grown/weeds/nettle.dm +++ b/code/modules/hydroponics/grown/weeds/nettle.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/nettle lifespan = 30 endurance = 40 // tuff like a toiger - yield = 40 + yield = 4 growthstages = 5 genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/attack/nettle_attack, /datum/plant_gene/trait/backfire/nettle_burn) possible_mutations = list(/datum/hydroponics/plant_mutation/death_nettle) @@ -24,7 +24,7 @@ product = /obj/item/food/grown/nettle/death endurance = 25 maturation = 8 - yield = 20 + yield = 2 genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/stinging, /datum/plant_gene/trait/attack/nettle_attack/death, /datum/plant_gene/trait/backfire/nettle_burn/death) possible_mutations = list() reagents_add = list(/datum/reagent/toxin/acid/fluacid = 0.5, /datum/reagent/toxin/acid = 0.5) diff --git a/code/modules/hydroponics/grown/weeds/starthistle.dm b/code/modules/hydroponics/grown/weeds/starthistle.dm index 859ef9f5b086c5..d5f730a5360b0e 100644 --- a/code/modules/hydroponics/grown/weeds/starthistle.dm +++ b/code/modules/hydroponics/grown/weeds/starthistle.dm @@ -10,7 +10,7 @@ endurance = 50 // damm pesky weeds maturation = 5 production = 1 - yield = 20 + yield = 2 potency = 10 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' @@ -44,7 +44,7 @@ endurance = 40 maturation = 30 production = 2 - yield = 20 + yield = 2 potency = 25 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 4f92ba56807e9b..d84bf59dbd67f6 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -974,13 +974,13 @@ /datum/plant_gene/trait/never_mutate name = "Prosophobic Inclination" description = "The plant does not mutate normally, but may give a mutated produce." - mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_GRAFTABLE + mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE /// Prevents stat mutation caused by instability. Trait acts as a tag for hydroponics.dm to recognise. /datum/plant_gene/trait/stable_stats name = "Symbiotic Resilience" description = "High instability does not affect the plant stats." - mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_GRAFTABLE + mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE /// Traits for flowers, makes plants not decompose. /datum/plant_gene/trait/preserved @@ -1025,8 +1025,3 @@ /datum/plant_gene/trait/plant_type/alien_properties name ="?????" icon = "reddit-alien" - -/datum/plant_gene/trait/seedless - name = "Seedless" - description = "The plant is unable to produce seeds" - mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index bb7911aea17ef9..b86e545dbc5c15 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -35,7 +35,7 @@ /// Changes the amount of time needed for a plant to become harvestable. var/production = 25 /// Amount of growns created per harvest. If is -1, the plant/shroom/weed is never meant to be harvested. - var/yield = 30 + var/yield = 3 /// The 'power' of a plant. Generally effects the amount of reagent in a plant, also used in other ways. var/potency = 10 /// Amount of growth sprites the plant has. @@ -247,77 +247,57 @@ /obj/item/seeds/proc/harvest(mob/user) ///Reference to the tray/soil the seeds are planted in. var/atom/movable/parent = loc //for ease of access + ///Count used for creating the correct amount of results to the harvest. + var/t_amount = 0 ///List of plants all harvested from the same batch. var/list/result = list() ///Tile of the harvester to deposit the growables. var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc //needed for TK ///Name of the grown products. var/product_name - var/seed_harvest_ratio = 0.2 - var/seedless = get_gene(/datum/plant_gene/trait/seedless) - ///the value of yield that the harvest amount stops being linear and slows down - var/yield_linearity_breakpoint = 100 - ///linear region growth coeff - var/harvest_linear_coeff = 0.1 - ///harvest amount gets close to 20 as yield gets close to +infinity - var/maximum_harvest_amount = 20 - ///to be calculated later based on yield - var/harvest_amount = 0 - var/harvest_counter = 0 - var/maximum_seed_production = 0 - var/seed_counter = 0 - var/plant_yield = getYield() + ///The Number of products produced by the plant, typically the yield. Modified by certain traits. + var/product_count = getYield() + + if(product_count >= 10) + product_count = 10 + log(1.02) * (getYield() - 1) if(user.client) add_jobxp_chance(user.client, 1, JOB_BOTANIST, 20) - if(plant_yield >= yield_linearity_breakpoint) - harvest_amount = qp_sigmoid(yield_linearity_breakpoint, maximum_harvest_amount, plant_yield) - if(!seedless) - maximum_seed_production = floor(harvest_amount * seed_harvest_ratio) - - else - harvest_amount = floor(plant_yield * harvest_linear_coeff) - if(!seedless) - maximum_seed_production = floor(harvest_amount * seed_harvest_ratio) - if ((plant_yield > 0 && maximum_seed_production == 0) && prob(50)) - maximum_seed_production = 1 - - while(harvest_counter < harvest_amount) - while(seed_counter < maximum_seed_production) + while(t_amount < product_count) + if(prob(25)) var/obj/item/seeds/seed_prod - if(prob(65) && has_viable_mutations()) + if(prob(50) && has_viable_mutations()) seed_prod = create_valid_mutation(output_loc, TRUE) ADD_TRAIT(seed_prod, TRAIT_PLANT_WILDMUTATE, "mutated") else seed_prod = src.Copy_drop(output_loc) - result.Add(seed_prod) - harvest_counter++ - seed_counter++ - var/obj/item/food/grown/item_grown - if(prob(10) && has_viable_mutations()) - item_grown = create_valid_mutation(output_loc) + result.Add(seed_prod) // User gets a consumable + t_amount++ else - if(!product) - harvest_counter++ - continue - item_grown = new product(output_loc, src) - if(plantname != initial(plantname)) - item_grown.name = plantname - if(istype(item_grown)) - item_grown.seed.name = name - item_grown.seed.desc = desc - item_grown.seed.plantname = plantname - result.Add(item_grown) // User gets a consumable - if(!item_grown) - return - harvest_counter++ - if(istype(item_grown)) - product_name = item_grown.seed.plantname - if(harvest_amount >= 1) - SSblackbox.record_feedback("tally", "food_harvested", harvest_amount, product_name) + var/obj/item/food/grown/t_prod + if(prob(10) && has_viable_mutations()) + t_prod = create_valid_mutation(output_loc) + else + if(!product) + t_amount++ + continue + t_prod = new product(output_loc, src) + if(plantname != initial(plantname)) + t_prod.name = plantname + if(istype(t_prod)) + t_prod.seed.name = name + t_prod.seed.desc = desc + t_prod.seed.plantname = plantname + result.Add(t_prod) // User gets a consumable + if(!t_prod) + return + t_amount++ + if(istype(t_prod)) + product_name = t_prod.seed.plantname + if(product_count >= 1) + SSblackbox.record_feedback("tally", "food_harvested", product_count, product_name) return result - /** * This is where plant chemical products are handled. diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index d4e41d63b364f6..c49071d37027e5 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -79,7 +79,7 @@ accessory = /obj/item/clothing/accessory/medal/gold/captain chameleon_extras = list( /obj/item/gun/energy/e_gun, - /obj/item/stamp/head/captain, + /obj/item/stamp/captain, ) implants = list(/obj/item/implant/mindshield) skillchips = list(/obj/item/skillchip/disk_verifier) diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 9ef561013e1b27..d5a7b6bca10621 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -65,8 +65,7 @@ uniform = /obj/item/clothing/under/rank/engineering/chief_engineer backpack_contents = list( /obj/item/melee/baton/telescopic = 1, - /obj/item/construction/rcd/ce = 1, - ) + ) belt = /obj/item/storage/belt/utility/chief/full ears = /obj/item/radio/headset/heads/ce gloves = /obj/item/clothing/gloves/color/black @@ -79,7 +78,7 @@ duffelbag = /obj/item/storage/backpack/duffelbag/engineering box = /obj/item/storage/box/survival/engineer - chameleon_extras = /obj/item/stamp/head/ce + chameleon_extras = /obj/item/stamp/ce skillchips = list(/obj/item/skillchip/job/engineer) implants = list(/obj/item/implant/mindshield) pda_slot = ITEM_SLOT_LPOCKET diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index daebcfa9d8457b..7ce73d4e7a5eed 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -78,7 +78,7 @@ box = /obj/item/storage/box/survival/medical chameleon_extras = list( /obj/item/gun/syringe, - /obj/item/stamp/head/cmo, + /obj/item/stamp/cmo, ) skillchips = list(/obj/item/skillchip/entrails_reader) diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 169260079dda38..7c2849e67c853c 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -68,7 +68,7 @@ chameleon_extras = list( /obj/item/gun/energy/e_gun, - /obj/item/stamp/head/hop, + /obj/item/stamp/hop, ) /datum/outfit/job/hop/pre_equip(mob/living/carbon/human/H) diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 259c828f47c097..4b0d7aaaaa39cd 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -71,7 +71,7 @@ box = /obj/item/storage/box/survival/security chameleon_extras = list( /obj/item/gun/energy/e_gun/hos, - /obj/item/stamp/head/hos, + /obj/item/stamp/hos, ) implants = list(/obj/item/implant/mindshield) diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 60871e29ea2514..5da3f5437f1abb 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -102,7 +102,7 @@ /// Iterates over all turfs in the target area and returns the first non-dense one /datum/job/prisoner/proc/get_random_open_turf_in_area() - var/list/turfs = get_area_turfs(/area/station/security/prison/) + var/list/turfs = get_area_turfs(/area/station/security/prison/safe) var/turf/open/target_turf = null var/sanity = 0 while(!target_turf && sanity < 100) diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 49d26f09d62ada..200742195922d7 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -47,4 +47,4 @@ shoes = /obj/item/clothing/shoes/sneakers/brown l_hand = /obj/item/clipboard - chameleon_extras = /obj/item/stamp/head/qm + chameleon_extras = /obj/item/stamp/qm diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index d0d711411061cb..f1a1d8135d4129 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -73,7 +73,7 @@ satchel = /obj/item/storage/backpack/satchel/science duffelbag = /obj/item/storage/backpack/duffelbag/science - chameleon_extras = /obj/item/stamp/head/rd + chameleon_extras = /obj/item/stamp/rd skillchips = list(/obj/item/skillchip/job/research_director) implants = list(/obj/item/implant/mindshield) diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 343752ea2fb30b..b98685902bd926 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -56,10 +56,6 @@ satchel = /obj/item/storage/backpack/satchel/eng duffelbag = /obj/item/storage/backpack/duffelbag/engineering - backpack_contents = list( - /obj/item/construction/rcd/loaded, - ) - box = /obj/item/storage/box/survival/engineer pda_slot = ITEM_SLOT_LPOCKET skillchips = list(/obj/item/skillchip/job/engineer) diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index e4d00214282714..9bd3c81e3b6598 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -76,10 +76,11 @@ if(kb.can_use(src) && kb.down(src) && keycount >= MAX_COMMANDS_PER_KEY) break - holder?.key_down(_key, src, full_key) - mob.focus?.key_down(_key, src, full_key) + holder?.key_down(_key, src) + mob.focus?.key_down(_key, src) mob.update_mouse_pointer() + /client/verb/keyUp(_key as text) set instant = TRUE set hidden = TRUE diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index d239c48d9ceee2..ef87e12d901039 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -1,7 +1,6 @@ // Set a client's focus to an object and override these procs on that object to let it handle keypresses -/datum/proc/key_down(key, client/user, full_key) // Called when a key is pressed down initially - SHOULD_CALL_PARENT(TRUE) +/datum/proc/key_down(key, client/user) // Called when a key is pressed down initially return /datum/proc/key_up(key, client/user) // Called when a key is released return diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm index cf0e71553abe02..d26271c71b42c6 100644 --- a/code/modules/mob/living/basic/drone/_drone.dm +++ b/code/modules/mob/living/basic/drone/_drone.dm @@ -162,12 +162,6 @@ /obj/item/clothing/mask, /obj/item/storage/box/lights, /obj/item/lightreplacer, - /obj/item/construction/rcd, - /obj/item/rcd_ammo, - /obj/item/rcd_upgrade, - /obj/item/storage/part_replacer, - /obj/item/soap, - /obj/item/holosign_creator, ) /// machines whitelisted from being shy with var/list/shy_machine_whitelist = list( diff --git a/code/modules/mob/living/basic/pets/dog/corgi.dm b/code/modules/mob/living/basic/pets/dog/corgi.dm index 00b64ffef6f914..8337cc4435f7e1 100644 --- a/code/modules/mob/living/basic/pets/dog/corgi.dm +++ b/code/modules/mob/living/basic/pets/dog/corgi.dm @@ -353,7 +353,6 @@ /mob/living/basic/pet/dog/corgi/ian/Initialize(mapload) . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, 1) //parent call must happen first to ensure IAN //is not in nullspace when child puppies spawn Read_Memory() diff --git a/code/modules/mob/living/basic/pets/parrot/poly.dm b/code/modules/mob/living/basic/pets/parrot/poly.dm index 3a1647726a6007..d5490389c434a4 100644 --- a/code/modules/mob/living/basic/pets/parrot/poly.dm +++ b/code/modules/mob/living/basic/pets/parrot/poly.dm @@ -31,7 +31,6 @@ /mob/living/basic/parrot/poly/Initialize(mapload) . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, 1) if(!memory_saved) roundend_callback = CALLBACK(src, PROC_REF(Write_Memory)) diff --git a/code/modules/mob/living/carbon/human/monkey/monkey.dm b/code/modules/mob/living/carbon/human/monkey/monkey.dm index db8f2f4f1e3d3c..2f1b8535d363e6 100644 --- a/code/modules/mob/living/carbon/human/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/human/monkey/monkey.dm @@ -65,8 +65,6 @@ GLOBAL_DATUM(the_one_and_only_punpun, /mob/living/carbon/human/species/monkey/pu if(!GLOB.the_one_and_only_punpun && mapload) GLOB.the_one_and_only_punpun = src - // 1 Pun Pun should exist - REGISTER_REQUIRED_MAP_ITEM(1, 1) fully_replace_character_name(real_name, name_to_use) diff --git a/code/modules/mob/living/navigation.dm b/code/modules/mob/living/navigation.dm index 470bdc18722860..df2e5806631e65 100644 --- a/code/modules/mob/living/navigation.dm +++ b/code/modules/mob/living/navigation.dm @@ -132,7 +132,7 @@ if(!target) target = lad continue - if(get_dist_euclidean(lad, src) > get_dist_euclidean(target, src)) + if(get_dist_euclidian(lad, src) > get_dist_euclidian(target, src)) continue target = lad @@ -144,7 +144,7 @@ if(!target) target = stairs_bro.z == z ? stairs_bro : get_step_multiz(stairs_bro, UP) //if the stairs aren't on our z level, get the turf above them (on our zlevel) to path to instead continue - if(get_dist_euclidean(stairs_bro, src) > get_dist_euclidean(target, src)) + if(get_dist_euclidian(stairs_bro, src) > get_dist_euclidian(target, src)) continue target = stairs_bro.z == z ? stairs_bro : get_step_multiz(stairs_bro, UP) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index bd27c482caf081..a7a36a476b756c 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -118,7 +118,6 @@ held_state = "cat" /mob/living/simple_animal/pet/cat/runtime/Initialize(mapload) - REGISTER_REQUIRED_MAP_ITEM(1, 1) if(prob(5)) icon_state = "original" icon_living = "original" diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 8f73af9701e068..b65e584eefc0ba 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1554,7 +1554,3 @@ set name = "View Skills" mind?.print_levels(src) - -/mob/key_down(key, client/client, full_key) - ..() - SEND_SIGNAL(src, COMSIG_MOB_KEYDOWN, key, client, full_key) diff --git a/code/modules/modular_computers/file_system/programs/radar.dm b/code/modules/modular_computers/file_system/programs/radar.dm index 82ce5e80ed95c2..cf8f39073cbfa6 100644 --- a/code/modules/modular_computers/file_system/programs/radar.dm +++ b/code/modules/modular_computers/file_system/programs/radar.dm @@ -91,7 +91,7 @@ var/locx = (target_turf.x - here_turf.x) + 24 var/locy = (here_turf.y - target_turf.y) + 24 - if(get_dist_euclidean(here_turf, target_turf) > 24) + if(get_dist_euclidian(here_turf, target_turf) > 24) userot = TRUE rot = round(get_angle(here_turf, target_turf)) else @@ -176,7 +176,7 @@ var/here_turf = get_turf(computer) var/target_turf = get_turf(signal) - var/trackdistance = get_dist_euclidean(here_turf, target_turf) + var/trackdistance = get_dist_euclidian(here_turf, target_turf) switch(trackdistance) if(0) program_icon_state = "[initial(program_icon_state)]direct" diff --git a/code/modules/paperwork/paperwork.dm b/code/modules/paperwork/paperwork.dm index 280bff58890ad5..cffa480e4a14bb 100644 --- a/code/modules/paperwork/paperwork.dm +++ b/code/modules/paperwork/paperwork.dm @@ -113,7 +113,7 @@ //HEAD OF STAFF DOCUMENTS /obj/item/paperwork/cargo - stamp_requested = /obj/item/stamp/head/qm + stamp_requested = /obj/item/stamp/qm stamp_job = /datum/job/quartermaster stamp_icon = "paper_stamp-qm" @@ -126,7 +126,7 @@ detailed_desc += span_info(" Despite how disorganized the documents are, they're all appropriately filled in. You should probably stamp this.") /obj/item/paperwork/security - stamp_requested = /obj/item/stamp/head/hos + stamp_requested = /obj/item/stamp/hos stamp_job = /datum/job/head_of_security stamp_icon = "paper_stamp-hos" @@ -139,7 +139,7 @@ detailed_desc += span_info(" What a bunch of crap, the security team were clearly just doing what they had to. You should probably stamp this.") /obj/item/paperwork/service - stamp_requested = /obj/item/stamp/head/hop + stamp_requested = /obj/item/stamp/hop stamp_job = /datum/job/head_of_personnel stamp_icon = "paper_stamp-hop" @@ -152,7 +152,7 @@ detailed_desc += span_info(" A MAXIMUM priority request like this is nothing to balk at. You should probably stamp this.") /obj/item/paperwork/medical - stamp_requested = /obj/item/stamp/head/cmo + stamp_requested = /obj/item/stamp/cmo stamp_job = /datum/job/chief_medical_officer stamp_icon = "paper_stamp-cmo" @@ -166,7 +166,7 @@ /obj/item/paperwork/engineering - stamp_requested = /obj/item/stamp/head/ce + stamp_requested = /obj/item/stamp/ce stamp_job = /datum/job/chief_engineer stamp_icon = "paper_stamp-ce" @@ -179,7 +179,7 @@ detailed_desc += span_info(" Damn, that's impressive stuff. You should probably stamp this.") /obj/item/paperwork/research - stamp_requested = /obj/item/stamp/head/rd + stamp_requested = /obj/item/stamp/rd stamp_job = /datum/job/research_director stamp_icon = "paper_stamp-rd" @@ -192,7 +192,7 @@ detailed_desc += span_info(" Regardless, they're still perfectly usable test results. You should probably stamp this.") /obj/item/paperwork/captain - stamp_requested = /obj/item/stamp/head/captain + stamp_requested = /obj/item/stamp/captain stamp_job = /datum/job/captain stamp_icon = "paper_stamp-cap" diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 342833a7caec5d..12caa3c003e1db 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -26,53 +26,46 @@ stamp_class = sheet.icon_class_name(icon_state) ) +/obj/item/stamp/qm + name = "quartermaster's rubber stamp" + icon_state = "stamp-qm" + dye_color = DYE_QM + /obj/item/stamp/law name = "law office's rubber stamp" icon_state = "stamp-law" dye_color = DYE_LAW -/obj/item/stamp/head - -/obj/item/stamp/head/Initialize(mapload) - . = ..() - // All maps should have at least 1 of each head of staff stamp - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) - -/obj/item/stamp/head/captain +/obj/item/stamp/captain name = "captain's rubber stamp" icon_state = "stamp-cap" dye_color = DYE_CAPTAIN -/obj/item/stamp/head/hop +/obj/item/stamp/hop name = "head of personnel's rubber stamp" icon_state = "stamp-hop" dye_color = DYE_HOP -/obj/item/stamp/head/hos +/obj/item/stamp/hos name = "head of security's rubber stamp" icon_state = "stamp-hos" dye_color = DYE_HOS -/obj/item/stamp/head/ce +/obj/item/stamp/ce name = "chief engineer's rubber stamp" icon_state = "stamp-ce" dye_color = DYE_CE -/obj/item/stamp/head/rd +/obj/item/stamp/rd name = "research director's rubber stamp" icon_state = "stamp-rd" dye_color = DYE_RD -/obj/item/stamp/head/cmo +/obj/item/stamp/cmo name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" dye_color = DYE_CMO -/obj/item/stamp/head/qm - name = "quartermaster's rubber stamp" - icon_state = "stamp-qm" - dye_color = DYE_QM - /obj/item/stamp/denied name = "\improper DENIED rubber stamp" icon_state = "stamp-deny" diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm index 00d878ba104198..2e47aa7ad78978 100644 --- a/code/modules/power/apc/apc_tool_act.dm +++ b/code/modules/power/apc/apc_tool_act.dm @@ -161,13 +161,13 @@ if(machine_stat & BROKEN) balloon_alert(user, "frame is too damaged!") return FALSE - return list("mode" = RCD_WALLFRAME, "delay" = 2 SECONDS, "cost" = 1) + return list("mode" = RCD_WALLFRAME, "delay" = 20, "cost" = 1) if(!cell) if(machine_stat & MAINT) balloon_alert(user, "no board for a cell!") return FALSE - return list("mode" = RCD_WALLFRAME, "delay" = 5 SECONDS, "cost" = 10) + return list("mode" = RCD_WALLFRAME, "delay" = 50, "cost" = 10) balloon_alert(user, "has both board and cell!") return FALSE diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm index b086f0f78e02e7..b2e29e3c5d61e4 100644 --- a/code/modules/reagents/chemistry/items.dm +++ b/code/modules/reagents/chemistry/items.dm @@ -123,7 +123,7 @@ return var/list/out_message = list() to_chat(user, "The chemistry meter beeps and displays:") - out_message += "Total volume: [round(cont.volume, 0.01)] Current temperature: [round(cont.reagents.chem_temp, 0.1)]K Total pH: [round(cont.reagents.ph, 0.01)]\n" + out_message += "Total volume: [round(cont.volume, 0.01)] Current temperature: [round(cont.reagents.chem_temp, 0.1)]K Total pH: [round(cont.reagents.ph, 0.01)]\n" out_message += "Chemicals found in [target.name]:\n" if(cont.reagents.is_reacting) out_message += "[span_warning("A reaction appears to be occuring currently.")]\n" @@ -135,7 +135,7 @@ out_message += "[round(reagent.volume, 0.01)]u of [reagent.name], Purity: [round(reagent.purity, 0.000001)*100]%, [(scanmode?"[(reagent.overdose_threshold?"Overdose: [reagent.overdose_threshold]u, ":"")]Base pH: [initial(reagent.ph)], Current pH: [reagent.ph].":"Current pH: [reagent.ph].")]\n" if(scanmode) out_message += "Analysis: [reagent.description]\n" - to_chat(user, examine_block(span_notice("[out_message.Join()]"))) + to_chat(user, "[out_message.Join()]") desc = "An electrode attached to a small circuit box that will display details of a solution. Can be toggled to provide a description of each of the reagents. The screen currently displays detected vol: [round(cont.volume, 0.01)] detected pH:[round(cont.reagents.ph, 0.1)]." /obj/item/burner diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 811d08fcec5e4c..fde4d21ea444f2 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(chem_master_containers, list( /// Insert new beaker and/or eject the inserted one /obj/machinery/chem_master/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker) - if(new_beaker && user && !user.transferItemToLoc(new_beaker, src)) + if(!user?.transferItemToLoc(new_beaker, src)) return FALSE if(beaker) try_put_in_hand(beaker, user) diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index 0c27f6b7550fba..a9267f9484d0ac 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -133,39 +133,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING -/datum/design/rcd_upgrade/anti_interrupt - name = "RCD anti disruption designs upgrade" - desc = "Prevents interruption of RCD construction and deconstruction." - id = "rcd_upgrade_anti_interrupt" - build_type = PROTOLATHE - materials = list( - /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5, - /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.25, - /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 1.5, - /datum/material/titanium = SHEET_MATERIAL_AMOUNT, - ) - build_path = /obj/item/rcd_upgrade/anti_interrupt - category = list( - RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED - ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING - -/datum/design/rcd_upgrade/cooling - name = "RCD cooling upgrade" - desc = "Allows the RCD to more quickly perform multiple actions at once." - id = "rcd_upgrade_cooling" - build_type = PROTOLATHE - materials = list( - /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, - /datum/material/glass = SHEET_MATERIAL_AMOUNT, - /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, - ) - build_path = /obj/item/rcd_upgrade/cooling - category = list( - RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED - ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING - /datum/design/rcd_upgrade/furnishing name = "RCD furnishing upgrade" desc = "Adds the ability to furnish areas using the RCD." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 7175b8663b8fe9..feab11b01e3230 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1558,8 +1558,6 @@ description = "Unlocks new designs that improve rapid devices." prereq_ids = list("adv_engi") design_ids = list( - "rcd_upgrade_anti_interrupt", - "rcd_upgrade_cooling", "rcd_upgrade_frames", "rcd_upgrade_furnishing", "rcd_upgrade_simple_circuits", diff --git a/code/modules/station_goals/meteor_shield.dm b/code/modules/station_goals/meteor_shield.dm index cb527fd12d8786..6eec271a01fc9e 100644 --- a/code/modules/station_goals/meteor_shield.dm +++ b/code/modules/station_goals/meteor_shield.dm @@ -13,7 +13,7 @@ // A chain of satellites encircles the station // Satellites be actived to generate a shield that will block unorganic matter from passing it. /datum/station_goal/station_shield - name = "Hard-Kill Meteor Protection System" // monkestation edit + name = "Station Shield" var/coverage_goal = 500 requires_space = TRUE diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index aaadb308076d3a..6e196b52af5e4b 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -228,7 +228,7 @@ color_cutoffs = high_light_cutoff.Copy() light_level = NIGHTVISION_LIGHT_HIG else - color_cutoffs = null + color_cutoffs = list() light_level = NIGHTVISION_LIGHT_OFF owner.update_sight() diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index e1d4f42815c143..5ebc3bf6ff5ebb 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -93,7 +93,7 @@ w_class = WEIGHT_CLASS_NORMAL toolspeed = 0.7 light_system = OVERLAY_LIGHT - light_outer_range = 1.5 + light_outer_range = 1 light_color = COLOR_SOFT_RED /obj/item/cautery/advanced/get_all_tool_behaviours() @@ -119,13 +119,7 @@ /obj/item/cautery/advanced/proc/on_transform(obj/item/source, mob/user, active) SIGNAL_HANDLER - if(active) - tool_behaviour = TOOL_DRILL - set_light_color(LIGHT_COLOR_BLUE) - else - tool_behaviour = TOOL_CAUTERY - set_light_color(LIGHT_COLOR_ORANGE) - + tool_behaviour = (active ? TOOL_DRILL : TOOL_CAUTERY) balloon_alert(user, "lenses set to [active ? "drill" : "mend"]") playsound(user ? user : src, 'sound/weapons/tap.ogg', 50, TRUE) return COMPONENT_NO_DEFAULT_MESSAGE @@ -378,7 +372,7 @@ w_class = WEIGHT_CLASS_NORMAL toolspeed = 0.7 light_system = OVERLAY_LIGHT - light_outer_range = 1.5 + light_outer_range = 1 light_color = LIGHT_COLOR_BLUE sharpness = SHARP_EDGED @@ -409,10 +403,10 @@ if(active) tool_behaviour = TOOL_SAW - set_light_color(LIGHT_COLOR_ORANGE) + set_light_range(2) else tool_behaviour = TOOL_SCALPEL - set_light_color(LIGHT_COLOR_BLUE) + set_light_range(1) balloon_alert(user, "[active ? "enabled" : "disabled"] bone-cutting mode") playsound(user ? user : src, 'sound/machines/click.ogg', 50, TRUE) diff --git a/code/modules/tgui_input/keycombo.dm b/code/modules/tgui_input/keycombo.dm deleted file mode 100644 index 948dbaea234a84..00000000000000 --- a/code/modules/tgui_input/keycombo.dm +++ /dev/null @@ -1,126 +0,0 @@ -/** - * 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.read_preference(/datum/preference/toggle/tgui_input)) - 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.read_preference(/datum/preference/toggle/tgui_input_large) - data["message"] = message - data["swapped_buttons"] = user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_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) - . = ..() - 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/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index d00abb28fe107d..80895a0dfd5642 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -70,12 +70,6 @@ #else #define TEST_OUTPUT_GREEN(text) (text) #endif -/// Change color to yellow on ANSI terminal output, if enabled with -DANSICOLORS. -#ifdef ANSICOLORS -#define TEST_OUTPUT_YELLOW(text) "\x1B\x5B1;33m[text]\x1B\x5B0m" -#else -#define TEST_OUTPUT_YELLOW(text) (text) -#endif /// A trait source when adding traits through unit tests #define TRAIT_SOURCE_UNIT_TESTS "unit_tests" @@ -144,7 +138,6 @@ #include "leash.dm" #include "lesserform.dm" #include "limbsanity.dm" -#include "linked_xenobio_pens.dm" #include "load_map_security.dm" #include "lungs.dm" #include "machine_disassembly.dm" @@ -187,7 +180,6 @@ #include "reagent_names.dm" #include "reagent_recipe_collisions.dm" #include "reagent_transfer.dm" -#include "required_map_items.dm" #include "resist.dm" #include "say.dm" #include "screenshot_antag_icons.dm" diff --git a/code/modules/unit_tests/find_reference_sanity.dm b/code/modules/unit_tests/find_reference_sanity.dm index 0a9b6f3d17225c..575ec326910677 100644 --- a/code/modules/unit_tests/find_reference_sanity.dm +++ b/code/modules/unit_tests/find_reference_sanity.dm @@ -15,8 +15,6 @@ return ..() /atom/movable/ref_test - // Gotta make sure we do a full check - references_to_clear = INFINITY var/atom/movable/ref_test/self_ref /atom/movable/ref_test/Destroy(force) @@ -30,9 +28,8 @@ var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 3, "Should be: test references: 0 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(testbed, "Sanity Check") //We increment search time to get around an optimization - - TEST_ASSERT(!LAZYLEN(victim.found_refs), "The ref-tracking tool found a ref where none existed") + victim.DoSearchVar(testbed, "Sanity Check", search_time = 1) //We increment search time to get around an optimization + TEST_ASSERT(!victim.found_refs.len, "The ref-tracking tool found a ref where none existed") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_baseline/Run() @@ -47,11 +44,11 @@ var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(testbed, "First Run") + victim.DoSearchVar(testbed, "First Run", search_time = 2) - TEST_ASSERT(LAZYACCESS(victim.found_refs, "test"), "The ref-tracking tool failed to find a regular value") - TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_list), "The ref-tracking tool failed to find a list entry") - TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find an assoc list value") + TEST_ASSERT(victim.found_refs["test"], "The ref-tracking tool failed to find a regular value") + TEST_ASSERT(victim.found_refs[testbed.test_list], "The ref-tracking tool failed to find a list entry") + TEST_ASSERT(victim.found_refs[testbed.test_assoc_list], "The ref-tracking tool failed to find an assoc list value") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_exotic/Run() @@ -64,14 +61,16 @@ testbed.vis_contents += victim testbed.test_assoc_list[victim] = TRUE + #if DM_VERSION >= 515 var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(testbed, "Second Run") + #endif + victim.DoSearchVar(testbed, "Second Run", search_time = 3) //This is another sanity check - TEST_ASSERT(!LAZYACCESS(victim.found_refs, testbed.overlays), "The ref-tracking tool found an overlays entry? That shouldn't be possible") - TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.vis_contents), "The ref-tracking tool failed to find a vis_contents entry") - TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find an assoc list key") + TEST_ASSERT(!victim.found_refs[testbed.overlays], "The ref-tracking tool found an overlays entry? That shouldn't be possible") + TEST_ASSERT(victim.found_refs[testbed.vis_contents], "The ref-tracking tool failed to find a vis_contents entry") + TEST_ASSERT(victim.found_refs[testbed.test_assoc_list], "The ref-tracking tool failed to find an assoc list key") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_esoteric/Run() @@ -86,14 +85,15 @@ var/list/to_find_assoc = list(victim) testbed.test_assoc_list["Nesting"] = to_find_assoc + #if DM_VERSION >= 515 var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(victim, "Third Run Self") - victim.DoSearchVar(testbed, "Third Run Testbed") - - TEST_ASSERT(LAZYACCESS(victim.found_refs, "self_ref"), "The ref-tracking tool failed to find a self reference") - TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find), "The ref-tracking tool failed to find a nested list entry") - TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_assoc), "The ref-tracking tool failed to find a nested assoc list entry") + #endif + victim.DoSearchVar(victim, "Third Run Self", search_time = 4) + victim.DoSearchVar(testbed, "Third Run Testbed", search_time = 4) + TEST_ASSERT(victim.found_refs["self_ref"], "The ref-tracking tool failed to find a self reference") + TEST_ASSERT(victim.found_refs[to_find], "The ref-tracking tool failed to find a nested list entry") + TEST_ASSERT(victim.found_refs[to_find_assoc], "The ref-tracking tool failed to find a nested assoc list entry") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_null_key_entry/Run() @@ -103,11 +103,12 @@ //Calm before the storm testbed.test_assoc_list = list(null = victim) + #if DM_VERSION >= 515 var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 4, "Should be: test references: 1 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(testbed, "Fourth Run") - - TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find a null key'd assoc list entry") + #endif + victim.DoSearchVar(testbed, "Fourth Run", search_time = 5) + TEST_ASSERT(testbed.test_assoc_list, "The ref-tracking tool failed to find a null key'd assoc list entry") /datum/unit_test/find_reference_assoc_investigation/Run() var/atom/movable/ref_test/victim = allocate(/atom/movable/ref_test) @@ -120,12 +121,13 @@ var/list/to_find_null_assoc_nested = list(victim) testbed.test_assoc_list[null] = to_find_null_assoc_nested + #if DM_VERSION >= 515 var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 5, "Should be: test references: 2 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(testbed, "Fifth Run") - - TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_in_key), "The ref-tracking tool failed to find a nested assoc list key") - TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_null_assoc_nested), "The ref-tracking tool failed to find a null key'd nested assoc list entry") + #endif + victim.DoSearchVar(testbed, "Fifth Run", search_time = 6) + TEST_ASSERT(victim.found_refs[to_find_in_key], "The ref-tracking tool failed to find a nested assoc list key") + TEST_ASSERT(victim.found_refs[to_find_null_assoc_nested], "The ref-tracking tool failed to find a null key'd nested assoc list entry") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_static_investigation/Run() @@ -143,9 +145,11 @@ for(var/key in global.vars) global_vars[key] = global.vars[key] + #if DM_VERSION >= 515 var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 5, "Should be: test references: 2 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(global_vars, "Sixth Run") + #endif + victim.DoSearchVar(global_vars, "Sixth Run", search_time = 7) - TEST_ASSERT(LAZYACCESS(victim.found_refs, global_vars), "The ref-tracking tool failed to find a natively global variable") + TEST_ASSERT(victim.found_refs[global_vars], "The ref-tracking tool failed to find a natively global variable") SSgarbage.should_save_refs = FALSE diff --git a/code/modules/unit_tests/linked_xenobio_pens.dm b/code/modules/unit_tests/linked_xenobio_pens.dm deleted file mode 100644 index 8dc582a73e56a5..00000000000000 --- a/code/modules/unit_tests/linked_xenobio_pens.dm +++ /dev/null @@ -1,20 +0,0 @@ -/// This test ensures that any mapped xenobiology pens properly have a unique mapping ID set between each ooze sucker and slime pen management console. -/datum/unit_test/linked_xenobio_pens - -/datum/unit_test/linked_xenobio_pens/Run() - var/list/obj/machinery/plumbing/ooze_sucker/used_map_ids = list() - for(var/obj/machinery/slime_pen_controller/pen as anything in GLOB.slime_pen_controllers) - if(!pen.mapping_id) - TEST_FAIL("Found a slime pen management console without a mapping ID at [AREACOORD(pen)]!") - else if(used_map_ids[pen.mapping_id]) - TEST_FAIL("Found a slime pen management console with duplicate mapping_id [pen.mapping_id] at [AREACOORD(pen)], which is already used by the console at [AREACOORD(used_map_ids[pen.mapping_id])]!") - else - used_map_ids[pen.mapping_id] = pen - for(var/obj/machinery/plumbing/ooze_sucker/sucker as anything in GLOB.ooze_suckers) - if(!sucker.mapping_id) - TEST_FAIL("Found an ooze sucker without a mapping ID at [AREACOORD(sucker)]!") - else if(!used_map_ids[sucker.mapping_id]) - TEST_FAIL("Found an ooze sucker with an unused mapping ID at [AREACOORD(sucker)]!") - else if(!sucker.linked_controller) - TEST_FAIL("Ooze sucker failed to link to controller at [AREACOORD(sucker)]!") - diff --git a/code/modules/unit_tests/required_map_items.dm b/code/modules/unit_tests/required_map_items.dm deleted file mode 100644 index 5f5fe135a950ab..00000000000000 --- a/code/modules/unit_tests/required_map_items.dm +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Tests that all expected items are mapped in roundstart. - * - * How to add an item to this test: - * - Add the typepath(s) to setup_expected_types - * - In the type's initialize, REGISTER_REQUIRED_MAP_ITEM() a minimum and maximum - */ -/datum/unit_test/required_map_items - /// A list of all typepaths that we expect to be in the required items list - var/list/expected_types = list() - /// Subtypes to ignore. - var/list/ignored_types = list() - -/// Used to fill the expected types list with all the types we look for on the map. -/// This list will just be full of typepaths that we expect. -/// More detailed information about each item (mainly, how much of each should exist) is set on a per item basis -/datum/unit_test/required_map_items/proc/setup_expected_types() - expected_types += subtypesof(/obj/item/stamp/head) - expected_types += subtypesof(/obj/machinery/computer/department_orders) - expected_types += /obj/machinery/computer/communications - expected_types += /mob/living/carbon/human/species/monkey/punpun - expected_types += /mob/living/basic/pet/dog/corgi/ian - expected_types += /mob/living/simple_animal/pet/cat/runtime - expected_types += /mob/living/basic/parrot/poly - // monkestation start - expected_types += /obj/item/radio/radio_mic - expected_types += /obj/machinery/atm - expected_types += /obj/machinery/cassette/adv_cassette_deck - expected_types += /obj/machinery/cassette/dj_station - expected_types += /obj/machinery/cassette/mailbox - expected_types += /obj/machinery/cryopod - expected_types += /obj/machinery/station_map/engineering - expected_types += /obj/structure/cassette_rack/prefilled - ignored_types += /obj/machinery/cryopod/prison - // monkestation end - -/datum/unit_test/required_map_items/Run() - setup_expected_types() - - var/list/required_map_items = GLOB.required_map_items.Copy() - for(var/got_type in expected_types) - var/datum/required_item/item = required_map_items[got_type] - var/items_found = item?.total_amount || 0 - required_map_items -= got_type - if(items_found <= 0) - TEST_FAIL("Item [got_type] was not found, but is expected to be mapped in on mapload!") - continue - - if(items_found < item.minimum_amount) - TEST_FAIL("Item [got_type] should have at least [item.minimum_amount] mapped in but only had [items_found] on mapload!") - continue - - if(items_found > item.maximum_amount) - TEST_FAIL("Item [got_type] should have at most [item.maximum_amount] mapped in but had [items_found] on mapload!") - continue - required_map_items -= ignored_types - - // This primarily serves as a reminder to include the typepath in the expected types list above. - // However we can easily delete this line in the future if it runs into false positives. - TEST_ASSERT(length(required_map_items) == 0, "The following paths were found in required map items, but weren't checked: [english_list(required_map_items)]") - -/// Datum for tracking required map items -/datum/required_item - /// Type (exact) being tracked - var/tracked_type - /// How many exist in the world - var/total_amount = 0 - /// Min. amount of this type that should exist roundstart (inclusive) - var/minimum_amount = 1 - /// Max. amount of this type that should exist roundstart (inclusive) - var/maximum_amount = 1 - -/datum/required_item/New(tracked_type, minimum_amount = 1, maximum_amount = 1) - src.tracked_type = tracked_type - src.minimum_amount = minimum_amount - src.maximum_amount = maximum_amount - total_amount += 1 diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 8647b026adc465..fbcec6159f0061 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -15,8 +15,6 @@ GLOBAL_DATUM(current_test, /datum/unit_test) GLOBAL_VAR_INIT(failed_any_test, FALSE) /// When unit testing, all logs sent to log_mapping are stored here and retrieved in log_mapping unit test. GLOBAL_LIST_EMPTY(unit_test_mapping_logs) -/// Global assoc list of required mapping items, [item typepath] to [required item datum]. -GLOBAL_LIST_EMPTY(required_map_items) /// A list of every test that is currently focused. /// Use the PERFORM_ALL_TESTS macro instead. @@ -167,55 +165,43 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) GLOB.current_test = test var/duration = REALTIMEOFDAY - var/skip_test = (test_path in SSmapping.config.skipped_tests) - var/test_output_desc = "[test_path]" - var/message = "" log_world("::group::[test_path]") + test.Run() - if(skip_test) - log_world("[TEST_OUTPUT_YELLOW("SKIPPED")] Skipped run on map [SSmapping.config.map_name].") + duration = REALTIMEOFDAY - duration + GLOB.current_test = null + GLOB.failed_any_test |= !test.succeeded - else - - test.Run() - - duration = REALTIMEOFDAY - duration - GLOB.current_test = null - GLOB.failed_any_test |= !test.succeeded + var/list/log_entry = list() + var/list/fail_reasons = test.fail_reasons - var/list/log_entry = list() - var/list/fail_reasons = test.fail_reasons + for(var/reasonID in 1 to LAZYLEN(fail_reasons)) + var/text = fail_reasons[reasonID][1] + var/file = fail_reasons[reasonID][2] + var/line = fail_reasons[reasonID][3] - for(var/reasonID in 1 to LAZYLEN(fail_reasons)) - var/text = fail_reasons[reasonID][1] - var/file = fail_reasons[reasonID][2] - var/line = fail_reasons[reasonID][3] + test.log_for_test(text, "error", file, line) - test.log_for_test(text, "error", file, line) + // Normal log message + log_entry += "\tFAILURE #[reasonID]: [text] at [file]:[line]" - // Normal log message - log_entry += "\tFAILURE #[reasonID]: [text] at [file]:[line]" + var/message = log_entry.Join("\n") + log_test(message) - if(length(log_entry)) - message = log_entry.Join("\n") - log_test(message) - - test_output_desc += " [duration / 10]s" - if (test.succeeded) - log_world("[TEST_OUTPUT_GREEN("PASS")] [test_output_desc]") + var/test_output_desc = "[test_path] [duration / 10]s" + if (test.succeeded) + log_world("[TEST_OUTPUT_GREEN("PASS")] [test_output_desc]") log_world("::endgroup::") - if (!test.succeeded && !skip_test) + if (!test.succeeded) log_world("::error::[TEST_OUTPUT_RED("FAIL")] [test_output_desc]") - var/final_status = skip_test ? UNIT_TEST_SKIPPED : (test.succeeded ? UNIT_TEST_PASSED : UNIT_TEST_FAILED) - test_results[test_path] = list("status" = final_status, "message" = message, "name" = test_path) + test_results[test_path] = list("status" = test.succeeded ? UNIT_TEST_PASSED : UNIT_TEST_FAILED, "message" = message, "name" = test_path) qdel(test) - /// Builds (and returns) a list of atoms that we shouldn't initialize in generic testing, like Create and Destroy. /// It is appreciated to add the reason why the atom shouldn't be initialized if you add it to this list. /datum/unit_test/proc/build_list_of_uncreatables() diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 725e3b27702a6f..b3022560075ee6 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -34,10 +34,6 @@ /obj/item/clothing/head/helmet/hat/cowboy = 3, /obj/item/clothing/head/costume/constable = 3, //monkestation edit /obj/item/clothing/under/rank/security/constable = 3, //Monkestation edit - /obj/item/clothing/under/rank/security/brig_physician = 3, //Monkestation edit - /obj/item/clothing/under/rank/security/brig_physician/skirt = 3, //Monkestation edit - /obj/item/clothing/suit/toggle/labcoat/brig_physician = 3, //Monkestation edit - /obj/item/clothing/shoes/sneakers/secred = 3, //Monkestation edit ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3, diff --git a/config/config.txt b/config/config.txt index a15291b8953e76..cf55e68060f4f2 100644 --- a/config/config.txt +++ b/config/config.txt @@ -362,14 +362,14 @@ AUTOADMIN_RANK Game Master ## These trigger for any version below (non-inclusive) the given version, so 510 triggers on 509 or lower. ## These messages will be followed by one stating the clients current version and the required version for clarity. ## If CLIENT_WARN_POPUP is uncommented a popup window with the message will be displayed instead -#CLIENT_WARN_VERSION 515 -#CLIENT_WARN_BUILD 1635 +#CLIENT_WARN_VERSION 511 +#CLIENT_WARN_BUILD 1421 #CLIENT_WARN_POPUP -#CLIENT_WARN_MESSAGE Byond released 515 as the stable release. This comes bundled with a host of niceties, including image generation for UIs and :: operators. -CLIENT_ERROR_VERSION 515 +#CLIENT_WARN_MESSAGE Byond released 511 as the stable release. You can set the framerate your client runs at, which makes the game feel very different and cool. Shortly after its release we will end up using 511 client features and you will be forced to update. +CLIENT_ERROR_VERSION 511 CLIENT_ERROR_MESSAGE Your version of byond is not supported. Please upgrade. -## The minimum build needed for joining the server. -CLIENT_ERROR_BUILD 1590 +## The minimum build needed for joining the server, if using 512, a good minimum build would be 1421 as that disables the Middle Mouse Button exploit. +CLIENT_ERROR_BUILD 1421 ## TOPIC RATE LIMITING ## This allows you to limit how many topic calls (clicking on an interface window) the client can do in any given game second and/or game minute. diff --git a/dependencies.sh b/dependencies.sh index d672e81ecfa154..62463ad41604af 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -5,15 +5,14 @@ # byond version export BYOND_MAJOR=515 -export BYOND_MINOR=1637 +export BYOND_MINOR=1633 #rust_g git tag export RUST_G_VERSION=3.1.0 #node version -export NODE_VERSION_LTS=20.13.0 -# compatiblility mode MUST work with windows 7 -export NODE_VERSION_COMPAT=20.2.0 +export NODE_VERSION=14 +export NODE_VERSION_PRECISE=14.16.1 # SpacemanDMM git tag export SPACEMAN_DMM_VERSION=suite-1.8 diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml index e1e4519a88c504..5607cdf1713ace 100644 --- a/html/changelogs/archive/2024-06.yml +++ b/html/changelogs/archive/2024-06.yml @@ -522,94 +522,3 @@ MrMelbert, KnigTheThrasher: - rscadd: Lizards can customize their lisp - code_imp: Added a modular file for species features -2024-06-26: - Absolucy: - - rscadd: Holomaps now show meteor defense coverage, visualized by a blue grid. - - sound: Meteor defense zap sounds should be able to be heard from further away - now. - - balance: Meteor defense sats can now always be ordered from cargo, regardless - of station goal. - - balance: Meteor defense sats now cover upwards and downwards too, making them - less of a pain on multi-Z stations. - - refactor: Tracking which tiles are covered by meteor defense sats is now much - more intuitive and efficient. - - qol: Meteors now drop debris when zapped by meteor defense sats. - - qol: Examining meteor defense sats now also shows how many meteors have been zapped - overall by all sats. - - balance: Slightly boosted the range of meteor defense satellite from 14 to 16 - tiles. -2024-06-27: - Absolucy: - - rscadd: Engineers now have an RCD round start. - - balance: RCD construction/deconstruction effects can now be attacked in order - to cancel them. You can get the anti-disruption upgrade disk to prevent this. - - balance: RCD construction/deconstruction is now slower if you already have another - effect up. This does not effect reconstruction. - - balance: Both of the above effects do not effect the CE's roundstart RCD, nor - any other RCDs such as combat RCDs. - - rscadd: RCDs can make girders now. - - bugfix: Some RCD constructs took more material than manual construction. The RCD - cost should be consistent in comparison to manual construction now. - - bugfix: RCDs can build wallmounts on reinforced walls. - - qol: RCDs can build directional windows without requiring/building a grill. - - bugfix: You should be able to click on lattices on icebox with the RCD and construct - a floor now - - balance: Maintenance drones now can use RPED, RCD, holosigns, and spray bottles. - - rscadd: Added liquid barriers, currently mapped into xenobio, which block all - liquid flow across them, hopefully preventing the dreaded station-wide ooze - floods. - - image: (intercepti0n) Resprites t-ray scanner, gas analyzer, geiger counter and - hand drill. - - image: (LT3) Medical and improvised gauze are visibly different from cloth. - - image: (Alecksohs) Updated the Advanced Surgical Tool's sprites. - - code_imp: (Alecksohs) Updated the Advanced Surgical Tool's light code. - - qol: Placing someone on an operating table now actually buckles them. - - qol: Prettied up the Chemical Analyzer's output in chat, making it easier to read, - especially when scanning multiple things. - DexeeXI: - - rscadd: New Title for Captains - DustanHache: - - rscadd: Egg bags are now craftable using cloth, like many other bags. - Kapu1178: - - bugfix: Fixed stuff relating to the MODsuit pathfinder module. - - code_imp: AI pathfinding should produce slightly better paths. - KnigTheThrasher: - - bugfix: fixed latejoin prisoner spawns - - bugfix: :) - RafRoq: - - rscadd: 'Added new botany plant trait, seedless, can be found in money tree seeds - - :cl:' - Rex9001, DexeeXI: - - rscadd: Brig Physician as a job - - rscadd: 'Clothing items for Brig Physician: jumpsuit, skirt, scrubs, shoes, backpacks - of all kinds.' - - rscadd: Plasmaman support for Brig Physician. Sprites provided directly by DimWhat. - - rscadd: Alternative job title support for Brig Physician - - rscadd: SECHUD, Crew Monitor and ID card support for Brig Physician - - rscadd: Locker specifically for Brig Physician - - rscadd: Digi-legs support for new clothes for Lizards. - - rscadd: Most new items have inhand sprites - - rscadd: Brig Physician start markers in Prison Medbays. - - rscadd: Requested alternative title for Medical Doctor. (Admin Team Request) - - balance: All prison medbays overhauled to provide proper support. The old tram - medbay was completely bare while Box was mostly "feature complete". All medbays - should have very similar capability. - - bugfix: Head of Personnel's supervisor is now the Captain properly. - - rscdel: Virus extrapolator in the CMO's locker is now gone. (I don't know how - I missed this one) - TTNT789: - - rscadd: The Ashen Forge as a traitor faction - Uristthedorf: - - qol: You can craft plastitanium shards. - ven1883: - - rscadd: Adds Alveolic Deoxidation, a nanite program that heals suffocation. - - rscadd: Adds Alveolic Deoxidation to the tech tree. -2024-06-30: - Absolucy: - - bugfix: Fixed cat ears disappearing from slimes with the gooey cat mutation across - Z-levels. - RafRoq: - - bugfix: 'Fixes botany early game yield - - :cl:' diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml deleted file mode 100644 index 6a6f0be52626c2..00000000000000 --- a/html/changelogs/archive/2024-07.yml +++ /dev/null @@ -1,16 +0,0 @@ -2024-07-02: - Absolucy: - - bugfix: TramStation now has the CMO's stamp properly mapped in. - - bugfix: KiloStation now has the CMO's stamp, prefilled cassette rack, and the - curator's radio "properly" mapped in. - - rscadd: Mapped ATMs and holomaps into Blueshift. - - refactor: Fixed up some code relating to the bodypart overlays of cybernetics. - - bugfix: Meteor satellites now longer shake the camera. - Absolucy, mc-oofert: - - qol: You may alt-click action buttons to bind them to a key. - KnigTheThrasher: - - rscadd: Added novastation clothes to our loadouts and store - - bugfix: Fixed satyr legs being unhealable - ancient-engineer: - - qol: Gets rid of the fov effect of the swat mask - - qol: Gets rid of the vignette around your vision while wearing the spacepol mask diff --git a/icons/mob/huds/hud.dmi b/icons/mob/huds/hud.dmi index 708882bb2302b8..6420db1c8750b7 100644 Binary files a/icons/mob/huds/hud.dmi and b/icons/mob/huds/hud.dmi differ diff --git a/icons/mob/inhands/equipment/backpack_lefthand.dmi b/icons/mob/inhands/equipment/backpack_lefthand.dmi index 7bed688b2b960c..6c600e85e8aaa4 100644 Binary files a/icons/mob/inhands/equipment/backpack_lefthand.dmi and b/icons/mob/inhands/equipment/backpack_lefthand.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 95d8375d739d1a..be13305ca8d47e 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 68276a9b5f6ba5..57beb052f91756 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/medical/stack_medical.dmi b/icons/obj/medical/stack_medical.dmi index 6a558951256346..d12949da595f1a 100644 Binary files a/icons/obj/medical/stack_medical.dmi and b/icons/obj/medical/stack_medical.dmi differ diff --git a/icons/obj/medical/surgery_tools.dmi b/icons/obj/medical/surgery_tools.dmi index 5582374b2825ff..594f0a8d43fcb3 100644 Binary files a/icons/obj/medical/surgery_tools.dmi and b/icons/obj/medical/surgery_tools.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 75a711d111a366..867ebd3f3c1cd7 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/monkestation/code/datums/components/crafting.dm b/monkestation/code/datums/components/crafting.dm index 35499e2f2ee72f..643255a9a3b0bf 100644 --- a/monkestation/code/datums/components/crafting.dm +++ b/monkestation/code/datums/components/crafting.dm @@ -12,18 +12,3 @@ ) time = 1.5 SECONDS category = CAT_WEAPON_MELEE - -/datum/crafting_recipe/ph_sensor //Ghetto science goggles for the wanna-be Walter White's upon our grimey-ass station. - name = "Chemical Sensor" - tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_MULTITOOL) - result = /obj/item/ph_meter - reqs = list( - /obj/item/stock_parts/scanning_module = 1, - /obj/item/stock_parts/cell = 1, - /obj/item/stack/sheet/glass = 1, - /obj/item/stack/cable_coil = 5, - /obj/item/pen = 1, - /obj/item/stack/sheet/iron = 2 - ) - time = 4 SECONDS - category = CAT_CHEMISTRY diff --git a/monkestation/code/datums/components/multi_hit.dm b/monkestation/code/datums/components/multi_hit.dm index 7c439ebf663179..870b7be7b79ab9 100644 --- a/monkestation/code/datums/components/multi_hit.dm +++ b/monkestation/code/datums/components/multi_hit.dm @@ -45,11 +45,6 @@ src.stamina_cost = stamina_cost item_parent = parent -/datum/component/multi_hit/Destroy(force, silent) - after_hit_callback = null - pre_hit_callback = null - return ..() - /datum/component/multi_hit/RegisterWithParent() RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(pre_hit_callback)) @@ -57,6 +52,7 @@ . = ..() UnregisterSignal(parent, COMSIG_ITEM_PRE_ATTACK) + /datum/component/multi_hit/proc/pre_hit_callback(datum/source, obj/item/thing, mob/user, params) SIGNAL_HANDLER diff --git a/monkestation/code/datums/id_trim/jobs.dm b/monkestation/code/datums/id_trim/jobs.dm deleted file mode 100644 index ece4a288985169..00000000000000 --- a/monkestation/code/datums/id_trim/jobs.dm +++ /dev/null @@ -1,28 +0,0 @@ -/datum/id_trim/job/brig_physician - assignment = "Brig Physician" - trim_state = "trim_brigphysician" - department_color = COLOR_SECURITY_RED - subdepartment_color = COLOR_MEDICAL_BLUE - sechud_icon_state = SECHUD_BRIG_PHYSICIAN - minimal_access = list( - ACCESS_BRIG, - ACCESS_BRIG_ENTRANCE, - ACCESS_COURT, - ACCESS_MECH_SECURITY, - ACCESS_MEDICAL, - ACCESS_MINERAL_STOREROOM, - ACCESS_MORGUE, - ACCESS_SECURITY, - ACCESS_WEAPONS, - ) - extra_access = list( - ACCESS_DETECTIVE, - ACCESS_MAINT_TUNNELS, - ACCESS_SURGERY, - ) - template_access = list( - ACCESS_CAPTAIN, - ACCESS_CHANGE_IDS, - ACCESS_HOS, - ) - job = /datum/job/brig_physician diff --git a/monkestation/code/game/machinery/cloning.dm b/monkestation/code/game/machinery/cloning.dm index 5e94c995db4f5f..d194835204edf5 100644 --- a/monkestation/code/game/machinery/cloning.dm +++ b/monkestation/code/game/machinery/cloning.dm @@ -383,9 +383,11 @@ icon_state = "pod_0" return - if(QDELETED(mob_occupant) || !exp_clone_check(mob_occupant)) + if(!mob_occupant) return - + + exp_clone_check(mob_occupant) + current_insurance = null REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT) REMOVE_TRAIT(mob_occupant, TRAIT_STABLELIVER, CLONING_POD_TRAIT) @@ -413,9 +415,9 @@ unattached_flesh.Cut() occupant = null - + /obj/machinery/clonepod/proc/exp_clone_check(mob_occupant) - return TRUE + return /obj/machinery/clonepod/proc/malfunction() var/mob/living/mob_occupant = occupant diff --git a/monkestation/code/game/machinery/computer/cloning.dm b/monkestation/code/game/machinery/computer/cloning.dm index 3dcd237a4b90fa..645f6b34a6f939 100644 --- a/monkestation/code/game/machinery/computer/cloning.dm +++ b/monkestation/code/game/machinery/computer/cloning.dm @@ -36,6 +36,8 @@ /obj/machinery/computer/cloning/Initialize() . = ..() updatemodules(TRUE) + AddElement(/datum/element/empprotection, EMP_PROTECT_SELF) // So when an experimental cloner gets emped, it's cloning console doesn't break nullifying the threat. + /obj/machinery/computer/cloning/Destroy() if(pods) diff --git a/monkestation/code/game/machinery/exp_cloner.dm b/monkestation/code/game/machinery/exp_cloner.dm index 6d522ee9cfcd52..bd8623ea51914c 100644 --- a/monkestation/code/game/machinery/exp_cloner.dm +++ b/monkestation/code/game/machinery/exp_cloner.dm @@ -7,13 +7,37 @@ req_access = null circuit = /obj/item/circuitboard/machine/clonepod/experimental internal_radio = FALSE + grab_ghost_when = CLONER_FRESH_CLONE // This helps with getting the objective for evil clones to display. VAR_PRIVATE static/list/image/cached_clone_images + /// Am I producing evil clones? + var/datum/objective/evil_clone/evil_objective = null + /// Can my objective be changed? + var/locked = FALSE + /// The custom objective given by the traitor item. + var/custom_objective = null /obj/machinery/clonepod/experimental/Destroy() clear_human_dummy(REF(src)) return ..() +/obj/machinery/clonepod/experimental/examine(mob/user) + . = ..() + if((evil_objective || custom_objective) && (in_range(user, src) || isobserver(user))) + if(!isnull(evil_objective) || !isnull(custom_objective)) + . += span_warning("You notice an ominous, flashing red LED light.") + if(isobserver(user)) + if(!isnull(custom_objective)) + . += span_notice("Those cloned will have the objective: [custom_objective]") //This doesn't look the best I think. + else + . += span_notice("Those cloned will have the objective: [evil_objective.explanation_text]") + +/obj/machinery/clonepod/experimental/RefreshParts() + . = ..() + if(!isnull(evil_objective) || !isnull(custom_objective)) + speed_coeff = round(speed_coeff / 2) // So better parts have half the speed increase. + speed_coeff += 1 // I still want basic parts to have base 100% speed. + //Start growing a human clone in the pod! /obj/machinery/clonepod/experimental/growclone(clonename, ui, mutation_index, mindref, blood_type, datum/species/mrace, list/features, factions, list/quirks, datum/bank_account/insurance) if(panel_open || mess || attempting) @@ -54,13 +78,25 @@ ADD_TRAIT(clonee, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT) clonee.Unconscious(80) + var/role_text + var/poll_text + if(!isnull(custom_objective)) + role_text = "syndicate clone" + poll_text = "Do you want to play as [clonename]'s syndicate clone?" + else if(!isnull(evil_objective)) + role_text = "evil clone" + poll_text = "Do you want to play as [clonename]'s evil clone?" + else + role_text = "defective clone" + poll_text = "Do you want to play as [clonename]'s defective clone?" + var/list/mob/dead/observer/candidates = SSpolling.poll_ghost_candidates_for_mob( - "Do you want to play as [clonename]'s defective clone?", + poll_text, poll_time = 10 SECONDS, target_mob = clonee, ignore_category = POLL_IGNORE_DEFECTIVECLONE, pic_source = get_clone_preview(clonee.dna) || clonee, - role_name_text = "defective clone" + role_name_text = role_text ) if(LAZYLEN(candidates)) var/mob/dead/observer/candidate = pick(candidates) @@ -84,8 +120,23 @@ /obj/machinery/clonepod/experimental/exp_clone_check(mob/living/carbon/human/mob_occupant) if(!mob_occupant?.mind) //When experimental cloner fails to get a ghost, it won't spit out a body, so we don't get an army of brainless rejects. qdel(mob_occupant) - return FALSE - return TRUE + else if(!isnull(custom_objective)) + var/datum/antagonist/evil_clone/antag_object = new + var/datum/objective/evil_clone/custom = new + custom.explanation_text = custom_objective + antag_object.objectives += custom + mob_occupant.mind.add_antag_datum(antag_object) + mob_occupant.grant_language(/datum/language/codespeak) // So you don't have to remember to grant each and every identical clone codespeak with the manual. + mob_occupant.remove_blocked_language(/datum/language/codespeak, source=LANGUAGE_ALL) // All the effects the codespeak manual would have. + ADD_TRAIT(mob_occupant, TRAIT_TOWER_OF_BABEL, MAGIC_TRAIT) + var/obj/item/implant/radio/syndicate/imp = new(src) + imp.implant(mob_occupant) + mob_occupant.faction |= ROLE_SYNDICATE + mob_occupant.AddComponent(/datum/component/simple_access, list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)) //Basic/syndicate access, and genetics too because clones are genetics stuff. + else if(!isnull(evil_objective)) + var/datum/antagonist/evil_clone/antag_object = new + antag_object.objectives += new evil_objective() + mob_occupant.mind.add_antag_datum(antag_object) /obj/machinery/clonepod/experimental/proc/get_clone_preview(datum/dna/clone_dna) RETURN_TYPE(/image) @@ -104,6 +155,25 @@ LAZYSET(cached_clone_images, key, preview) return preview +/obj/machinery/clonepod/experimental/emag_act(mob/user) + if(!locked) + evil_objective = /datum/objective/evil_clone/murder //Emags will give a nasty objective. + locked = TRUE + to_chat(user, span_warning("You corrupt the genetic compiler.")) + add_fingerprint(user) + log_cloning("[key_name(user)] emagged [src] at [AREACOORD(src)], causing it to malfunction.") + RefreshParts() + else + to_chat(user, span_warning("The cloner is already malfunctioning.")) + +/obj/machinery/clonepod/experimental/emp_act(severity) + . = ..() + if (!(. & EMP_PROTECT_SELF)) + if(prob(100/severity) && !locked) + evil_objective = pick(subtypesof(/datum/objective/evil_clone) - /datum/objective/evil_clone/murder) + RefreshParts() + log_cloning("[src] at [AREACOORD(src)] corrupted due to EMP pulse.") + //Prototype cloning console, much more rudimental and lacks modern functions such as saving records, autocloning, or safety checks. /obj/machinery/computer/prototype_cloning name = "prototype cloning console" diff --git a/monkestation/code/game/objects/effects/landmark.dm b/monkestation/code/game/objects/effects/landmark.dm index 266d1b7472624f..ee0bbd5fa0dc8a 100644 --- a/monkestation/code/game/objects/effects/landmark.dm +++ b/monkestation/code/game/objects/effects/landmark.dm @@ -129,10 +129,3 @@ /obj/effect/landmark/start/security_assistant name = "Security Assistant" icon_state = "Security Officer" - -//Brig Physician Spawn Location Marker - Dexee, 4/13/24 - -/obj/effect/landmark/start/brig_physician - name = "Brig Physician" - icon = 'monkestation/icons/mob/landmarks.dmi' - icon_state = "Brig Physician" diff --git a/monkestation/code/game/objects/items/caneswords.dm b/monkestation/code/game/objects/items/caneswords.dm index dca8c4e2b7d86a..bf240bb682b1e4 100644 --- a/monkestation/code/game/objects/items/caneswords.dm +++ b/monkestation/code/game/objects/items/caneswords.dm @@ -96,7 +96,6 @@ /obj/item/storage/canesword/civ/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_BELT) - AddElement(/datum/element/manufacturer_examine, COMPANY_ASHENFORGE) atom_storage.max_slots = 1 atom_storage.rustle_sound = FALSE @@ -139,7 +138,6 @@ /obj/item/storage/canesword/CentCom/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_BELT) - AddElement(/datum/element/manufacturer_examine, COMPANY_ASHENFORGE) atom_storage.max_slots = 1 atom_storage.rustle_sound = FALSE @@ -181,7 +179,6 @@ /obj/item/storage/canesword/syndicate/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_BELT) - AddElement(/datum/element/manufacturer_examine, COMPANY_ASHENFORGE) atom_storage.max_slots = 1 atom_storage.rustle_sound = FALSE diff --git a/monkestation/code/game/objects/items/devices/radio/encryptionkey.dm b/monkestation/code/game/objects/items/devices/radio/encryptionkey.dm deleted file mode 100644 index df453599a12a1e..00000000000000 --- a/monkestation/code/game/objects/items/devices/radio/encryptionkey.dm +++ /dev/null @@ -1,6 +0,0 @@ -/obj/item/encryptionkey/headset_secmed - name = "brig physician radio encryption key" - icon_state = "cypherkey_security" - channels = list(RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_MEDICAL = 1) - greyscale_config = /datum/greyscale_config/encryptionkey_security - greyscale_colors = "#820a16#280b1a" diff --git a/monkestation/code/game/objects/items/devices/radio/headset.dm b/monkestation/code/game/objects/items/devices/radio/headset.dm deleted file mode 100644 index c266ed70b6b4c1..00000000000000 --- a/monkestation/code/game/objects/items/devices/radio/headset.dm +++ /dev/null @@ -1,6 +0,0 @@ -/obj/item/radio/headset/headset_secmed - name = "brig physician radio headset" - desc = "This is used by your secure doctor." - icon_state = "sec_headset" - worn_icon_state = "sec_headset" - keyslot = /obj/item/encryptionkey/headset_secmed diff --git a/monkestation/code/game/objects/items/storage/garment.dm b/monkestation/code/game/objects/items/storage/garment.dm deleted file mode 100644 index e80e5175ae1ff9..00000000000000 --- a/monkestation/code/game/objects/items/storage/garment.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/item/storage/bag/garment/brig_physician - name = "brig physician's garment bag" - desc = "A bag for storing extra clothes and shoes. This one belongs to the brig physician." - -/obj/item/storage/bag/garment/brig_physician/PopulateContents() - new /obj/item/clothing/under/rank/security/brig_physician(src) - new /obj/item/clothing/under/rank/security/brig_physician/skirt(src) - new /obj/item/clothing/under/rank/security/scrubs/sec(src) - new /obj/item/clothing/head/utility/surgerycap/sec(src) - new /obj/item/clothing/suit/toggle/labcoat/brig_physician(src) - new /obj/item/clothing/shoes/sneakers/secred(src) - new /obj/item/clothing/gloves/latex/nitrile(src) - diff --git a/monkestation/code/game/objects/items/storage/uplink_kits.dm b/monkestation/code/game/objects/items/storage/uplink_kits.dm index 09b754b22d8401..5b5148806f3899 100644 --- a/monkestation/code/game/objects/items/storage/uplink_kits.dm +++ b/monkestation/code/game/objects/items/storage/uplink_kits.dm @@ -160,6 +160,45 @@ new /obj/item/lighter(src) new /obj/item/jammer(src) +/obj/item/storage/box/clonearmy + name = "Syndicate clone army kit" + desc = "A box containing everything you need to make a clone army. The disk inside cunningly disguised as a DNA data disk is used to give all clones a directive they must follow." + icon_state = "syndiebox" + +/obj/item/storage/box/clonearmy/PopulateContents() + var/static/items_inside = list( + /obj/item/disk/clonearmy = 1, + /obj/item/stack/sheet/iron = 15, + /obj/item/stack/sheet/glass = 4, + /obj/item/stack/cable_coil = 1, + /obj/item/circuitboard/machine/clonepod/experimental = 1, + /obj/item/circuitboard/machine/clonescanner = 1, + /obj/item/circuitboard/computer/cloning = 1, + /obj/item/stock_parts/manipulator/femto = 2, // The syndicate is so cool they gave you tier four parts. RIP my joke about tier 2 parts. + /obj/item/stock_parts/scanning_module/triphasic = 3, + /obj/item/stock_parts/micro_laser/quadultra = 1, + /obj/item/stock_parts/matter_bin/bluespace = 1, + /obj/item/wrench = 1, + /obj/item/screwdriver/nuke = 1, + /obj/item/multitool = 1, // For those who want space between the cloning console and pod. + /obj/item/language_manual/codespeak_manual/unlimited = 1, + /obj/item/implanter/radio/syndicate = 1, // So you can communicate with your clones, instead of having random evil clones roaming the halls with no direction. + /obj/item/paper/clone_guide = 1,) + generate_items_inside(items_inside, src) + +/obj/item/paper/clone_guide + name = "Clone Army User Manual" // Start and end shamelessly copied from contractor guide. I am not a good writer. This is also ugly. + default_raw_text = {"Welcome agent, thank you for purchasing the clone army kit.
\ +
    \ +
  • The "DNA data disk" inside is actually a sophisticated device that can be used to hijack an experimental cloner, giving the clones a directive they must follow.
  • \ +
  • In order to use this disk, use it in your hand, and input your desired directive, before hitting the cloner with the disk. You can input and upload a new objective to replace the old one if you ever feel like it, the disk is infinitely reusable.
  • \ +
  • The clones will be given basic access, including syndicate, maintenance, genetics, and mineral storage. They will also be given an implanted syndicate radio and automatically taught codespeak. Syndicate turrets and the like will recognize the clones as a member of the syndicate.
  • \ +
  • Be wary, the clones will have obviously evil red eyes, which will alert anyone who sees them with no eye covering that something is wrong with them. Also, don't try to use this on newer cloning models, Nanotrasen fixed the vulnerability that lets the disk work in their newer models.
  • \ +
  • When hacked, a cloner will begin to operate slower, and anyone who examines it closely will be able to see that the cloner is malfunctioning.
  • \ +
  • A tip, any activated mutations in the person being scanned, will be present in the clones produced, allowing you to give the clones some intrinsic powers. Make sure to use activators, not mutators.
  • \ +
+ Good luck agent. You can burn this document."} + #undef KIT_ITEM_CATEGORY_SUPPORT #undef KIT_ITEM_CATEGORY_WEAPONS #undef KIT_ITEM_CATEGORY_MISC diff --git a/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm b/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm deleted file mode 100644 index a2ae5b7beaaf61..00000000000000 --- a/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm +++ /dev/null @@ -1,17 +0,0 @@ -/obj/structure/closet/secure_closet/brig_physician - name = "brig physician's locker" - icon = 'monkestation/icons/obj/storage/closet.dmi' - icon_state = "brigphys" - req_access = list(ACCESS_BRIG) - - -/obj/structure/closet/secure_closet/brig_physician/PopulateContents() - ..() - - new /obj/item/flashlight/seclite(src) - new /obj/item/storage/bag/garment/brig_physician(src) - new /obj/item/storage/backpack/brig_physician(src) - new /obj/item/storage/backpack/duffelbag/sec/surgery(src) - new /obj/item/clothing/glasses/hud/health(src) - new /obj/item/healthanalyzer(src) - new /obj/item/defibrillator/loaded(src) diff --git a/monkestation/code/game/objects/structures/tables_racks.dm b/monkestation/code/game/objects/structures/tables_racks.dm index b2d9aa67c20ffe..20ac1c1152587e 100644 --- a/monkestation/code/game/objects/structures/tables_racks.dm +++ b/monkestation/code/game/objects/structures/tables_racks.dm @@ -1,7 +1,3 @@ -/obj/structure/table/optable/tablepush(mob/living/user, mob/living/pushed_mob) - . = ..() - buckle_mob(pushed_mob) - /obj/structure/table/sandstone name = "sandstone table" desc = "Woah! A sandstone TABLE!!" diff --git a/monkestation/code/modules/antagonists/contractor/items/misc.dm b/monkestation/code/modules/antagonists/contractor/items/misc.dm index 3e3c4e89a3ee96..13fa368c573d77 100644 --- a/monkestation/code/modules/antagonists/contractor/items/misc.dm +++ b/monkestation/code/modules/antagonists/contractor/items/misc.dm @@ -120,14 +120,14 @@ var/closest_turf_range = 255 if(!door_mode) for(var/turf/open/floor as anything in tracked_area_turfs) // Lets go over every turf and check their distances for the closest tile - if(get_dist_euclidean(pinpointer_turf, floor) < closest_turf_range) - closest_turf_range = get_dist_euclidean(pinpointer_turf, floor) + if(get_dist_euclidian(pinpointer_turf, floor) < closest_turf_range) + closest_turf_range = get_dist_euclidian(pinpointer_turf, floor) closest_turf = floor else // if door_mode is TRUE, we instead want to track the nearest airlock instead of all turfs for(var/turf/open/floor as anything in door_turfs) // Lets go over every door and check their distances for the closest tile - if(get_dist_euclidean(pinpointer_turf, floor) < closest_turf_range) - closest_turf_range = get_dist_euclidean(pinpointer_turf, floor) + if(get_dist_euclidian(pinpointer_turf, floor) < closest_turf_range) + closest_turf_range = get_dist_euclidian(pinpointer_turf, floor) closest_turf = floor target = closest_turf diff --git a/monkestation/code/modules/antagonists/evil_clone/evil_clone.dm b/monkestation/code/modules/antagonists/evil_clone/evil_clone.dm new file mode 100644 index 00000000000000..a3b4bc9591db85 --- /dev/null +++ b/monkestation/code/modules/antagonists/evil_clone/evil_clone.dm @@ -0,0 +1,23 @@ +/datum/antagonist/evil_clone + name = "\improper Evil Clone" + show_in_antagpanel = TRUE + roundend_category = "evil clones" + antagpanel_category = "Evil Clones" + show_name_in_check_antagonists = TRUE + show_to_ghosts = TRUE + +/datum/antagonist/evil_clone/greet() + . = ..() + owner.announce_objectives() + owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/revolutionary_tide.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE) + +/datum/antagonist/evil_clone/apply_innate_effects(mob/living/mob_override) + . = ..() + var/mob/living/current = owner.current + current.AddElement(/datum/element/cult_eyes, initial_delay = 0 SECONDS) + +/datum/antagonist/evil_clone/remove_innate_effects(mob/living/mob_override) + . = ..() + var/mob/living/current = owner.current + if (HAS_TRAIT(current, TRAIT_UNNATURAL_RED_GLOWY_EYES)) + current.RemoveElement(/datum/element/cult_eyes) diff --git a/monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm b/monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm new file mode 100644 index 00000000000000..88aa241e4453c2 --- /dev/null +++ b/monkestation/code/modules/antagonists/evil_clone/evil_clone_objective.dm @@ -0,0 +1,38 @@ +/datum/objective/evil_clone/murder // The existance of the murderbone objective makes evil clones properly feared, so even when they aren't murderboning they will still be shunned and persecuted. + name = "clone supremacy" + explanation_text = "Make sure clones of yourself are the only ones alive. Do not spare the original." + +/datum/objective/evil_clone/sole + name = "real one" + explanation_text = "All other versions of you are imposters, eliminate them." + +/datum/objective/evil_clone/rule + name = "rightful rule" + explanation_text = "You and your fellow clones of yourself are the rightful rulers of the station, take control." + +/datum/objective/evil_clone/minion + name = "minion" + explanation_text = "Find the most evil being you can, and become their minion." + +/datum/objective/evil_clone/dud // Relies on more destructive objectives, to create conflict from crew hating evil clones because they MIGHT have a more evil objective. + name = "peaceful clone" + explanation_text = "You find it really mean that some people don't like you because of your red eyes." + +/datum/objective/evil_clone/tide + name = "tider" + explanation_text = "Crime is your religion, commit as much crime as possible. Only seriously injure people if they try to stop crime." + +/datum/objective/evil_clone/fake_cult + name = "fake cultist" + explanation_text = "Praise" + +/datum/objective/evil_clone/fake_cult/New() + var/god = pick(list("Rat'var", "Nar'sie")) //So clones with different gods will fight eachother. + explanation_text+=" [god]! They haven't answered your prayers yet, but surely if you pray enough and make elaborate enough rituals they will inevitably come. Make sure no heretical religions prosper." + +/datum/objective/evil_clone/territorial + name = "territorial" + explanation_text = "The clonepod which created you is a holy site only you and your fellow clones of yourself are worthy to be in the presence of. Secure the area around the clonepod and ensure no non-clones threaten it." + +/datum/objective/evil_clone/check_completion() + return TRUE diff --git a/monkestation/code/modules/antagonists/evil_clone/evil_event.dm b/monkestation/code/modules/antagonists/evil_clone/evil_event.dm new file mode 100644 index 00000000000000..10d5b481d9ccf6 --- /dev/null +++ b/monkestation/code/modules/antagonists/evil_clone/evil_event.dm @@ -0,0 +1,19 @@ +/datum/round_event_control/cloner_corruption + name = "Experimental Cloner Corruption" + typepath = /datum/round_event/cloner_corruption + max_occurrences = 1 + weight = 3 + category = EVENT_CATEGORY_ENTITIES //Kinda, evil clones ARE entities. + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMBAT) // Clones will likely start a fight, but will usually not cause wanton destruction. + earliest_start = 35 MINUTES //This requires an experimental cloner to be made, so should wait until later to fire when there's better chance one has been set up. + +/datum/round_event/cloner_corruption/start() + var/found = FALSE + for(var/obj/machinery/clonepod/experimental/cloner in GLOB.machines) + if(!cloner.locked) + cloner.evil_objective = pick(subtypesof(/datum/objective/evil_clone)) + cloner.RefreshParts() + found = TRUE + if(!found) // Refund if no experimental cloners are found. + control.occurrences-- diff --git a/monkestation/code/modules/blueshift/benos/beno_types/rouny.dm b/monkestation/code/modules/blueshift/benos/beno_types/rouny.dm index bd39d44da8f509..0d1e4af8ec5ec8 100644 --- a/monkestation/code/modules/blueshift/benos/beno_types/rouny.dm +++ b/monkestation/code/modules/blueshift/benos/beno_types/rouny.dm @@ -25,10 +25,6 @@ add_movespeed_modifier(/datum/movespeed_modifier/alien_quick) -/mob/living/carbon/alien/adult/nova/runner/Destroy() - QDEL_NULL(evade_ability) - return ..() - /mob/living/carbon/alien/adult/nova/runner/create_internal_organs() organs += new /obj/item/organ/internal/alien/plasmavessel/small/tiny ..() diff --git a/monkestation/code/modules/blueshift/components/cell_component.dm b/monkestation/code/modules/blueshift/components/cell_component.dm index eec1cd115e966e..9a4522c17d945f 100644 --- a/monkestation/code/modules/blueshift/components/cell_component.dm +++ b/monkestation/code/modules/blueshift/components/cell_component.dm @@ -87,7 +87,8 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) /datum/component/cell/Destroy(force, silent) - on_cell_removed = null + if(on_cell_removed) + on_cell_removed = null if(inserted_cell) if(!inside_robot) //We really don't want to be deleting the robot's cell. QDEL_NULL(inserted_cell) diff --git a/monkestation/code/modules/blueshift/components/wall_mounted.dm b/monkestation/code/modules/blueshift/components/wall_mounted.dm index 49032e71db95c5..1ed4632c5a6581 100644 --- a/monkestation/code/modules/blueshift/components/wall_mounted.dm +++ b/monkestation/code/modules/blueshift/components/wall_mounted.dm @@ -15,10 +15,6 @@ hanging_wall_turf = target_wall on_drop = on_drop_callback -/datum/component/wall_mounted/Destroy(force, silent) - on_drop = null - return ..() - /datum/component/wall_mounted/RegisterWithParent() ADD_TRAIT(parent, TRAIT_WALLMOUNTED, REF(src)) RegisterSignal(hanging_wall_turf, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) diff --git a/monkestation/code/modules/blueshift/machines/ore_silo.dm b/monkestation/code/modules/blueshift/machines/ore_silo.dm index 490c89ce06a6bf..9763c882630716 100644 --- a/monkestation/code/modules/blueshift/machines/ore_silo.dm +++ b/monkestation/code/modules/blueshift/machines/ore_silo.dm @@ -7,13 +7,10 @@ /// What this packs into var/packed_type = /obj/item/flatpacked_machine/ore_silo -/obj/machinery/ore_silo/colony_lathe/Initialize(mapload) - . = ..() - AddElement(/datum/element/repackable, packed_type, 10 SECONDS) - /obj/machinery/ore_silo/colony_lathe/silo_log(obj/machinery/machinery_in_question, action, amount, noun, list/mats) . = ..() playsound(src, 'sound/machines/beep.ogg', 30, TRUE) + AddElement(/datum/element/repackable, packed_type, 10 SECONDS) /obj/machinery/ore_silo/colony_lathe/default_deconstruction_crowbar() return diff --git a/monkestation/code/modules/blueshift/mobs/soulcatcher.dm b/monkestation/code/modules/blueshift/mobs/soulcatcher.dm index d019b18b94cf4f..6f5195c12799fe 100644 --- a/monkestation/code/modules/blueshift/mobs/soulcatcher.dm +++ b/monkestation/code/modules/blueshift/mobs/soulcatcher.dm @@ -124,7 +124,7 @@ datum/saymode/saymode, list/message_mods = list(), ) - message = capitalize(trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))) + message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)) if(!message || message == "") return diff --git a/monkestation/code/modules/botany/new_seeds/seeds.dm b/monkestation/code/modules/botany/new_seeds/seeds.dm index d54ec1d4d37ad2..e1fb666b909ee4 100644 --- a/monkestation/code/modules/botany/new_seeds/seeds.dm +++ b/monkestation/code/modules/botany/new_seeds/seeds.dm @@ -12,7 +12,7 @@ endurance = 50 maturation = 15 production = 5 - yield = 50 + yield = 5 plant_icon_offset = 0 growing_icon = 'goon/icons/obj/hydroponics/plants_crop.dmi' @@ -52,7 +52,7 @@ icon_grow = "TreeCash-G" possible_mutations = list() - genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/seedless) + genes = list(/datum/plant_gene/trait/repeated_harvest) product = /obj/item/stack/spacecash/c10 /obj/item/seeds/tree/steel diff --git a/monkestation/code/modules/cargo/packs/engineering.dm b/monkestation/code/modules/cargo/packs/engineering.dm index ec20454ac8a92c..204dc92b3d324e 100644 --- a/monkestation/code/modules/cargo/packs/engineering.dm +++ b/monkestation/code/modules/cargo/packs/engineering.dm @@ -1,12 +1,3 @@ /datum/supply_pack/engineering/shield_sat - name = "Hard-Kill Meteor Protection Satellites" - desc = "Contains a 5 pack of HK-MPS capsules, which can be deployed into a full meteor defense satellite." - special = FALSE access_view = ACCESS_ENGINEERING contains = list(/obj/item/meteor_shield_capsule = 5) - -/datum/supply_pack/engineering/shield_sat_control - name = "Hard-Kill Meteor Protection System Control Board" - desc = "A control system for HK-MPS satellites." - special = FALSE - access_view = ACCESS_ENGINEERING diff --git a/monkestation/code/modules/cassettes/machines/cassette_rack.dm b/monkestation/code/modules/cassettes/machines/cassette_rack.dm index 1b9141d52237c5..3d3ef21aaebd1f 100644 --- a/monkestation/code/modules/cassettes/machines/cassette_rack.dm +++ b/monkestation/code/modules/cassettes/machines/cassette_rack.dm @@ -47,7 +47,6 @@ /obj/structure/cassette_rack/prefilled/Initialize(mapload) . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) for(var/i in 1 to spawn_blanks) new /obj/item/device/cassette_tape/blank(src) for(var/id in unique_random_tapes(spawn_random)) diff --git a/monkestation/code/modules/cassettes/machines/dj_station.dm b/monkestation/code/modules/cassettes/machines/dj_station.dm index 67ac5075633cb3..c0e6155c2b6d5a 100644 --- a/monkestation/code/modules/cassettes/machines/dj_station.dm +++ b/monkestation/code/modules/cassettes/machines/dj_station.dm @@ -35,7 +35,6 @@ GLOBAL_VAR(dj_booth) /obj/machinery/cassette/dj_station/Initialize(mapload) . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) GLOB.dj_booth = src register_context() diff --git a/monkestation/code/modules/cassettes/machines/postbox.dm b/monkestation/code/modules/cassettes/machines/postbox.dm index 14d5c7eb06607a..5d066a6843cee6 100644 --- a/monkestation/code/modules/cassettes/machines/postbox.dm +++ b/monkestation/code/modules/cassettes/machines/postbox.dm @@ -10,10 +10,6 @@ anchored = TRUE density = TRUE -/obj/machinery/cassette/mailbox/Initialize(mapload) - . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) - /obj/machinery/cassette/mailbox/attackby(obj/item/weapon, mob/user, params) if(!istype(weapon, /obj/item/device/cassette_tape) || !user.client) diff --git a/monkestation/code/modules/cassettes/machines/radio_mic.dm b/monkestation/code/modules/cassettes/machines/radio_mic.dm index 75ecbcdc7994f5..1e933ab7943d2a 100644 --- a/monkestation/code/modules/cassettes/machines/radio_mic.dm +++ b/monkestation/code/modules/cassettes/machines/radio_mic.dm @@ -25,8 +25,6 @@ /obj/item/radio/radio_mic/Initialize(mapload) . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) - frequency = FREQ_RADIO broadcasting = TRUE use_command = TRUE diff --git a/monkestation/code/modules/cassettes/machines/stationary_mixer.dm b/monkestation/code/modules/cassettes/machines/stationary_mixer.dm index 7bd3e0e6b13a68..71ce7031dbd08a 100644 --- a/monkestation/code/modules/cassettes/machines/stationary_mixer.dm +++ b/monkestation/code/modules/cassettes/machines/stationary_mixer.dm @@ -10,10 +10,6 @@ ///Selection used to remove songs var/selection -/obj/machinery/cassette/adv_cassette_deck/Initialize(mapload) - . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) - /obj/machinery/cassette/adv_cassette_deck/wrench_act(mob/living/user, obj/item/wrench) ..() default_unfasten_wrench(user, wrench, 15) diff --git a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm index 80b731f703090a..2ad3e7a4f20095 100644 --- a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm +++ b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm @@ -68,22 +68,12 @@ "Rancher", ) -/datum/job/brig_physician - alt_titles = list( - "Jail Doctor", - "Brig Orderly", - "Prison Medic", - "Chief Tickler", - "Navy Corpsman", - ) - /datum/job/captain alt_titles = list( "Captain", "Station Commander", "Commanding Officer", "Site Manager", - "Criminally Underpaid Babysitter", ) /datum/job/cargo_technician diff --git a/monkestation/code/modules/clothing/jobs/brig_physician.dm b/monkestation/code/modules/clothing/jobs/brig_physician.dm deleted file mode 100644 index 5aacbace4da7dc..00000000000000 --- a/monkestation/code/modules/clothing/jobs/brig_physician.dm +++ /dev/null @@ -1,99 +0,0 @@ -/obj/item/clothing/under/rank/security/brig_physician - desc = "A formerly retired security uniform pattern now brought back for those working the medical profession in the security apparatus." - name = "brig physician's jumpsuit" - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "brigphys" - inhand_icon_state = "gy_suit" - -/obj/item/clothing/under/rank/security/brig_physician/skirt - name = "brig physician's jumpskirt" - desc = "A formerly retired security uniform pattern now brought back for those working the medical profession in the security apparatus." - icon_state = "brigphys_skirt" - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - inhand_icon_state = "gy_suit" - body_parts_covered = CHEST|GROIN|ARMS - dying_key = DYE_REGISTRY_JUMPSKIRT - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/under/rank/security/scrubs/sec - armor_type = /datum/armor/rank_medical - name = "brig physician's security scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in security red." - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "scrubssec" - -/obj/item/clothing/head/utility/surgerycap/sec - name = "security surgical cap" - desc = "A security red medical surgery cap to prevent suspects from grabbing their doctor." - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "surgicalcapsec" - -/obj/item/clothing/under/plasmaman/brig_physician - desc = "A new pattern plasmaman suit for those qualified as a brig physician." - name = "brig physician's envirosuit" - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "brigphys_envirosuit" - -/obj/item/clothing/head/helmet/space/plasmaman/brig_physician - desc = "A new pattern plasmaman helmet for those qualified as a brig physician. This is still EVA rated too!" - name = "brig physician's envirosuit helmet" - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "brigphys_envirohelm" - -/obj/item/clothing/gloves/color/plasmaman/brig_physician - desc = "A new pattern plasmaman glove set to match that drippy security grey suit." - name = "brig physician's envirogloves" - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "brigphysplasma" - greyscale_colors = "#918F8C" - -/obj/item/clothing/suit/toggle/labcoat/brig_physician - name = "brig physician's labcoat" - desc = "A formerly retired labcoat pattern now brought back for those working the medical profession in the security apparatus." - icon_state = "labcoat_brigphys" - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - -/obj/item/storage/backpack/brig_physician - name = "brig physician's backpack" - desc = "You wear this on your back and put items into it." - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "backpack-brigphys" - inhand_icon_state = "backpack-brigphys" - lefthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi' - righthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi' - -/obj/item/storage/backpack/satchel/brig_physician - name = "brig physician's satchel" - desc = "You wear this on your back and put items into it." - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "satchel-brigphys" - inhand_icon_state = "satchel-brigphys" - lefthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi' - righthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi' - -/obj/item/storage/backpack/duffelbag/brig_physician - name = "brig physician's duffelbag" - desc = "You wear this on your back and put items into it." - icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' - worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' - icon_state = "duffel-brigphys" - inhand_icon_state = "duffel-brigphys" - lefthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi' - righthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi' - -/obj/item/clothing/shoes/sneakers/secred - name = "security red sneakers" - desc = "A nice set of sneakers in security red. These even have the custom fabric used by medical white! Sweet!" - armor_type = /datum/armor/sneakers_white - greyscale_colors = "#a52f29#918f8c" diff --git a/monkestation/code/modules/cryopods/_cryopod.dm b/monkestation/code/modules/cryopods/_cryopod.dm index 3c85fe48b6f48f..4ea563ea72a775 100644 --- a/monkestation/code/modules/cryopods/_cryopod.dm +++ b/monkestation/code/modules/cryopods/_cryopod.dm @@ -180,7 +180,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) /obj/machinery/cryopod/Initialize(mapload) ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) if(!quiet) GLOB.valid_cryopods += src return INITIALIZE_HINT_LATELOAD //Gotta populate the cryopod computer GLOB first diff --git a/monkestation/code/modules/cybernetics/augments/_base_changes.dm b/monkestation/code/modules/cybernetics/augments/_base_changes.dm index 1872722458b7f2..b4efe1b015178a 100644 --- a/monkestation/code/modules/cybernetics/augments/_base_changes.dm +++ b/monkestation/code/modules/cybernetics/augments/_base_changes.dm @@ -82,19 +82,16 @@ add_to_limb(ownerlimb) /obj/item/organ/internal/cyberimp/add_to_limb(obj/item/bodypart/bodypart) + bodypart_overlay = new bodypart_overlay() + bodypart_overlay.unique_properties(src) ownerlimb = bodypart - var/bodypart_overlay_path = src::bodypart_overlay - if(ispath(bodypart_overlay_path)) - bodypart_overlay = new bodypart_overlay_path - bodypart_overlay.unique_properties(src) - ownerlimb.add_bodypart_overlay(bodypart_overlay) + ownerlimb.add_bodypart_overlay(bodypart_overlay) owner.update_body_parts() return ..() /obj/item/organ/internal/cyberimp/remove_from_limb() - if(istype(bodypart_overlay)) - ownerlimb.remove_bodypart_overlay(bodypart_overlay) - QDEL_NULL(bodypart_overlay) + ownerlimb.remove_bodypart_overlay(bodypart_overlay) + QDEL_NULL(bodypart_overlay) ownerlimb = null owner.update_body_parts() return ..() diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index 92c23300dac310..1d35e5a15d5058 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -469,12 +469,6 @@ donator_only = TRUE requires_purchase = FALSE -/datum/loadout_item/toys/elliethedarksunplush - name = "Ellie plush" - item_path = /obj/item/toy/plush/elliethedarksun - donator_only = TRUE - requires_purchase = FALSE - //ThePooba /datum/loadout_item/mask/poob_mask name = "Yellow gas mask" @@ -508,10 +502,3 @@ item_path = /obj/item/toy/plush/cowlephant donator_only = TRUE requires_purchase = FALSE - -//av4l0n -/datum/loadout_item/toys/sheep_plush_av4l0n - name = "Sheep Plush" - item_path = /obj/item/clothing/head/sheep_plush_av4l0n - donator_only = TRUE - requires_purchase = FALSE diff --git a/monkestation/code/modules/donator/code/item/plush.dm b/monkestation/code/modules/donator/code/item/plush.dm index 64b2a39370dac2..0447c483f136a0 100644 --- a/monkestation/code/modules/donator/code/item/plush.dm +++ b/monkestation/code/modules/donator/code/item/plush.dm @@ -112,24 +112,3 @@ desc = "A plush of a Cowlephant ~Handcrafted lovingly for Raziaar" icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' icon_state = "cowlephant" - -/obj/item/toy/plush/elliethedarksun - name = "ellie plush" - desc = "A plush of a crewmember named Ellie! ~Handcrafted lovingly for elliethedarksun (must be an alias for something..)" - icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' - icon_state = "elliethedarksun" - squeak_override = list('monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-1.ogg'=1,'monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-2.ogg'=1,'monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-3.ogg'=1) - -/obj/item/clothing/head/sheep_plush_av4l0n - name = "sheep plushie" - desc = "What a silly little guy." - attack_verb_continuous = list("thumps", "whomps", "bumps") - attack_verb_simple = list("thump", "whomp", "bump") - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE - icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' - worn_icon = 'monkestation/code/modules/donator/icons/mob/plushes.dmi' - icon_state = "av4l0n_sheep" - inhand_icon_state = "av4l0n_sheep" - lefthand_file = 'monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_left.dmi' - righthand_file = 'monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_right.dmi' diff --git a/monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_left.dmi b/monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_left.dmi deleted file mode 100644 index 530025d6856657..00000000000000 Binary files a/monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_left.dmi and /dev/null differ diff --git a/monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_right.dmi b/monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_right.dmi deleted file mode 100644 index 0d0c32c433758d..00000000000000 Binary files a/monkestation/code/modules/donator/icons/mob/inhands/plushes_inhand_right.dmi and /dev/null differ diff --git a/monkestation/code/modules/donator/icons/mob/plushes.dmi b/monkestation/code/modules/donator/icons/mob/plushes.dmi deleted file mode 100644 index 53c9b699ebf2a2..00000000000000 Binary files a/monkestation/code/modules/donator/icons/mob/plushes.dmi and /dev/null differ diff --git a/monkestation/code/modules/donator/icons/obj/plushes.dmi b/monkestation/code/modules/donator/icons/obj/plushes.dmi index 979d4c381c1f39..e1036c599cab4b 100644 Binary files a/monkestation/code/modules/donator/icons/obj/plushes.dmi and b/monkestation/code/modules/donator/icons/obj/plushes.dmi differ diff --git a/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-1.ogg b/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-1.ogg deleted file mode 100644 index aa19b91b8568b5..00000000000000 Binary files a/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-1.ogg and /dev/null differ diff --git a/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-2.ogg b/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-2.ogg deleted file mode 100644 index 1eef1590c2649e..00000000000000 Binary files a/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-2.ogg and /dev/null differ diff --git a/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-3.ogg b/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-3.ogg deleted file mode 100644 index 87459e6cbe2690..00000000000000 Binary files a/monkestation/code/modules/donator/sounds/elliethedarksunPlushSqueak-3.ogg and /dev/null differ diff --git a/monkestation/code/modules/holomaps/icons/8x8.dmi b/monkestation/code/modules/holomaps/icons/8x8.dmi index 8e98b1dbe56ba5..ac8687dc1fcec8 100644 Binary files a/monkestation/code/modules/holomaps/icons/8x8.dmi and b/monkestation/code/modules/holomaps/icons/8x8.dmi differ diff --git a/monkestation/code/modules/holomaps/machinery.dm b/monkestation/code/modules/holomaps/machinery.dm index 9204f8c77b3ad8..428df2f604409b 100644 --- a/monkestation/code/modules/holomaps/machinery.dm +++ b/monkestation/code/modules/holomaps/machinery.dm @@ -269,12 +269,9 @@ icon_state = "station_map_engi" circuit = /obj/item/circuitboard/machine/station_map/engineering -/obj/machinery/station_map/engineering/Initialize(mapload) - . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) - /obj/machinery/station_map/engineering/attack_hand(mob/user) . = ..() + if(.) holomap_datum.update_map(handle_overlays()) @@ -294,20 +291,6 @@ if(length(fire_alarms)) extra_overlays["Fire Alarms"] = list("icon" = image('monkestation/code/modules/holomaps/icons/8x8.dmi', icon_state = "fire_marker"), "markers" = fire_alarms) - if(length(GLOB.meteor_shielded_turfs)) - var/icon/canvas = icon(HOLOMAP_ICON, "blank") - var/z_has_coverage = FALSE - for(var/turf/open/shielded_turf as anything in GLOB.meteor_shielded_turfs) - if(shielded_turf?.z != current_z_level) - continue - var/offset_x = HOLOMAP_CENTER_X + shielded_turf.x - var/offset_y = HOLOMAP_CENTER_Y + shielded_turf.y - var/color = ((offset_x ^ offset_y) % 2 == 0) ? HOLOMAP_AREACOLOR_SHIELD_1 : HOLOMAP_AREACOLOR_SHIELD_2 - canvas.DrawBox(color, offset_x, offset_y) - z_has_coverage = TRUE - if(z_has_coverage) - extra_overlays["Meteor Shield"] = list("icon" = image('monkestation/code/modules/holomaps/icons/8x8.dmi', icon_state = "meteor_shield"), "markers" = list(image(canvas))) - /* var/list/air_alarms = list() for(var/obj/machinery/airalarm/air_alarm in GLOB.machines) diff --git a/monkestation/code/modules/hydroponics/machines/composter.dm b/monkestation/code/modules/hydroponics/machines/composter.dm index c313e24f47dd42..9cb68fa0bddcbb 100644 --- a/monkestation/code/modules/hydroponics/machines/composter.dm +++ b/monkestation/code/modules/hydroponics/machines/composter.dm @@ -91,7 +91,7 @@ biomatter_added++ qdel(composter) else if(istype(composter, /obj/item/food)) - biomatter_added += 5 + biomatter_added += 4 qdel(composter) else if(istype(composter, /mob/living/carbon) && allow_carbons) var/mob/living/carbon/carbon_target = composter diff --git a/monkestation/code/modules/jobs/job_types/brig_physician.dm b/monkestation/code/modules/jobs/job_types/brig_physician.dm deleted file mode 100644 index 3865969ff26f07..00000000000000 --- a/monkestation/code/modules/jobs/job_types/brig_physician.dm +++ /dev/null @@ -1,71 +0,0 @@ -/datum/job/brig_physician - title = JOB_BRIG_PHYSICIAN - description = "Stitch up security, prisoners, sometimes the crew." - auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY - department_head = list(JOB_HEAD_OF_SECURITY) - faction = FACTION_STATION - total_positions = 1 - spawn_positions = 1 - supervisors = SUPERVISOR_HOS - exp_granted_type = EXP_TYPE_CREW - config_tag = "BRIG_PHYSICIAN" - - outfit = /datum/outfit/job/brig_physician - plasmaman_outfit = /datum/outfit/plasmaman/security - - paycheck = PAYCHECK_CREW - paycheck_department = ACCOUNT_SEC - - liver_traits = list(TRAIT_MEDICAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_BRIG_PHYSICIAN - bounty_types = CIV_JOB_MED - departments_list = list( - /datum/job_department/security, - ) - - family_heirlooms = list(/obj/item/storage/medkit/ancient/heirloom, /obj/item/scalpel, /obj/item/hemostat, /obj/item/circular_saw, /obj/item/retractor, /obj/item/cautery) - - mail_goodies = list( - /obj/item/healthanalyzer/advanced = 15, - /obj/item/scalpel/advanced = 6, - /obj/item/retractor/advanced = 6, - /obj/item/cautery/advanced = 6, - /obj/item/reagent_containers/cup/bottle/formaldehyde = 6, - /obj/effect/spawner/random/medical/organs = 5, - /obj/effect/spawner/random/medical/memeorgans = 1 - ) - rpg_title = "Chirurgeon" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN - - -/datum/outfit/job/brig_physician - name = "Brig Physician" - jobtype = /datum/job/brig_physician - - id_trim = /datum/id_trim/job/brig_physician - uniform = /obj/item/clothing/under/rank/security/scrubs/sec - suit = /obj/item/clothing/suit/toggle/labcoat/brig_physician - suit_store = /obj/item/flashlight/pen - belt = /obj/item/modular_computer/pda/security - ears = /obj/item/radio/headset/headset_secmed - head = /obj/item/clothing/head/utility/surgerycap/sec - shoes = /obj/item/clothing/shoes/sneakers/secred - l_hand = /obj/item/storage/medkit/surgery - - backpack = /obj/item/storage/backpack/brig_physician - satchel = /obj/item/storage/backpack/satchel/brig_physician - duffelbag = /obj/item/storage/backpack/duffelbag/brig_physician - - box = /obj/item/storage/box/survival/medical - chameleon_extras = /obj/item/gun/syringe - skillchips = list(/obj/item/skillchip/entrails_reader) - implants = list(/obj/item/implant/mindshield) - -/datum/outfit/plasmaman/brig_physician - name = "Brig Physician Plasmaman" - - uniform = /obj/item/clothing/under/plasmaman/brig_physician - gloves = /obj/item/clothing/gloves/color/plasmaman/brig_physician - head = /obj/item/clothing/head/helmet/space/plasmaman/brig_physician - diff --git a/monkestation/code/modules/liquids/liquid_barrier.dm b/monkestation/code/modules/liquids/liquid_barrier.dm deleted file mode 100644 index d2dd4809be093c..00000000000000 --- a/monkestation/code/modules/liquids/liquid_barrier.dm +++ /dev/null @@ -1,25 +0,0 @@ -/obj/structure/liquid_barrier - name = "liquid barrier" - desc = "A complex draining mesh embedded in the flooring that blocks any and all liquids from passing through.\nYou feel like these were installed for a very good reason..." - icon = 'monkestation/icons/obj/structures/drains.dmi' - icon_state = "bigdrain" - plane = FLOOR_PLANE - layer = GAS_SCRUBBER_LAYER - density = FALSE - anchored = TRUE - move_resist = INFINITY - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - -/obj/structure/liquid_barrier/Initialize(mapload) - . = ..() - if(mapload && !isfloorturf(loc)) - log_mapping("[src] mapped onto a non-floor turf at [AREACOORD(src)]!") - var/static/list/loc_connections = list( - COMSIG_TURF_LIQUIDS_CREATION = PROC_REF(on_liquid_creation), - ) - AddElement(/datum/element/connect_loc, loc_connections) - AddElement(/datum/element/give_turf_traits, string_list(list(TRAIT_BLOCK_LIQUID_SPREAD))) - -/obj/structure/liquid_barrier/proc/on_liquid_creation(datum/source) - SIGNAL_HANDLER - return BLOCK_LIQUID_CREATION diff --git a/monkestation/code/modules/liquids/liquid_effect.dm b/monkestation/code/modules/liquids/liquid_effect.dm index 306b44a11739bd..9e1e8324791fcf 100644 --- a/monkestation/code/modules/liquids/liquid_effect.dm +++ b/monkestation/code/modules/liquids/liquid_effect.dm @@ -200,8 +200,7 @@ RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall)) RegisterSignal(my_turf, COMSIG_ATOM_EXAMINE, PROC_REF(examine_turf)) - if(SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src) & BLOCK_LIQUID_CREATION) - return INITIALIZE_HINT_QDEL + SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src) if(z) QUEUE_SMOOTH(src) diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm index aaa3a2f2c5bdfb..93b81a9e5744cb 100644 --- a/monkestation/code/modules/liquids/liquid_groups.dm +++ b/monkestation/code/modules/liquids/liquid_groups.dm @@ -895,8 +895,6 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) /datum/liquid_group/proc/spread_liquid(turf/new_turf, turf/source_turf) if(isclosedturf(new_turf) || !source_turf.atmos_adjacent_turfs) return - if(HAS_TRAIT(new_turf, TRAIT_BLOCK_LIQUID_SPREAD)) - return if(!(new_turf in source_turf.atmos_adjacent_turfs)) //i hate that this is needed return if(!source_turf.atmos_adjacent_turfs[new_turf]) @@ -906,7 +904,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) var/turf/Z_turf_below = GET_TURF_BELOW(new_turf) if(!Z_turf_below) return - if(isspaceturf(Z_turf_below) || HAS_TRAIT(Z_turf_below, TRAIT_BLOCK_LIQUID_SPREAD)) + if(isspaceturf(Z_turf_below)) return FALSE if(QDELETED(Z_turf_below.liquids)) Z_turf_below.liquids = new(Z_turf_below) diff --git a/monkestation/code/modules/liquids/liquid_interaction.dm b/monkestation/code/modules/liquids/liquid_interaction.dm index e9b725047a8533..0a43b0c9f51255 100644 --- a/monkestation/code/modules/liquids/liquid_interaction.dm +++ b/monkestation/code/modules/liquids/liquid_interaction.dm @@ -11,10 +11,6 @@ interaction_callback = CALLBACK(parent, on_interaction_callback) -/datum/component/liquids_interaction/Destroy(force, silent) - interaction_callback = null - return ..() - /datum/component/liquids_interaction/RegisterWithParent() RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(AfterAttack)) //The only signal allowing item -> turf interaction diff --git a/monkestation/code/modules/loadouts/items/neck.dm b/monkestation/code/modules/loadouts/items/neck.dm index 983b4245e2a86e..a501441c3d3532 100644 --- a/monkestation/code/modules/loadouts/items/neck.dm +++ b/monkestation/code/modules/loadouts/items/neck.dm @@ -207,116 +207,3 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck) name = "Hornet Cloak" item_path = /obj/item/clothing/neck/hornetcloak -/// EVERYTHING NOVA RELATED - -/datum/loadout_item/neck/gags_cloak //BUYABLE - name = "Colourable Cloak" - item_path = /obj/item/clothing/neck/cloak/colourable - -/datum/loadout_item/neck/gags_veil //BUYABLE - name = "Colourable Veil" - item_path = /obj/item/clothing/neck/cloak/colourable/veil - -/datum/loadout_item/neck/gags_shroud //BUYABLE - name = "Colourable Shroud" - item_path = /obj/item/clothing/neck/cloak/colourable/shroud - -/datum/loadout_item/neck/gags_mantle //BUYABLE - name = "Colourable Mantle" - item_path = /obj/item/clothing/neck/mantle/recolorable - -/datum/loadout_item/neck/long_cape //BUYABLE - name = "Long Colourable Cape" - item_path = /obj/item/clothing/neck/long_cape - -/datum/loadout_item/neck/wide_cape //BUYABLE - name = "Wide Colourable Cape" - item_path = /obj/item/clothing/neck/wide_cape - -/datum/loadout_item/neck/robe_cape //BUYABLE - name = "Robed Colourable Cape" - item_path = /obj/item/clothing/neck/robe_cape - -/datum/loadout_item/neck/maid_neck_cover //BUYABLE - name = "Colourable Maid Neck Cover" - item_path = /obj/item/clothing/neck/maid_neck_cover - -/datum/loadout_item/neck/face_scarf //BUYABLE - name = "Colourable Face Scarf" - item_path = /obj/item/clothing/neck/face_scarf - -/* -* MANTLES -*/ - -/datum/loadout_item/neck/mantle //BUYABLE - name = "Mantle" - item_path = /obj/item/clothing/neck/mantle - -/datum/loadout_item/neck/mantle_qm - name = "Quartermaster's Mantle" - item_path = /obj/item/clothing/neck/mantle/qm - restricted_roles = list(JOB_QUARTERMASTER) - requires_purchase = FALSE - -/datum/loadout_item/neck/mantle_hop - name = "Head of Personnel's Mantle" - item_path = /obj/item/clothing/neck/mantle/hopmantle - restricted_roles = list(JOB_HEAD_OF_PERSONNEL) - requires_purchase = FALSE - -/datum/loadout_item/neck/mantle_cmo - name = "Chief Medical Officer's Mantle" - item_path = /obj/item/clothing/neck/mantle/cmomantle - restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER) - requires_purchase = FALSE - -/datum/loadout_item/neck/mantle_rd - name = "Research Director's Mantle" - item_path = /obj/item/clothing/neck/mantle/rdmantle - restricted_roles = list(JOB_RESEARCH_DIRECTOR) - requires_purchase = FALSE - -/datum/loadout_item/neck/mantle_ce - name = "Chief Engineer's Mantle" - item_path = /obj/item/clothing/neck/mantle/cemantle - restricted_roles = list(JOB_CHIEF_ENGINEER) - requires_purchase = FALSE - -/datum/loadout_item/neck/mantle_hos - name = "Head of Security's Mantle" - item_path = /obj/item/clothing/neck/mantle/hosmantle - restricted_roles = list(JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/* -/datum/loadout_item/neck/mantle_bs - name = "Blueshield's Mantle" - item_path = /obj/item/clothing/neck/mantle/bsmantle - restricted_roles = list(JOB_BLUESHIELD) -*/ -/datum/loadout_item/neck/mantle_cap - name = "Captain's Mantle" - item_path = /obj/item/clothing/neck/mantle/capmantle - restricted_roles = list(JOB_CAPTAIN) - requires_purchase = FALSE - -/datum/loadout_item/neck/mantle_chap - name = "Bishop's Cloak" - item_path = /obj/item/clothing/neck/chaplain - restricted_roles = list(JOB_CHAPLAIN) - requires_purchase = FALSE - -/datum/loadout_item/neck/mantle_bchap - name = "Bishop's Cloak (Black)" - item_path = /obj/item/clothing/neck/chaplain/black - restricted_roles = list(JOB_CHAPLAIN) - requires_purchase = FALSE - -/* -* MISC -*/ - -/datum/loadout_item/neck/imperial_police_cloak //BUYABLE - name = "Imperial Police Cloak" - item_path = /obj/item/clothing/neck/cloak/colonial/nri_police diff --git a/monkestation/code/modules/loadouts/items/shoes.dm b/monkestation/code/modules/loadouts/items/shoes.dm index 639e61ba501ce8..e01e4c767ffd6d 100644 --- a/monkestation/code/modules/loadouts/items/shoes.dm +++ b/monkestation/code/modules/loadouts/items/shoes.dm @@ -154,50 +154,3 @@ GLOBAL_LIST_INIT(loadout_shoes, generate_loadout_items(/datum/loadout_item/shoes /datum/loadout_item/shoes/donator/rainbow name = "Rainbow Converse" item_path = /obj/item/clothing/shoes/sneakers/rainbow - -/// EVERYTHING NOVA RELATED -//NOTES -//Glass will fuck you up if you're wearing wraps - -//Not adding everything as we already got simillar stuff - Knight - -/datum/loadout_item/shoes/nova/jackboots/recolorable - name = "Recolorable Jackboots" - item_path = /obj/item/clothing/shoes/jackboots/recolorable - requires_purchase = FALSE - -/datum/loadout_item/shoes/nova/colorable_laceups - name = "Recolorable Laceups" - item_path = /obj/item/clothing/shoes/colorable_laceups - requires_purchase = FALSE - -/datum/loadout_item/shoes/nova/colorable_sandals - name = "Recolorable Sandals" - item_path = /obj/item/clothing/shoes/colorable_sandals - requires_purchase = FALSE - -/datum/loadout_item/shoes/nova/wraps/colorable - name = "colourable foot wraps" - item_path = /obj/item/clothing/shoes/wraps/colourable - requires_purchase = FALSE - -/datum/loadout_item/shoes/nova/wraps/cloth - name = "cloth foot wraps" - item_path = /obj/item/clothing/shoes/wraps/cloth - requires_purchase = FALSE - -/datum/loadout_item/shoes/nova/wraps/swag - name = "gilded foot wraps" - item_path = /obj/item/clothing/shoes/wraps - -/datum/loadout_item/shoes/nova/wraps/drip - name = "silver leg wraps" - item_path = /obj/item/clothing/shoes/wraps/silver - -/datum/loadout_item/shoes/nova/jungleboots - name = "jungle boots" - item_path = /obj/item/clothing/shoes/jungleboots - -/datum/loadout_item/shoes/nova/kimshoes - name = "aerostatic boots" - item_path = /obj/item/clothing/shoes/kimshoes diff --git a/monkestation/code/modules/loadouts/items/under/under.dm b/monkestation/code/modules/loadouts/items/under/under.dm index 663be727d71463..9a94f31afe3f28 100644 --- a/monkestation/code/modules/loadouts/items/under/under.dm +++ b/monkestation/code/modules/loadouts/items/under/under.dm @@ -485,577 +485,3 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/miscellaneous/shrine name = "Shrine Priestess Kimono" item_path = /obj/item/clothing/under/dress/shrine_priestess - -/// EVERYTHING NOVA RELATED -//NOTES -//Jumpskirt prefs overrides jumpsuits (ex.qm's formal jumpsuit becomes a skirt) -//From now on I'm marking every new purchasable item as BUYABLE for my own sanity -//Here be dragons (literally) - -/datum/loadout_item/under/jumpsuit/frontier - name = "Frontier Jumpsuit" - item_path = /obj/item/clothing/under/frontier_colonist - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/impcap - name = "Captain's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/nova/imperial - restricted_roles = list(JOB_CAPTAIN) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/imphop - name = "Head of Personnel's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/civilian/head_of_personnel/nova/imperial - restricted_roles = list(JOB_HEAD_OF_PERSONNEL) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/imphos - name = "Head of Security's Naval Uniform" - item_path = /obj/item/clothing/under/rank/security/head_of_security/nova/imperial - restricted_roles = list(JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/impcmo - name = "Chief Medical Officer's Naval Uniform" - item_path = /obj/item/clothing/under/rank/medical/chief_medical_officer/nova/imperial - restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/impce - name = "Chief Engineer's Naval Uniform" - item_path = /obj/item/clothing/under/rank/engineering/chief_engineer/nova/imperial - restricted_roles = list(JOB_CHIEF_ENGINEER) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/imprd - name = "Research Director's Naval Uniform" - item_path = /obj/item/clothing/under/rank/rnd/research_director/nova/imperial - restricted_roles = list(JOB_RESEARCH_DIRECTOR) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/impcommand - name = "Light Grey Officer's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/nova/imperial/generic - restricted_roles = list(JOB_CAPTAIN) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/impcom - name = "Grey Officer's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/nova/imperial/generic/grey - restricted_roles = list(JOB_CAPTAIN) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/impred - name = "Red Officer's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/nova/imperial/generic/red - restricted_roles = list(JOB_CAPTAIN) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/impcomtrous - name = "Grey Officer's Naval Jumpsuit (Trousers)" - item_path = /obj/item/clothing/under/rank/captain/nova/imperial/generic/pants - restricted_roles = list(JOB_CAPTAIN) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_dress - name = "Security Battle Dress" - item_path = /obj/item/clothing/under/rank/security/peacekeeper/dress - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_trousers - name = "Security Trousers" - item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_shorts - name = "Security Shorts" - item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_jumpskirt - name = "Security Jumpskirt" - item_path = /obj/item/clothing/under/rank/security/officer/skirt - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_plain_skirt - name = "Security Plain Skirt" - item_path = /obj/item/clothing/under/rank/security/peacekeeper/plain_skirt - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_miniskirt - name = "Security Miniskirt" - item_path = /obj/item/clothing/under/rank/security/peacekeeper/miniskirt - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_jumpsuit - name = "Security Jumpsuit" - item_path = /obj/item/clothing/under/rank/security/peacekeeper/jumpsuit - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/security_peacekeeper - name = "Security Peacekeeper Uniform" - item_path = /obj/item/clothing/under/rank/security/peacekeeper - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_WARDEN, JOB_HEAD_OF_SECURITY) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/imperial_police_uniform //BUYABLE - name = "Imperial Police Uniform" - item_path = /obj/item/clothing/under/colonial/nri_police - -/datum/loadout_item/under/jumpsuit/sol_peacekeeper //BUYABLE - name = "Sol Peacekeeper Uniform" - item_path = /obj/item/clothing/under/sol_peacekeeper - -/datum/loadout_item/under/jumpsuit/sol_emt - name = "Sol Emergency Medical Uniform" - item_path = /obj/item/clothing/under/sol_emt - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_PARAMEDIC, JOB_CHEMIST, JOB_VIROLOGIST, JOB_CHIEF_MEDICAL_OFFICER) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/paramed_light - name = "Light Paramedic Uniform" - item_path = /obj/item/clothing/under/rank/medical/paramedic/nova/light - restricted_roles = list(JOB_PARAMEDIC) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/paramed_light_skirt - name = "Light Paramedic Skirt" - item_path = /obj/item/clothing/under/rank/medical/paramedic/nova/light/skirt - restricted_roles = list(JOB_PARAMEDIC) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/chemist_formal - name = "Chemist's Formal Jumpsuit" - item_path = /obj/item/clothing/under/rank/medical/chemist/nova/formal - restricted_roles = list(JOB_CHEMIST) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/chemist_formal_skirt - name = "Chemist's Formal Jumpskirt" - item_path = /obj/item/clothing/under/rank/medical/chemist/nova/formal/skirt - restricted_roles = list(JOB_CHEMIST) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/hlscientist - name = "Ridiculous Scientist Outfit" - item_path = /obj/item/clothing/under/rank/rnd/scientist/nova/hlscience - restricted_roles = list(JOB_SCIENTIST) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/utility //BUYABLE - name = "Utility Uniform" - item_path = /obj/item/clothing/under/misc/nova/utility - -/datum/loadout_item/under/jumpsuit/utility_eng - name = "Engineering Utility Uniform" - item_path = /obj/item/clothing/under/rank/engineering/engineer/nova/utility - restricted_roles = list(JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_CHIEF_ENGINEER) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/utility_med - name = "Medical Utility Uniform" - item_path = /obj/item/clothing/under/rank/medical/doctor/nova/utility - restricted_roles = list(JOB_PARAMEDIC, JOB_MEDICAL_DOCTOR, JOB_CHEMIST, JOB_VIROLOGIST, JOB_GENETICIST ,JOB_CHIEF_MEDICAL_OFFICER) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/utility_sci - name = "Science Utility Uniform" - item_path = /obj/item/clothing/under/rank/rnd/scientist/nova/utility - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/utility_cargo - name = "Supply Utility Uniform" - item_path = /obj/item/clothing/under/rank/cargo/tech/nova/utility - restricted_roles = list(JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER) - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/utility_sec - name = "Security Utility Uniform" - item_path = /obj/item/clothing/under/rank/security/nova/utility - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BRIG_PHYSICIAN, JOB_SECURITY_ASSISTANT, JOB_HEAD_OF_SECURITY) //i dunno about the blueshield, they're a weird combo of sec and command, thats why they arent in the loadout pr im making - requires_purchase = FALSE - -/datum/loadout_item/under/jumpsuit/utility_com - name = "Command Utility Uniform" - item_path = /obj/item/clothing/under/rank/captain/nova/utility - restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER) - requires_purchase = FALSE - -/* - * MISC UNDERSUITS - */ - -/datum/loadout_item/under/miscellaneous - - -/datum/loadout_item/under/miscellaneous/vicvest //BUYABLE - name = "Recolorable Buttondown Shirt with Double-Breasted Vest" - item_path = /obj/item/clothing/under/pants/nova/vicvest - -/datum/loadout_item/under/miscellaneous/slacks //BUYABLE - name = "Recolorable Slacks" - item_path = /obj/item/clothing/under/pants/slacks //BUYABLE - -/datum/loadout_item/under/miscellaneous/jeans //BUYABLE - name = "Recolorable Jeans" - item_path = /obj/item/clothing/under/pants/jeans - -/datum/loadout_item/under/miscellaneous/jeansripped //BUYABLE - name = "Recolorable Ripped Jeans" - item_path = /obj/item/clothing/under/pants/nova/jeans_ripped //BUYABLE - -/datum/loadout_item/under/miscellaneous/yoga //BUYABLE - name = "Recolorable Yoga Pants" - item_path = /obj/item/clothing/under/pants/nova/yoga - -/datum/loadout_item/under/miscellaneous/track //BUYABLE - name = "Track Pants" - item_path = /obj/item/clothing/under/pants/track - -/datum/loadout_item/under/miscellaneous/camo //BUYABLE - name = "Camo Pants" - item_path = /obj/item/clothing/under/pants/camo - -/datum/loadout_item/under/miscellaneous/jeanshorts //BUYABLE - name = "Recolorable Jean Shorts" - item_path = /obj/item/clothing/under/shorts/jeanshorts - -/datum/loadout_item/under/miscellaneous/pants_blackshorts //BUYABLE - name = "Recolorable Ripped Jean Shorts" - item_path = /obj/item/clothing/under/shorts/nova/shorts_ripped - -/datum/loadout_item/under/miscellaneous/shortershorts //BUYABLE - name = "Recolorable Shorter Shorts" - item_path = /obj/item/clothing/under/shorts/nova/shortershorts - -/datum/loadout_item/under/miscellaneous/shorts //BUYABLE - name = "Recolorable Shorts" - item_path = /obj/item/clothing/under/shorts - -/datum/loadout_item/under/miscellaneous/red_short //BUYABLE - name = "Red Shorts" - item_path = /obj/item/clothing/under/shorts/red - -/datum/loadout_item/under/miscellaneous/green_short //BUYABLE - name = "Green Shorts" - item_path = /obj/item/clothing/under/shorts/green - -/datum/loadout_item/under/miscellaneous/blue_short //BUYABLE - name = "Blue Shorts" - item_path = /obj/item/clothing/under/shorts/blue - -/datum/loadout_item/under/miscellaneous/black_short //BUYABLE - name = "Black Shorts" - item_path = /obj/item/clothing/under/shorts/black - -/datum/loadout_item/under/miscellaneous/grey_short //BUYABLE - name = "Grey Shorts" - item_path = /obj/item/clothing/under/shorts/grey - -/datum/loadout_item/under/miscellaneous/purple_short //BUYABLE - name = "Purple Shorts" - item_path = /obj/item/clothing/under/shorts/purple - -/datum/loadout_item/under/miscellaneous/recolorable_kilt //BUYABLE - name = "Recolorable Kilt" - item_path = /obj/item/clothing/under/pants/nova/kilt - -/datum/loadout_item/under/miscellaneous/dress_striped //BUYABLE - name = "Striped Dress" - item_path = /obj/item/clothing/under/dress/striped - -/datum/loadout_item/under/miscellaneous/skirt_cableknit //BUYABLE - name = "Recolorable Cableknit Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/turtleskirt_knit - -/datum/loadout_item/under/miscellaneous/straplessdress //BUYABLE - name = "Recolorable Strapless Dress" - item_path = /obj/item/clothing/under/dress/nova/strapless - -/datum/loadout_item/under/miscellaneous/pentagramdress //BUYABLE - name = "Recolorable Pentagram Strapped Dress" - item_path = /obj/item/clothing/under/dress/nova/pentagram - -/datum/loadout_item/under/miscellaneous/jacarta_dress //BUYABLE - name = "Jacarta Dress" - item_path = /obj/item/clothing/under/dress/nova/jute - -/datum/loadout_item/under/miscellaneous/red_skirt //BUYABLE - name = "Red Bra and Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/red_skirt - -/datum/loadout_item/under/miscellaneous/striped_skirt //BUYABLE - name = "Red Bra and Striped Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/striped_skirt - -/datum/loadout_item/under/miscellaneous/black_skirt //BUYABLE - name = "Black Bra and Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/black_skirt - -/datum/loadout_item/under/miscellaneous/swept_skirt //BUYABLE - name = "Swept Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/swept - -/datum/loadout_item/under/miscellaneous/lone_skirt //BUYABLE - name = "Recolorable Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/lone_skirt - -/datum/loadout_item/under/miscellaneous/medium_skirt //BUYABLE - name = "Medium Colourable Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/medium - -/datum/loadout_item/under/miscellaneous/long_skirt //BUYABLE - name = "Long Colourable Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/long - -/datum/loadout_item/under/miscellaneous/denim_skirt //BUYABLE - name = "Jean Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/jean - -/datum/loadout_item/under/miscellaneous/littleblack //BUYABLE - name = "Short Black Dress" - item_path = /obj/item/clothing/under/dress/nova/short_dress - -/datum/loadout_item/under/miscellaneous/pinktutu //BUYABLE - name = "Pink Tutu" - item_path = /obj/item/clothing/under/dress/nova/pinktutu - -/datum/loadout_item/under/miscellaneous/flowerdress //BUYABLE - name = "Flower Dress" - item_path = /obj/item/clothing/under/dress/nova/flower - -/datum/loadout_item/under/miscellaneous/tactical_hawaiian_orange //BUYABLE - name = "Tactical Hawaiian Outfit - Orange" - item_path = /obj/item/clothing/under/tachawaiian - -/datum/loadout_item/under/miscellaneous/tactical_hawaiian_blue //BUYABLE - name = "Tactical Hawaiian Outfit - Blue" - item_path = /obj/item/clothing/under/tachawaiian/blue - -/datum/loadout_item/under/miscellaneous/tactical_hawaiian_purple //BUYABLE - name = "Tactical Hawaiian Outfit - Purple" - item_path = /obj/item/clothing/under/tachawaiian/purple - -/datum/loadout_item/under/miscellaneous/tactical_hawaiian_green //BUYABLE - name = "Tactical Hawaiian Outfit - Green" - item_path = /obj/item/clothing/under/tachawaiian/green - -/datum/loadout_item/under/miscellaneous/yukata //BUYABLE - name = "Yukata" - item_path = /obj/item/clothing/under/costume/nova/yukata - -/datum/loadout_item/under/miscellaneous/qipao_black //BUYABLE - name = "Qipao" - item_path = /obj/item/clothing/under/costume/nova/qipao - -/datum/loadout_item/under/miscellaneous/qipao_recolorable //BUYABLE - name = "Qipao, Custom Trim" - item_path = /obj/item/clothing/under/costume/nova/qipao/customtrim - -/datum/loadout_item/under/miscellaneous/cheongsam //BUYABLE - name = "Cheongsam" - item_path = /obj/item/clothing/under/costume/nova/cheongsam - -/datum/loadout_item/under/miscellaneous/cheongsam_recolorable //BUYABLE - name = "Cheongsam, Custom Trim" - item_path = /obj/item/clothing/under/costume/nova/cheongsam/customtrim - -/datum/loadout_item/under/miscellaneous/kimono //BUYABLE - name = "Fancy Kimono" - item_path = /obj/item/clothing/under/costume/nova/kimono - -/datum/loadout_item/under/miscellaneous/chaps //BUYABLE - name = "Black Chaps" - item_path = /obj/item/clothing/under/pants/nova/chaps - -/datum/loadout_item/under/miscellaneous/tracky //BUYABLE - name = "Blue Tracksuit" - item_path = /obj/item/clothing/under/misc/bluetracksuit - -/datum/loadout_item/under/miscellaneous/cybersleek //BUYABLE - name = "Sleek Modern Coat" - item_path = /obj/item/clothing/under/costume/cybersleek - -/datum/loadout_item/under/miscellaneous/cybersleek_long //BUYABLE - name = "Long Modern Coat" - item_path = /obj/item/clothing/under/costume/cybersleek/long - -/datum/loadout_item/under/miscellaneous/dutch //BUYABLE - name = "Dutch Suit" - item_path = /obj/item/clothing/under/costume/dutch - -/datum/loadout_item/under/miscellaneous/cavalry //BUYABLE - name = "Cavalry Uniform" - item_path = /obj/item/clothing/under/costume/nova/cavalry - -/datum/loadout_item/under/miscellaneous/expeditionary_corps //BUYABLE - name = "Expeditionary Corps Uniform" - item_path = /obj/item/clothing/under/rank/expeditionary_corps - -/datum/loadout_item/under/miscellaneous/tactical_pants //BUYABLE - name = "Tactical Pants" - item_path = /obj/item/clothing/under/pants/tactical - -/datum/loadout_item/under/miscellaneous/jabroni //BUYABLE - name = "Jabroni Outfit" - item_path = /obj/item/clothing/under/costume/jabroni - -/datum/loadout_item/under/miscellaneous/blacknwhite - name = "Classic Prisoner Jumpsuit" - item_path = /obj/item/clothing/under/rank/prisoner/classic - restricted_roles = list(JOB_PRISONER) - -/datum/loadout_item/under/miscellaneous/redscrubs - name = "Red Scrubs" - item_path = /obj/item/clothing/under/rank/medical/scrubs/nova/red - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_PARAMEDIC, JOB_VIROLOGIST, JOB_GENETICIST ,JOB_CHIEF_MEDICAL_OFFICER) - requires_purchase = FALSE - -/datum/loadout_item/under/miscellaneous/whitescrubs - name = "White Scrubs" - item_path = /obj/item/clothing/under/rank/medical/scrubs/nova/white - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_PARAMEDIC, JOB_VIROLOGIST, JOB_GENETICIST ,JOB_CHIEF_MEDICAL_OFFICER) - requires_purchase = FALSE - -/datum/loadout_item/under/miscellaneous/taccas //BUYABLE - name = "Tacticasual Uniform" - item_path = /obj/item/clothing/under/misc/nova/taccas - -/datum/loadout_item/under/miscellaneous/cargo_casual - name = "Cargo Tech Casualwear" - item_path = /obj/item/clothing/under/rank/cargo/tech/nova/casualman - restricted_roles = list(JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER) - requires_purchase = FALSE - -/datum/loadout_item/under/miscellaneous/cargo_turtle - name = "Cargo Turtleneck" - item_path = /obj/item/clothing/under/rank/cargo/tech/nova/turtleneck - restricted_roles = list(JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER) - requires_purchase = FALSE - -/datum/loadout_item/under/miscellaneous/cargo_gorka - name = "Cargo Gorka" - item_path = /obj/item/clothing/under/rank/cargo/tech/nova/gorka - restricted_roles = list(JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER) - requires_purchase = FALSE - -/datum/loadout_item/under/miscellaneous/cargo_skirtle - name = "Cargo Skirtleneck" - item_path = /obj/item/clothing/under/rank/cargo/tech/nova/turtleneck/skirt - restricted_roles = list(JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER) - requires_purchase = FALSE - -/datum/loadout_item/under/miscellaneous/qm_skirtle - name = "Quartermaster's Skirtleneck" - item_path = /obj/item/clothing/under/rank/cargo/qm/nova/turtleneck/skirt - restricted_roles = list(JOB_QUARTERMASTER) - requires_purchase = FALSE - -/datum/loadout_item/under/miscellaneous/qm_gorka - name = "Quartermaster's Gorka Uniform" - item_path = /obj/item/clothing/under/rank/cargo/qm/nova/gorka - restricted_roles = list(JOB_QUARTERMASTER) - requires_purchase = FALSE - -/* -* FORMAL UNDERSUITS -*/ - -/datum/loadout_item/under/formal - -/datum/loadout_item/under/formal/formaldressred //BUYABLE - name = "Formal Red Dress" - item_path = /obj/item/clothing/under/dress/nova/redformal - -/datum/loadout_item/under/formal/countessdress //BUYABLE - name = "Countess Dress" - item_path = /obj/item/clothing/under/dress/nova/countess - -/datum/loadout_item/under/formal/executive_suit_alt //BUYABLE - name = "Wide-collared Executive Suit" - item_path = /obj/item/clothing/under/suit/nova/black_really_collared - -/datum/loadout_item/under/formal/executive_skirt_alt //BUYABLE - name = "Wide-collared Executive Suitskirt" - item_path = /obj/item/clothing/under/suit/nova/black_really_collared/skirt - -/datum/loadout_item/under/formal/navy_suit //BUYABLE - name = "Navy Suit" - item_path = /obj/item/clothing/under/suit/navy - -/datum/loadout_item/under/formal/helltaker //BUYABLE - name = "Red Shirt with White Trousers" - item_path = /obj/item/clothing/under/suit/nova/helltaker - -/datum/loadout_item/under/formal/helltaker/skirt //BUYABLE - name = "Red Shirt with White Skirt" - item_path = /obj/item/clothing/under/suit/nova/helltaker/skirt - -/datum/loadout_item/under/formal/fancy_suit //BUYABLE - name = "Fancy Suit" - item_path = /obj/item/clothing/under/suit/fancy - -/datum/loadout_item/under/formal/recolorable_suit //BUYABLE - name = "Recolorable Formal Suit" - item_path = /obj/item/clothing/under/suit/nova/recolorable - -/datum/loadout_item/under/formal/recolorable_suitskirt //BUYABLE - name = "Recolorable Formal Suitskirt" - item_path = /obj/item/clothing/under/suit/nova/recolorable/skirt - -/datum/loadout_item/under/formal/recolorable_suit/casual //BUYABLE - name = "Office Casual Suit" - item_path = /obj/item/clothing/under/suit/nova/recolorable/casual - -/datum/loadout_item/under/formal/recolorable_suit/executive //BUYABLE - name = "Executive Casual Suit" - item_path = /obj/item/clothing/under/suit/nova/recolorable/executive - -/datum/loadout_item/under/formal/pencil //BUYABLE - name = "Pencilskirt with Shirt" - item_path = /obj/item/clothing/under/suit/nova/pencil - -/datum/loadout_item/under/formal/pencil/noshirt //BUYABLE - name = "Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/noshirt - -/datum/loadout_item/under/formal/pencil/black_really //BUYABLE - name = "Executive Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/black_really - -/datum/loadout_item/under/formal/pencil/charcoal //BUYABLE - name = "Charcoal Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/charcoal - -/datum/loadout_item/under/formal/pencil/navy //BUYABLE - name = "Navy Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/navy - -/datum/loadout_item/under/formal/pencil/burgandy //BUYABLE - name = "Burgandy Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/burgandy - -/datum/loadout_item/under/formal/pencil/checkered //BUYABLE - name = "Checkered Pencilskirt with Shirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/checkered - -/datum/loadout_item/under/formal/pencil/checkered/noshirt //BUYABLE - name = "Checkered Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/checkered/noshirt - -/datum/loadout_item/under/formal/pencil/tan //BUYABLE - name = "Tan Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/tan - -/datum/loadout_item/under/formal/pencil/green //BUYABLE - name = "Green Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/green - diff --git a/monkestation/code/modules/meteor_shield/meteor_shield.dm b/monkestation/code/modules/meteor_shield/meteor_shield.dm deleted file mode 100644 index 2bee0d716a638e..00000000000000 --- a/monkestation/code/modules/meteor_shield/meteor_shield.dm +++ /dev/null @@ -1,114 +0,0 @@ -GLOBAL_LIST_EMPTY_TYPED(meteor_shield_sats, /obj/machinery/satellite/meteor_shield) -GLOBAL_VAR_INIT(total_meteors_zapped, 0) - -/obj/machinery/satellite/meteor_shield - name = "meteor defense satellite" - mode = "HK-MPS" - kill_range = 16 - /// Whether the meteor sat checks for line of sight to determine if it can intercept a meteor. - var/check_sight = TRUE - /// The proximity monitor used to detect meteors entering the shield's range. - var/datum/proximity_monitor/advanced/meteor_shield/monitor - /// A counter for how many meteors this specific satellite has zapped. - var/meteors_zapped = 0 - /// A list of "proxy" objects used for multi-z coverage. - var/list/obj/effect/abstract/meteor_shield_proxy/proxies = list() - -/obj/machinery/satellite/meteor_shield/Initialize(mapload) - . = ..() - AddElement(/datum/element/repackable, /obj/item/flatpacked_machine/generic, 5 SECONDS, TRUE, TRUE) - - GLOB.meteor_shield_sats += src - RegisterSignal(src, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(on_space_move)) // so these fuckers don't drift off into space when you're trying to position them - setup_proximity() - setup_proxies() - register_context() - -/obj/machinery/satellite/meteor_shield/Destroy() - GLOB.meteor_shield_sats -= src - proxies = null - QDEL_NULL(monitor) - return ..() - -/obj/machinery/satellite/meteor_shield/examine(mob/user) - . = ..() - . += span_info("It has stopped [meteors_zapped] meteors so far.") - . += span_info("Overall, all meteor defense satellites have stopped a combined [GLOB.total_meteors_zapped] meteors this shift.") - -/obj/machinery/satellite/meteor_shield/proc/on_space_move(datum/source) - SIGNAL_HANDLER - return COMSIG_MOVABLE_STOP_SPACEMOVE - -/obj/machinery/satellite/meteor_shield/vv_edit_var(vname, vval) - . = ..() - if(.) - switch(vname) - if(NAMEOF(src, kill_range)) - monitor?.set_range(kill_range) - for(var/proxy_z in proxies) - var/obj/effect/abstract/meteor_shield_proxy/proxy = proxies[proxy_z] - proxy.monitor.set_range(kill_range) - if(NAMEOF(src, active)) - set_anchored(active) - setup_proximity() - -/obj/machinery/satellite/meteor_shield/add_context(atom/source, list/context, obj/item/held_item, mob/user) - context[SCREENTIP_CONTEXT_LMB] = active ? "Deactivate" : "Activate" - return CONTEXTUAL_SCREENTIP_SET - -/obj/machinery/satellite/meteor_shield/toggle(mob/user) - . = ..() - if(.) - user.log_message("[active ? "" : "de"]activated [src] at [AREACOORD(src)]", LOG_GAME) - setup_proximity() - -/obj/machinery/satellite/meteor_shield/emag_act(mob/user, obj/item/card/emag/emag_card) - . = ..() - user.log_message("emagged [src] at [AREACOORD(src)]", LOG_GAME) - setup_proximity() - -/obj/machinery/satellite/meteor_shield/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) - . = ..() - setup_proxies() - -/obj/machinery/satellite/meteor_shield/proc/setup_proximity() - if((obj_flags & EMAGGED) || !active) - if(!QDELETED(monitor)) - QDEL_NULL(monitor) - else - if(QDELETED(monitor)) - monitor = new(src, kill_range) - -/obj/machinery/satellite/meteor_shield/proc/setup_proxies() - for(var/stacked_z in SSmapping.get_connected_levels(get_turf(src))) - setup_proxy_for_z(stacked_z) - -/obj/machinery/satellite/meteor_shield/proc/setup_proxy_for_z(target_z) - if(target_z == z) - return - // don't setup a proxy if there already is one. - if(!QDELETED(proxies["[target_z]"])) - return - var/turf/our_loc = get_turf(src) - var/turf/target_loc = locate(our_loc.x, our_loc.y, target_z) - if(QDELETED(target_loc)) - return - var/obj/effect/abstract/meteor_shield_proxy/new_proxy = new(target_loc, src) - proxies["[target_z]"] = new_proxy - -/obj/machinery/satellite/meteor_shield/piercing - check_sight = FALSE - -/obj/machinery/satellite/meteor_shield/proc/change_meteor_chance(mod = 1) - var/static/list/meteor_event_typecache - if(!meteor_event_typecache) - meteor_event_typecache = typecacheof(list( - /datum/round_event_control/meteor_wave, - /datum/round_event_control/sandstorm, - /datum/round_event_control/space_dust, - /datum/round_event_control/stray_meteor - )) - var/list/all_events = SSevents.control | SSgamemode.control - for(var/datum/round_event_control/event as anything in all_events) - if(is_type_in_typecache(event, meteor_event_typecache)) - event.weight *= mod diff --git a/monkestation/code/modules/meteor_shield/meteor_shield_capsule.dm b/monkestation/code/modules/meteor_shield/meteor_shield_capsule.dm deleted file mode 100644 index be8c7b317d5847..00000000000000 --- a/monkestation/code/modules/meteor_shield/meteor_shield_capsule.dm +++ /dev/null @@ -1,10 +0,0 @@ -/obj/item/meteor_shield_capsule - name = "meteor defense satellite capsule" - desc = "A bluespace capsule which a single unit of meteor defense satellite is compressed within. If you activate this capsule, a meteor shield satellite will pop out. You still need to install these." - icon_state = "capsule" - icon = 'icons/obj/mining.dmi' - w_class = WEIGHT_CLASS_TINY - -/obj/item/meteor_shield_capsule/Initialize(mapload) - . = ..() - AddComponent(/datum/component/deployable, 5 SECONDS, /obj/machinery/satellite/meteor_shield, delete_on_use = TRUE) diff --git a/monkestation/code/modules/meteor_shield/meteor_shield_coverage.dm b/monkestation/code/modules/meteor_shield/meteor_shield_coverage.dm deleted file mode 100644 index f86bf04c6f706b..00000000000000 --- a/monkestation/code/modules/meteor_shield/meteor_shield_coverage.dm +++ /dev/null @@ -1,40 +0,0 @@ -#define TRAIT_METEOR_SHIELD_FIELD_MONITORED "meteor_shield_field_monitored" - -GLOBAL_LIST_EMPTY_TYPED(meteor_shielded_turfs, /turf/open) - -/// Stupid element to handle tracking which turfs are in a meteor sat's range, -/// without messing up in situations like with overlapping ranges. -/datum/element/meteor_shield_coverage - // Detach whenever destroyed, so we can ensure there's no hanging references to the turf in GLOB.meteor_shielded_turfs - element_flags = ELEMENT_DETACH_ON_HOST_DESTROY - /// Signals to attach to all turfs. - var/static/list/attach_signals = list( - SIGNAL_ADDTRAIT(TRAIT_COVERED_BY_METEOR_SHIELD), - SIGNAL_REMOVETRAIT(TRAIT_COVERED_BY_METEOR_SHIELD) - ) - -/datum/element/meteor_shield_coverage/Attach(turf/open/target) - . = ..() - if(!isgroundlessturf(target)) - return ELEMENT_INCOMPATIBLE - // We use a trait to prevent duplicate assignments. - if(!HAS_TRAIT(target, TRAIT_METEOR_SHIELD_FIELD_MONITORED)) - ADD_TRAIT(target, TRAIT_METEOR_SHIELD_FIELD_MONITORED, ELEMENT_TRAIT(type)) - RegisterSignals(target, attach_signals, PROC_REF(update_global_shield_list)) - GLOB.meteor_shielded_turfs += target - -/datum/element/meteor_shield_coverage/Detach(turf/open/target) - REMOVE_TRAIT(target, TRAIT_METEOR_SHIELD_FIELD_MONITORED, ELEMENT_TRAIT(type)) - UnregisterSignal(target, attach_signals) - GLOB.meteor_shielded_turfs -= target - return ..() - -/datum/element/meteor_shield_coverage/proc/update_global_shield_list(turf/open/source) - SIGNAL_HANDLER - if(!isgroundlessturf(source) || !HAS_TRAIT(source, TRAIT_COVERED_BY_METEOR_SHIELD)) - source.RemoveElement(/datum/element/meteor_shield_coverage) - -/proc/get_meteor_sat_coverage() as num - return length(GLOB.meteor_shielded_turfs) - -#undef TRAIT_METEOR_SHIELD_FIELD_MONITORED diff --git a/monkestation/code/modules/meteor_shield/meteor_shield_field.dm b/monkestation/code/modules/meteor_shield/meteor_shield_field.dm deleted file mode 100644 index 60c1cea4650a56..00000000000000 --- a/monkestation/code/modules/meteor_shield/meteor_shield_field.dm +++ /dev/null @@ -1,33 +0,0 @@ -GLOBAL_LIST_EMPTY_TYPED(meteor_shield_fields, /datum/proximity_monitor/advanced/meteor_shield) - -/// A proximity monitor field that marks openspace turfs within as being covered by a meteor shield. -/datum/proximity_monitor/advanced/meteor_shield - edge_is_a_field = TRUE - var/obj/machinery/satellite/meteor_shield/proxied_host - -/datum/proximity_monitor/advanced/meteor_shield/New(atom/_host, range, _ignore_if_not_on_turf, proxied_host) - GLOB.meteor_shield_fields += src - if(proxied_host) - src.proxied_host = proxied_host - return ..() - -/datum/proximity_monitor/advanced/meteor_shield/Destroy() - GLOB.meteor_shield_fields -= src - proxied_host = null - return ..() - -/datum/proximity_monitor/advanced/meteor_shield/setup_field_turf(turf/open/target) - if(!isgroundlessturf(target)) - return - var/obj/machinery/satellite/meteor_shield/host_sat = proxied_host || host - if(host_sat.check_los(get_turf(host_sat), target)) - ADD_TRAIT(target, TRAIT_COVERED_BY_METEOR_SHIELD, REF(src)) - target.AddElement(/datum/element/meteor_shield_coverage) - -/datum/proximity_monitor/advanced/meteor_shield/cleanup_field_turf(turf/target) - REMOVE_TRAIT(target, TRAIT_COVERED_BY_METEOR_SHIELD, REF(src)) - -/datum/proximity_monitor/advanced/meteor_shield/set_range(range, force_rebuild) - . = ..() - if(.) - recalculate_field(full_recalc = TRUE) diff --git a/monkestation/code/modules/meteor_shield/meteor_shield_proxy.dm b/monkestation/code/modules/meteor_shield/meteor_shield_proxy.dm deleted file mode 100644 index 111913bd58cf8f..00000000000000 --- a/monkestation/code/modules/meteor_shield/meteor_shield_proxy.dm +++ /dev/null @@ -1,43 +0,0 @@ -/obj/effect/abstract/meteor_shield_proxy - invisibility = INVISIBILITY_ABSTRACT - /// The meteor shield sat this is proxying - any HasProximity calls will be forwarded to it. - var/obj/machinery/satellite/meteor_shield/parent - /// Our proximity monitor. - var/datum/proximity_monitor/advanced/meteor_shield/monitor - -/obj/effect/abstract/meteor_shield_proxy/Initialize(mapload, obj/machinery/satellite/meteor_shield/parent) - . = ..() - if(QDELETED(parent)) - return INITIALIZE_HINT_QDEL - src.parent = parent - src.monitor = new(src, parent.kill_range, TRUE, parent) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_deleted)) - RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_parent_z_changed)) - RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(on_parent_moved)) - -/obj/effect/abstract/meteor_shield_proxy/Destroy(force) - QDEL_NULL(monitor) - if(!QDELETED(parent)) - if(parent.proxies["[z]"] == src) - parent.proxies -= "[z]" - UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_Z_CHANGED, COMSIG_QDELETING)) - parent = null - return ..() - -/obj/effect/abstract/meteor_shield_proxy/HasProximity(obj/effect/meteor/meteor) - parent.HasProximity(meteor) - -/obj/effect/abstract/meteor_shield_proxy/proc/on_parent_moved() - SIGNAL_HANDLER - var/turf/parent_loc = get_turf(parent) - var/turf/new_loc = locate(parent_loc.x, parent_loc.y, z) - forceMove(new_loc) - -/obj/effect/abstract/meteor_shield_proxy/proc/on_parent_z_changed() - SIGNAL_HANDLER - if(!are_zs_connected(parent, src) || z == parent.z) - qdel(src) - -/obj/effect/abstract/meteor_shield_proxy/proc/on_parent_deleted() - SIGNAL_HANDLER - qdel(src) diff --git a/monkestation/code/modules/meteor_shield/meteor_shield_zap.dm b/monkestation/code/modules/meteor_shield/meteor_shield_zap.dm deleted file mode 100644 index 4530a15f308234..00000000000000 --- a/monkestation/code/modules/meteor_shield/meteor_shield_zap.dm +++ /dev/null @@ -1,47 +0,0 @@ -/obj/machinery/satellite/meteor_shield/HasProximity(obj/effect/meteor/meteor) - if(!active || !istype(meteor) || QDELING(meteor) || (obj_flags & EMAGGED)) - return - var/turf/our_turf = get_turf(src) - var/turf/meteor_turf = get_turf(meteor) - if(!check_los(our_turf, meteor_turf)) - return - our_turf.Beam(meteor_turf, icon_state = "sat_beam", time = 5) - if(meteor.shield_defense(src)) - new /obj/effect/temp_visual/explosion(meteor_turf) - INVOKE_ASYNC(src, PROC_REF(play_zap_sound), meteor_turf) - SSblackbox.record_feedback("tally", "meteors_zapped", 1, "[meteor.type]") - meteors_zapped++ - GLOB.total_meteors_zapped++ - meteor.make_debris() - qdel(meteor) - -/obj/machinery/satellite/meteor_shield/proc/check_los(turf/source, turf/target) as num - // if something goes fucky wucky, let's just assume line-of-sight by default - . = TRUE - if(!check_sight) - return TRUE - for(var/turf/segment as anything in get_line(source, target)) - if(QDELETED(segment)) - continue - if(isclosedturf(segment) && !istransparentturf(segment)) - return FALSE - -/obj/machinery/satellite/meteor_shield/proc/play_zap_sound(turf/epicenter) - if(QDELETED(epicenter)) - return - var/static/near_distance - if(isnull(near_distance)) - var/list/world_view = getviewsize(world.view) - near_distance = max(world_view[1], world_view[2]) - SSexplosions.shake_the_room( - epicenter, - near_distance, - far_distance = near_distance * 8, - quake_factor = 0, - echo_factor = 0, - creaking = FALSE, - near_sound = sound('sound/weapons/lasercannonfire.ogg'), - far_sound = sound('sound/weapons/marauder.ogg'), - pressure_affected = FALSE, - disable_shaking = TRUE - ) diff --git a/monkestation/code/modules/physics/physics_component.dm b/monkestation/code/modules/physics/physics_component.dm index fd7b02da5754bd..fbd705b9217095 100644 --- a/monkestation/code/modules/physics/physics_component.dm +++ b/monkestation/code/modules/physics/physics_component.dm @@ -122,10 +122,10 @@ set_angle(angle) /datum/component/movable_physics/Destroy(force, silent) + . = ..() bounce_callback = null stop_callback = null cached_transform = null - return ..() /datum/component/movable_physics/RegisterWithParent() RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(on_bump)) diff --git a/monkestation/code/modules/ranching/components/aging.dm b/monkestation/code/modules/ranching/components/aging.dm index 1726af06c26168..505ea914ed0fe2 100644 --- a/monkestation/code/modules/ranching/components/aging.dm +++ b/monkestation/code/modules/ranching/components/aging.dm @@ -19,10 +19,6 @@ START_PROCESSING(SSobj, src) -/datum/component/aging/Destroy(force, silent) - death_callback = null - return ..() - /datum/component/aging/RegisterWithParent() . = ..() RegisterSignal(parent, COMSIG_AGE_ADJUSTMENT, PROC_REF(adjust_age)) diff --git a/monkestation/code/modules/ranching/components/happiness_container.dm b/monkestation/code/modules/ranching/components/happiness_container.dm index 03c307aac72f6d..350223d910e0bb 100644 --- a/monkestation/code/modules/ranching/components/happiness_container.dm +++ b/monkestation/code/modules/ranching/components/happiness_container.dm @@ -30,9 +30,8 @@ src.unhappy_callbacks = unhappy_callbacks /datum/component/happiness_container/Destroy(force, silent) - unhappy_callbacks = null + . = ..() QDEL_NULL(applied_visual) - return ..() /datum/component/happiness_container/RegisterWithParent() . = ..() diff --git a/monkestation/code/modules/ranching/components/hatching.dm b/monkestation/code/modules/ranching/components/hatching.dm index 7884eb41ab47ae..56f358c656b9ed 100644 --- a/monkestation/code/modules/ranching/components/hatching.dm +++ b/monkestation/code/modules/ranching/components/hatching.dm @@ -45,10 +45,6 @@ START_PROCESSING(SSobj, src) -/datum/component/hatching/Destroy(force, silent) - hatch_callback = null - return ..() - /datum/component/hatching/process(seconds_per_tick) if(!COOLDOWN_FINISHED(src, failed_cooldown)) return diff --git a/monkestation/code/modules/ranching/components/shearable.dm b/monkestation/code/modules/ranching/components/shearable.dm index 2cd0676ae3e716..e576509f1b07d6 100644 --- a/monkestation/code/modules/ranching/components/shearable.dm +++ b/monkestation/code/modules/ranching/components/shearable.dm @@ -34,11 +34,6 @@ created_amount = amount src.created = created -/datum/component/shearable/Destroy(force, silent) - regrow = null - post_shear = null - return ..() - /datum/component/shearable/RegisterWithParent() . = ..() RegisterSignal(parent, COMSIG_MOB_SHEARED, PROC_REF(try_shear)) diff --git a/monkestation/code/modules/ranching/satyr/bodyparts.dm b/monkestation/code/modules/ranching/satyr/bodyparts.dm index ff24f3dc4515f0..84dd37d795e563 100644 --- a/monkestation/code/modules/ranching/satyr/bodyparts.dm +++ b/monkestation/code/modules/ranching/satyr/bodyparts.dm @@ -19,9 +19,9 @@ /obj/item/bodypart/leg/left/satyr icon_greyscale = 'monkestation/code/modules/ranching/icons/bodyparts.dmi' limb_id = SPECIES_SATYR - bodytype = BODYTYPE_DIGITIGRADE | BODYTYPE_ORGANIC + bodytype = BODYTYPE_DIGITIGRADE /obj/item/bodypart/leg/right/satyr icon_greyscale = 'monkestation/code/modules/ranching/icons/bodyparts.dmi' limb_id = SPECIES_SATYR - bodytype = BODYTYPE_DIGITIGRADE | BODYTYPE_ORGANIC + bodytype = BODYTYPE_DIGITIGRADE diff --git a/monkestation/code/modules/research/designs/machine_designs.dm b/monkestation/code/modules/research/designs/machine_designs.dm index 41b5bcd143f049..91f2b95fe4e52a 100644 --- a/monkestation/code/modules/research/designs/machine_designs.dm +++ b/monkestation/code/modules/research/designs/machine_designs.dm @@ -7,7 +7,7 @@ category = list( RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_MEDICAL ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/clonepod @@ -18,7 +18,17 @@ category = list( RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_MEDICAL ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE + +/datum/design/board/clonepod_experimental + name = "Machine Design (Experimental Clone Pod)" + desc = "Allows for the construction of circuit boards used to build an Experimental Cloning Pod." + id = "clonepod_experimental" + build_path = /obj/item/circuitboard/machine/clonepod/experimental + category = list( + RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_MEDICAL + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/clonescanner //hippie end, re-add cloning @@ -29,7 +39,7 @@ category = list( RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_MEDICAL ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/nanite_chamber name = "Machine Design (Nanite Chamber Board)" diff --git a/monkestation/code/modules/research/designs/nanite_designs.dm b/monkestation/code/modules/research/designs/nanite_designs.dm index 0fc10a60a4b2a5..d91e9b32a770a6 100644 --- a/monkestation/code/modules/research/designs/nanite_designs.dm +++ b/monkestation/code/modules/research/designs/nanite_designs.dm @@ -143,14 +143,6 @@ program_type = /datum/nanite_program/regenerative_advanced category = list("Medical Nanites") -/datum/design/nanites/oxygen_rush - name = "Alveolic Deoxidation" - desc = "The nanites deoxidze the carbon dioxide carried within the blood inside of the host's lungs through rapid electrical stimulus. \ - However, this process is extremely dangerous, leaving carbon deposits within the lungs as well as causing severe organ damage." - id = "oxygen_rush_nanites" - program_type = /datum/nanite_program/oxygen_rush - category = list("Medical Nanites") - /datum/design/nanites/temperature name = "Temperature Adjustment" desc = "The nanites adjust the host's internal temperature to an ideal level." diff --git a/monkestation/code/modules/research/nanites/nanite_programs/healing.dm b/monkestation/code/modules/research/nanites/nanite_programs/healing.dm index bfb78f54d0a1ba..21fde9c7383758 100644 --- a/monkestation/code/modules/research/nanites/nanite_programs/healing.dm +++ b/monkestation/code/modules/research/nanites/nanite_programs/healing.dm @@ -231,41 +231,3 @@ log_game("[C] has been successfully defibrillated by nanites.") else playsound(C, 'sound/machines/defib_failed.ogg', 50, FALSE) - - -//heard you like smoking -/datum/nanite_program/oxygen_rush - name = "Alveolic Deoxidation" - desc = "The nanites deoxidze the carbon dioxide carried within the blood inside of the host's lungs through rapid electrical stimulus. \ - However, this process is extremely dangerous, leaving carbon deposits within the lungs as well as causing severe organ damage." - use_rate = 10 - rogue_types = list(/datum/nanite_program/suffocating) - - COOLDOWN_DECLARE(warning_cooldown) - COOLDOWN_DECLARE(ending_cooldown) - -/datum/nanite_program/oxygen_rush/check_conditions() - var/obj/item/organ/internal/lungs/lungs = host_mob.get_organ_slot(ORGAN_SLOT_LUNGS) - if(!lungs) - return FALSE - return ..() && !(lungs.organ_flags & ORGAN_FAILING) - -/datum/nanite_program/oxygen_rush/active_effect() - host_mob.adjustOxyLoss(-10, TRUE) - host_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 4) - var/mob/living/carbon/carbon_host = host_mob - if(prob(8) && istype(carbon_host)) - to_chat(host_mob, span_userdanger("You feel a sudden flood of pain in your chest!")) - carbon_host.vomit(blood = TRUE, harm = FALSE) - -/datum/nanite_program/oxygen_rush/enable_passive_effect() - . = ..() - if(COOLDOWN_FINISHED(src, warning_cooldown)) - to_chat(host_mob, span_warning("You feel a hellish burning in your chest!")) - COOLDOWN_START(src, warning_cooldown, 10 SECONDS) - -/datum/nanite_program/oxygen_rush/disable_passive_effect() - . = ..() - if(COOLDOWN_FINISHED(src, ending_cooldown)) - to_chat(host_mob, span_notice("The fire in your chest subsides.")) - COOLDOWN_START(src, ending_cooldown, 10 SECONDS) diff --git a/monkestation/code/modules/research/techweb/all_nodes.dm b/monkestation/code/modules/research/techweb/all_nodes.dm index 55ec1b4100dbec..80cd1645ccd94e 100644 --- a/monkestation/code/modules/research/techweb/all_nodes.dm +++ b/monkestation/code/modules/research/techweb/all_nodes.dm @@ -3,7 +3,7 @@ display_name = "Cloning" description = "We have the technology to make him." prereq_ids = list("biotech") - design_ids = list("clonecontrol", "clonepod", "clonescanner", "dnascanner", "dna_disk") + design_ids = list("clonecontrol", "clonepod", "clonescanner", "dnascanner", "dna_disk", "clonepod_experimental") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) /////////////////////////Nanites///////////////////////// @@ -133,7 +133,6 @@ "fakedeath_nanites", "purging_plus_nanites", "regenerative_plus_nanites", - "oxygen_rush_nanites", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000, TECHWEB_POINT_TYPE_NANITES = 3000) diff --git a/monkestation/code/modules/slimecore/components/latch_feeding.dm b/monkestation/code/modules/slimecore/components/latch_feeding.dm index c08040a2f59cbc..05d393ddc171e8 100644 --- a/monkestation/code/modules/slimecore/components/latch_feeding.dm +++ b/monkestation/code/modules/slimecore/components/latch_feeding.dm @@ -34,9 +34,9 @@ /datum/component/latch_feeding/Destroy(force, silent) REMOVE_TRAIT(parent, TRAIT_FEEDING, LATCH_TRAIT) + . = ..() target = null check_and_replace = null - return ..() /datum/component/latch_feeding/RegisterWithParent() RegisterSignal(parent, COMSIG_LIVING_SET_BUCKLED, PROC_REF(check_buckled)) diff --git a/monkestation/code/modules/slimecore/machines/ooze_sucker.dm b/monkestation/code/modules/slimecore/machines/ooze_sucker.dm index 204b2e61d097f0..61f37dd8e126c2 100644 --- a/monkestation/code/modules/slimecore/machines/ooze_sucker.dm +++ b/monkestation/code/modules/slimecore/machines/ooze_sucker.dm @@ -2,8 +2,6 @@ #define SUCKER_UPGRADE_BALANCER "balancer" #define SUCKER_UPGRADE_CAPACITY "capacity" -GLOBAL_LIST_EMPTY_TYPED(ooze_suckers, /obj/machinery/plumbing/ooze_sucker) - ///this cannablizes floor_pump code but rips specific reagents and and such just does stuff itself so it can be expanded easier in the future /obj/machinery/plumbing/ooze_sucker name = "ooze sucker" @@ -47,7 +45,6 @@ GLOBAL_LIST_EMPTY_TYPED(ooze_suckers, /obj/machinery/plumbing/ooze_sucker) /obj/machinery/plumbing/ooze_sucker/Initialize(mapload, bolt, layer) . = ..() - GLOB.ooze_suckers += src AddComponent(/datum/component/plumbing/simple_supply, bolt, layer) return INITIALIZE_HINT_LATELOAD @@ -55,10 +52,6 @@ GLOBAL_LIST_EMPTY_TYPED(ooze_suckers, /obj/machinery/plumbing/ooze_sucker) . = ..() locate_machinery() -/obj/machinery/plumbing/ooze_sucker/Destroy() - GLOB.ooze_suckers -= src - return ..() - /obj/machinery/plumbing/ooze_sucker/locate_machinery(multitool_connection) if(!mapping_id) return diff --git a/monkestation/code/modules/slimecore/machines/slime_pen_controller.dm b/monkestation/code/modules/slimecore/machines/slime_pen_controller.dm index 04bd25de1a8a87..274c482a586376 100644 --- a/monkestation/code/modules/slimecore/machines/slime_pen_controller.dm +++ b/monkestation/code/modules/slimecore/machines/slime_pen_controller.dm @@ -1,5 +1,3 @@ -GLOBAL_LIST_EMPTY_TYPED(slime_pen_controllers, /obj/machinery/slime_pen_controller) - /obj/item/wallframe/slime_pen_controller name = "slime pen management frame" desc = "Used for building slime pen consoles." @@ -23,7 +21,6 @@ GLOBAL_LIST_EMPTY_TYPED(slime_pen_controllers, /obj/machinery/slime_pen_controll /obj/machinery/slime_pen_controller/Initialize(mapload) . = ..() - GLOB.slime_pen_controllers += src register_context() return INITIALIZE_HINT_LATELOAD @@ -31,10 +28,6 @@ GLOBAL_LIST_EMPTY_TYPED(slime_pen_controllers, /obj/machinery/slime_pen_controll . = ..() locate_machinery() -/obj/machinery/slime_pen_controller/Destroy() - GLOB.slime_pen_controllers -= src - return ..() - /obj/machinery/slime_pen_controller/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = ..() diff --git a/monkestation/code/modules/slimecore/slime_traits/_base_trait.dm b/monkestation/code/modules/slimecore/slime_traits/_base_trait.dm index b5c536132c58e0..be953b5f8fd0a1 100644 --- a/monkestation/code/modules/slimecore/slime_traits/_base_trait.dm +++ b/monkestation/code/modules/slimecore/slime_traits/_base_trait.dm @@ -25,55 +25,34 @@ host.update_overlays() host.update_appearance() -/datum/slime_trait/proc/apply_overlays(obj/item/source, list/overlays) - SIGNAL_HANDLER - return NONE - /datum/slime_trait/proc/on_remove(mob/living/basic/slime/parent) - if(trait_flags & TRAIT_ON_DEATH) - UnregisterSignal(host, COMSIG_LIVING_DEATH) - if(trait_flags & TRAIT_VISUAL) - UnregisterSignal(host, COMSIG_ATOM_UPDATE_OVERLAYS) - host.update_overlays() - host.update_appearance() + return /datum/slime_trait/proc/on_death() return +/datum/slime_trait/proc/apply_overlays(obj/item/source, list/overlays) + return + + /datum/slime_trait/visual + trait_flags = (TRAIT_VISUAL) - // The visual icon_state of the trait. + //the visual icon_state of the trait var/trait_icon_state - /// The icon path of the trait. + ///the icon path of the trait var/trait_icon - /// The mutable_appearance object that will be created. - var/mutable_appearance/slime_visual -/datum/slime_trait/visual/Destroy() - if(slime_visual) - QDEL_NULL(slime_visual) - return ..() -/datum/slime_trait/visual/on_add(mob/living/basic/slime/parent) - . = ..() - if(!host) +/datum/slime_trait/visual/apply_overlays(obj/item/source, list/overlays) + if(!trait_icon || !trait_icon_state) return - if(trait_icon && trait_icon_state) - slime_visual = mutable_appearance(trait_icon, trait_icon_state, host.layer) - LAZYADD(host.update_overlays_on_z, slime_visual) -/datum/slime_trait/visual/on_remove(mob/living/basic/slime/parent) - . = ..() - if(slime_visual) - LAZYREMOVE(host.update_overlays_on_z, slime_visual) - QDEL_NULL(slime_visual) + var/mutable_appearance/slime_visual = mutable_appearance(trait_icon, trait_icon_state, host.layer, host, host.plane) -/datum/slime_trait/visual/apply_overlays(obj/item/source, list/overlays) - if(!slime_visual) - return - SET_PLANE_EXPLICIT(slime_visual, PLANE_TO_TRUE(host.plane), host) if(!host.overwrite_color) slime_visual.color = host.current_color.slime_color else slime_visual.color = host.overwrite_color + overlays += slime_visual diff --git a/monkestation/code/modules/station_goals/meteor_shield.dm b/monkestation/code/modules/station_goals/meteor_shield.dm new file mode 100644 index 00000000000000..b302624f958c00 --- /dev/null +++ b/monkestation/code/modules/station_goals/meteor_shield.dm @@ -0,0 +1,146 @@ +GLOBAL_LIST_EMPTY(meteor_shield_sats) + +/obj/machinery/satellite/meteor_shield + /// Whether the meteor sat checks for line of sight to determine if it can intercept a meteor. + var/check_sight = TRUE + /// The proximity monitor used to detect meteors entering the shield's range. + var/datum/proximity_monitor/meteor_monitor + /// A counter for how many meteors this specific satellite has zapped. + var/meteors_zapped = 0 + +/obj/machinery/satellite/meteor_shield/Initialize(mapload) + . = ..() + AddElement(/datum/element/repackable, /obj/item/flatpacked_machine/generic, 5 SECONDS, TRUE, TRUE) + + GLOB.meteor_shield_sats += src + RegisterSignal(src, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(on_space_move)) // so these fuckers don't drift off into space when you're trying to position them + setup_proximity() + register_context() + +/obj/machinery/satellite/meteor_shield/examine(mob/user) + . = ..() + . += span_info("It has stopped [meteors_zapped] meteors so far.") + +/obj/machinery/satellite/meteor_shield/proc/on_space_move(datum/source) + SIGNAL_HANDLER + return COMSIG_MOVABLE_STOP_SPACEMOVE + +/obj/machinery/satellite/meteor_shield/Destroy() + GLOB.meteor_shield_sats -= src + if(meteor_monitor) + QDEL_NULL(meteor_monitor) + return ..() + +/obj/machinery/satellite/meteor_shield/vv_edit_var(vname, vval) + . = ..() + if(.) + switch(vname) + if(NAMEOF(src, kill_range)) + meteor_monitor?.set_range(kill_range) + if(NAMEOF(src, active)) + setup_proximity() + +/obj/machinery/satellite/meteor_shield/add_context(atom/source, list/context, obj/item/held_item, mob/user) + context[SCREENTIP_CONTEXT_LMB] = active ? "Deactivate" : "Activate" + return CONTEXTUAL_SCREENTIP_SET + +/obj/machinery/satellite/meteor_shield/HasProximity(obj/effect/meteor/meteor) + if(!active || !istype(meteor) || QDELING(meteor) || (obj_flags & EMAGGED)) + return + var/turf/our_turf = get_turf(src) + var/turf/meteor_turf = get_turf(meteor) + if(!check_los(our_turf, meteor_turf)) + return + our_turf.Beam(meteor_turf, icon_state = "sat_beam", time = 5) + if(meteor.shield_defense(src)) + new /obj/effect/temp_visual/explosion(meteor_turf) + INVOKE_ASYNC(src, PROC_REF(play_zap_sound), meteor_turf) + SSblackbox.record_feedback("tally", "meteors_zapped", 1, "[meteor.type]") + meteors_zapped++ + qdel(meteor) + +/obj/machinery/satellite/meteor_shield/proc/check_los(turf/source, turf/target) as num + // if something goes fucky wucky, let's just assume line-of-sight by default + if(!check_sight) + return TRUE + for(var/turf/segment as anything in get_line(source, target)) + if(QDELETED(segment)) + continue + if(isclosedturf(segment) && !istransparentturf(segment)) + return FALSE + return TRUE + +/obj/machinery/satellite/meteor_shield/proc/play_zap_sound(turf/epicenter) + if(QDELETED(epicenter)) + return + var/static/near_distance + if(isnull(near_distance)) + var/list/world_view = getviewsize(world.view) + near_distance = max(world_view[1], world_view[2]) + SSexplosions.shake_the_room( + epicenter, + near_distance, + far_distance = near_distance * 3, + quake_factor = 0, + echo_factor = 0, + creaking = FALSE, + near_sound = sound('sound/weapons/lasercannonfire.ogg'), + far_sound = sound('sound/weapons/marauder.ogg') + ) + +/obj/machinery/satellite/meteor_shield/toggle(user) + . = ..() + setup_proximity() + +/obj/machinery/satellite/meteor_shield/emag_act(mob/user, obj/item/card/emag/emag_card) + . = ..() + setup_proximity() + +/obj/machinery/satellite/meteor_shield/proc/setup_proximity() + if((obj_flags & EMAGGED) || !active) + if(!QDELETED(meteor_monitor)) + QDEL_NULL(meteor_monitor) + else + if(QDELETED(meteor_monitor)) + meteor_monitor = new(src, kill_range) + +/obj/machinery/satellite/meteor_shield/piercing + check_sight = FALSE + +/proc/get_meteor_sat_coverage() as num + var/list/covered_tiles = list() + for(var/obj/machinery/satellite/meteor_shield/sat as anything in GLOB.meteor_shield_sats) + if(QDELETED(sat) || !sat.active || !is_station_level(sat.z) || (sat.obj_flags & EMAGGED)) + continue + if(sat.check_sight) + covered_tiles |= view(sat.kill_range, sat) + else + covered_tiles |= range(sat.kill_range, sat) + return length(covered_tiles) + + +/obj/machinery/satellite/meteor_shield/proc/change_meteor_chance(mod = 1) + var/static/list/meteor_event_typecache + if(!meteor_event_typecache) + meteor_event_typecache = typecacheof(list( + /datum/round_event_control/meteor_wave, + /datum/round_event_control/sandstorm, + /datum/round_event_control/space_dust, + /datum/round_event_control/stray_meteor + )) + var/list/all_events = SSevents.control | SSgamemode.control + for(var/datum/round_event_control/event as anything in all_events) + if(is_type_in_typecache(event, meteor_event_typecache)) + event.weight *= mod + + +/obj/item/meteor_shield_capsule + name = "meteor shield satellite capsule" + desc = "A bluespace capsule which a single unit of meteor shield satellite is compressed within. If you activate this capsule, a meteor shield satellite will pop out. You still need to install these." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + +/obj/item/meteor_shield_capsule/Initialize(mapload) + . = ..() + AddComponent(/datum/component/deployable, 5 SECONDS, /obj/machinery/satellite/meteor_shield, delete_on_use = TRUE) diff --git a/monkestation/code/modules/store/atm/_atm.dm b/monkestation/code/modules/store/atm/_atm.dm index 87aeeff4e1018b..afb175491c93db 100644 --- a/monkestation/code/modules/store/atm/_atm.dm +++ b/monkestation/code/modules/store/atm/_atm.dm @@ -7,6 +7,8 @@ max_integrity = 10000 + pixel_y = 30 + icon = 'monkestation/icons/obj/machines/atm.dmi' icon_state = "atm" @@ -19,11 +21,8 @@ ///static variable to check if a lottery is running var/static/lottery_running = FALSE -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atm, 30) - /obj/machinery/atm/Initialize(mapload) . = ..() - REGISTER_REQUIRED_MAP_ITEM(1, INFINITY) if(!lottery_running) lottery_running = TRUE addtimer(CALLBACK(src, PROC_REF(pull_lottery_winner)), 20 MINUTES) @@ -155,12 +154,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atm, 30) var/obj/item/stack/monkecoin/coin_stack = new(living_user.loc) coin_stack.amount = withdraw_amount - coin_stack.update_desc() living_user.put_in_hands(coin_stack) - /obj/machinery/atm/attacked_by(obj/item/attacking_item, mob/living/user) . = ..() if(do_after(user, 1 SECONDS, src)) @@ -225,8 +222,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atm, 30) /obj/item/stack/monkecoin name = "monkecoin" singular_name = "monkecoin" - icon = 'monkestation/icons/obj/monkecoin.dmi' - icon_state = "monkecoin" + icon = 'monkestation/icons/obj/economy.dmi' + icon_state = "coins" amount = 1 max_amount = INFINITY throwforce = 0 @@ -234,20 +231,19 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atm, 30) throw_range = 2 w_class = WEIGHT_CLASS_TINY full_w_class = WEIGHT_CLASS_TINY - resistance_flags = FIRE_PROOF | ACID_PROOF + resistance_flags = FLAMMABLE merge_type = /obj/item/stack/monkecoin var/value = 100 -/obj/item/stack/monkecoin/Initialize(mapload, new_amount, merge = FALSE, list/mat_override=null, mat_amt=1) +/obj/item/stack/monkecoin/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1) . = ..() update_desc() /obj/item/stack/monkecoin/update_desc() . = ..() var/total_worth = get_item_credit_value() - desc = "Monkecoin, it's the backbone of the economy. " - desc += "It's worth [total_worth] credit[(total_worth > 1) ? "s" : null] in total." - update_icon_state() + desc = "It's worth [total_worth] credit[(total_worth > 1) ? "s" : null] in total.\n" + desc += "Their are [amount] monkecoins in this stack." /obj/item/stack/monkecoin/get_item_credit_value() return (amount*value) @@ -262,23 +258,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atm, 30) /obj/item/stack/monkecoin/update_icon_state() . = ..() - var/coinpress = copytext("[amount]",1,2) switch(amount) - if(1 to 9) - icon_state = "[initial(icon_state)][coinpress]" - if(10 to 99) - icon_state = "[initial(icon_state)][coinpress]0" - if(100 to 999) - icon_state = "[initial(icon_state)][coinpress]00" - if(1000 to 8999) - icon_state = "[initial(icon_state)][coinpress]000" - if(9000 to INFINITY) - icon_state = "[initial(icon_state)]9000" - -/obj/item/stack/monkecoin/suicide_act(mob/living/carbon/user) - user.visible_message(span_suicide("[user] begins to gouge [user.p_their()] eyes with the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) - user.emote("scream") - if(do_after(user, 5 SECONDS, src)) - return BRUTELOSS - else - user.visible_message(span_suicide("[user] puts the [src] down away from [user.p_their()] eyes.")) + if(1) + icon_state = initial(icon_state) + if(2 to 9) + icon_state = "[initial(icon_state)]_2" + if(10 to 24) + icon_state = "[initial(icon_state)]_3" + if(25 to INFINITY) + icon_state = "[initial(icon_state)]_4" diff --git a/monkestation/code/modules/store/store_items/neck.dm b/monkestation/code/modules/store/store_items/neck.dm index aa59362d377032..ddd77f98a3b691 100644 --- a/monkestation/code/modules/store/store_items/neck.dm +++ b/monkestation/code/modules/store/store_items/neck.dm @@ -180,60 +180,3 @@ GLOBAL_LIST_INIT(store_neck, generate_store_items(/datum/store_item/neck)) name = "Rainbow Bow Tie" item_path = /obj/item/clothing/neck/bowtie/rainbow item_cost = 10000 - -/// EVERYTHING NOVA RELATED - -/datum/store_item/neck/gags_cloak //BUYABLE - name = "Colourable Cloak" - item_path = /obj/item/clothing/neck/cloak/colourable - item_cost = 7500 - -/datum/store_item/neck/gags_veil //BUYABLE - name = "Colourable Veil" - item_path = /obj/item/clothing/neck/cloak/colourable/veil - item_cost = 7500 - -/datum/store_item/neck/gags_shroud //BUYABLE - name = "Colourable Shroud" - item_path = /obj/item/clothing/neck/cloak/colourable/shroud - item_cost = 7500 - -/datum/store_item/neck/gags_mantle //BUYABLE - name = "Colourable Mantle" - item_path = /obj/item/clothing/neck/mantle/recolorable - item_cost = 5000 - -/datum/store_item/neck/long_cape //BUYABLE - name = "Long Colourable Cape" - item_path = /obj/item/clothing/neck/long_cape - item_cost = 7500 - -/datum/store_item/neck/wide_cape //BUYABLE - name = "Wide Colourable Cape" - item_path = /obj/item/clothing/neck/wide_cape - item_cost = 5000 - -/datum/store_item/neck/robe_cape //BUYABLE - name = "Robed Colourable Cape" - item_path = /obj/item/clothing/neck/robe_cape - item_cost = 5000 - -/datum/store_item/neck/maid_neck_cover //BUYABLE - name = "Colourable Maid Neck Cover" - item_path = /obj/item/clothing/neck/maid_neck_cover - item_cost = 2500 - -/datum/store_item/neck/face_scarf //BUYABLE - name = "Colourable Face Scarf" - item_path = /obj/item/clothing/neck/face_scarf - item_cost = 2500 - -/datum/store_item/neck/mantle //BUYABLE - name = "Mantle" - item_path = /obj/item/clothing/neck/mantle - item_cost = 5000 - -/datum/store_item/neck/imperial_police_cloak //BUYABLE - name = "Imperial Police Cloak" - item_path = /obj/item/clothing/neck/cloak/colonial/nri_police - item_cost = 7500 diff --git a/monkestation/code/modules/store/store_items/shoes.dm b/monkestation/code/modules/store/store_items/shoes.dm index 70798b4edc5856..f58354fdfb5bd9 100644 --- a/monkestation/code/modules/store/store_items/shoes.dm +++ b/monkestation/code/modules/store/store_items/shoes.dm @@ -116,25 +116,3 @@ GLOBAL_LIST_INIT(store_shoes, generate_store_items(/datum/store_item/shoes)) name = "Jester Shoes" item_path = /obj/item/clothing/shoes/clown_shoes/clown_jester_shoes item_cost = 4000 - -/// EVERYTHING NOVA RELATED - -/datum/store_item/shoes/nova/wraps/swag - name = "gilded foot wraps" - item_path = /obj/item/clothing/shoes/wraps - item_cost = 4000 //The price of kissing glass shards - -/datum/store_item/shoes/nova/wraps/drip - name = "silver leg wraps" - item_path = /obj/item/clothing/shoes/wraps/silver - item_cost = 3000 //The price of kissing glass shards - -/datum/store_item/shoes/nova/jungleboots - name = "jungle boots" - item_path = /obj/item/clothing/shoes/jungleboots - item_cost = 4000 - -/datum/store_item/shoes/nova/kimshoes - name = "aerostatic boots" - item_path = /obj/item/clothing/shoes/kimshoes - item_cost = 2500 diff --git a/monkestation/code/modules/store/store_items/under.dm b/monkestation/code/modules/store/store_items/under.dm index 4b8153f1235b4c..c07e33129a1ce9 100644 --- a/monkestation/code/modules/store/store_items/under.dm +++ b/monkestation/code/modules/store/store_items/under.dm @@ -464,400 +464,3 @@ GLOBAL_LIST_INIT(store_miscunders, generate_store_items(/datum/store_item/under/ name = "Shrine Priestess Kimono" item_path = /obj/item/clothing/under/dress/shrine_priestess item_cost = 5000 - -/// EVERYTHING NOVA RELATED - -/datum/store_item/under/jumpsuit/imperial_police_uniform //BUYABLE - name = "Imperial Police Uniform" - item_path = /obj/item/clothing/under/colonial/nri_police - item_cost = 4000 - -/datum/store_item/under/jumpsuit/sol_peacekeeper //BUYABLE - name = "Sol Peacekeeper Uniform" - item_path = /obj/item/clothing/under/sol_peacekeeper - item_cost = 4000 - -/datum/store_item/under/jumpsuit/utility //BUYABLE - name = "Utility Uniform" - item_path = /obj/item/clothing/under/misc/nova/utility - item_cost = 3000 - -/datum/store_item/under/miscellaneous/vicvest //BUYABLE - name = "Recolorable Buttondown Shirt with Double-Breasted Vest" - item_path = /obj/item/clothing/under/pants/nova/vicvest - item_cost = 1500 - -/datum/store_item/under/miscellaneous/slacks //BUYABLE - name = "Recolorable Slacks" - item_path = /obj/item/clothing/under/pants/slacks //BUYABLE - item_cost = 2500 - -/datum/store_item/under/miscellaneous/jeans //BUYABLE - name = "Recolorable Jeans" - item_path = /obj/item/clothing/under/pants/jeans - item_cost = 2500 - -/datum/store_item/under/miscellaneous/jeansripped //BUYABLE - name = "Recolorable Ripped Jeans" - item_path = /obj/item/clothing/under/pants/nova/jeans_ripped //BUYABLE - item_cost = 2500 - -/datum/store_item/under/miscellaneous/yoga //BUYABLE - name = "Recolorable Yoga Pants" - item_path = /obj/item/clothing/under/pants/nova/yoga - item_cost = 1500 - -/datum/store_item/under/miscellaneous/track //BUYABLE - name = "Track Pants" - item_path = /obj/item/clothing/under/pants/track - item_cost = 1500 - -/datum/store_item/under/miscellaneous/camo //BUYABLE - name = "Camo Pants" - item_path = /obj/item/clothing/under/pants/camo - item_cost = 1500 - -/datum/store_item/under/miscellaneous/jeanshorts //BUYABLE - name = "Recolorable Jean Shorts" - item_path = /obj/item/clothing/under/shorts/jeanshorts - item_cost = 2500 - -/datum/store_item/under/miscellaneous/pants_blackshorts //BUYABLE - name = "Recolorable Ripped Jean Shorts" - item_path = /obj/item/clothing/under/shorts/nova/shorts_ripped - item_cost = 2500 - -/datum/store_item/under/miscellaneous/shortershorts //BUYABLE - name = "Recolorable Shorter Shorts" - item_path = /obj/item/clothing/under/shorts/nova/shortershorts - item_cost = 1500 - -/datum/store_item/under/miscellaneous/shorts //BUYABLE - name = "Recolorable Shorts" - item_path = /obj/item/clothing/under/shorts - item_cost = 2500 - -/datum/store_item/under/miscellaneous/red_short //BUYABLE - name = "Red Shorts" - item_path = /obj/item/clothing/under/shorts/red - item_cost = 1500 - -/datum/store_item/under/miscellaneous/green_short //BUYABLE - name = "Green Shorts" - item_path = /obj/item/clothing/under/shorts/green - item_cost = 1500 - -/datum/store_item/under/miscellaneous/blue_short //BUYABLE - name = "Blue Shorts" - item_path = /obj/item/clothing/under/shorts/blue - item_cost = 1500 - -/datum/store_item/under/miscellaneous/black_short //BUYABLE - name = "Black Shorts" - item_path = /obj/item/clothing/under/shorts/black - item_cost = 1500 - -/datum/store_item/under/miscellaneous/grey_short //BUYABLE - name = "Grey Shorts" - item_path = /obj/item/clothing/under/shorts/grey - item_cost = 1500 - -/datum/store_item/under/miscellaneous/purple_short //BUYABLE - name = "Purple Shorts" - item_path = /obj/item/clothing/under/shorts/purple - item_cost = 1500 - -/datum/store_item/under/miscellaneous/recolorable_kilt //BUYABLE - name = "Recolorable Kilt" - item_path = /obj/item/clothing/under/pants/nova/kilt - item_cost = 2000 - -/datum/store_item/under/miscellaneous/dress_striped //BUYABLE - name = "Striped Dress" - item_path = /obj/item/clothing/under/dress/striped - item_cost = 1500 - -/datum/store_item/under/miscellaneous/skirt_cableknit //BUYABLE - name = "Recolorable Cableknit Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/turtleskirt_knit - item_cost = 1500 - -/datum/store_item/under/miscellaneous/straplessdress //BUYABLE - name = "Recolorable Strapless Dress" - item_path = /obj/item/clothing/under/dress/nova/strapless - item_cost = 1500 - -/datum/store_item/under/miscellaneous/pentagramdress //BUYABLE - name = "Recolorable Pentagram Strapped Dress" - item_path = /obj/item/clothing/under/dress/nova/pentagram - item_cost = 2000 - -/datum/store_item/under/miscellaneous/jacarta_dress //BUYABLE - name = "Jacarta Dress" - item_path = /obj/item/clothing/under/dress/nova/jute - item_cost = 1500 - -/datum/store_item/under/miscellaneous/red_skirt //BUYABLE - name = "Red Bra and Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/red_skirt - item_cost = 1500 - -/datum/store_item/under/miscellaneous/striped_skirt //BUYABLE - name = "Red Bra and Striped Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/striped_skirt - item_cost = 1500 - -/datum/store_item/under/miscellaneous/black_skirt //BUYABLE - name = "Black Bra and Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/black_skirt - item_cost = 1500 - -/datum/store_item/under/miscellaneous/swept_skirt //BUYABLE - name = "Swept Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/swept - item_cost = 1500 - -/datum/store_item/under/miscellaneous/lone_skirt //BUYABLE - name = "Recolorable Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/lone_skirt - item_cost = 1500 - -/datum/store_item/under/miscellaneous/medium_skirt //BUYABLE - name = "Medium Colourable Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/medium - item_cost = 1500 - -/datum/store_item/under/miscellaneous/long_skirt //BUYABLE - name = "Long Colourable Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/long - item_cost = 1500 - -/datum/store_item/under/miscellaneous/denim_skirt //BUYABLE - name = "Jean Skirt" - item_path = /obj/item/clothing/under/dress/skirt/nova/jean - item_cost = 1000 - -/datum/store_item/under/miscellaneous/littleblack //BUYABLE - name = "Short Black Dress" - item_path = /obj/item/clothing/under/dress/nova/short_dress - item_cost = 1000 - -/datum/store_item/under/miscellaneous/pinktutu //BUYABLE - name = "Pink Tutu" - item_path = /obj/item/clothing/under/dress/nova/pinktutu - item_cost = 1000 - -/datum/store_item/under/miscellaneous/flowerdress //BUYABLE - name = "Flower Dress" - item_path = /obj/item/clothing/under/dress/nova/flower - item_cost = 1000 - -/datum/store_item/under/miscellaneous/tactical_hawaiian_orange //BUYABLE - name = "Tactical Hawaiian Outfit - Orange" - item_path = /obj/item/clothing/under/tachawaiian - item_cost = 3000 - -/datum/store_item/under/miscellaneous/tactical_hawaiian_blue //BUYABLE - name = "Tactical Hawaiian Outfit - Blue" - item_path = /obj/item/clothing/under/tachawaiian/blue - item_cost = 3000 - -/datum/store_item/under/miscellaneous/tactical_hawaiian_purple //BUYABLE - name = "Tactical Hawaiian Outfit - Purple" - item_path = /obj/item/clothing/under/tachawaiian/purple - item_cost = 3000 - -/datum/store_item/under/miscellaneous/tactical_hawaiian_green //BUYABLE - name = "Tactical Hawaiian Outfit - Green" - item_path = /obj/item/clothing/under/tachawaiian/green - item_cost = 3000 - -/datum/store_item/under/miscellaneous/yukata //BUYABLE - name = "Yukata" - item_path = /obj/item/clothing/under/costume/nova/yukata - item_cost = 2500 - -/datum/store_item/under/miscellaneous/qipao_black //BUYABLE - name = "Qipao" - item_path = /obj/item/clothing/under/costume/nova/qipao - item_cost = 2500 - -/datum/store_item/under/miscellaneous/qipao_recolorable //BUYABLE - name = "Qipao, Custom Trim" - item_path = /obj/item/clothing/under/costume/nova/qipao/customtrim - item_cost = 2500 - -/datum/store_item/under/miscellaneous/cheongsam //BUYABLE - name = "Cheongsam" - item_path = /obj/item/clothing/under/costume/nova/cheongsam - item_cost = 2500 - -/datum/store_item/under/miscellaneous/cheongsam_recolorable //BUYABLE - name = "Cheongsam, Custom Trim" - item_path = /obj/item/clothing/under/costume/nova/cheongsam/customtrim - item_cost = 2500 - -/datum/store_item/under/miscellaneous/kimono //BUYABLE - name = "Fancy Kimono" - item_path = /obj/item/clothing/under/costume/nova/kimono - item_cost = 2500 - -/datum/store_item/under/miscellaneous/chaps //BUYABLE - name = "Black Chaps" - item_path = /obj/item/clothing/under/pants/nova/chaps - item_cost = 1500 - -/datum/store_item/under/miscellaneous/tracky //BUYABLE - name = "Blue Tracksuit" - item_path = /obj/item/clothing/under/misc/bluetracksuit - item_cost = 1500 - -/datum/store_item/under/miscellaneous/cybersleek //BUYABLE - name = "Sleek Modern Coat" - item_path = /obj/item/clothing/under/costume/cybersleek - item_cost = 4000 - -/datum/store_item/under/miscellaneous/cybersleek_long //BUYABLE - name = "Long Modern Coat" - item_path = /obj/item/clothing/under/costume/cybersleek/long - item_cost = 4000 - -/datum/store_item/under/miscellaneous/dutch //BUYABLE - name = "Dutch Suit" - item_path = /obj/item/clothing/under/costume/dutch - item_cost = 5000 - -/datum/store_item/under/miscellaneous/cavalry //BUYABLE - name = "Cavalry Uniform" - item_path = /obj/item/clothing/under/costume/nova/cavalry - item_cost = 5000 - -/datum/store_item/under/miscellaneous/expeditionary_corps //BUYABLE - name = "Expeditionary Corps Uniform" - item_path = /obj/item/clothing/under/rank/expeditionary_corps - item_cost = 3000 - -/datum/store_item/under/miscellaneous/tactical_pants //BUYABLE - name = "Tactical Pants" - item_path = /obj/item/clothing/under/pants/tactical - item_cost = 1500 - -/datum/store_item/under/miscellaneous/jabroni //BUYABLE - name = "Jabroni Outfit" - item_path = /obj/item/clothing/under/costume/jabroni - item_cost = 1500 - -/datum/store_item/under/miscellaneous/taccas //BUYABLE - name = "Tacticasual Uniform" - item_path = /obj/item/clothing/under/misc/nova/taccas - item_cost = 3000 - -/datum/store_item/under/formal/formaldressred //BUYABLE - name = "Formal Red Dress" - item_path = /obj/item/clothing/under/dress/nova/redformal - item_cost = 3000 - -/datum/store_item/under/formal/countessdress //BUYABLE - name = "Countess Dress" - item_path = /obj/item/clothing/under/dress/nova/countess - item_cost = 5000 - -/datum/store_item/under/formal/executive_suit_alt //BUYABLE - name = "Wide-collared Executive Suit" - item_path = /obj/item/clothing/under/suit/nova/black_really_collared - item_cost = 5000 - -/datum/store_item/under/formal/executive_skirt_alt //BUYABLE - name = "Wide-collared Executive Suitskirt" - item_path = /obj/item/clothing/under/suit/nova/black_really_collared/skirt - item_cost = 5000 - -/datum/store_item/under/formal/navy_suit //BUYABLE - name = "Navy Suit" - item_path = /obj/item/clothing/under/suit/navy - item_cost = 5000 - -/datum/store_item/under/formal/helltaker //BUYABLE - name = "Red Shirt with White Trousers" - item_path = /obj/item/clothing/under/suit/nova/helltaker - item_cost = 1500 - -/datum/store_item/under/formal/helltaker/skirt //BUYABLE - name = "Red Shirt with White Skirt" - item_path = /obj/item/clothing/under/suit/nova/helltaker/skirt - item_cost = 1500 - -/datum/store_item/under/formal/fancy_suit //BUYABLE - name = "Fancy Suit" - item_path = /obj/item/clothing/under/suit/fancy - item_cost = 1500 - -/datum/store_item/under/formal/recolorable_suit //BUYABLE - name = "Recolorable Formal Suit" - item_path = /obj/item/clothing/under/suit/nova/recolorable - item_cost = 4000 - -/datum/store_item/under/formal/recolorable_suitskirt //BUYABLE - name = "Recolorable Formal Suitskirt" - item_path = /obj/item/clothing/under/suit/nova/recolorable/skirt - item_cost = 4000 - -/datum/store_item/under/formal/recolorable_suit/casual //BUYABLE - name = "Office Casual Suit" - item_path = /obj/item/clothing/under/suit/nova/recolorable/casual - item_cost = 2000 - -/datum/store_item/under/formal/recolorable_suit/executive //BUYABLE - name = "Executive Casual Suit" - item_path = /obj/item/clothing/under/suit/nova/recolorable/executive - item_cost = 2000 - -/datum/store_item/under/formal/pencil //BUYABLE - name = "Pencilskirt with Shirt" - item_path = /obj/item/clothing/under/suit/nova/pencil - item_cost = 1500 - -/datum/store_item/under/formal/pencil/noshirt //BUYABLE - name = "Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/noshirt - item_cost = 1500 - -/datum/store_item/under/formal/pencil/black_really //BUYABLE - name = "Executive Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/black_really - item_cost = 1500 - -/datum/store_item/under/formal/pencil/charcoal //BUYABLE - name = "Charcoal Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/charcoal - item_cost = 1500 - -/datum/store_item/under/formal/pencil/navy //BUYABLE - name = "Navy Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/navy - item_cost = 1500 - -/datum/store_item/under/formal/pencil/burgandy //BUYABLE - name = "Burgandy Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/burgandy - item_cost = 1500 - -/datum/store_item/under/formal/pencil/checkered //BUYABLE - name = "Checkered Pencilskirt with Shirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/checkered - item_cost = 1500 - -/datum/store_item/under/formal/pencil/checkered/noshirt //BUYABLE - name = "Checkered Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/checkered/noshirt - item_cost = 1500 - -/datum/store_item/under/formal/pencil/tan //BUYABLE - name = "Tan Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/tan - item_cost = 1500 - -/datum/store_item/under/formal/pencil/green //BUYABLE - name = "Green Pencilskirt" - item_path = /obj/item/clothing/under/suit/nova/pencil/green - item_cost = 1500 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm index 700957dff6c656..cc79e2a2f7fa98 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm @@ -16,7 +16,6 @@ JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) enemy_roles = list( JOB_CAPTAIN, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm index 1bdf4c177a0a7d..31fa22fc383ba5 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm @@ -14,7 +14,6 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/brother.dm b/monkestation/code/modules/storytellers/converted_events/solo/brother.dm index c29c3ee7eac301..82decee034ee0e 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/brother.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/brother.dm @@ -15,7 +15,6 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm index 39e9d605a7e448..ec0f4d5cae3451 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm @@ -14,7 +14,6 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm index 0ebe10a6fd18fe..b1e009c05f3c26 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm @@ -16,7 +16,6 @@ JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) enemy_roles = list( JOB_CAPTAIN, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm index dc86d98cb9b9c3..d9854eb7394a07 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm @@ -18,7 +18,6 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) base_antags = 3 maximum_antags = 5 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm index 04905fcedf425c..eb7e43577b2ef8 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm @@ -17,7 +17,6 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) base_antags = 3 maximum_antags = 4 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm index 726b1a809bbf49..63e495b808c283 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm @@ -15,7 +15,6 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/malf.dm b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm index 2bf10fa56d9b55..713bd92de05766 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/malf.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm @@ -12,7 +12,6 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) shared_occurence_type = SHARED_HIGH_THREAT maximum_antags = 1 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm b/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm index 52f7647ae51512..be39ec01ca7db5 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm @@ -18,7 +18,6 @@ JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm index f2a5a12a3e1408..a6ca5701b713cb 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm @@ -18,7 +18,6 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) base_antags = 3 maximum_antags = 5 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm index eb8fce9f4aeb0e..aabee93a82a85a 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm @@ -18,7 +18,6 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, - JOB_BRIG_PHYSICIAN, ) base_antags = 2 enemy_roles = list( diff --git a/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm index 58ed6dd76653dc..ecc377c9f386ec 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm @@ -14,7 +14,6 @@ JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_ASSISTANT, - JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/uplink/uplink_items/job.dm b/monkestation/code/modules/uplink/uplink_items/job.dm index 216d4cb5987d0f..8d80747eca3d5f 100644 --- a/monkestation/code/modules/uplink/uplink_items/job.dm +++ b/monkestation/code/modules/uplink/uplink_items/job.dm @@ -11,3 +11,55 @@ /datum/uplink_item/role_restricted/modified_syringe_gun surplus = 50 + +/datum/uplink_item/role_restricted/clonekit + name = "Clone Army Kit" + desc = "Everything you need for a clone army, armaments not included." + progression_minimum = 5 MINUTES + cost = 20 + item = /obj/item/storage/box/clonearmy + restricted_roles = list(JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CARGO_TECHNICIAN, JOB_QUARTERMASTER) // Experimental cloners were traditionally bought by cargo. + +///I know this probably isn't the right place to put it, but I don't know where I should put it, and I can move it later. +/obj/item/disk/clonearmy + name = "DNA data disk" //Cunning disguise. + var/objective = "" + icon_state = "datadisk0" + +/obj/item/disk/clonearmy/Initialize(mapload) + . = ..() + icon_state = "datadisk[rand(0,7)]" + add_overlay("datadisk_gene") + +/obj/item/disk/clonearmy/attack_self(mob/user) + var/targName = tgui_input_text(user, "Enter a directive for the evil clones.", "Clone Directive Entry", objective, CONFIG_GET(number/max_law_len), TRUE) + if(!targName) + return + if(is_ic_filtered(targName)) + to_chat(user, span_warning("Error: Directive contains invalid text.")) + return + var/list/soft_filter_result = is_soft_ooc_filtered(targName) + if(soft_filter_result) + if(tgui_alert(user,"Your directive contains \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\". \"[soft_filter_result[CHAT_FILTER_INDEX_REASON]]\", Are you sure you want to use it?", "Soft Blocked Word", list("Yes", "No")) != "Yes") + return + message_admins("[ADMIN_LOOKUPFLW(user)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\" they may be using a disallowed term for a clone directive. Directive: \"[html_encode(targName)]\"") + log_admin_private("[key_name(user)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\" they may be using a disallowed term for a clone directive. Directive: \"[targName]\"") + objective = targName + ..() + +/obj/item/disk/clonearmy/attack() + return + +/obj/item/disk/clonearmy/afterattack(atom/target, mob/user, proximity) + . = ..() + var/atom/A = target + if(!proximity) + return + . |= AFTERATTACK_PROCESSED_ITEM + if(!istype(A, /obj/machinery/clonepod/experimental)) + return + to_chat(user, "You upload the directive to the experimental cloner.") + var/obj/machinery/clonepod/experimental/pod = target + pod.custom_objective = objective + pod.RefreshParts() + pod.locked = TRUE // The pod shouldn't be eligible for cloner event. diff --git a/monkestation/icons/mob/clothing/jobs/brig_physician.dmi b/monkestation/icons/mob/clothing/jobs/brig_physician.dmi deleted file mode 100644 index 56be335082d7a6..00000000000000 Binary files a/monkestation/icons/mob/clothing/jobs/brig_physician.dmi and /dev/null differ diff --git a/monkestation/icons/mob/clothing/species/suit_digi.dmi b/monkestation/icons/mob/clothing/species/suit_digi.dmi index 392e8319d99c99..89b99dbf2306e2 100644 Binary files a/monkestation/icons/mob/clothing/species/suit_digi.dmi and b/monkestation/icons/mob/clothing/species/suit_digi.dmi differ diff --git a/monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi b/monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi deleted file mode 100644 index 2d51c710748fe6..00000000000000 Binary files a/monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi and /dev/null differ diff --git a/monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi b/monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi deleted file mode 100644 index 7b4f607810b1ba..00000000000000 Binary files a/monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi and /dev/null differ diff --git a/monkestation/icons/mob/landmarks.dmi b/monkestation/icons/mob/landmarks.dmi deleted file mode 100644 index 534d291e79b36f..00000000000000 Binary files a/monkestation/icons/mob/landmarks.dmi and /dev/null differ diff --git a/monkestation/icons/mob/species/misc/uniform_digi.dmi b/monkestation/icons/mob/species/misc/uniform_digi.dmi index 30467bb4ddc001..fe7835409e995a 100644 Binary files a/monkestation/icons/mob/species/misc/uniform_digi.dmi and b/monkestation/icons/mob/species/misc/uniform_digi.dmi differ diff --git a/monkestation/icons/obj/clothing/jobs/brig_physician.dmi b/monkestation/icons/obj/clothing/jobs/brig_physician.dmi deleted file mode 100644 index 2f622cf5874100..00000000000000 Binary files a/monkestation/icons/obj/clothing/jobs/brig_physician.dmi and /dev/null differ diff --git a/monkestation/icons/obj/economy.dmi b/monkestation/icons/obj/economy.dmi new file mode 100644 index 00000000000000..20c15636815c31 Binary files /dev/null and b/monkestation/icons/obj/economy.dmi differ diff --git a/monkestation/icons/obj/monkecoin.dmi b/monkestation/icons/obj/monkecoin.dmi deleted file mode 100644 index 360482ec1fa15d..00000000000000 Binary files a/monkestation/icons/obj/monkecoin.dmi and /dev/null differ diff --git a/monkestation/icons/obj/storage/closet.dmi b/monkestation/icons/obj/storage/closet.dmi deleted file mode 100644 index f57673554e1d10..00000000000000 Binary files a/monkestation/icons/obj/storage/closet.dmi and /dev/null differ diff --git a/strings/antagonist_flavor/traitor_flavor.json b/strings/antagonist_flavor/traitor_flavor.json index 2b0c0e6c7c4efb..93da8d01374ee9 100644 --- a/strings/antagonist_flavor/traitor_flavor.json +++ b/strings/antagonist_flavor/traitor_flavor.json @@ -111,13 +111,5 @@ "roundend_report": "was a terrorist from Waffle Corporation.", "ui_theme": "syndicate", "uplink": "You have been provided with a standard uplink to accomplish your task." - }, - "The Ashen Forge Member": { - "allies": "The Forge trusts all who are willing to work... but the second a fraction of hostility is up all ties are cut and betrayal is expected.", - "goal": "The Boss still hasn't forgiven Nanotrasen, give 'em hell and show them what we are capable of...", - "introduction": "You are the Ashen Forge Member.", - "roundend_report": "was a Member of The Ashen Forge.", - "ui_theme": "syndicate", - "uplink": "You have been provided with a standard uplink to accomplish your task." } } diff --git a/tgstation.dme b/tgstation.dme index 5a26bb276b5fcd..3e7d0f8fea2954 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5463,7 +5463,6 @@ #include "code\modules\tgui_input\alert.dm" #include "code\modules\tgui_input\checkboxes.dm" #include "code\modules\tgui_input\color.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" @@ -5768,7 +5767,6 @@ #include "monkestation\code\datums\elements\area_locked.dm" #include "monkestation\code\datums\elements\uncompressed_storage.dm" #include "monkestation\code\datums\ert\moff_inspectors.dm" -#include "monkestation\code\datums\id_trim\jobs.dm" #include "monkestation\code\datums\keybinding\carbon.dm" #include "monkestation\code\datums\keybinding\communication.dm" #include "monkestation\code\datums\keybinding\living.dm" @@ -5830,8 +5828,6 @@ #include "monkestation\code\game\objects\items\circuitboards\machine_circuitboards.dm" #include "monkestation\code\game\objects\items\devices\compression_kit.dm" #include "monkestation\code\game\objects\items\devices\scanners.dm" -#include "monkestation\code\game\objects\items\devices\radio\encryptionkey.dm" -#include "monkestation\code\game\objects\items\devices\radio\headset.dm" #include "monkestation\code\game\objects\items\devices\scanners\gas_analyzer.dm" #include "monkestation\code\game\objects\items\drugs\cocaine_chem.dm" #include "monkestation\code\game\objects\items\drugs\cocaine_item.dm" @@ -5856,12 +5852,10 @@ #include "monkestation\code\game\objects\items\storage\book.dm" #include "monkestation\code\game\objects\items\storage\boxes.dm" #include "monkestation\code\game\objects\items\storage\crate.dm" -#include "monkestation\code\game\objects\items\storage\garment.dm" #include "monkestation\code\game\objects\items\storage\uplink_kits.dm" #include "monkestation\code\game\objects\structures\tables_racks.dm" #include "monkestation\code\game\objects\structures\beds_chairs\chair.dm" #include "monkestation\code\game\objects\structures\crates_lockers\crates.dm" -#include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\brig_physician.dm" #include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "monkestation\code\game\objects\structures\crates_lockers\crates\secure.dm" #include "monkestation\code\game\turfs\open\water.dm" @@ -6057,6 +6051,9 @@ #include "monkestation\code\modules\antagonists\contractor\items\modsuit\theme.dm" #include "monkestation\code\modules\antagonists\cult\blood_magic.dm" #include "monkestation\code\modules\antagonists\ert\moff_inspectors.dm" +#include "monkestation\code\modules\antagonists\evil_clone\evil_clone.dm" +#include "monkestation\code\modules\antagonists\evil_clone\evil_clone_objective.dm" +#include "monkestation\code\modules\antagonists\evil_clone\evil_event.dm" #include "monkestation\code\modules\antagonists\florida_man\__outfits.dm" #include "monkestation\code\modules\antagonists\florida_man\_defines.dm" #include "monkestation\code\modules\antagonists\florida_man\_florida_man.dm" @@ -6577,7 +6574,6 @@ #include "monkestation\code\modules\clothing\head\costume.dm" #include "monkestation\code\modules\clothing\head\hat.dm" #include "monkestation\code\modules\clothing\head\misc.dm" -#include "monkestation\code\modules\clothing\jobs\brig_physician.dm" #include "monkestation\code\modules\clothing\masks\gasmask.dm" #include "monkestation\code\modules\clothing\masks\misc.dm" #include "monkestation\code\modules\clothing\neck\cloaks.dm" @@ -6748,7 +6744,6 @@ #include "monkestation\code\modules\job_xp\milestones\botany_milestones.dm" #include "monkestation\code\modules\job_xp\preferences\base_preferences.dm" #include "monkestation\code\modules\job_xp\preferences\xp_handlers.dm" -#include "monkestation\code\modules\jobs\job_types\brig_physician.dm" #include "monkestation\code\modules\jobs\job_types\candysalesman.dm" #include "monkestation\code\modules\jobs\job_types\chaplain.dm" #include "monkestation\code\modules\jobs\job_types\clown.dm" @@ -6763,7 +6758,6 @@ #include "monkestation\code\modules\library\skill_learning\job_skillchips\shaft_miner.dm" #include "monkestation\code\modules\liquids\drains.dm" #include "monkestation\code\modules\liquids\height_floors.dm" -#include "monkestation\code\modules\liquids\liquid_barrier.dm" #include "monkestation\code\modules\liquids\liquid_controller.dm" #include "monkestation\code\modules\liquids\liquid_effect.dm" #include "monkestation\code\modules\liquids\liquid_groups.dm" @@ -6861,12 +6855,6 @@ #include "monkestation\code\modules\mentor\mentor_pm.dm" #include "monkestation\code\modules\mentor\mentor_say.dm" #include "monkestation\code\modules\mentor\mentor_who.dm" -#include "monkestation\code\modules\meteor_shield\meteor_shield.dm" -#include "monkestation\code\modules\meteor_shield\meteor_shield_capsule.dm" -#include "monkestation\code\modules\meteor_shield\meteor_shield_coverage.dm" -#include "monkestation\code\modules\meteor_shield\meteor_shield_field.dm" -#include "monkestation\code\modules\meteor_shield\meteor_shield_proxy.dm" -#include "monkestation\code\modules\meteor_shield\meteor_shield_zap.dm" #include "monkestation\code\modules\meteors\meteor_dark_matteor.dm" #include "monkestation\code\modules\metrics\metric_subsystem.dm" #include "monkestation\code\modules\metrics\subsystem_analytics\generics.dm" @@ -7414,6 +7402,7 @@ #include "monkestation\code\modules\spells\spell_types\aoe_spell\mind_swap.dm" #include "monkestation\code\modules\spells\spell_types\conjure_item\summon_mjollnir.dm" #include "monkestation\code\modules\spells\spell_types\pointed\smite.dm" +#include "monkestation\code\modules\station_goals\meteor_shield.dm" #include "monkestation\code\modules\store\admin\admin_coin_modification.dm" #include "monkestation\code\modules\store\atm\_atm.dm" #include "monkestation\code\modules\store\pre_round\_pre_round_store.dm" diff --git a/tgui/.prettierignore b/tgui/.prettierignore index a91324ebe6e886..79e703c954408f 100644 --- a/tgui/.prettierignore +++ b/tgui/.prettierignore @@ -6,7 +6,6 @@ /yarn.lock /.pnp.* -.swcrc /docs /public /packages/tgui-polyfill diff --git a/tgui/.prettierrc.yml b/tgui/.prettierrc.yml index 01769692264f15..1eebe6098b11da 100644 --- a/tgui/.prettierrc.yml +++ b/tgui/.prettierrc.yml @@ -1 +1,15 @@ +arrowParens: always +breakLongMethodChains: true +endOfLine: lf +importFormatting: oneline +jsxBracketSameLine: true +jsxSingleQuote: false +offsetTernaryExpressions: true +printWidth: 80 +proseWrap: preserve +quoteProps: preserve +semi: true singleQuote: true +tabWidth: 2 +trailingComma: es5 +useTabs: false diff --git a/tgui/.yarn/sdks/eslint/package.json b/tgui/.yarn/sdks/eslint/package.json index b29322a1ffb326..744a77321030e7 100644 --- a/tgui/.yarn/sdks/eslint/package.json +++ b/tgui/.yarn/sdks/eslint/package.json @@ -2,8 +2,5 @@ "name": "eslint", "version": "7.32.0-sdk", "main": "./lib/api.js", - "type": "commonjs", - "bin": { - "eslint": "./bin/eslint.js" - } + "type": "commonjs" } diff --git a/tgui/.yarn/sdks/prettier/bin/prettier.cjs b/tgui/.yarn/sdks/prettier/bin/prettier.cjs deleted file mode 100644 index 5efad688e73914..00000000000000 --- a/tgui/.yarn/sdks/prettier/bin/prettier.cjs +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); -const {resolve} = require(`path`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absRequire = createRequire(absPnpApiPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require prettier/bin/prettier.cjs - require(absPnpApiPath).setup(); - } -} - -// Defer to the real prettier/bin/prettier.cjs your application uses -module.exports = absRequire(`prettier/bin/prettier.cjs`); diff --git a/tgui/.yarn/sdks/prettier/index.cjs b/tgui/.yarn/sdks/prettier/index.js similarity index 68% rename from tgui/.yarn/sdks/prettier/index.cjs rename to tgui/.yarn/sdks/prettier/index.js index 8758e367a725ab..81f9bec5fe85e3 100644 --- a/tgui/.yarn/sdks/prettier/index.cjs +++ b/tgui/.yarn/sdks/prettier/index.js @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath); if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { - // Setup the environment to be able to require prettier + // Setup the environment to be able to require prettier/index.js require(absPnpApiPath).setup(); } } -// Defer to the real prettier your application uses -module.exports = absRequire(`prettier`); +// Defer to the real prettier/index.js your application uses +module.exports = absRequire(`prettier/index.js`); diff --git a/tgui/.yarn/sdks/prettier/package.json b/tgui/.yarn/sdks/prettier/package.json index c61f5117bacf3a..0cbd71ff32d5aa 100644 --- a/tgui/.yarn/sdks/prettier/package.json +++ b/tgui/.yarn/sdks/prettier/package.json @@ -1,7 +1,6 @@ { "name": "prettier", - "version": "3.1.0-sdk", - "main": "./index.cjs", - "type": "commonjs", - "bin": "./bin/prettier.cjs" + "version": "0.19.0-sdk", + "main": "./index.js", + "type": "commonjs" } diff --git a/tgui/.yarn/sdks/typescript/lib/tsserver.js b/tgui/.yarn/sdks/typescript/lib/tsserver.js index bbb1e46501b528..0fb2ac1079786f 100644 --- a/tgui/.yarn/sdks/typescript/lib/tsserver.js +++ b/tgui/.yarn/sdks/typescript/lib/tsserver.js @@ -109,8 +109,6 @@ const moduleWrapper = tsserver => { str = `zip:${str}`; } break; } - } else { - str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`); } } diff --git a/tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js b/tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js index a68f028fe19710..e7033a81782d05 100644 --- a/tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js +++ b/tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js @@ -109,8 +109,6 @@ const moduleWrapper = tsserver => { str = `zip:${str}`; } break; } - } else { - str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`); } } diff --git a/tgui/.yarn/sdks/typescript/lib/typescript.js b/tgui/.yarn/sdks/typescript/lib/typescript.js index b5f4db25bee673..e14fa87beaa405 100644 --- a/tgui/.yarn/sdks/typescript/lib/typescript.js +++ b/tgui/.yarn/sdks/typescript/lib/typescript.js @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath); if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { - // Setup the environment to be able to require typescript + // Setup the environment to be able to require typescript/lib/typescript.js require(absPnpApiPath).setup(); } } -// Defer to the real typescript your application uses -module.exports = absRequire(`typescript`); +// Defer to the real typescript/lib/typescript.js your application uses +module.exports = absRequire(`typescript/lib/typescript.js`); diff --git a/tgui/.yarn/sdks/typescript/package.json b/tgui/.yarn/sdks/typescript/package.json index 656833d45b642a..6aac31b184010d 100644 --- a/tgui/.yarn/sdks/typescript/package.json +++ b/tgui/.yarn/sdks/typescript/package.json @@ -2,9 +2,5 @@ "name": "typescript", "version": "4.9.4-sdk", "main": "./lib/typescript.js", - "type": "commonjs", - "bin": { - "tsc": "./bin/tsc", - "tsserver": "./bin/tsserver" - } + "type": "commonjs" } diff --git a/tgui/package.json b/tgui/package.json index 109c8b208ea4ed..b02f77037cd992 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -12,7 +12,7 @@ "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:prettier": "prettierx --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", @@ -38,7 +38,6 @@ "babel-plugin-transform-remove-console": "^6.9.4", "common": "workspace:*", "css-loader": "^5.2.7", - "esbuild-loader": "^4.0.2", "eslint": "^7.32.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-radar": "^0.2.1", @@ -50,10 +49,11 @@ "jest-circus": "^27.0.6", "jsdom": "^16.7.0", "mini-css-extract-plugin": "^1.6.2", - "prettier": "^3.1.0", + "prettier": "npm:prettierx@0.19.0", "sass": "^1.37.5", "sass-loader": "^11.1.1", "style-loader": "^2.0.0", + "terser-webpack-plugin": "^5.1.4", "typescript": "^4.9.4", "url-loader": "^4.1.1", "webpack": "^5.75.0", diff --git a/tgui/packages/common/collections.ts b/tgui/packages/common/collections.ts index 5bfcee8588441b..a005da7aa1654d 100644 --- a/tgui/packages/common/collections.ts +++ b/tgui/packages/common/collections.ts @@ -32,12 +32,12 @@ export const filter = }; type MapFunction = { - ( - iterateeFn: (value: T, index: number, collection: T[]) => U, - ): (collection: T[]) => U[]; + (iterateeFn: (value: T, index: number, collection: T[]) => U): ( + collection: T[] + ) => U[]; ( - iterateeFn: (value: T, index: K, collection: Record) => U, + iterateeFn: (value: T, index: K, collection: Record) => U ): (collection: Record) => U[]; }; @@ -75,7 +75,7 @@ export const map: MapFunction = */ export const filterMap = ( collection: T[], - iterateeFn: (value: T) => U | undefined, + iterateeFn: (value: T) => U | undefined ): U[] => { const finalCollection: U[] = []; @@ -261,7 +261,7 @@ export const zipWith = const binarySearch = ( getKey: (value: T) => U, collection: readonly T[], - inserting: T, + inserting: T ): number => { if (collection.length === 0) { return 0; diff --git a/tgui/packages/common/color.ts b/tgui/packages/common/color.ts index 86d9b8d3731476..724fa209d03003 100644 --- a/tgui/packages/common/color.ts +++ b/tgui/packages/common/color.ts @@ -30,7 +30,7 @@ export class Color { this.r - this.r * percent, this.g - this.g * percent, this.b - this.b * percent, - this.a, + this.a ); } @@ -47,7 +47,7 @@ export class Color { return new Color( parseInt(hex.substr(1, 2), 16), parseInt(hex.substr(3, 2), 16), - parseInt(hex.substr(5, 2), 16), + parseInt(hex.substr(5, 2), 16) ); } @@ -59,7 +59,7 @@ export class 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, + (c2.a - c1.a) * n + c1.a ); } @@ -102,7 +102,7 @@ export class Color { const round = ( number: number, digits = 0, - base = Math.pow(10, digits), + base = Math.pow(10, digits) ): number => { return Math.round(base * number) / base; }; @@ -222,7 +222,7 @@ export const hsvaToHsla = ({ h, s, v, a }: HsvaColor): HslaColor => { s: round( hh > 0 && hh < 200 ? ((s * v) / 100 / (hh <= 100 ? hh : 200 - hh)) * 100 - : 0, + : 0 ), l: round(hh / 2), a: round(a, 2), @@ -386,7 +386,7 @@ export const luminance = (rgb: RgbColor): number => { export const contrast = ( foreground: RgbColor, - background: RgbColor, + background: RgbColor ): number => { const foreground_luminance = luminance(foreground); const background_luminance = luminance(background); diff --git a/tgui/packages/common/redux.test.ts b/tgui/packages/common/redux.test.ts index 0a29a92e0cecfc..af4e5d4e73eb7a 100644 --- a/tgui/packages/common/redux.test.ts +++ b/tgui/packages/common/redux.test.ts @@ -1,11 +1,4 @@ -import { - Action, - Reducer, - applyMiddleware, - combineReducers, - createAction, - createStore, -} from './redux'; +import { Action, Reducer, applyMiddleware, combineReducers, createAction, createStore } from './redux'; // Dummy Reducer const counterReducer: Reducer> = (state = 0, action) => { @@ -38,7 +31,7 @@ describe('Redux implementation tests', () => { test('createStore with applyMiddleware works', () => { const store = createStore( counterReducer, - applyMiddleware(loggingMiddleware), + applyMiddleware(loggingMiddleware) ); expect(store.getState()).toBe(0); }); diff --git a/tgui/packages/common/redux.ts b/tgui/packages/common/redux.ts index cb262894e6d3ff..1635853c6b4f6a 100644 --- a/tgui/packages/common/redux.ts +++ b/tgui/packages/common/redux.ts @@ -6,7 +6,7 @@ export type Reducer = ( state: State | undefined, - action: ActionType, + action: ActionType ) => State; export type Store = { @@ -21,7 +21,7 @@ type MiddlewareAPI = { }; export type Middleware = ( - storeApi: MiddlewareAPI, + storeApi: MiddlewareAPI ) => (next: Dispatch) => Dispatch; export type Action = { @@ -33,7 +33,7 @@ export type AnyAction = Action & { }; export type Dispatch = ( - action: ActionType, + action: ActionType ) => void; type StoreEnhancer = (createStoreFunction: Function) => Function; @@ -48,7 +48,7 @@ type PreparedAction = { */ export const createStore = ( reducer: Reducer, - enhancer?: StoreEnhancer, + enhancer?: StoreEnhancer ): Store => { // Apply a store enhancer (applyMiddleware is one of them). if (enhancer) { @@ -90,14 +90,14 @@ export const applyMiddleware = ( ...middlewares: Middleware[] ): StoreEnhancer => { return ( - createStoreFunction: (reducer: Reducer, enhancer?: StoreEnhancer) => Store, + createStoreFunction: (reducer: Reducer, enhancer?: StoreEnhancer) => Store ) => { return (reducer, ...args): Store => { const store = createStoreFunction(reducer, ...args); let dispatch: Dispatch = () => { throw new Error( - 'Dispatching while constructing your middleware is not allowed.', + 'Dispatching while constructing your middleware is not allowed.' ); }; @@ -109,7 +109,7 @@ export const applyMiddleware = ( const chain = middlewares.map((middleware) => middleware(storeApi)); dispatch = chain.reduceRight( (next, middleware) => middleware(next), - store.dispatch, + store.dispatch ); return { @@ -129,7 +129,7 @@ export const applyMiddleware = ( * is also more flexible than the redux counterpart. */ export const combineReducers = ( - reducersObj: Record, + reducersObj: Record ): Reducer => { const keys = Object.keys(reducersObj); @@ -170,7 +170,7 @@ export const combineReducers = ( */ export const createAction = ( type: TAction, - prepare?: (...args: any[]) => PreparedAction, + prepare?: (...args: any[]) => PreparedAction ) => { const actionCreator = (...args: any[]) => { let action: Action & PreparedAction = { type }; @@ -206,7 +206,7 @@ export const useDispatch = (context: { export const useSelector = ( context: { store: Store }, - selector: (state: State) => Selected, + selector: (state: State) => Selected ): Selected => { if (!context) { return {} as Selected; diff --git a/tgui/packages/common/timer.ts b/tgui/packages/common/timer.ts index 1fc3e11fd30e50..49d36484200b34 100644 --- a/tgui/packages/common/timer.ts +++ b/tgui/packages/common/timer.ts @@ -13,7 +13,7 @@ export const debounce = any>( fn: F, time: number, - immediate = false, + immediate = false ): ((...args: Parameters) => void) => { let timeout: ReturnType | null; return (...args: Parameters) => { @@ -38,7 +38,7 @@ export const debounce = any>( */ export const throttle = any>( fn: F, - time: number, + time: number ): ((...args: Parameters) => void) => { let previouslyRun: number | null, queuedToRun: ReturnType | null; @@ -53,7 +53,7 @@ export const throttle = any>( } else { queuedToRun = setTimeout( () => invokeFn(...args), - time - (now - (previouslyRun ?? 0)), + time - (now - (previouslyRun ?? 0)) ); } }; diff --git a/tgui/packages/tgui-bench/lib/benchmark.d.ts b/tgui/packages/tgui-bench/lib/benchmark.d.ts index 3eac568d4184fa..7f3310005f77b9 100644 --- a/tgui/packages/tgui-bench/lib/benchmark.d.ts +++ b/tgui/packages/tgui-bench/lib/benchmark.d.ts @@ -27,7 +27,7 @@ declare class Benchmark { static reduce( arr: T[], callback: (accumulator: K, value: T) => K, - thisArg?: any, + thisArg?: any ): K; static options: Benchmark.Options; diff --git a/tgui/packages/tgui-bench/tests/DisposalUnit.test.tsx b/tgui/packages/tgui-bench/tests/DisposalUnit.test.tsx index 3ce1f695718434..1ae610e2e2e15f 100644 --- a/tgui/packages/tgui-bench/tests/DisposalUnit.test.tsx +++ b/tgui/packages/tgui-bench/tests/DisposalUnit.test.tsx @@ -10,7 +10,7 @@ const renderUi = createRenderer((dataJson: string) => { store.dispatch( backendUpdate({ data: Byond.parseJson(dataJson), - }), + }) ); return ( diff --git a/tgui/packages/tgui-bench/tests/Tooltip.test.tsx b/tgui/packages/tgui-bench/tests/Tooltip.test.tsx index 1445a61599b154..fa5df9582d8fb8 100644 --- a/tgui/packages/tgui-bench/tests/Tooltip.test.tsx +++ b/tgui/packages/tgui-bench/tests/Tooltip.test.tsx @@ -13,7 +13,7 @@ export const ListOfTooltips = () => { Tooltip #{i} - , + ); } diff --git a/tgui/packages/tgui-dev-server/dreamseeker.js b/tgui/packages/tgui-dev-server/dreamseeker.js index af4bfe891cb1ef..c81f51e35c55e3 100644 --- a/tgui/packages/tgui-dev-server/dreamseeker.js +++ b/tgui/packages/tgui-dev-server/dreamseeker.js @@ -6,8 +6,8 @@ import { exec } from 'child_process'; import { promisify } from 'util'; -import { createLogger } from './logging.js'; -import { require } from './require.js'; +import { createLogger } from './logging'; +import { require } from './require'; const axios = require('axios'); const logger = createLogger('dreamseeker'); @@ -30,7 +30,7 @@ export class DreamSeeker { + '=' + encodeURIComponent(params[key])) .join('&'); logger.log( - `topic call at ${this.client.defaults.baseURL + '/dummy?' + query}`, + `topic call at ${this.client.defaults.baseURL + '/dummy?' + query}` ); return this.client.get('/dummy?' + query); } diff --git a/tgui/packages/tgui-dev-server/index.js b/tgui/packages/tgui-dev-server/index.js index 199e93d836321b..460b15d99ad992 100644 --- a/tgui/packages/tgui-dev-server/index.js +++ b/tgui/packages/tgui-dev-server/index.js @@ -4,8 +4,8 @@ * @license MIT */ -import { createCompiler } from './webpack.js'; -import { reloadByondCache } from './reloader.js'; +import { createCompiler } from './webpack'; +import { reloadByondCache } from './reloader'; const noHot = process.argv.includes('--no-hot'); const noTmp = process.argv.includes('--no-tmp'); diff --git a/tgui/packages/tgui-dev-server/link/retrace.js b/tgui/packages/tgui-dev-server/link/retrace.js index b7f4d4eacfb93b..949835c700235b 100644 --- a/tgui/packages/tgui-dev-server/link/retrace.js +++ b/tgui/packages/tgui-dev-server/link/retrace.js @@ -6,9 +6,9 @@ import fs from 'fs'; import { basename } from 'path'; -import { createLogger } from '../logging.js'; -import { require } from '../require.js'; -import { resolveGlob } from '../util.js'; +import { createLogger } from '../logging'; +import { require } from '../require'; +import { resolveGlob } from '../util'; const SourceMap = require('source-map'); const { parse: parseStackTrace } = require('stacktrace-parser'); @@ -30,7 +30,7 @@ export const loadSourceMaps = async (bundleDir) => { try { const file = basename(path).replace('.map', ''); const consumer = await new SourceMapConsumer( - JSON.parse(fs.readFileSync(path, 'utf8')), + JSON.parse(fs.readFileSync(path, 'utf8')) ); sourceMaps.push({ file, consumer }); } catch (err) { diff --git a/tgui/packages/tgui-dev-server/link/server.js b/tgui/packages/tgui-dev-server/link/server.js index 60cc78c1bd9ed6..f0c0d153d3a1ca 100644 --- a/tgui/packages/tgui-dev-server/link/server.js +++ b/tgui/packages/tgui-dev-server/link/server.js @@ -6,9 +6,9 @@ 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'; +import { createLogger, directLog } from '../logging'; +import { require } from '../require'; +import { loadSourceMaps, retrace } from './retrace'; const WebSocket = require('ws'); diff --git a/tgui/packages/tgui-dev-server/reloader.js b/tgui/packages/tgui-dev-server/reloader.js index 427d1aecbd6d2a..aed9a7dcd77890 100644 --- a/tgui/packages/tgui-dev-server/reloader.js +++ b/tgui/packages/tgui-dev-server/reloader.js @@ -7,10 +7,10 @@ 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 { DreamSeeker } from './dreamseeker'; +import { createLogger } from './logging'; +import { resolveGlob, resolvePath } from './util'; +import { regQuery } from './winreg'; const logger = createLogger('reloader'); @@ -83,19 +83,19 @@ export const reloadByondCache = async (bundleDir) => { } // Get dreamseeker instances const pids = cacheDirs.map((cacheDir) => - parseInt(cacheDir.split('/cache/tmp').pop(), 10), + parseInt(cacheDir.split('/cache/tmp').pop(), 10) ); const dssPromise = DreamSeeker.getInstancesByPids(pids); // Copy assets const assets = await resolveGlob( bundleDir, - './*.+(bundle|chunk|hot-update).*', + './*.+(bundle|chunk|hot-update).*' ); for (let cacheDir of cacheDirs) { // Clear garbage const garbage = await resolveGlob( cacheDir, - './*.+(bundle|chunk|hot-update).*', + './*.+(bundle|chunk|hot-update).*' ); try { // Plant a dummy browser window file, we'll be using this to avoid world topic. For byond 515. diff --git a/tgui/packages/tgui-dev-server/util.js b/tgui/packages/tgui-dev-server/util.js index 54d806a629dfbc..6d0e884af095a6 100644 --- a/tgui/packages/tgui-dev-server/util.js +++ b/tgui/packages/tgui-dev-server/util.js @@ -6,7 +6,7 @@ import fs from 'fs'; import path from 'path'; -import { require } from './require.js'; +import { require } from './require'; const globPkg = require('glob'); diff --git a/tgui/packages/tgui-dev-server/webpack.js b/tgui/packages/tgui-dev-server/webpack.js index 139610b79ce99b..1c16345a892509 100644 --- a/tgui/packages/tgui-dev-server/webpack.js +++ b/tgui/packages/tgui-dev-server/webpack.js @@ -7,10 +7,10 @@ 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'; +import { loadSourceMaps, setupLink } from './link/server'; +import { createLogger } from './logging'; +import { reloadByondCache } from './reloader'; +import { resolveGlob } from './util'; const logger = createLogger('webpack'); diff --git a/tgui/packages/tgui-dev-server/winreg.js b/tgui/packages/tgui-dev-server/winreg.js index b61fddc1a255a4..d7408b5c39021b 100644 --- a/tgui/packages/tgui-dev-server/winreg.js +++ b/tgui/packages/tgui-dev-server/winreg.js @@ -8,7 +8,7 @@ import { exec } from 'child_process'; import { promisify } from 'util'; -import { createLogger } from './logging.js'; +import { createLogger } from './logging'; const logger = createLogger('winreg'); diff --git a/tgui/packages/tgui-panel/Panel.jsx b/tgui/packages/tgui-panel/Panel.jsx index 18976735de9ee5..83150ab6ef13d8 100644 --- a/tgui/packages/tgui-panel/Panel.jsx +++ b/tgui/packages/tgui-panel/Panel.jsx @@ -116,8 +116,7 @@ const HoboPanel = (props, context) => { 'z-index': 1000, }} selected={settings.visible} - onClick={() => settings.toggle()} - > + onClick={() => settings.toggle()}> Settings {(settings.visible && ) || ( diff --git a/tgui/packages/tgui-panel/audio/NowPlayingWidget.jsx b/tgui/packages/tgui-panel/audio/NowPlayingWidget.jsx index af5380a7a5b310..4495c2a8a1f22c 100644 --- a/tgui/packages/tgui-panel/audio/NowPlayingWidget.jsx +++ b/tgui/packages/tgui-panel/audio/NowPlayingWidget.jsx @@ -22,10 +22,10 @@ export const NowPlayingWidget = (props, context) => { 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?.substring(4, 6) + + '-' + + upload_date?.substring(6, 8) : upload_date; return ( @@ -36,10 +36,9 @@ export const NowPlayingWidget = (props, context) => { grow={1} style={{ 'white-space': 'nowrap', - overflow: 'hidden', + 'overflow': 'hidden', 'text-overflow': 'ellipsis', - }} - > + }}> {
diff --git a/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx b/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx index e4e7ea0dfdefd3..8a838483504313 100644 --- a/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx +++ b/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx @@ -5,14 +5,7 @@ */ import { useDispatch, useSelector } from 'common/redux'; -import { - Button, - Collapsible, - Divider, - Input, - Section, - Stack, -} from 'tgui/components'; +import { Button, Collapsible, Divider, Input, Section, Stack } from 'tgui/components'; import { removeChatPage, toggleAcceptedType, updateChatPage } from './actions'; import { MESSAGE_TYPES } from './constants'; import { selectCurrentChatPage } from './selectors'; @@ -32,7 +25,7 @@ export const ChatPageSettings = (props, context) => { updateChatPage({ pageId: page.id, name: value, - }), + }) ) } /> @@ -48,7 +41,7 @@ export const ChatPageSettings = (props, context) => { updateChatPage({ pageId: page.id, hideUnreadCount: !page.hideUnreadCount, - }), + }) ) } /> @@ -62,7 +55,7 @@ export const ChatPageSettings = (props, context) => { dispatch( removeChatPage({ pageId: page.id, - }), + }) ) } /> @@ -71,7 +64,7 @@ export const ChatPageSettings = (props, context) => {
{MESSAGE_TYPES.filter( - (typeDef) => !typeDef.important && !typeDef.admin, + (typeDef) => !typeDef.important && !typeDef.admin ).map((typeDef) => ( { toggleAcceptedType({ pageId: page.id, type: typeDef.type, - }), + }) ) - } - > + }> {typeDef.name} ))} {MESSAGE_TYPES.filter( - (typeDef) => !typeDef.important && typeDef.admin, + (typeDef) => !typeDef.important && typeDef.admin ).map((typeDef) => ( { toggleAcceptedType({ pageId: page.id, type: typeDef.type, - }), + }) ) - } - > + }> {typeDef.name} ))} diff --git a/tgui/packages/tgui-panel/chat/ChatPanel.jsx b/tgui/packages/tgui-panel/chat/ChatPanel.jsx index 1577e933fb4c8d..3132a66ce7f8c5 100644 --- a/tgui/packages/tgui-panel/chat/ChatPanel.jsx +++ b/tgui/packages/tgui-panel/chat/ChatPanel.jsx @@ -26,7 +26,7 @@ export class ChatPanel extends Component { chatRenderer.mount(this.ref.current); chatRenderer.events.on( 'scrollTrackingChanged', - this.handleScrollTrackingChange, + this.handleScrollTrackingChange ); this.componentDidUpdate(); } @@ -34,7 +34,7 @@ export class ChatPanel extends Component { componentWillUnmount() { chatRenderer.events.off( 'scrollTrackingChanged', - this.handleScrollTrackingChange, + this.handleScrollTrackingChange ); } @@ -46,7 +46,7 @@ export class ChatPanel extends Component { !prevProps || shallowDiffers(this.props, prevProps); if (shouldUpdateStyle) { chatRenderer.assignStyle({ - width: '100%', + 'width': '100%', 'white-space': 'pre-wrap', 'font-size': this.props.fontSize, 'line-height': this.props.lineHeight, @@ -63,8 +63,7 @@ export class ChatPanel extends Component { )} diff --git a/tgui/packages/tgui-panel/chat/ChatTabs.jsx b/tgui/packages/tgui-panel/chat/ChatTabs.jsx index b9d012163b65da..e20e6c27891525 100644 --- a/tgui/packages/tgui-panel/chat/ChatTabs.jsx +++ b/tgui/packages/tgui-panel/chat/ChatTabs.jsx @@ -15,12 +15,11 @@ const UnreadCountWidget = ({ value }) => ( style={{ 'font-size': '0.7em', 'border-radius': '0.25em', - width: '1.7em', + 'width': '1.7em', 'line-height': '1.55em', 'background-color': 'crimson', - color: '#fff', - }} - > + 'color': '#fff', + }}> {Math.min(value, 99)} ); @@ -47,10 +46,9 @@ export const ChatTabs = (props, context) => { dispatch( changeChatPage({ pageId: page.id, - }), + }) ) - } - > + }> {page.name} ))} diff --git a/tgui/packages/tgui-panel/chat/middleware.js b/tgui/packages/tgui-panel/chat/middleware.js index 5d2997a9a04f8a..05fb6041ce0898 100644 --- a/tgui/packages/tgui-panel/chat/middleware.js +++ b/tgui/packages/tgui-panel/chat/middleware.js @@ -6,26 +6,9 @@ import DOMPurify from 'dompurify'; import { storage } from 'common/storage'; -import { - loadSettings, - updateSettings, - addHighlightSetting, - removeHighlightSetting, - updateHighlightSetting, -} from '../settings/actions'; +import { loadSettings, updateSettings, addHighlightSetting, removeHighlightSetting, updateHighlightSetting } from '../settings/actions'; import { selectSettings } from '../settings/selectors'; -import { - addChatPage, - changeChatPage, - changeScrollTracking, - clearChat, - loadChat, - rebuildChat, - removeChatPage, - saveChatToDisk, - toggleAcceptedType, - updateMessageCount, -} from './actions'; +import { addChatPage, changeChatPage, changeScrollTracking, clearChat, loadChat, rebuildChat, removeChatPage, saveChatToDisk, toggleAcceptedType, updateMessageCount } from './actions'; import { MAX_PERSISTED_MESSAGES, MESSAGE_SAVE_INTERVAL } from './constants'; import { createMessage, serializeMessage } from './model'; import { chatRenderer } from './renderer'; @@ -38,7 +21,7 @@ const saveChatToStorage = async (store) => { const state = selectChat(store.getState()); const fromIndex = Math.max( 0, - chatRenderer.messages.length - MAX_PERSISTED_MESSAGES, + chatRenderer.messages.length - MAX_PERSISTED_MESSAGES ); const messages = chatRenderer.messages .slice(fromIndex) @@ -176,7 +159,7 @@ export const chatMiddleware = (store) => { const settings = selectSettings(store.getState()); chatRenderer.setHighlight( settings.highlightSettings, - settings.highlightSettingById, + settings.highlightSettingById ); return; diff --git a/tgui/packages/tgui-panel/chat/reducer.js b/tgui/packages/tgui-panel/chat/reducer.js index e75fbd06e43e2d..b727a7c1babc30 100644 --- a/tgui/packages/tgui-panel/chat/reducer.js +++ b/tgui/packages/tgui-panel/chat/reducer.js @@ -4,16 +4,7 @@ * @license MIT */ -import { - addChatPage, - changeChatPage, - loadChat, - removeChatPage, - toggleAcceptedType, - updateChatPage, - updateMessageCount, - changeScrollTracking, -} from './actions'; +import { addChatPage, changeChatPage, loadChat, removeChatPage, toggleAcceptedType, updateChatPage, updateMessageCount, changeScrollTracking } from './actions'; import { canPageAcceptType, createMainPage } from './model'; const mainPage = createMainPage(); diff --git a/tgui/packages/tgui-panel/chat/renderer.jsx b/tgui/packages/tgui-panel/chat/renderer.jsx index 958fd4c7c46124..e8fb0970cf15a5 100644 --- a/tgui/packages/tgui-panel/chat/renderer.jsx +++ b/tgui/packages/tgui-panel/chat/renderer.jsx @@ -7,19 +7,7 @@ import { EventEmitter } from 'common/events'; import { classes } from 'common/react'; import { createLogger } from 'tgui/logging'; -import { - COMBINE_MAX_MESSAGES, - COMBINE_MAX_TIME_WINDOW, - IMAGE_RETRY_DELAY, - IMAGE_RETRY_LIMIT, - IMAGE_RETRY_MESSAGE_AGE, - MAX_PERSISTED_MESSAGES, - MAX_VISIBLE_MESSAGES, - MESSAGE_PRUNE_INTERVAL, - MESSAGE_TYPES, - MESSAGE_TYPE_INTERNAL, - MESSAGE_TYPE_UNKNOWN, -} from './constants'; +import { COMBINE_MAX_MESSAGES, COMBINE_MAX_TIME_WINDOW, IMAGE_RETRY_DELAY, IMAGE_RETRY_LIMIT, IMAGE_RETRY_MESSAGE_AGE, MAX_PERSISTED_MESSAGES, MAX_VISIBLE_MESSAGES, MESSAGE_PRUNE_INTERVAL, MESSAGE_TYPES, MESSAGE_TYPE_INTERNAL, MESSAGE_TYPE_UNKNOWN } from './constants'; import { render } from 'inferno'; import { canPageAcceptType, createMessage, isSameMessage } from './model'; import { highlightNode, linkifyNode } from './replaceInTextNode'; @@ -39,8 +27,8 @@ export const TGUI_CHAT_COMPONENTS = { // List of injectable attibute names mapped to their proper prop // We need this because attibutes don't support lowercase names export const TGUI_CHAT_ATTRIBUTES_TO_PROPS = { - position: 'position', - content: 'content', + 'position': 'position', + 'content': 'content', }; const findNearestScrollableParent = (startingNode) => { @@ -217,7 +205,7 @@ class ChatRenderer { // Must be alphanumeric (with some punctuation) allowedRegex.test(str) && // Reset lastIndex so it does not mess up the next word - ((allowedRegex.lastIndex = 0) || true), + ((allowedRegex.lastIndex = 0) || true) ); let highlightWords; let highlightRegex; @@ -409,7 +397,7 @@ class ChatRenderer { , - childNode, + childNode ); /* eslint-enable react/no-danger */ } @@ -423,7 +411,7 @@ class ChatRenderer { node, parser.highlightRegex, parser.highlightWords, - (text) => createHighlightNode(text, parser.highlightColor), + (text) => createHighlightNode(text, parser.highlightColor) ); if (highlighted && parser.highlightWholeMessage) { node.className += ' ChatMessage--highlighted'; @@ -520,7 +508,7 @@ class ChatRenderer { { const fromIndex = Math.max( 0, - this.messages.length - MAX_PERSISTED_MESSAGES, + this.messages.length - MAX_PERSISTED_MESSAGES ); if (fromIndex > 0) { this.messages = this.messages.slice(fromIndex); @@ -536,7 +524,7 @@ class ChatRenderer { // Make a copy of messages const fromIndex = Math.max( 0, - this.messages.length - MAX_PERSISTED_MESSAGES, + this.messages.length - MAX_PERSISTED_MESSAGES ); const messages = this.messages.slice(fromIndex); // Remove existing nodes @@ -571,7 +559,7 @@ class ChatRenderer { } // Remove pruned messages from the message array this.messages = this.messages.filter( - (message) => message.node !== 'pruned', + (message) => message.node !== 'pruned' ); logger.log(`Cleared chat`); } diff --git a/tgui/packages/tgui-panel/chat/replaceInTextNode.js b/tgui/packages/tgui-panel/chat/replaceInTextNode.js index dabd3095448eee..8e616ea26cda38 100644 --- a/tgui/packages/tgui-panel/chat/replaceInTextNode.js +++ b/tgui/packages/tgui-panel/chat/replaceInTextNode.js @@ -149,7 +149,7 @@ export const highlightNode = ( node, regex, words, - createNode = createHighlightNode, + createNode = createHighlightNode ) => { if (!createNode) { createNode = createHighlightNode; diff --git a/tgui/packages/tgui-panel/index.jsx b/tgui/packages/tgui-panel/index.jsx index 95559291ee2d38..336d46031c4f71 100644 --- a/tgui/packages/tgui-panel/index.jsx +++ b/tgui/packages/tgui-panel/index.jsx @@ -84,14 +84,14 @@ const setupApp = () => { Byond.winset('browseroutput', { 'is-visible': true, 'is-disabled': false, - pos: '0x0', - size: '0x0', + 'pos': '0x0', + 'size': '0x0', }); // Resize the panel to match the non-browser output Byond.winget('output').then((output) => { Byond.winset('browseroutput', { - size: output.size, + 'size': output.size, }); }); diff --git a/tgui/packages/tgui-panel/ping/reducer.js b/tgui/packages/tgui-panel/ping/reducer.js index 49b9522c06fc03..b1e3d679cbcc38 100644 --- a/tgui/packages/tgui-panel/ping/reducer.js +++ b/tgui/packages/tgui-panel/ping/reducer.js @@ -6,11 +6,7 @@ import { clamp01, scale } from 'common/math'; import { pingFail, pingSuccess } from './actions'; -import { - PING_MAX_FAILS, - PING_ROUNDTRIP_BEST, - PING_ROUNDTRIP_WORST, -} from './constants'; +import { PING_MAX_FAILS, PING_ROUNDTRIP_BEST, PING_ROUNDTRIP_WORST } from './constants'; export const pingReducer = (state = {}, action) => { const { type, payload } = action; @@ -32,7 +28,7 @@ export const pingReducer = (state = {}, action) => { if (type === pingFail.type) { const { failCount = 0 } = state; const networkQuality = clamp01( - state.networkQuality - failCount / PING_MAX_FAILS, + state.networkQuality - failCount / PING_MAX_FAILS ); const nextState = { ...state, diff --git a/tgui/packages/tgui-panel/reconnect.tsx b/tgui/packages/tgui-panel/reconnect.tsx index 6d3e6d9759e269..ecfd76716925bd 100644 --- a/tgui/packages/tgui-panel/reconnect.tsx +++ b/tgui/packages/tgui-panel/reconnect.tsx @@ -21,8 +21,7 @@ export const ReconnectButton = () => { color="white" onClick={() => { Byond.command('.reconnect'); - }} - > + }}> Reconnect diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.jsx b/tgui/packages/tgui-panel/settings/SettingsPanel.jsx index 0a9791c33de33c..7850e4a7e498f1 100644 --- a/tgui/packages/tgui-panel/settings/SettingsPanel.jsx +++ b/tgui/packages/tgui-panel/settings/SettingsPanel.jsx @@ -8,37 +8,13 @@ import { toFixed } from 'common/math'; import { capitalize } from 'common/string'; import { useLocalState } from 'tgui/backend'; import { useDispatch, useSelector } from 'common/redux'; -import { - Box, - Button, - Collapsible, - ColorBox, - Divider, - Stack, - Input, - LabeledList, - NumberInput, - Section, - Tabs, - TextArea, -} from 'tgui/components'; +import { Box, Button, Collapsible, ColorBox, Divider, Stack, Input, LabeledList, NumberInput, Section, Tabs, TextArea } from 'tgui/components'; import { ChatPageSettings } from '../chat'; import { clearChat, rebuildChat, saveChatToDisk } from '../chat/actions'; import { THEMES } from '../themes'; -import { - changeSettingsTab, - updateSettings, - addHighlightSetting, - removeHighlightSetting, - updateHighlightSetting, -} from './actions'; +import { changeSettingsTab, updateSettings, addHighlightSetting, removeHighlightSetting, updateHighlightSetting } from './actions'; import { SETTINGS_TABS, FONTS, MAX_HIGHLIGHT_SETTINGS } from './constants'; -import { - selectActiveTab, - selectSettings, - selectHighlightSettings, - selectHighlightSettingById, -} from './selectors'; +import { selectActiveTab, selectSettings, selectHighlightSettings, selectHighlightSettingById } from './selectors'; export const SettingsPanel = (props, context) => { const activeTab = useSelector(context, selectActiveTab); @@ -56,10 +32,9 @@ export const SettingsPanel = (props, context) => { dispatch( changeSettingsTab({ tabId: tab.id, - }), + }) ) - } - > + }> {tab.name} ))} @@ -78,7 +53,7 @@ export const SettingsPanel = (props, context) => { export const SettingsGeneral = (props, context) => { const { theme, fontFamily, fontSize, lineHeight } = useSelector( context, - selectSettings, + selectSettings ); const dispatch = useDispatch(context); const [freeFont, setFreeFont] = useLocalState(context, 'freeFont', false); @@ -96,7 +71,7 @@ export const SettingsGeneral = (props, context) => { dispatch( updateSettings({ theme: THEME, - }), + }) ) } /> @@ -117,8 +92,7 @@ export const SettingsGeneral = (props, context) => { setFreeFont(!freeFont); }} /> - } - > + }> {FONTS.map((FONT) => ( @@ -122,8 +108,7 @@ const NewscasterChannelCreation = (props) => { act('setChannelDesc', { channeldesc: desc, }) - } - > + }> Channel Description @@ -195,8 +180,7 @@ const NewscasterCommentCreation = (props) => { act('setCommentBody', { commenttext: comment, }) - } - > + }> Channel Name @@ -453,8 +437,7 @@ const NewscasterChannelSelector = (props) => { key={activeWanted.index} icon={activeWanted.active ? 'skull-crossbones' : null} textColor={activeWanted.active ? 'red' : 'grey'} - onClick={() => act('toggleWanted')} - > + onClick={() => act('toggleWanted')}> Wanted Issue ))} @@ -471,8 +454,7 @@ const NewscasterChannelSelector = (props) => { act('setChannel', { channel: channel.ID, }) - } - > + }> {channel.name} ))} @@ -482,8 +464,7 @@ const NewscasterChannelSelector = (props) => { mr={1} textColor="white" color="Green" - onClick={() => act('startCreateChannel')} - > + onClick={() => act('startCreateChannel')}> Create Channel [+] @@ -499,7 +480,7 @@ const processedText = (value) => { smartypants: true, smartLists: true, baseUrl: 'thisshouldbreakhttp', - }), + }) ), }; return textHtml; @@ -527,7 +508,7 @@ const NewscasterChannelMessages = (props) => { ); } const visibleMessages = messages.filter( - (message) => message.ID !== viewing_channel, + (message) => message.ID !== viewing_channel ); return (
@@ -591,8 +572,7 @@ const NewscasterChannelMessages = (props) => { } /> - } - > + }>
{message.censored_message ? (
diff --git a/tgui/packages/tgui/interfaces/NifPanel.jsx b/tgui/packages/tgui/interfaces/NifPanel.jsx index 260f04186d36f2..97fa230aa4d4e1 100644 --- a/tgui/packages/tgui/interfaces/NifPanel.jsx +++ b/tgui/packages/tgui/interfaces/NifPanel.jsx @@ -1,18 +1,5 @@ import { useBackend, useLocalState } from '../backend'; -import { - BlockQuote, - Box, - Button, - Collapsible, - Dropdown, - Flex, - Icon, - Input, - LabeledList, - ProgressBar, - Section, - Table, -} from '../components'; +import { BlockQuote, Box, Button, Collapsible, Dropdown, Flex, Icon, Input, LabeledList, ProgressBar, Section, Table } from '../components'; import { TableCell, TableRow } from '../components/Table'; import { Window } from '../layouts'; @@ -33,8 +20,7 @@ export const NifPanel = (props) => { width={500} height={400} resizable - theme={current_theme} - > + theme={current_theme}>
{ selected={settingsOpen} onClick={() => setSettingsOpen(!settingsOpen)} /> - } - > + }> {(settingsOpen && ) || } {(!settingsOpen && (
+ right> {(loaded_nifsofts.length && ( {loaded_nifsofts.map((nifsoft) => ( @@ -77,8 +61,7 @@ export const NifPanel = (props) => { }) } /> - } - > + }> @@ -90,8 +73,8 @@ export const NifPanel = (props) => { {nifsoft.activation_cost === 0 ? ' No activation cost' : ' ' + - (nifsoft.activation_cost / max_power) * 100 + - '% per activation'} + (nifsoft.activation_cost / max_power) * 100 + + '% per activation'} @@ -74,8 +64,7 @@ export const NifSoulPoem = (props) => { diff --git a/tgui/packages/tgui/interfaces/NoticeBoard.tsx b/tgui/packages/tgui/interfaces/NoticeBoard.tsx index e39a07067f81dc..6514e4517e7678 100644 --- a/tgui/packages/tgui/interfaces/NoticeBoard.tsx +++ b/tgui/packages/tgui/interfaces/NoticeBoard.tsx @@ -27,8 +27,7 @@ export const NoticeBoard = (props) => { key={item.ref} color="black" backgroundColor="white" - style={{ padding: '2px 2px 0 2px' }} - > + style={{ padding: '2px 2px 0 2px' }}> {item.name} diff --git a/tgui/packages/tgui/interfaces/NtnetRelay.tsx b/tgui/packages/tgui/interfaces/NtnetRelay.tsx index 6fd070d7bb8f83..9acb8ec1526c12 100644 --- a/tgui/packages/tgui/interfaces/NtnetRelay.tsx +++ b/tgui/packages/tgui/interfaces/NtnetRelay.tsx @@ -1,12 +1,6 @@ import { BooleanLike } from 'common/react'; import { useBackend } from '../backend'; -import { - Box, - Button, - ProgressBar, - Section, - AnimatedNumber, -} from '../components'; +import { Box, Button, ProgressBar, Section, AnimatedNumber } from '../components'; import { Window } from '../layouts'; type Data = { @@ -39,14 +33,12 @@ export const NtnetRelay = (props) => { content={enabled ? 'ENABLED' : 'DISABLED'} onClick={() => act('toggle')} /> - } - > + }> {!dos_crashed ? ( + maxValue={dos_capacity}> GQ {' / '} {dos_capacity} GQ diff --git a/tgui/packages/tgui/interfaces/NtosArcade.jsx b/tgui/packages/tgui/interfaces/NtosArcade.jsx index b8c9aa05109e6f..e31da8a7346c2b 100644 --- a/tgui/packages/tgui/interfaces/NtosArcade.jsx +++ b/tgui/packages/tgui/interfaces/NtosArcade.jsx @@ -1,14 +1,6 @@ import { resolveAsset } from '../assets'; import { useBackend } from '../backend'; -import { - AnimatedNumber, - Box, - Button, - Grid, - LabeledList, - ProgressBar, - Section, -} from '../components'; +import { AnimatedNumber, Box, Button, Grid, LabeledList, ProgressBar, Section } from '../components'; import { NtosWindow } from '../layouts'; export const NtosArcade = (props) => { @@ -32,8 +24,7 @@ export const NtosArcade = (props) => { good: [20, 31], average: [10, 20], bad: [-Infinity, 10], - }} - > + }}> {data.PlayerHitpoints}HP @@ -46,8 +37,7 @@ export const NtosArcade = (props) => { purple: [11, Infinity], violet: [3, 11], bad: [-Infinity, 3], - }} - > + }}> {data.PlayerMP}MP @@ -56,8 +46,7 @@ export const NtosArcade = (props) => {
+ }> {data.Status}
@@ -70,8 +59,7 @@ export const NtosArcade = (props) => { good: [30, Infinity], average: [5, 30], bad: [-Infinity, 5], - }} - > + }}> HP diff --git a/tgui/packages/tgui/interfaces/NtosCard.jsx b/tgui/packages/tgui/interfaces/NtosCard.jsx index a81f74722e6567..fb12f51fedb23a 100644 --- a/tgui/packages/tgui/interfaces/NtosCard.jsx +++ b/tgui/packages/tgui/interfaces/NtosCard.jsx @@ -1,13 +1,5 @@ import { useBackend } from '../backend'; -import { - Box, - Button, - Dropdown, - Input, - NumberInput, - Section, - Stack, -} from '../components'; +import { Box, Button, Dropdown, Input, NumberInput, Section, Stack } from '../components'; import { NtosWindow } from '../layouts'; import { AccessList } from './common/AccessList'; @@ -57,8 +49,7 @@ export const NtosCardContent = (props) => { } tooltipPosition="left" /> - } - > + }> )} @@ -130,8 +121,7 @@ const IdCardPage = (props) => { }} /> - } - > + }>
diff --git a/tgui/packages/tgui/interfaces/NtosCyborgRemoteMonitor.jsx b/tgui/packages/tgui/interfaces/NtosCyborgRemoteMonitor.jsx index 24962f2c3bb01d..b9e47051dc89be 100644 --- a/tgui/packages/tgui/interfaces/NtosCyborgRemoteMonitor.jsx +++ b/tgui/packages/tgui/interfaces/NtosCyborgRemoteMonitor.jsx @@ -1,14 +1,5 @@ import { useBackend, useSharedState } from '../backend'; -import { - Box, - Button, - LabeledList, - NoticeBox, - ProgressBar, - Section, - Stack, - Tabs, -} from '../components'; +import { Box, Button, LabeledList, NoticeBox, ProgressBar, Section, Stack, Tabs } from '../components'; import { NtosWindow } from '../layouts'; export const NtosCyborgRemoteMonitor = (props) => { @@ -56,16 +47,14 @@ export const NtosCyborgRemoteMonitorContent = (props) => { icon="robot" lineHeight="23px" selected={tab_main === 1} - onClick={() => setTab_main(1)} - > + onClick={() => setTab_main(1)}> Cyborgs setTab_main(2)} - > + onClick={() => setTab_main(2)}> Stored Log File @@ -95,8 +84,7 @@ export const NtosCyborgRemoteMonitorContent = (props) => { }) } /> - } - > + }> { : cyborg.locked_down ? 'average' : 'good' - } - > + }> {cyborg.status ? 'Not Responding' : cyborg.locked_down @@ -125,8 +112,7 @@ export const NtosCyborgRemoteMonitorContent = (props) => { : cyborg.integ <= 75 ? 'average' : 'good' - } - > + }> {cyborg.integ === 0 ? 'Hard Fault' : cyborg.integ <= 25 @@ -144,8 +130,7 @@ export const NtosCyborgRemoteMonitorContent = (props) => { : cyborg.charge <= 70 ? 'average' : 'good' - } - > + }> {typeof cyborg.charge === 'number' ? cyborg.charge + '%' : 'Not Found'} diff --git a/tgui/packages/tgui/interfaces/NtosEmojipedia.jsx b/tgui/packages/tgui/interfaces/NtosEmojipedia.jsx index 8a2402f59ff554..b39672e9cb4d8b 100644 --- a/tgui/packages/tgui/interfaces/NtosEmojipedia.jsx +++ b/tgui/packages/tgui/interfaces/NtosEmojipedia.jsx @@ -10,8 +10,8 @@ export const NtosEmojipedia = (props) => { let filtered_emoji_list = filter ? emoji_list.filter((emoji) => { - return emoji.name.toLowerCase().includes(filter.toLowerCase()); - }) + return emoji.name.toLowerCase().includes(filter.toLowerCase()); + }) : emoji_list; if (filtered_emoji_list.length === 0) { filtered_emoji_list = emoji_list; @@ -37,8 +37,7 @@ export const NtosEmojipedia = (props) => { icon="circle-question" /> - } - > + }> {filtered_emoji_list.map((emoji) => ( { document.body.removeChild(input); resolve(); }); - }} - > + }}> {emoji.name} ))} diff --git a/tgui/packages/tgui/interfaces/NtosGasAnalyzer.tsx b/tgui/packages/tgui/interfaces/NtosGasAnalyzer.tsx index caf3836e0184a5..7fa700b9c1e484 100644 --- a/tgui/packages/tgui/interfaces/NtosGasAnalyzer.tsx +++ b/tgui/packages/tgui/interfaces/NtosGasAnalyzer.tsx @@ -26,8 +26,7 @@ export const NtosGasAnalyzer = (props) => { ? 'Right-click on objects while holding the tablet to scan them. Right-click on the tablet to scan the current location.' : "The app will update it's gas mixture reading automatically." } - tooltipPosition="bottom" - > + tooltipPosition="bottom"> {atmozphereMode === 'click' ? 'Scanning tapped objects. Click to switch.' : 'Scanning current location. Click to switch.'} diff --git a/tgui/packages/tgui/interfaces/NtosMain.jsx b/tgui/packages/tgui/interfaces/NtosMain.jsx index 6e5cf91128daee..894172db8762d2 100644 --- a/tgui/packages/tgui/interfaces/NtosMain.jsx +++ b/tgui/packages/tgui/interfaces/NtosMain.jsx @@ -17,7 +17,7 @@ export const NtosMain = (props) => { pai, } = data; const filtered_programs = programs.filter( - (program) => program.header_program, + (program) => program.header_program ); return ( { 'NtOS Main Menu' } width={400} - height={500} - > + height={500}> {Boolean( removable_media.length || - programs.some((program) => program.header_program), + programs.some((program) => program.header_program) ) && (
@@ -100,25 +99,22 @@ export const NtosMain = (props) => { /> )} - } - > + }>
ID Name:{' '} {show_imprint ? login.IDName + - ' ' + - (proposed_login.IDName - ? '(' + proposed_login.IDName + ')' - : '') + ' ' + + (proposed_login.IDName ? '(' + proposed_login.IDName + ')' : '') : proposed_login.IDName ?? ''} Assignment:{' '} {show_imprint ? login.IDJob + - ' ' + - (proposed_login.IDJob ? '(' + proposed_login.IDJob + ')' : '') + ' ' + + (proposed_login.IDJob ? '(' + proposed_login.IDJob + ')' : '') : proposed_login.IDJob ?? ''}
@@ -170,7 +166,7 @@ const ProgramsTable = (props) => { const { programs = [] } = data; // add the program filename to this list to have it excluded from the main menu program list table const filtered_programs = programs.filter( - (program) => !program.header_program, + (program) => !program.header_program ); return ( diff --git a/tgui/packages/tgui/interfaces/NtosMessenger.jsx b/tgui/packages/tgui/interfaces/NtosMessenger.jsx index e4d586a9998a5d..6d3e5e02938243 100644 --- a/tgui/packages/tgui/interfaces/NtosMessenger.jsx +++ b/tgui/packages/tgui/interfaces/NtosMessenger.jsx @@ -1,14 +1,6 @@ import { useBackend, useLocalState } from '../backend'; import { createSearch } from 'common/string'; -import { - Box, - Button, - Dimmer, - Icon, - Section, - Stack, - Input, -} from '../components'; +import { Box, Button, Dimmer, Icon, Section, Stack, Input } from '../components'; import { NtosWindow } from '../layouts'; const NoIDDimmer = (props) => { @@ -62,7 +54,7 @@ const ContactsScreen = (props) => { const [searchUser, setSearchUser] = useLocalState('searchUser', ''); const search = createSearch( searchUser, - (messengers) => messengers.name + messengers.job, + (messengers) => messengers.name + messengers.job ); let users = searchUser.length > 0 ? data.messengers.filter(search) : messengers; @@ -171,8 +163,7 @@ const ContactsScreen = (props) => { job: messenger.job, ref: messenger.ref, }) - } - > + }> {messenger.name} ({messenger.job}) ))} diff --git a/tgui/packages/tgui/interfaces/NtosNetChat.jsx b/tgui/packages/tgui/interfaces/NtosNetChat.jsx index aab73f826a1029..171398ab6a2f81 100644 --- a/tgui/packages/tgui/interfaces/NtosNetChat.jsx +++ b/tgui/packages/tgui/interfaces/NtosNetChat.jsx @@ -1,13 +1,5 @@ import { useBackend } from '../backend'; -import { - Box, - Button, - Dimmer, - Icon, - Input, - Section, - Stack, -} from '../components'; +import { Box, Button, Dimmer, Icon, Input, Section, Stack } from '../components'; import { NtosWindow } from '../layouts'; // byond defines for the program state @@ -203,8 +195,7 @@ export const NtosNetChat = (props) => { + color={client_color(client)}> {client.name} {client !== this_client && ( diff --git a/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx b/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx index 9dc1d1414d15b1..df7d87cef56d06 100644 --- a/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx +++ b/tgui/packages/tgui/interfaces/NtosNetDownloader.jsx @@ -1,16 +1,6 @@ import { scale, toFixed } from 'common/math'; import { useBackend, useLocalState } from '../backend'; -import { - Box, - Button, - Stack, - Icon, - LabeledList, - NoticeBox, - ProgressBar, - Section, - Tabs, -} from '../components'; +import { Box, Button, Stack, Icon, LabeledList, NoticeBox, ProgressBar, Section, Tabs } from '../components'; import { flow } from 'common/fp'; import { filter, sortBy } from 'common/collections'; import { NtosWindow } from '../layouts'; @@ -32,11 +22,11 @@ export const NtosNetDownloader = (props) => { } = data; const all_categories = ['All'].concat(categories); const downloadpercentage = toFixed( - scale(downloadcompletion, 0, downloadsize) * 100, + scale(downloadcompletion, 0, downloadsize) * 100 ); const [selectedCategory, setSelectedCategory] = useLocalState( 'category', - all_categories[0], + all_categories[0] ); const items = flow([ // This filters the list to only contain programs with category @@ -49,7 +39,7 @@ export const NtosNetDownloader = (props) => { // This sorts all programs in the lists by name and compatibility sortBy( (program) => -program.compatible, - (program) => program.filedesc, + (program) => program.filedesc ), ])(programs); const disk_free_space = downloading @@ -88,13 +78,11 @@ export const NtosNetDownloader = (props) => { tooltip={`${downloadname}.prg downloaded`} /> )) - } - > + }> + maxValue={disk_size}> {`${disk_free_space} GQ free of ${disk_size} GQ`} @@ -109,8 +97,7 @@ export const NtosNetDownloader = (props) => { setSelectedCategory(category)} - > + onClick={() => setSelectedCategory(category)}> {category} ))} @@ -151,8 +138,7 @@ const Program = (props) => { width="48px" textAlign="right" color="label" - nowrap - > + nowrap> {program.size} GQ diff --git a/tgui/packages/tgui/interfaces/NtosNetMonitor.jsx b/tgui/packages/tgui/interfaces/NtosNetMonitor.jsx index 2e9463ddc19491..3da75dba3fa0c7 100644 --- a/tgui/packages/tgui/interfaces/NtosNetMonitor.jsx +++ b/tgui/packages/tgui/interfaces/NtosNetMonitor.jsx @@ -1,14 +1,5 @@ import { useBackend, useSharedState } from '../backend'; -import { - Box, - Button, - LabeledList, - NoticeBox, - Icon, - Section, - Stack, - Tabs, -} from '../components'; +import { Box, Button, LabeledList, NoticeBox, Icon, Section, Stack, Tabs } from '../components'; import { NtosWindow } from '../layouts'; export const NtosNetMonitor = (props) => { @@ -30,16 +21,14 @@ export const NtosNetMonitor = (props) => { icon="network-wired" lineHeight="23px" selected={tab_main === 1} - onClick={() => setTab_main(1)} - > + onClick={() => setTab_main(1)}> NtNet setTab_main(2)} - > + onClick={() => setTab_main(2)}> Tablets ({tablets.length}) @@ -131,8 +120,7 @@ const MainPage = (props) => { content="Clear Logs" onClick={() => act('purgelogs')} /> - } - > + }> {ntnetlogs.map((log) => ( {log.entry} diff --git a/tgui/packages/tgui/interfaces/NtosNifsoftCatalog.jsx b/tgui/packages/tgui/interfaces/NtosNifsoftCatalog.jsx index 67edcaf776e086..8962c31c7430e0 100644 --- a/tgui/packages/tgui/interfaces/NtosNifsoftCatalog.jsx +++ b/tgui/packages/tgui/interfaces/NtosNifsoftCatalog.jsx @@ -1,15 +1,5 @@ import { useBackend, useSharedState } from '../backend'; -import { - BlockQuote, - Box, - Button, - Collapsible, - Flex, - Icon, - LabeledList, - Section, - Tabs, -} from '../components'; +import { BlockQuote, Box, Button, Collapsible, Flex, Icon, LabeledList, Section, Tabs } from '../components'; import { NtosWindow } from '../layouts'; export const NtosNifsoftCatalog = (props) => { @@ -17,7 +7,7 @@ export const NtosNifsoftCatalog = (props) => { const { product_list = [], rewards_points, current_balance } = data; const [tab, setTab] = useSharedState( 'product_category', - product_list[0].name, + product_list[0].name ); const products = @@ -43,8 +33,7 @@ export const NtosNifsoftCatalog = (props) => { key={product_category.key} textAlign="center" onClick={() => setTab(product_category.name)} - selected={tab === product_category.name} - > + selected={tab === product_category.name}> {product_category.name} ))} @@ -72,8 +61,7 @@ const ProductCategory = (props) => { {' ' + product.name} } - fill={false} - > + fill={false}>
{product.desc}
@@ -88,8 +76,7 @@ const ProductCategory = (props) => { rewards_purchase: false, }) } - fluid - > + fluid> Purchase for {product.price}cr diff --git a/tgui/packages/tgui/interfaces/NtosNotepad.tsx b/tgui/packages/tgui/interfaces/NtosNotepad.tsx index 349c9cd8844c29..cff8f06752e4a4 100644 --- a/tgui/packages/tgui/interfaces/NtosNotepad.tsx +++ b/tgui/packages/tgui/interfaces/NtosNotepad.tsx @@ -74,7 +74,7 @@ const NtosNotepadMenuBar = (props: MenuBarProps) => { const [openOnHover, setOpenOnHover] = useLocalState('openOnHover', false); const [openMenuBar, setOpenMenuBar] = useLocalState( 'openMenuBar', - null, + null ); const onMenuItemClick = (value) => { setOpenOnHover(false); @@ -134,8 +134,7 @@ const NtosNotepadMenuBar = (props: MenuBarProps) => { entry="file" openWidth="22rem" display={} - {...itemProps} - > + {...itemProps}> @@ -145,8 +144,7 @@ const NtosNotepadMenuBar = (props: MenuBarProps) => { entry="edit" openWidth="22rem" display={} - {...itemProps} - > + {...itemProps}> @@ -156,8 +154,7 @@ const NtosNotepadMenuBar = (props: MenuBarProps) => { entry="format" openWidth="15rem" display={} - {...itemProps} - > + {...itemProps}> { entry="view" openWidth="15rem" display={} - {...itemProps} - > + {...itemProps}> { entry="help" openWidth="17rem" display={} - {...itemProps} - > + {...itemProps}> @@ -275,7 +270,7 @@ class NotePadTextArea extends Component { const textarea = this.innerRef?.current; if (!textarea) { logger.error( - 'NotePadTextArea.render(): Textarea RefObject should not be null', + 'NotePadTextArea.render(): Textarea RefObject should not be null' ); return; } @@ -283,7 +278,7 @@ class NotePadTextArea extends Component { // Javascript – execute when textarea caret is moved // https://stackoverflow.com/a/53999418/5613731 TEXTAREA_UPDATE_TRIGGERS.forEach((trigger) => - textarea.addEventListener(trigger, this), + textarea.addEventListener(trigger, this) ); // Slight hack: Keep selection when textarea loses focus so menubar actions can be used (i.e. cut, delete) textarea.onblur = this.onblur.bind(this); @@ -293,12 +288,12 @@ class NotePadTextArea extends Component { const textarea = this.innerRef?.current; if (!textarea) { logger.error( - 'NotePadTextArea.componentWillUnmount(): Textarea RefObject should not be null', + 'NotePadTextArea.componentWillUnmount(): Textarea RefObject should not be null' ); return; } TEXTAREA_UPDATE_TRIGGERS.forEach((trigger) => - textarea.removeEventListener(trigger, this), + textarea.removeEventListener(trigger, this) ); } @@ -325,7 +320,7 @@ type AboutDialogProps = { const AboutDialog = (props: AboutDialogProps) => { const { close, clientName } = props; - const paragraphStyle = { padding: '.5rem 1rem 0 2rem' }; + const paragraphStyle = { 'padding': '.5rem 1rem 0 2rem' }; return (
@@ -339,20 +334,19 @@ const AboutDialog = (props: AboutDialogProps) => { © NT Corporation. All rights reserved. - + The NtOS operating system and its user interface are protected by trademark and other pending or existing intellectual property rights in the Sol system and other regions. + }}> This product is licensed under the NT Corporation Terms to: - {clientName} + {clientName}
@@ -372,11 +366,11 @@ export const NtosNotepad = (props) => { const { note } = data; const [documentName, setDocumentName] = useLocalState( 'documentName', - DEFAULT_DOCUMENT_NAME, + DEFAULT_DOCUMENT_NAME ); const [originalText, setOriginalText] = useLocalState( 'originalText', - note, + note ); console.log(note); const [text, setText] = useLocalState('text', note); @@ -386,15 +380,15 @@ export const NtosNotepad = (props) => { }); const [activeDialog, setActiveDialog] = useLocalState( 'activeDialog', - Dialogs.NONE, + Dialogs.NONE ); const [retryAction, setRetryAction] = useLocalState( 'activeAction', - null, + null ); const [showStatusBar, setShowStatusBar] = useLocalState( 'showStatusBar', - true, + true ); const [wordWrap, setWordWrap] = useLocalState('wordWrap', true); const handleCloseDialog = () => setActiveDialog(Dialogs.NONE); @@ -416,7 +410,7 @@ export const NtosNotepad = (props) => { }; const ensureUnsavedChangesAreHandled = ( action: () => void, - retrying = false, + retrying = false ): boolean => { // This is a guard function that throws up the "unsaved changes" dialog if the user is // attempting to do something that will make them lose data @@ -458,8 +452,7 @@ export const NtosNotepad = (props) => { + height={900}> { + position="top"> { + position="top"> { + color={log.adjusted_money < 1 ? 'red' : 'green'}> {log.adjusted_money > 1 ? '+' : ''} {log.adjusted_money} diff --git a/tgui/packages/tgui/interfaces/NtosPortraitPrinter.jsx b/tgui/packages/tgui/interfaces/NtosPortraitPrinter.jsx index 3f0d2c9e67981c..fa67d92180445f 100644 --- a/tgui/packages/tgui/interfaces/NtosPortraitPrinter.jsx +++ b/tgui/packages/tgui/interfaces/NtosPortraitPrinter.jsx @@ -48,8 +48,7 @@ export const NtosPortraitPrinter = (props) => { height="100%" align="center" justify="center" - direction="column" - > + direction="column"> {got_paintings ? ( <> diff --git a/tgui/packages/tgui/interfaces/NtosRadar.tsx b/tgui/packages/tgui/interfaces/NtosRadar.tsx index 16fa343b2dab8b..ab16bf6333049c 100644 --- a/tgui/packages/tgui/interfaces/NtosRadar.tsx +++ b/tgui/packages/tgui/interfaces/NtosRadar.tsx @@ -47,13 +47,12 @@ export const NtosRadarContent = (props) => { 'url("' + resolveAsset('ntosradarbackground.png') + '")', 'background-position': 'center', 'background-repeat': 'no-repeat', - top: '20px', + 'top': '20px', }} position="relative" m={1.5} width={45} - height={45} - > + height={45}> @@ -92,8 +91,7 @@ const ObjectDisplay = (props) => { act('selecttarget', { ref: object.ref, }); - }} - > + }}> {object.name}
))} @@ -118,8 +116,7 @@ const TargetDisplay = (props) => { left={1.35} width={42} fontSize="30px" - textAlign="center" - > + textAlign="center"> Signal Lost ); @@ -132,7 +129,7 @@ const TargetDisplay = (props) => { top="20px" left="243px" style={{ - transform: `rotate(${target.rot}deg)`, + 'transform': `rotate(${target.rot}deg)`, }} /> ) : ( diff --git a/tgui/packages/tgui/interfaces/NtosRecords.jsx b/tgui/packages/tgui/interfaces/NtosRecords.jsx index c190b443d0586d..06060e33b290dc 100644 --- a/tgui/packages/tgui/interfaces/NtosRecords.jsx +++ b/tgui/packages/tgui/interfaces/NtosRecords.jsx @@ -43,11 +43,10 @@ export const NtosRecords = (props) => { ' ' + record.age + ' ' + - record.fingerprint, + record.fingerprint ) ) - } - > + }> {record.name} @@ -81,11 +80,10 @@ export const NtosRecords = (props) => { ' ' + record.mental_status + ' ' + - record.physical_status, + record.physical_status ) ) - } - > + }> {record.name} diff --git a/tgui/packages/tgui/interfaces/NtosRoboControl.jsx b/tgui/packages/tgui/interfaces/NtosRoboControl.jsx index 29b3fadcce6b8a..0ddaa852da91eb 100644 --- a/tgui/packages/tgui/interfaces/NtosRoboControl.jsx +++ b/tgui/packages/tgui/interfaces/NtosRoboControl.jsx @@ -1,14 +1,5 @@ import { useBackend, useSharedState } from '../backend'; -import { - Box, - Button, - Dropdown, - LabeledList, - ProgressBar, - Section, - Stack, - Tabs, -} from '../components'; +import { Box, Button, Dropdown, LabeledList, ProgressBar, Section, Stack, Tabs } from '../components'; import { NtosWindow } from '../layouts'; const getMuleByRef = (mules, ref) => { @@ -36,16 +27,14 @@ export const NtosRoboControl = (props) => { icon="robot" lineHeight="23px" selected={tab_main === 1} - onClick={() => setTab_main(1)} - > + onClick={() => setTab_main(1)}> Bots setTab_main(2)} - > + onClick={() => setTab_main(2)}> Drones @@ -142,8 +131,7 @@ export const RobotInfo = (props) => { /> ) - } - > + }> @@ -302,8 +290,7 @@ export const DroneInfo = (props) => { title={drone.name} style={{ border: `4px solid ${color}`, - }} - > + }}> diff --git a/tgui/packages/tgui/interfaces/NtosRobotact.jsx b/tgui/packages/tgui/interfaces/NtosRobotact.jsx index 50d142b56d4d0e..2da096bb9557dc 100644 --- a/tgui/packages/tgui/interfaces/NtosRobotact.jsx +++ b/tgui/packages/tgui/interfaces/NtosRobotact.jsx @@ -1,15 +1,5 @@ import { useBackend, useSharedState } from '../backend'; -import { - AnimatedNumber, - Box, - Button, - Flex, - LabeledList, - ProgressBar, - Section, - Slider, - Tabs, -} from '../components'; +import { AnimatedNumber, Box, Button, Flex, LabeledList, ProgressBar, Section, Slider, Tabs } from '../components'; import { NtosWindow } from '../layouts'; export const NtosRobotact = (props) => { @@ -59,16 +49,14 @@ export const NtosRobotactContent = (props) => { icon="list" lineHeight="23px" selected={tab_main === 1} - onClick={() => setTab_main(1)} - > + onClick={() => setTab_main(1)}> Status setTab_main(2)} - > + onClick={() => setTab_main(2)}> Logs @@ -103,8 +91,7 @@ export const NtosRobotactContent = (props) => { good: [0.5, Infinity], average: [0.1, 0.5], bad: [-Infinity, 0.1], - }} - > + }}>
Chassis Integrity: @@ -142,24 +129,21 @@ export const NtosRobotactContent = (props) => { icon="" lineHeight="23px" selected={tab_sub === 1} - onClick={() => setTab_sub(1)} - > + onClick={() => setTab_sub(1)}> Actions setTab_sub(2)} - > + onClick={() => setTab_sub(2)}> Upgrades setTab_sub(3)} - > + onClick={() => setTab_sub(3)}> Diagnostics @@ -181,8 +165,7 @@ export const NtosRobotactContent = (props) => { /> + label={'Stored Photos (' + printerPictures + ')'}> diff --git a/tgui/packages/tgui/interfaces/NtosSupermatter.tsx b/tgui/packages/tgui/interfaces/NtosSupermatter.tsx index 00e6556f78dd8c..975534d57e39b6 100644 --- a/tgui/packages/tgui/interfaces/NtosSupermatter.tsx +++ b/tgui/packages/tgui/interfaces/NtosSupermatter.tsx @@ -32,8 +32,7 @@ export const NtosSupermatter = (props) => { content="Refresh" onClick={() => act('PRG_refresh')} /> - } - > + }> {sm_data.map((sm) => ( @@ -55,7 +54,7 @@ export const NtosSupermatter = (props) => {
Ore diff --git a/tgui/packages/tgui/interfaces/OreRedemptionMachine.jsx b/tgui/packages/tgui/interfaces/OreRedemptionMachine.jsx index 7d619af890c095..85f514db79b2cb 100644 --- a/tgui/packages/tgui/interfaces/OreRedemptionMachine.jsx +++ b/tgui/packages/tgui/interfaces/OreRedemptionMachine.jsx @@ -1,17 +1,6 @@ import { createSearch, toTitleCase } from 'common/string'; import { useBackend, useLocalState, useSharedState } from '../backend'; -import { - BlockQuote, - Box, - Button, - Table, - Tabs, - Input, - Stack, - Icon, - Section, - LabeledList, -} from '../components'; +import { BlockQuote, Box, Button, Table, Tabs, Input, Stack, Icon, Section, LabeledList } from '../components'; import { Window } from '../layouts'; import { formatSiUnit } from '../format'; @@ -100,8 +89,7 @@ export const OreRedemptionMachine = (props) => { if (searchItem.length > 0) { setSearchItem(''); } - }} - > + }}> Materials { if (searchItem.length > 0) { setSearchItem(''); } - }} - > + }}> Alloys { const [compact, setCompact] = useLocalState('compact', false); const display = material_icons.find( - (mat_icon) => mat_icon.id === material.id, + (mat_icon) => mat_icon.id === material.id ); const sheet_amounts = Math.floor(material.amount); diff --git a/tgui/packages/tgui/interfaces/OrionGame.jsx b/tgui/packages/tgui/interfaces/OrionGame.jsx index 8ab7e4c8d904c4..b5315ed9c6f814 100644 --- a/tgui/packages/tgui/interfaces/OrionGame.jsx +++ b/tgui/packages/tgui/interfaces/OrionGame.jsx @@ -28,8 +28,8 @@ const variousButtonIcons = { 'Restore Hull': 'wrench', 'Fix Engine': 'rocket', 'Repair Electronics': 'server', - Wait: 'clock', - Continue: 'arrow-right', + 'Wait': 'clock', + 'Continue': 'arrow-right', 'Explore Ship': 'door-open', 'Leave the Derelict': 'arrow-right', 'Welcome aboard.': 'user-plus', @@ -41,7 +41,7 @@ const variousButtonIcons = { 'Speed Past': 'tachometer-alt', 'Go Around': 'redo', 'Oh...': 'circle', - Dock: 'dollar-sign', + 'Dock': 'dollar-sign', }; const STATUS2COMPONENT = [ @@ -129,8 +129,7 @@ const AdventureStatus = (props) => { onClick={() => act('random_kill')} /> ) - } - > + }> {settlers?.map((settler) => ( @@ -259,8 +258,7 @@ const ORION_STATUS_INSTRUCTIONS = (props) => { content="Back to Main Menu" onClick={() => act('back_to_menu')} /> - } - > + }> In the 2200's, the Orion trail was established as a dangerous yet opportunistic trail through space for those willing to risk it. Many @@ -487,8 +485,7 @@ const ORION_STATUS_MARKET = (props) => { onClick={() => act('leave_spaceport')} /> - } - > + }> diff --git a/tgui/packages/tgui/interfaces/OutfitEditor.jsx b/tgui/packages/tgui/interfaces/OutfitEditor.jsx index d32c5420fd46c3..b4373e591e2111 100644 --- a/tgui/packages/tgui/interfaces/OutfitEditor.jsx +++ b/tgui/packages/tgui/interfaces/OutfitEditor.jsx @@ -27,11 +27,10 @@ export const OutfitEditor = (props) => { + }}> @@ -161,12 +158,11 @@ const OutfitSlot = (props) => { + title={currItem?.path}> {currItem?.name || 'Empty'} diff --git a/tgui/packages/tgui/interfaces/OutfitManager.jsx b/tgui/packages/tgui/interfaces/OutfitManager.jsx index 116cfac86dfae5..138ff6378edbf7 100644 --- a/tgui/packages/tgui/interfaces/OutfitManager.jsx +++ b/tgui/packages/tgui/interfaces/OutfitManager.jsx @@ -33,8 +33,7 @@ export const OutfitManager = (props) => { onClick={() => act('new')} /> - } - > + }> {outfits?.map((outfit) => ( @@ -43,15 +42,14 @@ export const OutfitManager = (props) => { grow={1} shrink={1} style={{ - overflow: 'hidden', + 'overflow': 'hidden', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', - }} - > + }}> @@ -103,8 +94,7 @@ const CandidateDisplay = (props: { candidate: Candidate; index: number }) => { } overflow="hidden" - title={`Candidate ${index}`} - > + title={`Candidate ${index}`}> @@ -173,8 +163,7 @@ const PaiOptions = (props) => { @@ -182,8 +171,7 @@ const PaiOptions = (props) => { @@ -191,8 +179,7 @@ const PaiOptions = (props) => { @@ -215,8 +202,7 @@ const PaiOptions = (props) => { color="bad" icon="bug" mt={1} - onClick={() => act('reset_software')} - > + onClick={() => act('reset_software')}> Malicious Software Detected )} diff --git a/tgui/packages/tgui/interfaces/PaiInterface/Available.tsx b/tgui/packages/tgui/interfaces/PaiInterface/Available.tsx index 7f9f976e09640d..62aa90a65c597a 100644 --- a/tgui/packages/tgui/interfaces/PaiInterface/Available.tsx +++ b/tgui/packages/tgui/interfaces/PaiInterface/Available.tsx @@ -1,13 +1,5 @@ import { useBackend } from 'tgui/backend'; -import { - Box, - Button, - Icon, - ProgressBar, - Section, - Table, - Tooltip, -} from 'tgui/components'; +import { Box, Button, Icon, ProgressBar, Section, Table, Tooltip } from 'tgui/components'; import { SOFTWARE_DESC } from './constants'; import { PaiData } from './types'; @@ -20,8 +12,7 @@ export const AvailableDisplay = () => { buttons={} fill scrollable - title="Available Software" - > + title="Available Software"> ); @@ -108,8 +99,7 @@ const ListItem = (props) => { disabled={ram < cost || purchased} onClick={() => act('buy', { selection: name })} tooltip={SOFTWARE_DESC[name]} - tooltipPosition="bottom-start" - > + tooltipPosition="bottom-start"> diff --git a/tgui/packages/tgui/interfaces/PaiInterface/Installed.tsx b/tgui/packages/tgui/interfaces/PaiInterface/Installed.tsx index 2a2ac7b2b19b8f..d18a87ab9be977 100644 --- a/tgui/packages/tgui/interfaces/PaiInterface/Installed.tsx +++ b/tgui/packages/tgui/interfaces/PaiInterface/Installed.tsx @@ -80,8 +80,7 @@ const SoftwareButtons = (props) => { disabled={door_jack} icon="plug" onClick={() => act(currentSelection, { mode: DOOR_JACK.Cable })} - tooltip="Drops a cable. Insert into a compatible airlock." - > + tooltip="Drops a cable. Insert into a compatible airlock."> Extend Cable @@ -108,16 +105,14 @@ const SoftwareButtons = (props) => { @@ -128,22 +123,19 @@ const SoftwareButtons = (props) => { @@ -153,8 +145,7 @@ const SoftwareButtons = (props) => { ); @@ -163,8 +154,7 @@ const SoftwareButtons = (props) => { ); diff --git a/tgui/packages/tgui/interfaces/PaiInterface/System.tsx b/tgui/packages/tgui/interfaces/PaiInterface/System.tsx index adad34996b0f13..ce5db1726ac242 100644 --- a/tgui/packages/tgui/interfaces/PaiInterface/System.tsx +++ b/tgui/packages/tgui/interfaces/PaiInterface/System.tsx @@ -74,22 +74,19 @@ const SystemInfo = (props) => { disabled={!master_dna} icon="dna" onClick={() => act('check dna')} - tooltip="Verifies your master's DNA. Must be carried in hand." - > + tooltip="Verifies your master's DNA. Must be carried in hand."> Verify } fill - title="System Info" - > + title="System Info"> {master_name || 'None.'} diff --git a/tgui/packages/tgui/interfaces/PaiInterface/constants.ts b/tgui/packages/tgui/interfaces/PaiInterface/constants.ts index 9e81ec91b1f36c..f8ca45cda8748c 100644 --- a/tgui/packages/tgui/interfaces/PaiInterface/constants.ts +++ b/tgui/packages/tgui/interfaces/PaiInterface/constants.ts @@ -24,17 +24,17 @@ export enum HOST_SCAN { } export const ICON_MAP = { - angry: 'angry', - cat: 'cat', + 'angry': 'angry', + 'cat': 'cat', 'extremely-happy': 'grin-beam', - face: 'grin-alt', - happy: 'smile', - laugh: 'grin-tears', - null: 'meh', - off: 'meh-blank', - sad: 'sad-cry', - sunglasses: 'sun', - what: 'frown-open', + 'face': 'grin-alt', + 'happy': 'smile', + 'laugh': 'grin-tears', + 'null': 'meh', + 'off': 'meh-blank', + 'sad': 'sad-cry', + 'sunglasses': 'sun', + 'what': 'frown-open', } as const; export enum PHOTO_MODE { @@ -60,7 +60,7 @@ export const SOFTWARE_DESC = { 'Medical HUD': `Allows you to view medical status using an overlay HUD.`, 'Music Synthesizer': `Synthesizes instruments, plays sounds and imported songs.`, - Newscaster: `A tool that allows you to broadcast news to other crew + 'Newscaster': `A tool that allows you to broadcast news to other crew members.`, 'Photography Module': `A portable camera module. Engage, then click to shoot. Includes a printer and lenses.`, diff --git a/tgui/packages/tgui/interfaces/PaiInterface/index.tsx b/tgui/packages/tgui/interfaces/PaiInterface/index.tsx index a2a2bba368a86f..3cdbc127e39d7d 100644 --- a/tgui/packages/tgui/interfaces/PaiInterface/index.tsx +++ b/tgui/packages/tgui/interfaces/PaiInterface/index.tsx @@ -41,29 +41,25 @@ const TabDisplay = (props) => { setTab(PAI_TAB.System)} - selected={tab === PAI_TAB.System} - > + selected={tab === PAI_TAB.System}> System setTab(PAI_TAB.Directive)} - selected={tab === PAI_TAB.Directive} - > + selected={tab === PAI_TAB.Directive}> Directives setTab(PAI_TAB.Installed)} - selected={tab === PAI_TAB.Installed} - > + selected={tab === PAI_TAB.Installed}> Installed setTab(PAI_TAB.Available)} - selected={tab === PAI_TAB.Available} - > + selected={tab === PAI_TAB.Available}> Download diff --git a/tgui/packages/tgui/interfaces/PaiSubmit.tsx b/tgui/packages/tgui/interfaces/PaiSubmit.tsx index ca72f584b83f22..3528cb52ae83ee 100644 --- a/tgui/packages/tgui/interfaces/PaiSubmit.tsx +++ b/tgui/packages/tgui/interfaces/PaiSubmit.tsx @@ -119,16 +119,14 @@ const ButtonsDisplay = (props) => { @@ -140,8 +138,7 @@ const ButtonsDisplay = (props) => { description, name, }) - } - > + }> SUBMIT diff --git a/tgui/packages/tgui/interfaces/PaintingAdminPanel.tsx b/tgui/packages/tgui/interfaces/PaintingAdminPanel.tsx index c2bac827bc3da6..712f71d2c809d3 100644 --- a/tgui/packages/tgui/interfaces/PaintingAdminPanel.tsx +++ b/tgui/packages/tgui/interfaces/PaintingAdminPanel.tsx @@ -40,8 +40,7 @@ export const PaintingAdminPanel = (props) => { title="Painting Information" buttons={ - } - > + }> { onClick={() => { setChosenPaintingRef(null); act('delete', { ref: chosenPainting.ref }); - }} - > + }}> Delete diff --git a/tgui/packages/tgui/interfaces/PaintingMachine.jsx b/tgui/packages/tgui/interfaces/PaintingMachine.jsx index 67ab4c0066a067..9c9b3ddbcb678d 100644 --- a/tgui/packages/tgui/interfaces/PaintingMachine.jsx +++ b/tgui/packages/tgui/interfaces/PaintingMachine.jsx @@ -9,12 +9,12 @@ export const PaintingMachine = (props) => { const [selectedPDA] = useSharedState( 'pdaSelection', - pdaTypes[Object.keys(pdaTypes)[0]], + pdaTypes[Object.keys(pdaTypes)[0]] ); const [selectedTrim] = useSharedState( 'trimSelection', - cardTrims[Object.keys(cardTrims)[0]], + cardTrims[Object.keys(cardTrims)[0]] ); return ( @@ -33,8 +33,7 @@ export const PaintingMachine = (props) => { }) } /> - } - > + }> { tooltipPosition="left" /> - } - > + }> { const [selectedOption, setSelectedOption] = useSharedState( stateKey, - options[Object.keys(options)[0]], + options[Object.keys(options)[0]] ); return ( diff --git a/tgui/packages/tgui/interfaces/Pandemic/Beaker.tsx b/tgui/packages/tgui/interfaces/Pandemic/Beaker.tsx index 583f98d28f95db..802967bd2cdd7c 100644 --- a/tgui/packages/tgui/interfaces/Pandemic/Beaker.tsx +++ b/tgui/packages/tgui/interfaces/Pandemic/Beaker.tsx @@ -1,13 +1,6 @@ import { capitalizeFirst } from 'common/string'; import { useBackend } from 'tgui/backend'; -import { - Button, - LabeledList, - NoticeBox, - ProgressBar, - Section, - Stack, -} from 'tgui/components'; +import { Button, LabeledList, NoticeBox, ProgressBar, Section, Stack } from 'tgui/components'; import { Data } from './types'; /** Displays loaded container info, if it exists */ @@ -60,8 +53,7 @@ export const BeakerDisplay = (props) => { onClick={() => act('eject_beaker')} /> - } - > + }> {content} ); @@ -96,9 +88,9 @@ const Info = (props) => { minValue={0} maxValue={beaker.capacity} ranges={{ - good: [beaker.capacity * 0.85, beaker.capacity], - average: [beaker.capacity * 0.25, beaker.capacity * 0.85], - bad: [0, beaker.capacity * 0.25], + 'good': [beaker.capacity * 0.85, beaker.capacity], + 'average': [beaker.capacity * 0.25, beaker.capacity * 0.85], + 'bad': [0, beaker.capacity * 0.25], }} /> @@ -122,22 +114,21 @@ const Antibodies = (props) => { {!resistances.length ? 'None' : resistances.map((resistance) => { - return ( - - ); - })} + return ( + + ); + })} ); diff --git a/tgui/packages/tgui/interfaces/Pandemic/Specimen.tsx b/tgui/packages/tgui/interfaces/Pandemic/Specimen.tsx index e65bcd9ac761ac..267672f445a483 100644 --- a/tgui/packages/tgui/interfaces/Pandemic/Specimen.tsx +++ b/tgui/packages/tgui/interfaces/Pandemic/Specimen.tsx @@ -44,8 +44,7 @@ const Buttons = (props) => { setTab(index)} - key={index} - > + key={index}> {virus.name} ); diff --git a/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx b/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx index 6aa148b2ad89b6..60d7c3db3ba3d5 100644 --- a/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx +++ b/tgui/packages/tgui/interfaces/Pandemic/Symptom.tsx @@ -1,11 +1,4 @@ -import { - Collapsible, - LabeledList, - NoticeBox, - Section, - Stack, - Tooltip, -} from 'tgui/components'; +import { Collapsible, LabeledList, NoticeBox, Section, Stack, Tooltip } from 'tgui/components'; import { getColor } from './helpers'; import { Threshold } from './types'; diff --git a/tgui/packages/tgui/interfaces/Pandemic/Virus.tsx b/tgui/packages/tgui/interfaces/Pandemic/Virus.tsx index 016297432c3774..d21da7892dffc7 100644 --- a/tgui/packages/tgui/interfaces/Pandemic/Virus.tsx +++ b/tgui/packages/tgui/interfaces/Pandemic/Virus.tsx @@ -1,13 +1,6 @@ import { capitalizeFirst, decodeHtmlEntities } from 'common/string'; import { useBackend } from 'tgui/backend'; -import { - Box, - Input, - LabeledList, - Section, - Stack, - Tooltip, -} from 'tgui/components'; +import { Box, Input, LabeledList, Section, Stack, Tooltip } from 'tgui/components'; import { getColor } from './helpers'; import { Data } from './types'; @@ -101,8 +94,7 @@ const Traits = (props) => { + label="Transmissibility"> {transmission} diff --git a/tgui/packages/tgui/interfaces/PaperSheet.tsx b/tgui/packages/tgui/interfaces/PaperSheet.tsx index c3a4719c596c1c..edcb55757016e8 100644 --- a/tgui/packages/tgui/interfaces/PaperSheet.tsx +++ b/tgui/packages/tgui/interfaces/PaperSheet.tsx @@ -198,7 +198,7 @@ class PaperSheetStamper extends Component { const radians = Math.atan2( currentWidth + stampWidth / 2 - e.pageX, - currentHeight + stampHeight - e.pageY, + currentHeight + stampHeight - e.pageY ); const rotate = rotating @@ -248,10 +248,10 @@ class PaperSheetStamper extends Component { export const Stamp = (props): Inferno.HTMLAttributes => { const { activeStamp, sprite, x, y, rotation, opacity, yOffset = 0 } = props; const stamp_transform = { - left: x + 'px', - top: y + yOffset + 'px', - transform: 'rotate(' + rotation + 'deg)', - opacity: opacity || 1.0, + 'left': x + 'px', + 'top': y + yOffset + 'px', + 'transform': 'rotate(' + rotation + 'deg)', + 'opacity': opacity || 1.0, 'z-index': activeStamp ? Z_INDEX_STAMP_PREVIEW : Z_INDEX_STAMP, }; @@ -311,7 +311,7 @@ export class PrimaryView extends Component { const [inputFieldData, setInputFieldData] = useLocalState( 'inputFieldData', - {}, + {} ); const [textAreaText, setTextAreaText] = useLocalState('textAreaText', ''); @@ -356,8 +356,7 @@ export class PrimaryView extends Component { + color={tooManyCharacters ? 'bad' : 'default'}> {`${usedCharacters} / ${max_length}`} - } - > + }>